diff --git a/Manifest b/Manifest
index b1d39ae9a969..607c810da43c 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29591 BLAKE2B 4d96b73548873d447bf365ca3a3b7023f1415f4221fc546b2d581e569bae8a46afe92594102f0d7ad8f94fa5887e10decf036403cb64dcf442abd6c65a5bca57 SHA512 6733b9c72c73552eba12f8002f93adca2ec924a766fd2dc8542159cd04c3cdd27a03031d71794d30a77cbcb69374b3cf275d75f626664ebb735834a7b3966faf
-TIMESTAMP 2022-06-13T11:09:40Z
+MANIFEST Manifest.files.gz 29588 BLAKE2B 0eb2b6e8acdf6ff619519be756a46bb138f0cc7594a97250be0d4709e6bdac365c68f50e844c80da9903ae31424c65bc57ffa1a5fb5548dd28430ead41ac9364 SHA512 83735b2ee6e100dfeea2c201141edcb748c63f754d8e85d377dfb0d05519abfbce6f016f6427327306930632bb195f58d3199bb127de79642b67d7cefec25338
+TIMESTAMP 2022-06-16T18:09:53Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmKnGvRfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmKrcfFfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDmqxAAiQCKZ0NkjvQSC38wuKFWGY+fumL8gvenxwtSsNzFhpdumQuX7SneApRj
-RgsM2ePVeoUpJGbmtkq1kZQuG0jPk2MMo3kgr/B1En6SfAXiPOtr+2U5rerPhRuH
-2uLGln+rcfprtaS3CnOVtXf4ZFE92ZMEAUna9wIkM3y510GJBg3BZ98AHksBtxhQ
-HLpuQs1kwXj4Icxk7Ic2mhPEWh9ZVVsJAY3wxIyFzbKwvZLnZsZkiVR+TguucrO8
-hY514wQDgsDV3N6+29HZFERB2Q5lhVIgkTLLig/z7DySHiE+n0inJZPXPIVXs1zu
-3BU7FLNG8hTO4Nj0uCo4Q/NRV9aT8pCuBzHCuvxUu+1RDE3Ot/ERrVtflFiOzyS6
-IJ5qmgKMJabodOw65woyH3yWLcPYEC6Pbj3zHqvHD0gTuhW5qOHdTFvVp82alryw
-Sq59N1GhlN1vi/eSQ6+K0WsnehAUcd1lEntYNxvGjZObRXXa9GYLmgUKWc1ncDMn
-+7HS5ZfNtl/j0LTPBDXps98XpENcw1w1NIPFm3BV3xX8TSBCoh0rqzOLXcUoXTKT
-rxjtgdxdf9R8Z6YE6NBt6mm6nMR0bGPFjdkNnaKOz3QxX+4k37M4/5wVUKTUTBy7
-MMt/MUdlC8XAFfCh2Is7FWp4ypTTzHuAnoW2Hh8BbF26OeeqBbU=
-=88Wd
+klDByRAAn2S8cgfThVmUklkHX6Z4eK+AmGDEitwGp4K92WrXKVby65h5bZwM7o5M
+IzwFPrd48cu5perPHtZNyDDZSn8NXngQvJxxULvPUKWjVOQQnYzbhlcH6y0E01le
+CagoGrAqaQ5619c+docTmSVubVoCBtiWG4OzpymEzvZheAPnSVUI9iDBuGKF75hV
+Buq01cTs2GU8ChxvbhnjOB96JrigpeaehMf9+pazsyjelZo09/9/TJdSIbKgxjJB
+kmcUpi9cS8JJi7om6THw9w2+zH6/hx84++LMuxxw4vm3sDbAdZhV12d8zGB/zTEo
+LMOkUKnwPUfdGsdmLovKlmIbketyfxkNNbnD8XFsH0ZONxhOHY6XaBw/LYBWn0SI
+UDQo+fA84J1JNMfpYsCwCJ3unQm+OJp4gzah1EbdcsYc7BRcC6FBiA20l1HgeK6J
+kxztQyaeYZD6gU6K1aPe6du67E50+5lq1RVwz4HVCiySUpdE/kN25eGOzTzXebiF
+u2GHP6jsz4pZw8CzNr72z2w6VqaTcZE/0yPg22GH6V3/gj8YY3syL/P6Q0eUh/W8
+O1D9Wyoi8ybGjmo6mBD9DnpmsxejCug8Hh5d9wGSb5uFBdd6xbffzkBSnvJiw5bQ
+z2RptUvyYieVcPq/IuQeSZ7mpxj+BXP0U/dt0mh22wqFrQcexto=
+=shsl
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 318a5b8dac1a..ee0081131158 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 9ac16d3ecc69..28227e1f06f3 100644
Binary files a/app-accessibility/Manifest.gz and b/app-accessibility/Manifest.gz differ
diff --git a/app-accessibility/sound-icons/Manifest b/app-accessibility/sound-icons/Manifest
index 204ed21b64d7..034651fdafe9 100644
--- a/app-accessibility/sound-icons/Manifest
+++ b/app-accessibility/sound-icons/Manifest
@@ -1,3 +1,3 @@
 DIST sound-icons-0.1.tar.gz 591196 BLAKE2B 3632d544dd186eb4358ca9cacaf6babc9ccae287cc4918462dff3b7b7a5b57fe33aea65e5c0a9399aa28a294c04ec686ddee47327cda9900173c064ef4631a5c SHA512 f0ba9e1e84ace325671c7f323f01d647aa0e1a318e9adc2a6d8af4e0d795e478b2ea66007670f9c7ced9ef7310fdbccb5168b0f404579f5dff8712fe12ad93a0
-EBUILD sound-icons-0.1.ebuild 680 BLAKE2B 86e433008f17fd98666098e40c8c8c3cff48937b67453cff298f5f343c20bb65e73d35aa933311452578190d02c1850e5f37fda09d564a265ebc76f3a09d1436 SHA512 34a4a69581f40c4efe8d662938fb1abb1bc8ce2de9abb88e1047b87d609826c1612ecd250bd76cfa7777a11fd923be5ed79c4102341616cf85bf3b236ada2065
+EBUILD sound-icons-0.1.ebuild 703 BLAKE2B 3a1ccb7f30fcc496b4e23ff3e15bf00a3fa81e47790d38ec3cba35fc9482f900f482c1bd0c81010eef40b7d2c4587dee8943f960ca50d994b3712a8ccb0a7b1a SHA512 70ce722af0e04b18c0d61a395902bec3445f7f616141e896833551d8447dce443aef7ee561338052a8222d06d8b567592b59bd1ab3fba8906266be55fd9308aa
 MISC metadata.xml 346 BLAKE2B 7e1272166e3d172f7228c972568c726842ae777ba6a347e8142de8736bebc86d2312d68fcde332947b03c48a7d388371b9f8a231fbcb4b0f37077615ee6f2645 SHA512 b6a500e0266cc804bd2b3b15dd1555801dd2afa30dde160264c6745e55f67576dbc980112c23982d378824d6681ae28e993dcfe48f99b9c5b5eef0092faab4d5
diff --git a/app-accessibility/sound-icons/sound-icons-0.1.ebuild b/app-accessibility/sound-icons/sound-icons-0.1.ebuild
index 30a81fbc310e..2582afeca261 100644
--- a/app-accessibility/sound-icons/sound-icons-0.1.ebuild
+++ b/app-accessibility/sound-icons/sound-icons-0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,9 +22,9 @@ src_install() {
 	dodoc README
 	insinto /usr/share/sounds/sound-icons
 	doins "${S}"/*.wav
-	links="`find ${S} -type l -print`"
-	for link in $links; do
-		target=`readlink -n $link`
-		dosym $target /usr/share/sounds/sound-icons/`basename $link`
+	local links=$(find "${S}" -type l -print)
+	for link in ${links}; do
+		target=$(readlink -n "${link}")
+		dosym "${target}" /usr/share/sounds/sound-icons/$(basename "${link}")
 	done
 }
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 4015bf9cd6c6..248ed608812e 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 89567312f3b7..00a78fd018c5 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,15 +1,21 @@
 DIST aws-cli-1.24.10.gh.tar.gz 2219050 BLAKE2B 9655429a65c81b5c6436f0bafb293243d8f6d2160573902bbd3f2b10ab69ef24796ac0c1bd112000afc3d15cc4d8560fc95f774c38739cf8e2d3303a4512e3ec SHA512 592564ff501ff52572655973c518366928a20371333ccf4f7234d414070343a38287a8870a5652bbbe6a8c35c8cd8731439f1520c0988100ade22d842f11ad2d
+DIST aws-cli-1.25.10.gh.tar.gz 2223709 BLAKE2B 95f7cca86f86617ff2f3ce91b745ef365300b3ea550b1260a1dd44f09f823ad8c46c03947365a0c98c54f099c4a22d0128f11fb677c1b3c315a065a8cb4945aa SHA512 efebf65901216b1e1f1e2ed5d956744d804d0a62e7384163afad65ec0837567d6002de84611feb1b0a05bbd6ca6c04cac8318424720ae020941a1402b6b796a3
 DIST aws-cli-1.25.2.gh.tar.gz 2220304 BLAKE2B 370137db21688db07a1367a1b82b906d5e7f16939fb9a10f8f8e60d986b68cd7cf3fcaca89baa097b351ce1552a9b35c143a5328972577cc08b2369a0ff35407 SHA512 4278be5b73865854a736ae447b729670310d557d019fe483376d8bb6317cc557f1567d8cbd77c4fc658d5593bdf8ddb2765696b144694c7df3d3447156ac14b0
 DIST aws-cli-1.25.3.gh.tar.gz 2221419 BLAKE2B ecc3e16985426b9b6cf6a6fc5cd3cf58d0641f57927ee533bfd5c63f1a02e7accf325f44f5f6e3289c7f0ce984be8f23428bf3d99dacc5a317b49fe2cfc2bb19 SHA512 a80088c8864d48c922734ab0d4f367d14b86470735dbb818640d0aaa2c957a30b1abcfbce441e33bccae388ce9df7869d0d7e82a519055c8aa192e2c74147f5e
 DIST aws-cli-1.25.4.gh.tar.gz 2222045 BLAKE2B 3d8496b997e80b9504c8810a256d6886a7dee239ed0eba74d42d23955d1596d5b7690a20ac31b8f57e004ff27889e8e204b335996d2f629e9ed11b3bfd033641 SHA512 e053529c9e5429e5782e6c3afe26c212599825c78691d8c58a4c5dcd373385c1111afb2f75e09b5c1831d30ce6c890db0e4888fa4d9d874a5fc68994a8c3c5fd
 DIST aws-cli-1.25.5.gh.tar.gz 2222976 BLAKE2B a726ed1ca6eb8172972c53c1418e342fa8b1f1920a3a023f63cef9a0c96e2a6e882246b8bc3caa3ff39fe0e55d66ce6993d395b7817dd1b666251f9c54d44b45 SHA512 e621237d198d15d6be662e22e7e07103969822d6324e8f63737db35c4e7b75c51d12409e1732b5a948ff2c468b7ab904f1f53903a578f04e750e426558979d68
 DIST aws-cli-1.25.6.gh.tar.gz 2223055 BLAKE2B e6e16b3b67110ed185bb94e2d56cef9445b32373e92136bde53f63bb94ff7b1e8749f33b022203ba113fde676aa086ab96b409dde7e4c48cbe5512cd9f3bd65e SHA512 c0f7b27583ce774a34467f6af0796ec4c7252d9babfda6e7a484252d2de417686194b1e7b4dffc6d8545b2126f1b55288703473153f3339656e9e7a350d143d0
 DIST aws-cli-1.25.7.gh.tar.gz 2223153 BLAKE2B fcadda94fd721135f94b1538c4b27e41108064f6fd32f324d5436138e3d1b0ffcab53fcc545b01c461365d55c4bfa2a05d90e94c875c929a3227efae76452415 SHA512 194adacab0df87d8e4f0cdc71bb956bef6dc8b2de2e7e4416c9c079ff2b7c2bce7584ac1049428d0bcb134368b39c37c04bc5e6a8fc7540c44c64f3934ccaf21
+DIST aws-cli-1.25.8.gh.tar.gz 2223378 BLAKE2B 0b7db8cf2e59f8e39929d3257e1008be082f0b5c0e5968c3a5ac8bacbfbe891fd65b1e9fe72e2058b6780b20839e9713636577c77f0efef47aeee187d30bdea7 SHA512 280018f5549c2f6240f8ebd06c82df47fd700b54075a57b21ec09403a0efc2ef039f9bacd3b3035405d29d3c4259a55ad2b8a5761e291abb3768eea6c1f8e3aa
+DIST aws-cli-1.25.9.gh.tar.gz 2223335 BLAKE2B 995c4474bde347593b61b6f8b11ed39a71e63789b2d061e08bbabcf1c1645c9ec46e73b2c58124642fa6bd194d68e81ac43eeb013b27d297d5dbbbcf34ee1cf9 SHA512 5afdabfb5a479e84c7bf302b3b93a3350100afd371270f9884848c57e7f3e48ddf8aa810db217160835d8594cbd6e2c929c86eead213bedb0246aa2145ba3806
 EBUILD awscli-1.24.10.ebuild 1811 BLAKE2B 5c7a4c3e43e396098987682075dbe1e49ef6d15d826b99276a0c12202200935251d9e2ef93c98db98a24a62672696c4a17ebb4bab667337b308ae2d8dd64f474 SHA512 5fee61d8edc58cac265d84d893cb557a032d22f6e132c63eb5061ce0c3afac0f14eb1fded3cef03533137e4fcc43f7668cccb93e0e450b151fafd54852c24d11
+EBUILD awscli-1.25.10.ebuild 1813 BLAKE2B 090772347728a30e7f77a51c1e8e7bb56e5cb87aa1a74dc95330effeae079f0631ae9be24bc1698d7f87f736125e9691e56b6a75519c6bf4cd9e2a0ee1bf6f02 SHA512 26133ab5c30348efd23e1d55f4db4f703512a05e8260eaf3e49171afd3a194649d400d7a49b67b6aaf1d6ebf1fd4d8e743ca650c9a7561e13b0d827aaa13e0db
 EBUILD awscli-1.25.2.ebuild 1813 BLAKE2B 090772347728a30e7f77a51c1e8e7bb56e5cb87aa1a74dc95330effeae079f0631ae9be24bc1698d7f87f736125e9691e56b6a75519c6bf4cd9e2a0ee1bf6f02 SHA512 26133ab5c30348efd23e1d55f4db4f703512a05e8260eaf3e49171afd3a194649d400d7a49b67b6aaf1d6ebf1fd4d8e743ca650c9a7561e13b0d827aaa13e0db
 EBUILD awscli-1.25.3.ebuild 1813 BLAKE2B 090772347728a30e7f77a51c1e8e7bb56e5cb87aa1a74dc95330effeae079f0631ae9be24bc1698d7f87f736125e9691e56b6a75519c6bf4cd9e2a0ee1bf6f02 SHA512 26133ab5c30348efd23e1d55f4db4f703512a05e8260eaf3e49171afd3a194649d400d7a49b67b6aaf1d6ebf1fd4d8e743ca650c9a7561e13b0d827aaa13e0db
 EBUILD awscli-1.25.4.ebuild 1813 BLAKE2B 090772347728a30e7f77a51c1e8e7bb56e5cb87aa1a74dc95330effeae079f0631ae9be24bc1698d7f87f736125e9691e56b6a75519c6bf4cd9e2a0ee1bf6f02 SHA512 26133ab5c30348efd23e1d55f4db4f703512a05e8260eaf3e49171afd3a194649d400d7a49b67b6aaf1d6ebf1fd4d8e743ca650c9a7561e13b0d827aaa13e0db
 EBUILD awscli-1.25.5.ebuild 1813 BLAKE2B 090772347728a30e7f77a51c1e8e7bb56e5cb87aa1a74dc95330effeae079f0631ae9be24bc1698d7f87f736125e9691e56b6a75519c6bf4cd9e2a0ee1bf6f02 SHA512 26133ab5c30348efd23e1d55f4db4f703512a05e8260eaf3e49171afd3a194649d400d7a49b67b6aaf1d6ebf1fd4d8e743ca650c9a7561e13b0d827aaa13e0db
 EBUILD awscli-1.25.6.ebuild 1813 BLAKE2B 090772347728a30e7f77a51c1e8e7bb56e5cb87aa1a74dc95330effeae079f0631ae9be24bc1698d7f87f736125e9691e56b6a75519c6bf4cd9e2a0ee1bf6f02 SHA512 26133ab5c30348efd23e1d55f4db4f703512a05e8260eaf3e49171afd3a194649d400d7a49b67b6aaf1d6ebf1fd4d8e743ca650c9a7561e13b0d827aaa13e0db
 EBUILD awscli-1.25.7.ebuild 1813 BLAKE2B 090772347728a30e7f77a51c1e8e7bb56e5cb87aa1a74dc95330effeae079f0631ae9be24bc1698d7f87f736125e9691e56b6a75519c6bf4cd9e2a0ee1bf6f02 SHA512 26133ab5c30348efd23e1d55f4db4f703512a05e8260eaf3e49171afd3a194649d400d7a49b67b6aaf1d6ebf1fd4d8e743ca650c9a7561e13b0d827aaa13e0db
+EBUILD awscli-1.25.8.ebuild 1813 BLAKE2B 090772347728a30e7f77a51c1e8e7bb56e5cb87aa1a74dc95330effeae079f0631ae9be24bc1698d7f87f736125e9691e56b6a75519c6bf4cd9e2a0ee1bf6f02 SHA512 26133ab5c30348efd23e1d55f4db4f703512a05e8260eaf3e49171afd3a194649d400d7a49b67b6aaf1d6ebf1fd4d8e743ca650c9a7561e13b0d827aaa13e0db
+EBUILD awscli-1.25.9.ebuild 1813 BLAKE2B 090772347728a30e7f77a51c1e8e7bb56e5cb87aa1a74dc95330effeae079f0631ae9be24bc1698d7f87f736125e9691e56b6a75519c6bf4cd9e2a0ee1bf6f02 SHA512 26133ab5c30348efd23e1d55f4db4f703512a05e8260eaf3e49171afd3a194649d400d7a49b67b6aaf1d6ebf1fd4d8e743ca650c9a7561e13b0d827aaa13e0db
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
diff --git a/app-admin/awscli/awscli-1.25.10.ebuild b/app-admin/awscli/awscli-1.25.10.ebuild
new file mode 100644
index 000000000000..4154af977ee6
--- /dev/null
+++ b/app-admin/awscli/awscli-1.25.10.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/awscli/awscli-1.25.8.ebuild b/app-admin/awscli/awscli-1.25.8.ebuild
new file mode 100644
index 000000000000..4154af977ee6
--- /dev/null
+++ b/app-admin/awscli/awscli-1.25.8.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/awscli/awscli-1.25.9.ebuild b/app-admin/awscli/awscli-1.25.9.ebuild
new file mode 100644
index 000000000000..4154af977ee6
--- /dev/null
+++ b/app-admin/awscli/awscli-1.25.9.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/exo/Manifest b/app-admin/exo/Manifest
index 06628cb0e3de..86d15061033a 100644
--- a/app-admin/exo/Manifest
+++ b/app-admin/exo/Manifest
@@ -1,3 +1,3 @@
-DIST exo-1.54.0.tar.gz 5596697 BLAKE2B 2cfc0b9eb8775d16311b8d6a2745bb8a59ec52e15f9006732a272cc949faa919d03f86e7031d18d7cd7fc95f71a7092f54f9bfddd827642ff99f2705f7c66af0 SHA512 5a49d13cf7e96980cb0077da199497e0d0a0b4dc4697327466b272f7e65d4e9bcc37dfd5368df8733eac70a5ae494c5890b4f08e625573bdae92300cf0ff5ca3
-EBUILD exo-1.54.0.ebuild 703 BLAKE2B fbee615ad22bcdc4efdce1344136056d3366c31ff1240c3c86b1fff39787b18f99f896d455ebde5cc4c2bee05e28cbaf216d1ab973b5f100d4a9957c8989ee65 SHA512 21b1e8bb20a9db8f635374ff64e9724679188cd356f975818e2390d3f369f2ff8886710d9c202cb4e72df39ba900948a392c6da296f95dc18344492d86e56d98
+DIST exo-1.56.0.tar.gz 5602569 BLAKE2B 8bf3b9805d459ce01a7e54d4bfa215c031354992c1b632a78f1b7084497574bd0900ff02592e5cf788b58d06317d3ef03460bd971d3b37339d531bb5b5710a15 SHA512 a6747231f2dd1cdf3ade56d0d62013c2eeb2977c30db53879cf1deb3ca5a8be93bfd89288d7be75aaaa8e47c90946e0b31bc95c7a0fa4a924dbef87931b1bb1d
+EBUILD exo-1.56.0.ebuild 703 BLAKE2B fbee615ad22bcdc4efdce1344136056d3366c31ff1240c3c86b1fff39787b18f99f896d455ebde5cc4c2bee05e28cbaf216d1ab973b5f100d4a9957c8989ee65 SHA512 21b1e8bb20a9db8f635374ff64e9724679188cd356f975818e2390d3f369f2ff8886710d9c202cb4e72df39ba900948a392c6da296f95dc18344492d86e56d98
 MISC metadata.xml 334 BLAKE2B 230d1a47a3e39f796c16a9e9a622fbc27560c951da0c49adf7aca135970c0c944f42da7eb624c7193d44830c72cf95da9d69d977562853de6a00fd8fb6408977 SHA512 cd1366d99abc260c6f2899000e2a517be9a4c43e921078764fdc996871df34c1827e512087c3eb6f95bf3b685c2f34cbc1f1462eaa303a948640a362b4501b01
diff --git a/app-admin/exo/exo-1.54.0.ebuild b/app-admin/exo/exo-1.56.0.ebuild
similarity index 100%
rename from app-admin/exo/exo-1.54.0.ebuild
rename to app-admin/exo/exo-1.56.0.ebuild
diff --git a/app-admin/hcloud/Manifest b/app-admin/hcloud/Manifest
index d597000758cc..885ce4e4f17a 100644
--- a/app-admin/hcloud/Manifest
+++ b/app-admin/hcloud/Manifest
@@ -1,5 +1,3 @@
-DIST hcloud-1.29.0.tar.xz 1499276 BLAKE2B 3ec9973fc3ecaf5ec476b2d165fc1663f4d6cd2c00c4c87efc72f3946d1d6028f9a2d20f80020203b1f8f2aa94512a1d02e05b54e9422f5b84826eb8bb552490 SHA512 b5b1e20785fc8a06954a753dbd6c5d91b2b557d0e64cb044ab55cbfb11f0fd7d0a2eb625a51e1216af86cad6f772a206d3b0ef443f256649dba38d199614d41d
 DIST hcloud-1.29.5.tar.xz 1416952 BLAKE2B 4b1c9e1df9bb3fdb63c28890e7f9cfb8c4c628fd22b765d8265e63415b8feee0466f32fd6a87a5cd981d231f93a60c28c140c1efa7ea33c327b234f1a4d6b0cf SHA512 fbe395c47cf1bef800c162b8c44359dab173c636ec4d7e8e4629fa95b323731c7c3d8a9045dd77692b7beb8a3554cdce567f2285640a5b410262be69442fe99e
-EBUILD hcloud-1.29.0.ebuild 712 BLAKE2B 720832d21c95224d42bc4511184428280c532f7edd91acfa6ead5b71fe0f3d0243285bf07b196b8cf86d1cbd9e5bbcc3d5bae99d71fa3ac739d5306584ae61b1 SHA512 879162a964a3bf1b13a74a5ef4e916153aed3ef7096d481e2c2428e27b812f6f1c4e181fa42c591140949a57b538150dedfac3e9452676c9446114c2cb861a27
-EBUILD hcloud-1.29.5.ebuild 726 BLAKE2B 7d96a9012f4b897b54576a5dbedb9419e0fcaa34476e68d252b907132efe6bc638ad9598a034160bcff3dca5b86dfe3a9cc9b4380b8606db71c889bcbafa2e2d SHA512 78a825e2b55f7ffbf6c5e7e8096f788b26d9fc4205edf5dc05286d8bf9da17d5f17d266f6c990bb07154edd7ba635a4c332241ac225e6b3ab02ab9a9f82f68d3
+EBUILD hcloud-1.29.5.ebuild 725 BLAKE2B edcbd89bab62c808b5d21c0df6e3a5e2420163bc955ead8cfb156a693f84ecf6ab7bb6f1f546bd9b3bc95ea43536ccd9ace2e6fb22f15edd067e6ec84a362e6d SHA512 e32ce446972a048443945716eba008cefbd43e0d08ffbf381a20213675485472e5b6576677764a5aea9cac2ee096ad6990bbfd0f763849ceec508ebf1c577497
 MISC metadata.xml 338 BLAKE2B 6ba2cbe509581ac35dabd93abe166f960d69d1f14336779848483386d28e22dd06e5d196061312827b7a945369f05a466417a1636b607e138515957a75db6f84 SHA512 cc69ce0ab7ba3a9af94ef1918738074cdd725bef2ff70d6c19e46d07bb9514d05ef6415c7ba5b372e7a98902a8440cdb9f7b14a848c3ff2f054863356971ddde
diff --git a/app-admin/hcloud/hcloud-1.29.0.ebuild b/app-admin/hcloud/hcloud-1.29.0.ebuild
deleted file mode 100644
index 358299f65bac..000000000000
--- a/app-admin/hcloud/hcloud-1.29.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=7
-
-DESCRIPTION="A command-line interface for Hetzner Cloud"
-HOMEPAGE="https://github.com/hetznercloud/cli"
-SRC_URI="https://dev.gentoo.org/~ago/distfiles/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-IUSE=""
-DEPEND="dev-lang/go:="
-RESTRICT="strip"
-QA_FLAGS_IGNORED=".*"
-
-src_compile() {
-	go build -mod vendor -o ${PN} -ldflags "-w -X github.com/hetznercloud/cli/cli.Version=${PV}-gentoo" ./cmd/${PN} || die "build failed"
-}
-
-src_test() {
-	# For upstream a simple test is run 'hcloud version'
-	./hcloud version
-	if [[ $? -ne 0 ]]
-	then
-		die "Test failed"
-	fi
-}
-
-src_install() {
-	dobin ${PN}
-}
diff --git a/app-admin/hcloud/hcloud-1.29.5.ebuild b/app-admin/hcloud/hcloud-1.29.5.ebuild
index 82ba00ab5dca..33ffb7d83afa 100644
--- a/app-admin/hcloud/hcloud-1.29.5.ebuild
+++ b/app-admin/hcloud/hcloud-1.29.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~ago/distfiles/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE=""
 DEPEND="dev-lang/go:="
diff --git a/app-admin/helm/Manifest b/app-admin/helm/Manifest
index d96fd1fb901e..88b249cc9f78 100644
--- a/app-admin/helm/Manifest
+++ b/app-admin/helm/Manifest
@@ -1,4 +1,4 @@
 DIST helm-3.8.1-deps.tar.xz 374838312 BLAKE2B 13700d77faef89828a98b0410f1539c4370848d3f741881dfff4fb6d08b50d152052b4c1fa7ce4fe19d1d08583530c89f9e8ca35ede178b08c05dbecbdf36fbb SHA512 5686ca6c3f9b114032dda78842c3e3d2012f97d5721455aedc204ffae8a6bdafcb5191beaaca0e89cb827a7846fe65658d4440c2982b36b008e8aa235be41736
 DIST k8s-helm-3.8.1.tar.gz 715683 BLAKE2B 2b0fc2a844f848e2a696be54224c1ca6027bf461c0885b3e082b57a09117b6ebc2500b35f1e6ad03cdc7ad4d0f18b3b6c24a1e79782b1b0492effc6a80031a93 SHA512 c4c3c8272ac4d83fad7dcdd41f81e9123ee71b01b6ebf352c3f3836048d7d240e144a52fd78e156c1957020bb1e4a868059486a4a4c3d37e4be150203a1e6158
-EBUILD helm-3.8.1.ebuild 963 BLAKE2B 6d9fc4860eb92eef275af4c42094da774bcf82de87aaccfba4ba40b81c90085bea5da9783e20fdd3799d3e66e8a799e4252bfe46d4cf565ca850a49fefc24506 SHA512 42e0f7194958dbcf36620146046f7562633432871fa23f76ad165af528002140b4334e731d86a196c45097e5d670d35af6594be9f74026b53e5062e8e78b42ca
+EBUILD helm-3.8.1.ebuild 970 BLAKE2B 75f992b41d1b1680f444d5a73e714fb404276f19ea6f0ec822f8526da7e6a02e27130fbe66c87a059f378794a18d792c3ba6b455f8cc52af58e6d1f5fe9a4b0b SHA512 9642bfa50f7d572ec38def3d3c9d743f2abef929c4bd30bd3c969223e89c1aedf14109ff3ef97a2f7f2ddcf5a906c79d53aed3ce8250149b6f35d017b5e8f17f
 MISC metadata.xml 323 BLAKE2B 5001082c76e55c24c27deced68a33a8fc8c9514b65116aa076ade0bacab00103a19e0807af8187b7bd8b761e64f20c4fab74b998e0f9ec473fb8d2bc9cbe4412 SHA512 a039551d398af15db8fb487b058ad569731376c51f8a23c245e4c14cd8924b960a2dcb286618c9365d21d219a271f1e0c6bcab712cf88920f4fc7fded832d800
diff --git a/app-admin/helm/helm-3.8.1.ebuild b/app-admin/helm/helm-3.8.1.ebuild
index b7cfdc5c8245..c0d0f73bf809 100644
--- a/app-admin/helm/helm-3.8.1.ebuild
+++ b/app-admin/helm/helm-3.8.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~arm64"
 
 RESTRICT=" test"
 
diff --git a/app-admin/metalog/Manifest b/app-admin/metalog/Manifest
index d55456b2f3d6..a83db389eac6 100644
--- a/app-admin/metalog/Manifest
+++ b/app-admin/metalog/Manifest
@@ -6,5 +6,5 @@ AUX metalog.service-r1 153 BLAKE2B 0353f6c1983b7146ce6471be82540aeb87d930e5c9f73
 DIST metalog-20200113.tar.gz 40276 BLAKE2B f2fcaccf610f3b7f1974aa97f2c7b5181f3c625c9e28d72832ba1570cfa369873887c83468bcea6a9f3d3080356bd1dd62849ec34a5d03c1272ada7f476946f6 SHA512 d399d86f988c69c9f74553cd682a5fe04886bca458e6f8bb3132fe1fb9f522510a428cfde8af0857c5ba22531b276b04fa05183e0006c2d28ef0f0aead488f93
 DIST metalog-20220214.tar.gz 40898 BLAKE2B 7ef04b9e0cd1ba878a11d988ec4b4bffa3d733f86c6b8cec57d32dcf837fe48a001a233a2b09378443b26f6e69869b8de7afeb25f11bb7729b66e1aa3a305f67 SHA512 44a1443e8f9e92460f128aa35125d50ae247ba4f2ce8fd8cc32b96a491e29963cdc27be12a6db28f286e2d5a2bc6243e126a77ae3eb642e7c969d58446a18fcd
 EBUILD metalog-20200113-r1.ebuild 1600 BLAKE2B 33d3eacc9e127c16c9397d43f83408738a357da739c5ba3fc7ba481c700c3e9fd0a720c20c1dc81b7f83371d93fd05c6dce7053b2fef989958ba53433de6bfb0 SHA512 b245200be3fdd4b92f97c15deb21d41789ac717deb430d6532f7eea0bf3158e1580b0a83d3d17fa66cc5ce174af991977856cd9ea657e17b7755e1c9f0bb4c70
-EBUILD metalog-20220214.ebuild 1610 BLAKE2B 0dc9c3c226342a133660db4bda207e75511f21887b105e6cbf57ec762c88441896dca09f58364166528373eeba889e24836d8ee4401346e0e21adde8c3f4e7a1 SHA512 9c9a78c461a0f55e052669f278f2be12b522e386f454c5892f2081f4d4af5b6828f9a3e532db9aed0346e967b923e79dab5953c08c9f0e3ef474808d70c3d44c
+EBUILD metalog-20220214.ebuild 1608 BLAKE2B ac154c3a01f80ecc0ebb64ce9bb37b69e5335a5f53d9531872faa82164700442299b9d172f16e975f5f27cc9e32b9a0f815b56e96008003d683413733cf10213 SHA512 7db94f90f6e6e2f43032d6b01a20e79f1749cb8c9eaed5ddf5795ec387f23c9cbff5503eb4f1d0993d905c90f0e03938ed5af71e0d3a61572e0870ce859129ba
 MISC metadata.xml 335 BLAKE2B 79615a8fc010da3c58df284f7c0490ca2a56bf0a31761090e4fdbde48f70f98660ab5e682f272a21cd820fb3b52a75b48d42f63d5b5debc5fa767f62eea8a938 SHA512 6ccfe49519ce8c5d9d76bf305993e09c76c2d095e0eea30c3de32947dbe80d6c99385a8bb743f4c78697324d9ae24bfb97b2f79385e5cca16dd753c448f517dd
diff --git a/app-admin/metalog/metalog-20220214.ebuild b/app-admin/metalog/metalog-20220214.ebuild
index 21f33769d1c7..ef771039b142 100644
--- a/app-admin/metalog/metalog-20220214.ebuild
+++ b/app-admin/metalog/metalog-20220214.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${PN}-${P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin"
 IUSE="unicode"
 
 RDEPEND="dev-libs/libpcre2"
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 75731c4ff8cc..3d480e2bc666 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -5,11 +5,14 @@ DIST sudo-1.9.11.tar.gz 4822882 BLAKE2B 5b6b0345d923935c022705b2f65d2b27f4b9fa33
 DIST sudo-1.9.11.tar.gz.sig 566 BLAKE2B 495058445cfbad7bf1db4f8a4fb2efe8d0549fdb2a0d35938ea986576fd39e4cf47a28e55819e937b9f4a3dddf556cb9eeb4ff03feddd60fd89c7c37e9254d28 SHA512 35d608c031816dfec5251e2dd1ed3ea2bc979db77f65803b7fa879429241188c79769fb32b58909f3dd39838cb27bf8266a5f518590bbaf5b16113bfc93025c3
 DIST sudo-1.9.11p1.tar.gz 4825102 BLAKE2B ed8ee83516bb53dae7be1848417ea895af38a6ae2503c403d3cb2f644b5e77459c5aa8b0f434e19e37eb98d99f134b45b6240cd6777d3db3fd7fca9b120941f9 SHA512 177ea094dbb083bbe53c28fefa7fdeb44a3a96914d9c653918479d40966f67122dd1fac175e7549325ff4392a05cde581a16a4fd9e486664d9d8dddd431f1375
 DIST sudo-1.9.11p1.tar.gz.sig 566 BLAKE2B f6c9986b3fa4dfab2592c1fbd4171ef5421edb04d019f8ab5cf7c82496a110c91835a4368c7a1285543904ab05bd42fc6aaccd02891654fae1c0db2395786d61 SHA512 1f95750630750b79c72395d96b82f76f4db514679ead0a284c8b952fd62fa99298b0f593f8c904a8cdc7cb9d108a02c2399bef47abc8a57fca458ab5f3419188
+DIST sudo-1.9.11p2.tar.gz 4825417 BLAKE2B b6b16f17ba8b6d5ab80f5515beebddf21579944376c2b0752111120d9fb6e2c3d3c40c8150a4f1c2c7165fb93e1f9ac3d03f77b0951a6f721e026a175cc948c4 SHA512 ca64ace6b663a61336a2aa45fb96eb585b5075a867e770b0b384aaf015479dfae48847226c83f824372e64f4697454e68c36305f7979f14b662185c284e1da67
+DIST sudo-1.9.11p2.tar.gz.sig 566 BLAKE2B 9ffe8ebf79f3d94c2df4ce18bb811f73854920b262774ef114ed77ff78a2f856765651c0408cd0cd71191b21840fa3c6a73ca7897baa7975dd7b655eead45ab1 SHA512 a452fb875b3f4a05cc8623df18f7b53192b8671cdd8fcdbb9360cc86160b9aadb1148a60f91f106fd381997b91a4dfcf06149f3cb43292284d27997a4d97473f
 DIST sudo-1.9.8p2.tar.gz 4302256 BLAKE2B ba40df539b3466bebe0d876ef4f1809867125e83983609eae0447f933fbd499b2eda88d2f6c475779654e68af9580a2998eca3c3f7953129ff73c923e1c88ad9 SHA512 899b252e8c219226f658dff3dd34c97b07d42004998b45175b4c0c4de42a6bf9f909598e99b4056fa1171e63378e203854b0f8608b0f5c1b00e9d3677818f6d3
 DIST sudo-1.9.8p2.tar.gz.sig 566 BLAKE2B 1e1cf69ea391602a214aef253a19fff2e26a908ffd9f5e54f2eeb20245f9518fde7d8417e7160b33d1067916fc7cd3df0b59e626d54d24dc8c6453a0efa95200 SHA512 18a7170a4654ff22b23181f589ae2115acd2d635d94977586aa15093bb5144f947584588ae03fc2dd941fb934fac4d9fa689b3fd5a4ef0295156e5b9772b8126
 EBUILD sudo-1.9.10-r1.ebuild 6976 BLAKE2B 8319a74c6c4cd73c1c45b2d28c5275fa1d6438a67a198541c9202f1081c9d0d7a53b87e4669ac48e6d3cf1ebfff5c4b06e14bbe08854166e4f9205e784ca441c SHA512 239152e2442735957d4d11e35a28a738a8a84024f4453202dc2465c59da46561642d98927ddb0c4ea9b879688605e6fe3d94b9c05399d42157002d2a6be5e488
 EBUILD sudo-1.9.11.ebuild 7359 BLAKE2B 328f489073450fc1618df35565822517f8d39313c7ed417e67b0bb89f713912ab364b58a9fddb205ed8e96beef3d8699ca00deaeaf3460234b9515149ba41a42 SHA512 9d14994dd67a9f115f7a9be1f1cc3700558329aceb47659ca8edf6fd227496fd1297c427395c8d6ab966bc3db4bc214bc0dd444e7662b7cc0727b45d3f96e071
 EBUILD sudo-1.9.11_p1.ebuild 7304 BLAKE2B de1380cd489087ec7aed591df8b4be9dc8fb032a6713f8ec141e496dc47899ae84557d09411d365987218d8135d8e8a75fe7c8425a75c1fb0d4ff5f3f3329969 SHA512 beed2ae17ca1240830d05e2e60014827c98b00f135cb7066264a5abf0b8d5a235dfed0c3414810a7dfe2b3dd1120d60bb3e2d9dfb289a969b01eb59753fc84b8
+EBUILD sudo-1.9.11_p2.ebuild 7386 BLAKE2B ccae805ca97cc7470605997171bd5d9a292a2dd094b78ba834b34cc0c1c608b228f66c3c5329641532fda23e5dd32f867363fd1edc5106bd7a04d01c3947929b SHA512 d5596e4c9e7e2ad5af160575c0daf27573a6704830f46add107eaab1a7002a36ac364ee758fb976db3ed74a88b5f910f25107225b050eb72c5282300cdc58b94
 EBUILD sudo-1.9.8_p2-r1.ebuild 7099 BLAKE2B f76853a4f9e092fb19a4e8d2ae780bcf2b6961ec597a2a487c508b42addcdb129f1484a34bdbb4daaeb9e971d5d18bdf82695c6d87d51b737ee809ce4350cb65 SHA512 2a9dabdd9b34abdc6a5795b8f805fd64d0e406e25464600b5e5ef41e3245aa71a2bebaa164ed6081812b63d1fdafc8236d4e87925c70b256db060aaa1bd96d12
-EBUILD sudo-9999.ebuild 7304 BLAKE2B de1380cd489087ec7aed591df8b4be9dc8fb032a6713f8ec141e496dc47899ae84557d09411d365987218d8135d8e8a75fe7c8425a75c1fb0d4ff5f3f3329969 SHA512 beed2ae17ca1240830d05e2e60014827c98b00f135cb7066264a5abf0b8d5a235dfed0c3414810a7dfe2b3dd1120d60bb3e2d9dfb289a969b01eb59753fc84b8
+EBUILD sudo-9999.ebuild 7386 BLAKE2B ccae805ca97cc7470605997171bd5d9a292a2dd094b78ba834b34cc0c1c608b228f66c3c5329641532fda23e5dd32f867363fd1edc5106bd7a04d01c3947929b SHA512 d5596e4c9e7e2ad5af160575c0daf27573a6704830f46add107eaab1a7002a36ac364ee758fb976db3ed74a88b5f910f25107225b050eb72c5282300cdc58b94
 MISC metadata.xml 1050 BLAKE2B 4027c8a5941e8e12bb6c9cd9950187965b01e236ddfc073ba0dd98be8e3e98225ffbca1c05b3153d72e5507484f966e01c7b44e9416bbedecd88ae8f4d52e359 SHA512 8033bd4649190c3c6bf0d07dab2dc99a708b81a74b0d154b1f4d56bdfbc115d4889b3a78e6b2f3eebaa91bf0252e8fd043bf2bc850b8f6b4199b38ea751b7174
diff --git a/app-admin/sudo/sudo-1.9.11_p2.ebuild b/app-admin/sudo/sudo-1.9.11_p2.ebuild
new file mode 100644
index 000000000000..afb8327d1680
--- /dev/null
+++ b/app-admin/sudo/sudo-1.9.11_p2.ebuild
@@ -0,0 +1,281 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit pam libtool tmpfiles toolchain-funcs
+
+MY_P="${P/_/}"
+MY_P="${MY_P/beta/b}"
+
+DESCRIPTION="Allows users or groups to run commands as other users"
+HOMEPAGE="https://www.sudo.ws/"
+if [[ ${PV} == 9999 ]] ; then
+	inherit mercurial
+	EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/sudo.ws.asc
+	inherit verify-sig
+
+	uri_prefix=
+	case ${P} in
+		*_beta*|*_rc*) uri_prefix=beta/ ;;
+	esac
+
+	SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
+		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz
+		verify-sig? (
+			https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz.sig
+			ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz.sig
+		)"
+	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~sparc-solaris"
+	fi
+
+	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-sudo )"
+fi
+
+# Basic license is ISC-style as-is, some files are released under
+# 3-clause BSD license
+LICENSE="ISC BSD"
+SLOT="0"
+IUSE="gcrypt ldap nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd"
+
+DEPEND="
+	sys-libs/zlib:=
+	virtual/libcrypt:=
+	gcrypt? ( dev-libs/libgcrypt:= )
+	ldap? (
+		>=net-nds/openldap-2.1.30-r1:=
+		sasl? (
+			dev-libs/cyrus-sasl
+			net-nds/openldap:=[sasl]
+		)
+	)
+	pam? ( sys-libs/pam )
+	sasl? ( dev-libs/cyrus-sasl )
+	skey? ( >=sys-auth/skey-1.1.5-r1 )
+	ssl? ( dev-libs/openssl:0= )
+	sssd? ( sys-auth/sssd[sudo] )
+"
+RDEPEND="
+	${DEPEND}
+	>=app-misc/editor-wrapper-3
+	virtual/editor
+	ldap? ( dev-lang/perl )
+	pam? ( sys-auth/pambase )
+	selinux? ( sec-policy/selinux-sudo )
+	sendmail? ( virtual/mta )
+"
+BDEPEND+="
+	sys-devel/bison
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	?? ( pam skey )
+	?? ( gcrypt ssl )
+"
+
+MAKEOPTS+=" SAMPLES="
+
+src_prepare() {
+	default
+
+	elibtoolize
+}
+
+set_secure_path() {
+	# First extract the default ROOTPATH from build env
+	SECURE_PATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env; echo "${ROOTPATH}")
+
+	case "${SECURE_PATH}" in
+		*/usr/sbin*)
+			;;
+		*)
+			SECURE_PATH=$(unset PATH; . "${EPREFIX}"/etc/profile.env; echo "${PATH}")
+			;;
+	esac
+
+	if [[ -z ${SECURE_PATH} ]] ; then
+		ewarn "	Failed to detect SECURE_PATH, please report this"
+	fi
+
+	# Then remove duplicate path entries
+	cleanpath() {
+		local newpath thisp IFS=:
+		for thisp in $1 ; do
+			if [[ :${newpath}: != *:${thisp}:* ]] ; then
+				newpath+=:${thisp}
+			else
+				einfo "   Duplicate entry ${thisp} removed..."
+			fi
+		done
+		SECURE_PATH=${newpath#:}
+	}
+	cleanpath /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}}
+
+	# Finally, strip gcc paths, bug #136027
+	rmpath() {
+		local e newpath thisp IFS=:
+		for thisp in ${SECURE_PATH} ; do
+			for e ; do
+				[[ ${thisp} == ${e} ]] && continue 2 ;
+			done
+			newpath+=:${thisp}
+		done
+		SECURE_PATH=${newpath#:}
+	}
+	rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
+}
+
+src_configure() {
+	local SECURE_PATH
+
+	set_secure_path
+
+	# bug #767712
+	tc-export PKG_CONFIG
+
+	# - audit: somebody got to explain me how I can test this before I
+	# enable it.. - Diego
+	# - plugindir: autoconf code is crappy and does not delay evaluation
+	# until `make` time, so we have to use a full path here rather than
+	# basing off other values.
+	local myeconfargs=(
+		# We set all of the relevant options by ourselves (patched
+		# into the toolchain) and setting these in the build system
+		# actually causes a downgrade when using e.g. -D_FORTIFY_SOURCE=3
+		# (it'll downgrade to =2). So, this has no functional effect on
+		# the hardening for users. It's safe.
+		--disable-hardening
+
+		# requires some python eclass
+		--disable-python
+		--enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d
+		--enable-zlib=system
+		--with-editor="${EPREFIX}"/usr/libexec/editor
+		--with-env-editor
+		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
+		--with-rundir="${EPREFIX}"/run/sudo
+		--with-vardir="${EPREFIX}"/var/db/sudo
+		--without-linux-audit
+		--without-opie
+		$(use_enable gcrypt)
+		$(use_enable nls)
+		$(use_enable sasl)
+		$(use_enable ssl openssl)
+		$(use_with ldap)
+		$(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
+		$(use_with offensive insults)
+		$(use_with offensive all-insults)
+		$(use_with pam)
+		$(use_with pam pam-login)
+		$(use_with secure-path secure-path "${SECURE_PATH}")
+		$(use_with selinux)
+		$(use_with sendmail)
+		$(use_with skey)
+		$(use_with sssd)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if use ldap ; then
+		dodoc README.LDAP.md
+
+		cat <<-EOF > "${T}"/ldap.conf.sudo
+		# See ldap.conf(5) and README.LDAP.md for details
+		# This file should only be readable by root
+
+		# supported directives: host, port, ssl, ldap_version
+		# uri, binddn, bindpw, sudoers_base, sudoers_debug
+		# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
+		EOF
+
+		if use sasl ; then
+			cat <<-EOF >> "${T}"/ldap.conf.sudo
+
+			# SASL directives: use_sasl, sasl_mech, sasl_auth_id
+			# sasl_secprops, rootuse_sasl, rootsasl_auth_id, krb5_ccname
+			EOF
+		fi
+
+		insinto /etc
+		doins "${T}"/ldap.conf.sudo
+		fperms 0440 /etc/ldap.conf.sudo
+
+		insinto /etc/openldap/schema
+		newins docs/schema.OpenLDAP sudo.schema
+	fi
+
+	if use pam ; then
+		pamd_mimic system-auth sudo auth account session
+		pamd_mimic system-auth sudo-i auth account session
+	fi
+
+	keepdir /var/db/sudo/lectured
+	fperms 0700 /var/db/sudo/lectured
+	# bug #652958
+	fperms 0711 /var/db/sudo
+
+	# Don't install into /run as that is a tmpfs most of the time
+	# (bug #504854)
+	rm -rf "${ED}"/run || die
+
+	# bug #697812
+	find "${ED}" -type f -name "*.la" -delete || die
+}
+
+pkg_postinst() {
+	tmpfiles_process sudo.conf
+
+	# bug #652958
+	local sudo_db="${EROOT}/var/db/sudo"
+	if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
+		chmod 711 "${sudo_db}" || die
+	fi
+
+	if use ldap ; then
+		ewarn
+		ewarn "sudo uses the ${ROOT}/etc/ldap.conf.sudo file for ldap configuration."
+		ewarn
+		if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
+			ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
+			ewarn "configured in ${ROOT}/etc/nsswitch.conf."
+			ewarn
+			ewarn "To make use of LDAP, add this line to your ${ROOT}/etc/nsswitch.conf:"
+			ewarn "  sudoers: ldap files"
+			ewarn
+		fi
+	fi
+	if use prefix ; then
+		ewarn
+		ewarn "To use sudo on Prefix, you need to change file ownership and permissions"
+		ewarn "with root privileges, as follows:"
+		ewarn
+		ewarn "  # chown root:root ${EPREFIX}/usr/bin/sudo"
+		ewarn "  # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
+		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers"
+		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers.d"
+		ewarn "  # chown root:root ${EPREFIX}/var/db/sudo"
+		ewarn "  # chmod 4111 ${EPREFIX}/usr/bin/sudo"
+		ewarn
+	fi
+
+	elog "To use the -A (askpass) option, you need to install a compatible"
+	elog "password program from the following list. Starred packages will"
+	elog "automatically register for the use with sudo (but will not force"
+	elog "the -A option):"
+	elog ""
+	elog " [*] net-misc/ssh-askpass-fullscreen"
+	elog "     net-misc/x11-ssh-askpass"
+	elog ""
+	elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
+	elog "variable to the program you want to use."
+}
diff --git a/app-admin/sudo/sudo-9999.ebuild b/app-admin/sudo/sudo-9999.ebuild
index dda0650bd5fc..afb8327d1680 100644
--- a/app-admin/sudo/sudo-9999.ebuild
+++ b/app-admin/sudo/sudo-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit pam libtool tmpfiles toolchain-funcs
 
@@ -10,13 +10,12 @@ MY_P="${MY_P/beta/b}"
 
 DESCRIPTION="Allows users or groups to run commands as other users"
 HOMEPAGE="https://www.sudo.ws/"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == 9999 ]] ; then
 	inherit mercurial
 	EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
 else
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/sudo.ws.asc
 	inherit verify-sig
-	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/sudo.ws.asc
-	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-sudo )"
 
 	uri_prefix=
 	case ${P} in
@@ -32,6 +31,8 @@ else
 	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
 		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~sparc-solaris"
 	fi
+
+	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-sudo )"
 fi
 
 # Basic license is ISC-style as-is, some files are released under
@@ -82,24 +83,27 @@ MAKEOPTS+=" SAMPLES="
 
 src_prepare() {
 	default
+
 	elibtoolize
 }
 
 set_secure_path() {
-	# first extract the default ROOTPATH from build env
-	SECURE_PATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env;
-		echo "${ROOTPATH}")
-		case "${SECURE_PATH}" in
-			*/usr/sbin*) ;;
-			*) SECURE_PATH=$(unset PATH;
-				. "${EPREFIX}"/etc/profile.env; echo "${PATH}")
-				;;
-		esac
+	# First extract the default ROOTPATH from build env
+	SECURE_PATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env; echo "${ROOTPATH}")
+
+	case "${SECURE_PATH}" in
+		*/usr/sbin*)
+			;;
+		*)
+			SECURE_PATH=$(unset PATH; . "${EPREFIX}"/etc/profile.env; echo "${PATH}")
+			;;
+	esac
+
 	if [[ -z ${SECURE_PATH} ]] ; then
 		ewarn "	Failed to detect SECURE_PATH, please report this"
 	fi
 
-	# then remove duplicate path entries
+	# Then remove duplicate path entries
 	cleanpath() {
 		local newpath thisp IFS=:
 		for thisp in $1 ; do
@@ -113,11 +117,13 @@ set_secure_path() {
 	}
 	cleanpath /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}}
 
-	# finally, strip gcc paths #136027
+	# Finally, strip gcc paths, bug #136027
 	rmpath() {
 		local e newpath thisp IFS=:
 		for thisp in ${SECURE_PATH} ; do
-			for e ; do [[ ${thisp} == ${e} ]] && continue 2 ; done
+			for e ; do
+				[[ ${thisp} == ${e} ]] && continue 2 ;
+			done
 			newpath+=:${thisp}
 		done
 		SECURE_PATH=${newpath#:}
@@ -127,15 +133,18 @@ set_secure_path() {
 
 src_configure() {
 	local SECURE_PATH
+
 	set_secure_path
-	tc-export PKG_CONFIG #767712
 
-	# audit: somebody got to explain me how I can test this before I
+	# bug #767712
+	tc-export PKG_CONFIG
+
+	# - audit: somebody got to explain me how I can test this before I
 	# enable it.. - Diego
-	# plugindir: autoconf code is crappy and does not delay evaluation
+	# - plugindir: autoconf code is crappy and does not delay evaluation
 	# until `make` time, so we have to use a full path here rather than
 	# basing off other values.
-	myeconfargs=(
+	local myeconfargs=(
 		# We set all of the relevant options by ourselves (patched
 		# into the toolchain) and setting these in the build system
 		# actually causes a downgrade when using e.g. -D_FORTIFY_SOURCE=3
@@ -205,26 +214,28 @@ src_install() {
 		newins docs/schema.OpenLDAP sudo.schema
 	fi
 
-	if use pam; then
+	if use pam ; then
 		pamd_mimic system-auth sudo auth account session
 		pamd_mimic system-auth sudo-i auth account session
 	fi
 
 	keepdir /var/db/sudo/lectured
 	fperms 0700 /var/db/sudo/lectured
-	fperms 0711 /var/db/sudo #652958
+	# bug #652958
+	fperms 0711 /var/db/sudo
 
 	# Don't install into /run as that is a tmpfs most of the time
 	# (bug #504854)
 	rm -rf "${ED}"/run || die
 
-	find "${ED}" -type f -name "*.la" -delete || die #697812
+	# bug #697812
+	find "${ED}" -type f -name "*.la" -delete || die
 }
 
 pkg_postinst() {
 	tmpfiles_process sudo.conf
 
-	#652958
+	# bug #652958
 	local sudo_db="${EROOT}/var/db/sudo"
 	if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
 		chmod 711 "${sudo_db}" || die
@@ -232,20 +243,20 @@ pkg_postinst() {
 
 	if use ldap ; then
 		ewarn
-		ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration."
+		ewarn "sudo uses the ${ROOT}/etc/ldap.conf.sudo file for ldap configuration."
 		ewarn
 		if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
 			ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
-			ewarn "configured in /etc/nsswitch.conf."
+			ewarn "configured in ${ROOT}/etc/nsswitch.conf."
 			ewarn
-			ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:"
+			ewarn "To make use of LDAP, add this line to your ${ROOT}/etc/nsswitch.conf:"
 			ewarn "  sudoers: ldap files"
 			ewarn
 		fi
 	fi
 	if use prefix ; then
 		ewarn
-		ewarn "To use sudo, you need to change file ownership and permissions"
+		ewarn "To use sudo on Prefix, you need to change file ownership and permissions"
 		ewarn "with root privileges, as follows:"
 		ewarn
 		ewarn "  # chown root:root ${EPREFIX}/usr/bin/sudo"
diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz
index 9d7376c761ba..c30ea305a355 100644
Binary files a/app-antivirus/Manifest.gz and b/app-antivirus/Manifest.gz differ
diff --git a/app-antivirus/lkrg/Manifest b/app-antivirus/lkrg/Manifest
index 26cb4b68e4f7..ce7ca98558ca 100644
--- a/app-antivirus/lkrg/Manifest
+++ b/app-antivirus/lkrg/Manifest
@@ -3,6 +3,6 @@ DIST lkrg-0.9.2.tar.gz 125976 BLAKE2B c3da2d4599c9dd5b7d6fbec426fd93d802715f6c85
 DIST lkrg-0.9.2.tar.gz.sign 801 BLAKE2B 0cd8b18c8a0fbcca61ffa868b406d048461ddf9189fb08f15faa45e01b8731906a6b14105dfcf92bb5124373860f6695594063ee8d138c94c70adf471bc15e0a SHA512 18b547ca84a7fd2957484857e17983408e92fd005d58b77b399c5156ecb09fc5e9e6c910337654a2655883d103098c1769b1993017eec753bd21e63d6491ad04
 DIST lkrg-0.9.3.tar.gz 127986 BLAKE2B 5d059247c9a8a5abe4795d22b3806544dbb4c332947012ec33ceace27747663375acf68a4e859fae293eead5f7d9540b4261d3fef149d1e5c6ee8714a2df28d6 SHA512 9b441b93ff28b733afc513643a5d843c1707ac5a05adb359a3142b9ca7cba6a4790ebca4f9e6ca88a6ddf61f2b06aa242e02f288e9295e74999ed534794fb45d
 DIST lkrg-0.9.3.tar.gz.sign 801 BLAKE2B c054522f281d09a008821f92c7b43b5384241100c68ef0b0ea7171b8c492772a5d668b425089e1aac990bf6a675215dd5861f3f2598995e31a8db82a8b2ec7e9 SHA512 87c2bfe8d342b85f3c6c8226be5b698527a507369603a03eefead89ea8635b5ba95f3cbbe1d84cd77ac42bb8a773a7133917e0c87132b4851ff4017f77bc683a
-EBUILD lkrg-0.9.2.ebuild 1026 BLAKE2B 6fb93f1537b995dc893095d87b8a40b531f39486ccfca6cb5f58a371ae4bd9d620757a5040d6697860ba48010952f1999b3fb26249c2f5be2ad0961beb80f169 SHA512 d69194399c394b528e51b4e9f2a63ebe80f92bbf6eca3208d43b51c3931975f1fc15eb3b0cc5e31c58895a2aeedf13ab2eab00a527c363eceec9b1940cc3facd
-EBUILD lkrg-0.9.3.ebuild 950 BLAKE2B c46caccc44282990b66c770ce56841c2add17460ef8b88a815bda53f13b11f8f3ac99ace0fc032ed9c4cec3d4b97fd3c6710f32b83f292da6ded47e6ed2ba52c SHA512 bf3a8844561dc7ecf24e89450cbdf4c50441cfe37c5f05319833a86136e63eddad54f1cfccd31acbba714889682e348dba166f6a7da29d35b55392082453f8b4
+EBUILD lkrg-0.9.2.ebuild 1028 BLAKE2B c1a49d95862433aa5defcf44feaa5357c983ca4edb49bc0b539a0ab604191f19b9b67115672c6f0b01e5572a47ac2b2d6f3f19d662b7d503e753f29ab02b5137 SHA512 6f9d9bd00296f8a6cd122c57b1e738a70c031c59888c8017a79cc7e3e4b3097e0592f9aa1a42baa9c181308bed6c141e337b6dbe97a62c2b4833ff53119b05f5
+EBUILD lkrg-0.9.3.ebuild 952 BLAKE2B d28b8a8b1cb5040250afbd0f8d33911b6ad07112759ee00cc9c8e06c885d8631f136a130c399246daa5cc673501864e326fa708f724f4b967329315864aef15e SHA512 9744b5e47787760ae12604d2da1b627a5e908061b0b845279ad5e610b5a9a2b6f18ef5c1523397cc87ca721a3715f6999b00ca1ff703fbfc507e0c95de88ef22
 MISC metadata.xml 326 BLAKE2B 01848278e317c44c65d36ffb73d68b87981796f69301447a32ea47f93bc1fda9ca82e7b8036310e733bf1f0ab67a4e31868e48e0c720023a016ae9f743b72f59 SHA512 afa115a36eeb4290c82de2be302f5432294beb26e3d4709de0c67df693694bcdd73573ca24b404493af492e958698c257f4b48395c29d4ab46a9796e871bcc3a
diff --git a/app-antivirus/lkrg/lkrg-0.9.2.ebuild b/app-antivirus/lkrg/lkrg-0.9.2.ebuild
index 05421d7d8ec1..17e26904008f 100644
--- a/app-antivirus/lkrg/lkrg-0.9.2.ebuild
+++ b/app-antivirus/lkrg/lkrg-0.9.2.ebuild
@@ -33,7 +33,7 @@ pkg_setup() {
 
 src_unpack() {
 	if use verify-sig; then
-		verify-sig_verify_detached ${DISTDIR}/${P}.tar.gz{,.sign}
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.sign}
 	fi
 
 	default
diff --git a/app-antivirus/lkrg/lkrg-0.9.3.ebuild b/app-antivirus/lkrg/lkrg-0.9.3.ebuild
index 92ead47afb71..465af99f681d 100644
--- a/app-antivirus/lkrg/lkrg-0.9.3.ebuild
+++ b/app-antivirus/lkrg/lkrg-0.9.3.ebuild
@@ -31,7 +31,7 @@ pkg_setup() {
 
 src_unpack() {
 	if use verify-sig; then
-		verify-sig_verify_detached ${DISTDIR}/${P}.tar.gz{,.sign}
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.sign}
 	fi
 
 	default
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 3ff246c54b9f..010b24f1d9b5 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/zstd/Manifest b/app-arch/zstd/Manifest
index f51ed94e3f22..d773b28c601e 100644
--- a/app-arch/zstd/Manifest
+++ b/app-arch/zstd/Manifest
@@ -6,5 +6,6 @@ DIST zstd-1.5.2.tar.gz 1950967 BLAKE2B 9d474e9fdcf7e5eb09d1f606712b05ca3001e8f6f
 EBUILD zstd-1.4.9.ebuild 1676 BLAKE2B 31a1c1f3b06f03aee1f79be98fd352ebc850cf763a5fca287810fae13042587d434e28f1826e0e86194bffeadb60704d9b36f0b0036aa72a51fa7be11257e814 SHA512 b878ad96130da9450c92597354335b294b24341c6ac0b8f236f9bcd55efda8c46f700f0571ac80822da34a5b854d463d02cf8707ea1e7b3b2b713a6f6924025c
 EBUILD zstd-1.5.0.ebuild 1449 BLAKE2B 1985dcc6336b6cb5617bc48a3d80400f3d642d281e098576c597b5e807cdacd2e738f66de94c58cef35a54f78f34eb21c77f4e5bd10a9f430d633f77c62d696e SHA512 31e0ab933fe30b781a1c0923ff4a8ab7437d95ee957e0b44e3d1b41687308ee6652ab13e4f490c39ec2b954bdeded743ac3642ebde9563a57d74d6dfa27c6e5d
 EBUILD zstd-1.5.1-r2.ebuild 1803 BLAKE2B 1309e5ea2c9d98ea1c496be3cc14b1ebc076577532b8622e787470fbc804dd1f225694431477aef8846c3a4283ac5697faa6a2eced78daf36607086d7cd6bb74 SHA512 9c953dae97b02decaa82090909c74bc3ad3c07724ccac56c348238051d4a671dddc29266c0b76828eb29924996acdd58fbb88ac1516b150569fdc1552827e8e1
+EBUILD zstd-1.5.1-r3.ebuild 1853 BLAKE2B 62ad656cd48f81489a3ff6dbab9f2f8eac4d26a248a7d3168282173d00ff73f109d393034f699e266d8850f5beb9ea7cdd1ce417a42c97d74d450fb7a0093da7 SHA512 d9ea1d8186852917a8159c2154d8aca748968919da6c312746ae22ff4818c90869bb2f0fc852056878620c6c182b2623a4089af8b1dfac58e519c1db1aeec9cf
 EBUILD zstd-1.5.2.ebuild 1456 BLAKE2B b1f0a313494d5025c9568bc09a4cc5c4caefc8aad0009ff272745541a97977fc812a69cd0ac05c8caf3a487d9cb51578e46e9446f9e9402448fd9227db6145d5 SHA512 445ca54ab352ff64fd6acbbc7e0a2e76ace9e4f55719efe80b304efb4e3da0e369e743f7516c22fd1e4d1611bcd38ea97624f7a874156e595f231b4e958147fb
 MISC metadata.xml 410 BLAKE2B c8c6cf3dc2e96b8d70bc199c8691f57fe43c561c3bdbeb71e49fc13f205bdf673e96e58d530b2e18c8ad2b99cd047ba5934437fda7828fe6ba177f5badc72a93 SHA512 3973ebd433d598c05023af411bbbb26b0f097d66e34c22fdcd31479ccc68c5a7bb318c29067a94de07ead566c5eec397d12b70a15d99e53ba08e6e9c999b61cf
diff --git a/app-arch/zstd/zstd-1.5.1-r3.ebuild b/app-arch/zstd/zstd-1.5.1-r3.ebuild
new file mode 100644
index 000000000000..83b2103a30b0
--- /dev/null
+++ b/app-arch/zstd/zstd-1.5.1-r3.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal toolchain-funcs usr-ldscript
+
+DESCRIPTION="zstd fast compression library"
+HOMEPAGE="https://facebook.github.io/zstd/"
+SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="lz4 static-libs split-usr +threads"
+
+RDEPEND="app-arch/xz-utils
+	lz4? ( app-arch/lz4 )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.1-respect-CFLAGS.patch
+)
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+mymake() {
+	# We need to turn off asm for certain arches (!amd64) for now.
+	# - bug #829849
+	# - https://bugzilla.redhat.com/show_bug.cgi?id=2035802
+	# - https://github.com/facebook/zstd/issues/2963
+	local asm="ZSTD_NO_ASM=1"
+
+	if use amd64 && [[ ${ABI} == amd64 ]] ; then
+		asm=
+	fi
+
+	emake \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		AR="$(tc-getAR)" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		V=1 \
+		${asm} \
+		"${@}"
+}
+
+multilib_src_compile() {
+	local libzstd_targets=( libzstd{,.a}$(usex threads '-mt' '') )
+
+	mymake -C lib ${libzstd_targets[@]} libzstd.pc
+
+	if multilib_is_native_abi ; then
+		mymake HAVE_LZ4="$(usex lz4 1 0)" zstd
+
+		mymake -C contrib/pzstd
+	fi
+}
+
+multilib_src_install() {
+	mymake -C lib DESTDIR="${D}" install
+
+	if multilib_is_native_abi ; then
+		mymake -C programs DESTDIR="${D}" install
+		gen_usr_ldscript -a zstd
+
+		mymake -C contrib/pzstd DESTDIR="${D}" install
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if ! use static-libs; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index f0836fe7aa9b..0502c0c07b30 100644
Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ
diff --git a/app-backup/tsm/Manifest b/app-backup/tsm/Manifest
index 9b634345b78a..e7832e749c73 100644
--- a/app-backup/tsm/Manifest
+++ b/app-backup/tsm/Manifest
@@ -5,5 +5,5 @@ AUX dsmcad.init.d-r1 531 BLAKE2B 840b6431f083df2da7f42d79a1b28a87ed3b90d497e54a1
 AUX dsmcad.service 224 BLAKE2B cb84b8616daa3649b8b29c58aa91fffbb119dfd1e84810ed61564fd45380ac792c89c20da1f8296f617467c411605f86a5cc2190d2135be771348c1d58b7c56c SHA512 e3572098abf5b2831d10a3b649337b5c9f1cd9fda4ed58844408b6fe31fdc68a3bbc197eab227f9808bc9ab4b4a7488c766aaa472e801d88631b6b8ec398eb45
 AUX tsm.logrotate 60 BLAKE2B bb367d3da53f8061d71e3753ab8c46595d5cf91485da920f032473a99d3241d22fdbe576cc99088c99e97c63d3f2af920d4602878830fb815a58dc8321d37a2a SHA512 2f412c61a21dbb2c69b2c12130ae12844787d998098de269da2b8a284c2ed86f7244c2854d7050f2a521b3fbe7239f1ec4339f3b434c67b9cd57980fe5de5a92
 DIST 8.1.13.3-TIV-TSMBAC-LinuxX86.tar 593264640 BLAKE2B 0dec77e87403f86aaf98b3dbc61c4dcf7a107d2dbdb1733ad97294669b122a202034928b6c83df931877c6cd08272f7920250fbd6262ec9f565afdc06dd42c2b SHA512 dac6b7f701e7fb8af49988da8df952c93879b57ea57daa88d4fff3c531423c73b24e89995894c041601faf1c33f115e5153461e2672254d9f29b65dd30c8ab8e
-EBUILD tsm-8.1.13.3.ebuild 7482 BLAKE2B 30e53b911e6413240a9b7541ef1899ea56c38a5eeaf172c138db11c53b25418dff0736ce3ad75ea3d242d7e112fd85c9dbc2952bc6a8e5751062b65f5455925d SHA512 51c51183f56769e62e800c1067045786c9661130bceb6bcb1cfd8bc7f3a151a04d828e2c0c50ec1d8551809f00fea38e7a7bfefe612332715109f4bfadb2f862
+EBUILD tsm-8.1.13.3.ebuild 7492 BLAKE2B 1d0f834cb55185a89ffd0077d05124a675af1a109db971a85d2790f1cace017ea32d2c840c984feff1cb9800b186333981e3b020d1a8c5a388b262d0ddfd73d2 SHA512 f49f0510c705450854a0fe4804c608ac1174af92eea99600cfeec5b0c066141c63e8ad809f667ce55a29173675088d10844e1a5e050586187bbe25f4209af16f
 MISC metadata.xml 399 BLAKE2B 286d9d8e3c94ff45959b763044b769441b4cca5bfc85640f364da79726288578c270c0f52027465eb94f7358fb702b04a69f0996af90efe0e10bc4b90df9d2e5 SHA512 564b638560a6d38bb606b06731a6e5790daf5c91498015cc30000192d588fcec56c18c688955eaf09072108d31c28446c3c73c12165fb7cb8989592681cfbec5
diff --git a/app-backup/tsm/tsm-8.1.13.3.ebuild b/app-backup/tsm/tsm-8.1.13.3.ebuild
index 0a2ef217d050..a7fb3824f621 100644
--- a/app-backup/tsm/tsm-8.1.13.3.ebuild
+++ b/app-backup/tsm/tsm-8.1.13.3.ebuild
@@ -181,13 +181,13 @@ src_install() {
 	keepdir /etc/tivoli
 
 	cp -a "${S}/opt/tivoli/tsm/client/ba/bin/dsm.sys.smp" "${D}/etc/tivoli/dsm.sys" || die
-	echo '	 PasswordDir "/etc/tivoli/"' >> ${D}/etc/tivoli/dsm.sys
-	echo '	 PasswordAccess generate' >> ${D}/etc/tivoli/dsm.sys
+	echo '	 PasswordDir "/etc/tivoli/"' >> "${D}"/etc/tivoli/dsm.sys
+	echo '	 PasswordAccess generate' >> "${D}"/etc/tivoli/dsm.sys
 
 	# Added the hostname to be more friendly, the admin will need to edit this file anyway
-	echo '	 NodeName' `hostname` >> ${D}/etc/tivoli/dsm.sys
-	echo '	 ErrorLogName "/var/log/tsm/dsmerror.log"' >> ${D}/etc/tivoli/dsm.sys
-	echo '	 SchedLogName "/var/log/tsm/dsmsched.log"' >> ${D}/etc/tivoli/dsm.sys
+	echo '	 NodeName' `hostname` >> "${D}"/etc/tivoli/dsm.sys
+	echo '	 ErrorLogName "/var/log/tsm/dsmerror.log"' >> "${D}"/etc/tivoli/dsm.sys
+	echo '	 SchedLogName "/var/log/tsm/dsmsched.log"' >> "${D}"/etc/tivoli/dsm.sys
 	dosym ../../../../../../etc/tivoli/dsm.sys /opt/tivoli/tsm/client/ba/bin/dsm.sys
 
 	cp -a "${S}/opt/tivoli/tsm/client/ba/bin/dsm.opt.smp" "${D}/etc/tivoli/dsm.opt"
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index c7836cb22f5a..1a86e192dc5e 100644
Binary files a/app-cdr/Manifest.gz and b/app-cdr/Manifest.gz differ
diff --git a/app-cdr/dvdisaster/Manifest b/app-cdr/dvdisaster/Manifest
index c52595900c25..bca66585861b 100644
--- a/app-cdr/dvdisaster/Manifest
+++ b/app-cdr/dvdisaster/Manifest
@@ -1,4 +1,4 @@
 AUX dvdisaster-0.79.5-fno-common.patch 538 BLAKE2B c50640bd957b1545fde6692920c4fd1a1877a0da6f03aca61eb03e8b0c2e4af72b82c8a9b4f769ab45f0627f9537b70ec188eb5f4f3a57168c9b3024770a9a60 SHA512 0e2c1dd7b48553975df2f3c2d56c811a489aae8dd65a3f57a544eab7c01d9b9022c1574d92a8210a1fef0fc8f44948509c6abf19d64bd3b871c1dc480c25b71f
 DIST dvdisaster-0.79.5.tar.bz2 8224726 BLAKE2B 443816b550a627ce1998eae71c6524c17105c7253af1e1591eae06055d342afc4457b847c53bfb857793676fc50ca9c5c7f33dafaf541c92e84f149a2987d632 SHA512 8630d4389983307afc3faa5b4256f531ded370f84ec35d4a363853dc7d79e5e15ee0b81bf64f4b88f57fe6176537df8195f83acf23e770d991c700b7408dd1f5
-EBUILD dvdisaster-0.79.5.ebuild 1860 BLAKE2B 4ada7e92304ba60c31e6e06d2e4868c78112b3ae63ab0c31a0b84c4d80b43893c10646417caf7c680cba5fb131023aedff4e89d906568209c39a86388ccd7ae5 SHA512 27b5b0dc6247cc37f217472d15aa79f18dc759be57c0dcc22646074f4fb2546f46ed8e0ebced43cc0bf688a1121788eedd314ba1eeba22785741364d74ee27cf
+EBUILD dvdisaster-0.79.5.ebuild 1862 BLAKE2B 815d7b978a5bf865e203e9f4409e0b8cd64474fc3f685f14c250649584707c1334218163fcecb57fba9fc008858e94ab7619ea603d12390b1176980112e6de04 SHA512 8070b6ab2a63fc46f8e7bce98381d8550cf8801dc12970735c056805bea1a8680713da952ef9a1879f5d0dd509297f9fcbae1ba1b614b73559bc6206d8d80bae
 MISC metadata.xml 564 BLAKE2B 1018804dfac0c3a5cb5ba5ce8ba0f4d691707a2b7b51427a75e1002a27508116b18cfbcb05d43bcd3a58e84b24b90026c0d680ca62f43eeb8e3232415ae87218 SHA512 98a02e5d60eb480b0351e0b20c8014be50dd513bcfc9e6b4ff22900f377e40d4d431cab04c3b36fc7152810d1a436167b853f5e3f1963c315aa54d82a68ec8f2
diff --git a/app-cdr/dvdisaster/dvdisaster-0.79.5.ebuild b/app-cdr/dvdisaster/dvdisaster-0.79.5.ebuild
index 242cffbb8bb8..d94b33064532 100644
--- a/app-cdr/dvdisaster/dvdisaster-0.79.5.ebuild
+++ b/app-cdr/dvdisaster/dvdisaster-0.79.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -78,5 +78,5 @@ src_install() {
 			${dest}/man/${dvdi_lang/-/_} || die
 	done
 
-	rm ${ED}/usr/bin/*-uninstall.sh || die
+	rm "${ED}"/usr/bin/*-uninstall.sh || die
 }
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 41976efbc560..ed2c2fd82741 100644
Binary files a/app-containers/Manifest.gz and b/app-containers/Manifest.gz differ
diff --git a/app-containers/docker-compose/Manifest b/app-containers/docker-compose/Manifest
index 8de3538bd6e9..696e34e8fcef 100644
--- a/app-containers/docker-compose/Manifest
+++ b/app-containers/docker-compose/Manifest
@@ -1,16 +1,10 @@
 AUX docker-compose-1.29.0-setup-py.patch 1858 BLAKE2B 9a53ffec0449fe1fa110b21617bc3e804829625abc6205f10962f568acbdfa7c38ffeec7e7feb0fe585b95555ff786223b3a7c24e960738cea0dfa7803be3f59 SHA512 66a25230e8d7f294c7baa3053cee508623d85e8453eb758f7f80aed9416aef9018c8878e9c0db6b96e657bb450508d442d6b055e11e80996ef3aba276d98fe63
 DIST docker-compose-1.29.2.tar.gz 320320 BLAKE2B 2d1a6375127fa09661822f7148665161b45bbd234c93444ae31c1d926513fcbc9fb845f8af01d8f11788f24b7517bff5f6cea2a5da9ade897891f2dd728f26bd SHA512 09f2ae2ae7a17ab5fb3e22580f7a80f1a8253f7ad9fc8f29aca432911bcde46ed22030ff3073cdd7eff3d55aaba17f56e628a178ec05c3a9b4f28495d6045111
-DIST docker-compose-2.3.3-deps.tar.xz 486283624 BLAKE2B 1bb2f743ff0ee46e4b5790bc53fadd03ff9cf177c4bd8f28f435eae7f00ceecf475d78cf0a80082066a62c4e97022afaad2b13ac3bb04893914f84b0a756a2b3 SHA512 9ca0dacabe66620108c8017d5ca2bb7fb568b4edb23460d528f81ad9491dd04efb192983a590db965c26781429cba5c6be6eaa91ac51e9a7d8e6ee4adb9b4c09
-DIST docker-compose-2.3.3.tar.gz 270143 BLAKE2B 9ab2863a37402ebcb881797e1d6a170dd9557d14a8174dec4049b55f6f3c106752423ac13d9e2ec1bb95dab83df83e53747519f4ceed91f7d9a5805c630e82e0 SHA512 5986f4f54302fd552c7aeb0cdfbe8d5185744bc2a2fe6f136e1a4009b3b9f68cf7578d3b6a2acb2067ef9a889eb33d159b2daf80140315a29412bda15d2a5446
-DIST docker-compose-2.4.1-deps.tar.xz 110605892 BLAKE2B 042d84818b963c23769e039a930076355cb2ebb2d86c5f8af56f240689012ae7aeff12cf366b46f2bf0fa0799d5f7b825f726686f54db218787e91a6c308ba5f SHA512 28bb292daac3ddf1055c4dd5f0b1920dc8145636e878beaac90863fec8b86e277f6906d82753b62fc7c9f755a9246c223307fad5fb412e41c0ca11b4d60e7e0e
-DIST docker-compose-2.4.1.tar.gz 274404 BLAKE2B 346c9c527630217fdeada28e7329400a910007c5296cf4b8b7f41d90049c51c54c518f82f602b71332d9ecd91eeb65e1135aa18c37fe98ee02b99238cf7dbadb SHA512 0c7611c95955b63a4cc77a4498393c52c7107a4a6fe950dbf2d1181df8f44f682337eb6cc7814e9902551b230507b12a05d1377acac7b2342f829401f1d24651
 DIST docker-compose-2.5.0-deps.tar.xz 110626568 BLAKE2B 657d4d421172a6ba3516475045af50ef2351cc847933a799b7232ad6a46485d7961ad5875c9f19bf96d39adf275ca943d02fba2b939a210c080c6d38211e56f5 SHA512 231416474c6b3f73911bc7cf344ea5bfdb719cecf6ad7b159c755814df08ffcb60d05ccbdd294211cb7f64a52a5a81e2dfd357bdc10738918d47a75909d20bf9
 DIST docker-compose-2.5.0.tar.gz 274812 BLAKE2B cf3b49cc13a8ab37d6426e78f4d9fca9a7b629346d292458e32ca2b66d20ba49929cc354d570b05deec3a0e0ac7778a02045ea87070059fc20c352f2d2ddb589 SHA512 7b556394e58dcdd49229c608d0672fe1aa5bd0b715f49b4b3e2ecbea16cc4962deb7e816ea057a8a565c598c21207316b8f7b5e41f0af0c3f330054ae81c2703
 DIST docker-compose-2.6.0-deps.tar.xz 110634424 BLAKE2B a63f67babac39bb3cc01cdf1a6db24d6612f0d1e9d41eb4d60e83153f3acc5f096cc323a28cba8ae7ff0e43c18b10427cf80a235e8d3463827487d479ef0db3e SHA512 d3001fda9da5523594d684db4f12c85c41a4b6e64d7f97b774d0d3ce68c7c301d466f7a4e2a1c9e17b23fca124b6fc253746255919b5212f7bb6d72d3bed85e5
 DIST docker-compose-2.6.0.tar.gz 277387 BLAKE2B e4ca8d614a8ae860dcda77e3b655ff6a8f4af8b4c77e679cdfe256053ac6b0bbbf77a92f2ca871a6d95120c2bbb54093979f816be3c367ff59e355e57fe063d8 SHA512 df8402f0f827b7c1defbb7d0b5037ea38db98337d8ebc4756f0316cf55e368e6c61401fb0d000e1942e0878d5ce1870b0f2a3217ac4b34d1e5f4c3aab68832fe
 EBUILD docker-compose-1.29.2-r1.ebuild 1915 BLAKE2B 45e984d2f7c8cf249187355bc2503a1b17642f1e87b0a308779ec027187ed9b700413f2c814880c6618607a3531c766086807b4a9a3021f6695453cc6074cb1b SHA512 37375b33f10219740a7f26b2af9f246635ac9196e17b1bd82337341afcdc21eebedceae1c32139f7c54eaf96b3cfa7a2f25c632a4d96b2a10708e80f5ec1cca1
-EBUILD docker-compose-2.3.3-r2.ebuild 1242 BLAKE2B 48e1062372861a1707356495b38ebdf3818a946538f1798016dd187969cac14c88a4c2e268f13f4178be10a65ef4d3cb1d2fbfb58e6d39ea6c4ed8bb03cf1727 SHA512 ba6439a3d2e6f62ae36a780a7c421d0316e2d70e0bf5327bbef4aa27ed9cdc0da0537b05416480fcce01dabf871245ef4f70176ef1503ccb20a4d4f791bb3cb9
-EBUILD docker-compose-2.4.1.ebuild 1242 BLAKE2B 48e1062372861a1707356495b38ebdf3818a946538f1798016dd187969cac14c88a4c2e268f13f4178be10a65ef4d3cb1d2fbfb58e6d39ea6c4ed8bb03cf1727 SHA512 ba6439a3d2e6f62ae36a780a7c421d0316e2d70e0bf5327bbef4aa27ed9cdc0da0537b05416480fcce01dabf871245ef4f70176ef1503ccb20a4d4f791bb3cb9
 EBUILD docker-compose-2.5.0.ebuild 1242 BLAKE2B 48e1062372861a1707356495b38ebdf3818a946538f1798016dd187969cac14c88a4c2e268f13f4178be10a65ef4d3cb1d2fbfb58e6d39ea6c4ed8bb03cf1727 SHA512 ba6439a3d2e6f62ae36a780a7c421d0316e2d70e0bf5327bbef4aa27ed9cdc0da0537b05416480fcce01dabf871245ef4f70176ef1503ccb20a4d4f791bb3cb9
 EBUILD docker-compose-2.6.0.ebuild 1242 BLAKE2B 48e1062372861a1707356495b38ebdf3818a946538f1798016dd187969cac14c88a4c2e268f13f4178be10a65ef4d3cb1d2fbfb58e6d39ea6c4ed8bb03cf1727 SHA512 ba6439a3d2e6f62ae36a780a7c421d0316e2d70e0bf5327bbef4aa27ed9cdc0da0537b05416480fcce01dabf871245ef4f70176ef1503ccb20a4d4f791bb3cb9
 MISC metadata.xml 544 BLAKE2B d515d07ee7d2045db1d4a2a0e8f0e797e23b01dea7ab164d9bffc85bc00ddc18a050f296db0a80df8a65c9c554d6e189218a1939b07b29ea823e5eea65d803e6 SHA512 17c3b4e7be1318a36aa744e185d7f7d5571107cecc98eed8fce07b4d905273409b95a202129440082f29be57d6a44eabda43730e8f47cc7c63c04d6d0ed05645
diff --git a/app-containers/docker-compose/docker-compose-2.3.3-r2.ebuild b/app-containers/docker-compose/docker-compose-2.3.3-r2.ebuild
deleted file mode 100644
index 3946a436a4be..000000000000
--- a/app-containers/docker-compose/docker-compose-2.3.3-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2018-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit bash-completion-r1 go-module
-MY_PV=${PV/_/-}
-
-DESCRIPTION="Multi-container orchestration for Docker"
-HOMEPAGE="https://github.com/docker/compose"
-SRC_URI="https://github.com/docker/compose/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64 ~arm64"
-
-RDEPEND=">=app-containers/docker-cli-20.10.3"
-
-S="${WORKDIR}/compose-${MY_PV}"
-
-src_prepare() {
-	default
-	# do not strip
-	sed -i -e 's/-s -w//' builder.Makefile || die
-}
-
-src_compile() {
-	emake -f builder.Makefile GIT_TAG=v${PV}
-}
-
-src_test() {
-	emake -f builder.Makefile test
-}
-
-src_install() {
-	exeinto /usr/libexec/docker/cli-plugins
-	doexe bin/docker-compose
-	dodoc README.md
-}
-
-pkg_postinst() {
-	has_version =app-containers/docker-compose-1* || return
-	ewarn
-	ewarn "docker-compose 2.x is a sub command of docker"
-	ewarn "Use 'docker compose' from the command line instead of"
-	ewarn "'docker-compose'"
-	ewarn "If you need to keep 1.x around, please run the following"
-	ewarn "command before your next --depclean"
-	ewarn "# emerge --noreplace docker-compose:0"
-}
diff --git a/app-containers/docker-compose/docker-compose-2.4.1.ebuild b/app-containers/docker-compose/docker-compose-2.4.1.ebuild
deleted file mode 100644
index 3946a436a4be..000000000000
--- a/app-containers/docker-compose/docker-compose-2.4.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2018-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit bash-completion-r1 go-module
-MY_PV=${PV/_/-}
-
-DESCRIPTION="Multi-container orchestration for Docker"
-HOMEPAGE="https://github.com/docker/compose"
-SRC_URI="https://github.com/docker/compose/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64 ~arm64"
-
-RDEPEND=">=app-containers/docker-cli-20.10.3"
-
-S="${WORKDIR}/compose-${MY_PV}"
-
-src_prepare() {
-	default
-	# do not strip
-	sed -i -e 's/-s -w//' builder.Makefile || die
-}
-
-src_compile() {
-	emake -f builder.Makefile GIT_TAG=v${PV}
-}
-
-src_test() {
-	emake -f builder.Makefile test
-}
-
-src_install() {
-	exeinto /usr/libexec/docker/cli-plugins
-	doexe bin/docker-compose
-	dodoc README.md
-}
-
-pkg_postinst() {
-	has_version =app-containers/docker-compose-1* || return
-	ewarn
-	ewarn "docker-compose 2.x is a sub command of docker"
-	ewarn "Use 'docker compose' from the command line instead of"
-	ewarn "'docker-compose'"
-	ewarn "If you need to keep 1.x around, please run the following"
-	ewarn "command before your next --depclean"
-	ewarn "# emerge --noreplace docker-compose:0"
-}
diff --git a/app-containers/grype/Manifest b/app-containers/grype/Manifest
index 23da2596cd58..de4cf7c7e0f3 100644
--- a/app-containers/grype/Manifest
+++ b/app-containers/grype/Manifest
@@ -1,4 +1,7 @@
 DIST grype-0.36.1-deps.tar.xz 671469268 BLAKE2B 227b76230e45851c0980e80c1299efca2299e196b2f9432d8dcbaff9ab08c545f7e64fdc8c88ba79392d3e3d0067f03155ace14473aeacc65da7909d7d3fe4cb SHA512 432ed203febeeb26db4d50a9bb1b95bef11c91e0335e1e75b7eec68484a2f5e5d9ff6f84b05ced703519d2490723adeaca6009efd18647f0a8d6ce515727c4dc
 DIST grype-0.36.1.tar.gz 1028910 BLAKE2B 70327fdbb1426537c623f7e8c8c286cfba336454e129166bbda6ff19403a4e6ab260ad2136e00acf8a76aab4de6073ae4c28614c0ab5c7955c14f07c124bc833 SHA512 299d440bb96a5092173a8baa42e80bf5ea4f90663ba50241f6b0d7a2f75d94496dc91eca78c3d4341f68f7e874223d49a7663146f7e20db8cac15ed65a8650f9
+DIST grype-0.39.0-deps.tar.xz 632583420 BLAKE2B 5fab5394d2f48200d9c1a59f7e12abf1be875ff8dafb237b86239d8acaadc76395e7e1d4ab38eed8c82f88cc71adc1659cdd60274c1721ebdf8674483102f9e2 SHA512 cd4492180f3f7008d0247c47069b187ec4e18f3167efd71eaf9dadf9f4c3a370463df48056db850f7d0bf7dbbea5e8d14e7966f219c615479d26827ad3aeb719
+DIST grype-0.39.0.tar.gz 1026121 BLAKE2B 1d9063e0752732af7c6364be65fdaf915730695d2cbeeab080a1b06b2c056ad4716c5355b51c8aa3c19baed7dd51318c0c5b76b5709a740e0151c5734e951de0 SHA512 a8ad6c5b1918804adcd2d71a2defd0557e6acd876342582f07673224723a86834937d2e94f6f61fb9bc9304bf560b407648b8d9997ead66f7f4bf3738ce5c0e5
 EBUILD grype-0.36.1.ebuild 511 BLAKE2B c1cf14d31e5d8bf842ce01048f0f3e9813e19e16d39222b3ae485134418587dbef88eaa5122ab37e693b635e0336835449aeea430df8fda7dac8b116e72b5c4c SHA512 b5f79ba354cc9db9dccff1c3e5b87be41924d5fc07df36b85a4fa20e65b04f9b473d0742620ba9238fe92644a8ff2a67c16e62708e6fbf11d690f205e8319dec
+EBUILD grype-0.39.0.ebuild 511 BLAKE2B c1cf14d31e5d8bf842ce01048f0f3e9813e19e16d39222b3ae485134418587dbef88eaa5122ab37e693b635e0336835449aeea430df8fda7dac8b116e72b5c4c SHA512 b5f79ba354cc9db9dccff1c3e5b87be41924d5fc07df36b85a4fa20e65b04f9b473d0742620ba9238fe92644a8ff2a67c16e62708e6fbf11d690f205e8319dec
 MISC metadata.xml 243 BLAKE2B 63665ae2020bc799fa6ebd6e1fca6755be6498803fdbc17cc630f9f4ffa03fbd46a9ad396e70adc3bc1c32b0a746fe4bab1c6291f32e68e636251207bca9e95c SHA512 78eab20831018fcf4957171a83aaaca9ced53380e01f083c07450c30fa1adfc02dd50ff2fa9f491dd62802f6e779264add1c47a09ade0a35cda558c1d5529ad0
diff --git a/app-containers/grype/grype-0.39.0.ebuild b/app-containers/grype/grype-0.39.0.ebuild
new file mode 100644
index 000000000000..c98fb9fd7f0c
--- /dev/null
+++ b/app-containers/grype/grype-0.39.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="A vulnerability scanner for container images and filesystems"
+HOMEPAGE="https://www.anchore.com"
+SRC_URI="https://github.com/anchore/grype/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_compile() {
+	ego build -o bin/grype
+}
+
+src_install() {
+	dobin bin/grype
+}
diff --git a/app-containers/lxd/Manifest b/app-containers/lxd/Manifest
index cdfac0efe6b6..339ae7a7a66c 100644
--- a/app-containers/lxd/Manifest
+++ b/app-containers/lxd/Manifest
@@ -7,6 +7,6 @@ DIST lxd-4.0.9.tar.gz 9117078 BLAKE2B aa6689c1e958258484fba5c060765dd71d5406cb43
 DIST lxd-4.0.9.tar.gz.asc 833 BLAKE2B 7cd0d3ab518d947ca3ea6dc804c6a59b592e4e568152c078fdd3c102420bcd94d2f0b2c335b8b4ecdb19dc3c9a10f665a1510903f395247da956717beaa172a3 SHA512 79a4111571ab43e79cf669e416ed50f3ccae0fbceb86d73757d23c778035e827f47643bc87ff6a2fc64b095345a3d53cbd0c4eb245c75364e907d7449f3a0886
 DIST lxd-5.0.0.tar.gz 17706199 BLAKE2B 5559bdd479e03b43407e58aa240a00dae488cbf799cec39cbe74b636c907d247341132a49b414fa573c5d5d366643d296522efb6d71c1c0f83cc8edc038f1432 SHA512 e74c14a2642ee4ea738629b1da9c4b416f3bdbb26a49c8c920eb0e5e0467236fd610276541af1d481d6b069093cb1c35c705008652ff2cd55d2d15e9b7433696
 DIST lxd-5.0.0.tar.gz.asc 833 BLAKE2B 7e8fc6f6892294fb8a6384f5767cb74b0a4b941c39da3b097c2196b328fb4f0b1816c46adae0bb343022bd558e77612ab3d93884053c1db5f7c1067c13444fb5 SHA512 d3d583175437cee37b6d7d8d137ab1440dd6ac1c91200616fe68e5f38197f11ab2ed85f1aba06dfb0d32f88153defb2bb3f897601902e66fe0a5eff6042e57c0
-EBUILD lxd-4.0.9-r3.ebuild 4797 BLAKE2B c4f8ffeb61409755e72101fca16f3b0139d05c6a6bd32a996d3c598beb7967d6d360415322b266cb4f111d64a3ff5562ba83ffb9067ccbce4c820f4bee0de8dc SHA512 4a4cb538b84a0ac24edea79370c48c44e737bd2e74dd450fb15c075654a7b1651c06db207378a1bcc2a1a2a90e5f7a7c1e6607d3bd7dc7f9d30af124887b41eb
-EBUILD lxd-5.0.0.ebuild 4820 BLAKE2B 2871188908e797abf423a52a6d5f05d091cc930bc82f4167309ae6e04acc28c7a5f11d2a3f75caff629df1d461a5a2807f099788422e6d5160629493a8e16ff4 SHA512 69acd4636591aaf1aa6c7a12728eae5235e3e42bc2624b55a3336d0f75a9fdd28a05bfee7e9c01e24ecabb824431516e9350b5eced021e0125a5d31d530e4d29
+EBUILD lxd-4.0.9-r3.ebuild 4799 BLAKE2B 89e600bdd7ecf304d02d34a5cf061c9120c322f8dab895c8b4edc4ff7ddf97d6ef8047461631b0cd4997ff3c35b54e05a14eb435d8cd7d26ef223e0f343a93c1 SHA512 f7d7b7889238b7ee8d957855421965c6f5ae4128144d709b8b36461593952317eb4c673ed3a8844fd2ee181d69ffc72407d37df456c13af026625a06c7cc1c04
+EBUILD lxd-5.0.0.ebuild 4827 BLAKE2B 7b598644b60abb3cadd890d229b10a5e7471e2d9154c2470de1b6006122123af182ea5ec296d2103f64ec24208d3b774ecaeaec9e3f49fad67d4ba5ce14f5046 SHA512 03bb5431efd54d86f1dcb9b7a2c302ca5490c22d2744247f7dc5490b67a7c93baefd89964c7a06d1d8fb7d3f6439c0eb9926c5c63a8e5c4cddec3c0950ffcaa9
 MISC metadata.xml 777 BLAKE2B e25ff2ac780143763e40917f2570bbe8244c2a2a9eac1a9761199e7ea19df9863ade968ca8218f62da9fe41f3b9e7110ef86abff764c2a3d85f02ae102951a16 SHA512 e39a06e8b838990a9b0019f52e1d0c7dd83527c6a15bc8a14f0aa9fec2ee86c914de52f1ba48e7a586c3866d9da46dc32c2d6e1ea3e2c42ca985fdfe0783b40c
diff --git a/app-containers/lxd/lxd-4.0.9-r3.ebuild b/app-containers/lxd/lxd-4.0.9-r3.ebuild
index 094ce154dee2..781b306647ce 100644
--- a/app-containers/lxd/lxd-4.0.9-r3.ebuild
+++ b/app-containers/lxd/lxd-4.0.9-r3.ebuild
@@ -125,7 +125,7 @@ src_compile() {
 		go install -v -x "${S}/${k}" || die "failed compiling ${k}"
 	done
 
-	go install -v -x -tags libsqlite3 ${S}/lxd || die "Failed to build the daemon"
+	go install -v -x -tags libsqlite3 "${S}"/lxd || die "Failed to build the daemon"
 
 	# Needs to be built statically
 	CGO_ENABLED=0 go install -v -tags netgo "${S}"/lxd-p2c
diff --git a/app-containers/lxd/lxd-5.0.0.ebuild b/app-containers/lxd/lxd-5.0.0.ebuild
index c8b54efd4968..04dab07a5718 100644
--- a/app-containers/lxd/lxd-5.0.0.ebuild
+++ b/app-containers/lxd/lxd-5.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="apparmor ipv6 nls verify-sig"
 
 DEPEND="acct-group/lxd
@@ -31,7 +31,7 @@ RDEPEND="${DEPEND}
 	net-firewall/iptables[ipv6(+)?]
 	sys-apps/iproute2[ipv6(+)?]
 	sys-fs/fuse:*
-	sys-fs/lxcfs
+	>=sys-fs/lxcfs-5.0.0
 	sys-fs/squashfs-tools[lzma]
 	virtual/acl"
 BDEPEND="dev-lang/go
diff --git a/app-containers/syft/Manifest b/app-containers/syft/Manifest
index d2a075bfca99..edb42105cde1 100644
--- a/app-containers/syft/Manifest
+++ b/app-containers/syft/Manifest
@@ -1,4 +1,7 @@
 DIST syft-0.45.1-deps.tar.xz 619145524 BLAKE2B c39ce29edb6820ff620f2d25b564084b2328f24cd453aad0cfed3a799768ff5e18f6de2fd11d981c544b6f377bb8ef64433158c71cab63c184587e648ab6bae0 SHA512 f734266b51956543e2aa94b62d47abeb45fa63de31b4f2d2d6e084b2c9233a1a0dbd36890523f54836d4e341c6fb38c3a2a0aca775a8ce2ca2bf3672e7dfbd72
 DIST syft-0.45.1.tar.gz 3826388 BLAKE2B 9600f44d4d0390c2cda422ccec04ab8f27165ed00cb031dfc441e21a156f5abfb1e63ed26bbc5795b074d2b8f578486624f8a88c87248a5c70a02268d728bbf2 SHA512 938af62b5c9d724d206db98174892bede409f4bfb9199d636cf3cedfa605cc79f2e4d9c2b49868e4f9ac1ab64d05b42849d15c9f28bf4c7a2b531449f346ef85
+DIST syft-0.47.0-deps.tar.xz 631564724 BLAKE2B 4eb6dedb2173d5dda214b4bb450fa6e85c1946ee8388064d8a7beb3f9fd4589ede95069b1ade378e04320326f012af155375b67c9502026454d4b97cb5183be6 SHA512 e2d0ff159be544a525a9628ad698499735073323e6b91531c636bc6ca15acfd3ee0625b87abc76dd74eaceffd912f98845c0f4126a364672414fac29cd7b3af7
+DIST syft-0.47.0.tar.gz 3846983 BLAKE2B 2833b360de24fc8c5ca2073bc776e2d33f8c78d7d25f8a622e8420b528e4c517c1298c1479d916a2a90b97cb44f1b5e407a9dc2a09016e7ccf6238d0050eb696 SHA512 997d6e7139be8c686ee38df9fe42fa50dac17e522c51db005628cf3fd6a97ef9f9758e86fe6c6e58a199d852bc4eeac88b3932c5f3847547382987cd02260551
 EBUILD syft-0.45.1.ebuild 530 BLAKE2B 9a8b225c4678c1f27a2cad3895b414bab798026339df7286117e5dd3c623da6f1562544c4ce9c145227266be9ff63a8fc4feb9de6cbb5b1665d63e64dad5e94d SHA512 ba9108a193c2f925f2b8f68ac2f546cc7f05e72d4ea5afe0aa52be90bc8ae869c375d9dc811fa336bbe9c2fa9c843001218890e85473d27c0c7044d8d151a236
+EBUILD syft-0.47.0.ebuild 530 BLAKE2B 9a8b225c4678c1f27a2cad3895b414bab798026339df7286117e5dd3c623da6f1562544c4ce9c145227266be9ff63a8fc4feb9de6cbb5b1665d63e64dad5e94d SHA512 ba9108a193c2f925f2b8f68ac2f546cc7f05e72d4ea5afe0aa52be90bc8ae869c375d9dc811fa336bbe9c2fa9c843001218890e85473d27c0c7044d8d151a236
 MISC metadata.xml 243 BLAKE2B 63665ae2020bc799fa6ebd6e1fca6755be6498803fdbc17cc630f9f4ffa03fbd46a9ad396e70adc3bc1c32b0a746fe4bab1c6291f32e68e636251207bca9e95c SHA512 78eab20831018fcf4957171a83aaaca9ced53380e01f083c07450c30fa1adfc02dd50ff2fa9f491dd62802f6e779264add1c47a09ade0a35cda558c1d5529ad0
diff --git a/app-containers/syft/syft-0.47.0.ebuild b/app-containers/syft/syft-0.47.0.ebuild
new file mode 100644
index 000000000000..2c42d972b97c
--- /dev/null
+++ b/app-containers/syft/syft-0.47.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="Generate a Software Bill of Materials from container images and filesystems"
+HOMEPAGE="https://www.anchore.com"
+SRC_URI="https://github.com/anchore/syft/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_compile() {
+	ego build -o bin/syft ./cmd/syft
+}
+
+src_install() {
+dobin bin/*
+}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 8577248023b1..d69164dc8d97 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index ef12b7aedabf..3b1eb4e6bae3 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -6,6 +6,6 @@ DIST gnupg-2.2.35.tar.bz2.sig 119 BLAKE2B d95323703c12c9474b21fa91ddb70d4d4d464c
 DIST gnupg-2.3.6.tar.bz2 7604761 BLAKE2B 6cbc749156c50b6633c126cde621271c6c9682a04efea51fbc5a2e92ee56493e8348814391ee0c337adcb4de4dd23293b9592db78998626905038c859ac4af6e SHA512 4540e8d2be836b491918f4987ba301a73fcdc4539b1f9abf6112a74c2d39c0e5dc3f17511212bac1dd7fd0594feecd91f95ecf78d4b2c1e70e818342a1802b85
 DIST gnupg-2.3.6.tar.bz2.sig 119 BLAKE2B c7d4cdc81580b8b1e56c7bc83236d65c9d2c1bab2d210d14a0d3c58f635d656c9b449ef9596b9601027cb891bd437cc8f2a63eb3c17742c288531511984fba7f SHA512 85d155f9809c8d0f38723d8622c085e421531c016d19fcce2ae34dc9a4aeac0bc1895f7a094ee9cdf69a15b426fb0d72ee53319fe0a05665c92caa0e950c1797
 EBUILD gnupg-2.2.34-r1.ebuild 4981 BLAKE2B e5b17c8ba84a9d809fb1554bfdf70c08dbe90c75a2a04108f17c51cb9ba72c29249320a99ddae50896a2b51bbb0369047ec3155a1f9b90fdf89f3e9760bcc776 SHA512 5a4cd0c8340f2d5bef91c607a36e00879da1ff7f5793644c0d1e1a1b2392b070afc20cbfc135f8e86360b39754560a9a47b0de8d6963e2a222c42576f17a9b15
-EBUILD gnupg-2.2.35.ebuild 5063 BLAKE2B 9d8ecd6145745b3b824297593e93e3c49c6ebf7e4d17d7342d9898beb21b1232ee4dc411478eed7f434d9fedd2766815efb7ef144ee29edb043681246b74b9c1 SHA512 3b51a826be0adc1fe11be8c6e2a55ca98f9a79faca774876f4131ba835c5e451f14081809d245feaf15012797f458b08b8ed2031f37101495fad3d8eb65ada66
+EBUILD gnupg-2.2.35.ebuild 5055 BLAKE2B b5be9e19cafb6e6a65aa219df93d818e0d298da4bcb961ca45edb5208df23cdac21cd8b11da22ba822ea31f4ac66157a32ddc7fb65a1cc82e2ebbd488d7be38c SHA512 25099e0c5880d46d1b89bb387a28cef5f70311ca89c7b78a155cc08dc9ef4107ba70de87d49d26a3dea1a9b67f6dcdae7a8dd7478d250277389c9520e77a3fc7
 EBUILD gnupg-2.3.6.ebuild 5232 BLAKE2B 0d5a372da5867eef0a78cb46050281e7d1ed5385b6bdfd0a4df9ba5cefabf92f5cd7c363b1f5bebe7919e0114b258833be39a41f3c8b0f6b370239123d0ae3f2 SHA512 eb8b033a34b9cb2509213cb03f1c1c47a823e3009ff334ec294037fd7236ccc0a90eb035849ba7e03feb7c562997c12edf805d83be08d93616c299953009e93f
 MISC metadata.xml 1297 BLAKE2B 2d1b2b6f7e6fdf5b73797347e9a3bf7758f1efc86e53d0d0f4b2c0012152ebc50630ff4f3b2c965063f608cf03b3da2794978a3e3659957970d91d3a735ad604 SHA512 0e9f3d5255ac70d6a08b251bfd20f13ff25f63e763ab9385924fb2cb5ac233b0ae97cc43e8a2d950b9662f088ef65af87f9af4dbb355e122e3fcb118bee1c0de
diff --git a/app-crypt/gnupg/gnupg-2.2.35.ebuild b/app-crypt/gnupg/gnupg-2.2.35.ebuild
index 82ecb4aefb55..eb852eeed2d9 100644
--- a/app-crypt/gnupg/gnupg-2.2.35.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.35.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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="bzip2 doc ldap nls readline selinux +smartcard ssl test tofu tools usb user-socket wks-server"
 RESTRICT="!test? ( test )"
 
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index af42c6ba509d..113a4118b24a 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -5,6 +5,6 @@ DIST gpgme-1.16.0.tar.bz2.sig 119 BLAKE2B abf363142f67a005d1a4c13c2d3d944d0fd449
 DIST gpgme-1.17.1.tar.bz2 1747692 BLAKE2B 44cf9309cbad038f23aa7c5c77fd85be23faf3d8e1eb7abdb87a737ad1ade1ee269a95ce618dba327bbd06e6f4b2a91e2446744ee08f09ea6fb3b2dad44431c5 SHA512 e6399c3de1e430e38f2692bf5ec0c02ecb36ea3dbb56ff29dc3a438a5be4900a77a0559dc5b673dc1ffbff5e7f589e548e19176b2644fe8f63e00c6b9181b920
 DIST gpgme-1.17.1.tar.bz2.sig 119 BLAKE2B 31832424c0e029dc520d3302a71b086d9fcb044c74344cc0fb4b6c6a02d0dd840e62e7eb60acfaf004e6f3650d58436b58e645ef2a50b948ecaf3ca162bf577a SHA512 e1a4213d0d39f2efd0d5c007a0449c76bd650e76e002a9acb673eef0579912db06d844df11a4f7cb821e1d8468d2d6c1303f1c5d915a5c3c9cb5abacfbd004fc
 EBUILD gpgme-1.16.0.ebuild 3034 BLAKE2B c807335ac78d88b1170f57b3c4eb771b8dd78b02ea54a8df4aaa062334d3a430459a274ddbe7977c3e1fd66995582a3e30dc2e3deceefabc05db296afb51822d SHA512 06d033131be2310cc8e96b5e3b65ec3cb6f70c9f01fa35ea57ffb97b95c80237bbc27b4923d2e9a99b0c94f779a50a89b38c30ce31fd5684f7a0ec7db2bd378e
-EBUILD gpgme-1.17.1-r1.ebuild 3345 BLAKE2B b303d5f1dbee1f2d904e2f4c0fbeef5963889435aa9352ca643d886d3799e9a0698966d580a1c0471868121f776816cd9a4a76f722ee20de5ca89d75df535550 SHA512 42d284914ce6e2a1b685a7672c5c7d362804e7673d9ecc17f24ec474db5251bde1b8197d683d2231ec49dc73c82aee82a6c4d53722f35002b71cacffdbf9cec2
+EBUILD gpgme-1.17.1-r1.ebuild 3341 BLAKE2B 7f4fb1892c57dfcaa4606f20fbf9f84ed5b8e7f8285705912834169d9ee630f5cc689a3b84382ee3c67f7815ee2c41fe4241edb5d1f253a4ade94c821abac15f SHA512 87781f49e123141e0cc338d0483ed89a67c4b96a85be28ee7cd6709a3a969e10818dbf7e77909f118ca350dafb36446054fb5deca40f2fab4f10fd2461497ffc
 EBUILD gpgme-1.17.1.ebuild 3332 BLAKE2B c6d069cf0243e546825e645c34b8b34dc7f1d15ed8947a6a228981487ea5ed97d55dc38eb9dc8d9f8bb7a3d1ed49698697fe7bd3805e9e17ee2cb4bf1f51a009 SHA512 b3e23d0d942d73450fff126857e8a3a43a4e1b355fb883770fe98dd72e001ce6ea0977a99a14a396c4267a41b63711be2ff37c0884c6acc3335049f3a38e6eef
 MISC metadata.xml 333 BLAKE2B 6dd18b63ec1f7656ab8bd705242bec45d7820db8be31f326172cad400711e6d7268c156d6b81facfdfa79118c04728ac910a8f8de36a11454227a1399235a582 SHA512 21b8d7bf3f14b5ab7e2ea587027395cdd881ecddd5a4f70237cafc70dc904b396a33f70dd7ef37519df5a204f4e3a89d9ea6ffc221df41bd9cbf23e69863f12f
diff --git a/app-crypt/gpgme/gpgme-1.17.1-r1.ebuild b/app-crypt/gpgme/gpgme-1.17.1-r1.ebuild
index db83c2548bf2..97be2b8de1b8 100644
--- a/app-crypt/gpgme/gpgme-1.17.1-r1.ebuild
+++ b/app-crypt/gpgme/gpgme-1.17.1-r1.ebuild
@@ -19,7 +19,7 @@ LICENSE="GPL-2 LGPL-2.1"
 # Use e.g. app-portage/iwdevtools integration with dev-libs/libabigail's abidiff.
 # Subslot: SONAME of each: <libgpgme.libgpgmepp.libqgpgme>
 SLOT="1/11.6.15"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="common-lisp static-libs +cxx python qt5 test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-crypt/libsecret/Manifest b/app-crypt/libsecret/Manifest
index dfbad42ad852..29179655f33a 100644
--- a/app-crypt/libsecret/Manifest
+++ b/app-crypt/libsecret/Manifest
@@ -1,3 +1,3 @@
 DIST libsecret-0.20.5.tar.xz 187340 BLAKE2B cde5094eaaf54f251c19afb015c39cc88435dafe6ee682ca8f9d1917dd5b3dc8cc1609cdbf2a3a42d2592c2a149bec5fe28b2f4ec179b92c0d0f07d2f14c1792 SHA512 61ca248aafd265e1f31d56c9084c68d880ebf03660ace3d4a6c6622ab306b56e921ac24647b6a60633bfa99c8a0407d4ae1aa6148511f289bf5ce2025b72692a
-EBUILD libsecret-0.20.5-r3.ebuild 3712 BLAKE2B 921c2a83db92b607313c862b8a46b4b76092aff46117e7d5bafa6e11270dd9dacef298850e3d3928e10678ef5f5e862b272a3d63d62fe713779be57be77cde0e SHA512 2d30b78566d30245bd302ee7fbbc64f5d598d7a9c7196dda160a1a6bbfad12a4d3faf7a373cef64c54fa22c7946668eba6f9f53377f3ff59279d08ee21812c54
+EBUILD libsecret-0.20.5-r3.ebuild 3714 BLAKE2B 47abd028419ab7e1006740e343f01b634ebd358edb59f231f38bb504108ec36d268230027284ab092d6dfbd090d905b845f7b9b30f3de09750010f7ef41feca9 SHA512 e28093adb9b27d778c31fb059699aae9d03f80b615dba6b2ad45571243d4650207e74a265c8ab7c448a77b8ce7e45f0db550546a42c4ff7df3c860bbd76e16d0
 MISC metadata.xml 368 BLAKE2B b1730ea71fc0ee02e7971533562f7bbf0e0479304c22dbeb13a4620dde8083031cffa63077ac5dc725de4f17c4a826df2cd6091d378682d04e9cab2f3072c97f SHA512 b5a3db4438a1a98846c2e24b269966b7d9fdbe7419f7a169557a16544ba1846b470e0835720d039bdea56d8cf02667cc6435169029f9ef40365cb4642a9a3b04
diff --git a/app-crypt/libsecret/libsecret-0.20.5-r3.ebuild b/app-crypt/libsecret/libsecret-0.20.5-r3.ebuild
index 97b3dc565112..bddb8f0cc181 100644
--- a/app-crypt/libsecret/libsecret-0.20.5-r3.ebuild
+++ b/app-crypt/libsecret/libsecret-0.20.5-r3.ebuild
@@ -72,7 +72,7 @@ dbus_run() {
 
 tpm2_run_with_emulator() {
 	export XDG_CONFIG_HOME=${T}/.config/swtpm
-	${BROOT}/usr/share/swtpm/swtpm-create-user-config-files || die
+	"${BROOT}"/usr/share/swtpm/swtpm-create-user-config-files || die
 
 	mkdir -p ${XDG_CONFIG_HOME}/mytpm1 || die
 	swtpm_setup_args=(
diff --git a/app-crypt/p11-kit/Manifest b/app-crypt/p11-kit/Manifest
index 15384f286725..4dfeacba3386 100644
--- a/app-crypt/p11-kit/Manifest
+++ b/app-crypt/p11-kit/Manifest
@@ -1,5 +1,5 @@
 DIST p11-kit-0.23.22.tar.xz 830016 BLAKE2B 4e1edfd9e2441d237c07a16c003aee5ffde38f1cf545c26e435645429f2cfa4fe7ca61cdc3c3940390aa040ba991f2ee3995b14cc31bb886d5eeffa8ed5e1721 SHA512 098819e6ca4ad9cc2a0bc2e478aea67354d051a4f03e6c7d75d13d2469b6dc7654f26b15530052f6ed51acb35531c2539e0f971b31e29e6673e857c903afb080
 DIST p11-kit-0.24.1.tar.xz 838304 BLAKE2B e5cb98881279199e2674e2ff4f12d72c4d126c54429ee7ece6dd56ad1987f84abf58a67b8bf2405b19a5bca9d1106f8ec901364ac3d2488f65b3f92b51f850fe SHA512 8cf170c714bb9e0cf3df93e8ec55b8e3c55cabf2c6a27f177ac6de8b8028985df2ca0216d3215d6828dc2ae3095c4e1a4febe8cb26b88ec321defc66bb011e81
-EBUILD p11-kit-0.23.22.ebuild 2008 BLAKE2B e2c6140ad7266ed68c605c3fd157776bca69900f8f123d6a9c469ca8877099a809bc92b99a9e57605e75940955c52e0de5794b68f9e2865fe58dac0a540d875f SHA512 be9bab7ce91c482bdf6d6413573926bebb77b987b5a8a620b610347d07bba36c502e7067d90e8e1bbb9023aa63c706c0929fec30e957a590675f97ecc2046839
-EBUILD p11-kit-0.24.1.ebuild 2023 BLAKE2B e6651ca25841b0889b8b4ad09fc4acb1d7c7cf0a8c93b65d328016324f857e7969882017b49c77464b785d152318609f5159bce50054f03fecf8df34f24a1fa8 SHA512 c94907529b0623cd3c812be604d324d7c04b2409536d962920d46459fc262441f470aa9b2314046106c6bcbecd54f567993aa415ad13a7c66f35480b1c4a0e7a
+EBUILD p11-kit-0.23.22.ebuild 2010 BLAKE2B 0a5fd2558221b3bf49b43550b55db0844f743a71362998c5fef7edf7e6e997388bbf2b39df1cca795df74aa47753757396a7290306ed69ba0bfbd36fbed6664e SHA512 2093e6b8b09fc075161d9db832f6436f4f44501370ea5dd5f1d5a19765e88853d1dc6ac75f1c42cc99d4f5947243f8889c0acea05c6dcd22df6c8509e10c3c0d
+EBUILD p11-kit-0.24.1.ebuild 2025 BLAKE2B 4bc37118a60aee8333efcfb54faa09e2c0a7a1c5821d42d02c0208ef602591d317ed9d896b69678252c645f8bbf5b492d87fb3e5398f2e9e22478dd718a27ce6 SHA512 9da02113a73c74ba8e1192e93dc3ba22d3bc5505c28999a409d15302b8529a90cc95c8f2441fac4f6667e323209230e4a6c34f0c2186ea7f63d6ae2987689d85
 MISC metadata.xml 462 BLAKE2B fa827cf8466907f22be017b9e86f15dff3107e681db7d799c09c75ce4ba5a3f2bde34e925945646b13c8a20973ab85884075810201720629f3868066832a8bab SHA512 e142dce54418ca0be110b2a1826c2234cada11110c5c0f8c6699f34405640cd8334638e9c35e1ff765cb2a68d40207cea01d4ba041fac3d8ba183ec1c18f062f
diff --git a/app-crypt/p11-kit/p11-kit-0.23.22.ebuild b/app-crypt/p11-kit/p11-kit-0.23.22.ebuild
index d8fecbda2389..5285fb5d5e15 100644
--- a/app-crypt/p11-kit/p11-kit-0.23.22.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.23.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -44,7 +44,7 @@ src_prepare() {
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf \
 		$(use_enable trust trust-module) \
-		$(use_with trust trust-paths ${EPREFIX}/etc/ssl/certs/ca-certificates.crt) \
+		$(use_with trust trust-paths "${EPREFIX}"/etc/ssl/certs/ca-certificates.crt) \
 		$(use_enable debug) \
 		$(use_with libffi) \
 		$(use_with asn1 libtasn1) \
diff --git a/app-crypt/p11-kit/p11-kit-0.24.1.ebuild b/app-crypt/p11-kit/p11-kit-0.24.1.ebuild
index 94d342c7b28b..91ee0171c43a 100644
--- a/app-crypt/p11-kit/p11-kit-0.24.1.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.24.1.ebuild
@@ -44,7 +44,7 @@ src_prepare() {
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf \
 		$(use_enable trust trust-module) \
-		$(use_with trust trust-paths ${EPREFIX}/etc/ssl/certs/ca-certificates.crt) \
+		$(use_with trust trust-paths "${EPREFIX}"/etc/ssl/certs/ca-certificates.crt) \
 		$(use_enable debug) \
 		$(use_with libffi) \
 		$(use_with asn1 libtasn1) \
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index ca21bdc83fff..d9e043f3b37b 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/featherpad/Manifest b/app-editors/featherpad/Manifest
index 4bb5d654d71d..36d9cc8f70c8 100644
--- a/app-editors/featherpad/Manifest
+++ b/app-editors/featherpad/Manifest
@@ -1,7 +1,9 @@
 DIST featherpad-1.0.0.tar.gz 1010200 BLAKE2B 22a11a0655ed57f7a7d53949e59c3b989a304b7c3db1f7308af0a52cc00a151cee505b02c19ece286da1be37e76c8874cee4102db3d881ef2c4ad48ecbb2f20a SHA512 9f7e24fa5e89e269693bc0a37f79d987e4914dde2d2b46bd0385886383dab8b35556fbc0f5c5b7b9a2c3a41694174ffa8532c48def87d2972fbc73c1e9c38bf3
 DIST featherpad-1.0.1.tar.gz 1014744 BLAKE2B 1525b0894e47facdc51da0c6417d69b12d630bb0e6e8d7b3916b0c4e82380243b1b4dd0ddf82f7954d83edcd7b30346cff0305d98296b4aeccc1fe3cab325cd7 SHA512 8d1a07f8f32f63ec77e6bff8a39badd1eef87b0675096f964ff2fa770dda7c79ec9a1f788cbfa77528163aeb6c6067ca74e009293eca2e718dce92a48aef5f98
 DIST featherpad-1.1.0.tar.gz 1061070 BLAKE2B 78c7ddf0b7961a300fe2e425876bfaf32a1186eb88c2619202cb2f07a780aed3c2f8d1ced0e963b1868c94e890d1d809baae534fe1f3d06b3f3036aeeccf7414 SHA512 c734619ea8eda2709ccfa4d1b3c2ac541f32d52f31f0896ddf3c1c5733f175da9d955458a62a34221400a73003970cf796f59cf574b499831267b6f4d1a28d21
+DIST featherpad-1.2.0.tar.gz 1091776 BLAKE2B f63ddcc8bf02b3f9ad5f6ad2b56b8f99cc8566f70351a293fbe339930b41542e9ba27888afabfcf98a04ec6a1087dd77aa35006ea33526e1a7d6c45f5fe3b7d9 SHA512 cf21ed9394444920fcf3a8ce3a8338814d69322389c4652e79f0754fe67ee61260f81604c91adf0a864fb1441307706c60ee1bd29efd2e617ab8e1f5fc254cdd
 EBUILD featherpad-1.0.0.ebuild 758 BLAKE2B 65419f5390e095a0e67ac4b60beb278fc5e390ab61c78bafd3a4c17c8eae139511d3203853aa5b054e8c71e1233d583cecf8a67250dea4ff635969f9ec6b4798 SHA512 ba15e7b6ea2b02da544bf346752f5d1bcbd3ec732b62abcd115079d329593d114a510fe401e2172ffefa299bd57ca5f78ed0f09592ab5a53908465e155eb51b6
 EBUILD featherpad-1.0.1.ebuild 758 BLAKE2B 65419f5390e095a0e67ac4b60beb278fc5e390ab61c78bafd3a4c17c8eae139511d3203853aa5b054e8c71e1233d583cecf8a67250dea4ff635969f9ec6b4798 SHA512 ba15e7b6ea2b02da544bf346752f5d1bcbd3ec732b62abcd115079d329593d114a510fe401e2172ffefa299bd57ca5f78ed0f09592ab5a53908465e155eb51b6
 EBUILD featherpad-1.1.0.ebuild 763 BLAKE2B 53acb0884d81da49e51ef6012e8e64e9f8ba009117b6ac83aeeac3a0c8ae4e421d0f2ca73faa86e8379f4c1471daeaca417c8f38ab1495732a1e6d22607c892b SHA512 407e8dc0667213f8c6bad387fb4b0102047ac39b05768fcfe8a7ee5c58aa2dfe5e7b74a064c3a1a2f27172a41f423367becaa8412435a44c39cb352903b72fd8
+EBUILD featherpad-1.2.0.ebuild 770 BLAKE2B c7f29009e12a6f7d6db402ebb44539048425333d52d7f2a06f60825d2abbe1d664036b44abeada9d8630de90754d05736a3e1e407bd4931fbb34ef7f7611b11a SHA512 5e2e341eff0a90ae49cf1638c862711a628ccb6e59776e954cc0ba8f80c53094e325d3b19e240dbc4c15f19b036f660faf2c4924de75a340569993dbada0eb16
 MISC metadata.xml 829 BLAKE2B d6d60de9902f49b8f04e15818d2da71a30e9b54fa6c73245eabf33bdfcbbb193f017e0b3967512578bd538c7ac718b26276442e411fe934a75873fef05fd3a67 SHA512 218c520af75da8a59b2b75cf2d4dbaa3f67c63620afe69221c854c2e5815518dc1514cffe54e57e4bca29529d99b95ca83a7879713552b9e0635aa27069f500e
diff --git a/app-editors/featherpad/featherpad-1.2.0.ebuild b/app-editors/featherpad/featherpad-1.2.0.ebuild
new file mode 100644
index 000000000000..e82070d4a429
--- /dev/null
+++ b/app-editors/featherpad/featherpad-1.2.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg cmake
+
+DESCRIPTION="Lightweight Qt5 Plain-Text Editor for Linux"
+HOMEPAGE="https://github.com/tsujan/FeatherPad"
+SRC_URI="https://github.com/tsujan/FeatherPad/archive/V${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/FeatherPad-${PV}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="+X"
+
+RDEPEND="app-text/hunspell:=
+	>=dev-qt/qtcore-5.15.0
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	X? (
+		dev-qt/qtx11extras:5
+		x11-libs/libX11
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITHOUT_X11=$(usex !X)
+	)
+	cmake_src_configure
+}
diff --git a/app-editors/ghex/Manifest b/app-editors/ghex/Manifest
index 4ec4107922b8..b5161a4ab38a 100644
--- a/app-editors/ghex/Manifest
+++ b/app-editors/ghex/Manifest
@@ -1,4 +1,6 @@
 DIST ghex-42.2.tar.xz 1003120 BLAKE2B db44dbb7c2cb7447dea3dd48a1ad90ee75c6ce5b9c76178550be1f638f63a9748144e8aac7434d526c24c3eddd0c6f7c0178c6976d2a11e32e943127b7f09219 SHA512 d7c64013d894d1803e03b1afc025a3f39fa65d156aaf7885e692b2b10574f320fb329abd8059a9c084c701a655d7708b8f0dec09f8300c8491fc75a66b475bf7
+DIST ghex-42.3.tar.xz 1003928 BLAKE2B 26bb123fc5a56fc2ff891a057ac276a36bc500a2e23f29bd26a85d6888035e2b8af7aed7f7b679a898c0a98bf042bb4e05c66e55a8fac0eb63422ee03823dc74 SHA512 9eff44892d203a2a9aab7239d85f61a860458fd7a8b4d7410f94d4f596ca5e2ff269faa81e620e7fc08bebe40c819a4c0cafefb5278121a9f2c8885bfd17c59f
 EBUILD ghex-42.2.ebuild 1141 BLAKE2B 4115c3ce3a4d786dbc56b9d25f529306c6d9e1495dd8d8fa5544c494b2ef5c83c24935ec1de544bc0937320f80470eeb02624a7a091dc09c811ad39fdae8ed30 SHA512 ddcd5e958f36b07a77a08a57a0f63be8755047427881b1e306c28a7b2a0e92bc36cf31a32e9b88d0f070b13034f93e9e6042545fbd9d7b089a09fa3026da5ea4
+EBUILD ghex-42.3.ebuild 1145 BLAKE2B 099778e4549aaa45647450e023553a1d81e0136aaaaf15102f994b8bf175f90b32810d7fde0ac19207d5eac0f1562a859a3d059e638bf6bbaa3538dee4d070ed SHA512 9a479828bf3fe8588c2cd90bb235338d286cd5f4a2cb5e4a6d05a2119b8c0d8622e8a483a2deabea8f5b2ca929bd0b49c3aadff0953ce3378012547b89862729
 EBUILD ghex-9999.ebuild 1133 BLAKE2B 292942cc63824ecc03559a0fa8cf8151fa28996cf9ee167fe76df7d8a65209917b93ab23d99e0232de494140448d0e5db59f3ebda252e9efddd8ff547fde5173 SHA512 3b18ffc6c3ac5ea2db326e140bba172ca95809a4412f508e56a39f4e2d30315331cc31c205f137d414a3900e56ff88c971d12ec85f318804ef470454cc66f1df
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/app-editors/ghex/ghex-42.3.ebuild b/app-editors/ghex/ghex-42.3.ebuild
new file mode 100644
index 000000000000..60b2aa480d88
--- /dev/null
+++ b/app-editors/ghex/ghex-42.3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="GNOME hexadecimal editor"
+HOMEPAGE="https://wiki.gnome.org/Apps/Ghex"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/ghex.git"
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-2+ FDL-1.1+"
+IUSE="gtk-doc test"
+RESTRICT="!test? ( test )"
+SLOT="4"
+
+RDEPEND="
+	>=dev-libs/glib-2.66.0:2
+	>=gui-libs/gtk-4.0.0:4
+	dev-libs/gobject-introspection
+	!app-editors/ghex:2
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	gtk-doc? ( dev-util/gi-docgen )
+	test? (
+		dev-util/desktop-file-utils
+		dev-libs/appstream-glib
+	)
+	dev-util/gtk-update-icon-cache
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Ddocdir="${EPREFIX}"/usr/share/gtk-doc/
+		-Dintrospection=enabled
+		$(meson_use gtk-doc gtk_doc)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-editors/ghostwriter/Manifest b/app-editors/ghostwriter/Manifest
index b8119687057e..60c4a84b3e4d 100644
--- a/app-editors/ghostwriter/Manifest
+++ b/app-editors/ghostwriter/Manifest
@@ -1,5 +1,3 @@
-AUX ghostwriter-1.8.1-appdata-path.patch 811 BLAKE2B d3feb82a74d27484c56e5f05818f8f78914cd269700457deef69854fe8158d1e4068393c7b57114093450f7b347d26e4b143fc426bf5b66e0997f5ee94382276 SHA512 8e015c55dd1905dabb7ddcb06cb8a05e93bf8bdeedfb2002f2568232382871e65251ebfeda632e614e9a090372dde10fb468002459d50641847d4f97c9b789de
-AUX ghostwriter-1.8.1-qt-5.15.patch 550 BLAKE2B 2c0d60746273f851f94677c0f0dd8b14f4bc4ab24d59605855cd5ad8570b30b8d4bf92a2bcfe32825a19b1c2b39fee4bf783affc75bc6ecf0c516cc95a731ebd SHA512 2bc77bd62a9d6adbd5eb1cfd40b1893fc2b6f2c321db228e0b22f4cf85a3c09634c3b5fa15c7a9fd25fd7071012efe636f69065776abc51c9ed920920f2feaed
 DIST ghostwriter-2.0.2.tar.gz 7802654 BLAKE2B a52a96ba6aecb8c6b8ff565bd9b3b7622d15ae68af5e393da4f1e1c8dae70a8053228e302e87e2530c907be825df5e7eebc7de14bb23e0e46f4b4308b9ae6e63 SHA512 1e51b86b8afae41c47e5e7ec96752d356dd9dca8a44d1aab6a541e1ce188cb40add52f96a52da7a689df47a2e7a9a1dc7211f480c3456f4a11c81f80e2779a7e
 DIST ghostwriter-2.1.3.tar.gz 7725244 BLAKE2B 06e868bdc599cfb1fd9b7ab18b571ba4c401a401efa1189cacf8faec076041d579e1894b93bf1a7bf0bf9b823d40fb498b535dc0be4e0d5c4b24a578db7bf5df SHA512 ce7192caa0100d7264856193bd1fb765b8f4307146f7b3828875f4316a9bcc7d61b94768a01beacfab23631ba24b385aab1be5b72d309153ceba92c84081be30
 EBUILD ghostwriter-2.0.2.ebuild 1125 BLAKE2B baa0bb57907e8eedff6c2bdea151181ffeaf0a7ad923bb30f6cd671a2e9bea2d0361af3a0678d197325c60f7a8660443e379c74b77fcf30043316adb92075bcf SHA512 86c1c610cc58b226218f3665ac0bca122e3e41051659808a3154ec60b493e3d2dcc010a8a243058f547bedddbf5bebb2b997d975e1bea5bc98104c38a2a33bf7
diff --git a/app-editors/ghostwriter/files/ghostwriter-1.8.1-appdata-path.patch b/app-editors/ghostwriter/files/ghostwriter-1.8.1-appdata-path.patch
deleted file mode 100644
index 514ab6262e5a..000000000000
--- a/app-editors/ghostwriter/files/ghostwriter-1.8.1-appdata-path.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 5e63fa9cb6d4020413db071ed68aa85f3e79fd9e Mon Sep 17 00:00:00 2001
-From: David Roman <davidroman96@gmail.com>
-Date: Mon, 9 Mar 2020 21:42:58 +0100
-Subject: [PATCH] update appdata path
-
-The previous location is deprecated
-see https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html
----
- ghostwriter.pro | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ghostwriter.pro b/ghostwriter.pro
-index d399fb5..7f5f22c 100644
---- a/ghostwriter.pro
-+++ b/ghostwriter.pro
-@@ -264,7 +264,7 @@ macx {
-     desktop.path = $$DATADIR/applications/
- 
-     appdata.files = resources/linux/ghostwriter.appdata.xml
--    appdata.path = $$DATADIR/appdata/
-+    appdata.path = $$DATADIR/metainfo/
- 
-     man.files = resources/linux/ghostwriter.1
-     man.path = $$PREFIX/share/man/man1
--- 
-2.25.1
-
diff --git a/app-editors/ghostwriter/files/ghostwriter-1.8.1-qt-5.15.patch b/app-editors/ghostwriter/files/ghostwriter-1.8.1-qt-5.15.patch
deleted file mode 100644
index 0f7425ff35e7..000000000000
--- a/app-editors/ghostwriter/files/ghostwriter-1.8.1-qt-5.15.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From f8f4ec0a1b53d1f3e670817f051c59444851cf7f Mon Sep 17 00:00:00 2001
-From: Jakob Gahde <j5lx@fmail.co.uk>
-Date: Tue, 9 Jun 2020 10:30:44 +0200
-Subject: [PATCH] Fix build error with Qt 5.15
-
----
- src/MarkdownEditor.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/MarkdownEditor.cpp b/src/MarkdownEditor.cpp
-index c5e46d5..c103173 100644
---- a/src/MarkdownEditor.cpp
-+++ b/src/MarkdownEditor.cpp
-@@ -30,6 +30,7 @@
- #include <QUrl>
- #include <QPixmap>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QFileInfo>
- #include <QDir>
- 
diff --git a/app-editors/gnome-text-editor/Manifest b/app-editors/gnome-text-editor/Manifest
index a0535e45b12b..edc2ede6155b 100644
--- a/app-editors/gnome-text-editor/Manifest
+++ b/app-editors/gnome-text-editor/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-text-editor-42.1.tar.xz 1131572 BLAKE2B 8d1b59131d8230af0dc9e3029798f1200b6a00f8991e912c34ce4808ca5517e14763825aa8ed7aecdac88e422e9d224d3c027282f6373c023c4ffe9f3e4896b6 SHA512 4616750d15d61b2bd2c708e414b564d0aa6c1202c765fbb895e60cdb46f8335fbefa70a24e8d99f208b186f2c8c244b752475cefdbe0184a67b60de116d5ac2f
+DIST gnome-text-editor-42.2.tar.xz 1168504 BLAKE2B 0bbd02fab92c3ac2df2a38352561dda27662b4ede30d9cfd05b54d58c4dc4824375ee427e764415dc450a2f8dd793ba539e5681df984a20b1d121bd97a3f3008 SHA512 4373b048118c7a4253fe99a6ec6091c054154399d34e5a33f933d535f0e6c659023603e08e1cbcddb972d6385632b2b9351455eaa1398dcd7c50b3b4562400ae
 EBUILD gnome-text-editor-42.1.ebuild 1034 BLAKE2B 529a22dedf22189af0f29a43f858cf45a85407ebe0a2e3381d0822c482c3106ed306f9d566615fce747114f002d1b7ef723a22e3858a5cb8fb26b9dd21e47447 SHA512 a42fe9bc4648c8f32beb360c20531ca0df19055231467214280b50390cb22463f4b2683d12d67a22400544753fa801840ac38c45a732914ac5c845d8b60384a8
+EBUILD gnome-text-editor-42.2.ebuild 1035 BLAKE2B 9acfd1099bdcf2f61b276d6022449e7b48aed1649395ddb40afbf23660b853023f7eb3f4b4361dfbe85e2f6055e88220d61e1556403959f18eeddc16c19bdd38 SHA512 372fccc9cd4c7ae22081b4ea1f7a09e999f364844951c5e555df05268661001d16ce9f19e10a30058e2c941d33410e7d544b62ecf1c16f13a3c382019fc12380
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/app-editors/gnome-text-editor/gnome-text-editor-42.2.ebuild b/app-editors/gnome-text-editor/gnome-text-editor-42.2.ebuild
new file mode 100644
index 000000000000..979bb30ca006
--- /dev/null
+++ b/app-editors/gnome-text-editor/gnome-text-editor-42.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="A simple text editor for the GNOME desktop"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-text-editor"
+SRC_URI="mirror://gnome/sources/gnome-text-editor/42/gnome-text-editor-${PV/_/.}.tar.xz"
+S="${WORKDIR}/gnome-text-editor-${PV/_/.}"
+
+LICENSE="GPL-3+ CC-BY-SA-3.0"
+SLOT="0"
+
+IUSE="spell"
+
+KEYWORDS="~amd64"
+
+DEPEND="
+	>=dev-libs/glib-2.69:2
+	>=gui-libs/gtk-4.6:4
+	>=gui-libs/gtksourceview-5.4.1:5
+	gui-libs/libadwaita:1
+	dev-libs/libpcre
+	spell? (
+		>=app-text/enchant-2.2.0:2
+		dev-libs/icu:=
+	)
+"
+RDEPEND="${DEPEND}
+	gnome-base/gsettings-desktop-schemas
+"
+BDEPEND="
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.21
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature spell enchant)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-editors/mg/Manifest b/app-editors/mg/Manifest
index e3b8d0c2077a..391eeafe68fe 100644
--- a/app-editors/mg/Manifest
+++ b/app-editors/mg/Manifest
@@ -1,5 +1,5 @@
-DIST mg-20210609.tar.gz 156850 BLAKE2B ed8061aa808a8570f24198fb32fa3d24d66decdd07dab871502456d734a8d7867f384122361294bda0155bc3fecea80983fd41c00a2ffe02d00e380bf94e2f43 SHA512 a17b470e5e192c1f62700c7b78b15c9403b25528a7d6603fda0b6e618196150329fe4889cedfc8dbf621053d45b78294ed5c2766604aaa4c3ddbaec545693043
 DIST mg-20220212.tar.gz 157828 BLAKE2B e3219efffef9c4da05965a0ed7a0f0bfdf5c34d607d25102a4d2ee9de6f9b9fd2da59050c6e56d1712875b2d129408200dde4c7305ffb2208c11b5d722b87270 SHA512 093736521e4bcaeff049594793474b9710e4cfe6db151032dc4413614566afce80db5b794dcf10082020dbb73f25742a0c7d49f45b6b4d2caa6865b20a9e574b
-EBUILD mg-20210609-r1.ebuild 1076 BLAKE2B e95ab621ef87cf6869a7ea5c16a2d13abeba717e683bfbce223be3c98f6debe22433842a754eb5732d596156faba388409e56d1ec0c7c3e748b455715b453ecc SHA512 6bc32e8cd88edee04db05e5ac2294879e6a7910511af007c5f07d547ede761a5d82b3faa87c387621900b42ddc43a0f3ffb57fa4902cfaa8f43ff867c2d9f15b
+DIST mg-20220614.tar.gz 157904 BLAKE2B 88141274b379c6117158f85d91d0d643709437f0292fe2f82569c33d85694b39f957e279e262839ef0ba2a7e81e8a9ad6512c621e68f42b0929805028898637a SHA512 bed455cda856e54fae28592ac0a520841d5d542880a7405dadf702d7407ac33ae7fb7b63880805a7e166e0e0a87c76b9fca1700c444f1b999a5af66732c69b65
 EBUILD mg-20220212.ebuild 1041 BLAKE2B 094d5fe311dc0f70b7c8263392e65ec43dbad838807eaf0c6675f789689d542da20831fb15a6a4575881cfc244f57f0eb0804096f322efb1a456fa9be0eb2e84 SHA512 2362878519045fb10dbeeeb6bdc27451e7173958b9cf22c9fcb9c4418fbd96eb6e0b53410f1a9cbe9f316c28906294bf17af9f0ced31f4cc1b2e152da508b0a9
+EBUILD mg-20220614.ebuild 1046 BLAKE2B 7af22f31ef51d1e69849a3b1717ca175ab5230442b5d28dfd591015cef13d22ddc5ed32b64395c9c85fbc1efc2f2e40c68d77ebd7f0af50b29f5727bef5e5ec6 SHA512 98863e7332a0d568c0b777ef38d8aeba989280c59c15bc9a66635722637d50cfc250b6e1bc3d5d5f1be158cc74dfdf4d931a7b51e29b0f934594e36c472e1564
 MISC metadata.xml 692 BLAKE2B 773199bfa6d52ed22a9c6567296e65e53263602562ae26d5ab33ab3f201edd8c4606d4bde7377b599a911f3f3b4dd2c9a5fbed9c5e499256d78ea7e89ff8d5c6 SHA512 1543f3ae91a1e2fb85e7b2e637ed886bcd5a62c4594d403ca79202eab594aff3c94e3d06117cca5cccbe828ff01bdce1683b96e76ecae084db8fa4547232ad9a
diff --git a/app-editors/mg/mg-20210609-r1.ebuild b/app-editors/mg/mg-20220614.ebuild
similarity index 85%
rename from app-editors/mg/mg-20210609-r1.ebuild
rename to app-editors/mg/mg-20220614.ebuild
index 6bbdcd7a6250..7d529ea79741 100644
--- a/app-editors/mg/mg-20210609-r1.ebuild
+++ b/app-editors/mg/mg-20220614.ebuild
@@ -6,13 +6,12 @@ EAPI=8
 inherit toolchain-funcs
 
 DESCRIPTION="MicroGnuEmacs, a port from the BSDs"
-HOMEPAGE="https://homepage.boetes.org/software/mg/
-	https://github.com/hboetes/mg"
+HOMEPAGE="https://github.com/hboetes/mg"
 SRC_URI="https://github.com/hboetes/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ~ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="livecd"
 
 RDEPEND="
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index 939e2f475e0f..98aefe6a4014 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,8 +1,6 @@
 AUX gentoo.nanorc 4206 BLAKE2B eacba1d5db1475aa53f177d9c04819ff2b81c5fa196365f65c75b1fbbcfa78f93d4537d33901a604753131a14978843ed588296dad37c626c125959e61f3650a SHA512 45afe49629f0fe232bae8a0ae8d3984b3add366b1f88e5859df7612ab0b47f4df8764c17e038bcb49b106b08bfc8a20356b6e62cb9cae9ac337adc37db97ffd0
-DIST nano-5.9.tar.gz 3093675 BLAKE2B d4fa2f0e64b6ab243a2b127ff894e900098f6261f5d46657ff3459cc0b51683a63fc5de54bd4545b47bc16c633b09142f8501b84a09df3e8123da5233a063766 SHA512 61bf4de300579bc6f0028a2237e105228d8657819c02f32c7ef8f84f9c54734df8fb9a9cddbce0f7721ebc5ac8ae4799c118291ae15480082f8b1317019a485d
 DIST nano-6.2.tar.gz 3146876 BLAKE2B be6dbc1f53890764184a701e97e792762600c892933830bfcb5c2c4eab19d659583fe797d7197c9045ea8912215aa5885a05f02c66194df17253d6788e0ba599 SHA512 5a59906664a88a03f215d8dba8f7e481fbaffc7bdf93c89ca997df7a8aba2cbb4d45ac84d11f03a796488b82b01ca75161a5ab49fd9115661575451b6ab018c4
 DIST nano-6.3.tar.xz 1581772 BLAKE2B 92ef2acac0dacebc0bf8364bfee928a8394d8e4323e622ad6ba9d35bebd18d3976ab0ca747f7c9b5597874775b44ba4b5560e7392606aa68736158c2bda62b92 SHA512 42279bee54f4d83a0dc06e93c2f385798c304a41e995461b018f5724010213761455563cb53e2411e12bc43c7245e289f4254c359717ca1b89a34d5af8b8c3f3
-EBUILD nano-5.9.ebuild 2284 BLAKE2B af8a47119587f66407d2b16815bdd79034d1ec7c84aa85739c32d9d1f0d0b9e4e15f7f149e4a84ce9f4dba02f83589546d26a4e5656366dc694878d27c4c2f67 SHA512 beec13ea4b555f016dbdd64312ad64c6cd73cba23e284d06e74aacf4d31cd9cda02f2521861c923bbf39d495e128a9171edad12ecc83aa3b21ba5d97cd46bc92
 EBUILD nano-6.2.ebuild 2349 BLAKE2B 53dc3860dd5366d797e3cae3943de67c960ebb626c932d91743897c67ba1bfd99280f9bf5ceb707cdc452b29cf15c2ec84dba2b38ee42297e655bd02d85954c4 SHA512 ab0772726974a97039bdd42bfc6d94b1b1e57f70b082e6bd8a37f88659d2382c031fc7cb8df7187ecbbb8a9129c0cf5f7aa5574c08bf6f16695ec49918eb5641
 EBUILD nano-6.3.ebuild 2357 BLAKE2B a04a268929814dfecdb6ceddcd0aa6b7118085719dc13525922311b3dc62529a66aae7ddf63d3d0b8cc0c5c3da2ccde009fd118a7b8c17008c753d38fbdbbb26 SHA512 283e6c687dad1d1730dad88f1993b88d11e076757af0b0bccec8e59caa4193b4c16474453c5b4f4b99445824d0e3a894dde653cce8059139027bc0a2bdac4682
 EBUILD nano-9999.ebuild 2350 BLAKE2B c158c4c173632d6b05ae33b0d4b56d308fffd04a39354d1d009819c2a04a7bc3648599b342d34f66dfb674453cd46b520da8be593e58a7dea3188420d81e1e6f SHA512 822a2a3fd233de2bbb2e176328ec5e2825a07078063cc90015ef9ace5513cbb68e324c9405b8c4adce1a7067828a6c5e1cae6a7d238e5b4693830bf5509cc0eb
diff --git a/app-editors/nano/nano-5.9.ebuild b/app-editors/nano/nano-5.9.ebuild
deleted file mode 100644
index 92f76e20465c..000000000000
--- a/app-editors/nano/nano-5.9.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/nano.git"
-	inherit git-r3 autotools
-else
-	MY_P="${PN}-${PV/_}"
-	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="GNU GPL'd Pico clone with more functionality"
-HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug justify magic minimal ncurses nls +spell +split-usr static unicode"
-
-LIB_DEPEND="
-	>=sys-libs/ncurses-5.9-r1:=[unicode(+)?]
-	sys-libs/ncurses:=[static-libs(+)]
-	magic? ( sys-apps/file[static-libs(+)] )
-	nls? ( virtual/libintl )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
-BDEPEND="
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="
-	magic? ( !minimal )
-"
-
-src_prepare() {
-	default
-	if [[ ${PV} == "9999" ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	local myconf=(
-		--bindir="${EPREFIX}"/bin
-		--htmldir=/trash
-		$(use_enable !minimal color)
-		$(use_enable !minimal multibuffer)
-		$(use_enable !minimal nanorc)
-		$(use_enable magic libmagic)
-		$(use_enable spell speller)
-		$(use_enable justify)
-		$(use_enable debug)
-		$(use_enable nls)
-		$(use_enable unicode utf8)
-		$(use_enable minimal tiny)
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	# don't use "${ED}" here or things break (#654534)
-	rm -r "${D}"/trash || die
-
-	dodoc doc/sample.nanorc
-	docinto html
-	dodoc doc/faq.html
-	insinto /etc
-	newins doc/sample.nanorc nanorc
-	if ! use minimal ; then
-		# Enable colorization by default.
-		sed -i \
-			-e '/^# include /s:# *::' \
-			"${ED}"/etc/nanorc || die
-
-		# Since nano-5.0 these are no longer being "enabled" by default
-		# (bug #736848)
-		local rcdir="/usr/share/nano"
-		mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die
-		rmdir "${ED}"${rcdir}/extra || die
-	fi
-
-	use split-usr && dosym ../../bin/nano /usr/bin/nano
-}
diff --git a/app-editors/qhexedit2/Manifest b/app-editors/qhexedit2/Manifest
index 4a81fc952d44..b3f676a72b4e 100644
--- a/app-editors/qhexedit2/Manifest
+++ b/app-editors/qhexedit2/Manifest
@@ -5,8 +5,8 @@ AUX qhexedit2-0.8.9-fix-crash.patch 1437 BLAKE2B 8a58e4dc74de1fb5120ea7fc53df92f
 AUX qhexedit2-0.8.9.patch 1135 BLAKE2B fb9c3c9a4fa01b6cba9b3ca12a1a1e82f1503663bb186835b56d2610145bf3c1e211ab31c705d55cc9f3e22312c566058b816c20a4a65c7d7a501bd05db3fb8f SHA512 934bd0422b539459b446fc6ea18806f9fe6f6e107822dc4a94150632fdef35b091ca309cb0a5b7eb96c325c4d71091314c89907ce6c6404e0a6d8ebd126c58c3
 DIST qhexedit2-0.8.6_p20190316.tar.gz 355512 BLAKE2B a7edc8d05a7788f3a3f2202762ca3dc436cafbde1b1216ff1bb342055600a2e9d53c27fe324380331b8182904545c698106129238065cd2416d244fdfa176446 SHA512 4ef288c8a220c308d38c41fee83fe962e213cdfa448445ef73c3d2fe1952b68f2096732e78d2aa0a87eddd3cf2f47bed3e77807e12d2b7616c1447b3bf1b0e7d
 DIST qhexedit2-0.8.9_p20210525.tar.gz 342178 BLAKE2B baffe5b5e1130476162f23a91420cc86675a162c39539c9f07685cecc82571817625202814006221f96b56e94c0325fd7a6d8f2294041b426054f809c9967bad SHA512 d8a5159433a1212085371473cc7a89c4888c6af6b1416a34e3ea9d1ef9ae19411af32bea2e2fb256a024d6f2d05c733d285314cfc17f37dae065d7407a9c0d2c
-EBUILD qhexedit2-0.8.6_p20190316-r2.ebuild 2280 BLAKE2B 9b38de3a539866ed67e310dd44dc309ec9b7a964f11826c1a86db03c0fd17c97124e41ffae607dd9c31a7ec64e481a91a4df1d56491803f1d3173a730aa8ef35 SHA512 23c32d183b45744b556669c3d91981a3693e54d7ec5f9098d5fdd3ce63936ec94fb0768f0e6ec543919b1d6bfb8d9009dff07b48bd09f98f965e27827dd62229
+EBUILD qhexedit2-0.8.6_p20190316-r2.ebuild 2284 BLAKE2B 0a3e943b1b04852de5e72c1ae34f4767ab04ac29c4e18e54148ea39201e367116fb99987b3d12228518b4f2013a37c29121a671c6decd32c24b0bd96cd1a9dc8 SHA512 4aca967f831c7774618f8e596e7b13b160e975b66ef23d4a1a9733a8fd6db0860ede6a1fb0b89d06270dcdcfda7bd7cd378fe9845a0632da5d7814eb3f2d3d3f
 EBUILD qhexedit2-0.8.6_p20190316.ebuild 1878 BLAKE2B deb3b0b20fd1681443e3e05fec6d35006966f94613e6397940f08220db939b5240924929aaa6095670c590f9bebdd6857a517b45855fb1f7081202248e3abe63 SHA512 1722f81744db0e01ed78ca3f2ae664510fd11a5fc42db897a8bf2defd8f432a0c06470e19a70b365b6c31f625f7b793d45d131c089b3368a13ef6b549694930a
-EBUILD qhexedit2-0.8.9_p20210525-r2.ebuild 2366 BLAKE2B ce2b575de2356b285336296b09db805feeef0c6a3b8390355614368a80d9c50cb96b30ae426e7d92a40409a13f452060f486f1373e5b0526d027c75d8b6052d0 SHA512 58b16148447e9e3cee1f48dd319cac043519c99a87b0c663ffe94a04445161baf0337eb10c1ea5f8c07a8cfee027e60c39d15fc6cb7b479173680de97f03cd73
+EBUILD qhexedit2-0.8.9_p20210525-r2.ebuild 2370 BLAKE2B fdf16a540f1585f8ed620a5f209e6594a0f6ff2993a2c9503e4959a798cb4f3c8952345c14957e7551b4e6d1109b76910240f13c1faa3f07cf78dac1d1e9db18 SHA512 783dd4e2ee8e6b9e2f1ec47e22e64a80003bfa73e0c024e6f1e1ff8c7c0b443b3016372cf37dd5d6f56ec18d3f5dce4381f280d84769f74030c19eb80532bb47
 EBUILD qhexedit2-0.8.9_p20210525.ebuild 1671 BLAKE2B e36e973b9137abda5736e5e9eba1c5f0a2396651315e86c4b6f91f499d5ccbcb2b64e9c552fc88503d62f8d28cdbbd80056680da8876b6e0a3cecfa17da68848 SHA512 d941ac5d83ccb9e1bee51a64397bb749416df4d7a363f88bf36c8108f565eee6d9399f3dc58266aeea0921137b8f8d4445041ce233ae154dba342b6c26dd0d26
 MISC metadata.xml 877 BLAKE2B f7343c25b4643b468d75938b4af93a8e52e10ebb1bc774c3caada33d202d0ea938789bc9400584fc78098b05c7a029c9be781f37302ac8edf7cae40659f6d9a9 SHA512 897f7435ec755c6689192e762172fc02a10ea043d7ba2662eb88dd7db4856dbe82e95c3b7fed890ee6dd2f8b11a3dd77e25af4ec56b69cb7191c5805b31371b3
diff --git a/app-editors/qhexedit2/qhexedit2-0.8.6_p20190316-r2.ebuild b/app-editors/qhexedit2/qhexedit2-0.8.6_p20190316-r2.ebuild
index 4b1b99b7663b..094aed04481c 100644
--- a/app-editors/qhexedit2/qhexedit2-0.8.6_p20190316-r2.ebuild
+++ b/app-editors/qhexedit2/qhexedit2-0.8.6_p20190316-r2.ebuild
@@ -66,7 +66,7 @@ src_compile() {
 	if use python; then
 		export PATH="$(qt5_get_bindir):${PATH}"
 		python_build() {
-			pushd ${S} || die
+			pushd "${S}" || die
 			sip-build || die
 			popd || die
 		}
@@ -88,7 +88,7 @@ src_install() {
 	dolib.so libqhexedit.so*
 	if use python; then
 		python_install() {
-			pushd ${S}/build || die
+			pushd "${S}"/build || die
 			emake INSTALL_ROOT="${D}" install
 			popd || die
 		}
diff --git a/app-editors/qhexedit2/qhexedit2-0.8.9_p20210525-r2.ebuild b/app-editors/qhexedit2/qhexedit2-0.8.9_p20210525-r2.ebuild
index 41bace650608..731f3fb8d1af 100644
--- a/app-editors/qhexedit2/qhexedit2-0.8.9_p20210525-r2.ebuild
+++ b/app-editors/qhexedit2/qhexedit2-0.8.9_p20210525-r2.ebuild
@@ -68,7 +68,7 @@ src_compile() {
 	if use python; then
 		export PATH="$(qt5_get_bindir):${PATH}"
 		python_build() {
-			pushd ${S} || die
+			pushd "${S}" || die
 			sip-build || die
 			popd || die
 		}
@@ -90,7 +90,7 @@ src_install() {
 	dolib.so libqhexedit.so*
 	if use python; then
 		python_install() {
-			pushd ${S}/build || die
+			pushd "${S}"/build || die
 			emake INSTALL_ROOT="${D}" install
 			popd || die
 		}
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 0bb0edb9d17c..1d9ffa261116 100644
Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ
diff --git a/app-emacs/auctex/Manifest b/app-emacs/auctex/Manifest
index e2ffc49e32bd..58b902601f5e 100644
--- a/app-emacs/auctex/Manifest
+++ b/app-emacs/auctex/Manifest
@@ -1,11 +1,7 @@
 AUX 50auctex-gentoo.el 157 BLAKE2B c7d59a1ff3fc08b60332f5f578841c942d1a302f9a594409b3cd6509fd254c0d8d4273061d2ec4f444ad9288b073900e4c07e9307ffe0421182e7380c4c73543 SHA512 7cfc10c95da1d920b3861eaa9950d5ddd2388af5086cb81457f084f9c094b15dae9638a8c1e9b662dedba90c2d3c33a972011b99d9e2d71d85f99003de5ebef2
 AUX 60auctex-gentoo.el 97 BLAKE2B 18cad086f4211844f8a32d0f2499d2ecf29cd41f90c9dee6cf87184f81b0ac3836a5a58705677b55f926bdeb5854aa9acd6438f42e29856acf6c6c644592e347 SHA512 2cf945ac36ad5b25afd723d04223556522ac901a469bdd47d0c7562beb985401df957acc100222df6d97f4335b6d3e8d003f6b00b86780eec0a906ff0fc2ccb4
-DIST auctex-11.92.tar.gz 1486606 BLAKE2B 6e34d1da3bacad8f2baee2f13eb44a5b617a342c294ef4d7ba28059b678510e1d161f3f02fbcf38128c09ab4996a035e5ec28898134b967d88ad621b8b477845 SHA512 758bf82903ba0499decf0ade77c7ac70865132a24195d7e8794538b7857c448811b7ef26149a915b60ed3ee34c2ebaddb3282a320bd459c9ee3f461d6ee9b84e
-DIST auctex-12.2.tar.gz 1511396 BLAKE2B 02cad76c8846fc10dc1bd94d15fb1d6f56a9beead96deaa32a5e9a43241b232f021d9abe1965e10e53b941a223c500b301b1c467228bf8d9ed2646fa70bae647 SHA512 412e247ad9ba7feb768cade0a7098cc79991ccdf350248836813d572bfe2339f52c4e0e9ce631354e2c2d434217274aa9116e61d122a625a45a7f67aabd2316b
 DIST auctex-12.3.tar.gz 1534283 BLAKE2B b70db839cd82805ed0410f8b92c5f19a78e92ee8f23d18962f0da77bdfdbac4264272805135c7f16ba35c461017aac74030071c85d2ff413f8eff542cad670d2 SHA512 29c411a7f18e0dd2d84edaf935e278cdf694644e01f40c26c26da403efa0a823fc3110c291d218bf930cad208dc249ca665dc20ccad5e2b44bd3caae828079ca
 DIST auctex-13.1.tar.gz 1600209 BLAKE2B e6ab7d19e60b19f54f8af61c0038a0aa656bebfb56f8a1bcea3ad26a249b2c176570fcd1eaceffbc99d4a824b9191eb301a1ead16dc382f31a09729cd99415e9 SHA512 562f106627d244113669654bc683818c7145c2f74d0ce50824765989e894dfe01e34bf96fe11123ebfb76c7053647697c99ae15e80fcd5e3e022683054a962ae
-EBUILD auctex-11.92.ebuild 1426 BLAKE2B 6a2cae3590f384ee0b1c0395d872029e4d83830109953557901975ce074d7464dd291511965f916c03eab1b88acc6c4f5538764ad9d5d29c4ea3d735338459c5 SHA512 7e26c9deed5f567d4c1e075abadbbd85df8391e2df17339523de2d07acf3822e850ab264bc1ec6b28e2ae7e3b5dffadd5de139fc222dd8f28ce8b6c2f149529f
-EBUILD auctex-12.2.ebuild 1442 BLAKE2B 961fb1c1009e2a53b83aaf0fd48dc605e9c99a013d4a30eeef8634753db3ac80069dc55e0048bac4df77cdd6edb8ed8e3a1aa939aa5948280523ad385a168117 SHA512 4be7449a4479faf4d24ebcb9ee50e34bd99bb0b7cbf360ff8210c0ddc20823247e1c4ede0957bc8af74eb8cc0ffe8776fef6d788fda899a822cf260bd798a665
 EBUILD auctex-12.3.ebuild 1442 BLAKE2B 961fb1c1009e2a53b83aaf0fd48dc605e9c99a013d4a30eeef8634753db3ac80069dc55e0048bac4df77cdd6edb8ed8e3a1aa939aa5948280523ad385a168117 SHA512 4be7449a4479faf4d24ebcb9ee50e34bd99bb0b7cbf360ff8210c0ddc20823247e1c4ede0957bc8af74eb8cc0ffe8776fef6d788fda899a822cf260bd798a665
-EBUILD auctex-13.1.ebuild 1450 BLAKE2B 67507801854a11d0d8091dc46892cff408bffc5f725ba82e8764144fc6a13e3b3c53ee91018cf2b827560df6271226c51a1577e8d65291fc6f9731562e214694 SHA512 01d5d6db2d3c0f392a66a28d724d21ffb2889442b71a1d128c7aac9cdcccf883ce29421cf57a99a5248db235b2aa943b101c1aa6dfc4073e074fe0d318e49f6f
+EBUILD auctex-13.1.ebuild 1445 BLAKE2B 08a86f8f5ce3b0856156157f0971855da02af277e637224d552805f71b9890d058a58206c5854db1b3c3b4df2a7398d5469ba09741d87d253ec4fec5605ad709 SHA512 fad87a6058bc13095739e0e80c4811d7d3cf1a3806f6af8263cccf6519a069f80f9f541298b40859e4a0655c8c092d64ed7c3b4ec63ff690b6f107561d97a041
 MISC metadata.xml 948 BLAKE2B 8b8d66912a4b4cc3c19413b3cda303b083dea2d7ff18e8d36ff7203a836de192acdaff00c10f9e8bd367d526e717da60d8069f80b596507988bc7e5528305bd9 SHA512 12e6afbe2f695fb822ac10e50212951975858a7aed152d523602195933b359788979b1c4d658b63a0271edb325c5156343db3e318a374f921094c5b989e3181f
diff --git a/app-emacs/auctex/auctex-11.92.ebuild b/app-emacs/auctex/auctex-11.92.ebuild
deleted file mode 100644
index 9765cb7d27a6..000000000000
--- a/app-emacs/auctex/auctex-11.92.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit elisp
-
-DESCRIPTION="Extensible package for writing and formatting TeX files in Emacs"
-HOMEPAGE="https://www.gnu.org/software/auctex/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+ FDL-1.3+"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE="preview-latex"
-
-DEPEND="virtual/latex-base
-	preview-latex? (
-		app-text/dvipng
-		app-text/ghostscript-gpl
-	)"
-RDEPEND="${DEPEND}"
-
-TEXMF="/usr/share/texmf-site"
-
-src_configure() {
-	econf \
-		--with-emacs \
-		--with-auto-dir="${EPREFIX}/var/lib/auctex" \
-		--with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
-		--with-packagelispdir="${EPREFIX}${SITELISP}/${PN}" \
-		--with-packagedatadir="${EPREFIX}${SITEETC}/${PN}" \
-		--with-texmf-dir="${EPREFIX}${TEXMF}" \
-		--disable-build-dir-test \
-		$(use_enable preview-latex preview)
-}
-
-src_compile() {
-	export VARTEXFONTS="${T}"/fonts
-	emake
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-	elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
-	if use preview-latex; then
-		elisp-site-file-install "${FILESDIR}/60${PN}-gentoo.el"
-	fi
-	dodoc ChangeLog* CHANGES FAQ INSTALL PROBLEMS.preview README RELEASE TODO
-}
-
-pkg_postinst() {
-	use preview-latex && texmf-update
-	elisp-site-regen
-}
-
-pkg_postrm() {
-	use preview-latex && texmf-update
-	elisp-site-regen
-}
diff --git a/app-emacs/auctex/auctex-12.2.ebuild b/app-emacs/auctex/auctex-12.2.ebuild
deleted file mode 100644
index 6ce7fec4acc6..000000000000
--- a/app-emacs/auctex/auctex-12.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-NEED_EMACS=24
-
-inherit elisp
-
-DESCRIPTION="Extensible package for writing and formatting TeX files in Emacs"
-HOMEPAGE="https://www.gnu.org/software/auctex/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+ FDL-1.3+"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE="preview-latex"
-
-RDEPEND="virtual/latex-base
-	preview-latex? (
-		app-text/dvipng
-		app-text/ghostscript-gpl
-	)"
-BDEPEND="${RDEPEND}"
-
-TEXMF="/usr/share/texmf-site"
-
-src_configure() {
-	econf \
-		--with-emacs \
-		--with-auto-dir="${EPREFIX}/var/lib/auctex" \
-		--with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
-		--with-packagelispdir="${EPREFIX}${SITELISP}/${PN}" \
-		--with-packagedatadir="${EPREFIX}${SITEETC}/${PN}" \
-		--with-texmf-dir="${EPREFIX}${TEXMF}" \
-		--disable-build-dir-test \
-		$(use_enable preview-latex preview)
-}
-
-src_compile() {
-	export VARTEXFONTS="${T}"/fonts
-	emake
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-	elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
-	if use preview-latex; then
-		elisp-site-file-install "${FILESDIR}/60${PN}-gentoo.el"
-	fi
-	dodoc ChangeLog* CHANGES FAQ INSTALL PROBLEMS.preview README RELEASE TODO
-}
-
-pkg_postinst() {
-	use preview-latex && texmf-update
-	elisp-site-regen
-}
-
-pkg_postrm() {
-	use preview-latex && texmf-update
-	elisp-site-regen
-}
diff --git a/app-emacs/auctex/auctex-13.1.ebuild b/app-emacs/auctex/auctex-13.1.ebuild
index 64b85674a975..85bec5cd7b70 100644
--- a/app-emacs/auctex/auctex-13.1.ebuild
+++ b/app-emacs/auctex/auctex-13.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+ FDL-1.3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="preview-latex"
 
 RDEPEND="virtual/latex-base
diff --git a/app-emacs/csv-mode/Manifest b/app-emacs/csv-mode/Manifest
index 8ddf3ac06d3d..57223de9e5f3 100644
--- a/app-emacs/csv-mode/Manifest
+++ b/app-emacs/csv-mode/Manifest
@@ -2,5 +2,5 @@ AUX 50csv-mode-gentoo.el 194 BLAKE2B 6232d9d6d6989647532b496f8c3304b256cd04ec125
 DIST csv-mode-1.18.el.xz 18228 BLAKE2B 36963d268a1f2cac6f9e897c1b5b2b99dd2b36d80eb0a493214cb7ee2c9b74862b43e632ae6ee8d847fb7b4ac330669b79bbe86032385830429735bace2e0276 SHA512 e7b22d545a6f926957f9080ca1a927ce34d35341c8484e66f52d5e1273a4933519c53e813e710e3c818bbdfd2ac8f27da691b4f36fd71638f220ea5c56e68591
 DIST csv-mode-1.20.el.xz 19580 BLAKE2B 6942af53e8e494c1b4b063bd75937184f375d5d0bfef57558006d49b168b9786efa11e498ddd92fb7b29c9ac055feeb709b33ec9bc98c6807ee0c35b388cb841 SHA512 c9198ce3cdc60fd5b74a9f93af4dfc8be537638374fb729ad160e89b2bb6cef42112b0342732c7e9151889a254608157b084ee31cdfa330e551bc153020bbbdb
 EBUILD csv-mode-1.18.ebuild 491 BLAKE2B d16db6bea192dd41585788a00cacf2b1c526b477b1cb59641cad26153051d11a1c2d653d98f2de8fd0ec10e42351089d10b76ba847d9917118ff35bdadf967cb SHA512 9eda809ddc3860ca2499de2badaac388d917fd6fca2202ae27c4ca871f0e2d74a0542407ffb371d0cbd9b77dcd60ad7106f44943b8f9622caf3b6fff59e47a94
-EBUILD csv-mode-1.20.ebuild 494 BLAKE2B ca9b5466476a8b0be2c37e995ee620308414ba1e4e62eaec748e04a20be5c95760c02fb8ea2d35603fe8c3717c5f121dcf16f5a288bcefc6118f4164314fb0b3 SHA512 79941342279cc8a6eb318cfe8750f1959b8adb5ef8613eb3a60ce7b55f872211da10152f2c5ad5085969ed3b0ffdeab9490c3e933a01e04564db0d6a6576130a
+EBUILD csv-mode-1.20.ebuild 491 BLAKE2B d16db6bea192dd41585788a00cacf2b1c526b477b1cb59641cad26153051d11a1c2d653d98f2de8fd0ec10e42351089d10b76ba847d9917118ff35bdadf967cb SHA512 9eda809ddc3860ca2499de2badaac388d917fd6fca2202ae27c4ca871f0e2d74a0542407ffb371d0cbd9b77dcd60ad7106f44943b8f9622caf3b6fff59e47a94
 MISC metadata.xml 283 BLAKE2B 81c49021199f71096079a27f9121390fb8c1285c54b9478583ff2d647277fa106ef12456d7097c4be092fc48b514a1adcf855ca0fac911598232ef9eb7f102c0 SHA512 f32b303760addf5d4db8d18bd10fb677353cdfa4c5e545d47804ef756cf5e5a21f8b8efb631b08f802185913ceb98da820e404e06eb03d01fe9ea85c10d1ac13
diff --git a/app-emacs/csv-mode/csv-mode-1.20.ebuild b/app-emacs/csv-mode/csv-mode-1.20.ebuild
index f6678a2b457b..a9ab6cdf30f9 100644
--- a/app-emacs/csv-mode/csv-mode-1.20.ebuild
+++ b/app-emacs/csv-mode/csv-mode-1.20.ebuild
@@ -13,6 +13,6 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc sparc x86"
 
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/helm/Manifest b/app-emacs/helm/Manifest
index ce30d664e3ec..bea353453bba 100644
--- a/app-emacs/helm/Manifest
+++ b/app-emacs/helm/Manifest
@@ -1,9 +1,7 @@
 AUX 50helm-gentoo.el 79 BLAKE2B 7f188281cba0bf1f683977149ffa01f2bf6679cec1d73553e27c445ebcf97d2a6b227d09c77a01dadce49e755d97cc572af4fc5358ca35866a4c12dd8caa61b6 SHA512 30d2ce1f8073f15439cc6d68620e9ca776ed74fdedfca4944d7d749891f33aa2ad1dccffdfb85f1e1049460015daf2104f0b9cd0f5b872c5d5c5ee1eccd25b21
 AUX helm-3.8.0-no-autoload-check.patch 629 BLAKE2B 23ae68b3f15b6a7b8bbe1c7c22c897ead11abf6c7ad4280767f69c58edbb9cbe8528968e859d45e4ff76d13ac3ae4016a0818f674cb5b53d69441733343e958b SHA512 cb8192855f474cf43e3f2247f84d00ca6b2b190164c3a50940e09e771650db5860923256cb482cbd4f1d3f0b5bd964c688d6124a129c80850786c39245c034da
-DIST helm-3.8.0.tar.gz 3943168 BLAKE2B cee9ed8eafdf01cb2109dcf5289522f4a0d9db9a8626097a1ffc3bdeaee792b072b7b27e635ef360815a354c9796b55fc4b3921784e2fd0d655387507df208b6 SHA512 0aec3d4270205c61cabc991dd39d5bac3b10e827f362819e9fb85880985ce2c7e7c7b8f73d2f0cde5b5c168d4b9857e0379f1e4ca9395dbd8f083c1a707ad3f2
 DIST helm-3.8.4.tar.gz 2346120 BLAKE2B 2f554a6a3fc3a42ba2761c267d085ad1e6679f4913bc19cdbbff11130922d93d2fbe75bcae8230748c39148b6e42d45d4c2c711f731ebd4a1984c5927d93d290 SHA512 011cc4eb79a0a6916404428b9f645e4401b8a0b8b473bec88ac4211d4157b78cc673922c1b74dc93d60cf036135a67bd9c174198b63edd63a6d26a40ba9c1b9d
 DIST helm-3.8.5.tar.gz 2349290 BLAKE2B 84f0c15c2a9f492246defdf9496e8dcc5265b0c60b50ccaaa3b9f6731285a667da919da7fec80d77a4fd11bc83d9f4ae4c0910e31423b58afbdf00d51b070295 SHA512 af727553c29c9fa0ba6eb6a73b25d62855ea4413eebc57baf3ed94be6a0240e4c558193c898430dc21132ba5e32ead584514910bf98b3b8d82adf7828f953652
-EBUILD helm-3.8.0.ebuild 652 BLAKE2B 8daea4061ce9eba2fc25791b412e6605fe5ee76a9b3dd58e34b5d72b4547c68389eab20af5d00c23117a026326c2c6e5f247f33c8b02ecacd2d2fce1901ac588 SHA512 e6f3335e3f0ffbaf6e5e812002daecdeef04fbb74aaef431bee64677fdc2d9b4d12ce36bac356c28c35f1303161cbbdc9f6b2b83ddd67b6750a8608998b501f4
 EBUILD helm-3.8.4.ebuild 659 BLAKE2B e3cad45c98c77c77b7b4db89070d84fcc5709fa315e7b8a5e0f6df7054665cd4d380d3a2e2d45a8376d02b368efe9477026fefca855365b425366571083aa1d8 SHA512 414fbc4a5080f8ac17607bf41bc2d84d0fffec6b3c8b3b25462133ab55245ed424995e89f3d1c574280bc6e56386162fba7c2ce7de4ca5243ee8302f4786d841
-EBUILD helm-3.8.5.ebuild 661 BLAKE2B d65c558348be095c07eb87c6ffd38cedccd85b53efb410cae71109145d8b73429416f68701f2b0fe080b130052d06d257d1f3dcba84e60c5ed3212d5ded75722 SHA512 ed8b176c6f6c6540304c5b231d7d422fbc81bdd30297f8cef32ac037507bfbcc5ab6d15dbdec83c155e309834c2e63bd7095ce713acdfbb252db46baae1be84f
+EBUILD helm-3.8.5.ebuild 659 BLAKE2B e3cad45c98c77c77b7b4db89070d84fcc5709fa315e7b8a5e0f6df7054665cd4d380d3a2e2d45a8376d02b368efe9477026fefca855365b425366571083aa1d8 SHA512 414fbc4a5080f8ac17607bf41bc2d84d0fffec6b3c8b3b25462133ab55245ed424995e89f3d1c574280bc6e56386162fba7c2ce7de4ca5243ee8302f4786d841
 MISC metadata.xml 822 BLAKE2B 5de057ddb881d67550d3e8cd0be43d3328b8e7a38b98338ffccec147095cd5d8f8bc68695c797a872e2ed7e455859fc1d6170f414231016edab5a8d742ad2a40 SHA512 08367530e4e47577e1812d229b97094b9c012c4c91eb7e69f5724e98d8790327fe35fb9b480cf33eedd105f1fd85133c39397eda0426461d80bdee704a51c55a
diff --git a/app-emacs/helm/helm-3.8.0.ebuild b/app-emacs/helm/helm-3.8.0.ebuild
deleted file mode 100644
index c7df4d68e4d9..000000000000
--- a/app-emacs/helm/helm-3.8.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp
-
-DESCRIPTION="Emacs incremental completion and selection narrowing framework"
-HOMEPAGE="https://emacs-helm.github.io/helm/"
-SRC_URI="https://github.com/emacs-helm/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="app-emacs/async
-	app-emacs/popup"
-BDEPEND="${RDEPEND}"
-
-PATCHES="${FILESDIR}/${P}-no-autoload-check.patch"
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
-	elisp-compile *.el
-	elisp-make-autoload-file
-}
-
-src_install() {
-	elisp_src_install
-	dobin emacs-helm.sh
-}
diff --git a/app-emacs/helm/helm-3.8.5.ebuild b/app-emacs/helm/helm-3.8.5.ebuild
index 76b566bbf23a..68aff2bea3b6 100644
--- a/app-emacs/helm/helm-3.8.5.ebuild
+++ b/app-emacs/helm/helm-3.8.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/emacs-helm/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="app-emacs/async
 	app-emacs/popup"
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 70e5023ed96a..36987f86ee15 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/ruffle/Manifest b/app-emulation/ruffle/Manifest
index b2c9a5072a37..62d1d26b0e33 100644
--- a/app-emulation/ruffle/Manifest
+++ b/app-emulation/ruffle/Manifest
@@ -21,6 +21,7 @@ DIST bit_field-0.10.1.crate 10576 BLAKE2B 3a906092be85cce6af9e2ac48632d8545864c5
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST bitflags_serde_shim-0.2.2.crate 1876 BLAKE2B 09b756c1548d007e48e0f7f849cc5e3d2b53b4b9836aa725ced9075ef14f55961a638d5f63280980394d8f39fc372c556ca24c15c259aa3665493559b5263799 SHA512 ea298ee5708f8321cd6e2def4858ce6e66306f26ed8757722b65a7935add2ef2bb913e0009ee483c7b43c126cc8c5a768e02818b5a5ba1127cf723c6a5895c7e
 DIST bitstream-io-1.3.0.crate 28435 BLAKE2B 160df5958fe6c3e4dd0dc79b54731e69cd997b1a5892aaf4c229a6db9298ae057645879c476df824ff9a18927505078ac8b96587c339ad8e191e380377047897 SHA512 1e2edb439b030e139c18a6de3660658e8eadcdeda82e5469848a17a571f986b84a57a35de62627c9cc21b9fd8131ceb533f90e9f646a78ff185016d03376793b
+DIST bitstream-io-1.5.0.crate 30422 BLAKE2B 11aaa0c5c6cfe04035b60ff5a373e86acc2c31c63e1060f649f176ca7159654fe1d4096f5cc53c87ecdeffccc4b2cf30c81f9780d9c0dd5d33c2735644b7f30d SHA512 53125e3006b74cb0b8952dd4badf80786cd5459fb835aaa998c876335c8587e8dadcb86ebe3efac58683e735d94cf831ed2c3d925f216fd103f2363faccc10eb
 DIST bitvec-0.19.6.crate 147956 BLAKE2B 63f470260a8ed3a23d6e5ca07d7f9b208c3a7e766ad35d1fb4cd926c811b4886ff28bceb2e0e609739ae5f097f9f461f3be5216b5da3435e937a8e9dc277b316 SHA512 b0ff49814a0197e7be7dda7b0781fecf9b02e7ba0301769a89cf236c981736236263bdb5872afc711731d2c84cf8fe696b0dc4e284d24d399675f4ecc6ab7ea4
 DIST block-0.1.6.crate 4077 BLAKE2B a2c11873b8cb1a1ea399ecc99ed45e5d0b9399bd88435cdea346910b8707b7da94eeef522dafa5cdb09929534472b2a096c03c373744a789962d4175fd1b110e SHA512 c278e3c0346cae423b533a8f5d6b822e788ec450c92ef0f5f559d5705764a0a11df49f0f66bb1c8af7e89bec8ec802934676b969e43f92255a38b210d0fbd710
 DIST block-buffer-0.10.2.crate 10258 BLAKE2B d3ad2f9f0379e04320e954e1a2226949d83cc1acdda806b98329a5ddcfdbbafdf511907d99ad7daae271a2981ad0c39de218968c22c3487e21a32817d41c23fa SHA512 8f1d99af7c08bf3b54ba7383cf0272eb5a8137f6244bc2d7e6d6761016614514ad7d27c5c51946c5cd7becd84b320f62fc2770e7aa07038d370505c29e032078
@@ -295,10 +296,12 @@ DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226e
 DIST regress-0.4.1.crate 99620 BLAKE2B 9141cad8f53e2a8e3ea3d746737ab5b8c75ed345f09350b6c337310255969c033a28591909f5914661414ab69caefb0d4e26c00442b40a97d8f2c2937dea5765 SHA512 05edd8e4d3a6bd8f75f4f75e79275591a3be5d481921a921c09a32053bacef8aec6104219c809d76d79784466f71f7de193305f48ce1dacc1708d50452c62a17
 DIST renderdoc-sys-0.7.1.crate 4592 BLAKE2B d5c543119a498bf295bf506b164945a3de6c48358891170278baea05db0f67813d9bd232cc52593fa02095d04cbb163fdfc9ef2c121eb1155ca761b89350cc15 SHA512 5ef5596705e4d9b752e132571960e4518b96e47b65ea799dc4fc87cc4abcf769e05dafd3a7cf78df4957ed32d42f714f9d78b2f3614597cd5a45352a3f509dab
 DIST rfd-0.8.2.crate 34788 BLAKE2B d74f02185a730ff0447956fc88b9616c66c75fff1b9f313e122f542a0fe377f4c4d4dd6ae03e77e8163cdbaeae76fe9744b9b79c85cf59340acbb6901fa9d9e7 SHA512 ac56eda9ee57ad33cfc7d73e31f4b57578846a4b1fd22306f5af7f60e80a6f675e20c79a45eb46b133be0212ac6d23013adb30f43ffe33adb779a66efe8f2afc
+DIST rfd-0.8.4.crate 34945 BLAKE2B b404294e1175a62a3db4a28808ce541b64df085788fb50b0162d1d55c630f2a3c91abaefe006559a37259e949628b89c9538c6b7618baa6e783852523cb1203b SHA512 75e54164b673a026b0969f02bdc5498db57c64e0b424b0e813824a5a23ce5d8a3b35558749a55b31001189d4ef91d09f7ee4d062e33f4a5413957877d58913ab
 DIST rle-decode-fast-1.0.3.crate 62086 BLAKE2B 402d56595936734f36597c18e816a798ade6a8636b27e79acdedd4069da38e22e6ded5f2358ef0f0d509ea752e828fa294a4a9ac6d99cf26472fe21a505302c9 SHA512 f647cfd9ae0bbaca4a189cd1f8d1f8531f6dc0ffa1fd296c75cfe405fc9060e25be74581558a9195364ea90e32c7ccd60e066d21704cae836d41606b5799301a
 DIST ron-0.7.0.crate 45492 BLAKE2B adff53e8db8fc8c2288c0803b22cf064334596697a8278e51a5f0d1d2e48e69e02e377a735b30dec78a0b896ff55dffd8b4748cb305f06b08a64ddd2e319e8dc SHA512 1d690def70a47df838c69c042fd183037ca1b6becf2e013d9c30944e2d77b89249c22fdcb286a720c0ee181051b8ea19f62971ef3762f63fc121570d8fdd7fbf
 DIST ruffle-nightly-2022-05-16.tar.gz 8422146 BLAKE2B 045084aa8fa6c67084b54712e82c82505533b1ffacefd8c000208a3cd8ea2869d070f1baa68079e72a2e6f13c56a11fee4449755a75021690f424a2a3ebe2a2c SHA512 8b50325a7f0fbe8546e10abef1d802f75ef0328699e2112b59c11f42642f3f596a0e4278f9a749170998ec194c45f61d5f48d8237def05820bf70df445a3b544
 DIST ruffle-nightly-2022-06-01.tar.gz 8434678 BLAKE2B 17e1ab206c39530f0cb362807dc5ee47093620a67dc49116d170a1f0c0035760295d282511c4b401f5a895c08f55913521452d260dbb62f69c51d886c146cb86 SHA512 92554c536af64f8d950d66dcfc6dc3a38395a445d1dfa464cacb5a80cd248d968d69d72dd7ed36933ba78499cde4ab5d1190f5dd54c0ab585e0276fd640da96e
+DIST ruffle-nightly-2022-06-14.tar.gz 8436466 BLAKE2B a0ec1c80757f591270b1d4bea74c8af7d5ec955fe669f7295726486f5fec719a18973643c4cbdee2a82d24822d3e1adbd64886873b9db4db96b9b231ce597f81 SHA512 22d4d2edfaacb48d15bbfd08d82a3c411219bc074a87302f1a3189f66cd0b38e835351189476a86aec59ef59b280e28f562628e3b61bdeef79bb5bfba1dc664c
 DIST rust-flash-lso-19fecd07b9888c4bdaa66771c468095783b52bed.tar.gz 676612 BLAKE2B 3c2ff3edef1aad8e6276758fd3bac85106fa9a445180c9c7d954d5b4e469751b9a14e1cc8c3bc4736a410f5e1478eb821395b8f0a1acb0e5dca1082155b0690f SHA512 6f668066999d3454d255d227167ef92e8fcf5755017617439fc227d53c5b8169a7c585857bed4879991e8cab0a6efb4ee04eca3e1b7e01bfaaa4cab70af30d3a
 DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
 DIST rustc_version-0.4.0.crate 12175 BLAKE2B 6fda2ce03eab45d7193fa0d70175cc7ffb56b7be85fb1314092bdcfd3948ea145420569ace3a47218a4a2a6e44a818862cea6dd8cfb945475496f63b591c29da SHA512 f66da7c6efe431db06cd01180d84ba67fcd38f8cd6ef693762957c00ccc2211f23c08079d7f184776e08f28d2d6ca3bdb5f5016f7de245c6193d4722891ba1db
@@ -338,6 +341,7 @@ DIST symphonia-core-0.5.0.crate 95475 BLAKE2B af3a0bd7ee11d5026cc51fe5940337ffe7
 DIST symphonia-metadata-0.5.0.crate 20888 BLAKE2B 5c677c4479d556c3ab99044cea6d290cdc1a5859c7cae85368bb59329ee648bc32e785cf93f5743ef06393184ee77d3fa187809ac1feb2b2c332212ed4c20277 SHA512 ba3961a80ef8638417083bb8f7031b228355f2878d9d5baa50fadf86c10bd3fd84ebdbe1e59f5f584f96773c4f48fd31b717489986fa6adbb72e1efac71f4025
 DIST syn-1.0.92.crate 236605 BLAKE2B 3d23ad321e639ff45c169197cfe2fc09c23772a745fde4a8b72dbfbabc7e93f822eb127cbb42762d1e6a05e22eb5b40f3457d779530f466e7265f6a99e34714d SHA512 1884dd85a13bd0dd84f3599de428304f90b9bad91d8e51f23523fb75aab950df017ea85dc5efb99f793a37769bf2a1b972580ed5b14500b2706c45336a9068b7
 DIST syn-1.0.95.crate 236676 BLAKE2B a42463accafeda7b69ce1b69b3be5e8131f612e2e0eb1522d85623cc210b8640aa4489b8450e388e87c78a832eafea3b7074af01901df429a4dd8c37a6ee28de SHA512 a03283c628e85debf93a08bf906cfa7764c157176673cc32ed7c74d9dc8a087d83579fb2671bce5ba30f6fc13f504ebf9abe0ea5440194b13f81ff0e5e753aca
+DIST syn-1.0.96.crate 236896 BLAKE2B 57445f4925169212c3b794312f388c2829bc343fd60f37f60d46bc944c946c02476b1ec64f17ec8b91e84c112dbbf04bf64feba9a3fd3512dad0d4b3376f4869 SHA512 f53b9e97b6b19d18a35d13aaa9c58b8fdd0da96443aaad76ed027e9ac7d438b574ae052b02b9bef410f25fbab851a5af3cc64fafaefffe47932827e6ca02209c
 DIST synstructure-0.12.6.crate 18429 BLAKE2B 7666cd83f82910e036e5b57600dec9a1c2e559453ccc2f1201e2ee4ba64f2ee62cfc1046ded5cae64dd183967b9d71cbfe4b60a88bcb93706eedd0c4ab69be4f SHA512 6ec5dd7ade904fb6d79c2be595886289846e064b8c4100f780d8adfcbb41e6ca67f4b1d682212f4673c2169f889a042049b31161ec3cebc3f399751124f01f9c
 DIST system-deps-6.0.2.crate 22869 BLAKE2B 0e5412b140cb4c667dd3e98a8b3c9bfae07c1df71abfde009dfe494bd11f3043cc3c7bb2c825b46caa8f47414b7c4076e131c47d3135c60678a2a826cc21899f SHA512 5ab193ff8ef680aafe89e6920b90d07349809018a27d962c6abf0ed6920d8a7541d6af03600c7b5e328425add04305743183e072491eacf973e6e96e6590b33d
 DIST tap-1.0.1.crate 11316 BLAKE2B 60786fd5f12c2f06097330c26809fdcfce62716586d2e1985f8c01406d356ed0ab730a04dfe72ee3e1d6208a53c76c66883d45a76130750b41ba5b82aa721b83 SHA512 d69ff11a46e2fbc276212511878f48eb93640c0b147df6578ea057b23625f9366a7fc3926693fc3809688537af5ca919c91605beed364decf83c35a032310995
@@ -401,11 +405,17 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST windows-0.35.0.crate 13993813 BLAKE2B 5f4df3db3e89e41c7ff6ee258bc1b10147c84685ced799dc88c70417bb49f517cceeeba0c20e2038f56659ee065a1785fb8c835a53ea154b020e10ded01cc793 SHA512 71ca88af44817e1ca35d39dd138f7a3819067ba30c6d154cd1528d810f5e2accf0f7b3545ba8178cd70bab379eba3820862044d7871a8249e84d25b06693bfb9
+DIST windows-0.37.0.crate 14060820 BLAKE2B 4993494caf29e403e275964a80ce64469e6ec3a688ba31c7a3d0e261c160f6baf3cd84754bd8661ed38e593f2f8dca80afd0b426104a9249cbdf5cd96391d59e SHA512 d10347d7cbede894f7acdc988e197d76b8b35f09272a1f525f0307b2c5005ea36b106b99efb2f06fa4109fed8c95257c420cc54dcb79f302d1e98438c823e223
 DIST windows_aarch64_msvc-0.35.0.crate 660555 BLAKE2B 11300d85bae4afca31ccb1e44c55d5e1b4b2839f38765c40dd7e372c331025bcf59da0c8555dada2d26dc40b263676fed345d00b3634392d7b2d25ed526b141a SHA512 1945a17bd015cdea474c7eba95140d6dbd3160d4fbf72b9d3efeb2bd9d4bf37220f31a133bb5dcd4cdb36cc42cd40be9fbdd7fbea4e83a61ea99eb24165af522
+DIST windows_aarch64_msvc-0.37.0.crate 661960 BLAKE2B ae184d78d8663ac491090210eaddcabc29da3ed2bc9b551bf705196f3323063c1e07f011d77760d0682347843428789a23802fd4889c01c99ad0e7308799abf7 SHA512 3d249b39a2aa329d56965ed56b171fe0996f8078c0fe49537d746b62fddce37e90d68f2a31e51022d9a6b693db7e2e35ada399fc8a125903f4f9d7af7b651d8e
 DIST windows_i686_gnu-0.35.0.crate 816952 BLAKE2B ad2ed36df1c7934392af62494f040c93e75ad8359190f63f88eb1687530b21152ff0f50cfea08657c98c9e6fac02570efb169e497d11d86ca3011bc31f9d5f99 SHA512 d937d99225ab9465690466c0944c4a480bafe341ca582ee4dbfbcb31193342c489a48c2c78d8673aafa66e3018530d49ba29fcee29395f9a8f85a6dfd4147215
+DIST windows_i686_gnu-0.37.0.crate 818111 BLAKE2B bba5bfc3e85dc38fef52ae7d00919262a971ecb381e6236056c29586335efc69f4a6e020c91d59f85760191ad7626a3cb2283872b009788046dea6cf7aa38fd9 SHA512 7f3aaf30530d13d9a9c6f20df4abee8ca6ddda25de289551b7223a7092277d5ec4764c048bcf566ce49b085b78d567f3a6e7c62d6d5fbe79b671dbb2d9526aef
 DIST windows_i686_msvc-0.35.0.crate 722696 BLAKE2B f8809e20af402159b793d103abc785063eeaac68ba2404300ca0e8083e46db9ed26ae21c4ba56a40c4ac82020ad8b36a710fdd5d5a05b9741858b732f4cccf30 SHA512 331220a08e55a0464f6c52239cab564bf37bcbb526a18f58ee657069a83f91fc7f06e65d5d35573662b588cf389e9a1da784794b2abe96d3b033005f2ce72b34
+DIST windows_i686_msvc-0.37.0.crate 724577 BLAKE2B c83f437526293ae1326f4ed7598c66b0b0ce71ffc85b24807203b732fa9745a12ef1b339c28b0fb51614408503562991bdd611ab3721c1b37d83841121569c4b SHA512 b95650193a0a6f71cc8b66ca380d4e931d1c4a7a1e38a0b8222efc164c0e8c8c3cd21f26cb0e503c64e08d28e2922be5fce05302f2552086585bbb56073f077c
 DIST windows_x86_64_gnu-0.35.0.crate 789684 BLAKE2B 8e6abb3f23cb4ab64a3aedae842b8e3c7bdfa9d3bf80332e7eca758e1a05db3d9574a726d515c044bde705fbb538add11f8174b992ae15f08522d7d53ca3f9bf SHA512 c5ff2d5ca56e905ba7c5bd347e8a6c6675a4c289484c7b13962089faa0e3407c1c5b1c2f289d98b7e40172a868be9d089a384e73df197e6339f64900109313c7
+DIST windows_x86_64_gnu-0.37.0.crate 790933 BLAKE2B ddf80027c50c150ffb542b864f4c2ce62511195db59956bfd7ced85afaefa3a53a4eb67f5c6a72a1571e8b28848846d2a199e4c9ab2b8714190952d2a8993944 SHA512 c528d0e7fa1a3e600d9adf055fc42bd19e6871feb99cb1fc1631a9a078824a9328439db17e3222c76dc8730951251478939033215a32b240058423a145877fe1
 DIST windows_x86_64_msvc-0.35.0.crate 660523 BLAKE2B 5bcc93b38b15c67d62bf259f8a4d111767f7934c0d20a39cb9a51c4ff2139cb6b96a1b76e4dd9e814038ec0c7d6193b0da72645a72b54fe9085c084b5fdbd629 SHA512 8fbf319038441b8b86b0cf5875a454f23de1b14b7d9e14dcbd379d9bf78ce0a88afb1fd5361c87d65f3f0b77d05a0a73e38cbce1dcbe358f3436d69a7a0964b9
+DIST windows_x86_64_msvc-0.37.0.crate 661993 BLAKE2B ec6509a2e07ae8f94c5cb0cd6eb507b504782702698c93ec86af66c9bf3587d2dcc7b7f5a5da95ce92df42091633378374f101d64685cbdc8ef55d49523c41bc SHA512 ccfb98753311f32a591b94391dc4a8d9ffb5bdbb09e83f082b8dde6077e5ec710dc380a2a6cad90a00da5570eacd74dae810108943801a0615abf53c35ff7da6
 DIST winit-0.26.1.crate 333842 BLAKE2B 6eb454288c278be0817484fb5558e0463b4e31f76f7de73dfbb0295c369d6f2d4f1b8b111a620f30597803f6511d8dcf9b8ab29f1377fd798d662511b8013ea2 SHA512 1d9052c301263e5895dde17783600116cc88d972cf505fcfde838f13a93bc61c552b24feccbd0e4c30b64d186c817d21f9ccbb5bb48adebdd18d286bec9bf9ae
 DIST winreg-0.10.1.crate 25725 BLAKE2B db536f2a098e4ff6ae4ff80a19bd2029030d68007c3d6100f5135da1a7c223463fc17640f533bc1d4e8c53e9becb186d98351719b3b6276802c68cc755b9ba4e SHA512 09f2d18f62c3c427ebed40d667b672bb778629502ad3c39541f324b2d5ac41f0822c98b7e5320314144130580da46f1e8e51928941850e7d4af28455a564360c
 DIST wyz-0.2.0.crate 12926 BLAKE2B dd4de5ec403e57d8362a15efea78e5217164dfd6b22c16458ffff8722e8cd3f28b567a2b9b1bc2774d6c8ba153d37e350929e98b38c82d022f7890052da30e37 SHA512 3a16c3e81d3595ddf1e7816e698eb4d07c7455dec579fd5e97b5d8b77e626cda52f3cdaee71e234e5e500a7ac58b9d1d5f12b17264686f3f225d5e5b0d315de7
@@ -416,5 +426,6 @@ DIST xcursor-0.3.4.crate 6069 BLAKE2B 0597eb71a6ad7ad5360674c76bab042a80f1f52f49
 DIST xml-rs-0.8.4.crate 52690 BLAKE2B 140d4e725ae0e82c949838c1f6d82e1fbb00e2df4d51b74486597302d4a434ccb46bbd6f5e97636b4947c0092793928c29837a3290bb525344e8a27c0951a42b SHA512 b21b0db9ee7cdfddae7c110e4fec714d719e75ba139744c290692d660caa425aa8b1ece644deb5f1879f21c0561b9b412b9ba8931f7f5b4e220ef08f8a7fc5e6
 EBUILD ruffle-0_p20220516.ebuild 10570 BLAKE2B 3012d641ac476df924a65c91188026d0a91586ecb0627a7bef548a3ec7df7ee19eccb8bfe55dfe6fdd04985b29ae96ef9e397c2ca6676932449069f5cd41b8ed SHA512 3a62daa680992b8b7f5d421bc82798cd526f963e25bf44b21086becdb133e82eed764283c4b37c9548e21ade51e65f01a8f6f02c66fc4169d07f1c8d10c819ce
 EBUILD ruffle-0_p20220601.ebuild 10580 BLAKE2B 9f28bbacd713a0f0508d7c118d104ba8d2602f4d52de347f0bd929aed8779c1fa3335147143ee53b9b0c4c45d399ffb1c57562b152c9ea73813112a8276d55de SHA512 a4f1c06bf0324136fc45f9f4d5f9f0a8ce85666bc18ed61df5eff275b9934ee057ce44de24170b6de73739a301d914f8a4a58128f0fca96ba56459113a44bbc2
+EBUILD ruffle-0_p20220614.ebuild 10580 BLAKE2B 5504613f49b4566c3088e82ec9a6e31fbfb73f8df6d76834cec836bc7d937dbc1a9c2903591870bb8b3a102c339c7bbe6042769fd988d281d2543bcf4449c730 SHA512 931e19249fb95b1e00f32ce07411ff10574b302152fac7a048796f81300ee6ae63f1156d79e7abcd6a5b2ee7e1c134cd1b08ee27444d6058c6669d6d032644ad
 EBUILD ruffle-9999.ebuild 1392 BLAKE2B 762aa365360288fb098fc58b9d9986d3a4c2c8b9d6ecde94f6a837a8ea45a4a26519792d8833beaf1535b32fd83b569cc73e04b0ffa94e39c02499ae1c78a6fc SHA512 be0cb0a2f58e1212a305886034ed26f21673b7981912a0f68fff800b59d1c4a37ed195b4307d508c98e03602d5989a03232338d57c03196aa7a98066ebf9df2c
 MISC metadata.xml 327 BLAKE2B aad7b4089000263fccd1bf6af04e88ac138658121db322215ce0dcc85380b12afa01cdcd2be232c5d2c773698b38903759ecaea6f4854d8c90c420c0a43f33b1 SHA512 bb5e665acc6d02ae3e6a22fbb483c293142104e538d386a9b93884f097629dcbb8ca7b614aa20e0358bf22ae36487c7d86cc1467103987845a70ebacc9c4a5d2
diff --git a/app-emulation/ruffle/ruffle-0_p20220614.ebuild b/app-emulation/ruffle/ruffle-0_p20220614.ebuild
new file mode 100644
index 000000000000..b244d587de4c
--- /dev/null
+++ b/app-emulation/ruffle/ruffle-0_p20220614.ebuild
@@ -0,0 +1,507 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	adler-1.0.2
+	adler32-1.2.0
+	ahash-0.7.6
+	aho-corasick-0.7.18
+	alsa-0.6.0
+	alsa-sys-0.3.1
+	ansi_term-0.12.1
+	approx-0.5.1
+	arrayvec-0.5.2
+	arrayvec-0.7.2
+	ash-0.34.0+1.2.203
+	async-channel-1.6.1
+	atk-sys-0.15.1
+	atty-0.2.14
+	autocfg-1.1.0
+	base64-0.13.0
+	bindgen-0.56.0
+	bit-set-0.5.2
+	bit-vec-0.6.3
+	bit_field-0.10.1
+	bitflags-1.3.2
+	bitflags_serde_shim-0.2.2
+	bitstream-io-1.5.0
+	bitvec-0.19.6
+	block-0.1.6
+	block-buffer-0.10.2
+	bstr-0.2.17
+	build_const-0.2.2
+	bumpalo-3.9.1
+	bytemuck-1.9.1
+	bytemuck_derive-1.1.0
+	byteorder-1.4.3
+	bytes-1.1.0
+	cache-padded-1.2.0
+	cairo-sys-rs-0.15.1
+	calloop-0.9.3
+	castaway-0.1.2
+	cc-1.0.73
+	cesu8-1.1.0
+	cexpr-0.4.0
+	cfg-expr-0.10.2
+	cfg-if-0.1.10
+	cfg-if-1.0.0
+	cfg_aliases-0.1.1
+	chrono-0.4.19
+	clang-sys-1.3.1
+	clap-3.1.18
+	clap_derive-3.1.18
+	clap_lex-0.2.0
+	clipboard-0.5.0
+	clipboard-win-2.2.0
+	cocoa-0.24.0
+	cocoa-foundation-0.1.0
+	codespan-reporting-0.11.1
+	color_quant-1.1.0
+	combine-4.6.3
+	concurrent-queue-1.2.2
+	console-0.15.0
+	console_error_panic_hook-0.1.7
+	console_log-0.2.0
+	cookie-factory-0.3.2
+	copyless-0.1.5
+	core-foundation-0.7.0
+	core-foundation-0.9.3
+	core-foundation-sys-0.7.0
+	core-foundation-sys-0.8.3
+	core-graphics-0.19.2
+	core-graphics-0.22.3
+	core-graphics-types-0.1.1
+	core-video-sys-0.1.4
+	coreaudio-rs-0.10.0
+	coreaudio-sys-0.2.9
+	cpal-0.13.5
+	cpufeatures-0.2.1
+	crc-1.8.1
+	crc32fast-1.3.2
+	crossbeam-channel-0.5.4
+	crossbeam-deque-0.8.1
+	crossbeam-epoch-0.9.8
+	crossbeam-utils-0.8.8
+	crypto-common-0.1.3
+	csv-1.1.6
+	csv-core-0.1.10
+	ctor-0.1.21
+	cty-0.2.2
+	curl-0.4.43
+	curl-sys-0.4.55+curl-7.83.1
+	d3d12-0.4.1
+	darling-0.13.1
+	darling_core-0.13.1
+	darling_macro-0.13.1
+	deflate-1.0.0
+	derive-try-from-primitive-1.0.0
+	diff-0.1.12
+	digest-0.10.3
+	dirs-4.0.0
+	dirs-sys-0.3.6
+	dispatch-0.2.0
+	dlib-0.5.0
+	downcast-rs-1.2.0
+	either-1.6.1
+	embed-resource-1.7.2
+	encode_unicode-0.3.6
+	encoding_rs-0.8.31
+	enum-map-2.3.0
+	enum-map-derive-0.9.0
+	enumset-1.0.8
+	enumset_derive-0.5.5
+	env_logger-0.9.0
+	euclid-0.22.6
+	event-listener-2.5.2
+	exr-1.4.2
+	fastrand-1.7.0
+	flate2-1.0.24
+	float_next_after-0.1.5
+	flume-0.10.12
+	fnv-1.0.7
+	foreign-types-0.3.2
+	foreign-types-shared-0.1.1
+	form_urlencoded-1.0.1
+	funty-1.1.0
+	futures-0.3.21
+	futures-channel-0.3.21
+	futures-core-0.3.21
+	futures-executor-0.3.21
+	futures-io-0.3.21
+	futures-lite-1.12.0
+	futures-macro-0.3.21
+	futures-sink-0.3.21
+	futures-task-0.3.21
+	futures-util-0.3.21
+	fxhash-0.2.1
+	gdk-pixbuf-sys-0.15.1
+	gdk-sys-0.15.1
+	generational-arena-0.2.8
+	generic-array-0.14.5
+	getrandom-0.2.6
+	gif-0.11.3
+	gio-sys-0.15.7
+	glib-sys-0.15.7
+	glob-0.3.0
+	glow-0.11.2
+	gobject-sys-0.15.9
+	gpu-alloc-0.5.3
+	gpu-alloc-types-0.2.0
+	gpu-descriptor-0.2.2
+	gpu-descriptor-types-0.1.1
+	gtk-sys-0.15.3
+	half-1.8.2
+	hashbrown-0.11.2
+	hashbrown-0.9.1
+	heck-0.4.0
+	hermit-abi-0.1.19
+	hexf-parse-0.2.1
+	http-0.2.6
+	humantime-2.1.0
+	ident_case-1.0.1
+	idna-0.2.3
+	image-0.24.2
+	indexmap-1.6.2
+	indicatif-0.16.2
+	inflate-0.4.5
+	inplace_it-0.3.3
+	instant-0.1.12
+	isahc-1.7.2
+	itoa-0.4.8
+	itoa-1.0.1
+	jni-0.19.0
+	jni-sys-0.3.0
+	jobserver-0.1.24
+	jpeg-decoder-0.1.22
+	jpeg-decoder-0.2.6
+	js-sys-0.3.57
+	khronos-egl-4.1.0
+	lazy_static-1.4.0
+	lazycell-1.3.0
+	lebe-0.5.1
+	lexical-core-0.7.6
+	libc-0.2.120
+	libflate-1.2.0
+	libflate_lz77-1.1.0
+	libloading-0.7.3
+	libnghttp2-sys-0.1.7+1.45.0
+	libz-sys-1.1.5
+	lock_api-0.4.6
+	log-0.4.17
+	lyon-0.17.10
+	lyon_algorithms-0.17.7
+	lyon_geom-0.17.6
+	lyon_path-0.17.7
+	lyon_tessellation-0.17.10
+	lzma-rs-0.2.0
+	mach-0.3.2
+	malloc_buf-0.0.6
+	matches-0.1.9
+	memchr-2.4.1
+	memmap2-0.3.1
+	memoffset-0.6.5
+	metal-0.23.1
+	mime-0.3.16
+	minimal-lexical-0.2.1
+	minimp3-0.5.1
+	minimp3-sys-0.3.2
+	miniz_oxide-0.5.1
+	mio-0.8.1
+	miow-0.3.7
+	naga-0.8.5
+	nanorand-0.7.0
+	ndk-0.5.0
+	ndk-0.6.0
+	ndk-context-0.1.0
+	ndk-glue-0.5.1
+	ndk-glue-0.6.1
+	ndk-macro-0.3.0
+	ndk-sys-0.2.2
+	ndk-sys-0.3.0
+	nix-0.22.3
+	nix-0.23.1
+	nom-5.1.2
+	nom-6.1.2
+	nom-7.1.1
+	ntapi-0.3.7
+	num-complex-0.4.0
+	num-derive-0.3.3
+	num-integer-0.1.44
+	num-iter-0.1.42
+	num-rational-0.4.0
+	num-traits-0.2.15
+	num_cpus-1.13.1
+	num_enum-0.5.7
+	num_enum_derive-0.5.7
+	number_prefix-0.4.0
+	objc-0.2.7
+	objc-foundation-0.1.1
+	objc_exception-0.1.2
+	objc_id-0.1.1
+	oboe-0.4.5
+	oboe-sys-0.4.5
+	once_cell-1.10.0
+	openssl-probe-0.1.5
+	openssl-sys-0.9.72
+	os_str_bytes-6.0.0
+	output_vt100-0.1.3
+	pango-sys-0.15.1
+	parking-2.0.0
+	parking_lot-0.11.2
+	parking_lot_core-0.8.5
+	path-slash-0.1.4
+	peeking_take_while-0.1.2
+	percent-encoding-2.1.0
+	pin-project-1.0.10
+	pin-project-internal-1.0.10
+	pin-project-lite-0.2.8
+	pin-utils-0.1.0
+	pkg-config-0.3.24
+	png-0.17.5
+	polling-2.2.0
+	ppv-lite86-0.2.16
+	pretty_assertions-1.2.1
+	primal-check-0.3.1
+	proc-macro-crate-1.1.3
+	proc-macro-error-1.0.4
+	proc-macro-error-attr-1.0.4
+	proc-macro2-1.0.39
+	profiling-1.0.5
+	quote-1.0.18
+	radium-0.5.3
+	rand-0.8.5
+	rand_chacha-0.3.1
+	rand_core-0.6.3
+	range-alloc-0.1.2
+	raw-window-handle-0.4.2
+	rayon-1.5.3
+	rayon-core-1.9.2
+	redox_syscall-0.2.11
+	redox_users-0.4.0
+	regex-1.5.5
+	regex-automata-0.1.10
+	regex-syntax-0.6.25
+	regress-0.4.1
+	renderdoc-sys-0.7.1
+	rfd-0.8.4
+	rle-decode-fast-1.0.3
+	ron-0.7.0
+	rustc-hash-1.1.0
+	rustc_version-0.4.0
+	rustdct-0.7.0
+	rustfft-6.0.1
+	ryu-1.0.9
+	safe_arch-0.6.0
+	same-file-1.0.6
+	schannel-0.1.19
+	scoped-tls-1.0.0
+	scoped_threadpool-0.1.9
+	scopeguard-1.1.0
+	semver-1.0.6
+	serde-1.0.137
+	serde_derive-1.0.137
+	serde_json-1.0.81
+	sha2-0.10.2
+	shlex-0.1.1
+	sid-0.6.1
+	slab-0.4.5
+	slice-deque-0.3.0
+	slotmap-1.0.6
+	sluice-0.5.5
+	smallvec-1.8.0
+	smithay-client-toolkit-0.15.3
+	socket2-0.4.4
+	spin-0.9.2
+	spirv-0.2.0+1.5.4
+	static_assertions-1.1.0
+	stdweb-0.1.3
+	strength_reduce-0.2.3
+	strsim-0.10.0
+	symphonia-0.5.0
+	symphonia-bundle-mp3-0.5.0
+	symphonia-core-0.5.0
+	symphonia-metadata-0.5.0
+	syn-1.0.96
+	synstructure-0.12.6
+	system-deps-6.0.2
+	tap-1.0.1
+	termcolor-1.1.3
+	terminal_size-0.1.17
+	textwrap-0.15.0
+	thiserror-1.0.31
+	thiserror-impl-1.0.31
+	threadpool-1.8.1
+	tiff-0.7.1
+	time-0.1.43
+	tinyvec-1.5.1
+	tinyvec_macros-0.1.0
+	toml-0.5.8
+	tracing-0.1.32
+	tracing-attributes-0.1.20
+	tracing-core-0.1.23
+	tracing-futures-0.2.5
+	transpose-0.2.1
+	typenum-1.15.0
+	unicode-bidi-0.3.7
+	unicode-ident-1.0.0
+	unicode-normalization-0.1.19
+	unicode-width-0.1.9
+	unicode-xid-0.2.2
+	url-2.2.2
+	vcpkg-0.2.15
+	version-compare-0.1.0
+	version_check-0.9.4
+	vswhom-0.1.0
+	vswhom-sys-0.1.1
+	waker-fn-1.1.0
+	walkdir-2.3.2
+	wasi-0.10.2+wasi-snapshot-preview1
+	wasi-0.11.0+wasi-snapshot-preview1
+	wasm-bindgen-0.2.80
+	wasm-bindgen-backend-0.2.80
+	wasm-bindgen-futures-0.4.30
+	wasm-bindgen-macro-0.2.80
+	wasm-bindgen-macro-support-0.2.80
+	wasm-bindgen-shared-0.2.80
+	wayland-client-0.29.4
+	wayland-commons-0.29.4
+	wayland-cursor-0.29.4
+	wayland-protocols-0.29.4
+	wayland-scanner-0.29.4
+	wayland-sys-0.29.4
+	weak-table-0.3.2
+	web-sys-0.3.57
+	webbrowser-0.7.1
+	weezl-0.1.5
+	wepoll-ffi-0.1.2
+	wgpu-0.12.0
+	wgpu-core-0.12.2
+	wgpu-hal-0.12.4
+	wgpu-types-0.12.0
+	wide-0.7.4
+	widestring-0.5.1
+	winapi-0.3.9
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-util-0.1.5
+	winapi-x86_64-pc-windows-gnu-0.4.0
+	windows-0.37.0
+	windows_aarch64_msvc-0.37.0
+	windows_i686_gnu-0.37.0
+	windows_i686_msvc-0.37.0
+	windows_x86_64_gnu-0.37.0
+	windows_x86_64_msvc-0.37.0
+	winit-0.26.1
+	winreg-0.10.1
+	wyz-0.2.0
+	x11-clipboard-0.3.3
+	x11-dl-2.19.1
+	xcb-0.8.2
+	xcursor-0.3.4
+	xml-rs-0.8.4"
+# python is needed by xcb-0.8.2 until update to >=0.10
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="xml(+)"
+inherit cargo desktop flag-o-matic python-any-r1 xdg
+
+# 0(github) 1(repo) 2(commit hash) 3(crate:workspace,...) [see core/Cargo.toml]
+RUFFLE_GIT=(
+	"RustAudio dasp f05a703d247bb504d7e812b51e95f3765d9c5e94 dasp"
+	"ruffle-rs gc-arena 4931b3bc25b2b74174ff5eb9c34ae0dda732778b gc-arena:src/gc-arena"
+	"ruffle-rs h263-rs 023e14c73e565c4c778d41f66cfbac5ece6419b2 h263-rs:h263,h263-rs-yuv:yuv"
+	"ruffle-rs nellymoser 4a33521c29a918950df8ae9fe07e527ac65553f5 nellymoser-rs:."
+	"ruffle-rs nihav-vp6 9416fcc9fc8aab8f4681aa9093b42922214abbd3 nihav_codec_support:nihav-codec-support,nihav_core:nihav-core,nihav_duck:nihav-duck"
+	"ruffle-rs quick-xml 8496365ec1412eb5ba5de350937b6bce352fa0ba quick-xml:."
+	"ruffle-rs rust-flash-lso 19fecd07b9888c4bdaa66771c468095783b52bed flash-lso"
+)
+ruffle_uris() {
+	cargo_crate_uris
+
+	local g
+	for g in "${RUFFLE_GIT[@]}"; do
+		g=(${g})
+		echo "https://github.com/${g[0]}/${g[1]}/archive/${g[2]}.tar.gz -> ${g[1]}-${g[2]}.tar.gz"
+	done
+}
+
+# using _pYYYYMMDD over YYYY.MM.DD given ruffle has an underlaying version
+# (0.1.0) which could get a non-nightly release eventually (YYYY. > 0.1.0)
+MY_PV="nightly-${PV:3:4}-${PV:7:2}-${PV:9:2}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Flash Player emulator written in Rust"
+HOMEPAGE="https://ruffle.rs/"
+SRC_URI="
+	https://github.com/ruffle-rs/ruffle/archive/refs/tags/${MY_PV}.tar.gz -> ${MY_P}.tar.gz
+	$(ruffle_uris)"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT MPL-2.0 ZLIB curl"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/openssl:=
+	media-libs/alsa-lib
+	sys-libs/zlib:=
+	x11-libs/gtk+:3
+	x11-libs/libxcb:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	>=virtual/rust-1.61"
+
+QA_FLAGS_IGNORED="
+	usr/bin/${PN}
+	usr/bin/${PN}_exporter
+	usr/bin/${PN}_scanner"
+
+src_prepare() {
+	default
+
+	# use [patch] directive to register git snapshots of needed crates
+	local crate g
+	for g in "${RUFFLE_GIT[@]}"; do
+		g=(${g})
+		echo "[patch.\"https://github.com/${g[0]}/${g[1]}\"]"
+		for crate in ${g[3]//,/ }; do
+			echo "${crate%:*} = { path = \"../${g[1]}-${g[2]}/${crate#*:}\" }"
+		done
+	done >> Cargo.toml || die
+}
+
+src_compile() {
+	filter-flags '-flto*' # undefined references with ring crate and more
+
+	cargo_src_compile --bins # note: configure --bins would skip tests
+}
+
+src_install() {
+	dodoc README.md
+
+	newicon web/packages/extension/assets/images/icon180.png ${PN}.png
+	make_desktop_entry ${PN} ${PN^} ${PN} "AudioVideo;Player;Emulator;" \
+		"MimeType=application/x-shockwave-flash;application/vnd.adobe.flash.movie;"
+
+	cd target/$(usex debug{,} release) || die
+
+	newbin ${PN}_desktop ${PN}
+	newbin exporter ${PN}_exporter
+	dobin ${PN}_scanner
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "${PN} is experimental software that is still under heavy development"
+		elog "and only receiving nightly releases. Plans in Gentoo is to update"
+		elog "roughly every two weeks if no known major regressions."
+		elog
+		elog "There is currently no plans to support wasm builds / browser"
+		elog "extensions, this provides the desktop viewer and other tools."
+	fi
+}
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 042d701316c4..b2f17cbf635a 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -6,12 +6,13 @@ AUX virtualbox-4-config 38 BLAKE2B 8eab341f3264a056a89633fe43dd58f274d0d87760215
 AUX virtualbox-5-localconfig 1553 BLAKE2B dc1e946e97eb6b19a99b5ecf34640ef09c444637c19ea55ae7f0e34583a048b20ea4049e83ef3714a51e44545c50922b1f2758210145319f9881ca71b7d561d4 SHA512 1ec62f872a19ad76ce7d10ed70ee0503c65e817e123d82c20753e6ae4ac7d2ceb4e236da6be1fe3d63b0b104dd355de2cffd6e9d0ec0603c82fbf89662eeb34b
 AUX virtualbox-5.2.8-paxmark-bldprogs.patch 2732 BLAKE2B a3966e0f1a990c648cba0dfd245229d66040294f068f5fa3f52d7cd55f56819fa1ed505465bc6e524c147f958af3460ecc9e4c3b1628dcb456067181521b7ef5 SHA512 2c436dd64ff3135ce31dc7ab2c05a38fe0b1b1a2b2cc687b1f58fa09f7de2384a6f067ff67c0ab4ecb5ddd42a94a9379517e1901a085e3cb7f43c38a07c28a16
 AUX virtualbox-6.1.26-configure-include-qt5-path.patch 717 BLAKE2B d6d9f1b0d30602e18b245e25bf1c5e2f4a33e308956fa946f913cf054173aa337708923ef92355f171f5b53a1b1ed58089f1a5146d8cd40a049fdfef874c5194 SHA512 bd07544302db16c291c21ef548455590079307fac2e11c3508019a6fb38a47db6a130c4ba265f9f47dead82d1684226542f21ff2da889ece51cba4b0744d109c
+AUX virtualbox-6.1.34-python3.10.patch 686 BLAKE2B 708c4b70c50024dbbd200bdd2af51600ee1cf4abf74fc15fe8cb340f77a58d7714315d887370893a21b10e3c20eb2ee97503558da6df0cb53ec083f32b0456a3 SHA512 58910df546ea27e4f568823a0d4c44d98c1833678dd7b47de4593e7b481f428123358dcdeb9ae5cab803d0167359f0e31e611f8359a1b59beeb71d1bce4f1004
 AUX virtualbox-6.1.34-vboxr0.patch 1565 BLAKE2B ec47a42b7574def3ac3ca482db14cca96af855652b0ff11e4ef49cbc7ea2bec4e134b57e18df85b07d8a8f3efcd1d0fa69380cf32bf544781c6e14437f124a11 SHA512 3feb258993509e2bd3c13130fb227883960e6e3b3e14d146d04cb222c7323689902fcf581ff207ef70a985eaced02e303a6d93e55261db499f5c54eb3e007f57
-AUX virtualbox-ose-6-wrapper 3570 BLAKE2B 730747f4e7517fae218d8abf311e1f30f90bbf0810bdd1ee358dd4250359d501803c2213782310788b2c54a3c57f5195455b89331f02d35be0c5f4713a235b54 SHA512 e7e1e161fa8030234973e18d9d033238ded1f0b511323b642d8102dc062a16e69b6fa63729e88dcf1ef16fa02befd1f36e7242e23db12fa838b25d83f19810ea
+AUX virtualbox-ose-6-wrapper 3578 BLAKE2B c150e578212435268de3c5fb0eea701bc843ec2241dc3839d3d1e33604fc01f6bdff6ed0425ba6917072f652b8c29d0df9a550a92900ca13306fcd36521afbee SHA512 315d981f3e92f2e0134946f6bbb8ad4ea4228afb8f73aaed7feead59b3f55cef01cec4285a7fdaf30ce0931d8b69bda4698baebd63d11f2cd9dfe9d0591a0f40
 AUX virtualbox-vboxusb_tmpfilesd 35 BLAKE2B 56937e236a0e4d1a2aa085271e8ae0af9553fdf7c3b804af4d3fda3aa8dbc32d63762fee90bc949390cb9cd67f2f0111894c8af084731dab6920ae1675c69a64 SHA512 72e4602f5f214f8833486f5c787c263a10390e8bdf65b5615d67c35ec44048f02add12fe43b19f9c57a9d2f12d768c52e54fcfb9052c0611d06cc988a698c171
 DIST VirtualBox-6.1.32.tar.bz2 165758238 BLAKE2B 24873d7cc8bd306ea3552fe75379fbe7be767c85406042344eb047ed31184c3357aea07dda5e15c275f5036ae63106ef1d2e6524b143bc645a6b5ba0016f1391 SHA512 8bf7af6b8b4d3ba90f0e91589cf26400648436eb9da6d31c1a760460bfe5eb7311ac3220b4c9a98ac50e559641d3d5f559134be65288821038255de1c2c7ce1e
 DIST VirtualBox-6.1.34.tar.bz2 165761216 BLAKE2B d3c8f7d3d6f408e4c4275c2b2815e92819c871359501ec4fa7212bf7cdc852613e2e4703d8650371097a5bc805efa04ea75bb03ab83d24a869a677555f6e22d5 SHA512 46d63a9fd9df76af654af59fab5cf555858bc2c4b5dc34e2378d85ae784e6380b6def4aab06909a9b5e114a7297269f90cfb2c3d8d6529b423d703afbad18c64
 DIST virtualbox-6.1.12-patches-01.tar.xz 2528 BLAKE2B a5d7cde0daea41bee2e40e46569c725769927a31865d99d13b8b13c4903e59b4097f85da15dc592b9c7e8baf8ff805397af827620f107ba09a468b4d1198ecab SHA512 f71d10a9fbce99c3f631ef30bcfa9d0e017e702ac509541b039e08ccbcd024beb93fde09c43d90af5d9d28f6842a7947f20e7950d3897da3e6d57859657e1123
-EBUILD virtualbox-6.1.32-r1.ebuild 14607 BLAKE2B 864c1c66961c1b04296580e87e62ec5d18f556f71857d120ebb6db5ce4d33005ab9769f698a902b6fb1028702ae686380337aed2500dedbd5ec3dabec8ea82ca SHA512 a65ad608a408c1ba38f0ae11f91167f0376c0777483f0bd4dc882e2da9144f2ac48f6a4f225eb8bb67bb369df5be38ffaa694e4e0a028bccaf26f7c92e6df887
-EBUILD virtualbox-6.1.34.ebuild 13646 BLAKE2B 8879284631fd6d1be7ef6d6983f0f4532ca3020c5540aaebdf1ee387f4c61e7544a19c276eaa2fc8c09ed1465b87c6322470cd6d9381b67254d833b1b98958b7 SHA512 1634355bfd07cf067ca44c7a995f6d701b464cf8ebfdaa0872c182a38afe703fbc8189fed012e09093b3165a3df6959715febe2c9424d7a9b3105cf43178ccf3
+EBUILD virtualbox-6.1.32-r2.ebuild 14607 BLAKE2B 864c1c66961c1b04296580e87e62ec5d18f556f71857d120ebb6db5ce4d33005ab9769f698a902b6fb1028702ae686380337aed2500dedbd5ec3dabec8ea82ca SHA512 a65ad608a408c1ba38f0ae11f91167f0376c0777483f0bd4dc882e2da9144f2ac48f6a4f225eb8bb67bb369df5be38ffaa694e4e0a028bccaf26f7c92e6df887
+EBUILD virtualbox-6.1.34-r1.ebuild 13699 BLAKE2B 01a96acd3f1e734536372baa60f0adca25d0153e5c7dc986ac51fa1bbd67a4e3e6fbf71a0b5865a5ab92f236e598c86dd4755c72e1a83ee95a44f714d6e0c877 SHA512 d647990d450c92d8eba46250e7a9f058c1f887fd0b0bc9b6223197973561a60bbef6f7e8133352baae034ae4014040bd325747644bc2eec286e56f71363ccab3
 MISC metadata.xml 774 BLAKE2B 5052aaa17c815e63ef8cd450e09f220a71e8a59df1ab79ad7dd713780dd0c62ae5bc453012b35d8e37a7b0dc9b1287c3a8119f0324c4a5e8ba6211b20f5350e7 SHA512 2b0515ae0e5a280dc40b6ecdaaa9165f90b6e276e01323896509b9a2ecc01a34d4e2542788ba3166d56a242c8ed65ef1f2df6e2de62b95d11700d28036f616fa
diff --git a/app-emulation/virtualbox/files/virtualbox-6.1.34-python3.10.patch b/app-emulation/virtualbox/files/virtualbox-6.1.34-python3.10.patch
new file mode 100644
index 000000000000..eacc77a7f5bc
--- /dev/null
+++ b/app-emulation/virtualbox/files/virtualbox-6.1.34-python3.10.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/852152
+
+--- VirtualBox-6.1.34/configure
++++ VirtualBox-6.1.34/configure
+@@ -2027,7 +2027,7 @@
+ }
+ EOF
+   found=
+-  SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 python3.4m python3.5 python3.5m python3.6 python3.6m python3.7 python3.7m python3.8 python3.8m python3.9 python3.9m"
++  SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 python3.4m python3.5 python3.5m python3.6 python3.6m python3.7 python3.7m python3.8 python3.8m python3.9 python3.9m python3.10 python3.10m"
+   for p in $PYTHONDIR; do
+     for d in $SUPPYTHONLIBS; do
+       for b in lib/x86_64-linux-gnu lib/i386-linux-gnu lib64 lib/64 lib; do
diff --git a/app-emulation/virtualbox/files/virtualbox-ose-6-wrapper b/app-emulation/virtualbox/files/virtualbox-ose-6-wrapper
index af8090dd09af..57b15cc93eba 100644
--- a/app-emulation/virtualbox/files/virtualbox-ose-6-wrapper
+++ b/app-emulation/virtualbox/files/virtualbox-ose-6-wrapper
@@ -60,7 +60,7 @@ WARNING: The character device /dev/vboxdrv does not exist.
 EOF
 fi
 
-SERVER_PID=`ps -U \`whoami\` | grep VBoxSVC | awk '{ print $1 }'`
+SERVER_PID=$(ps -U ${LOGNAME:-$USER} | grep VBoxSVC | awk '{ print $1 }')
 if [ -z "$SERVER_PID" ]; then
     # Server not running yet/anymore, cleanup socket path.
     # See IPC_GetDefaultSocketPath()!
diff --git a/app-emulation/virtualbox/virtualbox-6.1.32-r1.ebuild b/app-emulation/virtualbox/virtualbox-6.1.32-r2.ebuild
similarity index 100%
rename from app-emulation/virtualbox/virtualbox-6.1.32-r1.ebuild
rename to app-emulation/virtualbox/virtualbox-6.1.32-r2.ebuild
diff --git a/app-emulation/virtualbox/virtualbox-6.1.34.ebuild b/app-emulation/virtualbox/virtualbox-6.1.34-r1.ebuild
similarity index 99%
rename from app-emulation/virtualbox/virtualbox-6.1.34.ebuild
rename to app-emulation/virtualbox/virtualbox-6.1.34-r1.ebuild
index ffef67a75eb1..3857ced6663f 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.34.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.34-r1.ebuild
@@ -131,6 +131,7 @@ REQUIRED_USE="
 
 PATCHES=(
 	"${FILESDIR}/${P}-vboxr0.patch"
+	"${FILESDIR}/${PN}-6.1.34-python3.10.patch" #852152
 )
 
 pkg_pretend() {
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index f3024f8074c2..37c9969a02d4 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/opencc/Manifest b/app-i18n/opencc/Manifest
index e5e7c388c9c9..91fa5515e973 100644
--- a/app-i18n/opencc/Manifest
+++ b/app-i18n/opencc/Manifest
@@ -5,6 +5,6 @@ DIST opencc-1.1.2.tar.gz 2804665 BLAKE2B 9b8be92cfdc2f565c9dc27745724c739e674239
 DIST opencc-1.1.3.tar.gz 2805430 BLAKE2B 060ca820676a92ddfddc362488031e1ada538626a1fbeb8d178a0ef059b99f606cb0f1151857579221942183820bf34c6f96517d13d4ae8dc3f81846537b668d SHA512 90da656fa4790c58932ad2240a076cc4a9e8cf70ac73d83e0d299e84472deb6491a823966a7686ed1487ef8405909981b9a12b661d8de7f086bd4b498594abac
 EBUILD opencc-1.0.5.ebuild 1377 BLAKE2B 4d38a897f7d9d42be4c9e84bc33342deea38b9cdbd617fc70bde26e3e172c9a8ab27c46547c94d734951b353c9b8a9b506acd25a3c8b14a6ab0dce804256b313 SHA512 5fa0e68dea35abc4c8c5caa567e04c7de16ce705cf1e965cce417d43f8981b29d9d87673c05942406e98f6ada609908a2ba89df8659bc3e9e513de1c3b089fbe
 EBUILD opencc-1.1.2.ebuild 1773 BLAKE2B 7f1a25ed703c5b24e47e5c9365cd05d8ebede64f0f38a65f1be379bd905996a9f76136a267aa0d5830d3c532e99304dc7d0d28795a04d6a73ab7a4d14bf4e09a SHA512 435e65ce7188ac891a0ae9ac42adf1eb7441ba0df19125da716b43f673bbee47120be03f837f68ed0eda599a6f6a78c9391e3ecb5b2bececff7744d7f2931ef1
-EBUILD opencc-1.1.3.ebuild 1585 BLAKE2B 98cd56472ad8cf5f1097a1ddc371778219b29c5b6b0eeb6a96eb1c6244c2fdc5a84ee9b03d31d2366c33fd8b9e77159339786943db0a2d4afd4bf064c57b8c4a SHA512 ffb99ec29ccf8e3cfbb56d427caddfa43629fcb2e1f906390d33bfc620aec2301c08b626b5af8fb7982709518b5f916bb2c77c0b695dc473696b92914f8ca8a2
+EBUILD opencc-1.1.3.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
index b1f7acfceaf9..ccdabe3b3bb3 100644
--- a/app-i18n/opencc/opencc-1.1.3.ebuild
+++ b/app-i18n/opencc/opencc-1.1.3.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="Apache-2.0"
 SLOT="0/1.1"
-KEYWORDS="amd64 arm64 ~hppa ~loong ppc ppc64 ~riscv sparc ~x86"
+KEYWORDS="amd64 arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index cbdaeda9cda8..e37872d1f400 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/cw/Manifest b/app-misc/cw/Manifest
index 7a767effb564..aa4893e5669d 100644
--- a/app-misc/cw/Manifest
+++ b/app-misc/cw/Manifest
@@ -2,6 +2,8 @@ AUX 1.0.16-collision.patch 1239 BLAKE2B 39567192acb63116de0c9ae34eeb05619cf25d86
 AUX 1.0.16-format-security.patch 284 BLAKE2B 79945a54bf591e7b78475276b1f51e5c613f9992580de92fa7ebed90201b955fdf4b151283e5f3ae84174233598b9f0687bf48b60f91f02b76e2518dec4b8492 SHA512 0f6b701e0d7925dcc5ec125db4efcd967fc17d5d1e4d3b5b73786639d0c017c9125c800d948843f4746c2762a0f7bf35eab183e9edb2a2f1088aa01f59021ec5
 AUX 1.0.16-ldflags.patch 417 BLAKE2B ec4399063c9b082ea2b51cc33ba684f5b583392e350cc859e5b133fe324dff83c9d7efd3e0bd26b19534d760271b367088d05660c036eb58f870411b7ca4c0c7 SHA512 190d5fe9e583a5db62bb34ff228ee77e1f8bbb89c41943759d007f73571bb739ace842e7eda36b6eb50a63b212f8a73a4552a51e035f50aa4c9ab3414bccab4a
 AUX 1.0.16-path.patch 479 BLAKE2B 17108f1ff61d1ff3e4625f86589b6cc372cef6e849851df193093bef8f9fd43706f70eaec98544c3a2e4da20298b21c597d87dc56354e6317859f05b12bc9c38 SHA512 6ecc5cc11e65db11617b1ba902a414900e7e4f0ac319c60e4d5131769560b07a1dac3496b33dd07d44cf9ea6d95924114fb9361ef7b15235604a53b2b517bb53
+AUX cw-1.0.16-replace-isastream-with-fcntl.patch 530 BLAKE2B 31719713817c810c4368b1842186711b1f9190d62eaa644bfe3981aa31a7733ccb4f85d0a3b5bfbfdfdca6357455cdb3fe030b4fa1be6c1cc85cc07c0190683e SHA512 3de7d966cbf1ccc86dd45a797c62af75b0e38e9f9e08547090d3eef6b947386b4bc1118e3f9bc5213e9c8d35e5f59e0e86b59823dd3883fd15eecc505c3b160d
 DIST cw-1.0.16.tar.bz2 76035 BLAKE2B 4257dad6df2122efabd9d5f51e7d0f0f5103afa261b4d7781ec27a81d9efc903c55a56e7b9bb1d16bb3c6bc856f15ec6f8d7ae69935511659bbfe82475377e38 SHA512 6a5da4e4dbb4d042d8b4e1e0727039f3103f9d7124a6f7c37ac094d7fee0ae10d9bacc6739fc133ca9fb682501bcafecd39a660abfe19fbf1fd9bf7ec06cfa32
 EBUILD cw-1.0.16-r3.ebuild 1536 BLAKE2B 48af35f48ed2693c7ce6307dc7eb1f178d5d039a4a34abb6811943be3a8cd31392ddf5ff847097a3b1f14ffbb35acb8107ecf06cf246774c1449d94ff2b87263 SHA512 c537ae708fb5ab3439edb76b525f8dfa8c406ddc3e2777c3c2b1a84b605dee34a0a513d1f2bfe4d48e2582b5f94eb533cfa44f263a517e2a256e5e704455cc13
+EBUILD cw-1.0.16-r4.ebuild 1732 BLAKE2B 455ab021e2ce47a8c44bf7d30a0f586bd475b9a3701e43ff649d9561c03fa2a33f4cb38f25a6fc44c453ce82c2447e00663cc5ccea837a2a3f6c9f85ef8fbe9f SHA512 340869ae66627e4fd7396baae7641ef4866b0662db1ce2dcbbf8be61a563affab78659496bc2d639a1d3f452a1cf1fb7b77b3e637460ae9857a74b06eb809b70
 MISC metadata.xml 344 BLAKE2B 7f3db60367ffaacb5217d36eee3a431fac236d8675ceb212641e7c391cd1e766302adef0912dd32c42b39df01b5747821af4dc36c11f3a79e0b4c7c57fa98bd8 SHA512 4b14684bfd5872f9de5812015c341c763da06a2e75981f67355464f68ea5f11dfa944233b1a77be73854dce0f697edcc76402ec1cd073d53d23db0ef2d6b565f
diff --git a/app-misc/cw/cw-1.0.16-r4.ebuild b/app-misc/cw/cw-1.0.16-r4.ebuild
new file mode 100644
index 000000000000..b738753f2715
--- /dev/null
+++ b/app-misc/cw/cw-1.0.16-r4.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="A non-intrusive real-time ANSI color wrapper for common unix-based commands"
+HOMEPAGE="http://cwrapper.sourceforge.net"
+SRC_URI="mirror://sourceforge/cwrapper/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-ldflags.patch
+	"${FILESDIR}"/${PV}-path.patch
+	"${FILESDIR}"/${PV}-collision.patch
+	"${FILESDIR}"/${PV}-format-security.patch
+	"${FILESDIR}"/${P}-replace-isastream-with-fcntl.patch
+)
+
+src_unpack() {
+	default
+
+	gunzip "${S}"/man/*.gz || die
+}
+
+src_configure() {
+	tc-export CC
+
+	append-flags -D_XOPEN_SOURCE=500 -D_GNU_SOURCE
+
+	econf
+}
+
+src_compile() {
+	emake local
+}
+
+src_install() {
+	insinto /usr/share/cw
+	doins etc/*
+
+	exeinto /usr/libexec/cw
+	doexe def/*
+
+	doman man/cwu.1
+	doman man/cwe.1
+	newman man/cw.1 color-wrapper
+	dodoc CHANGES CONTRIB INSTALL README PLATFORM doc/README*
+
+	dobin bin/{cwu,colorcfg}
+	# app-misc/color currently conflicts; hopefully 'colors' is safe
+	newbin bin/color colors
+	# media-radio/unixcw currently conflicts;
+	newbin bin/cw color-wrapper
+}
+
+pkg_postinst() {
+	ebegin "Updating definition files"
+	cwu /usr/libexec/cw /usr/bin/color-wrapper # >/dev/null
+	eend $?
+
+	elog "To enable color-wrapper, as your user, run:"
+	elog "  colorcfg [1|2|3]"
+	elog "to add relevant environment variables to your ~/.bash_profile"
+	elog "Run colorcfg without options to see what [1|2|3] means."
+	elog
+	elog "After sourcing your ~/.bash_profile, commands for which definitions"
+	elog "are provided should have colored output."
+	elog
+	elog "To enable/disable colored output, run: 'colors [on|off]'."
+}
diff --git a/app-misc/cw/files/cw-1.0.16-replace-isastream-with-fcntl.patch b/app-misc/cw/files/cw-1.0.16-replace-isastream-with-fcntl.patch
new file mode 100644
index 000000000000..18f2dba953d2
--- /dev/null
+++ b/app-misc/cw/files/cw-1.0.16-replace-isastream-with-fcntl.patch
@@ -0,0 +1,20 @@
+--- /var/tmp/portage/app-misc/cw-1.0.16-r3/work/cw-1.0.16/src/cw.c
++++ cw-1.0.16/src/cw.c
+@@ -1173,7 +1173,7 @@
+   close(master);
+   return(0);
+  }
+- if(isastream(slave)){
++ if(fcntl(slave,F_GETFD) < 0){
+   if(ioctl(slave,I_PUSH,"ptem")<0||ioctl(slave,I_PUSH,"ldterm")<0){
+    close(master);
+    close(slave);
+@@ -1211,7 +1211,7 @@
+   close(master);
+   return(0);
+  }
+- if(isastream(slave)){
++ if(fcntl(slave,F_GETFD) < 0){
+   if(ioctl(slave,I_PUSH,"ptem")<0||ioctl(slave,I_PUSH,"ldterm")<0){
+    close(master);
+    close(slave);
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index eea662508e3d..abfd65afd4db 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -4,5 +4,5 @@ DIST mc-4.8.27.tar.xz 2510296 BLAKE2B efb0f3a8beb7285a793085a8e3b3a49619d0f8a4ba
 DIST mc-4.8.28.tar.xz 2333072 BLAKE2B f4218e6c166df85b7b3736f0fd1414c9507c72074f06001f12b114ce6c6fbbf3688ab850aa70f5063eb3920736f878e113eb39a5d261ccfc3ffa9dab473a8436 SHA512 ca3b3a57281e9387cb52bf1fcfc3f39a4d5f438aafc256dc492c192678824f67c983a852c759664efc5bc6d0de471c9b3929834f8301f6302ca1ebeee513fdfd
 EBUILD mc-4.8.27-r1.ebuild 3287 BLAKE2B f7775d8d551809cfa939ef94fe7be10d2c89dae8c8a004ddb7af948fa88c27100d7f27e8cc9401697cc62b2c0608cc7f6b63d6db5e98f76687ed1d409c351c3b SHA512 1dbb77669c0b657db22948a8f424cffa10f5b0113384ba52c88f89650051d6632b23cbec9fadae0ac838db4b6abdc004174fb08a731aa016e238a801c07713ea
 EBUILD mc-4.8.28-r1.ebuild 3286 BLAKE2B 97f5a53cca2a057daee1c9514203c67ec00d7071b3bb48f94d97719fb1f4aade16289b14b57ea2c4dc353b55a49cbdaeff9ff4b1f020d3c867680a6516e50d19 SHA512 d857d1cb3ab6fc9ef732ffbde363326167517144dc4c23758d3553ca1390edceb27bce0f3f16d2ed884aab954858131c5c4845da1db044876e2534b7f33ca49c
-EBUILD mc-9999.ebuild 3571 BLAKE2B 28c8ceb41679fe58ec6bc122d59fd7ba2432d55d27fb46946afa437309999195d612986dd9e8b80a654fd90cf1bd8cf237770290cd21d61d626a7226dcbcd640 SHA512 b8d5d5ec38a2d0d0020545f3f2a0185eb6a711453688a3f2dd3e8af0fdfeb3ef23abefde18d23833f2bfbcea9db8b71c742a4f687a6ceeb921437abbe047c83d
+EBUILD mc-9999.ebuild 3573 BLAKE2B bfc47edaf0d2d929fba3abd75c739bcbc213c18344be024f0ea773dfdd3ae52e27177c6c8028a939550b384d6a7b9e4c594b9da2bf79a76e7003a098e75f3e7e SHA512 a577f23011c6382b671d46724e57effeff59c4c3e608fa8f05622d8c240c142cc776504c21f21cc779530a982f76f44875bfe2542e5bb716ff3a97951e3b2c83
 MISC metadata.xml 771 BLAKE2B 9680a9a9c9cdd9dd6c7972947f8d62eab08e14c8c1285009f4f55a90409bca51ea9bf72be913eb5812db7723230fa469acbc731a959b7caaa9473136b68115e4 SHA512 5c4dd207f8f3fc8c33bf571c78f50e51a4331ddddaa1b0cfdee93601b86d34a234482a1168ba021440fde04bcc4e034e223e89413a034ddf21faca08a112a9e9
diff --git a/app-misc/mc/mc-9999.ebuild b/app-misc/mc/mc-9999.ebuild
index 186c6b0f21c5..418ebc976d9a 100644
--- a/app-misc/mc/mc-9999.ebuild
+++ b/app-misc/mc/mc-9999.ebuild
@@ -63,7 +63,7 @@ src_prepare() {
 			$(find . -name '*.[ch]') | sed -ne '/^#:/{s/#://;s/:[0-9]*/\
 			  /g;s/ //g;p;}' | grep -v '^$' | sort | uniq > po/POTFILES.in \
 			  || die
-		./version.sh ${S} || die
+		./version.sh "${S}" || die
 	fi
 }
 
diff --git a/app-misc/rover/Manifest b/app-misc/rover/Manifest
new file mode 100644
index 000000000000..e0ed4e0ba34d
--- /dev/null
+++ b/app-misc/rover/Manifest
@@ -0,0 +1,6 @@
+AUX rover-1.0.1-install.patch 2899 BLAKE2B f140843144232c7b448c303a2548bf17aa5bfc6a2363bb3d1149bd43553ea76522c52b10c9a8936b59a7be0c8214e738fb8e7b12965815d5dac70364ade04aac SHA512 caecf106d29d04ac4b34bb7eeaa57ba76e9b26bdfd7d6224da16db876a4e8da491d7e5379516ac6e10b77b86c8bb35b1a755737ce91352b9a2ed447eb257394e
+AUX rover-1.0.1-ncurses.patch 1839 BLAKE2B 7bcc3dda3c224cbc24b82a58409a83ca102071420db5329fbc1eb01ced72b5b88c813ea4cdfe0aad99960767e785c04acddcd6e366a0cb486f7198f218265b19 SHA512 6deae37dcd38e6bf33604ff10f9e061ce5295f2c68def564fac94469e0d1f927b90f123b8d2461e0cb332cde6979babbbf72140381afa49d2f08acffdd63a993
+DIST rover-1.0.1.tar.gz 18068 BLAKE2B 7d755cb46185093cc17b4186e98e4b3646d00c5ccc48e6f83056238be1b990ada2e2db5fc83bd22f401d347530dc3a3d6509fe8e58e2010cabdef87fe847ec77 SHA512 9cac075438fe923064b143650670915bfb8ddad852d58aab451d6ccc4ea1fca15d917834c5cf153e964a3a9cfca08ec0d5263e2516ed44f8c9e5555edd8836d4
+EBUILD rover-1.0.1.ebuild 798 BLAKE2B 1124bbe7baf3b23703e03f8acf05ff3ef2a4309a12b45b4cb1f5332edb6ee1d9f799b251b96a86f6c019fb7a2aa278cf90bf2fbbde593295a27d6fde35054fc9 SHA512 e3f839d131039aa75c6ae3fa2378fe5ecfc3499f44d1c9e8373e13b76b0bc308eea94de31e952cc9e90b3321158f120b9bbe51ead4b50e9b56f8bba1d54cb0bc
+EBUILD rover-9999.ebuild 717 BLAKE2B 87d34f679168e156bfc15b28c3305aaa5d1a8b971c9e12fdb2ae23f9757b242a53b07d79d65c4c75e7a8d979e02872d3126c8078f296cb9f12f0eb2d71bacdce SHA512 c88fc901b19542096d564a3e3465178bdce5bfab81717f3571c265298534af1ee511a04334079edc77165afde7e9ffa3bd40004536b5de60876b951f6b4d0db4
+MISC metadata.xml 431 BLAKE2B 5e723e0ee07fdab24a0791ade98d2b75c65bf7dbbd3263266568e7af4bee97a6708199eb4490c70350c4c39d4091d52deebad30382058233fc44ba63a77ad42b SHA512 a1385e42eb6bfde3e19060077372f9824f23bd8e5c4c6aac01a46e15f1f6dabf27cdc154af10c95e4b2b6b7e92d4ed1353ae3c356266283c619cc08da197ca53
diff --git a/app-misc/rover/files/rover-1.0.1-install.patch b/app-misc/rover/files/rover-1.0.1-install.patch
new file mode 100644
index 000000000000..c64473d4092b
--- /dev/null
+++ b/app-misc/rover/files/rover-1.0.1-install.patch
@@ -0,0 +1,113 @@
+Upstream-PR: https://github.com/lecram/rover/pull/40
+From bceeabdf443d5e03ac38a80a195383d3ef800ffa Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Tue, 3 May 2022 09:29:28 -0700
+Subject: [PATCH 1/3] build: Use standard install variables
+
+This removes DESTDIR from both BINDIR and MANDIR and adds it directly
+to the intall and uninstall rules.
+
+This also moves 'man1' directly to the rules as it should not be
+configurable by the user.
+
+And lastly this removes the non-standard and now useless MANPREFIX.
+---
+ Makefile | 19 +++++++++----------
+ 1 file changed, 9 insertions(+), 10 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 8fea662..43c90f4 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,8 +1,7 @@
+ LDLIBS=-lncursesw
+ PREFIX=/usr/local
+-MANPREFIX=$(PREFIX)/man
+-BINDIR=$(DESTDIR)$(PREFIX)/bin
+-MANDIR=$(DESTDIR)$(MANPREFIX)/man1
++BINDIR=$(PREFIX)/bin
++MANDIR=$(PREFIX)/man
+ 
+ all: rover
+ 
+@@ -10,15 +9,15 @@ rover: rover.c config.h
+ 	$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(LDLIBS)
+ 
+ install: rover
+-	rm -f $(BINDIR)/rover
+-	mkdir -p $(BINDIR)
+-	cp rover $(BINDIR)/rover
+-	mkdir -p $(MANDIR)
+-	cp rover.1 $(MANDIR)/rover.1
++	rm -f $(DESTDIR)$(BINDIR)/rover
++	mkdir -p $(DESTDIR)$(BINDIR)
++	cp rover $(DESTDIR)$(BINDIR)/rover
++	mkdir -p $(DESTDIR)$(MANDIR)/man1
++	cp rover.1 $(DESTDIR)$(MANDIR)/man1/rover.1
+ 
+ uninstall:
+-	rm -f $(BINDIR)/rover
+-	rm -f $(MANDIR)/rover.1
++	rm -f $(DESTDIR)$(BINDIR)/rover
++	rm -f $(DESTDIR)$(MANDIR)/man1/rover.1
+ 
+ clean:
+ 	rm -f rover
+
+From 91dfa8e9b37b1433ebc3210a06779fd5163c70fb Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Tue, 3 May 2022 10:13:19 -0700
+Subject: [PATCH 2/3] build: Explicitly set variables
+
+---
+ Makefile | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 43c90f4..b54fc88 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+-LDLIBS=-lncursesw
+-PREFIX=/usr/local
+-BINDIR=$(PREFIX)/bin
+-MANDIR=$(PREFIX)/man
++LDLIBS := -lncursesw
++PREFIX ?= /usr/local
++BINDIR ?= $(PREFIX)/bin
++MANDIR ?= $(PREFIX)/man
+ 
+ all: rover
+ 
+
+From f0518c52fef6f0822dc553e261b37db8075ca07e Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Tue, 3 May 2022 09:29:58 -0700
+Subject: [PATCH 3/3] build: Use FHS and GNU paths for MANDIR
+
+The FHS path for MANDIR is /usr/share/man.
+
+https://refspecs.linuxfoundation.org/FHS_3.0/fhs/ch04s11.html#usrsharemanManualPages
+
+While GNU directory variables show MANDIR to be DATADIR/man
+
+https://www.gnu.org/prep/standards/html_node/Directory-Variables.html
+---
+ Makefile | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index b54fc88..291a7b3 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,9 @@
+ LDLIBS := -lncursesw
+ PREFIX ?= /usr/local
+ BINDIR ?= $(PREFIX)/bin
+-MANDIR ?= $(PREFIX)/man
++DATAROOTDIR ?= $(PREFIX)/share
++DATADIR ?= $(DATAROOTDIR)
++MANDIR ?= $(DATADIR)/man
+ 
+ all: rover
+ 
diff --git a/app-misc/rover/files/rover-1.0.1-ncurses.patch b/app-misc/rover/files/rover-1.0.1-ncurses.patch
new file mode 100644
index 000000000000..52c64c76b29a
--- /dev/null
+++ b/app-misc/rover/files/rover-1.0.1-ncurses.patch
@@ -0,0 +1,72 @@
+Upstream-PR: https://github.com/lecram/rover/pull/41
+From 9e1f635a4c31d1621141dce51bb620365c784a0e Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Sat, 7 May 2022 08:41:22 -0700
+Subject: [PATCH 1/2] build: Use pkgconfig to fix undefined references
+
+On gentoo the build also requires -ltinfow which is exposed
+by the ncursesw.pc pkgconfig file.
+---
+ Makefile | 8 ++++++--
+ rover.c  | 2 ++
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 291a7b3..bbf376b 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,14 +1,18 @@
+-LDLIBS := -lncursesw
+ PREFIX ?= /usr/local
+ BINDIR ?= $(PREFIX)/bin
+ DATAROOTDIR ?= $(PREFIX)/share
+ DATADIR ?= $(DATAROOTDIR)
+ MANDIR ?= $(DATADIR)/man
+ 
++PKG_CONFIG ?= pkg-config
++
++CFLAGS_NCURSESW := `$(PKG_CONFIG) --cflags ncursesw`
++LIBS_NCURSESW := `$(PKG_CONFIG) --libs ncursesw`
++
+ all: rover
+ 
+ rover: rover.c config.h
+-	$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(LDLIBS)
++	$(CC) $(CFLAGS) $(CFLAGS_NCURSESW) -o $@ $< $(LDFLAGS) $(LIBS_NCURSESW)
+ 
+ install: rover
+ 	rm -f $(DESTDIR)$(BINDIR)/rover
+diff --git a/rover.c b/rover.c
+index eca6aeb..342aa48 100644
+--- a/rover.c
++++ b/rover.c
+@@ -1,4 +1,6 @@
++#ifndef _XOPEN_SOURCE
+ #define _XOPEN_SOURCE       700
++#endif
+ #define _XOPEN_SOURCE_EXTENDED
+ #define _FILE_OFFSET_BITS   64
+ 
+
+From 7b5983d9d90d8ec0ff6e846a7fc7126cddc1d808 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Sat, 7 May 2022 08:49:07 -0700
+Subject: [PATCH 2/2] build: Add CFLAGS default
+
+---
+ Makefile | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Makefile b/Makefile
+index bbf376b..c2890fe 100644
+--- a/Makefile
++++ b/Makefile
+@@ -4,6 +4,8 @@ DATAROOTDIR ?= $(PREFIX)/share
+ DATADIR ?= $(DATAROOTDIR)
+ MANDIR ?= $(DATADIR)/man
+ 
++CFLAGS ?= -O2
++
+ PKG_CONFIG ?= pkg-config
+ 
+ CFLAGS_NCURSESW := `$(PKG_CONFIG) --cflags ncursesw`
diff --git a/app-misc/rover/metadata.xml b/app-misc/rover/metadata.xml
new file mode 100644
index 000000000000..e0477390ef0d
--- /dev/null
+++ b/app-misc/rover/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>orbea@riseup.net</email>
+		<name>orbea</name>
+	</maintainer>
+	<maintainer type="person" proxied="proxy">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">lecram/rover</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-misc/rover/rover-1.0.1.ebuild b/app-misc/rover/rover-1.0.1.ebuild
new file mode 100644
index 000000000000..ea3173754330
--- /dev/null
+++ b/app-misc/rover/rover-1.0.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="simple file browser for the terminal"
+HOMEPAGE="https://lecram.github.io/p/rover/"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lecram/${PN}.git"
+else
+	SRC_URI="https://github.com/lecram/${PN}/archive/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="public-domain"
+SLOT="0"
+
+DEPEND="sys-libs/ncurses:=[unicode(+)]"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${P}-install.patch"
+	"${FILESDIR}/${P}-ncurses.patch"
+)
+
+src_compile() {
+	emake CC="$(tc-getCC)" PKG_CONFIG="$(tc-getPKG_CONFIG)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
+	dodoc README.md
+}
diff --git a/app-misc/rover/rover-9999.ebuild b/app-misc/rover/rover-9999.ebuild
new file mode 100644
index 000000000000..590a037551fe
--- /dev/null
+++ b/app-misc/rover/rover-9999.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="simple file browser for the terminal"
+HOMEPAGE="https://lecram.github.io/p/rover/"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lecram/${PN}.git"
+else
+	SRC_URI="https://github.com/lecram/${PN}/archive/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="public-domain"
+SLOT="0"
+
+DEPEND="sys-libs/ncurses:=[unicode(+)]"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_compile() {
+	emake CC="$(tc-getCC)" PKG_CONFIG="$(tc-getPKG_CONFIG)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
+	dodoc README.md
+}
diff --git a/app-misc/rpick/Manifest b/app-misc/rpick/Manifest
index b9828f50314c..748ae112d538 100644
--- a/app-misc/rpick/Manifest
+++ b/app-misc/rpick/Manifest
@@ -131,6 +131,6 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
-EBUILD rpick-0.8.10.ebuild 2517 BLAKE2B 86dc7b2fd8f52375692b350305557723aa5a4b69453bf1a6e9415d21b40896e07b3ffbe232baf035328a5c2c8718274e0ae8ee75297aed5e15e02dddc174d2e2 SHA512 0b9b4b69e8763b0eb3e251c2506b6247c007e144cdeebd61579b42d895ad8ce048d90cd7c27187db5ab16c0769c911d81b4763a23c0b6bc257339f57650b61d6
+EBUILD rpick-0.8.10.ebuild 2514 BLAKE2B f7cc031180c1439413742392ffc9b88576cea8f180f9a888823550f8948eecddd6212f64cf41677552e7f31f92872bebccd0df8f2aa22476e5d62186f50d9fbf SHA512 670d6b17e8df2d5021a72326a3f3d9679009d96e78ec0197d2a472ee188c73baaa35de7e0cf10451de8f479ee1135de1dd49c315ff34c8acc1cb1c7b1d8d8be7
 EBUILD rpick-0.8.9.ebuild 2495 BLAKE2B 539a674c848097047049978f72e17727e7f126196fd826814c586ba820fb84557b42225ef227415c64e457d6075b628106311a7d788f006b3aaf1ccbb3d6ef0a SHA512 498554d7ea90d873ecbfcaa1cb2fec315e758f7bd72772d1602945ac873409e57b6ddebe65594e2dde73be0a6875e6197ad2840b41b9b7eb19e5e9ee56108b4d
 MISC metadata.xml 982 BLAKE2B 81e304c7c73f959b09d1bb5f2d26d1495930f1b340552fbdb989c8741dba6f5ee7b8801e3eb1d7063947f8f424d0c32ccc66c29cf6508ce8c11305e45febf322 SHA512 bfa865140ae1320670b94f4f383931dfc9bbf1a0278597a283cd64d538362d95751e9b9b53a1a46aa96a835a69b9425518760bd286d0375c550d0e110d1f4f08
diff --git a/app-misc/rpick/rpick-0.8.10.ebuild b/app-misc/rpick/rpick-0.8.10.ebuild
index 26361b584d7b..6fe08c160355 100644
--- a/app-misc/rpick/rpick-0.8.10.ebuild
+++ b/app-misc/rpick/rpick-0.8.10.ebuild
@@ -122,7 +122,7 @@ SRC_URI="$(cargo_crate_uris)"
 
 LICENSE="GPL-3 Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 CC0-1.0 MIT Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 QA_FLAGS_IGNORED="usr/bin/rpick"
 
diff --git a/app-misc/tdl/Manifest b/app-misc/tdl/Manifest
index 68a6db32911a..e7f32fc34536 100644
--- a/app-misc/tdl/Manifest
+++ b/app-misc/tdl/Manifest
@@ -4,5 +4,5 @@ AUX tdl-1.5.2-main.c.patch 4967 BLAKE2B f609c3a44996ddf4bac91f65e28e3dbad4600284
 AUX tdl-1.5.2-man.patch 11004 BLAKE2B 849601edce8452c3ca590b6b10f211ee81355adc121ff878fee165758bde10cc58b4a72a0bb71855b58093ff45a21d51761e24563b50c8be88ebb61d9d1a50eb SHA512 fef2ca8f8c6db0b61037ad10269fe185f2d5cb1ffdee0560acdba61be87d71d2195471412d26a5c6e7766332d9a13bf95774b0374de14b6df7b4a97ad27e8d32
 DIST tdl-1.5.2.tar.gz 66057 BLAKE2B cc2d5581126d995098b5dc3032c97213614acaea3b984a507a824da2ba4d3be9afff954722f29acf0b9bd26db42ada22d67fc9110496961c2cb3104d9b4b7ece SHA512 8c07a5b6a5434bb567a2d68b6e0215bbfa7be3f7176ae1042652ac18684289117230af25d8d161fcf1ba27d9b740fd3fcd43c3213467b533de64390686481fe0
 DIST tdl-screenshot.png.tar 20480 BLAKE2B ce9284501ba1550179e1c3da54399a802aae3c0fb23b9a1ea25a1adb0f5c0404fe7694a360435913bb91cc1977d71561050ec0fe4e1681db775cdc7ec5fa11b7 SHA512 caca9793626b320ded4c7f16425b98e4bfde9ab0ca3c1bea60ecc8aaa8db080ab6fc3c474aef4d56e394b6415ec1162671329912aa22452dbd5dc72b50c7c8f6
-EBUILD tdl-1.5.2-r3.ebuild 1535 BLAKE2B 494cc0fe3d5cc7490c6bcbab33ab412ce688834412ce5ecbbf8c8e8fbaa36fa62cfd7948155c7674382d3e943c2830028bbe9c09393a4e0a23d1f62693a30233 SHA512 0e591794f384544c46a23e9e926d8dd841b9f5858bb18a89b983529187a6a8804139e1a696ab75873d52591390fa30add3ef66d85c641400dc05e220fa96af98
+EBUILD tdl-1.5.2-r3.ebuild 1537 BLAKE2B 52d75bf6f5dfaa2bbf76f1f4d1ce00fbb0bd0c3937570414fc3f72a9f2f9d60ecb1cec1317dedcd4b96ef338eb32c0434bef92ba09d5dc684673fb600911aa1c SHA512 cbab76fa758bb43ef3307346a052fcb76afea6c74107c151ccf575b4a69a4a728a91c9477b16d568ddca3106d68c0875910a3f7ea0eb0a2605726fa59e29bdc8
 MISC metadata.xml 508 BLAKE2B 3a0e69cf69b2db3288f73929c4280be983ee7d53d30482b8a5a7c080e28c9a209a6018b48ec7a949e35357da919220bb4e125ffdb490aa0b2af3607676aee1d4 SHA512 f319b229a3295ecd97abee52e5d13e443893410764e744c32c6919c4cb78f916587036e907e1a2f538b51f7e308dfbfb7bff406e8f6d46ea6d6bae39ca9ab392
diff --git a/app-misc/tdl/tdl-1.5.2-r3.ebuild b/app-misc/tdl/tdl-1.5.2-r3.ebuild
index 075f1712868c..9a3ffcabd822 100644
--- a/app-misc/tdl/tdl-1.5.2-r3.ebuild
+++ b/app-misc/tdl/tdl-1.5.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -41,7 +41,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf=( --prefix=${EPREFIX}/usr )
+	local myconf=( --prefix="${EPREFIX}"/usr )
 
 	if ! use readline; then
 		myconf+=( "${myconf} --without-readline" )
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 2e9dd22b5bbc..9ee955d47ad3 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/libalkimia/Manifest b/app-office/libalkimia/Manifest
index a2c56d80cd8a..596216ec43ba 100644
--- a/app-office/libalkimia/Manifest
+++ b/app-office/libalkimia/Manifest
@@ -1,7 +1,4 @@
 AUX libalkimia-8.1.0-cmake.patch 1453 BLAKE2B 9dfb249e5fa95e78083f1f010960253915831888959944511d6e945a81f1f24a9e060c76e4927ac98ea8847c46b04dd8a1910079deb2ec0514a5b20d7c977d52 SHA512 61396c87615fd1105d1a3f10b687f987aaad6ca533b42ba36e9e5179a375e505652afad097726e8f2fd7da893c9593fe990461e7afa85b72933e803a8cf743db
-AUX libalkimia-8.1.0-missing-header.patch 733 BLAKE2B 9b8892938b68ae8cfb7eb7d47361f2f196a4c214e6f226bc85520f890d611e506fd575143b1754e748a8ad834168999e1535feb5b3a4d9b565f52332e4bc09b8 SHA512 2e678505952c6b8aa9db893c39fc5fa300c83c0970d64f81d86acc95ff7b0cb98daf2cb84a06b12ebdbc285319960497403321e48b52e388dd424505c02ee638
-DIST alkimia-8.1.0.tar.xz 230804 BLAKE2B 9cc005f8550181b4bf5dd945ac22592d711f0e9689758d56c62272d4879181f73faeaebecab24d74a790f6c6d1a59c42295ceb2c23d09195a76f7e6b6b4e53c0 SHA512 c3d0851ec6e5af7f690059f2c80942bbe69c6bde946898ba4a124c344dd47e0fba4e6ed0a5320e36385c060c49d5eeaaca35bc0a41410ef4ad849a4f9541d4d3
 DIST alkimia-8.1.1.tar.xz 252332 BLAKE2B 35c5cbca47e993d0a771ec723fcdd764265b2d0706a77ac06bb892b0717f791bfbceb2611b64810abe9fb209ed065abae1545efa512009003a3626aa84940181 SHA512 3e96f5b32da3d8a7f23b3b0f0a0ba7923e472b972c06b35f918c7f00d1745fa747afb6b8fdc1d596b2c1d9757a8037de04a039047f47eb46383070721da05258
-EBUILD libalkimia-8.1.0-r1.ebuild 2039 BLAKE2B a40f39790fcce8cff97f55d4859de55036aba63eea1e09dbc1154456a1ce9350e0c90a876eda0e892008e9d40b9c224fa51cf3c9925f8308910cb69077a47b5a SHA512 2c649b95a385487c0a6dab067d3d3ab9f0195f58a4987f1babfc05e94b5384bbbaff1bb56d39080e0b8dadbfbffaa3e2e41e0146a9030552773361ecd2f03144
 EBUILD libalkimia-8.1.1.ebuild 1996 BLAKE2B 9f7d94bae5d8b9b42e0b8b0fae1d7f56e82c47bc4674030e5f838b0f90852323de87a8453412bcef946242e92239f7fc32ffe010a4b92a1ca6a3120f75efb2ed SHA512 109bf6b54df3c54b4afcfd18605bb749be330bd0d66d3afac1cb80a00a36d5ffc8a1f1ff6c20440700870528d6c705fd74026e3ca79f3b6ffc143c62c8fbce0e
 MISC metadata.xml 420 BLAKE2B 719c2414ed5970b3c11b73d5fd49ca6fa3d9bd11d672bf33d37050de21b979c3b0b43f4c06b3b935befa2ae23f8440642fff9f9d0a9901dfee9da35c03a2379d SHA512 072388b1ba53e4a727607ae600fc83e8c4062823be4c5c7252aed321354ecc31e6601f83769f4914b7ef56d659ec5c031ab03e634bb74569bab541f9e6ae4bdd
diff --git a/app-office/libalkimia/files/libalkimia-8.1.0-missing-header.patch b/app-office/libalkimia/files/libalkimia-8.1.0-missing-header.patch
deleted file mode 100644
index c1f1ff463ee3..000000000000
--- a/app-office/libalkimia/files/libalkimia-8.1.0-missing-header.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0e398425030bae0cfe7be70ce82d61e674160a97 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 5 Mar 2021 22:40:40 +0100
-Subject: [PATCH] Add missing QUrl include with -DBUILD_WITH_WEBENGINE=no
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- tools/onlinequoteseditor/mainwindow.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tools/onlinequoteseditor/mainwindow.cpp b/tools/onlinequoteseditor/mainwindow.cpp
-index fad7e85..d5a3026 100644
---- a/tools/onlinequoteseditor/mainwindow.cpp
-+++ b/tools/onlinequoteseditor/mainwindow.cpp
-@@ -28,6 +28,7 @@
- #include <QComboBox>
- #include <QDockWidget>
- #include <QLineEdit>
-+#include <QUrl>
- 
- class MainWindow::Private
- {
--- 
-2.30.1
-
diff --git a/app-office/libalkimia/libalkimia-8.1.0-r1.ebuild b/app-office/libalkimia/libalkimia-8.1.0-r1.ebuild
deleted file mode 100644
index 4bb9abf961eb..000000000000
--- a/app-office/libalkimia/libalkimia-8.1.0-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-KDE_ORG_NAME="alkimia"
-KFMIN=5.74.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${KDE_ORG_NAME}/${PV}/${KDE_ORG_NAME}-${PV}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Library with common classes and functionality used by KDE finance applications"
-HOMEPAGE="https://www.linux-apps.com/content/show.php/libalkimia?content=137323
-https://community.kde.org/Alkimia"
-
-LICENSE="LGPL-2.1"
-SLOT="0/8"
-IUSE="doc gmp plasma webengine"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	!gmp? ( sci-libs/mpir:=[cxx] )
-	gmp? ( dev-libs/gmp:0=[cxx(+)] )
-	plasma? (
-		>=kde-frameworks/kpackage-${KFMIN}:5
-		>=kde-frameworks/plasma-${KFMIN}:5
-	)
-	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-cmake.patch"
-	"${FILESDIR}/${P}-missing-header.patch" # bug 774321
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_FINANCEQUOTE=OFF
-		-DBUILD_TOOLS=ON
-		-DBUILD_WITH_WEBKIT=OFF
-		-DBUILD_DOXYGEN_DOCS=$(usex doc)
-		$(cmake_use_find_package !gmp MPIR)
-		-DBUILD_APPLETS=$(usex plasma)
-		-DBUILD_WITH_WEBENGINE=$(usex webengine)
-	)
-	ecm_src_configure
-}
-
-src_test() {
-	# Depends on BUILD_WITH_WEBKIT, bug 736128
-	local myctestargs=(
-		-E "(alkonlinequotestest)"
-	)
-	ecm_src_test
-}
diff --git a/app-office/libreoffice-bin-debug/Manifest b/app-office/libreoffice-bin-debug/Manifest
index 28110b215ade..ceee79be7985 100644
--- a/app-office/libreoffice-bin-debug/Manifest
+++ b/app-office/libreoffice-bin-debug/Manifest
@@ -1,31 +1,11 @@
-DIST amd64-debug-libreoffice-7.2.6.2-r1.tar.xz 1471522536 BLAKE2B a3ba5f0f9fb6039a6f1759ce7a09fe78a7c5b9b81c9a25ed43074569c72633f0efe8f0178ad591e13f9bf9aaf4b820d73364e35ec11600903c3e43d18524f32f SHA512 3c67cf8bf10f8667719ed0f1df811a14e2b69d33e767269ecd1e380efb9fec76e2bb2ef9ef5442841eb3a22278fcf8deb852b9e6b0afa797473844f72170dc80
-DIST amd64-debug-libreoffice-7.2.6.2.tar.xz 1468971352 BLAKE2B b94770acb7c96f59f047b9ee468b29a621da2a379dfad4f295ed77bc8ac4c910884df9a5eaf38da03c8f58d4f62d3767f4c6cb791f96695357107a29bf4c9a5c SHA512 fe9eb2f3dffbb8f003ff05b2c98f30dcd69cb388eb9e045501caf6145ecb623b648abb91b9cca2873d17e1065738a2e7df9ee47150ea00e9891b719b4267a416
 DIST amd64-debug-libreoffice-7.3.3.2-r3.tar.xz 1497663004 BLAKE2B 50a3083f4faf1b10887f41cdfb0f263751d3e35ad8bece5df1a30e04a18d9b9cb04593bdf514a59600eaa3912f44d6699be0ad41e8317372c0b8b8605a3a2f0e SHA512 20b727e7912026248a5de940bf3072b00ad668be5501f54a2d93afa13e9bc4bace004771e7137dfabe94a789a6591323e06938b247d8ed5124b243f0acce8d7e
-DIST amd64-debug-libreoffice-gnome-7.2.6.2-r1.xd3 1382590 BLAKE2B 5f104ef0bd263b85c23dafbc5e6bd8062e797d1683d64ae8d26d60dbe4b946589ed9ab0fded67dd0fa5cbfce9781dc7764bb7c0dca12ff7fdc1bb7d03d231565 SHA512 0ca249d566cb8b1c4d9aa93c02c8e264a2f46e5f5cc3c7cf898d00c9e27fe5a99dc9454b1b614b97237d9a858cbd58ff686f0c94e8e744850b075990d1fae725
-DIST amd64-debug-libreoffice-gnome-7.2.6.2.xd3 1382303 BLAKE2B 71291a92cd245c2e9ed68fb01ff1543a26a81d345d13fe1e5c57527c6fb716e7bd6ee393bd500fcee526605784b20db9aa6e891897158e6767b3aecfee5e9ed4 SHA512 6a9b4df2bb53abe79cf4d268b2f4da5e2a1c93444b37dcc2cfd4e0fd37a53db59ab69b9ecd2152f5fbd48d073dd579fd1fa21080b84c6b61b59cbe05df556c73
 DIST amd64-debug-libreoffice-gnome-7.3.3.2-r3.xd3 1426942 BLAKE2B 4065ec4424c66cecb63a2c565e7622e822d0111d7791810ba7611626c188202b6213b5d61ac51e053b7a9b149de265b28d2a97891aa90269821fac780567a190 SHA512 470acdf23a0a63f5e3e70c050df421693674196019ef2f4f7e4238c8d8aca489b33748bc8ab3682b5b63a773c30c124219e1017ff58552ead31ca9091015c289
-DIST amd64-debug-libreoffice-gnome-java-7.2.6.2-r1.xd3 757133326 BLAKE2B 7528f922dcca1873d4dcbc9d70bcf20102bad875880e37680806d846179c7eb1c16b345b729397832321e5054742ef090c78e617381eb1fc2f1a4bd160498ede SHA512 d96b610bf976172136b9312102d3f5bbd17776c536d1107be809523cddd56342fd5352df4d8c5021968f8f2252f84eb13acfaae6e668b18d6624a9d89a41e028
-DIST amd64-debug-libreoffice-gnome-java-7.2.6.2.xd3 755642290 BLAKE2B b1a355f4fa92996990c481133bea367a3ed019796159be4c9f3e877dc50fb1d0e460aaba369f2b065073e6f2005e15030ef0812b6bea8a3ab4e069aefd7cd351 SHA512 5524b1215dbe0839d6a17d022a2c06f4df30dfe4cc623c61e0e122a4613eca459fa8d71e78b3868a587ea8bc23bbcfd72cecb6ede1c09f397efd98683efdc7bd
 DIST amd64-debug-libreoffice-gnome-java-7.3.3.2-r3.xd3 781950066 BLAKE2B 9029d5962874b841b331449809b89ef0e7558bd5c7417953c460489697b8eb3892e66d9d66c19906a76dd94f203e9e81b41e9df4a90f62fe4453c56f7c16d1cd SHA512 87099de1886084f238fa85bbfdeec4057fb8d59e9d6284b46d9a9a3f5abbf2c5715b2b685af3d2198fb1be0b2ada0c5f350b9cc26faf98094acb363d3f38a5e9
-DIST amd64-debug-libreoffice-java-7.2.6.2-r1.xd3 755727696 BLAKE2B ea3cdb76f3a58ad91646acac21fbd90f7fe1efe8bdc9cb5eee36b94d418b27bdbb25d3a3da23accb1f1c9cc5afbdd4e59ee065a16dd420ff58ce67eb9e40514b SHA512 e86356206729dbee21273b0c58a37bf4829f1a1a774c7840b93df728a3d5bf162c325a0551a9548079f913dcc4492b08ab1b3b152d8058c5f1883f216dcb6b71
-DIST amd64-debug-libreoffice-java-7.2.6.2.xd3 754236655 BLAKE2B 324345c211da2b8773e81db97821324be77a9dfb712ae5c377e09d9d7fe9c0c2f9d352cc241a23ccbf091aba721c738fe56b65e7db500d7041fa1c893b0be73f SHA512 0249814b8b5d07a99bb35c154ddc31cb228c066a9af4d87730b81caac628f189ac0717d883a116f3c99d3a2cf058015036aadb47241122c34495d94a0e595ec4
 DIST amd64-debug-libreoffice-java-7.3.3.2-r3.xd3 780540993 BLAKE2B d684f08931576e798847ccd8eeda1b2c9f46fd9af89d1b5c3b1c3d6b27e086d11e86946c6c628348666a19af23f11bdea6b4159fba400bbe2341ea2b52baf02b SHA512 a5c742c60d380585759ee5710c86559fe5e0b777f6b54e1c3b5fee0c6888b9a905f4272ca584765212d082aeae787ad4868d556d604047a63a494adb8eda8174
-DIST amd64-debug-libreoffice-kde-7.2.6.2-r1.xd3 460340283 BLAKE2B 9d65b86d77e1883d97d78b492a8e4a39af9e503f5972a710d6b243b7d55c06947702871c0b781b5f3444053606f508e230d09b3171d93cc9f11f3e68b270f9c6 SHA512 5c195aa7290f0e73959bc3e9b45c197a02f98d0f405e185bf06b43565b7096bbb978c366c51a816fce7a227fb5e7b547bbf8e23a5b088880d4681e4707437e9d
-DIST amd64-debug-libreoffice-kde-7.2.6.2.xd3 460398978 BLAKE2B 30d95ed2b40fae34259d7922ad963fc330c2f9311320af4796e09c96b713234037c1c4d0a7e38e870d2ebd87dd6a8d0da48ba1d0e42f1c46da1f1cc63a40d8fa SHA512 c66330553a0bf09a1027d45e229065c71d6585cc3c1f6598b4ef393ae0aed14c223cfb8fe6f711c74caa0c3bfedbf02d45fb07c8560af465edcb77b08fc2bc3f
 DIST amd64-debug-libreoffice-kde-7.3.3.2-r3.xd3 475252964 BLAKE2B f201b68122d03628110f71b6b6ccbb9281e9efc023c0034b2ed620667c7f51156ca3c7f13609faca4e5e0bc8ba13612f8d7b2ca5867dfa6f1a3ff82c524c9af1 SHA512 f2f737a627226ce80c1ccb12a69d8eacc762cba52eba77c3017efdb4bf4a609956626024e4cd9a15dee3aa0090ac7a47795c3b01c0723eb6584f3c12753ded5e
-DIST amd64-debug-libreoffice-kde-java-7.2.6.2-r1.xd3 760418637 BLAKE2B 0e20b98b4dbb2a5ad80192a7e13912d06e044c2d9f10a79ab3687e69c322fd1b5c91835d8756921c50555f65816325ea6f74a78142a9feaf7b7b0f1882dcf2de SHA512 814f2dc13fab757fe6fada6a27ebd4572ce24b34a750dc1d35ae1c82b3de9ba53575a98efca009c54802ea3206ced17dd84bcb10a637edaa5c4cabb0cb6e8053
-DIST amd64-debug-libreoffice-kde-java-7.2.6.2.xd3 758655199 BLAKE2B 26382ff16e3155e5786ac7d7a1c0eabc815c8a45d8a129a5f07c39fa39fb678c212feb8699ebc9f120b223d0462af15c01bafb74c81f08d5213fa38e0b6d951c SHA512 7cc9292420941fecf9e9527a35b8a56238574793b64fc54b5fd8cb0754b62128c2193a9933664b46162f2aafe1afbb18a30b09f134ed39a81bbec3cf79f8f5d6
 DIST amd64-debug-libreoffice-kde-java-7.3.3.2-r3.xd3 785272796 BLAKE2B 6c4678af64da1913b52733fedce5ef544f18f78616d056eb42793e2fad17a1d5c4ec331dd4c9d1a5c0f5d65e59237d41cdcad324b6adda7bf1ff5c22ad28b3d6 SHA512 fac9fbf9a3185035a2132a9bcb8f0fb57bc2540b3f1758ad043563c74b51ad17b42d760a61b1fe07826a25d0c9e2e59be3fc607c3e9e80e16fe4e7d7e2934c82
-DIST x86-debug-libreoffice-7.2.6.2-r1.tar.xz 1440156912 BLAKE2B a17dc2680e1e6c595436d01318f0aa35c017fbcc5efdf2cf6114e39fed40690b92c9be42bf0f0c5d228ec48bd64634532d88c4f3e69ffb6b816a13106b89cc5f SHA512 cec6395dcd34b7ec8d04df1f6f95ab3caa10e311e2260e5e81d3ad24dec2301c8a5e269e93adcbd742207206baa04eb0c2b8f63ef133931ca9b9cf6f567ef7f3
-DIST x86-debug-libreoffice-7.2.6.2.tar.xz 1437742176 BLAKE2B 762e7eb6c7566983306920978b5e689fc7a75016c6861c4fc878c17e19a1b948e14d7ec6749dcaabd9d918d2583db1c9cf51f5d9e111530ef7550f3bcd92b8b7 SHA512 446122ffa154111062b7178acfe116e53c6335fd29963838f7e215fd91ee09c4aa51cd5bd058652a42cabe61b93672b7437067846d6020fb5be2dc93933e2fed
 DIST x86-debug-libreoffice-7.3.3.2-r3.tar.xz 1466296624 BLAKE2B 2978c81e86af058a583b97992de6a8e453f7c1825eeb7b71354dbc11b115803234dce7df88996372e8f1c317bfda9f3b0c3cda563af71b6c6cd66177cabd1978 SHA512 28c9d2a25661c066178559569e00966b277f78776762b4ff104c3ee4e6eeffe59683b1c17f4a102cedb0ab88b1311b5d70cb991376b08102c2c811ecf37cb612
-DIST x86-debug-libreoffice-gnome-7.2.6.2-r1.xd3 1340759 BLAKE2B 1aadc8f982d2e920eeca545f390076b9f5541a91c2b793949903d1c68fed4fd74344e33ba9140d590e80947a4add485f42ce888c77dfebe103a5dd05a8a8b334 SHA512 16b3f12ae3d329f520bd6e1da2ef29baa783489e90db7400af443bcb2ff9a170a7a58838a58daea7c8a7d7eb78574b0affb3f6f5431c767d2a8148651a90ba2e
-DIST x86-debug-libreoffice-gnome-7.2.6.2.xd3 1340712 BLAKE2B 8004167ce6f32f97720399fa67de5a6f3c2b2df6ec815fa5c3764755aeefdddf5c67c34b8d2058dfcae420481b1cccf67d9cfbb2c416ba0d18bf24416bfe2bf1 SHA512 1ba6d86ab8396992a326144b3225af4f8d41a97bb97af2892ae9393d292c751598325f73ed5010f7de61099bb1861abe105a5fcb02579c63733957fac533aad2
 DIST x86-debug-libreoffice-gnome-7.3.3.2-r3.xd3 1385520 BLAKE2B 6275a12d860f493d0838e8cac518cd0a2a840a6be99d89b7964a44f81f26312c87bded4e67d33e4e6e4223ce14b4428e399da60b25f96e24085eef618cddd43b SHA512 ef35204b09b0ea62620950dd7f17cc012a31508963c6442fae2b36d39d468223d28fd251ac82ba26416b17bb3f89c3b4ed38165942da5b271192b525f08eb37b
-DIST x86-debug-libreoffice-kde-7.2.6.2-r1.xd3 438013793 BLAKE2B 9763c34ce81e8ff14bb5ad17cccfec7d835db1ebd6e5129b9940fc7a9c41639a379b4be00b331e6d066aadee51d556f2a1c60a843d001a0f5cb6a89ed3959a15 SHA512 a9149b67b2c6a5d6b19e2a7386c90378b2669285358317a720b8806cb4a670a404d51b8d789a7862c4e1637eada66fd78f0bbf7cb83fb463e7601fafe926838e
-DIST x86-debug-libreoffice-kde-7.2.6.2.xd3 438069622 BLAKE2B e5602a31725801540300a78ec359d67c6df1c29c4663c61e5e72c7bc4bc119eda6cb005e4aae763c3c43df7fa6491419dfc8d7f7dfd3ccd61de2e53cf69c7fb2 SHA512 dd0cb3c92a415dae00f476c31d3185cb65acbc03edc1c303c8dd21ca282c783293aedfdc21412b6a5a73d92da99b6c32b478c269852152977e099297cbb7713a
 DIST x86-debug-libreoffice-kde-7.3.3.2-r3.xd3 452781808 BLAKE2B 7f4ec8aa2723949aa56170803e451639a3e6608449e465c817166ff8ffc9552a111186bccdd835449090786a7add2898445559368fb5a8c71b600f30a31ed968 SHA512 853a9cfd782077a86d9e34f1df9ae1718e36f628877a6aa7b311e82e56beca86322959d95beceaa2a4b760fc28bb1191fd4d9d8a4063acc648165e786f58033c
-EBUILD libreoffice-bin-debug-7.2.6.2-r1.ebuild 2538 BLAKE2B e0eea0332798d68b7d6eb6788188af2f01b799c68c9110e0fd7bec7dda32c98898de2968538e47fabcaa4c3f798c53d9bb9c76f5026b9296021a60075b140599 SHA512 e88917ab3fe7b8fdcc99c03561b7ed38ebb31d9f27b6b426c3f527c923cb2266e79a26fe85e83e7039a84b08bba5767263d272f67828fadfe7150364d3688a44
-EBUILD libreoffice-bin-debug-7.2.6.2.ebuild 2451 BLAKE2B 5e3dfa9db695203636656a3cc16440f43d740adea37309f062f6290209885c71b5dfebe9e04edfbe2788b8972f37ccf2a550dd0e440dc16e20f7d5379f8a29cf SHA512 cbad6fb433a434742b2534798dcc9c6ade97f514defe1d58f6b7dd34a319f4dd19551825e31a92dca3c1b682e3de9cdf60881afff0f60b35626e042b8ce12ced
-EBUILD libreoffice-bin-debug-7.3.3.2-r3.ebuild 2537 BLAKE2B dff500770438b878d2b3becbd9cd891f9a5ad0007e42606805ed063b3651073e3795653eb5e3c6ae8d653e8ae4355b8301fe80d2cbb246351fb9b3555e827276 SHA512 40646d86a57a0fb6978a5a29d3a36179e827b968e14a3ebd0ab14bda947c2394fbfa66c04818a251820a7e1bad50cd9519a85ae5341136868f7ef6f7c246ca45
+EBUILD libreoffice-bin-debug-7.3.3.2-r3.ebuild 2536 BLAKE2B 5f503b15d77b316ec45399e6c6cc3d2dcc8b8960b83daa623bf7028808c6fc28b2ce0fc29f25a44ab10b8dca6332581126ce437310001787baadb6a9a8fb8246 SHA512 6aeb4fa56ea0620ced999b3fb231b2b3c133c9729a90933ca3a498ee9763112b34bb674e3cabb173e6adb71316a76245a727358b9ec11d085fb19fd3c8b1750d
 MISC metadata.xml 482 BLAKE2B 94bf0468867227f0b085d6ca86359e9ae852fb874ed95ffa6d9926cfcdc7173d5db4dfe1a0ed86daec746a4f867d42534465bb03402c5bd4d9ac6bb8101932d7 SHA512 d4f6a8f90659676fa509690059e462c1755e22792efeff0a571d8f04f9f167cbed22d5ce34928a4afbf2fc01bf7ea2b5e8f1a70d4a652a3df9153ed0ccbe1905
diff --git a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.2.6.2-r1.ebuild b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.2.6.2-r1.ebuild
deleted file mode 100644
index 9f2211232ee1..000000000000
--- a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.2.6.2-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-BASE_PACKAGENAME="debug"
-BASE_AMD64_URI="https://tamiko.43-1.org/distfiles/amd64-${BASE_PACKAGENAME}-"
-BASE_X86_URI="https://tamiko.43-1.org/distfiles/x86-${BASE_PACKAGENAME}-"
-
-DESCRIPTION="LibreOffice, a full office productivity suite. Binary package, debug info"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI_AMD64="
-	${BASE_AMD64_URI}libreoffice-${PVR}.tar.xz
-	kde? (
-		!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PVR}.xd3 )
-		java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PVR}.xd3 )
-	)
-	gnome? (
-		!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PVR}.xd3 )
-		java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PVR}.xd3 )
-	)
-	!kde? ( !gnome? (
-		java? ( ${BASE_AMD64_URI}libreoffice-java-${PVR}.xd3 )
-	) )
-"
-SRC_URI_X86="
-	${BASE_X86_URI}libreoffice-${PVR}.tar.xz
-	kde? (
-		${BASE_X86_URI}libreoffice-kde-${PVR}.xd3
-	)
-	gnome? (
-		${BASE_X86_URI}libreoffice-gnome-${PVR}.xd3
-	)
-"
-
-SRC_URI="
-	amd64? ( ${SRC_URI_AMD64} )
-	x86? ( ${SRC_URI_X86} )
-"
-
-IUSE="gnome java kde"
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-
-# the = is correct, the debug info needs to fit the exact binary
-RDEPEND="=app-office/${PN/-debug}-${PVR}[gnome=,java=,kde=]"
-
-DEPEND="dev-util/xdelta:3"
-
-RESTRICT="test strip"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="/usr/*"
-
-src_unpack() {
-	einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz"
-	xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
-
-	use x86 && use java && die "There is no build for x86 with Java support."
-
-	local patchname
-	use kde && patchname="-kde"
-	use gnome && patchname="-gnome"
-	use java && patchname="${patchname}-java"
-
-	if [[ -n "${patchname}" ]]; then
-		einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3"
-		xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3" "${WORKDIR}/tmpdist.tar" || die
-		mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
-	fi
-
-	einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
-	unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
-}
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	dodir /usr
-	cp -aR "${S}"/usr/* "${ED}"/usr/ || die
-}
diff --git a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.2.6.2.ebuild b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.2.6.2.ebuild
deleted file mode 100644
index 3bf7989da80b..000000000000
--- a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.2.6.2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-BASE_PACKAGENAME="debug"
-BASE_AMD64_URI="https://tamiko.43-1.org/distfiles/amd64-${BASE_PACKAGENAME}-"
-BASE_X86_URI="https://tamiko.43-1.org/distfiles/x86-${BASE_PACKAGENAME}-"
-
-DESCRIPTION="LibreOffice, a full office productivity suite. Binary package, debug info"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI_AMD64="
-	${BASE_AMD64_URI}libreoffice-${PV}.tar.xz
-	kde? (
-		!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PV}.xd3 )
-		java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PV}.xd3 )
-	)
-	gnome? (
-		!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PV}.xd3 )
-		java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PV}.xd3 )
-	)
-	!kde? ( !gnome? (
-		java? ( ${BASE_AMD64_URI}libreoffice-java-${PV}.xd3 )
-	) )
-"
-SRC_URI_X86="
-	${BASE_X86_URI}libreoffice-${PV}.tar.xz
-	kde? (
-		${BASE_X86_URI}libreoffice-kde-${PV}.xd3
-	)
-	gnome? (
-		${BASE_X86_URI}libreoffice-gnome-${PV}.xd3
-	)
-"
-
-SRC_URI="
-	amd64? ( ${SRC_URI_AMD64} )
-	x86? ( ${SRC_URI_X86} )
-"
-
-IUSE="gnome java kde"
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-
-RDEPEND="~app-office/${PN/-debug}-${PV}[gnome=,java=,kde=]"
-
-DEPEND="dev-util/xdelta:3"
-
-RESTRICT="test strip"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="/usr/*"
-
-src_unpack() {
-	einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar.xz"
-	xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" || die
-
-	use x86 && use java && die "There is no build for x86 with Java support."
-
-	local patchname
-	use kde && patchname="-kde"
-	use gnome && patchname="-gnome"
-	use java && patchname="${patchname}-java"
-
-	if [[ -n "${patchname}" ]]; then
-		einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PV}.xd3"
-		xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PV}.xd3" "${WORKDIR}/tmpdist.tar" || die
-		mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" || die
-	fi
-
-	einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar"
-	unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar"
-}
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	dodir /usr
-	cp -aR "${S}"/usr/* "${ED}"/usr/ || die
-}
diff --git a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.3.3.2-r3.ebuild b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.3.3.2-r3.ebuild
index ed28f7e94aea..7fcfcf3bd910 100644
--- a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.3.3.2-r3.ebuild
+++ b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.3.3.2-r3.ebuild
@@ -41,7 +41,7 @@ SRC_URI="
 IUSE="gnome java kde"
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="-* amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 
 # the = is correct, the debug info needs to fit the exact binary
 RDEPEND="=app-office/${PN/-debug}-${PVR}[gnome=,java=,kde=]"
diff --git a/app-office/libreoffice-bin/Manifest b/app-office/libreoffice-bin/Manifest
index 6cc39837bb28..10b573e0fa8a 100644
--- a/app-office/libreoffice-bin/Manifest
+++ b/app-office/libreoffice-bin/Manifest
@@ -1,32 +1,12 @@
 AUX 50-libreoffice-bin 158 BLAKE2B 2091698f80fbe097785c60b20f636150a2ee65bf52639fa1bb4a92341d050146040ad8912c5f5e3ca22e48ac3d819053c9948e256fb1d0e0901f7645934bfb89 SHA512 2d1158f48ac80f9212578d020e5659e777ff494adc3abc94438cec6890b88741f92ea2ed3bb4585ffdabe531d55c6938ca9408e9ece5a438e67d480eb406ed50
-DIST amd64-bin-libreoffice-7.2.6.2-r1.tar.xz 141875540 BLAKE2B 01c6127c08b07e842780fb6b224501fc555113646cfa25b186d1b932702d9780662afe2de97dc3334faddddbac57d26e13f4e0c32f710d57c693138ab08fc0a8 SHA512 afdd0daed052d7225e4ca8bf38cb51b3b12cd3c35829735bc9c559f579f16459f82e2c10f21f2b234d6324a2325fbade0bcacb93e564db4ec90bc0164ca84133
-DIST amd64-bin-libreoffice-7.2.6.2.tar.xz 141647232 BLAKE2B f3de787c4021a241e905c4da1e1427ff9568277d6f350ec4b4d16916d08b11f0b28e16abec1015e25cc949fc769a86bd642804bd39507c4fc284e53e9496bf0a SHA512 9334caff01d675ec3ba442199ef6e2216a9226da64aebf3173c3a170abc8c8574c9416f3d76446f9cf18fb048e73b9e83558a8d9e1aeae6516489666d4a9a2ff
 DIST amd64-bin-libreoffice-7.3.3.2-r3.tar.xz 142385916 BLAKE2B a46f7f3efa4db9a3a341cd69d445a4a82806880e6e14eec5bcc621fd9396f7d3ca68c05be6651169099f553412192ffeb7e3d5f127cd926ac408e465bb82036e SHA512 400a7d08907f86d48d28c392377ad02790f79bbe4b1147de70b21622cb622118e9e62c90ccc8f750e63f7efdc67209c789f63df49d7a388066ff4b5a375d54b3
-DIST amd64-bin-libreoffice-gnome-7.2.6.2-r1.xd3 1450552 BLAKE2B 338e5fb46fdb700ca104b4838459a91444f69d0cb26d0a3ccecd807e38306d6454498277a888b11406717ca3bf4883e0d785fcf9c49afe3bb73527faf40fc629 SHA512 ed4e0f50b9164ed75c723b22ba4d1cdeead201cfa9a84779131681840e08e7571e90635cc80fa7843eb7ffc1681586c49bafc63bfb0aa21eaff5cd146f877b71
-DIST amd64-bin-libreoffice-gnome-7.2.6.2.xd3 1432488 BLAKE2B 171840cf4ceda8fb52ec29cca9e48cf5f0f8167f6ac37980481a145b4bc5aed016cab6a898feba4072288b0301f3b261e7ea162ff03a0b7bb9eba49883140bab SHA512 006eb6afeb476e1272c7654797ceb142e8d3840af84b9a94328896eb03ae52d8c00ec0c5b879ed149c3f4d0d35870039f9d96b1052c3eb6a16c2c1bdf2ec5803
 DIST amd64-bin-libreoffice-gnome-7.3.3.2-r3.xd3 1485486 BLAKE2B 617fd8ae2496353cee690336fc3cfb5f5fbaf497d35d50b1bc26cd6cbb29a9e2f5b461157e8da8e3cec15d9dba9519dd388acd90144f25d46590b052b10cd394 SHA512 81dcd57dae4a20b8d629825155bb4c024bb9796e5e1deb44caaf4bc7aed4447a19eb396c33c96a1b04ebd908d69e24820e0415de46d1999331f70d4cfe18935b
-DIST amd64-bin-libreoffice-gnome-java-7.2.6.2-r1.xd3 30849546 BLAKE2B bdc00007147122e4d6d550fd12e5eef7a57982a2f9ad427b43443a78f46ae98c8c66ebc81cd6ae50cc60b9570c9284ae0370cfc005bc7bf3b89d30a7a24b304e SHA512 7a7b0ea1b1b1ea2a8e1935fa92ee6e18d4f21cc7abf95e390d2c21b18e5995877f2e72b90e9129b5bc128602ab10bc1cd6ad93a2332ff08fec4e4051395e87d3
-DIST amd64-bin-libreoffice-gnome-java-7.2.6.2.xd3 30838103 BLAKE2B 025c3d554e73ea4811892641a917a84880c2a2cd24dbfc6e1b31ee30827acb8eab6b94f48ce07a7a002bf8ac0bae62c08442cfa274981439c946896c0ce99e32 SHA512 fe03906327ae39ca32184c66fea151348c03bdfe83608605a8761f4c2679c31623d628de4f24b605b4adc1d64cc82a7bc2a3b6106acd360592c43ec2a225d17b
 DIST amd64-bin-libreoffice-gnome-java-7.3.3.2-r3.xd3 30886601 BLAKE2B 469e1f72bb8bc8a5707edf33fd5e67cd717d4a540d48598c165376a67e039bde84e5756ba4eafe3246e1755777e82cb9c55012a8d57dd2ae28003a280f3bb9f7 SHA512 e2816bcfb63d0602f0f4a840c9ddecf23868aca277efa59e74e60aa478236e93332b743ea4185a9c27f8d5f43db3874051f1bbbfc183d1c245b004e24e6a993b
-DIST amd64-bin-libreoffice-java-7.2.6.2-r1.xd3 30713882 BLAKE2B 771af8eb60fd269862da024b7a363bb109f4e630ef2cbab14e4e8af47f143d5ea7b244456dc97d3217cec1f02eedcc43b3e26ab60a84516bfa50f388092f8a41 SHA512 7ebfb1c3b647b09af0883a71b7c5e1c21a75d8e41b24a83f7bbc6fab8d33899b3647448cc1c17aa1630d8d0e21b1a4d202e7bc5c95e08247229a0b6ad5ce559b
-DIST amd64-bin-libreoffice-java-7.2.6.2.xd3 30714634 BLAKE2B 54ff35c9d5b239b8caeaf6fb6bd9269ae931230d5585afd73e7bd5b1bcd960add490614508e1d4bd09becfac5ffbb1683eeef959e1bad61e030a1f81ee19bcab SHA512 8d23e08879bf4057e539798568b5f8d50b1c4f5721c787430763cbfcebe5095185f389aa1bdf391d3ef7ace9ea6ffc43a8d5ec25a5dc3e6a1b3004a105d9b8f7
 DIST amd64-bin-libreoffice-java-7.3.3.2-r3.xd3 30751415 BLAKE2B 325deb2c13dff85682f4927cfd04c9699ec9c79564e602646f68e89a3b6e72c76aad972a60dd70b36ba7f20455964f670ad0673a408fc95a59aee8961888d547 SHA512 f5d696c984c2eaf4f28b7e44eeab199bc294b323d5215d71b9dff73797726ec24d20d18fac146d79d2e306868d8e8bd6773956a43dd7f3c03cb5ffd82b938f9b
-DIST amd64-bin-libreoffice-kde-7.2.6.2-r1.xd3 20950411 BLAKE2B 162d6477173389191630d1c6c3f77fef99f3ad1d70c45f7c79b99456b25f0c643dfa61681b09c2fb99a51108ec399bd0045255a751493fbb422bacc79e184655 SHA512 60f241d76a198c55da9f8f0d8b1a7575cbab09909e76eab591f56acf77d9c80c9a35608ae34c753d75126cb476150ed60bee71aea0a264a780d02144af10996a
-DIST amd64-bin-libreoffice-kde-7.2.6.2.xd3 20970286 BLAKE2B e4d41de640bfe99d4d480c863726dad37c69d7e0ad1fd54765d2556fa07ba60cdb0f97032437aaf4e8252b3100ed05cc0be71fcbb2a2d3ebfbbf0e752e1aa604 SHA512 c7f718e1b5aecd4be5a92c3cf65ac63cc5a764a38c54b942cb4fcc30283e3d0f46a67cce79082d2012d6ebfcc5634ba1a2c4c69bf214e6e2012d750e87dafff1
 DIST amd64-bin-libreoffice-kde-7.3.3.2-r3.xd3 20923444 BLAKE2B 1f50b67b66f21a3e83012ba6a203cd75003ef13e33d820e921ff3e91ead6df72b2f8bc0adddd61401deba647748e5d2f8b490e673f9bb5bc8eb5d0f64a62c588 SHA512 bf55af25bf7ac82b126c1be243c4e64b23d9b836c173a65c986cc8d09431f270cf99cb377228bd96407be36d365aa19014a2d19a003c99bc20c043b00f2c0859
-DIST amd64-bin-libreoffice-kde-java-7.2.6.2-r1.xd3 30841606 BLAKE2B 0649c91623c41d21c1e4f56e640f4d8552588ee0a42480c2c3465afcd61c6c5db88645e04d81c5f228ad1099a480dbbdf506554a28ebbf06b53925a3180b2457 SHA512 16d917e87c656aa425f4dfd41208ec6128c6200edfacd5ed6aaef6c9516d8c7d59f4f5b0c2f67c6cd4b21568a9eaa27bf1adafc39309dca560debb9353ff071e
-DIST amd64-bin-libreoffice-kde-java-7.2.6.2.xd3 30861267 BLAKE2B fbb6c86449b8d109ecbaeff83229aae4b3acb6355c05c4cec6c6eef78287a00f12b6bd9b0cb064d1f6c2a4ec145bb299f62e923f95ad3e9bb1d12c66765f75e4 SHA512 84cb8f18cd69b9f9056b8959c8760fb331b30b612a1f6d4f9524b8782ea4d0c8d5a0b836a2e121a8ffe054dc47a9016e87665c9dbd573f80d19560ec8871eaf2
 DIST amd64-bin-libreoffice-kde-java-7.3.3.2-r3.xd3 30867686 BLAKE2B 352c47ec2b1b4b528cc727fb24fc8ebaa5c94339d8a9d2fae97f103d6ed6485485b1e61fdac6a1ed6958c658ee9ee92e636caf33e65d9417c871cf85f653f968 SHA512 e397779754c2a0e95d7cc1d3575774810d968d0b1ce5906cb374b0e7e534127b342636666b83dc29bf52e0eb049c2fd93da80c312f0470b39befd6bd5e0812c9
-DIST x86-bin-libreoffice-7.2.6.2-r1.tar.xz 143507652 BLAKE2B a5112406f1070c510fc260eb61abe90ed5fea2e2307b8cb08fa83ef5133d18cf9abe03d6ba1887fe136121d5e121c1ec5cf98ddb3e1034a9f857921d7bbf66cf SHA512 830549b126b80d00bf4cb1bc140f1c6fbc5f6bd6fb93945b1b65ce4f5d0b2f60696a21facba821bdeebd3ae4816431386956adf11e924a80c3e28c71df1defdc
-DIST x86-bin-libreoffice-7.2.6.2.tar.xz 143296276 BLAKE2B 77d2674199b1ef1838f6274f3d75b4904ea5edbfb884bc8df1bb67609c1155b7cff93cd4141265fd609cb7aa7b7a00cf200096ba5b2ad27ec94ca84f414b4148 SHA512 00ad6fb88933a0a14b0633c716a94a3403f20860f8a017564e6c4a09981a65d877404b48a2543a3559d650bb30087ba9d538641fba7dbeb9f28d38eb3cf98808
 DIST x86-bin-libreoffice-7.3.3.2-r3.tar.xz 144159236 BLAKE2B 2987cfb61eaa37c7c0eec8f58efaf0c464c1e6311dc207cf9aaee85790930eacd12d38ca83684714392f20954fb07d427b3a994b61c2ecb50096f9ba22079e8d SHA512 3bbd3624d7381cc8e09035098901214dceb2c6ab985eedb219cd333b32faf80e9b12cf6bfe3e3cd148cb21d868cab276f400816f45d8b19c4fc539b42f47705a
-DIST x86-bin-libreoffice-gnome-7.2.6.2-r1.xd3 1455489 BLAKE2B d5125754e6a2a8405df060dadfd29ca4675433b9a73d5513159e965ae04577e5af790f4c0e0038bc81adfc23cdff14828016c2c2a900773b6c898a8127fabc82 SHA512 a7b1d85e20b9f8f7a4f6df394d6795cfe73f1742fcda7d72fa8fc53177a3e1ae0abcf61c9ff9c83fb3aa27c9d9ee27acbb571f541dd2c157239ae0b77d5d9311
-DIST x86-bin-libreoffice-gnome-7.2.6.2.xd3 1455405 BLAKE2B 61d236edefec968cd735c5eb619def336e383297c7ed3ef0421dc9034e8fedbfccb5eeade2d397418fd12d154314a28514cf5c997d4dbbad3e7dfb5e7d0b4e43 SHA512 ec2e5f6a26a75f69c66d73e64d4897099b7c3bba435aab1a1f0fecf42bb92c65fe56cbf237b72d25f0382003574891be7722a38957becbde94405b8a473ec84e
 DIST x86-bin-libreoffice-gnome-7.3.3.2-r3.xd3 1446875 BLAKE2B 4d2c700c42c81422ec9834d119d141c8a255578245bb74eecaf3a785e874b20ef0dec98544ac9fb9d28bd7e2bd35e3b822793f7e86c61e04c1953cf52cba327c SHA512 b33eefe0233f7f68ca1706eacc92631fa9f45e639615449d877ef7f3716db60bf3d3166525cb298881c5c80d387ced6f19a2b87b9e295bc48669bc5998855763
-DIST x86-bin-libreoffice-kde-7.2.6.2-r1.xd3 18623444 BLAKE2B 8355a622fc3727250683bc5468012696c4726c080b260c4f52bcdd4e83d827f8a06f2ffb769b22086118281c213f035773bbbd73d6fdbd3678e416515e7e0124 SHA512 ab1da13597d71e65ea91e12bbb853b6ef29103abb8bfb78d58a46bc51e51c62167fd257edfa82d850d41d968d9f83ebbd9e33aa5c86dae3292d0cf246522283c
-DIST x86-bin-libreoffice-kde-7.2.6.2.xd3 18626678 BLAKE2B 3a70292566ff1b6ba97f99babed3c408200501235385cb21414c72a73dc9cb7e3441022e125b7aa8475791ab5e986d28871076a1c77e29abaab3f717bd59339d SHA512 165a223514c4cf16897fa9ed98ad43e3f9fb39e4a8cd3bc96b524c404ad1127e2bb7578189d058444342416091c27f6e3f4fc4207526556bf5aafdc554b3b154
 DIST x86-bin-libreoffice-kde-7.3.3.2-r3.xd3 18547991 BLAKE2B 09d3f38a7592ab487a241c2c4a427fa57405d95796f5ba5e1ca8036cb89630edcdab902308f89e616d1d3a0981200626c465d0465800b334c3d9f5886d09d3f6 SHA512 1fbfe49bd25f219d7ec9168aeaa9c0c8aef9303027fcc8491c5a69ce7d2ea582e02445b644a3db6f3cc3964aafda8ec6f08292617e7983680f448cd1dfffb336
-EBUILD libreoffice-bin-7.2.6.2-r1.ebuild 6119 BLAKE2B aa3394d27b920a4a2b7de7472a39194be9bc92115bce9ffbfa1e5eb2cd272d85868cfbd55be46c26656492c8a8aa48582002b1af4d834d91ca25f91824f8c25c SHA512 f846ce8c8952d54365a2cd846bce781aa00f59de6505d0fa71c95515889b7ac453041c36525abd8a4e6245e3383aba7428c65abdb28617970d7e7e1b85cb20ea
-EBUILD libreoffice-bin-7.2.6.2.ebuild 6098 BLAKE2B 36cd550aa00d8a5f25ce69ff6072afcde46bb0d2439098b9f8e782d9598bd5391a8f9d1392797c675e7cf17d28e12e54e539ebbaba392c644aeb06ddeafab20c SHA512 b1449bda3e3bda4a39b43aef55ac039f029a1c2407fbf653ccf98a1225544f5ba1092c981c9ea1b0056b2899d9cd4e53a3e8365ba6c950f0a57ca5ed652c92bd
-EBUILD libreoffice-bin-7.3.3.2-r3.ebuild 6295 BLAKE2B 95c856326a1330a7c3f40a4dfa8439954c38d1b2d4b706ed2a7f6eecaf9b58be7abca444429d3d8932e3a376ccd7257059e03e7a5157a0c80daf10987ee429aa SHA512 d15625e97cdc178d168c8811929f1f1af008ae96045f93f94d935aaf5981e946865aa79fb6274ff854cec1525348aebe3550dfd853b3df6d70c6af0763814d15
+EBUILD libreoffice-bin-7.3.3.2-r3.ebuild 6294 BLAKE2B 5f76e0018fe509c6e89f3bf0578acaabfa996f1a04c1ffc4513f8cd5a5545a63048cdd95b807bf93142e12c1385cc946eb8452531395dc87bfd1e33a2dac60ce SHA512 bc549b9398c2258b6e665fdc460d844444cd77f1532ccba186e152fe6355f0abbf6c6fa74538ba588fe94df240f82a0d619ff75a545710379d3264eec6fca01c
 MISC metadata.xml 511 BLAKE2B 3ebaebf19d7db6a7e64093e54ae4ce86f14f528dfbc0987c027bfd7dde5de6ce8e7bfdd815e437aff272b7201d298568fa032cfd3292523c00a1c2bef5bc984c SHA512 01ae7e196fa4b7fbca6190fda6ac2e2667b36a284e828f6b329593b517379f3f4575f96a2eecc4a1d74764fac19ba8d7a756a54c04190f2aa17c578705c9708d
diff --git a/app-office/libreoffice-bin/libreoffice-bin-7.2.6.2-r1.ebuild b/app-office/libreoffice-bin/libreoffice-bin-7.2.6.2-r1.ebuild
deleted file mode 100644
index 5a698dd29382..000000000000
--- a/app-office/libreoffice-bin/libreoffice-bin-7.2.6.2-r1.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-BASE_PACKAGENAME="bin"
-BASE_AMD64_URI="https://tamiko.43-1.org/distfiles/amd64-${BASE_PACKAGENAME}-"
-BASE_X86_URI="https://tamiko.43-1.org/distfiles/x86-${BASE_PACKAGENAME}-"
-
-PYTHON_COMPAT=( python3_9 )
-PYTHON_REQ_USE="xml"
-
-inherit java-pkg-opt-2 python-single-r1 prefix toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite. Binary package"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI_AMD64="
-	${BASE_AMD64_URI}libreoffice-${PVR}.tar.xz
-	kde? (
-		!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PVR}.xd3 )
-		java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PVR}.xd3 )
-	)
-	gnome? (
-		!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PVR}.xd3 )
-		java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PVR}.xd3 )
-	)
-	!kde? ( !gnome? (
-		java? ( ${BASE_AMD64_URI}libreoffice-java-${PVR}.xd3 )
-	) )
-"
-SRC_URI_X86="
-	${BASE_X86_URI}libreoffice-${PVR}.tar.xz
-	kde? (
-		${BASE_X86_URI}libreoffice-kde-${PVR}.xd3
-	)
-	gnome? (
-		${BASE_X86_URI}libreoffice-gnome-${PVR}.xd3
-	)
-"
-
-SRC_URI="
-	amd64? ( ${SRC_URI_AMD64} )
-	x86? ( ${SRC_URI_X86} )
-"
-
-IUSE="gnome java kde"
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-
-BIN_COMMON_DEPEND="
-	app-text/hunspell:0/1.7
-	=app-text/libexttextcat-3.4*
-	=app-text/libmwaw-0.3*
-	dev-libs/boost:0/1.78.0
-	dev-libs/icu:0/70.1
-	dev-libs/liborcus:0/0.16
-	>=media-gfx/graphite2-1.3.10
-	media-libs/harfbuzz:0/3.0.0[icu]
-	media-libs/libpng:0/16
-	>=sys-devel/gcc-11.2.1
-	>=sys-libs/glibc-2.34
-	virtual/jpeg-compat:62
-"
-
-# PLEASE place any restrictions that are specific to the binary builds
-# into the BIN_COMMON_DEPEND block above.
-# All dependencies below this point should remain identical to those in
-# the source ebuilds.
-
-COMMON_DEPEND="
-	${BIN_COMMON_DEPEND}
-	${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	app-crypt/gpgme[cxx]
-	app-text/hunspell:=
-	>=app-text/libabw-0.1.0
-	>=app-text/libebook-0.1
-	app-text/libepubgen
-	>=app-text/libetonyek-0.1
-	app-text/libexttextcat
-	app-text/liblangtag
-	>=app-text/libmspub-0.1.0
-	>=app-text/libmwaw-0.3.1
-	>=app-text/libnumbertext-1.0.6
-	>=app-text/libodfgen-0.1.0
-	app-text/libqxp
-	app-text/libstaroffice
-	app-text/libwpd:0.10[tools]
-	app-text/libwpg:0.3
-	>=app-text/libwps-0.4
-	app-text/mythes
-	>=dev-cpp/clucene-2.3.3.4-r2
-	>=dev-cpp/libcmis-0.5.2
-	dev-db/unixODBC
-	>=games-engines/box2d-2.4.1:0
-	dev-lang/perl
-	>=dev-libs/boost-1.72.0:=[nls]
-	dev-libs/expat
-	dev-libs/hyphen
-	dev-libs/icu:=
-	dev-libs/libassuan
-	dev-libs/libgpg-error
-	dev-libs/liborcus:0/0.16
-	dev-libs/librevenge
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/nspr
-	dev-libs/nss
-	>=dev-libs/redland-1.0.16
-	>=dev-libs/xmlsec-1.2.28[nss]
-	media-gfx/fontforge
-	media-gfx/graphite2
-	media-libs/fontconfig
-	>=media-libs/freetype-2.11.0-r1:2
-	>=media-libs/harfbuzz-0.9.42:=[graphite,icu]
-	media-libs/lcms:2
-	>=media-libs/libcdr-0.1.0
-	>=media-libs/libepoxy-1.3.1[X]
-	>=media-libs/libfreehand-0.1.0
-	media-libs/libpagemaker
-	>=media-libs/libpng-1.4:0=
-	>=media-libs/libvisio-0.1.0
-	media-libs/libzmf
-	media-libs/zxing-cpp
-	>=net-libs/neon-0.31.1:=
-	net-misc/curl
-	sci-mathematics/lpsolve
-	sys-libs/zlib
-	virtual/glu
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/cairo[X]
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	net-print/cups
-	sys-apps/dbus[X]
-	gnome? (
-		dev-libs/glib:2
-		gnome-base/dconf
-		gnome-extra/evolution-data-server
-	)
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	!kde? (
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		gnome-base/dconf
-		media-libs/mesa[egl(+)]
-		x11-libs/gtk+:3[X]
-		x11-libs/pango
-	)
-	kde? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-		kde-frameworks/kconfig:5
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/ki18n:5
-		kde-frameworks/kio:5
-		kde-frameworks/kwindowsystem:5
-	)
-	dev-db/mariadb-connector-c
-"
-
-RDEPEND="${COMMON_DEPEND}
-	!app-office/libreoffice
-	!app-office/openoffice
-	media-fonts/liberation-fonts
-	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
-	java? ( virtual/jre:11 )
-	kde? ( kde-frameworks/breeze-icons:* )
-"
-
-PDEPEND="
-	=app-office/libreoffice-l10n-$(ver_cut 1-4)*
-"
-
-DEPEND="dev-util/xdelta:3"
-
-# only one flavor at a time
-REQUIRED_USE="kde? ( !gnome ) gnome? ( !kde ) ${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test strip"
-
-S="${WORKDIR}"
-
-PYTHON_UPDATER_IGNORE="1"
-
-QA_PREBUILT="/usr/*"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz"
-	xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
-
-	use x86 && use java && die "There is no build for x86 with Java support."
-
-	local patchname
-	use kde && patchname="-kde"
-	use gnome && patchname="-gnome"
-	use java && patchname="${patchname}-java"
-
-	if [[ -n "${patchname}" ]]; then
-		einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3"
-		xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3" "${WORKDIR}/tmpdist.tar" || die
-		mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
-	fi
-
-	einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
-	unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
-}
-
-src_prepare() {
-	cp "${FILESDIR}"/50-${PN} "${T}"
-	eprefixify "${T}"/50-${PN}
-	default
-}
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	dodir /usr
-	cp -aR "${S}"/usr/* "${ED}"/usr/
-
-	# prevent revdep-rebuild from attempting to rebuild all the time
-	insinto /etc/revdep-rebuild && doins "${T}/50-${PN}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	ewarn 'If you plan to use the Base application you should use a source build and enable java and firebird.'
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-office/libreoffice-bin/libreoffice-bin-7.2.6.2.ebuild b/app-office/libreoffice-bin/libreoffice-bin-7.2.6.2.ebuild
deleted file mode 100644
index b278a019fbf0..000000000000
--- a/app-office/libreoffice-bin/libreoffice-bin-7.2.6.2.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-BASE_PACKAGENAME="bin"
-BASE_AMD64_URI="https://tamiko.43-1.org/distfiles/amd64-${BASE_PACKAGENAME}-"
-BASE_X86_URI="https://tamiko.43-1.org/distfiles/x86-${BASE_PACKAGENAME}-"
-
-PYTHON_COMPAT=( python3_9 )
-PYTHON_REQ_USE="xml"
-
-inherit java-pkg-opt-2 python-single-r1 prefix toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite. Binary package"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI_AMD64="
-	${BASE_AMD64_URI}libreoffice-${PV}.tar.xz
-	kde? (
-		!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PV}.xd3 )
-		java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PV}.xd3 )
-	)
-	gnome? (
-		!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PV}.xd3 )
-		java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PV}.xd3 )
-	)
-	!kde? ( !gnome? (
-		java? ( ${BASE_AMD64_URI}libreoffice-java-${PV}.xd3 )
-	) )
-"
-SRC_URI_X86="
-	${BASE_X86_URI}libreoffice-${PV}.tar.xz
-	kde? (
-		${BASE_X86_URI}libreoffice-kde-${PV}.xd3
-	)
-	gnome? (
-		${BASE_X86_URI}libreoffice-gnome-${PV}.xd3
-	)
-"
-
-SRC_URI="
-	amd64? ( ${SRC_URI_AMD64} )
-	x86? ( ${SRC_URI_X86} )
-"
-
-IUSE="gnome java kde"
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-
-BIN_COMMON_DEPEND="
-	app-text/hunspell:0/1.7
-	=app-text/libexttextcat-3.4*
-	=app-text/libmwaw-0.3*
-	dev-libs/boost:0/1.78.0
-	dev-libs/icu:0/70.1
-	dev-libs/liborcus:0/0.16
-	>=media-gfx/graphite2-1.3.10
-	media-libs/harfbuzz:0/3.0.0[icu]
-	media-libs/libpng:0/16
-	>=sys-devel/gcc-11.2.1
-	>=sys-libs/glibc-2.34
-	virtual/jpeg-compat:62
-"
-
-# PLEASE place any restrictions that are specific to the binary builds
-# into the BIN_COMMON_DEPEND block above.
-# All dependencies below this point should remain identical to those in
-# the source ebuilds.
-
-COMMON_DEPEND="
-	${BIN_COMMON_DEPEND}
-	${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	app-crypt/gpgme[cxx]
-	app-text/hunspell:=
-	>=app-text/libabw-0.1.0
-	>=app-text/libebook-0.1
-	app-text/libepubgen
-	>=app-text/libetonyek-0.1
-	app-text/libexttextcat
-	app-text/liblangtag
-	>=app-text/libmspub-0.1.0
-	>=app-text/libmwaw-0.3.1
-	>=app-text/libnumbertext-1.0.6
-	>=app-text/libodfgen-0.1.0
-	app-text/libqxp
-	app-text/libstaroffice
-	app-text/libwpd:0.10[tools]
-	app-text/libwpg:0.3
-	>=app-text/libwps-0.4
-	app-text/mythes
-	>=dev-cpp/clucene-2.3.3.4-r2
-	>=dev-cpp/libcmis-0.5.2
-	dev-db/unixODBC
-	>=games-engines/box2d-2.4.1:0
-	dev-lang/perl
-	>=dev-libs/boost-1.72.0:=[nls]
-	dev-libs/expat
-	dev-libs/hyphen
-	dev-libs/icu:=
-	dev-libs/libassuan
-	dev-libs/libgpg-error
-	dev-libs/liborcus:0/0.16
-	dev-libs/librevenge
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/nspr
-	dev-libs/nss
-	>=dev-libs/redland-1.0.16
-	>=dev-libs/xmlsec-1.2.28[nss]
-	media-gfx/fontforge
-	media-gfx/graphite2
-	media-libs/fontconfig
-	>=media-libs/freetype-2.11.0-r1:2
-	>=media-libs/harfbuzz-0.9.42:=[graphite,icu]
-	media-libs/lcms:2
-	>=media-libs/libcdr-0.1.0
-	>=media-libs/libepoxy-1.3.1[X]
-	>=media-libs/libfreehand-0.1.0
-	media-libs/libpagemaker
-	>=media-libs/libpng-1.4:0=
-	>=media-libs/libvisio-0.1.0
-	media-libs/libzmf
-	media-libs/zxing-cpp
-	>=net-libs/neon-0.31.1:=
-	net-misc/curl
-	sci-mathematics/lpsolve
-	sys-libs/zlib
-	virtual/glu
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/cairo[X]
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	net-print/cups
-	sys-apps/dbus[X]
-	gnome? (
-		dev-libs/glib:2
-		gnome-base/dconf
-		gnome-extra/evolution-data-server
-	)
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	!kde? (
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		gnome-base/dconf
-		media-libs/mesa[egl(+)]
-		x11-libs/gtk+:3[X]
-		x11-libs/pango
-	)
-	kde? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-		kde-frameworks/kconfig:5
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/ki18n:5
-		kde-frameworks/kio:5
-		kde-frameworks/kwindowsystem:5
-	)
-	dev-db/mariadb-connector-c
-"
-
-RDEPEND="${COMMON_DEPEND}
-	!app-office/libreoffice
-	!app-office/openoffice
-	media-fonts/liberation-fonts
-	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
-	java? ( virtual/jre:11 )
-	kde? ( kde-frameworks/breeze-icons:* )
-"
-
-PDEPEND="
-	=app-office/libreoffice-l10n-$(ver_cut 1-4)*
-"
-
-DEPEND="dev-util/xdelta:3"
-
-# only one flavor at a time
-REQUIRED_USE="kde? ( !gnome ) gnome? ( !kde ) ${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test strip"
-
-S="${WORKDIR}"
-
-PYTHON_UPDATER_IGNORE="1"
-
-QA_PREBUILT="/usr/*"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar.xz"
-	xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" || die
-
-	use x86 && use java && die "There is no build for x86 with Java support."
-
-	local patchname
-	use kde && patchname="-kde"
-	use gnome && patchname="-gnome"
-	use java && patchname="${patchname}-java"
-
-	if [[ -n "${patchname}" ]]; then
-		einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PV}.xd3"
-		xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PV}.xd3" "${WORKDIR}/tmpdist.tar" || die
-		mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" || die
-	fi
-
-	einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar"
-	unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar"
-}
-
-src_prepare() {
-	cp "${FILESDIR}"/50-${PN} "${T}"
-	eprefixify "${T}"/50-${PN}
-	default
-}
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	dodir /usr
-	cp -aR "${S}"/usr/* "${ED}"/usr/
-
-	# prevent revdep-rebuild from attempting to rebuild all the time
-	insinto /etc/revdep-rebuild && doins "${T}/50-${PN}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	ewarn 'If you plan to use the Base application you should use a source build and enable java and firebird.'
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-office/libreoffice-bin/libreoffice-bin-7.3.3.2-r3.ebuild b/app-office/libreoffice-bin/libreoffice-bin-7.3.3.2-r3.ebuild
index 271b6a6d7d77..39bff2d14806 100644
--- a/app-office/libreoffice-bin/libreoffice-bin-7.3.3.2-r3.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-7.3.3.2-r3.ebuild
@@ -46,7 +46,7 @@ SRC_URI="
 IUSE="gnome java kde"
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="-* amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 
 BIN_COMMON_DEPEND="
 	app-text/hunspell:0/1.7
diff --git a/app-office/libreoffice-l10n/Manifest b/app-office/libreoffice-l10n/Manifest
index 3c413452d152..c4b3a23da67f 100644
--- a/app-office/libreoffice-l10n/Manifest
+++ b/app-office/libreoffice-l10n/Manifest
@@ -1,187 +1,4 @@
 AUX lo_gen_langs.sh 1466 BLAKE2B 81a5c47dcdd23cfbb7d99d91db7d4dec9b89f0b28939dc7897e9ab94fe95d1800dc6b54aae5f608dcd669ea4fb8bc6141b5bda2a45b4a6aaa49feac4786ea504 SHA512 492250b1531a58f3ba22e405d8a6ce397b5fb7e06c74c7ecfcb4c9efaacb9d48f19ad05854891c0c6ec9ae558bc4595f061397e5a506c46a981e14502eeb8cff
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_am.tar.gz 4385647 BLAKE2B 94b83f24f27c9b9cb11641f1e227d6fe7813f9c06441b83fe3e5ef6a2c7f4d89e10fd7575223b11e969352997e7f6cd8ffc8a9a477e4a77b61e96ded1f64dd34 SHA512 4aa0f4219e3f69fbf18df3afa5bbdd0eed411e305b2c57c622240f1616c5572f27b89a7899a13166ccecd07b43fafaef1b720c348ef195915e2e0d4129796763
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_ar.tar.gz 3848653 BLAKE2B ccd1c6350147619ff18d8b5d1f07efb4b4713a716676590dd6de2f23d5c3efcac2f6f4f0054977ce10fbee4c4ad0e79d810cde7e32c3899ad32b2586e4f06d87 SHA512 ab8367d79ea3935cf5d4de3850d7a0810df90eb81fd018431ca418b37c4b86411e2be73cf00d54b58b471b89891adfeb3baa76fc076568f542416641aab134bd
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_ast.tar.gz 4088656 BLAKE2B 363246bb8d447d8a69a759026d5afb11ece9b04abfcff93a590cf207fa078657b07f734b5078e47d1d661016ba9cbb0558c42b36974fb96f6c5ec66bb6bdb28b SHA512 55007e8531af473757a29d17aead2470efb88311e0193be55a43759d1d40daa67a55a85be13816f9b6dea792c79d281adb7db92236abebaa908b7bc9d9e5e14d
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_bg.tar.gz 4445310 BLAKE2B c4f117d9198c3e535140d2d74f12ad4db2ed50740a6ba655e976721e026ee4820b228dcc79393058d1342940d4cb598613c44574c2d65a57bfa01f60a77c0423 SHA512 4d6b46646fd7a122924bf4bbc54115d4aba9ded59b2064c9d05e07b22bca96e74417e2df483ebc4f3f5e772c93c32165f120295e20380ce7912e5177bc38e35a
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_bn-IN.tar.gz 4548232 BLAKE2B 8b881a549ad1c7e9f5bfd957e849877080c908bd1da6dd8b2987c161993f8ffe07f398dbbaf253d69518513c6b8c3ee4aee4c15e89afafb9b8d78f7f28c3f533 SHA512 cec0b5c4ec132f54a56f4da52381a3d7e60dee84939b22de20a37c92a5f2d3004ca25c0120bca416e160b2050f7fcc3e8088b7d9cba20a0b414f18793c90885b
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_bn.tar.gz 4228953 BLAKE2B 0845ba4fe5719474997056a7525ec3387fc1d81a6b96074bdbd37b82a7a95ccf5717389f9ab290de33cab8af7e6ae55f5e6d909448cfc5bd934162b8a7223f48 SHA512 1d470f74a44d5f3f80f4f9f4130667844d54b4c2947abbe858ea3d17cb2595d2228dfe2e1385be9e0b1e808ad14634ca6de06c423173ea87c396e2bc88c649cd
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_bo.tar.gz 4233818 BLAKE2B e3e3c345314f0ac905190ad711de032bb587b4544de9ff32cad3ff0eefcd43fd98ef67e019c3a757f6bf71726bfa88e3d9bb5413ff709418b9a05b7563980042 SHA512 567ea4489f1ec80eccbdbaf82597fc811f21dfc39a1859a55081879093a5b39520d04b721b850ed2c6ec4ec0cd7d3a0724e3d2941f424ea45e2b78d69b2e2195
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_bs.tar.gz 3969499 BLAKE2B 67f74547e28483cc050c2ac59f202e340720cee1148523f632f9f5fe1f40cc6f3cadc159f151532ca9de55bc723fa2b3a5be129e9e8466e19a56856783bc9141 SHA512 9eca8024a9020abd4deb9df6b1cac1774354f4354c83163f4c940ba0e94ae9015f7cf0635339a8ef51ed6a2eb1f5a21923f24fc8cf8e82923c576334245f84ab
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz 4123241 BLAKE2B 930b072fcd78ae4e2d042e48c878600bb263f3ffb5e6189d19e556213f3acc44bf434f60fad8d87138940cc576f9c9d8741c292a11108532bfa21b898b3e1c4a SHA512 893c643bf8727669ef5c62a486dae10c736e106051ed3454cf622378a6b8af033c3fe6557282ecd19bfc372103fe3ec592905eb35e419a7c07d8b27f73113789
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_ca.tar.gz 4122504 BLAKE2B 92f77430838a2f79b942acafe2123fbe4dc4bc4db543e9e61f49b18fbb1c651f122058bffdf1052484be4a6abebfe89fa83dab724977eba05aa9a095a7291854 SHA512 980548f3d3e1bfe9b21703578be19ec0125fc6f4f539f1f6149a1e3c414abac32542b589c68a512c4a5f72a5fa5091d6eba01687a7f7a483625fa2a1ddc5c603
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_cs.tar.gz 4147103 BLAKE2B 230666009d40f1ea5a05c26510d512e269ec1d2eda259ac672eaf1b35b8a5f948ddc8d8fdc2fcbb62e48bdbdc2216b33014a3aef4272d2e495c1b5308608a031 SHA512 18dafa6d9291a1b61667a5992bdf9cc3fe331475479eec527beb07843a08e24ed3a6449149b26c9075681bd73dae84fdf32d05a92643f2873638e4f194b79b41
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_da.tar.gz 4058496 BLAKE2B 3930576a7852d8fc5fce6ed912657bd414bec3b3e5e7e6adaa1d7c55560a7b50d2dc020863db82be8ef36b527d818403bae9ef4696f7ce3d7e5ed542f9fcb650 SHA512 4ba41b9269b81a0f732725875861fdb798f01d6215e68762175b5626e358c57244af462b2fe8fcb968f3ceac25053455ad5e2a027672077acbd1e0a3c0216749
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_de.tar.gz 4205290 BLAKE2B d38856e4501b7082ccda08e21cf70d52e8ff6c411ae5eb5768e08f506d18ce55e0aec17fd6d850eb0f2a584c141bff1a665c8352907fb2f4f01144ce22eca66c SHA512 6f1c26d128de3ae76bd6c22b88740815b2b43d054d14562d84a0df49be77d556ce6b7c04897fd0f6b5e64406b403fa9e06a11abfbbdf6d674022e4d16e3a3b40
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_dz.tar.gz 4376966 BLAKE2B 49e3b50518c3b70c82ac313ae36f48131135a1189afe8101996c17e44cd48bd52ab45d2da2dec6fc566dce911770679c77967059a5b329fadca09fdfad2026af SHA512 f9ab4ca1274b6f161fe16a1ec858324b5b64ae9dfd425d6177fd1f1eb3833514a4e11d9188c91d4248904839948f25b9c3c8f59ddfafc4049c7d4e2a6feec1d0
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_el.tar.gz 4882914 BLAKE2B d1872865b470b79348e90c65522a0ba77b7e11f73039f967dc2c2117ca04d8a7536b3234f211d2af67ebdc12f8dfc335d091b2675b0f0df41135f812322b729a SHA512 1afed336d54e175050290fea7cdf205d8ab7b19b116a80bb68680f89d95ae574bfb6664d2bcec22631f3ed6a0220cadf77fad746bc486fc08da41a303f73398d
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_en-GB.tar.gz 3857046 BLAKE2B 3a387b6c43800978d12578876feabb34004a2779faf349701861339aac2f39ba9496b2e5df11ded0ca6b0fbcf5db3caa81e2a610f4d282e71311f8d44b6d4a72 SHA512 4210a24bb0635505aedf970ad64329e3c5a936edbf16bfbb04c15c6da474e9198c18760ec54278067cf66fcd2110f22ec7f078cff7bcc11ebf45639ae5035f43
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_en-US.tar.gz 2530131 BLAKE2B d95a167810af3e1d05f6b06f4f66f221ebb26d843719e97c34b85bbcf893e5ade00924bc53ea9411ad800cc1c85e957a2f1edf86b939e9cf9e6d5b5eaa768c8a SHA512 7cab64ab7b53af4ec20b895a5f2b648a1d24f0bdc02f97cd482198b91f2b77950ec481496f5440dd0d029a2d80cb5e237c8867b28a22bd7bd5e671cd71c9ce71
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_en-ZA.tar.gz 3847877 BLAKE2B 3a89b2f7c6d9d2ce065c07fdd602af6c858e58f15f39d6275e59aed4892c2d29cb62967e44725846c223b69c7c2947fb268c55a521271dbdf96baa3f2796d565 SHA512 b592ca6c1ee7cae8643df501b6c3de8bde6dd7fa962266971ebf5d66940f1444e8abacc1468be77fb1a8c3aa932fb044a63c77a55dbed981a2ccbb24b5dabfd2
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_eo.tar.gz 3956062 BLAKE2B 18b324bf275906fbbc9ae5c731a174df865113d4024a86946730f55caffacccf968e0c76e6b23ad707bb23feb1d7b9e47092722be37c66f05c29c8fefc6819ce SHA512 28f84154c59e8bb3b13498ff9e7ed25e2b4567a14e338ef81577528efea72229006d5e77ef34b7d58ce1f7bb1df715842f5c85022ad549dea61307818224f1d5
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_es.tar.gz 4165940 BLAKE2B ae99aa935a2c2bd512e55a9bac45abfe49de03d42829f7252ea112290da3170e261aa600498082ddca16cbc0e95cd1f4ca9ce0d0c97db0349d835da53bf0616d SHA512 7a62a9b7aad9191d3aca16c9a8e498fd3f88b725114ac374ddefab6dfc0b560e7f9e319864f9b88d2ff6cf7a50a0d83d53fb1721b3c40dcbee8152df11adcfa7
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_et.tar.gz 4000884 BLAKE2B ae6a9ad94c17df11e9e02e4e3a356813111a46f132b6ca07f00955adae798538a7eb41006ae9e4535fd44a572d2b83ebf4a7a7cf3cc395f8e1021cecf991f85f SHA512 73bfc026adc0f2bd9830bee718da59883cf767ea77641614c69f9aa1832b99a53b22ca64cb186f5d99313737a87945883aaf119a6abc2c598f7cf69a43edb214
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_eu.tar.gz 3985777 BLAKE2B ac0e6808cc6a614ab47e84f9e8085c964e7ea285561556013b524fde12ac166414bb0e8223df0fc1cd14ff881083a42b83330dfec5725b22b1dfb0aaf99b7fd9 SHA512 17d1be34b19669a548be4d5cf5814d7f14a437fa4ab8df019011e87e7534c91e3301ad92bc13aca4dfdc2d31c11e90743704071b69168d5d787e1bd4ffec6cbd
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_fi.tar.gz 4001838 BLAKE2B d60e92e36ecc10d86d00a2b4159896f24fe3c3ae3d22820a61d156f1c737853792beb0a4623136c5516f8d1a565bdc2180af18b1495aa432589f2e4bbed16d91 SHA512 94e37fb478410659be64849cf1290fe84aff28b566a51ec44232d99f3a030e936089e50e8e06ba681e6f51741ae32604a1beb7a557b1049a72844364768bda74
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_fr.tar.gz 4144027 BLAKE2B 93553f265c2c32c19109435304df5f5f4517b6f34828588411e2e08e9dad785804bcac43b793e378545fd2479fcbd2864bdbbd3dd1a076ceab9a5f94fc212fc6 SHA512 ac40c51a41fbfac9d2a41cc1230b4fcac68f0971e2caf8697ec0a2bff37c8d11ffe361bf964027db8a1a7001fbbc5919de9f59fae7891beb4a5ca9bc8dcfefd2
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_gl.tar.gz 4091056 BLAKE2B a227f6aeb4d065fa75bb01c1068a55ad2f08ccd9427a8065f5a25547fcaaf695306699895ba5812fc0e878395bfaa1d2bf78ccb29fdeeb343e1faa69b1efa24f SHA512 d2b18610f3a0b42a90aeed6a51d7c7a22af60ac91578466ee19f039136cefb5383a29ec757e0ddfd86fb8c8894931fe001efbd6a040336ca8509eb374d1e5cbd
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_gu.tar.gz 3933970 BLAKE2B e1d0cef55c2f55314ae35aaa1ea16b24fbbd611e22097ca3a76ea16c6d0233295c14cfa3b197e0ee592d692bbedaba0d04c23b4bcb1d944f06505102c1a7b6d8 SHA512 6065c7817b0e98a9bf37708db0cbab4b1a64046aa3a3e20c15f453ff5d49133f1cdd6e606060eb7ecf016ec750bf8cb8bf817f7b1dde39091ed506f623a65fd9
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_he.tar.gz 3712425 BLAKE2B b1ef14c47891ffa72b12cebf16ca12f1586023a05386129c68e00ce22698064b53712b4fecc1d0d082a5763f07c9ec938ec6ab038c42a79d7b3f5f86f7cbff38 SHA512 b56c1415bea6c9e79212595d7b8506afd0c43422dfc57deff3a8675dce7510b2509f4f81780589c4fbf76a10399a9dc15e8fe62f76c4429010580cdf9c0e8d5f
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_hi.tar.gz 4062732 BLAKE2B 50cc4bf8e045bc0c6090243cfc1baf630eb61eea49a41b9773efa14d32bd4c9167d905f22ac9c96bc2c0eec232e15f223a3b689c89f7af3a447ca07bfc63b93e SHA512 77d995d4b0699b965b65c77ddfac3b2030b20fa53f62fecd910743b6a8329fc67b05884ea1bc54228f1869d63959b106ea1b58a34418b08df400bd29988ab9d3
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_hr.tar.gz 3972304 BLAKE2B 41e0d7689f4a375b286db202cb8bb3c3e6ce07c65682fea782f14c07ed76eb007e56431d275ca23a76b9aef89c70ca3367a3cff52bce74008180df3f1d8ce118 SHA512 3e8d12a5aa31d4cb8188497e0aac46cdb04b4a5b1c9f3a22b59f3626f04a93e2061298995519e204db0769702badb50bb63ea24162f890b54d69ca580bd02708
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_hu.tar.gz 4260555 BLAKE2B b83c48794cbeedc9cd5d957e2e60035d8653533cf80a42c8a2302d44bd53e5b409fb2c3e58e7c6166aca1dbe7cbb9caa56f93e67bff587bb43c8fb3b6251c2dc SHA512 0e8701d602aa42b3d7288e941df5a908b863bc9c4a0e70a5140e3f919ffb7d7a831ea60d558ff90dba373c47ed57b11ce482666d0315b50b26f2b0cf0b47c75b
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_id.tar.gz 3941840 BLAKE2B b6ff36267be249aea6ffbadd73cedd8a4e94e26a9d788b362b087fe35d309100ed049cd1b942e7f55006da0b6b51737e9d28a3ab0e2809972e88c6c0bfdb97f9 SHA512 4c7d1e0faa913ae770c024a74be9cc3c0f59482abf049f716a3e056f1a5a98012841e1f8ecedf034d14a3c0b1db5702bf39e26de3eb52b9b3d05a83282a13229
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_is.tar.gz 3992566 BLAKE2B ac7f80fb852c38503a52f9ec0b6cb0115dbbdb402d15e58786ed94fe05ed9f039c8e031365d5d7e7ba9ff1298cd932aaa22d5b8ecad31ccbaace543958c9a416 SHA512 239f633a85c2a72c2b9f130242caf854e4efcebdf6e17d9ca6163a98706a9fe058d0de957524d34f851b71dc90d9d87c281ce6e7cf4aaf65f12a9de0a0c39826
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_it.tar.gz 4071135 BLAKE2B 38267102272d0763d52a4033541d3a4a0c3b7c8177f89744a7ff1b0ca0633ceff44fd6fe64572eb0e07b91e0552c6b06f935650814f48a91e00c832739243d41 SHA512 7be903311373cd1a62a2a05d6f3db615f5ea592a74fb8cc01a578982317c462bec6e0f2f7f0d0afa6801fc48fb1af571d7412b617b1eb90c0ac7825798b5b929
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_ja.tar.gz 4721146 BLAKE2B aeebef587b763df699d74e31242fe2652329fe6140cdb3327cb065534574acd6ef8676e0a30fd8f4f9da9afebaae5c65d4762b8fef8ae685ab3bbbc2ab9b97b2 SHA512 e2d3d70d8f62decc208a86ac7060d33ba8b6325968aa6f8d4def87b9aa447c795ab60721339e68eeeb2ab41c630e7360b5ae2d80e4b53a33492c75d8e53d6dff
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_ka.tar.gz 4175257 BLAKE2B cdf196d5d9c563cd3c36f1f761a994369152f935ee22c888fc38637abd7ec86fb3984ca9080d8b4673cc42e56b342903f84b29848c4ff2413b82ecea413045ae SHA512 5e0e0b8e95a4eed827035ac069aee3a731006c9aa6b89b2d2340e81acbab9691eda85b5e1c6fe23dd86fee24c5c5febc95f2f291df7e0efedf6190fa4c832d4a
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_km.tar.gz 4515357 BLAKE2B fb047baba0b391b53f96ec4c11484fee3bc9205c3c41ab7f5f1a502c4863d7b9ed26fddfc0bb150a0fb79e39a4f423bda2fbbaffc849b6fcdf81f27f667a65d5 SHA512 5d6f12b4631450f5ba23393a0fcb2d9402d47ac6b38c3f22172e0b76b2bca7c2df21e7897d1bafe0cf7ff33fdca16851f94b561c6b9c74fad23b43c97cf91a6c
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_ko.tar.gz 4214921 BLAKE2B 3e784bcace279045b3376b68ac38696a6cd77382009dac0b3d079b2882f86db09063821ef094b606e26870b42c3395806d9b7c8da21f99261edcd3f51f3a52f5 SHA512 6177f6485b5626d903ab331b5d5ec8f450bd52be786ce72b5ac84bae905a1d0989005da1dba3e03f301573e8e91f63f793fbc017276663bcb7b4059e2a3e3c38
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_lo.tar.gz 3933767 BLAKE2B bf8ec96796e23f48c299e1bbba0e90d5f3189204d539b2ec44f4fd66ad2538b3d65bdb9ba00ba1c1d539ea5c7b90b656924aa214fa1ac61b3458b86a04dc93e8 SHA512 bfe08eeae9b07720a35300446a00f0653e27c0ec812efb479e7aeb22d03710cc7a9ac26fe33cd100315360fc2bb2e1f8a38cf4ce3639571ddf9f27cfa8ccdd7a
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_lt.tar.gz 4172985 BLAKE2B 10b7b950697c852b28ef5af73c6f450f8923c9a5e78016f3fa648af250161d2d99276bc48b4c14d7607b9cb889072e0699b1cf0ccfa9e9a1c71da00b4d08421a SHA512 4523bbe6c258094e4c63ba0ca8db4d2981bf930b3d55cd9ca8484a0acb134efb13485290978e3a42fe5549c5cd8d7e973313108553ec65b62b032ccc184154f3
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_lv.tar.gz 3987480 BLAKE2B ce516f7404db0fc079e4737a61d0b3d048ce90b3f0950275883f033bc44f13b49dd18bd8ee6408c588702b2f462c5983173a27745af8ed422957f5401c503735 SHA512 b59cd495de4167b06c98892e711b3dcc46da493b1aab42c46954640da1d178d2cd49a8fff7d4b6d0bd6c7a87a687230edb1791a3be2175f44360b8ae9fdd7256
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_mk.tar.gz 4026126 BLAKE2B 6f3d8bb733cc1c9f276929de39990449c18c69f0ee2d8d7c18b93e231f6fac9d0dfe0f23921dba359d85b72cc7958776899f89f24cc7db79761ea1985e76b855 SHA512 a3f3c5186e3102f8da9f3a87f5f7513f7d8f174c7c3263312397f719b9a634bc3599a7bf7eace679f07b7a4d7386851c6a6f6e22f6971957ed76ca11f9563c01
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_nb.tar.gz 3989223 BLAKE2B 4bcccd670305c10a0aca8e6fc78b82c26af64cfe4c76b06b9631758472abbf0339afa0da734259217a2b869584424347c841a6f57cbe905cad89c3983d0418ae SHA512 565e38ba6261a8983fc09e5843d407d8d2f48a29459151bc8f7c76ed94ff63551be69f70b78d5086db1737ffcfc3c93a70479f36f6e89ca32227cd4ab0bcf7b4
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_ne.tar.gz 4263941 BLAKE2B 4351a9934c2ae52293bfa12dfa26e6c15b8a39b8b74487f8e5b9ba7bb805c0c3bc9e5ea1de25cdcec12171ebe4b617bbf5ff02b3afa0d25280a3936ddc88a331 SHA512 c681f25665cd3cce41168c9f220ec040bc6c05bcf32252832fe8035438b4cfc3469389528c927414692892918611f3f2f376faafaa3b0c768e097f7fd1e37939
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_nl.tar.gz 4102370 BLAKE2B 3c8a4658c536fa19c6f7063f7fc0c4093f298d5ae6441a12037f76e6c3cb7fe2ad54e19610173303f64b200c64af8cf629042f61ea4824e77912f2a1dadc6934 SHA512 2f26300d7ec5f73af39a8db4dced075c8ce9e905a2bb9ef253e9e797927cb69af9ce9010cd9e7946d741ea431a61045c129f8ed1b9399d556c9704fb9ff51993
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_nn.tar.gz 4163904 BLAKE2B 049f64a980293565c3fd044ceec325fc2205b93606db5a4fa4e261e17fcbcbd518ec2d9248e57fe1e6e55ac918e3a0a60d6bf29839faeca8767e7bdd3c3d0e67 SHA512 0fc08d053d930686b88ffbd66bfac6a5ec4af17713b7b8b42c33bab30160ab5e17050b912d03bbafebc22d0ef8380905611627c83d32ad3d50207991b17ae040
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_om.tar.gz 4040923 BLAKE2B 4227a2e37289c73be322f6f716919f856cbd2cf2f5674608100d344e74f69cb012f19663320604fb23dd0e1bf1a6c4654d1c04ed92214b8b22d2972cd42a09cc SHA512 bfeaa55b503ac806298ecfcbea479ab9afd96c06f499b90ae83ec458a56daad5f9788fc088857e18051b22ba01faaee213269b674e677cedcdafcd36f9ab22ed
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_pl.tar.gz 4288270 BLAKE2B bb3bcba364715268078e0957d98fd8ca16e37fd099ebb4c9901cf7b2d662b17ddf7cbd43d7aa199b391b254bbfac4fefbd19533d2b442a8fa2cad585256740ad SHA512 2d8aa4170d8a2b09933d33b21e8be02dd456866e21e190b5547a59d71180bc8ca94488fcae5d36fdd56d12b23a5908216a7b255f2df6246ebfaec69d0f12e7e3
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_pt-BR.tar.gz 4114633 BLAKE2B 0b696745711acf573e9f7aba5bacfe22bb8dabf7b128e9e66f2d4c5721a6e7c61a70ed20b93c1093c390560d5a9c3effe18f22080e7e5307184aa3d34df98b19 SHA512 2c63daa309c711334725699c2fc7237d65ec8851062b86e972bbc52d19620560a279ea35ddb1017efe503e95ebcae761f9d158348fd3a525dfc587ca702fb974
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_pt.tar.gz 4094075 BLAKE2B d3bcc3be777a6f1bf717c8f0b4421a1f88bf27999bb12f897a751c520e9c1c140689e7af8d524d82f64c886f1dcd8a90a6bfecb2803e9fbec340cfb4ce993320 SHA512 c5b10022bfc0e05ba8ab8826fd3de9fab4d4bbec6ad13f31671cb0640487d811f2f9c2e994956c3c93dafe37a8351ab947e23edd3627f11ad910364e2f05c4af
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_ro.tar.gz 3883800 BLAKE2B 14b4f596589d795e316a6e1217f0da72a78bc8d290eeed4e06ac75dd848f0055d7966f27c69911c65c6afa00fe2cf719da61c87b2c84c1c3838bcd902937ce89 SHA512 d05cc8e06584986befe42e2c612f3b3814ffcca9540869f85878a5fc002962f9db37b2b42a272b43fbdf7af4c516d4d6d1711fdb3a48a5cf71e7d2f777ce784d
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_ru.tar.gz 4430376 BLAKE2B 2c834f85eb64ef855b99e8b122ee548f82f5e5d889ff11c4ccec5ebdfe35bbaeb4ac279ec31636fa2ffd85cb9706ce9c48d23f174c59ddb68cceb569fffe2b55 SHA512 03538d9ae714e70304f87e96d54c80190ee98ae3a56c1e53dc56d0c9cb1713edea9ff8d7d75f0d14d9e9c9c906c7e692dec715fbe61f27bd0de91e7a7055096d
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_si.tar.gz 4165447 BLAKE2B 5d706f258ed022f70a07f387440c1d57e0e96516f972a49659e2a79ce106ed11d876a2c948a0cc81eae691b454d76c3644cfe0350ec4c287bd142de486c06225 SHA512 0fda9caab019353dea2729828294a1d26a1d142f735adb9ea2d47d25168e176f2da920fe18b6a8861e5542cd7953e6a161e1beee4875245c315d6584847b44e8
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_sid.tar.gz 4029123 BLAKE2B bfecfd12899875dcd6eb6852ce22983f4553f5031493584ce5634fb7bbac9f7dae8efa1d350f869bbc80b0dd618c5df519d50a2489bf14c5ddcc76b64e20050c SHA512 e11b557594365b1fee746d6caec0b15e9dacc668dcd1096da748754ead7b5cbf5e487455d6e9ee3d5415d15fd186120284f8b339ad3405471bcd19707b45bcc4
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_sk.tar.gz 4186254 BLAKE2B aa7f066103054f2051730d864c4292773076504027962f49058b890287d60b10faff3879573a2d2dee9b44d7a0ab7d1081fa141fa365a0159d4ce70cc2a884c8 SHA512 effa708b23247e133cf9ebf50b1f003f8e01377944e9c970a34bb0651d25611f65b42d1453a4439291dad4c352d8686a6f3ed0e0428d91d87b874089e7a2039a
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_sl.tar.gz 4055951 BLAKE2B 1d60f279c43d5efe133486b070d0f84c8656f5030601ab971347257fc5e0c7bab4b4d953e647b4d72e0f7eea514891cccb4f7a9f11511d73fde2c48410ddfcce SHA512 16c91b584dde2f78303b2667d1ba4e294715446b5baab160b7c94b337c31f4ce6950bd5a559fa85ac54274f37ede1606675c8dd77fbf3000330e09ec55fd75ea
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_sq.tar.gz 3943282 BLAKE2B 600def8493b73ad0c5db3915a21aca8037322f28b2d0c124e3b1f861456a8519a7606e135ff626dd935b1bf36000887b8c985b0369ba89f3a2afd35aabfa6580 SHA512 9c4b412e2a2161a0c245244654eb020b3ae686be2ad876233299bdb86ee9db02c9283b78c451c5b53169a0dbf081369db7ad3abe5b5eb2b6e7e8f2c6d6670187
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_sv.tar.gz 4033400 BLAKE2B 3e7e6bd406f8eec04c2c51d2422accb866a3d4fb3e26686495967d3809a855eba3f0cc5a8ffe6263524e8ad1192d4d71d9ac1a5ead30eba89481c2111ef617c4 SHA512 dbd3f8d92f9d6355473dfa360b7f101f0beba7f9c939bc431c902b74b994ad332097354423003cff83ea6a6d34853f4f92014837b6cb5acdedc1975698e0bf9f
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_ta.tar.gz 4377108 BLAKE2B b872cf3f96918c2ea88d36528cd1472d18aef272babcbd3335363ef5cb6c4137a341f531f8008765d6e5e226cb3304d4ca144d9d404c8ac3dadff7b604d2a3e4 SHA512 65e8a95c42796b991ffb58aedba967b237485e6b8a016ec04169c3446fb56fb6b61779ec3f1d5804b588a25ae33ab776e27fd7d8516468bce34e9b5645da1483
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_tg.tar.gz 4002642 BLAKE2B c6ef3ac895ec00b725154da2e476df1199a8e4e02bf22dc1fe48558bcc1ecb0e0f1b0d27cee6ba879a823ad9045e0b347769e6b939f4041043eb38bd80f9105b SHA512 a3983af2d88dd766686abd8728d79bbc881377a4ce2762f260b1acf97e29bd5625d092b1290b0010b88f62c8e88fd1088e682e43f6dc0340eccf8379f4121113
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_tr.tar.gz 4104072 BLAKE2B 6a56f1237d1a3658a626cc2f338f5671e263666f15acff93b604891aea99068a56a2356531cf50c9238a5eff50f45c7c9fddc557fc947fbd6cce1c8714b83b8b SHA512 b8d502974fb8dc4a1b69c634ae07501cb6c7f36256efd2d9b65d62543e5fd19d810e93cb35b6687bdfe3f55b616a549c52dd68593f4625d592aea99f1b4c7d2c
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_ug.tar.gz 4107111 BLAKE2B e6f82b4b2a99225698d40e1b524761b7efc1d3f0f8c162a8ef57971f00c370a624d3b2d4eb794f6d8f1d64965226b89a432ed00396b7e92897c4a7052d39a390 SHA512 3fe0ecb1aeb470d475cc8e3b571b1ed56575e5e0d42b0a1be5251f704b0195f646eea6ed804eb13cd3b25a6b05b9201f8d7a165c4ee3aff6449cddc959d21dd7
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_uk.tar.gz 4437877 BLAKE2B 2d462b8830d336bbded8f2d3d4f7d07599a93cf8e6d7fae2d1b7b43807b5b1c6c85989212e1bf8fb27d5ad06164d5548321335a2c515fa8aa00cf22b584f80b5 SHA512 770850d1c2ee425fcb29fc1d2724aab73ee24532ffe7fb4ac95f2704cf43abd7c60ed27f17ff4a9bbaac9a1165c4391d81e55236ffc3519cfa0a6ba19f351dd8
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_vi.tar.gz 4076693 BLAKE2B 2e93f7bfcb15c050aebc473c296b20e5d4101ac6dfd29181856302a8fcc6e6a178664a8f61095c490758b35c1a1ddcb043bc94743a36cac59d3d2c3e27a6a6a8 SHA512 861d465114d41aeb240a3f79e2035cb41ec974f4c12fefe70311c55fe5eed6081a178230d7b4f01b7d20edbdc0c7b9aec00bb5ba536cd7e13e075de85049fe67
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_zh-CN.tar.gz 4352098 BLAKE2B 5b98c4ffcc6a3784d7cf7205a8cac7f804277d21c64058128c6b1a768f3e0058880f531d247a235df0b38a2509e8591c12bafcb46adb41d62426b70a2c8c210c SHA512 73b41d4c2f416cf8aa78c74131f047d540849ab27a4371756a46fe92eee860c1a42703dcf994495d3ddbff5ed2e449903394ab58eb8a74ef9d434a83e6af1da2
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_zh-TW.tar.gz 4457064 BLAKE2B 8d0f269c2621ad6a22e3d18e508ed3c290ead5624136fca52b6895d0fa1b0b58be6928c38f23aeb329ef35dcbdfd0cbcff9130edac09965785d969901ea966a9 SHA512 82414011afff1117e4f58803ebfc906dc98969dab5962bd124930e67b9db65620c6c45ec2d28612575e4d9ec0ea301ec138d55637654bcb9deee4f016ba3f80c
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_af.tar.gz 1507435 BLAKE2B 79560a34d5bfd7976dff0018c5f6b42daa25ced610b2c4e3988d9d0ee12a1702cdb3e023843c2795d62dc0cb62e748074d0fb60b9dda2815791b69b85f90e3a1 SHA512 bafe4e5a147eb9ac37de0c28f3f613e9a5537e4e4d04bab7f52a5e9f30442b58c1983f0119d62e4bc89112abc482fcfeb2edf92c543c8f8459fb3260dae6f3d9
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_am.tar.gz 984854 BLAKE2B 63e2e65a420c03ffeb42729941c4fd4cefdfe6e1d19dbe3e392fd3b9eb6e01248c228c00f128e2788b1eafa97f69887d09e5ecbb4ea7a614d1dff8ee700cd52b SHA512 19374afdabd73c4041b7fbec2dd22646e6ef83758bbf032fe7ef26f8045f7c38df3c791570fb0861ed3957428d6f0210e5d44e8c60497ffe68682fc895f6ca24
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ar.tar.gz 2509625 BLAKE2B 7ec068da74bf928334cf35e9da7c5ad08e8e145fcb699385e7a093f5f8e43fe979b4f54e2692fc339369746ee7406b03328db00f4ce195ea38ae6561147e7aab SHA512 ae7cb4f75534ec15bc17c01de715626fafd8fbe8711aea2d647a941fff8ccdfc7e337985bc2a6a3ca7a017cb3723d69444f3698a85e014193cab7ce3987a7dda
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_as.tar.gz 528653 BLAKE2B a259bf030f76f46f45fd2e4766be5821d2ec44144007e9b51ffbc6c4c340d61c1bda989cb1d7e11f892fb78681a49559f4dacef7ce2f7e8dc8f6992e2ea7f846 SHA512 3bdc2ab3b8ab1fe77f44cbe77d37dc3714630102ce4b3427a02371e6393d8aef3c67d2ef11d0eb80e4cbc7f0aff89682fa906926972aed08e92611deef72562d
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ast.tar.gz 583635 BLAKE2B 6b4a51958fa9e1be7eb9c475c2a1e8f1ce920bd834699c4720ae80cef7a9149d7542265428dfdb513ab50697de43770fb2c202c92901a0f8d2de58968275c3ea SHA512 9c5f7702eb383cb236b69839303a7ef53f38809e3481bd99df40d69c22f9907fd0ee44e7f46cbd1cd69d8c17781aeeefd8a58c2b7aa320739b33d58feddd90b4
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_be.tar.gz 1045019 BLAKE2B 17e773b34fb07afa16fa9f7837069bef33661cefd4db87418be2057ba3de5d9b929139a74c5c9c2a1dbbb6e3adb21c7e3fe4ebf09cbfedb8a476e4efa30c4859 SHA512 deff1ba8188d14bf45a0ec39cbe98ae3852cb629d211b138e9f107d88b46f219999e4f661fcde7c58ef50dc6fb24eb8f3e41fe004e9b7a6f5ab8331c4d56cf2c
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_bg.tar.gz 2770195 BLAKE2B cdb6c5fd7533d0a2efca6bd07a46dc17ff611a9298c5afb0e706eb23fa7d72e404871dde21ddc262f201348c457a43622169fe0f3f500fdb0dead0d54efecced SHA512 8ee95d9722252f9e98ec3748b2e715cec0ae0f432e49879e11ddffbe3b78a3d47ae5037e3012a317a839b5088d35a8f459268da1d35c401a70b10fe7546f2816
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_bn-IN.tar.gz 723267 BLAKE2B 7f6271a85fc9ae9d746c1679f74a45934970c7533fc99ab7a072b068f43356750c7842bafe97a90cb4a765bdb952c642f6c61fdcbac722b7bbce5c3130585910 SHA512 0005c69e4429fae8caf594857b1b513092841587f7a8851be65f4d697588b64963420bfdac70e2e9d9610423c84ef429b5a05ee77857baac9672673acd4e43e5
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_bn.tar.gz 876921 BLAKE2B 74b8363d53fab13c65971e641be5688bc4f82feaf3d4168a58fd6f7e88528fdc5971b27620ec24cc26500e006e708d4b9a2fe444309479c1e62da512865bd469 SHA512 71c9fe89d5590a856e88f03639f160ffc0d175d773d02701bc6acf2a8a228498b578fe629ee69435c27393db84f798f051e7f9c1ef54ad4fb9934d7da6d61641
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_bo.tar.gz 456974 BLAKE2B 1b366064d4a71992886b8c917d0176050b9916890a25e25e94dd9961b813f08a396d0c07a039505c659c888905b888dd46f976b37f798ac345a3c9472424e261 SHA512 448f6240024fde6ab155839567ed15fb138f0ae01a9c470af8df2cf612cf0b8ffd859b1c5bad9b3242b4e4b86648fa6cab154aaba5141fca33b6839d5a97684b
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_br.tar.gz 1515047 BLAKE2B 442f5236901a3ab3df054727652dfe67e4a7122abcfa2891e63094a6e2d37d7618b65f13c535e1270f2ac01b973d35788a205d4ed1e812825d4a1c13e4701e1e SHA512 9f7591967331ac63c722035267d083516ac826302eed3b4140a2c0a658f8b7305327c6f8f014628c2378a389186f30218fbdcb2056c28e585adda71b27ccc515
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_brx.tar.gz 336149 BLAKE2B b8c1549b991dc30579db8823a3f579d45a0d132616bd3aecd45cc6916011928a629b4a4c559527805a82ab6702b9a77a052f85ca234db5a42ad9da6e74c529dc SHA512 54787337dc5df756d2706a590cf7716d2a5e95ad3e327efd18edbfa61224667c8adde87b319f3174f139725a4cf096a9ae3249bfd8168b2a1afd9493b82e7d08
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_bs.tar.gz 669788 BLAKE2B 789422d55ef5339e13477cb91eee3a179e7f8779e3866d5990d709e745720e17a1513b285c5a376ba0af26b2bf37e92dadd43399becadf21ed0c12d1260afa4e SHA512 d695e637075cdd9be2dc67aa7cb127a433257456d465a3ff49a21544ccf723a20ca98b4015fc81e7be7d852ed2c4c5a0eb351bf6d48bc2d457e0a2de1a8ec4c2
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz 2713905 BLAKE2B c8a34da56bd708baa1520cac647b879c9efce98049b0e309a1f5343ed0f15ef39295b6f6d1cee0d416d18d6cd7063f9e4efd10af8f82f470d947df3bb1863b16 SHA512 d4b1b3fd8d0d41a80d0add04c899c353004f12dd302d9abc59bfd8d3110a200f78139ff41c37d80dcbeff3f071f02f3c9046278c624e4dcb6fc5a32cc74c6337
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ca.tar.gz 2745813 BLAKE2B 64939feccf8ae1c3c229a9efff6cb19c03730892fd67796aa27d855526ecb59cf4f61942de907a9d1ff5e6240bd3583e545beb85e521e8f2fef201d18ce07d01 SHA512 6a5980ee25c25c2adea1e87acf3b00c92dfd67710b57fe5cd6e5ffaf8547acc6d8ddf2eafd0bb1cce3247b75e489d00d5f8cd926ba0a07a0245a4d685be5e6f9
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ckb.tar.gz 368313 BLAKE2B a691d0ac99c3354b37e06353ead3df39424cd9ed70182cc76a1d77517145525b294e42df1dc083614787cdbe4b1b5888f470f5b86029422afc7bece1e694fb03 SHA512 f725937cb2cf6e05c0dd4c2455b328ce5a667559fa46558f298444162c5fa38f2743fbf283fb2c5f8ef5b83c3235a757f8b65b4f4192aec639738cfffc29b5b9
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_cs.tar.gz 3860090 BLAKE2B 7408fd0db9353242b30d53c1ea41b4349040fd39131401967d555937e3fb8216b5443fdba9c632cd7785fb7f28f5c3e20bbdb5af54cfb505f35ef2467ff0a4dc SHA512 466319dc724da8d48753def161a973760ff0fe5e253bec22662307f717d5b4983b5c936e54f60e0c2230d14243bcbf102ef6d85bb1e36d6b7b757ad298b05d16
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_cy.tar.gz 1033330 BLAKE2B d23d9cadd1aa0750e6e98a0502d77107a2f1f8b0802eb4cc74d1c39f6edb0b2099bed330798975683093c1acc7fe6da094316e0374c9966d22a4a31af678baf5 SHA512 74086ff067bc74c12cc07455f1b692def75a6ffdd1d233d46a2e045e052914f0b2b42c5e72121fd1ced9c78ae7c6876d70c15f0517cbaeb0761fb7134c81b812
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_da.tar.gz 3134587 BLAKE2B a1bfa407fdb4ceb1b188701b0a55cbb8cd9049feadd02df4daad223ae528a542749344e7a224c01fc42f74ba254cdc04a21a27e4a8f2612598063d504d236cee SHA512 4693c48fa2547891032e9a9ee954d53184271a1ad1fbac8b438fc0e5e6bb07387d11996dfac8ed272bfa999bc453b5301462dd7a3df155292f7a29996b006e9c
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_de.tar.gz 22072265 BLAKE2B 2881165c94b99a6904e3d9c6ef251657967c777a2c24e14f0235bf4ca36c77813916fb7888d1544bf5489917186f287462931d9dd5905a52d52fbf48f906c814 SHA512 6bb3098f7b77aaca50528ded0aa4629e7d6ef6420550a6a618c92cff16bbc973eb228960fd34f2a00f27d5269a11716b965ecb91f0991a7f01282c13a3c2bd89
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_dgo.tar.gz 432910 BLAKE2B 92de4fd914320f1ca19720644fb718ba48de77c651f61c446142ddd5eb03f62075216443338d86eb17a3d02457f6c413f3c26b3b483d8f50d600c1aaa6f5c980 SHA512 ee9c026597019b8e2e6daa9c1bdddc40c80afec89ca18536df60b03c16868c032a1175688cbecd631ee85735b2609d2992fbc745bf6c3f124d61eadd4b38be4f
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_dsb.tar.gz 916886 BLAKE2B 4245fca16794d7dfb1c9dfe846e5fca2fb79d1a5eca9d72cc89fe6b519dc1633f7386800a78cb681ecfbd7cefc2ef00985849416129bc56228c53e1f59bfa901 SHA512 f206c93438f413f13068a8caffe4f1770685e1112ed0f30d018eb802152b40710128ce6573fa25bfc303721671d057c458b7cccfbb9ca31322f342fdcd7de812
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_dz.tar.gz 481785 BLAKE2B e9206cbfd262eb4bc4dd4776a6a20d36c6d57e1e350c470f0674360ee37433428dc83966359e0edcaafb6a0e9fda725fc309ce027c53a936202e5ebbbdeff15f SHA512 775d479a72417decf2f7f0f30b2f83d0e5dec70d67e566387b5e836862b4e4125824e5fd056e74afe775fbdd1619a3b0408b43f741c400ad6f912e3ba0185202
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_el.tar.gz 3174332 BLAKE2B 3eae1cf6c78c072f59980a1bb87097a10aef502790e4db3bbffba20bb49b168ba740ee94b6e0118df970ddf3f0dc284d81d7d3aecb44e69f75f1c45e555e90f4 SHA512 42f94fb023b7d7f2b14a6e3bdf190c7796c15e1d1fcc3690bb5e2ba4dbdc5b026edd7daef67c8ea60a2fb28e215d095edc98d7fff2cae3660b43799c0c6fef09
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_en-GB.tar.gz 7642089 BLAKE2B 3683435e3834fda2a97d7cba00282edaa1bd52de52519d1623cc3ed049baa98d7e29234147508e1d84f43f827749e57677dcee7c0ff2bfb409685c52f82bf44b SHA512 392cbd3b10176fe91ab27a1ff8e5e7c0e68961c148735bc20baaaf7aa801108573df9c09ab1d563a4d6fb3ed4fa7f95d3ae04bae5277c4f32ceb147ef047824e
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_en-ZA.tar.gz 7059143 BLAKE2B 62b7a606e0d70f8adaf22fbbfa7996dcd088d30152f10d9a7f8b43088e91fcbabdcc960bc3b920817d589854e31953530156c20ddce78c22e2c5ce2a2b826abc SHA512 cc85be52a563757f05984659097b67f2eb7a26f10063ad11768fba79ca8dd0ae5c88220e47148422eed9f0d6428420b74c63b202f8a942a7873f49f49785cc64
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_eo.tar.gz 1302783 BLAKE2B c6dc25c8aa68a78e3a44976a88a578990d4265819a51be9f9690995a2bd1f1314c7efcf14cac0e7ac4e9f67b9048283788a89983c9164897a79702eca30087d1 SHA512 17aa60b46993dc1cdf0988461492904949979908dd29427de58bf05a98a37fbbf76f2246c5e22766527716c364f7f67fdd32a2c66505e7b21cc64367811b0a23
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_es.tar.gz 7816046 BLAKE2B a5ce76b15b92fa0c2f8d36b0ec4ac40aecf70edd55eaacdbc93b6020b5cf90639de2b0a20606c7346b813d80d251f7564acf9cb5939b9e605c2aa389793e3254 SHA512 0c3284e3269869ac3ce19396ea7f15a45405a8d88b5c873b27ca8dec7e7faddb113a78c1003be20781c1b5d1ecf7ee8091c22afe4b32049bf695469b9d280a8b
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_et.tar.gz 1888906 BLAKE2B 8eedb7f40c065a253b9d5e8a474f1d5780bf6468ec0392009416a72f984bf5a7c10d6e98bbce03727afb07ba901d78ca8bd68cd909717e8a754d894703a27c12 SHA512 954edda2302c4797762a79ada0eeab9f81a7bcb5b4f43314d74981078682a90befa0190c26c32d34a2358225c79cb62eda4fda1dc42e407473adfc4cf99db1cf
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_eu.tar.gz 1035516 BLAKE2B a6a1b46d0cf88c45fd9ff51ba8f806447677a2017b9a700b21c17052c6ffe3562c500605e2cd362a154f237eb8d2f5ce015c6b5521b195546edd7ddb78357ec1 SHA512 a601fc6ecb3d4200ee54ec8b6db5b7d377f751109d1aa2bee0595f9bd77082efa77520eea66fd2c3c92b209113bde45aa39258d1241bdc6bab60a18c1bdf0381
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_fa.tar.gz 355113 BLAKE2B 8a4f678f22c1b490fa3a540c5e75563d56b01be6559b49e5eba0f58a5e6a257d331d524857ad8bd158e8f71f309febcb5a82a349213f013148e13744c21c35c9 SHA512 eebacebbf446d50d6114a31aff1de232d56a6b676aea32cb09f2ef56cab11169b564fbfc248383e9bfcb03d0dba0b657386ea9c3131de3dadfee0f0612047fb9
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_fi.tar.gz 880996 BLAKE2B 2c312eae0edf531aafcdefcd81dc84d2fd9295007f67e3b068298eb8014de08a304f4fc967c4e25c2697cd8854d47a151260b5cabdcaf59ee6f48392807e9f8a SHA512 f9d5e5792dfc623df7d73ba70b6ff5a5400544c7336d4563228ab6ae915995551f4b2b4f331e09e2d1a6dab4b7d7636773b2e3c3b8e674f33e825a82a01f34ea
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_fr.tar.gz 3352860 BLAKE2B 8fa3259a4582558220f98858a35da422ddc1eddcf7bf2178520fe0590fced4990581ba6205a7c1656ed95bce839e0f5829a1e5c57e9ec3b69c2ec2b5266ea325 SHA512 430543e167457d8b6219cf542bc448427ba183d280da5e0d74523bbb86e99979b9b501d69f547502c42693dd3cd895900b94969cd89ac1b8420ca53fcc95dfcc
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_fur.tar.gz 196179 BLAKE2B edd81417fb6f9a25c8cad5c109b10a3b07623f1c4b493dc46c349e45f40f1c4e776de6c3125f0abe6ec45c1660c766edfdbf8418a2f305afa3a7af63acc18f3c SHA512 0cb0e72050cd40bb0cd5186d4a52a5231be75f4224d0a030d4dafd674e0319f398c2edf0a815cb6902759d3986ff9c60ca40bb10804d4e6bda0ca5ea8b305eac
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_fy.tar.gz 926802 BLAKE2B 28b658064f9841f60353cc90932b5e9f82cabead15e8781f832d1ea323778b02c50d93356c9e4db6b881f648972cca28de0f8ce7eb6d42c52c2c667387c38e88 SHA512 cc9465abff2fa79ec0ac6bc3f685fc2482783943cbfdb9207398496c0649c9a8ecbcec801a65ac380decd549dc8959ff34ada76d0d717a731995120003aacecc
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ga.tar.gz 727464 BLAKE2B 00d05dfe25c01cc0e81dfaf395a89c6ae1e7f14406e3afa73618edcb446f55655c20bd1bd34eaee7e80adfb53005deb7ebd4731df7c05870c1fd962273a1e79f SHA512 d0fb0c7b7034ee3fb312f796d10cacd1ac266bf11b7e962e8ba566af79d7b6a7451f2201c276e41ed2001a3e874980fbf1311a2cbd051ba90350562942b42fdb
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_gd.tar.gz 1767530 BLAKE2B 9dab7702b292fb72e4c9c93664797eace6d0be87174eebea7ab1c33dbad426a5d825874b2ec9a25de8e686c68c856142ff8cc180331e8be4829aaad4a6663c37 SHA512 89c835fba9a11abe1acd02462d01baad5ffd4a541131a8449d5c01473c3fce74861221a16c05dcd22365b3d8c4963f3d76da830151b251e023fa498853784074
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_gl.tar.gz 2876312 BLAKE2B 2aff2c6d2105ea13c15583a966f06d9887655e6427892d2800a3b82fb0e0e5793f9bd8b3247f71857e383d489090e2c445d0db5d3252e5a9ececdea81579e3d0 SHA512 254b44ff3ddf41c8202945cf5629e9e0a0fb819716b98f69a24966a65d3619c7f731fc41cdeb6ed8d04709445fc9b3580ab201b1396f61e7069b6a59fcaa8533
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_gu.tar.gz 1297940 BLAKE2B 48fa47a4beb90d17dabe4dfc008753d9c57339988a2816c8b57fb8ddeded6fc0448a23cb155fac9402a8bc37ec079feaeb47db67032c5fb2619841732baead6b SHA512 496132ecbcc1faa5665253e19cd9ecd1971cbb61d06a5b60728f1a7a513f67d0699cea9e17f6a6f9d0878fa049f167a3574aa2bf4b39a7d8a20c3c7c0d304971
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_gug.tar.gz 507301 BLAKE2B 001bddee7113e6fdf0faced4f5faeeff0b73e840ef48435a983dadacdaf5bf2499aa696e0d3449f05167dc1c6376cd9f3dbfc4eba172c13e9a3d338d2cceb433 SHA512 7d720d6d009d0486d4b95fd279596875fd75ebf67e0b2cd46bef4c57d90fa3f231dde4417eb78012ba05b21bdecc0b0a820b85fcb411a70fa8094566fe08ef63
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_he.tar.gz 1702683 BLAKE2B b16995689dc0d5c23192ad580437780a42bffbc33fb936a0b85d4337024bba1999e0264c5115008830187d8c0a4443aebf5f34e182b5c443f7b6c3b1dd2ed1de SHA512 25221e6aeb2da9432244cb3b7b147814d1ce7f72e5d362768539110b5b9add452089f66ec384119f4aab426aa83c85cc93b5caf8828dfe310fc5567a860b4f1a
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_hi.tar.gz 560474 BLAKE2B 4fb78c2e2279fce78256c5ecdfae387627634629ef0d973310e53b5b6dcd8cd4e652db54243758159f84657ee8be2185d929402cc85a9521d05bf59d2ca9b09d SHA512 4210212a2523d76744afe5460f70907135b4920270ad023add102a7e4b9ce86966d2621112be2bd6dd00834ab3f98d8913b79290040e7a44e72aaa6dcfdccf88
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_hr.tar.gz 998081 BLAKE2B e0d4a46534ba94ed6b5b45cc77b43b2d188a6736ef490611e6136e61dcc1fa7f4c087d62ce4108bd6aedd542cbd25ae801b5912a8b9ab7b8cb1bcb88cafd6573 SHA512 c623d7ca7780a89b4c12ec17ce4db24efabb13372779053455ca9cba07944a2979d00733520635c032f0392f57a4e5e812e8c6f8444f67e47588fc3fd5396186
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_hsb.tar.gz 927936 BLAKE2B beb7219302ce552afe32b589cf72ba07818af9bdb0f46cbc5ce99d480594ce9bd28e84e23b89cf7d064413523404b3961e89789751d27522d06e79d1a7cf47f6 SHA512 0618b0484fae546ac41860662a3702bc5fc02721e24579fd806e794ad6132fd4735caafd54cee17d732fa302b00865a130aadf939cb96144dc1761f2dffe37f0
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_hu.tar.gz 3336637 BLAKE2B 58046009ce3c4830f3174faa8256682f917b01e0d291282c7c9c77a8be9b4ce82ea722ec9f10a3f966c218e0cc30b9ffa3f5f538b5c62fc637cb05a207c7cbc7 SHA512 30300d5e1ef07f62eca638edb2f2434dba4eb49e32adce7ec2780fdabe82bac01c7d0d4465aa1fabd4e18f5d123baf282ded05e8ec1422ceb3d11da66b5f52fb
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_id.tar.gz 1889595 BLAKE2B 45cbc580dcd66cdf4415b880b20461befdb9d7ad55f41d98da9b1eea0d2df9375aa95b3a6a3957f405eb457e23d4128e781e1e86e5ef6590b7138cb1210491a6 SHA512 ebfb5a1bd92d568b94f7628bab1cb0c335ef197e51c726a72a44c5a558681469ed862d733ef4a7d62066b3c2c368b6e72df6a7919641bc3138e41de62668f991
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_is.tar.gz 1568870 BLAKE2B 8244c1ffa859ccbb8919b172a03a28a2326bab7e578d5f93a04484e79775ee701a1a0a7b9c1811135e0fdea4086d8b25fc778b6cb216d8dff70bc9a3536ad1ac SHA512 e5bc640f79308990b86a0be4dee965eb5ce634430e88b9288adc7c786c56b05a5d45c5eb1ae25800d7d324739deca1a6d5ab68d78c24e22298e6009d27cc7a5b
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_it.tar.gz 2376903 BLAKE2B e1f6dda92ccbaa5da3fa07a4c6174b62a282b780f17d660497e1f0d4aa0b72a6fce525cb1be051bd1263d3d571848df2a08c72eaee005f0ed94f6be77ea5d419 SHA512 8b3675398d48449f83ba57d2f8c481443349a9d58faf129712bbdb072c585697defbe07bc3aa31b2a766505f5e8aa5e7941ea71f5ee504f25d6dc9deff0f634e
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ja.tar.gz 1041409 BLAKE2B 245729a1dcc62c1ff924ed66c6a0d1e1b53a7df279fdf1164c41256299d300e8046fecaff540e68caf6c03881e0ac96a4d7c98b30ca227ce459db7c629059115 SHA512 a40367580a0c2d505943dcf5ee5cdbf2a4ef391038066d1bd79f66b2cc77711701771d02af99917e8f55ecd3154a2fada01793532f78dc4f90bb89cac3d2c38c
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ka.tar.gz 398890 BLAKE2B 9211b007f614ccaa9d2ffeacd67b272c78c3f86aa712ab5e3ad094424ce63ef244883656491ff04983f9146f526142be5aef0744313e5364906de0acdf04c311 SHA512 ddb478544b56df288a7e35eb4ab4b614b922d35dd09ad3bdf85e84f144075404825ece92fb7f4dd971100bb59bb0da18f4ff0a34935e99236936cd455955c244
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_kab.tar.gz 633618 BLAKE2B 72baf748432fecfffeb968ce7295dbd44f059f3abc8c8755ad5312f22da2ea46bfaf64339f80385dce26c2162f5f1edbad93fd2ce63df135f3b1e90335dbca09 SHA512 88f2ef1a9e6ef4788cb082675bb89315a7130ba33e734a24822467be186f46d5aa912203d975d87a473a971a53227eb84e6ab35e6fe1c27c2de341221dcef6da
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_kk.tar.gz 837405 BLAKE2B ad84c172666800cace8a939f380d4063c4d0f9391954b1b2e847d9a80cc93e98e6d996bafd0521bfe63f4bea87b02063629d0ecc2b1a2acaccfdf981209b725c SHA512 a6f293ce2e2ff5f780a9f2d2f0c54851293dcdc41d9aa3752ff27942ea44fb52ee878fd4d7fe2c8d2f857f91baeeecd14761bf3e244bd62a94670144b399d3ed
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_km.tar.gz 818239 BLAKE2B 00d566cad5d131598d3f8d0d1b12efe91b499c71a218339f64694fb6b916f607825b63df5165649173c0ed008f9238248f62bcbf3afd86915fd642e4065fbced SHA512 28fdd0f564cf9dbdb6edbd1e511d5f956f10c45480420e7c3398f10a4f16a3a322266a72bd55492c4ad13de1299935806637dc15e3c51d9be79d5a05bb0ef0e8
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz 333276 BLAKE2B d6a0e60d92e18644a7bd82c5ffce8d195d081717bf25c4ff84b4483873e66fab0ad82ee434048b6be1bbc98560b1808c9205ebcc921ed2fa2e1130675a81708c SHA512 ea45b2899cd02f7026c9655ec3b94f0483659696da2d3966c93f020e3d1cda3cce4d18864a48b5e8e1f2002a1d918e62704caedb68a212967d35129d32f27593
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_kn.tar.gz 568882 BLAKE2B 70ee533fe595133d5e608f3047baa2a8921f2f237aa0362223be5e256d3a199efe656c6603a6ab0112276d0b29415f6b15b6c40084b83930abbe772924c5bb63 SHA512 a88dae0a798cbd6c606428e10c78092ea0a0a2cfa9f0f794e11b542069631d5c3a172576232cf166d8d7237de02b4be54036892e21867ecfdd45e489c0203f00
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ko.tar.gz 1702255 BLAKE2B 73a9db9e72754fa2d7b1fcf24dcaf42833e63a75869a8129d85c13d76d4b699189011eb87356c8a03839dae2befdeea36379c5cb35558b51741e74b1f3cf5ea3 SHA512 33b7a50d3654aadbc46430bc67d1d46b8e8616c5e1f7d02953896f94ae9080b60e7609a15f4d2933b071137a9f73da12226971adf7575d5e86ccb447904cb0b7
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_kok.tar.gz 406981 BLAKE2B 399389231bb4f22ffb03f7d12093753eeb2315ce330889d4a4d294183f5d639278244921538f40582b4fe4d3c05e949a859131dea1ab28b7988a1f3368322bb2 SHA512 4cb4218f1edaea3944dcd9a4bcc68fa2c535dda69bee56424e92bc21ffe88323a553d8fecd589865b49791bd81ded515844759aea47c08f97676171216487947
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ks.tar.gz 328765 BLAKE2B b350c046a44d92d7e7a300b1d32bc3b9bffa6d83cedea1c06d9962b14c59367c47c1d69fd096ae95fd385c7b2e5c09d522ab0fc1568b54ffa5f93ab75a10545a SHA512 0e896bfbc019bcdedcb0827025bd2999b78f20a3bf076fb4b38cbd5a83121509fcd7ad351292926dffdeb8e919b05acd355b0397b21e005b7ebebe51d4a91d67
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_lb.tar.gz 148043 BLAKE2B 47fc1d6d61b3b8b20571455d3e07d64821e284ce12c54c1bc1ec7132e76422059386962f562bcee73ab047a9d96812c4977edb3796c4ced771e1f6e52d216120 SHA512 d947fbca48da5c93f4aa8335b9f1eebdfad5a11fa63f34913272204acc87ad60c0d81d0376241264ee60283c33b1f9a5ab28b00c2d6277b32bea6076d06ceabf
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_lo.tar.gz 520397 BLAKE2B c404fd81200d5f3aa8d358d402c1c2b569a4478d2b539783285f53f764a0fdf2967ddeaf871ee2077e8eefc157fba30cf536af3644ac2713d42f7344e9e595e4 SHA512 73c2317e59ee3bd7ed6b3f0bc4e104ce877eae7cdb5900e2c584e525cd484fc89b110f666dfdb68c72b5d1df443fb54963004aaafd344b16bc6f39fb1d96f09b
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_lt.tar.gz 1247682 BLAKE2B e143b638640c4f3f05685337216f43f0f1e31bdeca65aa21a670c9e2933a78a6243ea7ea8f8b7df97c171cf79ece32eb3370f6cfde3236f5926e57a005f39b0a SHA512 fb9abc79686fd58ee54a9135f735399c6d1bc9c9fbfb81383b8fd5a1545e8f43a381ca05702356b7f45878ea8b9dededed56656829ff084bb69fb583911624c5
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_lv.tar.gz 1181914 BLAKE2B e446ee22ad870fd7dff8ec402c80bf0b13ba733100b906cc2e0347575224f4b97a366f79b81452a28936ab2ac194d74df62bfb5e4f5ecd5057c7c12a215a0884 SHA512 cebf97fe260b871d15596f1c020f88b3703a7cc754bc9191c8e16951a13e9bbbfe1acd5a5b04a413bfb4cd6090a834644c5276ea3ff630c812c19478a2c3ac2a
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_mai.tar.gz 330707 BLAKE2B 5479619ee6f5da65ee97ce0324ce28788048700e408064130096fda4aa0e12fcbeeb677ffcf5f407541edbb79e5d448d56fbc5d51b320e18a5fb2be179925b1c SHA512 50a88e410b738caf2e188cd31044f0b38af22f3cf028fdd398d2ff670fd746eb676f83ec39cbe4beb96fa46ca0d2fec218d3307da9123bfd918f20ea44605cb7
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_mk.tar.gz 482559 BLAKE2B 75da7ca220c889e836d4ab417a48b80e2564b3825c1848ca849388fbed5f5b75e4b53afc8ecd64a186e591e4446ad6d37b32839f59bb1552744f2c09ec54b723 SHA512 52b9aad182a08771d149f1220adc3b321a9ca4156284cc62bb816768881dd00cefb10f7ed65b55a240b10740dd3d9c999870e09b18be677df7e09d6da1e0a04a
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ml.tar.gz 530162 BLAKE2B ec87caa6d51aa19be3ae65d436b5b2cd3fac699001fab5b16049de35f987bafff0a4842b882d327a6dd1494a1b2290bd30b35a73cb3ccf3ff1429071bcfabaf6 SHA512 1d6a559575e6ed33406c35e743bc650a7f20d2ae475874766db399372dd71655c79c70858ab52026c59eb1df16079c239e2ef32fc0d3aaa0b540033631f926ac
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_mn.tar.gz 2366349 BLAKE2B abb8c7dd0ec62b30033ef34159ede031682b35c56e714dd1c5ba53a6fee1cc60d77e1fc05299e2d263d289ae81ab75bf9235f96adde68b1f4eefd416012d7150 SHA512 13aa67b22fa46736755aeb7cb8f1032aee1cbdc80571f5044ccfd47cb0e9ba2c844cf3887bd450e90aa326520df3d1977858925df62b35cbf7fe291a6212af45
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_mni.tar.gz 397328 BLAKE2B 7b9562af4fbe91b48f9683676d9c36d05850ff40067450631b9a4ec962bff57ae57ab59a3f732707824181c4a1c7819c7c057da5c90ff1b5282f75b22a2e9807 SHA512 5ded017c2f19f2813af5da13da601a5638d1d15c124147360c7ae6bb861c942018bae740240859fc60e5ed021fe8d634f548273fc8a9cbcab3cf675b32f3822a
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_mr.tar.gz 563273 BLAKE2B 3481f6ad370682bb0dd61cd3c3b873a403475f0eee4c423b8dd091a68f4c1fe956c71cdaeb0289e057bfcac9b5e63fd748b987408ebad8c20ccb4c611326863a SHA512 85b908cd1a042335a27eeca50710ad02585fe5fa0897b1306364b346134e2b312f3666f74de2cf80dafc13bc85dcb11aa10ba58427ce835c9c3d91280d341d83
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_my.tar.gz 455875 BLAKE2B 28bee4132d14054a7cbc376548a249a0ecedfeb3b4f4c3c4dbfb5c1564b557a32090529240005763c3f417ab7bf935d998ba91b5041638fd0ae595f7fbc1e3a0 SHA512 ae85cdfffc5d68bf9a0f724157779fd6b01b505754bb46c675b7acac04d8e06df1ac045d3f8b71092b2d7354df68968646a721cf00b749fb0c04bb2bde91a33d
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_nb.tar.gz 4367781 BLAKE2B 5f4775c3ad0f0c349a8a35b55b53aa1e0d31ee129105d900114588c647f2b7c08845bd33946c76e4411d8bf58383f6b6e0d2328ed340b69e01ecb0a2442e464d SHA512 80abdd04711498b80b970725fc147c07dace9028b1d4a486f852920ddddf52d4ef14e228e01ce53d48344c1e6483d76a26ec24951bfad4aa371434ec4d0b194c
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ne.tar.gz 945183 BLAKE2B 0c688679ffaec1c063643a7b445322e0b93e241093569dd0a8dde832e3e8b7044d68d692bf82b8bb7b0c426b65b98a15546c2ebce3b3eb5211be587fa1a93ad6 SHA512 51dff88ab50688d0501bd8e2cff35875bf4c9347216ca1ee35faecf079946abd75b050ad7413495de332993af941304c3f6e981667c6ad80f82a16db6f38e9c7
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_nl.tar.gz 1832178 BLAKE2B 2829bcaa3214e2050c56b17ee35a2b0840263855ae11d0267a8adf009299b2fd80087069db9578ed720c6d6a8d00d784adf85d517bfa4b3be0418430d2ff5654 SHA512 466a2aa6483c8417f02526ec13caa8d92614ddab9d65d47c6871e7460b6bdacbe6e22faac3a14a6a8349dc330b1012f5602fd81a6a7b0d6131afa32f8200f690
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_nn.tar.gz 4372332 BLAKE2B 71dc5f8a6f9f8d6d7cb5a28e1456f535bba5937fe4ae8cebbe01f114fb1e0ce654fda6c09ed22343469d8cd49ebd0e8e09b29b41a958d29f4c80b687f608f2b5 SHA512 7180f94ab3e37b6cdd1d9776c7bcd545d659375b8f7d43ebcf95e7bb6628f46769ff79e7760b243dfe8f981b2ecde4f75c1b2347d21801fbe76be67289180bdd
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_nr.tar.gz 277800 BLAKE2B 24ee7f7b2d75ef993b0a96bdb588061d1f5647ce2a3622c24a6da2fdb0a833daad7c871f63bd775ecd94168cba05a30be9d69adf953925092f95c8cf4f6151f8 SHA512 253e41e384425d2899f998ba3a0a2e554e8aca0c156af215ec75d8ff05019606adb0603be987ca1db52b0711f54156a18ffdd6b5b09aedc8976c811fe4817bf3
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_nso.tar.gz 321408 BLAKE2B e03bd4fb92fe6fa1543cd9e0de65ae2c2f47b56a575154426c292ea47dc2e5fc46434a1c34016edc6331b1a4584f7f038570a275dd0fff0a89b91095d55b85d8 SHA512 43ecb564eddeeaa90375924f258ed694055f6330d8957865e529ddbdeea3308d887dbc775b94acd570adf1d16b9cd17435640219fe942f08f4c2c4079a1987a2
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_oc.tar.gz 1352026 BLAKE2B 4dac053a1a08991d67ca3f58500b5cdc50b355561ea6627cfba780a7ed96147ef995055dadd847a86d2198e698b6d79b51d674a963fa14eb9255baf50aa3f3c9 SHA512 a1362eb464f6526bd15337e749abfd994e8e0ed02f284e5ff6bd4e2d57a6ad7de01174e51bd4bb37a6a7e3f9295aa1de9a60cb32f2cb4e5dbd0b0a6b0352fe5c
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_om.tar.gz 482431 BLAKE2B e048d72cf591104d7fbb2873eb4f23ab2a3d69359b1b2e7a0a89d464bbe2ac9373061ff55b5b26c394d73175dba0b0fb8fda5be0f09dc470e86f7e75dfbeaaac SHA512 501fab7a98a49393301d15e41866a80d1c684c39ee1d461f8830cd156b1e090b129ba8a8a9384bff293209f7cea261681e3791951b144e42efb7f33772ed2354
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_or.tar.gz 582640 BLAKE2B cf5d2a8e98af8d24741c99ab0cd2ef294a9a14f67efdfac293466c09dc6ecd1ed24bcb36375c7d9a9d7b95322b4d93fbfe459bb4a5c5085e105be090430ddf20 SHA512 1723e98d571a6e50e9b3fb8c58348edd19da158ca8b09cf2a24d1163af2292022ad9c33ffae9c8fa18607a7eb4c28ece450515407a01757b7b018cf8d1c577d7
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_pa-IN.tar.gz 513081 BLAKE2B ac0cdc368ad6754511c13c6e0c66d24a1dfe10a67b8a328fc3ff50899d4115b85b2d1a4b9e71782355f8add97e3391919ce8faa51b502fabbce894079e06fa56 SHA512 fd3ea6d7adea1c92ca8d8a19be09906482b789343292cb2c837eca984d6cb39b08067ef9d963035d2f63d8d90b309fb9058a1eede18a22975697f6727862ab86
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_pl.tar.gz 3402063 BLAKE2B c7a0c90a0a9e16055cd564137def36dda9a26bd9794eebbd15c299eefc19407ad3a701ed44b44c15d619ad69a7a91b53da97b9d29e48e1ab7384c3888a3b61bc SHA512 d5e76bd8e5f3518693eb06bee1b3379a17c11d404572b13637f81fcc099d2734820e2089bd85b2261d70122b0d2c4b6876597a4e8405c56302b3a61d7dbc95b0
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_pt-BR.tar.gz 3134417 BLAKE2B 0be6dc8d42440faf7c3e65ce6c7221ff8edcbeb4d706701280e18c7c26ea7fa930c3a0602990fecf863bbc23b53354dfd53fa8d042c4763efc748dea3fe56c23 SHA512 00711fb92c8893a2fdd759b3154b261e999f7b12f38fa4a83cb1d5d8d0416342e5a84adb14b22d5a8a43efe83072c9d706477d06ba0150d11e5d5f0351f776f7
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_pt.tar.gz 2668119 BLAKE2B 33f4c364f405ba31a17cb19f17e4b23351ee1761ad771bf66512598b9c0ecbc1bcec46a053d19e8362e691c496de5941a21b9cface5656b89a22ca59afaadb6c SHA512 b68f9f141d570c018c406477edb7505613b5fb537257cb903995aa18484909d3520f1b1903b34530562fc399304e0c5eb4ecc169721e271f089cd39706cdb0da
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ro.tar.gz 2518917 BLAKE2B 0fd2597fc8584f3e644ac3802f2960d972277fedfe0725aad47cf2c015431d2c02ecabe36714ac6a9dc857d3cb441d89ed8f953783a10c1ec0830173b06cb7ff SHA512 9e9c2ac9218af079a3f93d0b2b5128912213765cb21354ffc2eeb59ef57b4c86d2688ab5387355b4109687aa4268f0cdc7fd3ea7ed314d12a4a56cf82c8f189d
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ru.tar.gz 2416160 BLAKE2B 3e929f9cbc9a9cbb4194954fc2a594378b5a6e99043039591864d866a6ab5e8eb53b3ce1c293d5b5761ca04fe95999a80a6f762858e3258bd0c8e2f44a4ca9cc SHA512 99c2cfbbeae69042ba5c36581c385b0c19766f573104b827ac8f5700e6ab25fce6f98c4c96cf0db3ca18a174317a199e6e5b82a9da899be34ff3114252dad20c
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_rw.tar.gz 345365 BLAKE2B 61b391bd696f5d259f1540a964ed7d95a5af1e9e1ecffc1bfde0bf353a00146b3f580075dc9e958792b73668cb52d23ac59b24413b8a879149ae22edf8c2c7ee SHA512 a5f7fb42cc1a6944d3601ca3b6105a6ebc4f9463bc52b63ffa7836182e9c25417e58abf05f4b5be5c69f348403bbe4b7c6dc8bd0fb9cfd26ca634623996bf8eb
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_sa-IN.tar.gz 443189 BLAKE2B a0f6191eb30b568ebffaf43f346b0e27cc554d9ca3380d9f69e753164d15a14eb875bff99219a187e4f91b1069cd63dd4a782a33fdc051ef25e544626b87d5b7 SHA512 bcbadc618bec1166a5c2755c6ec9985a96577663e48f2c573ea27fc207b86a59073b5634fa0378d35369057acc61c9119c82ab74e2250f94c7f748c1e5aaf4ec
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_sat.tar.gz 508912 BLAKE2B c931be5d031cf26fc88684cb1f36e97e2486e6ad6d12ecde64abdadefd6087d73c9f5b26910bb07d2bcceaf2722902216679b6621081f0781c90ef9c501a4865 SHA512 34a35b4382bb41c0bf220d05878b25041f232dcfc3920feea650c89c48dc31bcdc62300005636ca96d6d29bad9b3817eb5884223c83540507ef9d1246cedf987
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_sd.tar.gz 430350 BLAKE2B fa3f67ce4a4621bcd59b5bc3c55c9b7828f5a87971c42d3c093bcc00478515a585294d9b9559d0b7d346e4df809b051cc26d8c5f256dbc7345e4c53dd51c26a9 SHA512 71c86296e5ec2d066571721250d0172430f21ce162c54f548877367b7d1f54e9ca200b649f06db55dae59a8e62d7bf77898ce9f75c4379a99e727b5c2bf268b4
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_si.tar.gz 757838 BLAKE2B 2455efab3c62a153fde2220c76f7b7a741a1d1c52120e25e94e32ca1d5dc2d09ce29759641b18a7e3f43c3d68a64bff567131c0bfea12df49d8e0e122cea5063 SHA512 4dc402bd1d314f8bce3d88e2aea3d83c3770515ebb858c218c6f79ec47bf9d2ff2fe94f86182ea55b2955279f4e5d216ca074ab88ee7400a02d4a348d6b2d968
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_sid.tar.gz 518559 BLAKE2B 308f8984a144dfcc3fc3e4b0895e7b782e969a5d3223b8bb16635dcde9f11f7993efd4fd930dedc4040cce972203895d76a9c1fd2f835619a9789c3808b0eabf SHA512 56f3fae95cdff7cea978530ed64cf0e42ead19c2403dddbfcad9c414858d54506224d4ad8ead9c2c492639e47d5f4249f63b95124e26c92e8da5ca4b26ab8b69
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_sk.tar.gz 2380321 BLAKE2B f431a2374a2d2584e8d48603307a88d50ad72481b74494b6a026412fe259d4a0869777cdec01ed8e0b341bf0dc5e54adc47d95e20dd01996169e53e7214a3023 SHA512 67139a1fb6e4bda6026e3f86932a9c65ee0b4c7d06a58ad1eaee053fb446a8e6dc67df9f08f6ba85533b073a68f28392c43a822b8e61a6ce20571d180d6f23f4
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_sl.tar.gz 2784938 BLAKE2B 10ef40c637eb19d251d7493e2c9cf8e9bab8783720e9e91931fd16fa341f39fbb6ecee3d75dae8d0ebe56f34b4d985e1b4458f70005122abee5bf46c776a1968 SHA512 8c9c61100b46c93045df6fc76141b005af949affdce19f28361d4b5b249e30851546d2ea0b5b08ef0742ed6e1fd3d00d44e72c1b6b75e2ba63a92dfb6280fdcf
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_sq.tar.gz 1217310 BLAKE2B b4c3109d15b047db8ed8fa63ef6849f212c99879a5ea9867e7511b75a4156c4d57a7bce0400a66f6f4c9f742664e8dde0798e17651c2961368ace2874efc7c56 SHA512 ff293b3bcbcb93fe9549077c27adc0371f1e5b6b35c58161cedf81609a2b8ab49a978a8ce63c35c5e04b0faa3df7c82ee730b5d4d30a11a38250fb88dd1ed2da
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz 2405338 BLAKE2B ed79c6874f913e7963d3ebe0b4fe717529eba77021d884a2a3a658b00b8a16a063b5d2658459c320197a4d7806ded56fd239c6e74eae607b80c69c4bedd351bb SHA512 c4ad88885d6350226b28ad822a0df21babc048c47b5d7d2621206082bf959cfdce7dd11e14cb0c7dbe79530a182253faf7c76dcfd06f5cf6b91da2d35ee6a2ff
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_sr.tar.gz 2862523 BLAKE2B e5ed4f6ee3d62d0b3c22a51ddf7bc1ab802725f2f29857caedbd893ca63fd50e80eda853814abfb18fcef5fe2c0c700d1c938bbe6a6db289ae1d1dbdb3afbcf0 SHA512 c9a5b266d646a6475235a3e26fc3681e0280a1a8f3699f4e9349e1d7fc62e27f6a343301685361fe62e8d914bf6c67ab55215b9a00192f3c676650c13402a38f
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ss.tar.gz 286071 BLAKE2B 3bd2e7a0e7b3922dbb715c061bae75a7efd9f949e07137d3513ee89f585b98be51bf97614e1a48e74ef5dbf0946da2ac1bcc0c22f830e35ff59e04ef451208be SHA512 af1d32632e5896792c3c5e660d912e003e0a4b7b673ac1ff46077bd6b58123704f3867e8057847d0941d2a47426c00da94b00ed5a0af06df23745c30bec79767
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_st.tar.gz 280262 BLAKE2B 7aeeaf872283f47a57cd7d0e7329ed6a0b6c2ae12e9dccf230d45a7852646adc0ddaa281ef38709bfe665c2b77c2d8c148794f5020aa56985fd0616c263795c8 SHA512 d10762d172ed1705de32edfde0e9a17b9e93c5275cb958f6a84041dad3d267af03fd81606fc8de7d048f507e59c44f37391b962fbcdc11afc82b1a6d258f375c
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_sv.tar.gz 2879234 BLAKE2B bcee91ae2d62359b37fc13d81366d1f88d87d3cf64d4d7d26e57d1c3a7e98889de5c88938f9df516b43a7ca25434a2646f1a0b00eae9db394fc304be014810c0 SHA512 c43dbe3f9111719197e62c07c165c7e677836ad31a4b831f74e0177ace0db2679f895e30df5629e0ed64b9420d94c5c4553c1b286652350d5bc3f2944d45c2d8
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz 317063 BLAKE2B a1e438a1e711dc74488adcab0b75c380a62b76dc9156dbdae186fa30dc2b6df34f3287795fbb10a8dd44e14975756df791df12e17df9b0e378de9aaf0ec05045 SHA512 c9a16f22b35cae1d3b583c56a90f12f7aafd8ab23efa3469e3835c34a185681aebc32cab3c799436c18731e349b7ed7d4a785e8b4a3198649bf4d6065fcf3997
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_szl.tar.gz 728302 BLAKE2B 00b9f8bd211e6dc270a05afc042001e88c0f369f2fa42e3e4ddebdac892ed942a87449eadd719df2b7354352d17ad0988716383636bf7a82951869488873ca8a SHA512 247743126755692991ab2a26e013ef785ba9c85e7ac78606c820decf56744068b24a6421c45968802d739c0f54c033558257a9e46f06c10b5a7907d032068b42
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ta.tar.gz 727820 BLAKE2B fa97db17936ec0f0b7f77fc9e20499d15f8c53d9f8b45eb6b50b1c14bd25e5f55236951141eab31368eb9eb10b7a9e0616a9e0349d14f0f69f02ac6749640851 SHA512 27d6131c20bad8c01f8f0061134d64408dc1695578ac97508b761df09fdb29e84360d39d3bb0c9cae54ccd61e763eadf5861e6e77f61f5b904bdda85c4842eff
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_te.tar.gz 1073998 BLAKE2B 17ec649fb22faa6c7e8a535d45808ecc1bc7a7943686775f0a8477104c42924d4c456632efc42b3f8f0827e5912dadc846214eb7ca86105ad83869b60366d32c SHA512 7c36befa6e1179d019503fa8aadabeeadadfcd33b9a425d45edeb70ea1eb5bc9f696aabb94ccf8cca95b0a81069884ab27973036ba3923d20c68d7cd5555eea8
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_tg.tar.gz 389525 BLAKE2B 0f6211dadcea19d59638dfa7af62ab552bc1d38e05c89907338519603144c19a6f4d1bc8e1de8f2fddc01826524c56a3e7993333626842ea45b70cc196e8fb3a SHA512 529d0236eaa7a757a7c21827e9851dcab806937a3f7d8b40420017fd0110534ddefa3739fa4042a65ff6defc9a1eb309c9dce709a4c3d0ad073b4f13b8dd8597
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_th.tar.gz 737610 BLAKE2B d82d49a56e421d0e7e97811b83a906f133bde870c93302ebea7f6b303df5738fefb63411e10318d919415d4e8b7663a274cce50dabe308b2b4d6a5e0d2047310 SHA512 b0fd821108f11244e555d12b739aabdd64ebdbeba2cf7ac6ae07cf1d09347a591ff44dc12ac2fca6ed0025dde41e11e1ebbbc38890bb242cadb4f599ba3285c7
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_tn.tar.gz 260429 BLAKE2B 73b61d09616558e65024fcb373fc278d4a38a00165484e3c0a4a8ed89380868d9270e47d43b157fd5af207f7a46b9a1e7b3d36ebcbefa1d48a1c2f59fb263341 SHA512 057a6f46b52a2457bdda740edcc7b4a8052988fc5337c4da3c3f9798b3de405969f43044a47f7d2bd3eb7c897521bf029583a317af486daa45158aa56cc843a4
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_tr.tar.gz 3358427 BLAKE2B f1611dea3881e76803e58ffdfffc9d71aeb2758e5bffe281dc74d45cff7102d7a6498c7e2a162ca4c19d2d7d90e9119e1fa54cec55452638a57098a12da658f1 SHA512 8192569da933a73e5642954ec0cf9694162f4d0742a01ce3a9d3fceeb112bd2a79ce49240c5f6314c954115b9f68e03a76aa8547df2ed77d84fee6577958b6cd
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ts.tar.gz 277721 BLAKE2B fb81a2a5597838c169382257bdede92880caea257cf40fe49c8591baabdeddaf5b05a66f83559bab0fac1cb3ffd60ca7540908940f34894eb5718f68ae804af0 SHA512 ea7436fd9129d5abf871de2b101fdd2c873485f3f59004636c217b30e905850f1b59737fbebaa2909aa7b501e41c7b5b762be1aef712749cbf163b174a3e5056
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_tt.tar.gz 185882 BLAKE2B 073641448e39568b9b68a594ea5ab87c4b634e64fa7a6b97ea7dd6d5ae64fd22626d02e925f1b13a82983e3d23b663ab8f9195131b1d9670369aaae2995dacb1 SHA512 edfb8ba51bcbc485d12c8c77d5e932d8e39b76a74c3d8be78f9630dd5079b4b025ba75d360116f1eed7a1952bfb263e7d5249dfdd3cb2654b77d5dd562633f7d
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ug.tar.gz 537856 BLAKE2B 4b9f6e3023d7bdf9a90b2b24e1e92e9c7978679f6478a03a35e747a90eea2d4252b683deec50e0df3a8ad318b352b0940cf3245bb664323f2dd789e6acbafedb SHA512 9a2d5ea119409ff0bac79b894fc7dd776fbee168cb92a6bef726f27254a28465028213364741d7fb67b8ba868ff5b0994dea0e5d6c7dee7b7c4b48e62dae0004
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_uk.tar.gz 2889213 BLAKE2B 49f421b58e1e82af3029e0d608b81a1c02522a815b0f8a2ae8802f844d07379e77f36da12b2075f0343283402062905a9388fb1d11ca2208c195df696e327c18 SHA512 5468e356f6908a9afee55235f9430a30ec93766b2bcbb771b3bc3412f4f608697a3ee8a93d2043a656781ba581b72807bf2de28ab5e047f6aeb983c25c9843aa
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_uz.tar.gz 312709 BLAKE2B 870581bbf20d3c699fde8aea3ebbbb6d8691ce55b20d045628575f9244861928e7c44197e9f39156100b53f9c7f4407ff1a64a8872e4bedcee031fc33c68b72c SHA512 c5366833107def5a0147f12973ce11b3632133650af83f57ba13664bd2b0d0a4087baf067340bed794c6ebfd1cb8b936500d2d17154fae80f7c460496fa13480
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ve.tar.gz 282410 BLAKE2B f3ca96af25a486898247f8748b1da07c6dd93395031e0c4b54609e84817432285eb4b4096d420ed1533fe61de4c8d20b6b8102e8e43e80900ee10f1f55833460 SHA512 9186cd3e64ac52f45b5b20e9e922666a1b154752be34bc330044534beef096cb8e20d0aad15ea0be252ddc07c7f25473dceb853b4a88b1b3d55101681a6d9741
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_vec.tar.gz 758096 BLAKE2B 8b97bfdd8eb3962ad0652334c2ebed41a1fc44d1185f1a764a065e6cde0d47652e506a3f67204bf0ae2eb9f5d022a3d1327759470f139cff6babafb2c3122115 SHA512 36f9b2877f2087770276ca63957de6b12554d68c0f1f90dcc237d48ffb097cdeca62a8eea00180967e51d0eb3c5aa4ac269884fe85088445ac02887ca63db8fa
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_vi.tar.gz 563868 BLAKE2B a47767b5a43a3b11612a77500c401e417e83b1188ad25fea365652943bf48917bd4e7885d53885c2bcf40cbbbc933494322422d7e16fbcc58f54e76a8b7599eb SHA512 027900fc9ad804455ca8b5994982f7f2cd29b0b509f379b95e9da2b7bdef3fb1a21367375376e5bee0f188e9bbe2d4a82b38d28940066acff03b0cb9b0316058
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_xh.tar.gz 289535 BLAKE2B 05388ba059dd3692df3e2146d942bcb46c70752fb6628300e753da169f892fa9b043c349495aa2ce73d169907ebfb68f4e5c3e137056f852d0dcae3dba17ce57 SHA512 def7069a252adaf5cdf446c988c7101f20e2b77aa351123745feb5033eadf91bea373830561c2db50679aa837b738fb7f3b5ea85204ab99c7da2528c0b7146d7
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz 1085509 BLAKE2B 072013660c94efe0bbec8acb1aec4b33940527240ffcfc3a59f750bc0030d5a19ea8eceed4d0c6438f0207005bc6eb78ad436c16733d540b1ae261a7ea49f716 SHA512 852a5db014096b45485a10061441f2c6e906edbf0137fc0628bfbcae357c0057d104120d0244d0f9ba2a26a61280e6fd8e656cf6cba1ef71ee44b5b6761e4e69
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz 1102646 BLAKE2B df94096a07e41edf279f93c79cc04b0cc9850189eaadee0511420cc21dc335327f89c6f8c1937484c31ef969fdfac9a73a02024ebae94c389f7c4c438739b4c2 SHA512 f13995b46abe460d083786075c8d3a6fa89a0a34884075b1e86d567e2d0f9dace04ad62c2d5fde6c829779ed9add4b658ab1ef7edcdad056e23ab51e9d1397b3
-DIST LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_zu.tar.gz 318905 BLAKE2B d1079eb0f94a3764183125c87a51271c9e3a96042eaa9e643a19f8bc9498c096b6426f6a3299ccfca9a6d8c0caae5cd91750851075c417f357b6f7c466929e30 SHA512 f5bd904266897b063af13d45e02b2f456ac2820346b14414e13f23337727221777e4f677c4efd6e99d8cae1e3d64251ba9d026c89420258919d0d88820fef7ad
 DIST LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_am.tar.gz 4491591 BLAKE2B 8a18c59b649fd4114c6868f9e79304ee8c9b007c9f4f277641e37d50c4abd45827bf632058435ccb1b73cc078407e645ec5942c8860c5fa967c47f60240abb72 SHA512 e14235d84f2471ad9f42495ff975e9cbda76e7be259ab31a65194592d28c2e025248f3416da107c90c9fc3ca82c3d1d574643e72608f8cd03ce73c686076d8fc
 DIST LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_ar.tar.gz 3951132 BLAKE2B df830781d24520bbbb87d8dabedc6b08d2516fd4b525408daadb0b4bd0bb32aa22de1f3072495f300cee5c264d35d1589531352e8387bd74863bf82a84c0c1d3 SHA512 1779b77457f0126ef56e8001ccfcea4281f989aa7a5ca8ce9686bab39e674451a5404d08a7480019af77c1d2e20799f7e3ee1eef5c8930edc64dcdab272a5de3
 DIST LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_ast.tar.gz 4191279 BLAKE2B a960e82e2ccb8e9e02caac5d07650fec6872475839089003298ca0852b4a8d5f224260a2004abf94b41962969aa7412102cae4b3abeff3bc7f83f45165e54324 SHA512 06f4413b6efc5bbfe0fc2c8b74f00dd0bcc8e040b6ceb67d781927c7ffbb517d444cfee59d0bc18e9113ef78ee50e63aea1b40dae68e62e9969b5bc2f37a2ed4
@@ -548,7 +365,6 @@ DIST LibreOffice_7.3.4.2_Linux_x86-64_rpm_langpack_xh.tar.gz 288741 BLAKE2B 3291
 DIST LibreOffice_7.3.4.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz 1091131 BLAKE2B c6d2921e9162c85a0fda89a07a323a9c44d4d98eba8b39fd29048bdd8cbfbed9e4ee6b94558dc2d9e286404879c02af06e85f52b1e4c328554cba54ac14a1bb9 SHA512 77af723cfd8a4681ba3c0089d03d875bf9de08db4fc3300f39e84affbdea068988733bd3c4552a3ac784d555220087d4fa53ca8c008987a933311c30b7494bf6
 DIST LibreOffice_7.3.4.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz 1111273 BLAKE2B 463e64b91998e1369b52d6863c114e4d811c65964f0f45395038c1222dc05adb3f92a5becffbbd404d2c4d4a57ad112c6829eabe88ce74b08b432c2de675c5e6 SHA512 5a413b1a10afc1cdbdfa458d1799601d5aa044c49683c1bf7101e384099ef76f9bf12b56fd6124e178c85b2c281bd95fba520d2f8da93e6a365829e96829903f
 DIST LibreOffice_7.3.4.2_Linux_x86-64_rpm_langpack_zu.tar.gz 317755 BLAKE2B 7938c2de17208a5a21fe32de9b78e6f2d3aa293c1fd2be4c97f1525eebccdd3b4192ec95c53b9b1be18e49f0379c60cce2a1f8cc0a437a62bed2436930e4d9cc SHA512 907b3768990ac48f18e40031a59959dec92ae567cd082904f88ca8951d8f87cbf9f285211aaaea2be8e41e242392709319d27584f40593cfe7158433037a9c6a
-EBUILD libreoffice-l10n-7.2.6.2.ebuild 3685 BLAKE2B 5e71a8974f751af51cd692693483b86bdff5eefea0b10bdb9351324b6432f4f0a76b3c9086c2c64a99644c0aba001806a39910ac682fc89638ada957a3c50a51 SHA512 3b23bb01971c4371a61e55334b02cddfa9219cbed33ace17e991b6f7e217165a9f2938f637b639ed74a44750a3799d6471142265796a75399a1b39f31f1789cd
-EBUILD libreoffice-l10n-7.3.3.2.ebuild 3687 BLAKE2B f1cf0ab147a8c77845c84e900a2dc139277815481953935bee5793fc54d4605957f61f539a94589a01b98bf772ad68a7834ba99bc03e3ce101a2f965dfef9e0d SHA512 1f8fcc354179065cdb6b4fde3303eebf79fe08d3d91a1fc372d8828354fcdbaafd8ff4ac74f5da9b4a0d03506f4c332d20de70c88f93b631f71cbba2282780bd
+EBUILD libreoffice-l10n-7.3.3.2.ebuild 3685 BLAKE2B 5e71a8974f751af51cd692693483b86bdff5eefea0b10bdb9351324b6432f4f0a76b3c9086c2c64a99644c0aba001806a39910ac682fc89638ada957a3c50a51 SHA512 3b23bb01971c4371a61e55334b02cddfa9219cbed33ace17e991b6f7e217165a9f2938f637b639ed74a44750a3799d6471142265796a75399a1b39f31f1789cd
 EBUILD libreoffice-l10n-7.3.4.2.ebuild 3688 BLAKE2B 363b476047788fe36ecda6ac19bcb145438f9fd23b280d7704a237501846b0668bc62c7e5748f580ea3ef6ddaa26d4c29656f27143f26c40c3036040bc132965 SHA512 457f15f4e1ad4d4b2076e52679e6e3b9ac7b0dd380ac37bb2c7f90772530134a9ab66a75082e58cb7284cdefe63447bc1e39d012f6b487ce3281867f2b480240
 MISC metadata.xml 370 BLAKE2B 19bdb15f0dd1c100e450d6bcbb07dd79b6debb6d278d0bf08cc668b916c3fdef1431256aaf184997c95556ecff6da5811d1a1cd89b6e4beeae7b55116c5739cf SHA512 e39c0062d9f3a4845d86539861c1b2caffb5c44c4334449b6bc97f23bf134df100c06d244a25a34f625db318f7607210ecf3c9d7ae3d3ce5444ad685717969a1
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-7.2.6.2.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-7.2.6.2.ebuild
deleted file mode 100644
index 71362885f275..000000000000
--- a/app-office/libreoffice-l10n/libreoffice-l10n-7.2.6.2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit rpm
-
-BASE_PV=$(ver_cut 1-3)
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-[[ ${PV} == *alpha* || ${PV} == *beta* ]] && PN_DEV="Dev"
-
-DESCRIPTION="Translations for the Libreoffice suite"
-HOMEPAGE="https://www.libreoffice.org"
-BASE_SRC_URI_TESTING="https://download.documentfoundation.org/${PN/-l10n/}/testing/${BASE_PV}/rpm"
-BASE_SRC_URI_STABLE="https://download.documentfoundation.org/${PN/-l10n/}/stable/${BASE_PV}/rpm"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux"
-IUSE="offlinehelp"
-
-#
-# when changing the language lists, please be careful to preserve the spaces (bug 491728)
-#
-# "en:en-US" for mapping from Gentoo "en" to upstream "en-US" etc.
-LANGUAGES_HELP=" am ar ast bg bn-IN bn bo bs ca-valencia ca cs da de dz el en-GB en:en-US en-ZA eo es et eu fi fr gl gu he hi hr hu id is it ja ka km ko lo lt lv mk nb ne nl nn om pl pt-BR pt ro ru si sid sk sl sq sv ta tg tr ug uk vi zh-CN zh-TW "
-LANGUAGES="${LANGUAGES_HELP}af as be br brx ckb cy dgo dsb fa fur fy ga gd gug hsb kab kk kmr-Latn kn kok ks lb mai ml mn mni mr my nr nso oc or pa:pa-IN rw sa:sa-IN sat sd sr-Latn sr ss st sw-TZ szl te th tn ts tt uz ve vec xh zu "
-
-for lang in ${LANGUAGES_HELP}; do
-	helppack="offlinehelp? ( ${BASE_SRC_URI_STABLE}/x86_64/LibreOffice${PN_DEV}_${BASE_PV}_Linux_x86-64_rpm_helppack_${lang#*:}.tar.gz -> LibreOffice_${MY_PV}_Linux_x86-64_rpm_helppack_${lang#*:}.tar.gz ${BASE_SRC_URI_TESTING}/x86_64/LibreOffice${PN_DEV}_${MY_PV}_Linux_x86-64_rpm_helppack_${lang#*:}.tar.gz -> LibreOffice_${MY_PV}_Linux_x86-64_rpm_helppack_${lang#*:}.tar.gz )"
-	SRC_URI+=" l10n_${lang%:*}? ( ${helppack} )"
-done
-for lang in ${LANGUAGES}; do
-	if [[ ${lang%:*} != en ]]; then
-		langpack="${BASE_SRC_URI_STABLE}/x86_64/LibreOffice${PN_DEV}_${BASE_PV}_Linux_x86-64_rpm_langpack_${lang#*:}.tar.gz -> LibreOffice_${MY_PV}_Linux_x86-64_rpm_langpack_${lang#*:}.tar.gz ${BASE_SRC_URI_TESTING}/x86_64/LibreOffice${PN_DEV}_${MY_PV}_Linux_x86-64_rpm_langpack_${lang#*:}.tar.gz -> LibreOffice_${MY_PV}_Linux_x86-64_rpm_langpack_${lang#*:}.tar.gz"
-		SRC_URI+=" l10n_${lang%:*}? ( ${langpack} )"
-	fi
-	IUSE+=" l10n_${lang%:*}"
-done
-unset lang helppack langpack
-
-RDEPEND+="app-text/hunspell"
-
-RESTRICT="strip"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-
-	local lang dir rpmdir
-
-	# First remove dictionaries, we want to use system ones.
-	find "${S}" -name *dict*.rpm -delete || die "Failed to remove dictionaries"
-
-	for lang in ${LANGUAGES}; do
-		# break away if not enabled
-		use l10n_${lang%:*} || continue
-
-		dir=${lang#*:}
-
-		# for english we provide just helppack, as translation is always there
-		if [[ ${lang%:*} != en ]]; then
-			rpmdir="LibreOffice_${MY_PV}_Linux_x86-64_rpm_langpack_${dir}/RPMS/"
-			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"
-			rpm_unpack ./${rpmdir}/*.rpm
-		fi
-		if [[ "${LANGUAGES_HELP}" =~ " ${lang} " ]] && use offlinehelp; then
-			rpmdir="LibreOffice_${MY_PV}_Linux_x86-64_rpm_helppack_${dir}/RPMS/"
-			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"
-			rpm_unpack ./${rpmdir}/*.rpm
-		fi
-	done
-}
-
-src_configure() { :; }
-src_compile() { :; }
-
-src_install() {
-	local dir="${S}"/opt/${PN/-l10n/}$(ver_cut 1-2)/
-	# Condition required for people who do not install anything e.g. no l10n
-	# or just english with no offlinehelp.
-	if [[ -d "${dir}" ]] ; then
-		insinto /usr/$(get_libdir)/${PN/-l10n/}/
-		doins -r "${dir}"/*
-	fi
-	# remove extensions that are in l10n for some weird reason
-	rm -rf "${ED}"/usr/$(get_libdir)/${PN/-l10n/}/share/extensions/ || \
-		die "Failed to remove extensions"
-}
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-7.3.3.2.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-7.3.3.2.ebuild
index fe416c8dcd3c..71362885f275 100644
--- a/app-office/libreoffice-l10n/libreoffice-l10n-7.3.3.2.ebuild
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-7.3.3.2.ebuild
@@ -17,7 +17,7 @@ BASE_SRC_URI_STABLE="https://download.documentfoundation.org/${PN/-l10n/}/stable
 
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux"
 IUSE="offlinehelp"
 
 #
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 89c1d0dfed1b..831f94253193 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -1,7 +1,6 @@
 AUX libreoffice-5.3.4.2-kioclient5.patch 605 BLAKE2B 30961066c080c4d06ca978b7c0ad4b57a3739d6d34a2941f2ea57d3a5c4ab65e3f3c2376243aa88c9c05b1038cf9bfb7605a370d11513bb4553de2d268010519 SHA512 2aa6d1fc96749b79b3291f6e27630c6cf59d2c743f0dd8603867ba8aec2c17f87b70e1dd031365013f7e9ea53c160e9cb3f48af592a587dc05f3ae4cc1b35df6
 AUX libreoffice-6.1-nomancompress.patch 967 BLAKE2B e60afbfd7007a5fab7291ffba34369137336327f4d1ee27789c5f6229b9a82f4aeab0eaeaf494e60b992c66fcdb276b6423b87713febb14e9eeaffa388369ca8 SHA512 f82e23f15cefd947af20a50e1e4168c9023d5f8b9e19da7f76b141a60be4fa3516ad16400ce26e4d0ff293c570031ac87bbbf6766444e1b31e7bc3ee8ef58083
 AUX libreoffice-7.2.0.4-qt5detect.patch 536 BLAKE2B fd77876d1ca3973ad30c9ebb60bf28e163dd29dcaebaa2b94d84f4c2ab060617d96f4df3d5114f17f882b0cb8b9e2ecdb284fdd1e4aaf8a34cc0c1f06a295c04 SHA512 e1ac7dfc4743cbdea3050b18c1714d06c8bcca4abc51d56e13362c8379fbdd3d37a1916c962fcb1389783c9b1fd72783c9ee45fbb649538ca0fc0cb7b05bcacf
-AUX libreoffice-7.2.2.2-makefile-gengal.patch 11807 BLAKE2B 6d8547d64df433f7786a538d29e8462af031e3a7cfc78b22940e1df18d9d684611a4a0340d4e495a0ed8bae70d5bde44c8805821d7e579fb7476abd360dc6d64 SHA512 0844af3144a437288cc05e8dc8e69125e273ba869232f9b6800889db2a82aa7026b337e439231a9ea40cf6a9f8199f939bc3fc5828acb0f8575346d109eab242
 AUX libreoffice-7.2.6.2-poppler-22.03.0.patch 1361 BLAKE2B da788c4de7203ab20337a1d92cb4478f7a7db3f54e05054e5943d8acf78eb0907f9510c6bdf5bfc5466171322af98f55fe68ee0678e2a08856f6247b1981840b SHA512 f2cb95d52a97b1f3dc985e391df333159b2754ba3a386b71479c584363022c54b09125bfedaf61c72f056e12677a4dd1eac1d3074adaadc084243ddea05392c6
 AUX libreoffice-7.3.3.2-Add-missing-nSize-set-for-Poppler-22.04.0.patch 1122 BLAKE2B 7f6c0d006fda26d868f2b4a193c8280ac3048233a2e796d1a10ec7210e68ecc391d6c4aa88a28c42bfb053fe418abe5fbbb1c3eeb8521990f692fb94387c334e SHA512 3abdc14a55cea3829cac8c652fcbe6cbbbae45b1ba8e02bf8654f8b8c45780d73eb094968985fe98e10b014c2e2b8b3fd82a830af297902644e2ceffe3a02ad1
 AUX libreoffice-7.3.3.2-Import-FreeBSD-patch-for-Poppler-22.04.0-build.patch 2462 BLAKE2B bb49834014847b2cba163cbb946d865f3dee13a3a9fc04fa74ff9526ae089f8213ae2f094170d41e909ae77d93e468cbf06eefdd05262a305d52a3300a2b4b88 SHA512 d47885a5476bb81243a93729f176902144134c66914ad7e8ec9032c85bb9b5f19040236da883d7cc0dec14d05af32771be06c3a686d0b9587721b8aed65aa5ad
@@ -27,18 +26,14 @@ DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 BLAKE2B d3ac085a3
 DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c72493e44d3ad1714d294fb7baaa85d33fef2eb4ce75bf507b65f78f1d9d399bb5eb72cee188a8abc4b234eb2845a26755791fb3ac104ffe6e55013ab41ca8b SHA512 c1a15ebbfe817ec79d4b3f1c97d096bf8511737d7d35d97302856ccfb3de14a1cd16bd31000415d9ab24bbd9ef770d37855cee4b819ff0e8fca2f2766920a114
 DIST libcmis-0.5.2.tar.xz 484404 BLAKE2B 7de242393c28fc8289bb598b34e704eb2affaaa8b9e470e10044dbfd3812391f29e1421df8d7ac3869955698ddbc9575feebcfbac27bb074a60ccc0527dca1c3 SHA512 295ab15115e75b1f6074f17d3538afe0de9b2b77ab454f5c63cb05e8df11886d82942fbf21ba01486052e3f6c75b0636b99d8e660cd3472dc4b87c31d3cd557b
 DIST libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz 5005888 BLAKE2B 836ec268c19c27ac079ea1084587c3e999f39ad2188be1a5cf8337ad0473ffda6c32d0695254d3797d1607707329befa88da6043f424544487238e550eda8590 SHA512 4159dfb4d08e359feb23127e12db590260913e70774161ac9513abb5183ad6ed6d2bdfbe56fc8aa68e2fc57ee29eae67aa0180e1a7d955016884ecba2ca60ff8
-DIST libreoffice-7.2.6.2.tar.xz 252995284 BLAKE2B b807e666d39b4302b0a33f84f7e8797bc41ec9e1814bfe57f0e06c8bbbf3b8bf89a70a25caa65401f402a593acce04cb1118bd13bbd961d7feeac295511e36e4 SHA512 2b1a92d98595d4a40bf699ebf5ee3cbf4daeb765a8d37ae035f459f2a74c2ce27e53747307d9875aaec7d1d5a2693266ea81b7fe1281c33653c9fa4bbd727242
 DIST libreoffice-7.3.3.2.tar.xz 256036064 BLAKE2B 8a96121448e3cc1f81990c837d36191a6127e3ff78773440a4ecdfb5f178f7ab522298fec1d0dd872afe38b67ec102d4f5ea4b0cde64caf5d6420a7f02f25e1b SHA512 242d5694b6d09c669992ea68223b62fb8e418e886f68c7e5d843272d55ad2de34e5207180b7a541fd97cbe678c2d12d5290ebd8b82d47c88f1607e6736413c96
 DIST libreoffice-7.3.4.2.tar.xz 256373724 BLAKE2B 98a3a450e8b16caafdbe914b542c32e3e251ac6f2fe528e593640397d50b533f146b1cfd262c633bfee9766a5ef659f7ce606453952978c71c08f249da7d7125 SHA512 10ea93d380b8c59ec15aefc4c4f6f5cbc76b03cf444e2f172fdb8cdde637e8d3de4aa2b7adbd55ec04ba8ad5db73a1bd80e8b692ca328c416d229526f01bd4a0
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
-DIST libreoffice-help-7.2.6.2.tar.xz 112079748 BLAKE2B f9d96d6d72e70f28f12dcf656cf8fd22bc8e563ec53c840cf7cd668e3de677ee73a3f3099e7c62c6034cd4d23915b9e7a94012340c6a7db7f8822e4c8c6d0887 SHA512 05f02eb1afaa90547ca388008e02c4a48c191984e77d4022adf02089f69a3b4792cdc065e160f59fbf2f5554b062ff0d6853b12aa9abb9b180dd7c4c855e4d8b
 DIST libreoffice-help-7.3.3.2.tar.xz 112209704 BLAKE2B b0e92b88aeb866d3f611fe89d723287cf037bca1772a861cb8b76ee046ae0d039d67648e121aa253eccbfa132c8d252b947bdcbbc3ee6178b6defd3c876749d0 SHA512 f70e747c5b78be20bbe4dd0c20840923d14b4278c00a12a60f5e58e3226abc0c218ac3cce4885cf5a440ace92141bf0428df40a4d1469edb91103167c5e3d46f
 DIST libreoffice-help-7.3.4.2.tar.xz 112208564 BLAKE2B a47b428d69c62ba38d74ee5eca1dfeba66389ea0c7ef103f97292180d43ddc92a5e6ca4f9377f802318b89fca7aab6278c23171d9480e3961e521c161ec42fd3 SHA512 68af32f017b46f7d3e664bc8cfc69de6939c33f26248273372cc7ba5a29299c79795cc13b92a921b8e2508045e0447319ad0c0cd3678929355db6ef8a79a8614
 DIST skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz 11079112 BLAKE2B d3eb44a64187ddd3097bc7473eaa6b631b4043b9679861426ae83956de7907a03b51cc472cbb9169c52e92cbc4ebe681181c675ae938324c6d3a10eff9a7084a SHA512 1234ff6e787947fb6442b7279c7ef07d48d7036b15591782ea197c827c60fba77bbe83029bf7d8dfa7dc126535a9a780f6b927fbf7339f0825061616a9c53436
-DIST skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz 10630696 BLAKE2B a3d42d08a0622de591d177184b6225cf62e3048d02d8f2012b6b02aae186b644c899c4e73b528b3528a4acec6cec07e3576dd6d97b130fedf3b2ec5b2ddf4ed7 SHA512 625ed461d85ce5c5c73ffd20bc3f2c9b5fe6ba557693b793b387ffb434d4f0d9056bd9befe6760c55e9e47f09c02373a49b8ac106162a40d940ea351e8c873c0
 DIST skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz 11826600 BLAKE2B 2985ba0318fd72ac216fda33c6961eaa8ee649d2a850eb736accbd91fbc9cee7dc4e5752b2696a35204770a188412e2ecd0cc128cec324c682f9bc35e68358b3 SHA512 fbf5cfef66991565dbad928091a4e795a5b5b79a1e062a98ab9135b9972827de703c449507957294e7471c422c2e2ed239d6df61ffb9b9581a9ca3d848687a76
-EBUILD libreoffice-7.2.6.2-r1.ebuild 19610 BLAKE2B 911bf949f45c111a6649c3b34f3f5357a0aced00b8015568eebbb2ec38824c0b76624a6f9bae045d388ad109e4f25e43e4efca80ba812bbee122cfadad507193 SHA512 619efe64bc029bd5ae01a225d65d1efccd2833cde0750814c2800c052876dff0fe827f01d49584072d36288c6acb43f100de802986d46ed049c005f290703d52
-EBUILD libreoffice-7.3.3.2-r3.ebuild 20106 BLAKE2B 4a9b73cc37f3bbec547ffc1dbbf7d1c6b0160401fbeb79743a05db160e94224b5dd84106e115fe6069d321172d7df58fd59a7f14a0c28594f416afad115c48f3 SHA512 0f784a27b174db126c81844a3dca04c8a118de0401dbae81f64ef7b0ac68d8401dc9c1f3f80ef66286f80e2d0ad1f23c3a0a13e435311341899e6dc381dfedab
+EBUILD libreoffice-7.3.3.2-r3.ebuild 20104 BLAKE2B 83e9ed8a88338f3aafcc4853e9de0c2c8c5d2c27174a9226bf6f7cb52294f77956eaa8f3f3e3f7c7dc4207301901c82c60c1d33578fb5671e06b968d402282a0 SHA512 57a2210dd8a17f8959b5895344f142e7f648e8c37997992056f1e021eb440f7ac9348afc062c41ff2cb645b2056e108154c17a489a8e2e553086fbefbe79d9fb
 EBUILD libreoffice-7.3.4.2.ebuild 20275 BLAKE2B 221abd841dbf77a6ff8d774af419f0f77868e587bea3b275e64f54a19b05658967e6442d879242470b8f7a380c103eff0d94c22fd39cddd8195351815ec03f2f SHA512 311271b551b5246fdf68e22b14b12b21341dcf512fd550b2b94f9a6a60ae83aab40921a80d6691b0b534d26c8e7bf548b86dbda311d2f3215109152908dd6ae2
 EBUILD libreoffice-7.3.9999.ebuild 19990 BLAKE2B d4e1875bbb11e06c09a88f9c677508796b0f349cfd9833f786761eb1d144ae79159705676fb16a1d334bdecc14b572bffb5eeb699e8215988e1c74f648c3153c SHA512 1f1394ff674132c205022fd16128d830d5bbc73be8b449ac90ef682f4decb6613d184a0506ac48ff57486e8a9b957377713a8b1dc4e6bbb77b509c06affc6168
 EBUILD libreoffice-9999.ebuild 19993 BLAKE2B e7b37bb5c572b416a0d053b6664c893592b7bf9b5015f7d2045a82e827ce81af683c1abfff4ddb8864153d57f7aa8e086f96c49cd0bfdb5c7451bba97b3c54d3 SHA512 ad85312bd7f2aa9fb51b36b7366932e907bf01b201fde0250e15728854e08bbdfa8c311f8d6cd6fd07b2af60125dd2ad1a8ac75b114b117dc4c58adf4a3622e7
diff --git a/app-office/libreoffice/files/libreoffice-7.2.2.2-makefile-gengal.patch b/app-office/libreoffice/files/libreoffice-7.2.2.2-makefile-gengal.patch
deleted file mode 100644
index 5fd0179ccb05..000000000000
--- a/app-office/libreoffice/files/libreoffice-7.2.2.2-makefile-gengal.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-https://github.com/LibreOffice/core/commit/0e7d4d99beda181f4e22725e4b8295d25489696f
-https://bugs.gentoo.org/821265
-
-From 0e7d4d99beda181f4e22725e4b8295d25489696f Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman@redhat.com>
-Date: Sun, 22 Aug 2021 11:26:38 +0200
-Subject: [PATCH] gengal needs Library_localedata_en now
-
-Whatever caused that requirement, but a from-scratch build of e.g.
-Gallery_backgrounds failed for me (with a follow-on SIGABRT after
-"framework/source/services/desktop.cxx:176: Desktop::~Desktop(): Who forgot to
-dispose this service?") because it failed to load
-instdir/program/../program/liblocaledata_en.so at
-
-> #1  0x00007fffda0b9671 in i18npool::LocaleDataImpl::getFunctionSymbol(com::sun::star::lang::Locale const&, char const*) (this=0x159b630, rLocale=..., pFunction=0x7fffda136ed8 "getAllFormats0") at i18npool/source/localedata/localedata.cxx:1460
-> #2  0x00007fffda0b6a93 in i18npool::LocaleDataImpl::FormatSection::getFunc(i18npool::LocaleDataImpl&, com::sun::star::lang::Locale const&, char const*) (this=0x7fffffffc840, rLocaleData=..., rL=..., pName=0x7fffda136ed8 "getAllFormats0") at i18npool/source/localedata/localedata.cxx:857
-> #3  0x00007fffda0b6b5c in i18npool::LocaleDataImpl::getAllFormats(com::sun::star::lang::Locale const&) (this=0x159b630, rLocale=...) at i18npool/source/localedata/localedata.cxx:865
-> #4  0x00007fffda0d4815 in NumberFormatCodeMapper::getFormats(com::sun::star::lang::Locale const&) (this=0x1594fa0, rLocale=...) at i18npool/source/numberformatcode/numberformatcode.cxx:150
-> #5  0x00007fffda0d4155 in NumberFormatCodeMapper::getAllFormatCode(short, com::sun::star::lang::Locale const&) (this=0x1594fa0, formatUsage=8, rLocale=...) at i18npool/source/numberformatcode/numberformatcode.cxx:92
-> #6  0x00007ffff572a824 in LocaleDataWrapper::loadCurrencyFormats() (this=0x159b3f0) at unotools/source/i18n/localedatawrapper.cxx:544
-> #7  0x00007ffff572777e in LocaleDataWrapper::loadData() (this=0x159b3f0) at unotools/source/i18n/localedatawrapper.cxx:131
-> #8  0x00007ffff57271b4 in LocaleDataWrapper::LocaleDataWrapper(LanguageTag const&, std::__debug::vector<rtl::OUString, std::allocator<rtl::OUString> > const&) (this=0x159b3f0, rLanguageTag=..., rOverrideDateAcceptancePatterns=std::__debug::vector of length 0, capacity 0) at unotools/source/i18n/localedatawrapper.cxx:80
-> #9  0x00007ffff5766fd6 in SvtSysLocale_Impl::SvtSysLocale_Impl() (this=0x158a4e0) at unotools/source/misc/syslocale.cxx:67
-> #10 0x00007ffff5768ad7 in std::construct_at<SvtSysLocale_Impl>(SvtSysLocale_Impl*) (__location=0x158a4e0) at ~/gcc/trunk/inst/include/c++/12.0.0/bits/stl_construct.h:97
-> #11 0x00007ffff5768b1c in std::allocator_traits<std::allocator<SvtSysLocale_Impl> >::construct<SvtSysLocale_Impl>(std::allocator<SvtSysLocale_Impl>&, SvtSysLocale_Impl*) (__a=..., __p=0x158a4e0) at ~/gcc/trunk/inst/include/c++/12.0.0/bits/alloc_traits.h:514
-> #12 0x00007ffff57688c2 in std::_Sp_counted_ptr_inplace<SvtSysLocale_Impl, std::allocator<SvtSysLocale_Impl>, (__gnu_cxx::_Lock_policy)2>::_Sp_counted_ptr_inplace<>(std::allocator<SvtSysLocale_Impl>) (this=0x158a4d0, __a=...) at ~/gcc/trunk/inst/include/c++/12.0.0/bits/shared_ptr_base.h:519
-> #13 0x00007ffff576860a in std::__shared_count<(__gnu_cxx::_Lock_policy)2>::__shared_count<SvtSysLocale_Impl, std::allocator<SvtSysLocale_Impl>>(SvtSysLocale_Impl*&, std::_Sp_alloc_shared_tag<std::allocator<SvtSysLocale_Impl> >) (this=0x7fffffffd0a8, __p=@0x7fffffffd0a0: 0x0, __a=...) at ~/gcc/trunk/inst/include/c++/12.0.0/bits/shared_ptr_base.h:650
-> #14 0x00007ffff57684c6 in std::__shared_ptr<SvtSysLocale_Impl, (__gnu_cxx::_Lock_policy)2>::__shared_ptr<std::allocator<SvtSysLocale_Impl>>(std::_Sp_alloc_shared_tag<std::allocator<SvtSysLocale_Impl> >) (this=0x7fffffffd0a0, __tag=...) at ~/gcc/trunk/inst/include/c++/12.0.0/bits/shared_ptr_base.h:1342
-> #15 0x00007ffff576838d in std::shared_ptr<SvtSysLocale_Impl>::shared_ptr<std::allocator<SvtSysLocale_Impl>>(std::_Sp_alloc_shared_tag<std::allocator<SvtSysLocale_Impl> >) (this=0x7fffffffd0a0, __tag=...) at ~/gcc/trunk/inst/include/c++/12.0.0/bits/shared_ptr.h:409
-> #16 0x00007ffff5768164 in std::allocate_shared<SvtSysLocale_Impl, std::allocator<SvtSysLocale_Impl>>(std::allocator<SvtSysLocale_Impl> const&) (__a=...) at ~/gcc/trunk/inst/include/c++/12.0.0/bits/shared_ptr.h:863
-> #17 0x00007ffff5767dfc in std::make_shared<SvtSysLocale_Impl>() () at ~/gcc/trunk/inst/include/c++/12.0.0/bits/shared_ptr.h:879
-> #18 0x00007ffff5767583 in SvtSysLocale::SvtSysLocale() (this=0x7fffffffd120) at unotools/source/misc/syslocale.cxx:122
-> #19 0x00007ffff015148f in FwkResId(TranslateId) (aId=...) at framework/source/fwe/classes/fwkresid.cxx:22
-> #20 0x00007ffff025f333 in framework::Desktop::constructorInit() (this=0x1588850) at framework/source/services/desktop.cxx:106
-> #21 0x00007ffff0265c1c in (anonymous namespace)::createDesktop(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&) (context=...) at framework/source/services/desktop.cxx:1764
-> #22 0x00007ffff0265ce5 in framework::getDesktop(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&) (context=...) at framework/source/services/desktop.cxx:1773
-> #23 0x00007ffff0265d9e in com_sun_star_comp_framework_Desktop_get_implementation(com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&) (context=0x522200) at framework/source/services/desktop.cxx:1782
-> #24 0x00007ffff5a5d864 in std::__invoke_impl<com::sun::star::uno::XInterface*, com::sun::star::uno::XInterface* (*&)(com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&), com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&>(std::__invoke_other, com::sun::star::uno::XInterface* (*&)(com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&), com::sun::star::uno::XComponentContext*&&, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&) (__f=@0x54bb58: 0x7ffff0265d5f <com_sun_star_comp_framework_Desktop_get_implementation(com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&)>) at ~/gcc/trunk/inst/include/c++/12.0.0/bits/invoke.h:61
-> #25 0x00007ffff5a551f4 in std::__invoke_r<com::sun::star::uno::XInterface*, com::sun::star::uno::XInterface* (*&)(com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&), com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&>(com::sun::star::uno::XInterface* (*&)(com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&), com::sun::star::uno::XComponentContext*&&, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&) (__fn=@0x54bb58: 0x7ffff0265d5f <com_sun_star_comp_framework_Desktop_get_implementation(com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&)>) at ~/gcc/trunk/inst/include/c++/12.0.0/bits/invoke.h:114
-> #26 0x00007ffff5a4d254 in std::_Function_handler<com::sun::star::uno::XInterface* (com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&), com::sun::star::uno::XInterface* (*)(com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&)>::_M_invoke(std::_Any_data const&, com::sun::star::uno::XComponentContext*&&, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&) (__functor=..., __args#0=@0x7fffffffd4f0: 0x522200, __args#1=...) at ~/gcc/trunk/inst/include/c++/12.0.0/bits/std_function.h:291
-> #27 0x00007ffff5a3f913 in std::function<com::sun::star::uno::XInterface* (com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&)>::operator()(com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&) const (this=0x54bb58, __args#0=0x522200, __args#1=...) at ~/gcc/trunk/inst/include/c++/12.0.0/bits/std_function.h:568
-> #28 0x00007ffff5a2a396 in cppuhelper::ServiceManager::Data::Implementation::doCreateInstance(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&) (this=0x54baa0, context=...) at cppuhelper/source/servicemanager.cxx:704
-> #29 0x00007ffff5a2a12a in cppuhelper::ServiceManager::Data::Implementation::createInstance(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, bool) (this=0x54baa0, context=..., singletonRequest=false) at cppuhelper/source/servicemanager.cxx:672
-> #30 0x00007ffff5a2d02d in cppuhelper::ServiceManager::createInstanceWithContext(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&) (this=0x523450, aServiceSpecifier=..., Context=...) at cppuhelper/source/servicemanager.cxx:1003
-> #31 0x00007ffff6cd9922 in com::sun::star::frame::Desktop::create(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&) (the_context=...) at workdir/UnoApiHeadersTarget/offapi/normal/com/sun/star/frame/Desktop.hpp:38
-> #32 0x00007ffff6cd8c07 in SfxApplication::Initialize_Impl() (this=0x1588150) at sfx2/source/appl/appinit.cxx:182
-> #33 0x00007ffff6cb776a in SfxApplication::GetOrCreate() () at sfx2/source/appl/app.cxx:122
-> #34 0x0000000000405ecf in (anonymous namespace)::GalApp::Main() (this=0x4204e0 <vclmain::createApplication()::aGalApp>) at svx/source/gengal/gengal.cxx:254
-> #35 0x00007ffff2dd6777 in ImplSVMain() () at vcl/source/app/svmain.cxx:199
-> #36 0x00007ffff2dd6898 in SVMain() () at vcl/source/app/svmain.cxx:231
-> #37 0x0000000000410f1f in sal_main() () at vcl/source/salmain/salmain.cxx:34
-> #38 0x0000000000410efa in main(int, char**) (argc=10, argv=0x7fffffffded8) at vcl/source/salmain/salmain.cxx:29
-
-This fix should remove the need for the cross-build--only fix
-0e142fa01972ad28182ca54b855d0ecae0d5c83b "cross-toolset: gengal now needs
-localedata_en", which it reverts.
-
-Change-Id: If71b7249c19619a83911c7624e3d99077decba31
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120837
-Tested-by: Jenkins
-Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
----
- RepositoryExternal.mk                      | 1 +
- solenv/gbuild/extensions/pre_BuildTools.mk | 1 -
- 2 files changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
-index 6e732c94793b2..15cfbfde3d4ac 100644
---- a/RepositoryExternal.mk
-+++ b/RepositoryExternal.mk
-@@ -3875,6 +3875,7 @@ endef
- define gb_Executable__register_gengal
- $(call gb_Executable_add_runtime_dependencies,gengal,\
- 	$(call gb_Library_get_target_for_build,$(CPPU_ENV_FOR_BUILD)_uno) \
-+	$(call gb_Library_get_target_for_build,localedata_en) \
- 	$(if $(filter MACOSX,$(OS_FOR_BUILD)),$(call gb_Library_get_target_for_build,vclplug_osx)) \
- 	$(if $(filter WNT,$(OS_FOR_BUILD)),$(call gb_Library_get_target_for_build,vclplug_win)) \
- 	$(if $(filter host,$(gb_Side)),$(call gb_Package_get_target,postprocess_images)) \
-diff --git a/solenv/gbuild/extensions/pre_BuildTools.mk b/solenv/gbuild/extensions/pre_BuildTools.mk
-index e08906068d246..84e2ea533673f 100644
---- a/solenv/gbuild/extensions/pre_BuildTools.mk
-+++ b/solenv/gbuild/extensions/pre_BuildTools.mk
-@@ -47,7 +47,6 @@ gb_BUILD_TOOLS = \
-     $(foreach executable,$(gb_BUILD_TOOLS_executables),$(call gb_Executable_get_runtime_dependencies,$(executable))) \
-     $(foreach executable,$(gb_BUILD_TOOLS_executables_extern),$(call gb_ExternalExecutable_get_dependencies,$(executable))) \
- 	$(INSTROOT)/$(LIBO_URE_ETC_FOLDER)/$(call gb_Helper_get_rcfile,uno) \
--    $(if $(WITH_GALLERY_BUILD),$(call gb_Library_get_target,localedata_en)) \
- 
- endif
- 
diff --git a/app-office/libreoffice/libreoffice-7.2.6.2-r1.ebuild b/app-office/libreoffice/libreoffice-7.2.6.2-r1.ebuild
deleted file mode 100644
index 62e42b1e8c03..000000000000
--- a/app-office/libreoffice/libreoffice-7.2.6.2-r1.ebuild
+++ /dev/null
@@ -1,665 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+),xml"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
-	https://dev-builds.libreoffice.org/pre-releases/src
-	https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
-	https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
-	for i in ${DEV_URI}; do
-		SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
-		SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
-	done
-	unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
-	# broken against latest upstream release, too many patches on top:
-	# https://github.com/tdf/libcmis/pull/43
-	"${ADDONS_URI}/libcmis-0.5.2.tar.xz"
-	# not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
-	"${ADDONS_URI}/dtoa-20180411.tgz"
-	# not packaged in Gentoo, https://skia.org/
-	"${ADDONS_URI}/skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz"
-	"base? (
-		${ADDONS_URI}/commons-logging-1.2-src.tar.gz
-		${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-		${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
-		${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
-		${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
-		${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
-		${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
-		${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
-		${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
-		${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
-		${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
-		${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
-	)"
-	"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
-	# no release for 8 years, should we package it?
-	"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
-	# Does not build with 1.6 rhino at all
-	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
-	# requirement of rhino
-	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
-	# not packageable
-	"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="accessibility base bluetooth +branding clang coinmp +cups custom-cflags +dbus debug eds firebird
-googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test vulkan
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	base? ( firebird java )
-	bluetooth? ( dbus )
-	gtk? ( dbus )
-	libreoffice_extensions_nlpsolver? ( java )
-	libreoffice_extensions_scripting-beanshell? ( java )
-	libreoffice_extensions_scripting-javascript? ( java )
-	libreoffice_extensions_wiki-publisher? ( java )
-"
-
-RESTRICT="!test? ( test )"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	app-crypt/gpgme:=[cxx]
-	app-text/hunspell:=
-	>=app-text/libabw-0.1.0
-	>=app-text/libebook-0.1
-	app-text/libepubgen
-	>=app-text/libetonyek-0.1
-	app-text/libexttextcat
-	app-text/liblangtag
-	>=app-text/libmspub-0.1.0
-	>=app-text/libmwaw-0.3.1
-	>=app-text/libnumbertext-1.0.6
-	>=app-text/libodfgen-0.1.0
-	app-text/libqxp
-	app-text/libstaroffice
-	app-text/libwpd:0.10[tools]
-	app-text/libwpg:0.3
-	>=app-text/libwps-0.4
-	app-text/mythes
-	>=dev-cpp/clucene-2.3.3.4-r2
-	>=dev-cpp/libcmis-0.5.2
-	dev-db/unixODBC
-	dev-lang/perl
-	>=dev-libs/boost-1.72.0:=[nls]
-	dev-libs/expat
-	dev-libs/hyphen
-	dev-libs/icu:=
-	dev-libs/libassuan
-	dev-libs/libgpg-error
-	dev-libs/liborcus:0/0.16
-	dev-libs/librevenge
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/nspr
-	dev-libs/nss
-	>=dev-libs/redland-1.0.16
-	>=dev-libs/xmlsec-1.2.28[nss]
-	>=games-engines/box2d-2.4.1:0
-	media-gfx/fontforge
-	media-gfx/graphite2
-	media-libs/fontconfig
-	>=media-libs/freetype-2.11.0-r1:2
-	>=media-libs/harfbuzz-0.9.42:=[graphite,icu]
-	media-libs/lcms:2
-	>=media-libs/libcdr-0.1.0
-	>=media-libs/libepoxy-1.3.1[X]
-	>=media-libs/libfreehand-0.1.0
-	media-libs/libpagemaker
-	>=media-libs/libpng-1.4:0=
-	>=media-libs/libvisio-0.1.0
-	media-libs/libzmf
-	media-libs/zxing-cpp
-	>=net-libs/neon-0.31.1:=
-	net-misc/curl
-	sci-mathematics/lpsolve
-	sys-libs/zlib
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/cairo[X]
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	accessibility? (
-		$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
-	)
-	bluetooth? (
-		dev-libs/glib:2
-		net-wireless/bluez
-	)
-	coinmp? ( sci-libs/coinor-mp )
-	cups? ( net-print/cups )
-	dbus? ( sys-apps/dbus[X] )
-	eds? (
-		dev-libs/glib:2
-		gnome-base/dconf
-		gnome-extra/evolution-data-server
-	)
-	firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	gtk? (
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		gnome-base/dconf
-		media-libs/mesa[egl(+)]
-		x11-libs/gtk+:3[X]
-		x11-libs/pango
-	)
-	kde? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-		kde-frameworks/kconfig:5
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/ki18n:5
-		kde-frameworks/kio:5
-		kde-frameworks/kwindowsystem:5
-	)
-	ldap? ( net-nds/openldap:= )
-	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
-	libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
-	mariadb? ( dev-db/mariadb-connector-c:= )
-	!mariadb? ( dev-db/mysql-connector-c:= )
-	pdfimport? ( app-text/poppler:=[cxx] )
-	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-#        after everything upstream is under gbuild
-#        as dmake execute tests right away
-#        tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/libatomic_ops-7.2d
-	dev-perl/Archive-Zip
-	>=dev-util/cppunit-1.14.0
-	>=dev-util/gperf-3.1
-	dev-util/mdds:1/1.5
-	media-libs/glm
-	sys-devel/ucpp
-	x11-base/xorg-proto
-	x11-libs/libXt
-	x11-libs/libXtst
-	java? (
-		dev-java/ant-core
-		|| (
-			dev-java/openjdk:11
-			dev-java/openjdk-bin:11
-		)
-	)
-	test? (
-		app-crypt/gnupg
-		dev-util/cppunit
-		media-fonts/dejavu
-		media-fonts/liberation-fonts
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!app-office/libreoffice-bin
-	!app-office/libreoffice-bin-debug
-	media-fonts/liberation-fonts
-	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
-	java? ( || (
-		dev-java/openjdk:11
-		dev-java/openjdk-jre-bin:11
-		>=virtual/jre-1.8
-	) )
-	kde? ( kde-frameworks/breeze-icons:* )
-"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	clang? (
-		|| (
-			(	sys-devel/clang:13
-				sys-devel/llvm:13
-				=sys-devel/lld-13*	)
-			(	sys-devel/clang:12
-				sys-devel/llvm:12
-				=sys-devel/lld-12*	)
-			(	sys-devel/clang:11
-				sys-devel/llvm:11
-				=sys-devel/lld-11*	)
-		)
-	)
-	odk? ( >=app-doc/doxygen-1.8.4 )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
-	PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
-	# Translations are not reliable on live ebuilds
-	# rather force people to use english only.
-	PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
-	# "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
-	# not upstreamable stuff
-	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
-	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
-	"${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
-
-	# TODO upstream
-	"${FILESDIR}/${P}-poppler-22.03.0.patch" # by Archlinux
-
-	# 7.3 branch
-	"${FILESDIR}/${PN}-7.2.2.2-makefile-gengal.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
-	CHECKREQS_MEMORY="512M"
-	if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		CHECKREQS_DISK_BUILD="22G"
-	else
-		CHECKREQS_DISK_BUILD="6G"
-	fi
-	check-reqs_$1
-}
-
-pkg_pretend() {
-	if use x86; then
-		elog "Unfortunately for packaging reasons on x86, various Java-based wizards,"
-		elog "most notably Report Builder in LibreOffice Base, will not be available."
-		elog "See also: https://bugs.gentoo.org/785640"
-	else
-		use base ||
-			ewarn "If you plan to use Base application you must enable USE base."
-		use java ||
-			ewarn "Without USE java, several wizards are not going to be available."
-	fi
-
-	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	python-single-r1_pkg_setup
-	xdg_environment_reset
-
-	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
-	default
-
-	if [[ ${MY_PV} = *9999* ]]; then
-		local base_uri branch mypv
-		base_uri="https://anongit.freedesktop.org/git"
-		branch="master"
-		mypv=${MY_PV/.9999}
-		[[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
-		git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
-		git-r3_checkout "${base_uri}/${PN}/core"
-		LOCOREGIT_VERSION=${EGIT_VERSION}
-
-		git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
-		git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
-	fi
-}
-
-src_prepare() {
-	default
-
-	# sandbox violations on many systems, we don't need it. Bug #646406
-	sed -i \
-		-e "/KF5_CONFIG/s/kf5-config/no/" \
-		configure.ac || die "Failed to disable kf5-config"
-
-	AT_M4DIR="m4" eautoreconf
-	# hack in the autogen.sh
-	touch autogen.lastrun
-
-	# sed in the tests
-	sed -i \
-		-e "s#all : build unitcheck#all : build#g" \
-		solenv/gbuild/Module.mk || die
-	sed -i \
-		-e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
-		-e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
-		Makefile.in || die
-
-	sed -i \
-		-e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
-		-e "s,\$INSTALLDIRNAME.sh,${PN}," \
-		bin/distro-install-desktop-integration || die
-
-	if use branding; then
-		# hack...
-		mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
-	fi
-
-	# Don't list pdfimport support in desktop when built with none, bug # 605464
-	if ! use pdfimport; then
-		sed -i \
-			-e ":MimeType: s:application/pdf;::" \
-			-e ":Keywords: s:pdf;::" \
-			sysui/desktop/menus/draw.desktop || die
-	fi
-}
-
-src_configure() {
-	# Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
-	# Note: these are for Gentoo use ONLY. For your own distribution, please get
-	# your own set of keys. Feel free to contact chromium@gentoo.org for more info.
-	local google_default_client_id="329227923882.apps.googleusercontent.com"
-	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
-	# Show flags set at the beginning
-	einfo "Preset CFLAGS:    ${CFLAGS}"
-	einfo "Preset LDFLAGS:   ${LDFLAGS}"
-
-	if use clang ; then
-		# Force clang
-		einfo "Enforcing the use of clang due to USE=clang ..."
-		AR=llvm-ar
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		NM=llvm-nm
-		RANLIB=llvm-ranlib
-		LDFLAGS+=" -fuse-ld=lld"
-	else
-		# Force gcc
-		einfo "Enforcing the use of gcc due to USE=-clang ..."
-		AR=gcc-ar
-		CC=${CHOST}-gcc
-		CXX=${CHOST}-g++
-		NM=gcc-nm
-		RANLIB=gcc-ranlib
-	fi
-
-	if use custom-cflags ; then
-		elog "USE=custom-cflags has been selected. You are on your own to make sure that"
-		elog "the build succeeds. Good luck!"
-	else
-		strip-flags
-	fi
-
-	export LO_CLANG_CC=${CC}
-	export LO_CLANG_CXX=${CXX}
-
-	# Show flags set at the end
-	einfo "  Used CFLAGS:    ${CFLAGS}"
-	einfo "  Used LDFLAGS:   ${LDFLAGS}"
-
-	# Ensure we use correct toolchain
-	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
-	if use vulkan && ! use clang ; then
-		ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
-	fi
-
-	# optimization flags
-	export GMAKE_OPTIONS="${MAKEOPTS}"
-	# System python enablement:
-	export PYTHON_CFLAGS=$(python_get_CFLAGS)
-	export PYTHON_LIBS=$(python_get_LIBS)
-
-	use kde && export QT5DIR="$(qt5_get_bindir)/.."
-
-	local gentoo_buildid="Gentoo official package"
-	if [[ -n ${LOCOREGIT_VERSION} ]]; then
-		gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
-	fi
-
-	# system headers/libs/...: enforce using system packages
-	# --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
-	# --enable-cairo: ensure that cairo is always required
-	# --enable-*-link: link to the library rather than just dlopen on runtime
-	# --enable-release-build: build the libreoffice as release
-	# --disable-fetch-external: prevent dowloading during compile phase
-	# --enable-extension-integration: enable any extension integration support
-	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
-	# --disable-report-builder: too much java packages pulled in without pkgs
-	# --without-system-sane: just sane.h header that is used for scan in writer,
-	#   not linked or anything else, worthless to depend on
-	# --disable-pdfium: not yet packaged
-	local myeconfargs=(
-		--with-system-dicts
-		--with-system-epoxy
-		--with-system-headers
-		--with-system-jars
-		--with-system-libs
-		--enable-build-opensymbol
-		--enable-cairo-canvas
-		--enable-largefile
-		--enable-mergelibs
-		--enable-python=system
-		--enable-randr
-		--enable-release-build
-		--disable-breakpad
-		--disable-bundle-mariadb
-		--disable-ccache
-		--disable-epm
-		--disable-fetch-external
-		--disable-gtk3-kde5
-		--disable-online-update
-		--disable-openssl
-		--disable-pdfium
-		--with-extra-buildid="${gentoo_buildid}"
-		--enable-extension-integration
-		--with-external-dict-dir="${EPREFIX}/usr/share/myspell"
-		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
-		--with-external-thes-dir="${EPREFIX}/usr/share/myspell"
-		--with-external-tar="${DISTDIR}"
-		--with-lang=""
-		--with-parallelism=$(makeopts_jobs)
-		--with-system-ucpp
-		--with-tls=nss
-		--with-vendor="Gentoo Foundation"
-		--with-webdav="neon"
-		--with-x
-		--without-fonts
-		--without-myspell-dicts
-		--with-help="html"
-		--without-helppack-integration
-		--with-system-gpgmepp
-		--without-system-jfreereport
-		--without-system-libcmis
-		--without-system-sane
-		$(use_enable base report-builder)
-		$(use_enable bluetooth sdremote-bluetooth)
-		$(use_enable coinmp)
-		$(use_enable cups)
-		$(use_enable dbus)
-		$(use_enable debug)
-		$(use_enable eds evolution2)
-		$(use_enable firebird firebird-sdbc)
-		$(use_enable gstreamer gstreamer-1-0)
-		$(use_enable gtk gtk3)
-		$(use_enable kde kf5)
-		$(use_enable kde qt5)
-		$(use_enable ldap)
-		$(use_enable odk)
-		$(use_enable pdfimport)
-		$(use_enable postgres postgresql-sdbc)
-		$(use_enable vulkan skia)
-		$(use_with accessibility lxml)
-		$(use_with coinmp system-coinmp)
-		$(use_with googledrive gdrive-client-id ${google_default_client_id})
-		$(use_with googledrive gdrive-client-secret ${google_default_client_secret})
-		$(use_with java)
-		$(use_with odk doxygen)
-	)
-
-	if use eds || use gtk; then
-		myeconfargs+=( --enable-dconf --enable-gio )
-	else
-		myeconfargs+=( --disable-dconf --disable-gio )
-	fi
-
-	# libreoffice extensions handling
-	for lo_xt in ${LO_EXTS}; do
-		if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
-			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
-		else
-			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
-		fi
-	done
-
-	if use java; then
-		# hsqldb: system one is too new
-		myeconfargs+=(
-			--without-junit
-			--without-system-hsqldb
-			--with-ant-home="${ANT_HOME}"
-		)
-		if has_version "dev-java/openjdk:11"; then
-			myeconfargs+=( -with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
-		elif has_version "dev-java/openjdk-bin:11"; then
-			myeconfargs+=( --with-jdk-home="/opt/openjdk-bin-11" )
-		fi
-
-		use libreoffice_extensions_scripting-beanshell && \
-			myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
-		use libreoffice_extensions_scripting-javascript && \
-			myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
-	fi
-
-	is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
-	MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# more and more LO stuff tries to use OpenGL, including tests during build
-	# bug 501508, bug 540624, bug 545974 and probably more
-	addpredict /dev/dri
-	addpredict /dev/ati
-	addpredict /dev/nvidiactl
-
-	local target
-	use test && target="build" || target="build-nocheck"
-
-	# this is not a proper make script
-	make ${target} || die
-}
-
-src_test() {
-	make unitcheck || die
-	make slowcheck || die
-}
-
-src_install() {
-	# This is not Makefile so no buildserver
-	emake DESTDIR="${D}" distro-pack-install -o build -o check
-
-	# bug 593514
-	if use gtk; then
-		dosym libreoffice/program/liblibreofficekitgtk.so \
-			/usr/$(get_libdir)/liblibreofficekitgtk.so
-	fi
-
-	# bash completion aliases
-	bashcomp_alias \
-		libreoffice \
-		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
-	if use branding; then
-		insinto /usr/$(get_libdir)/${PN}/program
-		newins "${WORKDIR}/branding-sofficerc" sofficerc
-		dodir /etc/env.d
-		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
-	fi
-
-	# bug 703474
-	insinto /usr/include
-	doins -r include/LibreOfficeKit
-
-	local lodir=/usr/$(get_libdir)/libreoffice
-	# patching this would break tests
-	cat <<-EOF > "${T}"/uno.py
-import sys, os
-sys.path.append('${EPREFIX}${lodir}/program')
-os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
-EOF
-	sed -e "/^import sys/d" -e "/^import os/d" \
-		-i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
-	cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
-	cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
-
-	# more system pyuno mess
-	sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
-		-i "${D}"${lodir}/program/officehelper.py || die
-
-	python_optimize "${D}"${lodir}/program
-	# link python bridge in site-packages, bug 667802
-	local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
-	for py in uno.py unohelper.py officehelper.py; do
-		dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
-		while IFS="" read -d $'\0' -r pyc; do
-			pyc=${pyc//*\/}
-			dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
-		done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
-	done
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-office/libreoffice/libreoffice-7.3.3.2-r3.ebuild b/app-office/libreoffice/libreoffice-7.3.3.2-r3.ebuild
index 2322c56f7f43..9c8dd7f4efdc 100644
--- a/app-office/libreoffice/libreoffice-7.3.3.2-r3.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.3.2-r3.ebuild
@@ -105,7 +105,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
 
 [[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux"
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	app-arch/unzip
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 5ccb71e3f2bf..995f95ed928f 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index 0fdb16e6259e..bbada9a6ec43 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -2,9 +2,11 @@ DIST portage-utils-0.90.1.tar.xz 1779252 BLAKE2B 27c94694cab84970c0c92e835b9039d
 DIST portage-utils-0.90.tar.xz 1776636 BLAKE2B bbacc05aa97c77705ae4fbdb5efde5f1d49a99ac8ed259e026c9a997f43a86551b3a10a397e0c5f1da161d2c0d88afe88e22870705ca39d911c4a98ad13f4928 SHA512 2077061dd7dfd444d4ad38faf5a87aa44392d7747f71d7283b5e2775ce3d714773cd642ea085aea3dd34a715f2c446d42fd64ba42fa99e716e8d843aae3d9682
 DIST portage-utils-0.92.tar.xz 1819676 BLAKE2B 01798e3984745140bca1bcc1eda5c2aea7c517bee2656acfe1bd810fc8088ddcb474f2c64fee6832c5e1699e2ec8ad5a9c6d5afba8a2e2b6f1861d49fbf7fcb7 SHA512 7d36263c9c242c8e82786fa12e171a3f396f65520acb8caa91516862615bd71241699ab6c2232122f7009875aa0a10b06b614a842d45afc86e599b39711e12b3
 DIST portage-utils-0.93.3.tar.xz 1796828 BLAKE2B cfad7ab27ff2d92f631f4e31012e8903c5fa6113485f727338812059379cdd4a9552d80dc3aef6bb91264c361c0554fe9054a12347e274c4c5c3db66fd36008b SHA512 c1245aa78d236263cd266fc8565312c2ac30cb992037a7b0f26da04ecf2dfeebc85bff653784e186cf2c7d7468e4772fb0bd93bcdb3a37d46e493d000933e5a1
+DIST portage-utils-0.94.1.tar.xz 1871688 BLAKE2B bec5ddd514b397c157c3b1bff70d61730f15804a6751f56eb69c4030a35fc6a6b11fa1e2bde94332772660f02bf9428623210733ae9e2f1290f29aa3b31a1813 SHA512 29fdb4093997eb95703d407da6b00305c949f0a00ae3aa5cfb2c47b66bddc59e034fae114663b40b611f906332066b648018aa4e5bc1b935e61a64f4b4bf1088
 EBUILD portage-utils-0.90.1.ebuild 1344 BLAKE2B aa2a6db5a845dae33a6a5e711b3cc2f49d39458bb89bb3498b1b29a87909456f6e361f2108aff2b0dc36bd73189b5d6b0826e352ee47d80c0388bd47b5e08a92 SHA512 54523cfaa4e7362efe036e37f75cb8a40c356569952293ac2e9ee1a8ac289ea1e5f32b0c41c65ad505b5d3e0b686dd1bd4b6ac463ed78b33f89e2850119e170f
 EBUILD portage-utils-0.90.ebuild 1524 BLAKE2B 75878900c8ba8a8a6c8382a0be0a48bf5bb75ef28b12583e437a577cbf3138f6e562675344bb79b3516c7510baed5bf5d69339d0e6924570e21fc45c2f248c0e SHA512 9bd404d97610fedb1e036e5548be12932570fe7916ab486e02835baa1bfa8d8fa59a7c31689b17728d72ee9d8d1a4733823dc611a6c9b2eecc1d58f78b1165ac
 EBUILD portage-utils-0.92.ebuild 1520 BLAKE2B 7dd754e763e53568562d2022bcb09df5c0be58b38675593569bd6c446fb3fd96b2c03919216b42a8e14391578f1d99f368bde20fd093cca0cc4a5d92c358814e SHA512 aa9224219077cbe9e2dbe64594c8f794beead0621e3bc2d1c17d75b2cf1c66fcd625f8b47c74bb73644d7d78c2cf8087f88b2f1964ba4c0d053e2876e81bb66c
 EBUILD portage-utils-0.93.3.ebuild 1525 BLAKE2B 31633b095b9fb0dbc0e9a4c5810be266484b0d353578969d587d725722c7f6870031453466b8e8ea70b094ff3129e94d71a81a7000b432f739f4b64a811df561 SHA512 c2f182e8b08adad0f5b22ff08bd1a41aec90a0fa03e40070ab3535947a5d3eee57d5fe4d6bec28b6d228ef9e8baddbe69203a4cc24833a7e02af5e2cfb615186
+EBUILD portage-utils-0.94.1.ebuild 1526 BLAKE2B 9f78548abcc178ec9771d894a942130b183f83014bad9e347528914239b3a81cc92f9c489a3ac6789d7d9750291ec4c8018b9bb329c5db37dc4392483db92663 SHA512 501ded3ec21c5efd4b38037050e87f66678dd2be9dbb8c7b1346ba5cbe3a339751b48983f611da2c7134e69f6ca1af169724f4c1ee4f4f0ea8d1dcd6fbec0753
 EBUILD portage-utils-9999.ebuild 1526 BLAKE2B 9f78548abcc178ec9771d894a942130b183f83014bad9e347528914239b3a81cc92f9c489a3ac6789d7d9750291ec4c8018b9bb329c5db37dc4392483db92663 SHA512 501ded3ec21c5efd4b38037050e87f66678dd2be9dbb8c7b1346ba5cbe3a339751b48983f611da2c7134e69f6ca1af169724f4c1ee4f4f0ea8d1dcd6fbec0753
 MISC metadata.xml 574 BLAKE2B 1448e8343748e8bbc61128f3a621010ae1f7095872c271962ac24e62abcea8cca7c52034008c0d5691a56ca7f2e242ab4cec7d38fceecc2c39f858d1ceb30ab1 SHA512 dcf9949c990845794a534b34e44e820b16b3700bc993e13707bfac6d26269d2aba00fd3f873b9157ead222d2fa5cdd63d263c098bfc79c1b1f66097fa24f552e
diff --git a/app-portage/portage-utils/portage-utils-0.94.1.ebuild b/app-portage/portage-utils/portage-utils-0.94.1.ebuild
new file mode 100644
index 000000000000..f0936e338fac
--- /dev/null
+++ b/app-portage/portage-utils/portage-utils-0.94.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Small and fast Portage helper tools written in C"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="nls static openmp +qmanifest +qtegrity"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"
+else
+	SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+RDEPEND="
+	qmanifest? (
+		openmp? (
+			|| (
+				>=sys-devel/gcc-4.2:*[openmp]
+				sys-devel/clang-runtime:*[openmp]
+			)
+		)
+		static? (
+			app-crypt/libb2:=[static-libs]
+			dev-libs/openssl:0=[static-libs]
+			sys-libs/zlib:=[static-libs]
+			app-crypt/gpgme:=[static-libs]
+		)
+		!static? (
+			app-crypt/libb2:=
+			dev-libs/openssl:0=
+			sys-libs/zlib:=
+			app-crypt/gpgme:=
+		)
+	)
+	qtegrity? (
+		openmp? (
+			|| (
+				>=sys-devel/gcc-4.2:*[openmp]
+				sys-devel/clang-runtime:*[openmp]
+			)
+		)
+		static? (
+			dev-libs/openssl:0=[static-libs]
+		)
+		!static? (
+			dev-libs/openssl:0=
+		)
+	)
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	econf \
+		--disable-maintainer-mode \
+		--with-eprefix="${EPREFIX}" \
+		$(use_enable qmanifest) \
+		$(use_enable qtegrity) \
+		$(use_enable openmp) \
+		$(use_enable static)
+}
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 6122e1276b8e..26b93558c426 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 512acff20186..27f2e81ad9e9 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -1,63 +1,3 @@
-AUX autoconf-mktime-2.53.patch 4812 BLAKE2B 153e7d9d2b57a0946c759545327ba95d64b79ac955fd4da2664b267ffee4766280ed3faf5d4bd3ce916c71ab56eb388b018ad0ddbc3374cbab7eb034ba91d4cc SHA512 52fd04b9ba576ef28a66647307b550e9da074867c2cfd9d517948f3029521d94ca01f3e43b49544ecf6ed1139f8ac4f8beb36470e7e225a65557a6b5fb5348ec
-AUX autoconf-mktime-2.59.patch 4690 BLAKE2B ad0c681d0139c7cdf08c7104621106d84cbdfa5d4e65867e4289088cbcfab5153fbcc30332956f54c876a0b61c841e5da73556039d2cacde00e89280731654e3 SHA512 5d903e598577e4227749580e7aa2d598e58f5aa7ae7cb232c370971da59ce8022b3acd825559a6dbddb44f640d3172d061bf157e424a4942a300d5563eb7d245
-AUX bash-2.05b-destdir.patch 598 BLAKE2B eaf7581e28c74548e4ea421b7ada2e725ea6e835b3ff4badd4b4430dbdd554af7660af3a2a3419513eca7996f95eb886f81b055a168f009ca7960f35c7eed2d2 SHA512 d453ff834c7a4b5b74e395e496493d77f98ec0e1aa1d7cf8ff0d8260b2a0602067da65a18d5dc9dbedc1d79c8b50395dd97f7091a6d55ff0bae52ed1b2b007bd
-AUX bash-2.05b-empty-herestring.patch 667 BLAKE2B d21552652550bfffd50221c074778c5fc54a46385f701654db7714fdedd7aed78a094eca5a7764401c276fa195b6c1bb45002c90fcb661b55ab80a2957bcc2d4 SHA512 311626129c33546b42a16788a566958f15b48aec40989828498ce45c50ffc450c1b3d3413cc7cbaeef44699d64962c968d38dda0ed810cce389b572228221be4
-AUX bash-2.05b-fix-job-warning.patch 341 BLAKE2B 98859dc6cc61f35f05e1446b343a2df727a823c2cc6eb843d135473ca8c250a77660d7d3c4849de4a9e78f56ecf37381897ce091fa9055fec210aecbb0eed8c8 SHA512 5ede03f96f8061d6ea99c473cd8625aedd745b9545a5af4bfa371907a4446e57d8d4d75e934ee38ae6654a0521f203d7e54d7b111e594bd4efff2ab0491b0a20
-AUX bash-2.05b-jobs.patch 813 BLAKE2B fc4818d90298b58a5a9062ed3a5ebe6a7d0ec8970a6274fe2462a0df928830df9a9c51e3f6e81e59bb476520b4279bd65a3d05e87512e005a0e4e3730508dc53 SHA512 7d6176ab2831f2dec6e033b1604d2b41694adc106e0a7bb63c69df245e85ff3ba45904d798f4d596dfe712ccc0bfd17d71ad70039eaf67b280254b15517f2e97
-AUX bash-2.05b-parallel-build.patch 426 BLAKE2B 621b7a0fc43e4dbcabbdd052e0dc4a79082d317dbd0413a980479608e7df6cacf87484d21f63c84119d3532ed5017ec1bdc6b11460bf86481c7026241e748784 SHA512 1ae173412ef3dad6b874cf6461479a0291e8dce2b0f1464450d41cc5a1e833e66860d7c2ed5c14e55fd082a95fdfa6164ae677aff0192fd2e02f1eedafe06992
-AUX bash-2.05b-protos.patch 692 BLAKE2B 2b6d4290a6b94d98d2579eaf3f1fac4229321e7032ef34915128d879c2e4bfdaca57e37702cd8665ffac28bc51e4b2eb3d713a77ca600a833269f26fe44e1551 SHA512 77a5d48d629cd127db6f7163fd9ee4e67c22b92007cb5e9fc9f51c83427f809dd74f176a521a7d8e342127419c872c01e29b921f48cea5cb8e788ff5f51faaa1
-AUX bash-2.05b-rbash.patch 616 BLAKE2B 9c943a1987a3558735aa9d7edfb74a5a0cf6bc8be956194d6457f9e0dae8ff4050e916eabda834a2f418c03327bec2039e11837229815c1bf200dd3ded1b62f2 SHA512 bc4a6132a36b65794843930e34abd199d9c5df7838c49ec3edf47f92e0f09877a31df051689a8267eaadfbb743934c2f4f25ab8a2ca07d1561dd6ec8c337a53f
-AUX bash-3.0-afs.patch 633 BLAKE2B 078765894c95e242feaa2d86f0613989a20b9550f6c29081445107834e60a17be4bd9b048a638bba627763ca0dd239956daef1d167b54193a5e0675b473203d6 SHA512 833515f5b4040ffb7e65b410aa860da73a2bf1d9b4da7ea74ec41581fcb27b0ebafdcbb041abf4c1cebaa3d7b43ee6ea11f7c7ecec5759530ce0184ac6029f3f
-AUX bash-3.0-crash.patch 1144 BLAKE2B ef90dd624da0cadb3cf75ee1d632187e17d845a1bd25d1756142f21b8c4a3fb0706b7a3a18d32e34c25c9bc950c92993bd9193981628e4181a942eb735d57770 SHA512 de2e982af985e07b7425a09afbdf4b70b6f0fa47f9126c5da35636bd1748f28803664ec71c52d15be19e84410e147c8128888a109faeba4d60eb531ecff7890e
-AUX bash-3.0-darwin-conn.patch 969 BLAKE2B 0a2dd39b1a1df5888cf03bc1cf59e17a7b0fc09334a13125ec385849ba21be45638e25c9d375e48db7aff3bba3c1844eae54925e75c937789e88128c39c0fc7a SHA512 cc85dbf39df3289e40ba33626d2a0ad511145ea3cc8dcbed136ad128181022bd70c3a4f7f8e3146bcd027d7999deefefe8496d5eb70ff1a70235950a01f9376f
-AUX bash-3.0-histtimeformat.patch 1784 BLAKE2B 10c9bae29f06832474dbfe038bae5e4b99dce795c7c04360a2813cba2962d86f44af53599d7b4ab3687c0378c9f9d910f4659444caea828c063a368caa9e4a29 SHA512 36ce1afa92707a4c43f212119fb2562fee0f1283bee94d892869611de1f34869b1dcf737746ac1887c1ee8165079bdb4ae6cb353a3cbefdf1cbbffb8b43a23e6
-AUX bash-3.0-jobs.patch 1438 BLAKE2B 1107d79b268df413c6ae03e4522f804f32bda4b9c98199e47eb45a1a4af69e1d31fd043b686cb048b310a3e9e36db46db5eee1574fbb649fe06b9395409f19c0 SHA512 d52b64f989e82f45c0305233333d2b004afb3ceda232a2144a56a21310b91749009d89639e323b4b63dcf92aff27c29d425af7e62ff9de9b164072669693ded0
-AUX bash-3.0-locale.patch 3492 BLAKE2B cec73c4f807172da52406a21cbdbd630449709aab4d51ea5a969065595eb339576cbb456dc62b6c0aae92a888498810c349e88c4abbeebfa355b401c397eeb7a SHA512 c216b5877eb87660f5f3309280b9852917dad50936261d22611fa7a0f5e26a2efb7383fc13884105fd0798c6576f203396f185e8441a14f03067d5aed6e3f6b3
-AUX bash-3.0-manpage.patch 498 BLAKE2B 6e1d4b03fc3f62e6021b0a79ed0955ea268d8fdf384a7211869f6806b891e5516bceabb13f3c044edaf182141bcbaccbdd3e3717bc0ca961023e8b7fa4ef937c SHA512 2492344828ad51d52dc4591b0df9e45e38904f5fc1bc6408b14815cf8809641b218c030cca0d830ddf3b18776bbc99e76aa0035b15e6e966ff1aa0a7914121fd
-AUX bash-3.0-multibyteifs.patch 6099 BLAKE2B 377cfffa517f316ba866e7adcf986dd92b8ef859a6f46a622b97f92694b3e1d5061bf2039c061c0878555f10144fb6e4c81e06b9045697c1587d1e3e5fe2f5ce SHA512 3c0a5e565dc1f0b38172d6417eded435b1d5482eb8d33beb850b53178130e7d08e1cd6051a08aa93c845902c0ad5d688f8a74671222eb269cae6bddf33a99342
-AUX bash-3.0-pgrp-pipe-fix.patch 410 BLAKE2B f1ce60171c4495aa3c8ff7843b484adecb12962015f17a0a7cceaefccf0494f45691cdd85ee50de145e37ccf9b91bee8134098b7f6e01087d7c96d9f040bda24 SHA512 ee7061bba01c38ebeb8d03828a915e6f21548316dd38af04f33175d1fa464f89526052f849d1e5ed3235924999d6c6e7be89cda69bbfa1cb9c1718d0a6833296
-AUX bash-3.0-protos.patch 1618 BLAKE2B a11aea928e0ec54e239834959714c96c0e3746ad9d8a2941f42bc12b7e257e8077be22e42ed744253871e19a21b2cd4e5ec8008b4e0599f19b2300142f2cd672 SHA512 b129beb6d0e8df83bcd1a2f8a4e56f60fa1d7566355a7ba73cbb4c267f074ce5aa8f5abd5da8bc45529b6101dd3111e3b427d49abe6d64b370704e9608ace099
-AUX bash-3.0-pwd.patch 717 BLAKE2B a834beb35b89f7b058d80fa06710ceb78bdf64214ea5a2a903e7afb6d05cfcd5b4b71f0cc3f3e4e2b9a1b13d10511bf6fd9eb1eaa1c45d224dbe9766dd3598ba SHA512 3766c9efab53754292227c21074e0fa176924956664eaa5d33ef562d14e864ac0c06fe0f03a565b0ade0bcbc0c97ec8a532ee7a31567dcca34cf84978f7ab805
-AUX bash-3.0-rbash.patch 405 BLAKE2B 0e35d1aa7a674c4def64c6dedecfb402fe6842c742f4df77312d4057959b7864e3c79f242bbc15108908e99077c34ed1e3cd63509a814e8f1ddcd31d306d473d SHA512 b247afab23cef742ec48c19012b79da52c1f1386cdc256a237742cc04f9ce64835a42f833b67ac5ed60424672484e6ffb262d5c80e253290062e21ce39357348
-AUX bash-3.0-read-builtin-pipe.patch 693 BLAKE2B 1f95af33371236119118d9cc92e0ae86264ca6af110483f619817996b5eb0333e8295ad8a2d09366854ede7ac163bf877cab9eeee1139ced131282f436983559 SHA512 0b06841acc959a9141f2e3072906703ee455501902db91946c1da8c9142dbe4d6d8b1cd06a2ba9eceb840a8229f82d33b61b125167c0e23c5af2a1bddce375fe
-AUX bash-3.0-read-memleak.patch 416 BLAKE2B 4fc13e44b5dcc7a3a76dcdfcc3e2d17904ce9ebc46c88a21b3b7142b1301bdf9518582a81256e582adf468caf0c4d68aa77d5e6e6d66d39b3d152a34512fa1cf SHA512 97361f9e14e2547a67da475a0bfd20c1be70534d745845d4918e98665d4182da231923c8365f881561db63b90d5e40def1f1b7f0bc98016c8d8c2e8aeb4e4407
-AUX bash-3.0-strnlen.patch 4976 BLAKE2B 9cde9d95df2b815071ea7aaafc9f59a98577b1302c76bc643a56d23bcae75e3f75083acfa043bbbd8abbce97b08ed6ae00f7f069c4ec495a966369388984f407 SHA512 390845441ad608d0938ca8ed5f9f06f28e6fe45462864072c19b3af302cc6cdb0a7f4fa9f0ee4dadc3ed19a73e06457044be47ad9c327a81f3de4ed7bb70aaf3
-AUX bash-3.0-subshell.patch 1219 BLAKE2B 2171bb8885dc2a5070cc7138e0999e615fd4982f0fa4a390acc8ef6877cd3ab896d676dfe0c2fc78d0436fa41b6765e159baa2953874257b01523b50d300e8ac SHA512 ede172d08b8220f44ba12f803285192b82a505d4d2549914ef563c66d6f19c3a14acd5af3f30fe096dc6c360e9aef71b89f23c468e55c06e61be19d6ce17a68f
-AUX bash-3.0-trap-fg-signals.patch 645 BLAKE2B 7a317c624463ad226367756ce4a23793e08a287dd6dbaa61bf64dd6ed945c7cbdfbf53732904eb785952a7ee707b45a5baaf631bb4c60a2c4b263420d0dba86f SHA512 ba3677afcf72a9830d1ee2a9d5167204e9881f0002f31cc557be6d0d6b4aa4631e47e98a39620d46118725c27811a79f0bc9dc10adb82c82f2051859fce3cc10
-AUX bash-3.0-ulimit.patch 5226 BLAKE2B 23ce5aee0854df8b19d885d8b51df828dd7d40ba6f67956ada76de6abb590d166e79977f0ce1bdda32937358a0626b21dd37df7c96ef95b064b866829fa8ccca SHA512 1cbf210ceb840a959530506777dc4ffb34862ec6f1bc4b65a68c77c8b1b3ce02168d7283dad8d64e218169125d041a25c4e604c3a4327ceee53f806d77067011
-AUX bash-3.0-volatile-command.patch 442 BLAKE2B ade700db1a17f79c029d5d97cf1108c8388f234993465060086a1d53d960ee9450f30376a64547593aa6a787dfd37d5819893cc16e7d1de6345e622ab51d1e8d SHA512 0ffb1a276d83f74c5bf1fbee14d535569e75c3584e1977adc3d92b45123c735b7c5b677c4ff6a6ce5a5faece628eadc66438f3c2ba6e2edbf9d20eac5f6a4154
-AUX bash-3.1-dev-fd-buffer-overflow.patch 557 BLAKE2B ef7874e23012e051673b695a96f8be714834e43f2e282f5591e1b6b50e99edaebce585e784623a8b74a018301fdee3a5bcf425c4c480767d550b2c793c3388fb SHA512 3db03dc6e8c5fd9542788cb84854a0849a0f87ff07e95adf57aaee21c7edcb1293ae47ad8b83e0e0513431ba9826fcb45b847ccd9d87efb32b91ac7fc0cb415e
-AUX bash-3.1-dev-fd-test-as-user.patch 437 BLAKE2B 1a235dc6192e3f9de5779768151b6dba34e57d0eb0875db36001943023d7813facb4cf46916105fca2d64bcba3c3ef325fc265771aad5093b2f048563d03bca5 SHA512 eb9907741b68513c53128221c240a1325735c1ceec2a4ac0df74ed85126404c3347a3d97181ada5b28686e17600653de9dfadfa9985812049de45741c81876b7
-AUX bash-3.1-fix-dash-login-shell.patch 1749 BLAKE2B ae26669a67196265fc301f0372b050bf74386288a128469647c31731aded2e7607c20dc41c1dbe404b423b1f464e646756d770ff7f9bd5974dca75d5f288e29c SHA512 f1ec4e9e6c119cba8d7df35d3cdb53b8bcf990b8577d0488a750dfdbd6781413981d2939ff3995977706ed927284aa0049ce36f64a126d6375fbed1210affb7d
-AUX bash-3.1-protos.patch 1580 BLAKE2B 99a5ed84fc5d3b90a69202e5c7bbeacf96fe15fb202ca0f30d1f8d0b2ab6f511bbc8cb30d94756e7b4b7d9fc764aa61b07b523ba356f4b99ecba6853b0816d7d SHA512 19a17cd5a1f245a46047575670b3f7d2d37d6beb445a9ae3df373d5bc70b19386811fd7c9119a3051b1a39534e60a8b144151c5e95c44eeddf2c899d9e932536
-AUX bash-3.1-ulimit.patch 3748 BLAKE2B d5db6fcb27b3618444f968a0a54afcca39f35d990a0c1961cff6666fdbce3ae697fd961eebd3ee2bb540cb9889548f7f5e231e6108e01416cfa03e0d1b500395 SHA512 85cfcc2bbb57b5f13b933a6fcdd8d31b94f9bbcdf6750792297eb72f719f98f69d561a0a7b696ec440a123b762ff5a67e7c4d994d69d93b460219e873155d3c8
-AUX bash-3.2-dev-fd-test-as-user.patch 1104 BLAKE2B bd6c70942fa0f02f02d723c4897b8bf26894e6809d54edface87621dff96b1762e3fb16f81a56a9fe04dc7fe29e982b9762de69db0f5e3af016eb559ba87e775 SHA512 fe4478d4423f7a9cce4af46207e2adcea2de17591c8cbc888695177a0b5efb9ab060d7980f6679ca66f6e99f1fa7b632fea6f002364c588996a4287cc5313689
-AUX bash-3.2-ldflags-for-build.patch 1172 BLAKE2B 8fb65436f504e46639ba959ddb7d7549fca6cfc4aefda0d4e871fcd7575e20dcb36ee3e4f318e20c9106b0b19dd6b2d6d2f3d6cac2b4e04c50d5807287c04906 SHA512 5ee27f6e2f3665ee4de4d47114ae03dc20d8050f1e4496d29796d892f9c96019a5dac8ec5672ba1818c0326d1151969bd03f9466089d6432468bc2cf56a1dd09
-AUX bash-3.2-loadables.patch 5355 BLAKE2B 55f280075d220ea3cff2763951b940ffb1277ddb870eec62f61f4140c8faf3317d5aaa7d4925b11eeadd4df8eace2a39e3f02d12aae5360f68cb6422db7543ad SHA512 8255659ea5737a6edc97c29a772c3b40c634190d869c67ed585e9169d18bba08d625b6a56b8e3abf200fa4798c4ee5d9411807fabed8c123b4afa1fd3d7be50d
-AUX bash-3.2-process-subst.patch 276 BLAKE2B 1f1656e70542a26944546e10c56395ef16400721f4c105b303795eea5aed7c66bd89d4349b81fac82c3e9c552cc6c452b84e92c32887641a71196de7655ad297 SHA512 f509c469e0cf4da3cc01771af1392cf1f2ad3badfb24df8b6be69d8798013c67ec158be3239bbf31b37c16dbf7dab08b6fc44c47a9d70c90e44e797a8a99c96f
-AUX bash-3.2-protos.patch 1376 BLAKE2B f5205d8d02aafc39fc8834f5fd98c609e14cec54bad3501e492499df1d56f0aad23ef1597e6e90720f420720e6c6d69653f64855724e9ca41b8480f5a835fbad SHA512 38fda9326bc92cdd10b9f4fac91d1ae8b37aca303376f9cbb59376f06136ed6d765421626d253931350e6ce5f6a34de9016eaab862de1deaee20c62d53d017a5
-AUX bash-3.2-session-leader.patch 2021 BLAKE2B c3c92e4c00227329624b31c6f8b6c1b239731069c54d10640120c515c7af10bd90bddc61b8a483943e334a11dbefcaa7fd1574223d35d8f2093ea7c3b223e04e SHA512 ad2a8580ab9895d9be36820c872b97d005167b0424ee1816587155ffdfc3dc43717bbff9a611e3e307fad7529fa351aa40bbd14fa3bf6bb4b3335a8a22df2690
-AUX bash-3.2-ulimit.patch 453 BLAKE2B c8c617e3f0f130aa33d28c859f6c71310695b46aea8e0cdf51cada012f898a903d39571ba4cccdb2c8449cbe0be66ab28efd0a572ad84b17e8295765ab2b5ff9 SHA512 c3c1f9d682e4374f57d1051d17d7342b6fb03844db5240c27a6e4176575f021b56df88556359ae8abd1077373d98f4d1d6cb9ef2536be69b6a6f5b0b06d7d652
-AUX bash-4.0-configure.patch 749 BLAKE2B 4d97e6c343537859068702082dd5ebe8a7abb4ee3de1330b200b04563b84265184f938b8f9bba454b46698b146f44e69c617b0a579c601c392f290bce36722a9 SHA512 b7df205a424c8b345e7ddac0c112b59b473cb1a76350f0b22e002e3e5f2f3594d8350573f8c624835582591a97a518fe62028ec8e3c2ea73a3eeb94872ee7a95
-AUX bash-4.0-ldflags-for-build.patch 512 BLAKE2B 09e617a76b541067b6733dee05b40b023df34ec0610537320e394964b40eb2f6fd47c8e821d333e5f7ae0b5c0e6d4aafdeba8abd330bfb8ccbad19b8d9b0282b SHA512 58298b4f76fdbbcce0c22a90ecd554fd5c5e485260ac8aeedadebfa6b2347c41fe99a1d4d8487e70cfbd7bed075e3efb12736e57516a45e0431821f6f243cd46
-AUX bash-4.0-negative-return.patch 748 BLAKE2B b582bab3822eb5175180e9f5495cd7fe4cdb45b78cb27f9ccadbd0c932808e118b658c0fbe356a2b209ceb4ab4804987449bfc337291b2a82bb1b1ff7fdab1ab SHA512 08bf99a64fafaa5d31c68337c6943c24353dc28b478a0678749dbcd21777c95e911d416f379f03499bbe5bf25edb7a36d35b51ae6b6cdf17f8c767d2cc620092
-AUX bash-4.0-parallel-build.patch 2237 BLAKE2B 883426410c469687cd592a10acc2aaab97dc3a78ad4589bdb06061a1de6a18c65aa50ed032180aa0de8cb9498888e4dc511eb256e1b228a65bd9ec5a80c77b0c SHA512 007ae35eb0f5027fc8f490df0270c52cc36648020aa9be717e548be68c85bf532492ddb6b34df169be4a2b4f788dd89b81d4b2872a26428683b421a9360af2b4
-AUX bash-4.1-fbsd-eaccess.patch 847 BLAKE2B a2a35f4b2563e00e82743057ae45762d480d315662130d9fc386b8922cbc21ccc9d2079a2fd0a880866879be8983e90aea0fcd1a1d1ac918ddeae31ee18301d5 SHA512 336bbd91c7badb6d3a0004224be508f9f98765dd2fb523084330da6e272bd1a88f871e074312b043ea4dc11b1582b75ebf33fa5ec0f1e32ae6b7e37e1ad55a55
-AUX bash-4.1-parallel-build.patch 829 BLAKE2B 9a2b41f426fca028e7ff231b1858f0908f0579db94c8e0bac2fefe2cbbc0c8574d294635e343c16bdc3e3ee9d6e03d6c52f9c107c358e821cee9199507bbe2c8 SHA512 4378b430b5238bccee1d9d368e094bb567481ff551bc1ee3331fb29f9a37e13d833daf56524b9d7a2649549c9ff372a73ba659ac4b5fee93dd584d03149a4db5
-AUX bash-4.2-dev-fd-buffer-overflow.patch 1255 BLAKE2B 61df074a224f6244d0821b06035040cef7e262bc1f77a7b64476048c9639a32ca471606a49ae2cf8e9d819ec5bc8cc4953be270301654f1e0541d771aec394e5 SHA512 c05a73f96d0c8c6e65d2bda1818bb28d6561f6004f7e1dadbce92a6a475d81169449a891a1d84b264df777253f354b984ffbae63af0e4e7948c04fe5b1c21832
-AUX bash-4.2-execute-job-control.patch 865 BLAKE2B c115ed8a46542b246c4526ecadda73389e95d9e5c1aec51bc43bc6e3d06c1b6196efd00689c3fb279268671aeff8a9039ed09a6f8c860ed408595db41020b4f2 SHA512 c2d45f5e9668a8717137c533ced119315cf03c63fb373e5636c65383a399227e1d2aaef846452a0d3316db20b0b4cc41bde55c9aba2a9a02c1c31462d2273577
-AUX bash-4.2-no-readline.patch 287 BLAKE2B 24d5c367440cdefc0a2e709e32867535e5dc3a617fd1f7b4703f572608385fa864a215aa690e1948db7bd1fdc33b00593ea56d289f98519b95980107194018d3 SHA512 558b6bc3a7588ca83190264c842a0eb79d838ebe8002f3aecf8a4dbbbbfa770a3568e2f35496ab80683c0317f15afbeb5748bd0c0027c7afbcb0419217dd5847
-AUX bash-4.2-parallel-build.patch 4448 BLAKE2B daf719a2fac8e18403401f68f7192a595fc31ab12f968e60d690c7453559b604b6c8d9d18c6973cf12c2f66b347739eeeda36dc611a1a5f420b7f6108a2e5a2a SHA512 44690ed868ed95b7949b21a308f402af64d46873a8eb023f44e3f12381719e66b5c123c75d496ccb3d51b10b7102ae041dc41d55131ff9835757731afb9f7711
-AUX bash-4.2-read-retry.patch 932 BLAKE2B 63f61cea187aa0b228870bc764d2882c000c587e9dbbc4fcbe90b1f17536c045330b997375674e275a8bacdf227ad94af57c87c002e4a47aed63651188734cce SHA512 b8c9524a1385f8a66b964bc629ed62a1c825415e3388ac4204709440d3feedd5ffa92dd0fb54eab85283b0de49ce24a76836512b737612c0a4c45eb4ab40f8cb
-AUX bash-4.2-speed-up-read-N.patch 2858 BLAKE2B d27c211af28432bc20c2b7bc4aed6a6293218684b55548807ca40e5cf716c16a87e45d0889888a3594738737b60e9f7fa633fc06dfee3bd26bfbb0138f757711 SHA512 6b7f611ac35746c5ce8caad49def25d060397d81844c0dda2ba7c73f4b0318a28b3fb89f356695c8a7799b70ab0591d9612619403b7d4ade8aba1e60a933fdae
-AUX bash-4.3-arrayfunc.patch 439 BLAKE2B 8fd293185d6ebed88788999a671aae6d490ecffd06e41b2b09ef745dcf0b8718991895d885a3484d71f52b4d6e0a680886e4cfa6faa8905f7c0290179f6f696a SHA512 9db458ea34495e8632d68c072db0c30be103d31ad0535d5327e2ba8db62d9464b2e4427fb0a06c6272dbaa399a2ba939666f4574929d0f53940234a78ca67867
-AUX bash-4.3-mapfile-improper-array-name-validation.patch 407 BLAKE2B 34644cc552d50cfd1db1904164fa69c84a315a8e0b0660bd0377669db532cca6af8f02f8e32d57ea117696f3caaf7a00e765773cf19c840a9aec57b3fd72f99a SHA512 214935a751c3275593654c36b471cbb47ca4f5bb6f2a19e0a7ff73b646e5318a861538bf923ebb5f84abafa6d0d6eeece7b2f36ef77ab8c582223e098b4eb356
-AUX bash-4.3-protos.patch 174 BLAKE2B 02d65bba8a12ab7d280a66d7e292e2ba6eea026fc252d302ee8a167e14bbccb9d3906a75728c9fe617b202ef63649fed13d82ff7407a71ee36baee6e1ad1c944 SHA512 4af0540467bbcf7cf041de6fe6ed080b149a2ff309e5dbe5e7b76bb30459aaeead813be678384feb01a7b64d3a649372f8a8aaf686f69ac7958baa87b25340b0
-AUX bash-4.4-jobs_overflow.patch 331 BLAKE2B 6897770ef49b5f3def669abaec3d18fd8c799fc54192c4a21a25da6a63390e0ae980cff88e0e8e74987a70c997a4205aa740bb6c7b60aad2dfbe4bcf595d958e SHA512 4b5d5c053b8bdad203a3440c084631fba2df79ccdb9cb0c0c41ece2af749382f4a8b2e9750cf0abff6558c91a5afed477cc1d49fd0911c913fe3d517da9faf42
-AUX bash-4.4-popd-offset-overflow.patch 995 BLAKE2B b44284ae2fe99126d6866945dab8a229d330980786ca6322f288ac2e0b4f3be92bf36ca0e8b42d712e97be67474a9c83509dbf1d4754dd55d385d752311565cb SHA512 8ee83abda21420e2092e447abc03a6255e1386bc6cf52bf806c02c639407f79291b925923a8a4d54fb0500c521cda674861649224110d5b031dbb8cb2c1a827f
-AUX bash-4.4-set-SHOBJ_STATUS.patch 410 BLAKE2B beddcd4ea00cf6814615896e9842a607280d56086165c38338bfdc8e92922f92219f30419f47dd1bd65939f2a3e48fced612db1332a9ee357465816b4939c678 SHA512 9a723b712279e640396bdaa18f4b5ec48fcbbf253573b0aa1e2e6e2cd9200d8d8a082fb3816154aaff0dd81de2e7a66babbdd682e50e4fc2e93dfaa1af17f04d
-AUX bash-4.x-deferred-heredocs.patch 1181 BLAKE2B 3afb0e6d6e9b1220133a862bc44c13a5989c4d21ab456098ee19f8dc8adfd0dfff6c83e3c42fc622487b05a33d614c08e69f400796ff6f1ee9c56c74a94f6867 SHA512 167d6344cef96f2c0e732450c3174c5cd74df822f71c415d145d531fb192fc9c684dcdff1a982b87824becd2bdbdf3fb5ab47dcaa4c7a35905b42d25ad0710aa
-AUX bash-5.0-history-append.patch 1150 BLAKE2B cc3d4c2303b37b14da2cbb3130db0c2fa65cdc7f7f8d0a4413042a898c4c48afbedcca03c9dbfc525ab191ddc2b4258fb976a28830e03490011f89a1361974b4 SHA512 9c2fb93c67a5da1e97b293db4b26469fd6813e2cfc8ffd776042529878b96312644d8dc247887d6171c89c0853d552e9f7d5d2c0b2f3d05c25c15e17e6706999
 AUX bash-5.0-syslog-history-extern.patch 376 BLAKE2B d883d3c3adbf8f4d19ecc3c2790754a7f6972682d1679b07d5bc599bdbfc019ba8ad4d1271ec550b59447db0a02f1219c9e6057a0b1c1c6c52f7750a746a07bf SHA512 c8dd17bdd8ccbd73061a7cbcb7351195e703a2c5fc6faf288ec3721fc6e526d88dd4b2201f87078a92ca134b98214ccfa935f82f585322f72e9a41fd51842b6a
 AUX bash_logout 205 BLAKE2B b8c0266c3d1e31a714304a2b3b33389f042ae5bd497379f9b15ce31d47d1e3da73ba6536023953b00efe27b687e2ff45d94e3f01a13acc824dc12e31552c5b94 SHA512 7234250c03fc920996a381f9daef9e2d8ab1e1a29acdebed6669d8e0fe1c872a7fa343adf7d9ddc81225b0cd9eb223ba7ad1ff42448aff057fc6d6baa8f04a7d
 AUX bashrc 3570 BLAKE2B 78fdff186afb07f9080b19e77ff197113df67b03407525d014a41b51ba6b42d98310f5093ecdc46c1d5354a77c578e94b9a4cd6d965156ad5f31c2955f4e41a2 SHA512 a3271c3c70b450fe67114720f0d2e4abf4eaf1925e5b3de1ee437968f4a29d722bc74b8e9461cd555487c578afe6f289d66898c75a7cc994d205fa5b29045604
@@ -65,17 +5,28 @@ AUX dot-bash_logout 127 BLAKE2B 8290778aea3426f4c56e5a9e7328faa76f99001fc7ce3eeb
 AUX dot-bash_profile 204 BLAKE2B cdb5ece2bea3b47651e2c9ca8d48ef3b0c4b7e2d660632d79edf3cdcea8f5f5a061019739b977538b25f2ace9dcb46e25b30e2d566ea71f6c1ac05388e59c957 SHA512 97ad83696b7eb8b084a53530d1a3e7648722ae4199c91737ceb02b8238e7637b0770731f5140ffb552142311f79b140a041d7e1e5366ba60399b0019f164fce9
 AUX dot-bashrc 551 BLAKE2B e245955936f0e036073e7fe153bd01181ae7206a73b45b0411e8d1a6eb0b7131dce260755eed00d2639848eebaefacf7c13087d4315b17f85fbafa6eba4c9fd8 SHA512 518b62aa2fa30e7d1692847929a6ce8dae4eac93e8b16d223d1ae86f4d5b076bcbe1852c9034f321c013e17502db9f771979957c67f8e8a71ca4eea7bfe9cc1b
 DIST bash-2.05b.tar.gz 1956216 BLAKE2B 15962417d13c6eec0db0861b601c33a6b13dc38d41672258f8f9fb8968a000ca1df7d5d3c99bbcb023e0b6b3e703d6c250291ac68ab3f24159eec7c2f0105b43 SHA512 595f84cfd38b239ff37f2c6fc22c669f8e1d4fea34400e30c4079ab657d05f735ee6b0e6af0db6c1b17dbf9cecec81805b467b4dbd45cc97044bfefac731aad6
+DIST bash-2.05b_p13-patches.tar.xz 4152 BLAKE2B 0f3d25f9b3a5df36a2da32b9cfc16d23901fd3b63578863903ff01530b9c524338d5cadd0ebe7d4fb79f7ac57945d77a3432578d7c2702a49f650d5774772453 SHA512 ef040ed2f53bae49cd84615adb513031a4dcbccef1af0669c2464ee7e3bd87615cd250d12342483fc895b0e8e6120bbc3b5c28b0d9b94cd3c6fe48d6c510d1f1
 DIST bash-3.0.tar.gz 2418293 BLAKE2B 7013cf7020e61987610933df55b1cf34036a2912c1844e87895535e7e77b28e2526b2a336365bd15cd2d528d9769783ff34c120c2d6932d8708e0b029ff68715 SHA512 2b56dc0531e908811e1cced23067d82505d57a3cf4651125a6e424649bc98f476366579306e03242388f0f5b17d2a09badc15b8358f70cde6f64c60b94015c9b
+DIST bash-3.0_p22-patches.tar.xz 13564 BLAKE2B b7107ffb3f9c592950f10369ea6c00f40e67eacbd42a23821a3db71f7326fba016a6b3e868cbe6f61fc00204a5ea02be27fa699aa3776afaa4b0aff5ba1f2f00 SHA512 146ab52e716cdb5c0896cf95b423662ed39acab5a0c34530cc1f9b3084dd68af8df52e9c69a7b206aa57b67911bdf138f2d46441b9cc1e533b028dfeceaa233c
 DIST bash-3.1.tar.gz 2533934 BLAKE2B 5cef5bb8a1b36688d578967e97bf19452f79f68012e4c720baceaf31cf1cd03d1dac0962d2b663a3b83bbea71b131ea54e15769fd22575ef1e610fd97efed615 SHA512 3b5d5f0de83d71c972e75267ab8f6b05a7e144acb39a7c6e14be7b4bcb9b67faeaf9a123fceebd957befa1222db05b9b539f524032d89eb1fb5936d9846c1c7e
+DIST bash-3.1_p23-patches.tar.xz 5792 BLAKE2B 239cd54b576101745f1d054b0de9bb7f8071329a99c46a04d35f1022cd0a8bfc86b871bb31637d924d8822f23de63922572966af548b6f76191490180592dd9e SHA512 26ac839cd00b19ccf4e170faf0ac044d31158d77c6cc00654cd92a6a4312eb5ded652fd2f3347d997dd1dc13916b1d5471ce2bcc6d1af5af21ccab25498febc4
 DIST bash-3.2.tar.gz 2529838 BLAKE2B 1e145f31231b0e5b0a2bbf2046e14df9718552856c01dc9699d75596b353ac0c8ac1d3bcfe4e0bd1a38aade6e775499f967925f74efe39f84611ac2b562ab47e SHA512 cc88b1a4dab9f752cf6a22153e40b8590f6d3408217730bb28f5eb431cbb5577c4d3befe8bd44669b8fa64433f299e0dd23511fd1ed8a820020e2f7f4a461758
+DIST bash-3.2_p57-patches.tar.xz 6060 BLAKE2B b6ed8271c8bd8dc765b1ca431ab524734f3a8486cacc54f7d1402a568f4dfe2569dad226bdecfad4aabdacb77491a9679070afaf9c80fa40bc44fd1e4d5c2f17 SHA512 aaec0d98cea6fbe8a34ea430d289314fa4db98c284eefa6dbb787da6061d13ed0b89ce982c0147fa7bd2e8935fd955f106a86c2ddb38476a9b8379404394e42b
 DIST bash-4.0.tar.gz 6230779 BLAKE2B 747614b0e7aa5aafec25850863e228837ac941a3285ec01e8adafde63ebb98c9211d1a8ae0782bc700340559a9884014c84c5ed2867cf40027886dd91de001bc SHA512 dccd099d11d649b26d5b5c2ab5fb8f33915631e1d86fba519a0464f2bd3a3289655e956cf161a0dc3671b8be193b6b065bede8a407d98af3012dd4b824711255
+DIST bash-4.0_p44-patches.tar.xz 3036 BLAKE2B 2dbff6f391b0b6a239b693578812541004de81c841d32eb6e4d7dbb2ab436a9d4052de4e44ec753fa669090fc1c4420bc2607839c533b7a7477c91cc7c5ace35 SHA512 d81a8d625e1522195c80ffa010b8862fe304f470187e1a12be673fd04cfd22d3605a30fb53b718817c07404e793c1738a5dcb94902566304c28a5f8eb679c395
 DIST bash-4.1.tar.gz 6598300 BLAKE2B 8ed70736071f7d946b939247dd43214059c7d545d99e4c7ec3388da263eb4f3faeeef939884ac8a489ded71fbfbaee15bb1cc6e29f3397f6e2c0d1e1d7097cda SHA512 2f2a053d98be9a31cd089e1293e3369ad05406f6543d1d1662d8b5807fdcfebc1dda79db9bf2c596a6351ea463fb9bd9c8943c1d45da9b82f2fd3bab0b8a581a
+DIST bash-4.1_p17-patches.tar.xz 1604 BLAKE2B 95dee794fd9890a47f5571a5921bb7abf0708da522a21bc7ee14a75461c0a618cfd54d86f3e210580395aa10c53e9435728a6bda97c58970108ba5414d93ba38 SHA512 1a31b8a0423fafd6449fbfd8d4eb11877e8016f0fb8eb53c48a821791bfe1f7755d9a9999b08cdced39afdfcd3b2058b91a555a31ff4aeae472fc076bd93120f
 DIST bash-4.2.tar.gz 7009201 BLAKE2B 52a4432ae401121ff187487a75a6541ce001c24d7d2251c3f0e33a58e93ff0c11b4c988003c6c740c13a51df0d752565023b8c39e79c96de52c73b49cc180523 SHA512 fdd3c230f4f7a687d36db1b8f7baab5e553cf55756e2d49a88ffaa4260c8cb949897dec9f48655e96608ef0093ac101b60c132060f06c711c0ab81aa3f148b5c
+DIST bash-4.2_p53-patches.tar.xz 4112 BLAKE2B bff4d8db9af567c0e5966f45941dee99562674c462670ee8339e8de4a68f5a2e4c4ace9dd7929c39df8dd24382cf99a750745612dac3b11e7dde8e4e321b9f32 SHA512 83f0fbf4943aa285c1c241854e6952669d078b17015c02c37e43e3f1b92b6f2bd9aa20c72ff6f4322089051035e81943885c22a059f2db63edb5c60970a65d12
 DIST bash-4.3.tar.gz 7955839 BLAKE2B 398461e90a1ab6fd726b1a9db41c4c2a1e184034e3b96029bd17097338f1f9869d1c2216bde0b5b3c8e561629824348a0da3045cc425914e8e024180a175efe4 SHA512 a852b8e46ee55568dce9d23a30a9dbd1c770c2d2a4bc91e1c3177d723b31b32c5d69d19704a93f165891b409b9dd2cc65723372044e2bd0ee49ed59a11512651
+DIST bash-4.3_p48-r2-patches.tar.xz 1080 BLAKE2B 2dfea3d3b24f6e03a2ba4643000599f7afda45bf07c78fcd748626304a6e31e3b55ca62043a41c9081d54cbe652e326d2ae90d1a07ae1f96ae99393e30dd6680 SHA512 a90886833c4b9962795fb3bf4b0b345e493fa90f0676ef6b618e8838cbb89ab8b298b0df0706bf1c11d817f56273222e1b44b1f4921e6d23f5b570bafdd0949c
 DIST bash-4.4.tar.gz 9377313 BLAKE2B ac0e481dd4f2d5b91eea4f0156f1fc398ef8bd1ccd941366aa9b041be576114c51e1ff1431ec871e96fb72257c2a05a0ebcbd88c43c221610fef7dfdb2502fc0 SHA512 73de3b425faaac55e45456b0f6f6d8077b5dfa7bb76e0d1894a19361b4a2b6bd4fbbe182117ddbfe9b07b4d898fba03537c261badc9533dd3c0da891764c7f29
+DIST bash-4.4_p23-r2-patches.tar.xz 664 BLAKE2B 4a5b71b95744be6b22807671ae3348aeb236b0c50d86d2dcaf142d847f3616d2b40858dae99fadbddfe1b206a86ad7730a7ef43a1864c18840b0ce97add52568 SHA512 0cddd5a251e0de52a8717cb7bfdc46745d9b3b5192d6cc81125afc5ac7d65748641af3d8e2241d3bbf642a485a23960fe02177901a6184135bc79b68bbdb04cc
 DIST bash-5.0.tar.gz 10135110 BLAKE2B a6c4d79144aa0c0f4a9433d618085c0d46b792b1de429b161f9f0266b55c099e13e44416c0886758a6f29411f5ceb79bfb0ec4eda47473f2713ae0b8081d6d3e SHA512 bb4519f06e278f271d08722b531e49d2e842cc3e0b02a6b3eee422e2efcb5b6226111af43f5e5eae56beb85ac8bfebcd6a4aacbabb8f609e529aa4d571890864
+DIST bash-5.0_p18-patches.tar.xz 804 BLAKE2B 89e615a08920a4cfc90f72d125a8256275b0677fb2d7abf208ca90ac80471d5fbf7efb86c814b6ccbbc65772370ed8fe82b7cee9b247ec881c0b664dee152f72 SHA512 538f817867ff3613f2177f2e6d9fecc69057152ac9cf35a5a7448ddc83960b94bc8e8f2987226ba68d14de376127ee5cf6c83f5374b74feb14fa1c5aab6105c7
 DIST bash-5.1.tar.gz 10458638 BLAKE2B 42059556694b604911b5b7936f94d42d8923f2931f3ebacefd95454274c7baadb1ec97629a524c1542e2e282dae66f1389334f8edc572ca8ee841cc3ac449ba7 SHA512 c44a0ce381469219548a3a27589af3fea4f22eda1ca4e9434b59fc16da81b471c29ce18e31590e0860a6a251a664b68c2b45e3a17d22cfc02799ffd9a208390c
 DIST bash-5.1.tar.gz.sig 95 BLAKE2B ac9209d6a4ab4436c511a7a195594e9036d7d1aef7887972f61a0e97378a9685b882621d7f95f5326b155dc155c41635417ce2ca41ac6d0dda78bd293ea4249f SHA512 3966404c0f683c7ef214fcf283b551e5441af3897009f778308c2e34067d98d57c95561453416a54ca5b1daf9a1288dbf950fe3f13353703cead12f5eec5fad8
+DIST bash-5.1_p16-patches.tar.xz 388 BLAKE2B 1575d54d311872c7ca71e13711fa0f7e3534fca16fd9d1ca045b6c696c9ca56f6a0ed5023a05d847ab5ddbefc22b8ef2c2a681f09571520f0294d83b495f0015 SHA512 c85e5b83f6ee1a7345647fa937d9718cab13be1a65886755d26a78d21fea4246650c7441a34fd729212e220366985b410562002d74c02c18de7ef0469b409ac7
 DIST bash-5.2-beta.tar.gz 10767207 BLAKE2B e3e0afd0d032dab002f3f7327cddbed56578d4d205e687c3408a9985038a4f24e7a728b874ff4ad960ca0c18e3174364e251658fb5ac8d1abed9907dd77764d2 SHA512 114fef0e3160d68fec977ccbe921b9e8a5ce468a8baefa1adb38c253da4528a3bd9a2791c667b01f0b7e248692044357d0506ee8a0b0ff2d4facc26112d0557d
 DIST bash-5.2-beta.tar.gz.sig 95 BLAKE2B 1c5a1ce4f6157593c40d931591dfa0c6b0baf8e871119fd94687d1fd17266be5e8445a174609075878f31f0e4d6722a6f19ae399a30bf3b5f254494aba5e21f7 SHA512 e0054cc76c9c5d066f6c4343ba8f144acb4f8792a1df1514845a9be4a1bd55b2b5bbf9f9318e8657d1efcd6dbe7b374eab757219d2334698a9ef56367bb4b4c1
 DIST bash205b-001 1132 BLAKE2B 0c5eef29777d54ef05957ea3d63b1556fb380bd20c238dc28993d822b37bc4e78ff4048ad069f6b8cd25da77ccdeb7aecd86c4349cb9d81e5e94c7001eeae5e6 SHA512 5ce4357468821b05e747201f3aa57225ad8f540c9e2c87051720490e039c30b478b9b662a68f14a0800fefe40184e4495e2645665200f9d75e9a115b2ac08071
@@ -428,17 +379,17 @@ DIST bash51-015 1409 BLAKE2B c9f4d7bb13727cbea142200ff61f09d5b06a117d863afd8a451
 DIST bash51-015.sig 95 BLAKE2B 236e63344a1d4f82acee460b84c7a0153ab27a5f8a1429eadb2db29c2506293828330a7da337a89d4e33cc1578ad47a427c574f669f6a4c560ffb7db719205bb SHA512 6dd83302c2dffa701ccb5ecb6d655714479609f2297bd53c5d02a9d8169fe52cea09149d122b679405da0ecbaeb4252b8834dd5397e89aaad1b87528d18ea7fb
 DIST bash51-016 2122 BLAKE2B c44d269366cf13d896602bc14ebefd8f5826cb10820e9bace83b643f5af0264cff0240da81cabcbb36af55a009795420cc622100969656bcb3c977ee9359d810 SHA512 020b3f3db77ca603a27a3423323538db5c9844be17ee428cf7cda80bebdcc715d30eab6c95773541cb8d14f3ad9e6142bf0adcda0e745ee638242508cc0ab05f
 DIST bash51-016.sig 95 BLAKE2B 6da76c4dc413b0a4560ae6b7ec550090c819b7a3e05dc2e000ee709b8430ae6373003f7c99dc94a13cfcce33e393199bd9b8f670a120375c929bf40b9e5a2a15 SHA512 d008d91db6b6bccea9431f962665fc4976cbeed87b24ea133044e9a15b0aba14f1d6361e524f00096377aa11a9b1daeea2bbeb65e82396cb12bc57cb560940f0
-EBUILD bash-2.05b_p13.ebuild 4602 BLAKE2B 158323bf007fd5448e55275b560b74c51f027bc75b29bc37cfa2214d21315248ac19280fecfde0dad04f1008ca1b04e369de91b66d6cd4639ac53049c2370ff1 SHA512 c4d3410da53c12bd204abcb166dc0173046251036b3eac3050203c3a31150180abca0205b8da5b50c2b6a7f15a8be231c1b9185f15253a16668d23b52c40ae5a
-EBUILD bash-3.0_p22.ebuild 4674 BLAKE2B 78486695de39edec99143d8abfd949cec69ef279a82fbb1fa8766f2eda978ef49bfd7bd7c8367cc171202d7055cab0290d132a4388ddcc4e207c04c8f166b3dd SHA512 a32fada9520f54ad6dfb4a752de6a541b84885bec18662c3fbc7fa69d94fe61030db56ebecf8a60323eb4f3ac9adf7e04dca3fc96535a86c721bb30d369aff8d
-EBUILD bash-3.1_p23.ebuild 4417 BLAKE2B 5e29cf37eb5c0951b18000421e103bc54cfddce3f80c7e351d77009c697222709b71111067f060d2f2df6cc830b53d21e62c3403e0a9af48a4de8af72a58851a SHA512 1b1dcb065353e7df8d377ec8263239014ebbf2f8005f0809637e0582aa611e0ea70f18fbefc2ae6c25461726c332ffe3d8895565744e4493edac29622ac521fa
-EBUILD bash-3.2_p57.ebuild 4516 BLAKE2B 5b7811a27721f479ca786177badcc423aa17d3a359727a78a4003fb568ba9f34eea25efae5a1d857d8cc758af9b8c94b77ac1520c7c4c6834bfac82f1ec30016 SHA512 c18b1552cbcee495bcc871cb144244c72d8b118ec0b5f401d25d871d224569941ef478b884d6f8ef7f3a5e2820a60c953bed9a912a7321d4d6ef2252b959150e
-EBUILD bash-4.0_p44.ebuild 4426 BLAKE2B 238c4413fc537988d2e23a55f5c79d3a27e675dac3afa0682f739f8d92ce9a5461f9e8312ba0f04aafea3e5a0ddf1d98ceb2ec3ff9aded6ae7e7171b62c5f3dc SHA512 a35c037bdb016c58631326abe78c74df5506287cc40cbd9ca2d1c644005bb811d8b77a1747cef2341e488e7a381168b9d8561b27063859a51b57ad5f743508af
-EBUILD bash-4.1_p17.ebuild 4158 BLAKE2B ebef5f57afe56b05dfeee49ce657bf766c399d00c268dc5b0cabf34790e85bee69577561bb998b6e558032bd3ec92bdcbb2e9e785091941a9b49ec65b3538b6a SHA512 e7563fbf92a57a51fbb133626fc539f6ea07551bf923317b0a48a88a49113cfcf531509da1d3ecf63d6509518ebda250563726235e099df00edf141709e7d14a
-EBUILD bash-4.2_p53.ebuild 4346 BLAKE2B 0f59fe8ecca91b88be903dad091fd7b1e5bf488f24482f83655ec22fa1ca973c7de3e334c18db46b6ac1e139efc9e1a1fe7af6260595b678a3b46f03d40635c7 SHA512 343626cbe8e34c0489ab83eb319de58c35a26557d95fcf598e829ee1c4d494f5440534aea08f783f552c747968d8e7accaef9a41b77fa0867ab48f5f973aec04
-EBUILD bash-4.3_p48-r2.ebuild 5625 BLAKE2B 84911de3d97af10c08b36a9ab850c2cab5ba8e5d81be0b3a5e5d42329614411030ff0131e93e1807e60da6cd759f14b0aaf19d408b8ae17aace984feb8423a3e SHA512 0e273dac763bab66906198a33a08b161ba54b59972ff3920034ac6c80c4996d668e1ada3055d3483d945b9be372c7c2aa0b7432c58957cd319cb0897c543c31b
-EBUILD bash-4.4_p23-r2.ebuild 5710 BLAKE2B 457af0b8fea1fbd5a41757264f15a266639ffc2500fcf1d0a5e5954374c1187da940440120c6a83631b757400a4ecd07af31f35593cb2233f2101f09095db21e SHA512 7c604d4a8006f8fb47baa0d8aae5b7995aa351f88cfa0b78864c68b5fa40760576ad6756f7014b9e0c0f7eabd719d035e831c223d0d48889f93bab41255b7f25
-EBUILD bash-5.0_p18.ebuild 7010 BLAKE2B 2dfab644677217ce3b059da587d1a059d5f44316a9389a6a5bf5918d84b54226cb521be3126c6879c2874e89529a1cd532378716281bed2654743e28cabbc7fb SHA512 c815ee034756bd58ab57a90a37d9c7a5541b89eceb93d3eeaccd517b26ec1eed1fc8a324b3b70c247dd212e0d2e6aa43604db077803a54d5bc25c8fc94037529
-EBUILD bash-5.1_p16.ebuild 7374 BLAKE2B 7cf353fd215952d06e3c850b8028c316c9faa25530ae348039fa202854f5d0a0e9b0838059d957a10869fc43332760407f1c17e99babf355a7ebfaed90832cfa SHA512 7bf3bfb496e44311535aa935a41ba62a1dce4d16988db9889b59347cf4dfdc57e591dbd9a24ded0f139eb572266cd088898dcabbb85b1b3b3b6ab04207b4788f
-EBUILD bash-5.2_beta.ebuild 7789 BLAKE2B 1159f3e97676dac104d6e19ab05e6f8b99b0562e948e020b873b5e4fb62e40b63c4c35a6197b64d1c8f9e26ba530cb347a23d7cbd77d51f6a4cf2faeaa50d1ec SHA512 2c1c03280834795418d6d6a788255b6f491e2d49605318ae0baedf67d455c2ccb31a985fad02451bf798e0aea8c2d04341e9d575bd7b99503397f2ec09f5c13a
-EBUILD bash-9999.ebuild 7789 BLAKE2B 1159f3e97676dac104d6e19ab05e6f8b99b0562e948e020b873b5e4fb62e40b63c4c35a6197b64d1c8f9e26ba530cb347a23d7cbd77d51f6a4cf2faeaa50d1ec SHA512 2c1c03280834795418d6d6a788255b6f491e2d49605318ae0baedf67d455c2ccb31a985fad02451bf798e0aea8c2d04341e9d575bd7b99503397f2ec09f5c13a
+EBUILD bash-2.05b_p13.ebuild 5246 BLAKE2B a428bfdebf5a98f8a45f2fb6127a132708ec0efc5bbd9cf6fa5c7bb70e565ae12e6b61248c80fda686da3706f957216aff2b5870ca13e1a0a86edfcf50648049 SHA512 72002267b10db0258c1912d5b665d4ca41054210197b4617822a4888ac7a2ff66a0a0354456a947333df5000272a54f70f75ccbcd24e137efe0a0058a4055f25
+EBUILD bash-3.0_p22.ebuild 5384 BLAKE2B a011f5d6d7c8428ffaabfff4f4ced9908876fb3cd198c4f72c2be7fb6b9c8cae37c333c6ad31e8506694c2945e83d0fe8fd6b8bd172f4c6092f74354b9e5fb65 SHA512 e56eedddbbe76d0c96fbbc8b6b1f95c183b1b3fe45fb32ea5ded646cfaff7ab14af4813cfb7ad20a6ce81b75118055aa606bba665e88d4dab55cec7ec6e5acdd
+EBUILD bash-3.1_p23.ebuild 5061 BLAKE2B 30640571e07e149a1a087c139c9f891922e9660a23033fdec6be3258a47812ef3280d72f68ec4521b2b6cb0c136cfce515f40c6ca1f2fafdac1205c7b8ac4067 SHA512 1137f8f69407ce2829681e932a534daff6a2f64c9b79c39e49766223719dae21503467e726dcaab729c10be9b887a947dda2d78d9f958b170168e2bcc2bfef5d
+EBUILD bash-3.2_p57.ebuild 5226 BLAKE2B 2cba8edc637d4899fc2e96ae83c1d7f39820f14d4b705a92eee6f685dc377ec6b3350bbbeb6c4f5e81aa881c1480e6b1937b8101c7315521944ae90c13d2ac33 SHA512 1e26cdac357e6439d84f75636622926265764552333828827ea6f5c3a2dee645604a0715effe57d07d4f0229eba0714a5bc5965eea445c86e3a599e434be6cf8
+EBUILD bash-4.0_p44.ebuild 5004 BLAKE2B a3d895250ee722a134267abff4dc43e7f54620fd965ebf8c1a8731a0f9a12db11c3860046438354e8175e32a59e8ec82d9fc850105ef568c49c2c982f8e7f347 SHA512 88d11e735a054802798180ee5b9a2ce724f592accb5de94addea5740e3deeaa0717db4eaa5e2e044f92909986b16f7c8dfa413b3df98b23c831a03996556b986
+EBUILD bash-4.1_p17.ebuild 4604 BLAKE2B 5cc7e801dc8d02ab1e2eb5a6568adfa7ca2cde916ba8d5b51b65b667d79e5358fd34dae8635eae6ba7699c7ebff7f3e72576611ca08607949d4569d89c3ed5d2 SHA512 40370b0cd2a8e5f7e6d13a5b7a166694923075b107546d30bd0ce8982e939c8ce143b0840c8f2170d7f456747394fcda3c47a12889c82a4150bdccc48d62b60e
+EBUILD bash-4.2_p53.ebuild 4858 BLAKE2B a1cc0c9c949a62fab8e0adb2160098dda714c1cc29600c875cd1d2563c8a6418115ac2a1b6b99a495183cf79d75a022db25700495b9d651f657317e2980fa58c SHA512 e36f1a6a701f6164b2818f76535f9605ed95deee8754c8c6c78e90f1cf2164b09912b9e895d4e033b59624ffdb3f460d7d5accbfc21e54cef70f663d2729bc6b
+EBUILD bash-4.3_p48-r2.ebuild 6035 BLAKE2B 408bffd82a0375ccfbe706fd3799a3dc34ce8372dfe0c4e740481df821194b13e81f61f923dff457e405f9fbd9a563e10dc95285ff463fbc7e0611ecb83706be SHA512 43b3742222a84cf406fc8fca2cd415ee0010da8b20b5e86132d2c137d2f50d06f3ec428fea3fffec405885dfd62e8d95459398c02eae3956324020a7db04b3cf
+EBUILD bash-4.4_p23-r2.ebuild 6090 BLAKE2B d09c2e76a0766ec38ace27c76b5219a52a6fa5cf2ec87e932950e3d5e3f6dadb84a5e594863b53739314aaad953f5a5fd1427bd9101ab1b4ca69c38e37ba9847 SHA512 9507a94d51dfce866e7ffe36880ad1879cc8a328f941103fb12ff84ab05492edfebee5deab7a19d8f8ff192c2b180656a7e0227f417b771ec32702dc4b549367
+EBUILD bash-5.0_p18.ebuild 7423 BLAKE2B ca28a57b4407a5971bdf25f477e4c6b40b6c2b1f79aaffaf778838f41490dcf7da7eb7dbe4652b47164210c25e764751f8ec60d4dc1c30751373bc0636d9d3ea SHA512 bddcc1a7813ed881f8ba6bf440a890f5ac633335e743ea1393082a6a55d99a3604b36271c6f15c9e2a7b06eefac1820f8f6ee4f92f582afc9ea86181c43ace6b
+EBUILD bash-5.1_p16.ebuild 7893 BLAKE2B b22235dbbbd3ba1cd85a8144cceadf3e6b06540427077d8da07fd6a63fa6d28b3a2f52783a90b056cd853c9261a94cd6e7f6bedf16d723dc59dad1ba6a93de52 SHA512 6b30679bd495a25d360b96b1ef124b5a32c50a641a2363de0edc45bcfa338d3b31a8a0da5c48466d6e5b47373ba2570e627597c4b5cfa55ef5c69bc3b42ac2bf
+EBUILD bash-5.2_beta.ebuild 8258 BLAKE2B f1d21b382d358ca435b46cf17d80b91c1572933dfa03999c2e9ca17a71487372f29abbf280d09375695bcbe977b02d5326838eff8ad9dfa43fb1e84e9b8519ac SHA512 2c82ea02284e06c8e3e9986da4e97eeb1c5b2f0b7dfde07f40c73f1cab1d7a92dcc33ce3a17835ce7eb7778c677fe9dc608f5b4adfca0cca9b9583828e86a48b
+EBUILD bash-9999.ebuild 8258 BLAKE2B f1d21b382d358ca435b46cf17d80b91c1572933dfa03999c2e9ca17a71487372f29abbf280d09375695bcbe977b02d5326838eff8ad9dfa43fb1e84e9b8519ac SHA512 2c82ea02284e06c8e3e9986da4e97eeb1c5b2f0b7dfde07f40c73f1cab1d7a92dcc33ce3a17835ce7eb7778c677fe9dc608f5b4adfca0cca9b9583828e86a48b
 MISC metadata.xml 735 BLAKE2B fb066d2f79f6b109d949f711d97a1446d3399b16aa2ed6934ba953179d0f6239ce677f5d887e49d7f5a9cf0680f31b560437e9b4399209ba8a7d2e09f05d864d SHA512 91b1f9e7c6419c3a7165180140fbc9754686fcd31f726b52a990a4dcddd290b049f3b681242ddf06f8e6ce0b2fafb7915052fa55c5fe205488361aa61dbc3b57
diff --git a/app-shells/bash/bash-2.05b_p13.ebuild b/app-shells/bash/bash-2.05b_p13.ebuild
index 508333271bcc..ef9bd98f1080 100644
--- a/app-shells/bash/bash-2.05b_p13.ebuild
+++ b/app-shells/bash/bash-2.05b_p13.ebuild
@@ -5,6 +5,10 @@ EAPI=7
 
 inherit flag-o-matic toolchain-funcs
 
+# Uncomment if we have a patchset
+GENTOO_PATCH_DEV="sam"
+GENTOO_PATCH_VER="${PV}"
+
 # Official patchlevel
 # See ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/
 PLEVEL="${PV##*_p}"
@@ -31,6 +35,10 @@ DESCRIPTION="The standard GNU Bourne again shell"
 HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html"
 SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
 
+if [[ -n ${GENTOO_PATCH_VER} ]] ; then
+	SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"
+fi
+
 LICENSE="GPL-2"
 SLOT="${MY_PV}"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
@@ -46,15 +54,15 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.05b-destdir.patch
-	"${FILESDIR}"/autoconf-mktime-2.53.patch # bug #220040
-	"${FILESDIR}"/${PN}-2.05b-protos.patch
-	"${FILESDIR}"/${PN}-2.05b-empty-herestring.patch
-	"${FILESDIR}"/${PN}-2.05b-rbash.patch # bug #26854
-	"${FILESDIR}"/${PN}-2.05b-parallel-build.patch # bug #41002
-	"${FILESDIR}"/${PN}-2.05b-jobs.patch
-	"${FILESDIR}"/${PN}-2.05b-fix-job-warning.patch
-	"${FILESDIR}"/${PN}-3.1-dev-fd-buffer-overflow.patch # bug #431850
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-2.05b-destdir.patch
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/autoconf-mktime-2.53.patch # bug #220040
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-2.05b-protos.patch
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-2.05b-empty-herestring.patch
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-2.05b-rbash.patch # bug #26854
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-2.05b-parallel-build.patch # bug #41002
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-2.05b-jobs.patch
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-2.05b-fix-job-warning.patch
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-3.1-dev-fd-buffer-overflow.patch # bug #431850
 )
 
 pkg_setup() {
@@ -68,6 +76,10 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${MY_P}.tar.gz
+
+	if [[ -n ${GENTOO_PATCH_VER} ]] ; then
+		unpack ${PN}-${GENTOO_PATCH_VER}-patches.tar.xz
+	fi
 }
 
 src_prepare() {
diff --git a/app-shells/bash/bash-3.0_p22.ebuild b/app-shells/bash/bash-3.0_p22.ebuild
index fa3951936d98..15629ba77d24 100644
--- a/app-shells/bash/bash-3.0_p22.ebuild
+++ b/app-shells/bash/bash-3.0_p22.ebuild
@@ -5,6 +5,10 @@ EAPI=7
 
 inherit flag-o-matic toolchain-funcs
 
+# Uncomment if we have a patchset
+GENTOO_PATCH_DEV="sam"
+GENTOO_PATCH_VER="${PV}"
+
 # Official patchlevel
 # See ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/
 PLEVEL="${PV##*_p}"
@@ -31,6 +35,10 @@ DESCRIPTION="The standard GNU Bourne again shell"
 HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html"
 SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
 
+if [[ -n ${GENTOO_PATCH_VER} ]] ; then
+	SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"
+fi
+
 LICENSE="GPL-2"
 SLOT="${MY_PV}"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
@@ -46,20 +54,20 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	"${FILESDIR}"/autoconf-mktime-2.53.patch
-	"${FILESDIR}"/${PN}-3.0-protos.patch
-	"${FILESDIR}"/${PN}-3.0-rbash.patch # bug #26854
-	"${FILESDIR}"/${PN}-2.05b-parallel-build.patch # bug #41002
-	"${FILESDIR}"/${PN}-3.0-darwin-conn.patch # bug #79124
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/autoconf-mktime-2.53.patch
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-3.0-protos.patch
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-3.0-rbash.patch # bug #26854
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-2.05b-parallel-build.patch # bug #41002
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-3.0-darwin-conn.patch # bug #79124
 
 	# Read patch headers for more info ... many ripped from Fedora/Debian[17]/SuSe/upstream
-	"${FILESDIR}"/${PN}-3.0-{afs,crash,jobs,manpage,pwd,ulimit,histtimeformat,locale,multibyteifs,subshell,volatile-command}.patch
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-3.0-{afs,crash,jobs,manpage,pwd,ulimit,histtimeformat,locale,multibyteifs,subshell,volatile-command}.patch
 
-	"${FILESDIR}"/${PN}-3.0-read-builtin-pipe.patch # bug #87093
-	"${FILESDIR}"/${PN}-3.0-trap-fg-signals.patch
-	"${FILESDIR}"/${PN}-3.0-pgrp-pipe-fix.patch # bug #92349
-	"${FILESDIR}"/${PN}-3.0-strnlen.patch
-	"${FILESDIR}"/${PN}-3.1-dev-fd-buffer-overflow.patch # bug #431850
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-3.0-read-builtin-pipe.patch # bug #87093
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-3.0-trap-fg-signals.patch
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-3.0-pgrp-pipe-fix.patch # bug #92349
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-3.0-strnlen.patch
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-3.1-dev-fd-buffer-overflow.patch # bug #431850
 )
 
 pkg_setup() {
@@ -73,6 +81,10 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${MY_P}.tar.gz
+
+	if [[ -n ${GENTOO_PATCH_VER} ]] ; then
+		unpack ${PN}-${GENTOO_PATCH_VER}-patches.tar.xz
+	fi
 }
 
 src_prepare() {
diff --git a/app-shells/bash/bash-3.1_p23.ebuild b/app-shells/bash/bash-3.1_p23.ebuild
index bc1b322a17e3..9e742a38c00b 100644
--- a/app-shells/bash/bash-3.1_p23.ebuild
+++ b/app-shells/bash/bash-3.1_p23.ebuild
@@ -5,6 +5,10 @@ EAPI=7
 
 inherit flag-o-matic toolchain-funcs
 
+# Uncomment if we have a patchset
+GENTOO_PATCH_DEV="sam"
+GENTOO_PATCH_VER="${PV}"
+
 # Official patchlevel
 # See ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/
 PLEVEL="${PV##*_p}"
@@ -31,6 +35,10 @@ DESCRIPTION="The standard GNU Bourne again shell"
 HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html"
 SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
 
+if [[ -n ${GENTOO_PATCH_VER} ]] ; then
+	SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"
+fi
+
 LICENSE="GPL-2"
 SLOT="${MY_PV}"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
@@ -46,15 +54,15 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	"${FILESDIR}"/autoconf-mktime-2.53.patch # bug #220040
-	"${FILESDIR}"/${PN}-2.05b-parallel-build.patch # bug #41002
-	"${FILESDIR}"/${PN}-3.1-protos.patch
-	"${FILESDIR}"/${PN}-3.1-ulimit.patch
-	"${FILESDIR}"/${PN}-3.0-read-memleak.patch
-	"${FILESDIR}"/${PN}-3.0-trap-fg-signals.patch
-	"${FILESDIR}"/${PN}-3.1-fix-dash-login-shell.patch # bug #118257
-	"${FILESDIR}"/${PN}-3.1-dev-fd-test-as-user.patch # bug #131875
-	"${FILESDIR}"/${PN}-3.1-dev-fd-buffer-overflow.patch # bug #431850
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/autoconf-mktime-2.53.patch # bug #220040
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-2.05b-parallel-build.patch # bug #41002
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-3.1-protos.patch
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-3.1-ulimit.patch
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-3.0-read-memleak.patch
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-3.0-trap-fg-signals.patch
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-3.1-fix-dash-login-shell.patch # bug #118257
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-3.1-dev-fd-test-as-user.patch # bug #131875
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-3.1-dev-fd-buffer-overflow.patch # bug #431850
 )
 
 pkg_setup() {
@@ -68,6 +76,10 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${MY_P}.tar.gz
+
+	if [[ -n ${GENTOO_PATCH_VER} ]] ; then
+		unpack ${PN}-${GENTOO_PATCH_VER}-patches.tar.xz
+	fi
 }
 
 src_prepare() {
diff --git a/app-shells/bash/bash-3.2_p57.ebuild b/app-shells/bash/bash-3.2_p57.ebuild
index 8f054fd31d22..fd2dedaf8b86 100644
--- a/app-shells/bash/bash-3.2_p57.ebuild
+++ b/app-shells/bash/bash-3.2_p57.ebuild
@@ -5,6 +5,10 @@ EAPI=7
 
 inherit flag-o-matic toolchain-funcs
 
+# Uncomment if we have a patchset
+GENTOO_PATCH_DEV="sam"
+GENTOO_PATCH_VER="${PV}"
+
 # Official patchlevel
 # See ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/
 PLEVEL="${PV##*_p}"
@@ -31,6 +35,10 @@ DESCRIPTION="The standard GNU Bourne again shell"
 HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html"
 SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
 
+if [[ -n ${GENTOO_PATCH_VER} ]] ; then
+	SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"
+fi
+
 LICENSE="GPL-2"
 SLOT="${MY_PV}"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
@@ -46,17 +54,17 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	"${FILESDIR}"/autoconf-mktime-2.59.patch # bug #220040
-	"${FILESDIR}"/${PN}-3.2-loadables.patch
-	"${FILESDIR}"/${PN}-2.05b-parallel-build.patch # bug #41002
-	"${FILESDIR}"/${PN}-3.2-protos.patch
-	"${FILESDIR}"/${PN}-3.2-session-leader.patch # bug #231775
-	"${FILESDIR}"/${PN}-3.2-ldflags-for-build.patch # bug #211947
-	"${FILESDIR}"/${PN}-3.2-process-subst.patch
-	"${FILESDIR}"/${PN}-3.2-ulimit.patch
-	"${FILESDIR}"/${PN}-3.0-trap-fg-signals.patch
-	"${FILESDIR}"/${PN}-3.2-dev-fd-test-as-user.patch # bug #131875
-	"${FILESDIR}"/${PN}-4.2-dev-fd-buffer-overflow.patch # bug #431850
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/autoconf-mktime-2.59.patch # bug #220040
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-3.2-loadables.patch
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-2.05b-parallel-build.patch # bug #41002
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-3.2-protos.patch
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-3.2-session-leader.patch # bug #231775
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-3.2-ldflags-for-build.patch # bug #211947
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-3.2-process-subst.patch
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-3.2-ulimit.patch
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-3.0-trap-fg-signals.patch
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-3.2-dev-fd-test-as-user.patch # bug #131875
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-4.2-dev-fd-buffer-overflow.patch # bug #431850
 )
 
 pkg_setup() {
@@ -70,6 +78,10 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${MY_P}.tar.gz
+
+	if [[ -n ${GENTOO_PATCH_VER} ]] ; then
+		unpack ${PN}-${GENTOO_PATCH_VER}-patches.tar.xz
+	fi
 }
 
 src_prepare() {
diff --git a/app-shells/bash/bash-4.0_p44.ebuild b/app-shells/bash/bash-4.0_p44.ebuild
index 80f0e3193096..3e10f70b2b88 100644
--- a/app-shells/bash/bash-4.0_p44.ebuild
+++ b/app-shells/bash/bash-4.0_p44.ebuild
@@ -5,6 +5,10 @@ EAPI=7
 
 inherit flag-o-matic toolchain-funcs
 
+# Uncomment if we have a patchset
+GENTOO_PATCH_DEV="sam"
+GENTOO_PATCH_VER="${PV}"
+
 # Official patchlevel
 # See ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/
 PLEVEL="${PV##*_p}"
@@ -31,6 +35,10 @@ DESCRIPTION="The standard GNU Bourne again shell"
 HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html"
 SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
 
+if [[ -n ${GENTOO_PATCH_VER} ]] ; then
+	SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"
+fi
+
 LICENSE="GPL-3"
 SLOT="${MY_PV}"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
@@ -46,14 +54,14 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-4.0-configure.patch # bug #304901
-	"${FILESDIR}"/${PN}-4.x-deferred-heredocs.patch
-
-	"${FILESDIR}"/${PN}-2.05b-parallel-build.patch # bug #41002
-	"${FILESDIR}"/${PN}-4.0-ldflags-for-build.patch # bug #211947
-	"${FILESDIR}"/${PN}-4.0-negative-return.patch
-	"${FILESDIR}"/${PN}-4.0-parallel-build.patch # bug #267613
-	"${FILESDIR}"/${PN}-4.2-dev-fd-buffer-overflow.patch #431850
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-4.0-configure.patch # bug #304901
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-4.x-deferred-heredocs.patch
+
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-2.05b-parallel-build.patch # bug #41002
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-4.0-ldflags-for-build.patch # bug #211947
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-4.0-negative-return.patch
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-4.0-parallel-build.patch # bug #267613
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-4.2-dev-fd-buffer-overflow.patch #431850
 )
 
 pkg_setup() {
@@ -67,6 +75,10 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${MY_P}.tar.gz
+
+	if [[ -n ${GENTOO_PATCH_VER} ]] ; then
+		unpack ${PN}-${GENTOO_PATCH_VER}-patches.tar.xz
+	fi
 }
 
 src_prepare() {
diff --git a/app-shells/bash/bash-4.1_p17.ebuild b/app-shells/bash/bash-4.1_p17.ebuild
index 1f9fd413625e..5088a6d4f393 100644
--- a/app-shells/bash/bash-4.1_p17.ebuild
+++ b/app-shells/bash/bash-4.1_p17.ebuild
@@ -5,6 +5,10 @@ EAPI=7
 
 inherit flag-o-matic toolchain-funcs
 
+# Uncomment if we have a patchset
+GENTOO_PATCH_DEV="sam"
+GENTOO_PATCH_VER="${PV}"
+
 # Official patchlevel
 # See ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/
 PLEVEL="${PV##*_p}"
@@ -31,6 +35,10 @@ DESCRIPTION="The standard GNU Bourne again shell"
 HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html"
 SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
 
+if [[ -n ${GENTOO_PATCH_VER} ]] ; then
+	SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"
+fi
+
 LICENSE="GPL-3"
 SLOT="${MY_PV}"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
@@ -46,10 +54,10 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-4.1-fbsd-eaccess.patch #bug #303411
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-4.1-fbsd-eaccess.patch #bug #303411
 
-	"${FILESDIR}"/${PN}-4.1-parallel-build.patch
-	"${FILESDIR}"/${PN}-4.2-dev-fd-buffer-overflow.patch #bug #431850
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-4.1-parallel-build.patch
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-4.2-dev-fd-buffer-overflow.patch #bug #431850
 )
 
 pkg_setup() {
@@ -63,6 +71,10 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${MY_P}.tar.gz
+
+	if [[ -n ${GENTOO_PATCH_VER} ]] ; then
+		unpack ${PN}-${GENTOO_PATCH_VER}-patches.tar.xz
+	fi
 }
 
 src_prepare() {
diff --git a/app-shells/bash/bash-4.2_p53.ebuild b/app-shells/bash/bash-4.2_p53.ebuild
index d2f41d73b72e..e80e66616297 100644
--- a/app-shells/bash/bash-4.2_p53.ebuild
+++ b/app-shells/bash/bash-4.2_p53.ebuild
@@ -5,6 +5,10 @@ EAPI=7
 
 inherit flag-o-matic toolchain-funcs
 
+# Uncomment if we have a patchset
+GENTOO_PATCH_DEV="sam"
+GENTOO_PATCH_VER="${PV}"
+
 # Official patchlevel
 # See ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/
 PLEVEL="${PV##*_p}"
@@ -31,6 +35,10 @@ DESCRIPTION="The standard GNU Bourne again shell"
 HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html"
 SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
 
+if [[ -n ${GENTOO_PATCH_VER} ]] ; then
+	SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"
+fi
+
 LICENSE="GPL-3"
 SLOT="${MY_PV}"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
@@ -48,11 +56,11 @@ BDEPEND="virtual/yacc"
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-4.2-execute-job-control.patch # bug #383237
-	"${FILESDIR}"/${PN}-4.2-parallel-build.patch
-	"${FILESDIR}"/${PN}-4.2-no-readline.patch
-	"${FILESDIR}"/${PN}-4.2-read-retry.patch # bug #447810
-	"${FILESDIR}"/${PN}-4.2-speed-up-read-N.patch
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-4.2-execute-job-control.patch # bug #383237
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-4.2-parallel-build.patch
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-4.2-no-readline.patch
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-4.2-read-retry.patch # bug #447810
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-4.2-speed-up-read-N.patch
 )
 
 pkg_setup() {
@@ -66,6 +74,10 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${MY_P}.tar.gz
+
+	if [[ -n ${GENTOO_PATCH_VER} ]] ; then
+		unpack ${PN}-${GENTOO_PATCH_VER}-patches.tar.xz
+	fi
 }
 
 src_prepare() {
diff --git a/app-shells/bash/bash-4.3_p48-r2.ebuild b/app-shells/bash/bash-4.3_p48-r2.ebuild
index 907ee1c4df9b..4409129e3732 100644
--- a/app-shells/bash/bash-4.3_p48-r2.ebuild
+++ b/app-shells/bash/bash-4.3_p48-r2.ebuild
@@ -5,6 +5,10 @@ EAPI=7
 
 inherit flag-o-matic toolchain-funcs
 
+# Uncomment if we have a patchset
+GENTOO_PATCH_DEV="sam"
+GENTOO_PATCH_VER="${PV}-r2"
+
 # Official patchlevel
 # See ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/
 PLEVEL="${PV##*_p}"
@@ -35,6 +39,10 @@ HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html"
 SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
 [[ ${PV} == *_rc* ]] && SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
 
+if [[ -n ${GENTOO_PATCH_VER} ]] ; then
+	SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"
+fi
+
 LICENSE="GPL-3"
 SLOT="${MY_PV}"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
@@ -49,10 +57,10 @@ RDEPEND="${DEPEND}
 BDEPEND="virtual/yacc"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-4.3-mapfile-improper-array-name-validation.patch
-	"${FILESDIR}"/${PN}-4.3-arrayfunc.patch
-	"${FILESDIR}"/${PN}-4.3-protos.patch
-	"${FILESDIR}"/${PN}-4.4-popd-offset-overflow.patch # bug #600174
+	"${WORKDIR}"/${P}-r2-patches/${PN}-4.3-mapfile-improper-array-name-validation.patch
+	"${WORKDIR}"/${P}-r2-patches/${PN}-4.3-arrayfunc.patch
+	"${WORKDIR}"/${P}-r2-patches/${PN}-4.3-protos.patch
+	"${WORKDIR}"/${P}-r2-patches/${PN}-4.4-popd-offset-overflow.patch # bug #600174
 )
 
 S="${WORKDIR}/${MY_P}"
@@ -73,6 +81,10 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${MY_P}.tar.gz
+
+	if [[ -n ${GENTOO_PATCH_VER} ]] ; then
+		unpack ${PN}-${GENTOO_PATCH_VER}-patches.tar.xz
+	fi
 }
 
 src_prepare() {
diff --git a/app-shells/bash/bash-4.4_p23-r2.ebuild b/app-shells/bash/bash-4.4_p23-r2.ebuild
index ee79d247e465..1cbb226099a8 100644
--- a/app-shells/bash/bash-4.4_p23-r2.ebuild
+++ b/app-shells/bash/bash-4.4_p23-r2.ebuild
@@ -5,6 +5,10 @@ EAPI=7
 
 inherit flag-o-matic toolchain-funcs prefix
 
+# Uncomment if we have a patchset
+GENTOO_PATCH_DEV="sam"
+GENTOO_PATCH_VER="${PV}-r2"
+
 # Official patchlevel
 # See ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/
 PLEVEL="${PV##*_p}"
@@ -44,6 +48,10 @@ else
 	SRC_URI="ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
 fi
 
+if [[ -n ${GENTOO_PATCH_VER} ]] ; then
+	SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"
+fi
+
 LICENSE="GPL-3"
 SLOT="${MY_PV}"
 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"
@@ -78,14 +86,18 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${MY_P}.tar.gz
+
+	if [[ -n ${GENTOO_PATCH_VER} ]] ; then
+		unpack ${PN}-${GENTOO_PATCH_VER}-patches.tar.xz
+	fi
 }
 
 src_prepare() {
 	# Include official patches
 	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
 
-	eapply "${FILESDIR}/${PN}-4.4-jobs_overflow.patch" # bug #644720
-	eapply "${FILESDIR}/${PN}-4.4-set-SHOBJ_STATUS.patch" # bug #644720
+	eapply "${WORKDIR}"/${P}-r2-patches/${PN}-4.4-jobs_overflow.patch # bug #644720
+	eapply "${WORKDIR}"/${P}-r2-patches/${PN}-4.4-set-SHOBJ_STATUS.patch # bug #644720
 
 	# Clean out local libs so we know we use system ones w/releases.
 	if is_release ; then
diff --git a/app-shells/bash/bash-5.0_p18.ebuild b/app-shells/bash/bash-5.0_p18.ebuild
index 55aa53be0667..55781d0923c2 100644
--- a/app-shells/bash/bash-5.0_p18.ebuild
+++ b/app-shells/bash/bash-5.0_p18.ebuild
@@ -5,6 +5,10 @@ EAPI=7
 
 inherit flag-o-matic toolchain-funcs prefix
 
+# Uncomment if we have a patchset
+GENTOO_PATCH_DEV="sam"
+GENTOO_PATCH_VER="${PV}"
+
 # Official patchlevel
 # See ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/
 PLEVEL="${PV##*_p}"
@@ -44,6 +48,10 @@ else
 	SRC_URI="ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
 fi
 
+if [[ -n ${GENTOO_PATCH_VER} ]] ; then
+	SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"
+fi
+
 LICENSE="GPL-3"
 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"
@@ -64,8 +72,8 @@ S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	# Patches from Chet sent to bashbug ml
-	"${FILESDIR}"/${PN}-5.0-history-append.patch
-	"${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-5.0-history-append.patch
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-5.0-syslog-history-extern.patch
 )
 
 pkg_setup() {
@@ -84,6 +92,10 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${MY_P}.tar.gz
+
+	if [[ -n ${GENTOO_PATCH_VER} ]] ; then
+		unpack ${PN}-${GENTOO_PATCH_VER}-patches.tar.xz
+	fi
 }
 
 src_prepare() {
diff --git a/app-shells/bash/bash-5.1_p16.ebuild b/app-shells/bash/bash-5.1_p16.ebuild
index a274960e97fe..43292ec1f762 100644
--- a/app-shells/bash/bash-5.1_p16.ebuild
+++ b/app-shells/bash/bash-5.1_p16.ebuild
@@ -6,6 +6,10 @@ EAPI=7
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/chetramey.asc
 inherit flag-o-matic toolchain-funcs prefix verify-sig
 
+# Uncomment if we have a patchset
+GENTOO_PATCH_DEV="sam"
+GENTOO_PATCH_VER="${PV}"
+
 # Official patchlevel
 # See ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/
 PLEVEL="${PV##*_p}"
@@ -48,6 +52,10 @@ else
 	SRC_URI+=" verify-sig? ( ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )"
 fi
 
+if [[ -n ${GENTOO_PATCH_VER} ]] ; then
+	SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"
+fi
+
 LICENSE="GPL-3"
 SLOT="0"
 [[ "${PV}" == *_rc* ]] || \
@@ -70,7 +78,7 @@ S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	# Patches from Chet sent to bashbug ml
-	"${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-5.0-syslog-history-extern.patch
 )
 
 pkg_setup() {
@@ -88,9 +96,19 @@ pkg_setup() {
 }
 
 src_unpack() {
-	verify-sig_src_unpack
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	else
+		if use verify-sig ; then
+			verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.sig}
+		fi
+
+		unpack ${MY_P}.tar.gz
 
-	unpack ${MY_P}.tar.gz
+		if [[ -n ${GENTOO_PATCH_VER} ]] ; then
+			unpack ${PN}-${GENTOO_PATCH_VER}-patches.tar.xz
+		fi
+	fi
 }
 
 src_prepare() {
diff --git a/app-shells/bash/bash-5.2_beta.ebuild b/app-shells/bash/bash-5.2_beta.ebuild
index 851264513714..9582f937a142 100644
--- a/app-shells/bash/bash-5.2_beta.ebuild
+++ b/app-shells/bash/bash-5.2_beta.ebuild
@@ -10,6 +10,10 @@ EAPI=7
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/chetramey.asc
 inherit flag-o-matic toolchain-funcs prefix verify-sig
 
+# Uncomment if we have a patchset
+#GENTOO_PATCH_DEV="sam"
+#GENTOO_PATCH_VER="${PV}"
+
 # Official patchlevel
 # See ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/
 PLEVEL="${PV##*_p}"
@@ -57,6 +61,10 @@ else
 	SRC_URI+=" verify-sig? ( ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )"
 fi
 
+if [[ -n ${GENTOO_PATCH_VER} ]] ; then
+	SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"
+fi
+
 LICENSE="GPL-3"
 SLOT="0"
 if is_release ; then
@@ -79,6 +87,8 @@ BDEPEND="verify-sig? ( sec-keys/openpgp-keys-chetramey )"
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
+	#"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}/
+
 	# Patches from Chet sent to bashbug ml
 	"${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch
 )
@@ -101,8 +111,15 @@ src_unpack() {
 	if [[ ${PV} == 9999 ]] ; then
 		git-r3_src_unpack
 	else
-		verify-sig_src_unpack
+		if use verify-sig ; then
+			verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.sig}
+		fi
+
 		unpack ${MY_P}.tar.gz
+
+		if [[ -n ${GENTOO_PATCH_VER} ]] ; then
+			unpack ${PN}-${GENTOO_PATCH_VER}-patches.tar.xz
+		fi
 	fi
 }
 
diff --git a/app-shells/bash/bash-9999.ebuild b/app-shells/bash/bash-9999.ebuild
index 851264513714..9582f937a142 100644
--- a/app-shells/bash/bash-9999.ebuild
+++ b/app-shells/bash/bash-9999.ebuild
@@ -10,6 +10,10 @@ EAPI=7
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/chetramey.asc
 inherit flag-o-matic toolchain-funcs prefix verify-sig
 
+# Uncomment if we have a patchset
+#GENTOO_PATCH_DEV="sam"
+#GENTOO_PATCH_VER="${PV}"
+
 # Official patchlevel
 # See ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/
 PLEVEL="${PV##*_p}"
@@ -57,6 +61,10 @@ else
 	SRC_URI+=" verify-sig? ( ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )"
 fi
 
+if [[ -n ${GENTOO_PATCH_VER} ]] ; then
+	SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"
+fi
+
 LICENSE="GPL-3"
 SLOT="0"
 if is_release ; then
@@ -79,6 +87,8 @@ BDEPEND="verify-sig? ( sec-keys/openpgp-keys-chetramey )"
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
+	#"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}/
+
 	# Patches from Chet sent to bashbug ml
 	"${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch
 )
@@ -101,8 +111,15 @@ src_unpack() {
 	if [[ ${PV} == 9999 ]] ; then
 		git-r3_src_unpack
 	else
-		verify-sig_src_unpack
+		if use verify-sig ; then
+			verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.sig}
+		fi
+
 		unpack ${MY_P}.tar.gz
+
+		if [[ -n ${GENTOO_PATCH_VER} ]] ; then
+			unpack ${PN}-${GENTOO_PATCH_VER}-patches.tar.xz
+		fi
 	fi
 }
 
diff --git a/app-shells/bash/files/autoconf-mktime-2.53.patch b/app-shells/bash/files/autoconf-mktime-2.53.patch
deleted file mode 100644
index 7632b63f4f79..000000000000
--- a/app-shells/bash/files/autoconf-mktime-2.53.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-https://bugs.gentoo.org/220040
-
---- a/configure
-+++ b/configure
-@@ -12393,22 +12393,25 @@ else
- #line $LINENO "configure"
- #include "confdefs.h"
- /* Test program from Paul Eggert and Tony Leneis.  */
--#if TIME_WITH_SYS_TIME
-+#ifdef TIME_WITH_SYS_TIME
- # include <sys/time.h>
- # include <time.h>
- #else
--# if HAVE_SYS_TIME_H
-+# ifdef HAVE_SYS_TIME_H
- #  include <sys/time.h>
- # else
- #  include <time.h>
- # endif
- #endif
- 
--#if HAVE_UNISTD_H
-+#include <limits.h>
-+#include <stdlib.h>
-+
-+#ifdef HAVE_UNISTD_H
- # include <unistd.h>
- #endif
- 
--#if !HAVE_ALARM
-+#ifndef HAVE_ALARM
- # define alarm(X) /* empty */
- #endif
- 
-@@ -12416,6 +12419,7 @@ else
- #undef putenv
- 
- static time_t time_t_max;
-+static time_t time_t_min;
- 
- /* Values we'll use to set the TZ environment variable.  */
- static const char *const tz_strings[] = {
-@@ -12424,9 +12428,9 @@ static const char *const tz_strings[] = {
- };
- #define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0]))
- 
--/* Fail if mktime fails to convert a date in the spring-forward gap.
-+/* Return 0 if mktime fails to convert a date in the spring-forward gap.
-    Based on a problem report from Andreas Jaeger.  */
--static void
-+static int
- spring_forward_gap ()
- {
-   /* glibc (up to about 1998-10-07) failed this test. */
-@@ -12445,23 +12449,27 @@ spring_forward_gap ()
-   tm.tm_min = 0;
-   tm.tm_sec = 0;
-   tm.tm_isdst = -1;
--  if (mktime (&tm) == (time_t)-1)
--    exit (1);
-+  return mktime (&tm) != (time_t) -1;
- }
- 
--static void
--mktime_test (now)
-+static int
-+mktime_test1 (now)
-      time_t now;
- {
-   struct tm *lt;
--  if ((lt = localtime (&now)) && mktime (lt) != now)
--    exit (1);
--  now = time_t_max - now;
--  if ((lt = localtime (&now)) && mktime (lt) != now)
--    exit (1);
-+  return ! (lt = localtime (&now)) || mktime (lt) == now;
- }
- 
--static void
-+static int
-+mktime_test (now)
-+     time_t now;
-+{
-+  return (mktime_test1 (now)
-+	  && mktime_test1 ((time_t) (time_t_max - now))
-+	  && mktime_test1 ((time_t) (time_t_min + now)));
-+}
-+
-+static int
- irix_6_4_bug ()
- {
-   /* Based on code from Ariel Faigon.  */
-@@ -12474,11 +12482,10 @@ irix_6_4_bug ()
-   tm.tm_sec = 0;
-   tm.tm_isdst = -1;
-   mktime (&tm);
--  if (tm.tm_mon != 2 || tm.tm_mday != 31)
--    exit (1);
-+  return tm.tm_mon == 2 && tm.tm_mday == 31;
- }
- 
--static void
-+static int
- bigtime_test (j)
-      int j;
- {
-@@ -12500,8 +12507,39 @@ bigtime_test (j)
- 	     && lt->tm_wday == tm.tm_wday
- 	     && ((lt->tm_isdst < 0 ? -1 : 0 < lt->tm_isdst)
- 		  == (tm.tm_isdst < 0 ? -1 : 0 < tm.tm_isdst))))
--	exit (1);
-+	return 0;
-     }
-+  return 1;
-+}
-+
-+static int
-+year_2050_test ()
-+{
-+  /* The correct answer for 2050-02-01 00:00:00 in Pacific time,
-+     ignoring leap seconds.  */
-+  unsigned long int answer = 2527315200UL;
-+
-+  struct tm tm;
-+  time_t t;
-+  tm.tm_year = 2050 - 1900;
-+  tm.tm_mon = 2 - 1;
-+  tm.tm_mday = 1;
-+  tm.tm_hour = tm.tm_min = tm.tm_sec = 0;
-+  tm.tm_isdst = -1;
-+
-+  /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0"
-+     instead of "TZ=America/Vancouver" in order to detect the bug even
-+     on systems that don't support the Olson extension, or don't have the
-+     full zoneinfo tables installed.  */
-+  putenv ("TZ=PST8PDT,M4.1.0,M10.5.0");
-+
-+  t = mktime (&tm);
-+
-+  /* Check that the result is either a failure, or close enough
-+     to the correct answer that we can assume the discrepancy is
-+     due to leap seconds.  */
-+  return (t == (time_t) -1
-+	  || (0 < t && answer - 120 <= t && t <= answer + 120));
- }
- 
- int
-@@ -12515,9 +12553,15 @@ main ()
-      isn't worth using anyway.  */
-   alarm (60);
- 
--  for (time_t_max = 1; 0 < time_t_max; time_t_max *= 2)
--    continue;
--  time_t_max--;
-+  for (;;)
-+    {
-+      t = (time_t_max << 1) + 1;
-+      if (t <= time_t_max)
-+	break;
-+      time_t_max = t;
-+    }
-+  time_t_min = - ((time_t) ~ (time_t) 0 == (time_t) -1) - time_t_max;
-+
-   delta = time_t_max / 997; /* a suitable prime number */
-   for (i = 0; i < N_STRINGS; i++)
-     {
-@@ -12525,17 +12569,22 @@ main ()
- 	putenv (tz_strings[i]);
- 
-       for (t = 0; t <= time_t_max - delta; t += delta)
--	mktime_test (t);
--      mktime_test ((time_t) 60 * 60);
--      mktime_test ((time_t) 60 * 60 * 24);
--
--      for (j = 1; 0 < j; j *= 2)
--        bigtime_test (j);
--      bigtime_test (j - 1);
-+	if (! mktime_test (t))
-+	  return 1;
-+      if (! (mktime_test ((time_t) 1)
-+	     && mktime_test ((time_t) (60 * 60))
-+	     && mktime_test ((time_t) (60 * 60 * 24))))
-+	return 1;
-+
-+      for (j = 1; ; j <<= 1)
-+	if (! bigtime_test (j))
-+	  return 1;
-+	else if (INT_MAX / 2 < j)
-+	  break;
-+      if (! bigtime_test (INT_MAX))
-+	return 1;
-     }
--  irix_6_4_bug ();
--  spring_forward_gap ();
--  exit (0);
-+  return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ());
- }
- _ACEOF
- rm -f conftest$ac_exeext
diff --git a/app-shells/bash/files/autoconf-mktime-2.59.patch b/app-shells/bash/files/autoconf-mktime-2.59.patch
deleted file mode 100644
index 33055a7be61a..000000000000
--- a/app-shells/bash/files/autoconf-mktime-2.59.patch
+++ /dev/null
@@ -1,197 +0,0 @@
-http://bugs.gentoo.org/220040
---- a/configure
-+++ b/configure
-@@ -5299,26 +6059,25 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- /* Test program from Paul Eggert and Tony Leneis.  */
--#if TIME_WITH_SYS_TIME
-+#ifdef TIME_WITH_SYS_TIME
- # include <sys/time.h>
- # include <time.h>
- #else
--# if HAVE_SYS_TIME_H
-+# ifdef HAVE_SYS_TIME_H
- #  include <sys/time.h>
- # else
- #  include <time.h>
- # endif
- #endif
- 
--#if HAVE_STDLIB_H
--# include <stdlib.h>
--#endif
-+#include <limits.h>
-+#include <stdlib.h>
- 
--#if HAVE_UNISTD_H
-+#ifdef HAVE_UNISTD_H
- # include <unistd.h>
- #endif
- 
--#if !HAVE_ALARM
-+#ifndef HAVE_ALARM
- # define alarm(X) /* empty */
- #endif
- 
-@@ -5335,9 +6094,9 @@
- };
- #define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0]))
- 
--/* Fail if mktime fails to convert a date in the spring-forward gap.
-+/* Return 0 if mktime fails to convert a date in the spring-forward gap.
-    Based on a problem report from Andreas Jaeger.  */
--static void
-+static int
- spring_forward_gap ()
- {
-   /* glibc (up to about 1998-10-07) failed this test. */
-@@ -5356,29 +6115,27 @@
-   tm.tm_min = 0;
-   tm.tm_sec = 0;
-   tm.tm_isdst = -1;
--  if (mktime (&tm) == (time_t)-1)
--    exit (1);
-+  return mktime (&tm) != (time_t) -1;
- }
- 
--static void
-+static int
- mktime_test1 (now)
-      time_t now;
- {
-   struct tm *lt;
--  if ((lt = localtime (&now)) && mktime (lt) != now)
--    exit (1);
-+  return ! (lt = localtime (&now)) || mktime (lt) == now;
- }
- 
--static void
-+static int
- mktime_test (now)
-      time_t now;
- {
--  mktime_test1 (now);
--  mktime_test1 ((time_t) (time_t_max - now));
--  mktime_test1 ((time_t) (time_t_min + now));
-+  return (mktime_test1 (now)
-+	  && mktime_test1 ((time_t) (time_t_max - now))
-+	  && mktime_test1 ((time_t) (time_t_min + now)));
- }
- 
--static void
-+static int
- irix_6_4_bug ()
- {
-   /* Based on code from Ariel Faigon.  */
-@@ -5391,11 +6148,10 @@
-   tm.tm_sec = 0;
-   tm.tm_isdst = -1;
-   mktime (&tm);
--  if (tm.tm_mon != 2 || tm.tm_mday != 31)
--    exit (1);
-+  return tm.tm_mon == 2 && tm.tm_mday == 31;
- }
- 
--static void
-+static int
- bigtime_test (j)
-      int j;
- {
-@@ -5417,8 +6173,39 @@
- 	     && lt->tm_wday == tm.tm_wday
- 	     && ((lt->tm_isdst < 0 ? -1 : 0 < lt->tm_isdst)
- 		  == (tm.tm_isdst < 0 ? -1 : 0 < tm.tm_isdst))))
--	exit (1);
-+	return 0;
-     }
-+  return 1;
-+}
-+
-+static int
-+year_2050_test ()
-+{
-+  /* The correct answer for 2050-02-01 00:00:00 in Pacific time,
-+     ignoring leap seconds.  */
-+  unsigned long int answer = 2527315200UL;
-+
-+  struct tm tm;
-+  time_t t;
-+  tm.tm_year = 2050 - 1900;
-+  tm.tm_mon = 2 - 1;
-+  tm.tm_mday = 1;
-+  tm.tm_hour = tm.tm_min = tm.tm_sec = 0;
-+  tm.tm_isdst = -1;
-+
-+  /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0"
-+     instead of "TZ=America/Vancouver" in order to detect the bug even
-+     on systems that don't support the Olson extension, or don't have the
-+     full zoneinfo tables installed.  */
-+  putenv ("TZ=PST8PDT,M4.1.0,M10.5.0");
-+
-+  t = mktime (&tm);
-+
-+  /* Check that the result is either a failure, or close enough
-+     to the correct answer that we can assume the discrepancy is
-+     due to leap seconds.  */
-+  return (t == (time_t) -1
-+	  || (0 < t && answer - 120 <= t && t <= answer + 120));
- }
- 
- int
-@@ -5432,12 +6219,15 @@
-      isn't worth using anyway.  */
-   alarm (60);
- 
--  for (time_t_max = 1; 0 < time_t_max; time_t_max *= 2)
--    continue;
--  time_t_max--;
--  if ((time_t) -1 < 0)
--    for (time_t_min = -1; (time_t) (time_t_min * 2) < 0; time_t_min *= 2)
--      continue;
-+  for (;;)
-+    {
-+      t = (time_t_max << 1) + 1;
-+      if (t <= time_t_max)
-+	break;
-+      time_t_max = t;
-+    }
-+  time_t_min = - ((time_t) ~ (time_t) 0 == (time_t) -1) - time_t_max;
-+
-   delta = time_t_max / 997; /* a suitable prime number */
-   for (i = 0; i < N_STRINGS; i++)
-     {
-@@ -5445,18 +6235,22 @@
- 	putenv (tz_strings[i]);
- 
-       for (t = 0; t <= time_t_max - delta; t += delta)
--	mktime_test (t);
--      mktime_test ((time_t) 1);
--      mktime_test ((time_t) (60 * 60));
--      mktime_test ((time_t) (60 * 60 * 24));
--
--      for (j = 1; 0 < j; j *= 2)
--	bigtime_test (j);
--      bigtime_test (j - 1);
-+	if (! mktime_test (t))
-+	  return 1;
-+      if (! (mktime_test ((time_t) 1)
-+	     && mktime_test ((time_t) (60 * 60))
-+	     && mktime_test ((time_t) (60 * 60 * 24))))
-+	return 1;
-+
-+      for (j = 1; ; j <<= 1)
-+	if (! bigtime_test (j))
-+	  return 1;
-+	else if (INT_MAX / 2 < j)
-+	  break;
-+      if (! bigtime_test (INT_MAX))
-+	return 1;
-     }
--  irix_6_4_bug ();
--  spring_forward_gap ();
--  exit (0);
-+  return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ());
- }
- _ACEOF
- rm -f conftest$ac_exeext
diff --git a/app-shells/bash/files/bash-2.05b-destdir.patch b/app-shells/bash/files/bash-2.05b-destdir.patch
deleted file mode 100644
index a1089d293c16..000000000000
--- a/app-shells/bash/files/bash-2.05b-destdir.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-support DESTDIR install
-
---- bash-2.05b/Makefile.in
-+++ bash-2.05b/Makefile.in
-@@ -20,16 +20,16 @@
- all: .made
- 
- # Include some boilerplate Gnu makefile definitions.
--prefix = @prefix@
-+prefix = $(DESTDIR)@prefix@
- 
--exec_prefix = @exec_prefix@
--bindir = @bindir@
--libdir = @libdir@
--infodir = @infodir@
--includedir = @includedir@
-+exec_prefix = $(DESTDIR)@exec_prefix@
-+bindir = $(DESTDIR)@bindir@
-+libdir = $(DESTDIR)@libdir@
-+infodir = $(DESTDIR)@infodir@
-+includedir = $(DESTDIR)@includedir@
- datadir = @datadir@
- 
--mandir = @mandir@
-+mandir = $(DESTDIR)@mandir@
- manpfx = man
- 
- man1ext = .1
diff --git a/app-shells/bash/files/bash-2.05b-empty-herestring.patch b/app-shells/bash/files/bash-2.05b-empty-herestring.patch
deleted file mode 100644
index db868c49aea7..000000000000
--- a/app-shells/bash/files/bash-2.05b-empty-herestring.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-###################################################################
-# Added by Tavis Ormandy <taviso@gentoo.org> 01/05/2003
-# Reproduce with
-#
-#  $ xargs <<< ${EMTPY_VARIABLE}
-#  Segmentation fault.
-#
-# note: bash will still give you a "\n" with this patch, but this is
-# standard behaviour, if you need proof:
-#
-#  $ wc -l <<< ""
-###############################
-
---- bash-2.05b/redir.c
-+++ bash-2.05b/redir.c
-@@ -263,7 +263,7 @@
-   int herelen, n, e;
- 
-   herestr = expand_string_to_string (redirectee->word, 0);
--  herelen = strlen (herestr);
-+  herelen = (herestr == NULL) ? 0 : strlen (herestr);
- 
-   n = write (fd, herestr, herelen);
-   if (n == herelen)
-     {
diff --git a/app-shells/bash/files/bash-2.05b-fix-job-warning.patch b/app-shells/bash/files/bash-2.05b-fix-job-warning.patch
deleted file mode 100644
index fcec078d3d0c..000000000000
--- a/app-shells/bash/files/bash-2.05b-fix-job-warning.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-fix obvious error:
-common.c:247:5: warning: format '%s' expects a matching 'char *' argument [-Wformat=]
-
---- a/builtins/common.c
-+++ b/builtins/common.c
-@@ -244,7 +244,7 @@
-      char *s;
- {
-   if (s)
--    builtin_error ("%s: no job control");
-+    builtin_error ("%s: no job control", s);
-   else
-     builtin_error ("no job control");
- }
diff --git a/app-shells/bash/files/bash-2.05b-jobs.patch b/app-shells/bash/files/bash-2.05b-jobs.patch
deleted file mode 100644
index 4ed475eab799..000000000000
--- a/app-shells/bash/files/bash-2.05b-jobs.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Fix using bash with post-20040808 glibc ebuilds (from fedora)
-
---- bash-2.05b/jobs.c
-+++ bash-2.05b/jobs.c
-@@ -2423,6 +2423,7 @@
-   PROCESS *child;
-   pid_t pid;
-   int call_set_current, last_stopped_job, job, children_exited, waitpid_flags;
-+  static int wcontinued_not_supported = 0;
- 
-   call_set_current = children_exited = 0;
-   last_stopped_job = NO_JOB;
-@@ -2436,7 +2437,15 @@
- 			: 0;
-       if (sigchld || block == 0)
- 	waitpid_flags |= WNOHANG;
-+    retry:
-+      if (wcontinued_not_supported)
-+	waitpid_flags &= ~WCONTINUED;
-       pid = WAITPID (-1, &status, waitpid_flags);
-+      if (pid == -1 && errno == EINVAL)
-+	{
-+	  wcontinued_not_supported = 1;
-+	  goto retry;
-+	}
- 
-       /* The check for WNOHANG is to make sure we decrement sigchld only
- 	 if it was non-zero before we called waitpid. */
diff --git a/app-shells/bash/files/bash-2.05b-parallel-build.patch b/app-shells/bash/files/bash-2.05b-parallel-build.patch
deleted file mode 100644
index 382ffd6dfd5e..000000000000
--- a/app-shells/bash/files/bash-2.05b-parallel-build.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix parallel make
-
-http://bugs.gentoo.org/41002
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -604,7 +604,7 @@
- 
- config.h:	stamp-h 
- 
--stamp-h:	config.status $(srcdir)/config.h.in $(srcdir)/config-top.h $(srcdir)/config-bot.h
-+stamp-h:	version.h config.status $(srcdir)/config.h.in $(srcdir)/config-top.h $(srcdir)/config-bot.h
- 	CONFIG_FILES= CONFIG_HEADERS=config.h $(SHELL) ./config.status
- 
- config.status:	$(srcdir)/configure
diff --git a/app-shells/bash/files/bash-2.05b-protos.patch b/app-shells/bash/files/bash-2.05b-protos.patch
deleted file mode 100644
index 2a42ced54711..000000000000
--- a/app-shells/bash/files/bash-2.05b-protos.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-move prototypes around so they show up when needed
-
---- a/externs.h
-+++ b/externs.h
-@@ -327,6 +327,9 @@
- #undef xstrchr
- extern char *xstrchr __P((const char *, int));
- 
-+/* declarations for functions defined in lib/sh/zcatfd.c */
-+extern int zcatfd __P((int, int, char *));
-+
- /* declarations for functions defined in lib/sh/zread.c */
- extern ssize_t zread __P((int, char *, size_t));
- extern ssize_t zreadintr __P((int, char *, size_t));
---- a/jobs.h
-+++ b/jobs.h
-@@ -175,6 +175,8 @@
- extern void ignore_tty_job_signals __P((void));
- extern void default_tty_job_signals __P((void));
- 
-+extern void close_pgrp_pipe __P((void));
-+
- #if defined (JOB_CONTROL)
- extern int job_control;
- #endif
diff --git a/app-shells/bash/files/bash-2.05b-rbash.patch b/app-shells/bash/files/bash-2.05b-rbash.patch
deleted file mode 100644
index 19b89ca35e2f..000000000000
--- a/app-shells/bash/files/bash-2.05b-rbash.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Fix broken rbash functionality when used as a login shell via /etc/passwd
-
-http://bugs.gentoo.org/26854
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=170298
-
-Backported from bash-3.1
-
---- bash-2.05b/shell.c
-+++ bash-2.05b/shell.c
-@@ -1065,6 +1099,8 @@
-   if (restricted)
-     return 1;
-   temp = base_pathname (name);
-+  if (*temp == '-')
-+    temp++;
-   return (STREQ (temp, RESTRICTED_SHELL_NAME));
- }
- 
-@@ -1082,6 +1118,8 @@
-   char *temp;
- 
-   temp = base_pathname (name);
-+  if (*temp == '-')
-+    temp++;
-   if (restricted || (STREQ (temp, RESTRICTED_SHELL_NAME)))
-     {
-       set_var_read_only ("PATH");
diff --git a/app-shells/bash/files/bash-3.0-afs.patch b/app-shells/bash/files/bash-3.0-afs.patch
deleted file mode 100644
index f07371c39eb4..000000000000
--- a/app-shells/bash/files/bash-3.0-afs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Ripped from Fedora
-
-- Fixed AFS support for output redirection, so that the correct errors
-  are reported for other filesystems (bug #155373).
-
-https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=155373
-
---- bash-3.0/redir.c.afs	2005-04-20 09:16:15.000000000 +0100
-+++ bash-3.0/redir.c	2005-04-20 09:16:58.000000000 +0100
-@@ -596,7 +596,9 @@
-       fd = open (filename, flags, mode);
- #if defined (AFS)
-       if ((fd < 0) && (errno == EACCES))
--	fd = open (filename, flags & ~O_CREAT, mode);
-+	if ((fd = open (filename, flags & ~O_CREAT, mode)) < 0)
-+	  /* Restore previous errno. */
-+	  errno = EACCES;
- #endif /* AFS */
-     }
- 
diff --git a/app-shells/bash/files/bash-3.0-crash.patch b/app-shells/bash/files/bash-3.0-crash.patch
deleted file mode 100644
index 38577e2a67ea..000000000000
--- a/app-shells/bash/files/bash-3.0-crash.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-> Machine Type: i686-pc-linux-gnu
-> 
-> Bash Version: 3.0
-> Patch Level: 0
-> Release Status: release
-> 
-> Description:
->         GNU bash, version 3.00.0(1)-release (i686-pc-linux-gnu)
->         (and
->         GNU bash, version 2.05b.0(1)-release (i386-redhat-linux-gnu)
-> 
->         dumps a core because of a null pointer "in make_bare_word 
->         at make_cmd.c:90" (see gdb output below)
-
-Thanks for the report.  Here's a quick fix:
-
-*** a/arrayfunc.c
---- b/arrayfunc.c
-***************
-*** 709,713 ****
-  	  return ((char *)NULL);
-  	}
-!       else if (var == 0)
-  	return ((char *)NULL);
-        else if (array_p (var) == 0)
---- 709,713 ----
-  	  return ((char *)NULL);
-  	}
-!       else if (var == 0 || value_cell (var) == 0)
-  	return ((char *)NULL);
-        else if (array_p (var) == 0)
-
-
-Chet
-
--- 
-``The lyf so short, the craft so long to lerne.'' - Chaucer
-( ``Discere est Dolere'' -- chet )
-						Live...Laugh...Love
-Chet Ramey, ITS, CWRU    chet@po.cwru.edu    http://tiswww.tis.cwru.edu/~chet/
-
-
-_______________________________________________
-Bug-bash mailing list
-Bug-bash@gnu.org
-http://lists.gnu.org/mailman/listinfo/bug-bash
diff --git a/app-shells/bash/files/bash-3.0-darwin-conn.patch b/app-shells/bash/files/bash-3.0-darwin-conn.patch
deleted file mode 100644
index f83e4c3f701d..000000000000
--- a/app-shells/bash/files/bash-3.0-darwin-conn.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Sune Foldager writes:
-On Darwin (Mac OS X), bash incorrectly assumed that it has been called over a
-network connection (such as ssh, rsh etc.), when stdin stems from the pipe()
-system call. This is because bash's heuristic code for determining if it's
-been started over a net connection is incorrect on Darwin kernels.
-
-http://bugs.gentoo.org/79124
-
---- a/lib/sh/netconn.c
-+++ b/lib/sh/netconn.c
-@@ -53,7 +53,8 @@
-   l = sizeof(sa);
-   rv = getpeername(fd, &sa, &l);
-   /* Solaris 2.5 getpeername() returns EINVAL if the fd is not a socket. */
--  return ((rv < 0 && (errno == ENOTSOCK || errno == EINVAL)) ? 0 : 1);
-+  /* Darwin 7.7.0 getpeername() returns ENOTCONN if the fd was created with pipe(). */
-+  return ((rv < 0 && (errno == ENOTSOCK || errno == ENOTCONN || errno == EINVAL)) ? 0 : 1);
- #else /* !HAVE_GETPEERNAME || SVR4_2 || __BEOS__ */
- #  if defined (SVR4) || defined (SVR4_2)
-   /* Sockets on SVR4 and SVR4.2 are character special (streams) devices. */
diff --git a/app-shells/bash/files/bash-3.0-histtimeformat.patch b/app-shells/bash/files/bash-3.0-histtimeformat.patch
deleted file mode 100644
index b910600fd896..000000000000
--- a/app-shells/bash/files/bash-3.0-histtimeformat.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Ripped from Debian
-
-http://lists.gnu.org/archive/html/bug-bash/2004-08/msg00008.html
-
-From: Enrique Perez-Terron <enrio@online.no>
-To: bug-bash@gnu.org
-Subject: When using HISTTIMEFORMAT, the date and the command are run
-	together.
-Date: Sun, 01 Aug 2004 18:36:45 +0200
-
-Configuration Information [Automatically generated, do not change]:
-Machine: i586
-OS: linux-gnu
-Compiler: gcc
-Compilation CFLAGS:  -DPROGRAM='bash' -DCONF_HOSTTYPE='i586'
--DCONF_OSTYPE='linux-gnu' -DCONF_MACHTYPE='i586-pc-linux-gnu'
--DCONF_VENDOR='pc' -DLOCALEDIR='/usr/local/share/locale'
--DPACKAGE='bash' -DSHELL -DHAVE_CONFIG_H  -I.  -I. -I./include -I./lib  
--g -O2
-uname output: Linux arabia.home.lan 2.6.6-1.435.2.3 #1 Thu Jul 1
-09:11:28 EDT 2004 i586 i586 i386 GNU/Linux
-Machine Type: i586-pc-linux-gnu
-
-# DP: Add space separating the time and the command in the
-# DP: output from the history builtin command.
-
-Bash Version: 3.0
-Patch Level: 0
-Release Status: release
-
-Description:
-	There is no space separating the time and the command in the 
-	output from the history builtin command.
-
-Repeat-By:
-	$ export HISTTIMEFORMAT=_A_format_string_
-	$ history 3
-	  997  _A_format_string_echo $BASH_VERSION
-	  998  _A_format_string_export HISTTIMEFORMAT=_A_format_string_
-	  999  _A_format_string_history 3
-
-Fix:
---- ./builtins/history.def.orig	2003-12-20 00:02:09.000000000 +0100
-+++ ./builtins/history.def	2004-08-01 18:18:02.652720102 +0200
-@@ -287,9 +287,10 @@
- 	  QUIT;
- 
- 	  timestr = (histtimefmt && *histtimefmt) ? histtime (hlist[i], histtimefmt) : (char *)NULL;
--	  printf ("%5d%c %s%s\n", i + history_base,
-+	  printf ("%5d%c %s%s%s\n", i + history_base,
- 		  histdata(i) ? '*' : ' ',
- 		  ((timestr && *timestr) ? timestr : ""),
-+		  ((timestr && *timestr) ? " " : ""),
- 		  histline(i));
- 	  i++;
- 	}
diff --git a/app-shells/bash/files/bash-3.0-jobs.patch b/app-shells/bash/files/bash-3.0-jobs.patch
deleted file mode 100644
index 72c149c71cf5..000000000000
--- a/app-shells/bash/files/bash-3.0-jobs.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Ripped from Fedora
-
-* Wed Sep  8 2004 Tim Waugh <twaugh@redhat.com> 3.0-13
-- Check for EINVAL from waitpid() and avoid WCONTINUED in that case.
-- Fixed jobs4 test.
-
-From: 	Tim Waugh
-Subject: 	[patch] bash-3.0: avoid WCONTINUED if invalid
-Date: 	Wed, 8 Sep 2004 16:52:38 +0100
-User-agent: 	Mutt/1.4.1i
-
-Hi,
-
-GNU libc defines WCONTINUED, but (at least on Linux 2.4.x kernels)
-waitpid() returns -1 with errno set to EINVAL if WCONTINUED is
-supplied in options.
-
-Here is a patch to retry without WCONTINUED set in that case.
-
-Tim.
-
---- bash-3.0/tests/jobs4.sub
-+++ bash-3.0/tests/jobs4.sub
-@@ -18,5 +18,5 @@
- 
- wait
- 
--cat &
-+sleep 100 &
- kill -1 %% && echo i killed it || echo could not kill it
---- bash-3.0/jobs.c
-+++ bash-3.0/jobs.c
-@@ -2475,6 +2475,7 @@
-   PROCESS *child;
-   pid_t pid;
-   int call_set_current, last_stopped_job, job, children_exited, waitpid_flags;
-+  static int wcontinued_not_supported = 0;
- 
-   call_set_current = children_exited = 0;
-   last_stopped_job = NO_JOB;
-@@ -2488,7 +2489,15 @@
- 			: 0;
-       if (sigchld || block == 0)
- 	waitpid_flags |= WNOHANG;
-+    retry:
-+      if (wcontinued_not_supported)
-+	waitpid_flags &= ~WCONTINUED;
-       pid = WAITPID (-1, &status, waitpid_flags);
-+      if (pid == -1 && errno == EINVAL)
-+	{
-+	  wcontinued_not_supported = 1;
-+	  goto retry;
-+	}
- 
-       /* The check for WNOHANG is to make sure we decrement sigchld only
- 	 if it was non-zero before we called waitpid. */
diff --git a/app-shells/bash/files/bash-3.0-locale.patch b/app-shells/bash/files/bash-3.0-locale.patch
deleted file mode 100644
index ea1ef3deae36..000000000000
--- a/app-shells/bash/files/bash-3.0-locale.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-Ripped from SuSe
-
-http://lists.gnu.org/archive/html/bug-bash/2004-08/msg00005.html
-
-From: schwab@suse.de
-To: bug-bash@gnu.org
-Subject: HISTTIMEFORMAT doesn't track locale changes
-Date: Sun,  1 Aug 2004 11:14:00 +0200 (CEST)
-
-Configuration Information [Automatically generated, do not change]:
-Machine: ia64
-OS: linux-gnu
-Compiler: gcc
-Compilation CFLAGS:  -DPROGRAM='bash' -DCONF_HOSTTYPE='ia64' -DCONF_OSTYPE='linux-gnu' -DCONF_MACHTYPE='ia64-unknown-linux-gnu' -DCONF_VENDOR='unknown' -DLOCALEDIR='/usr/local/share/locale' -DPACKAGE='bash' -DSHELL -DHAVE_CONFIG_H  -I.  -I../bash-3.0 -I../bash-3.0/include -I../bash-3.0/lib   -O2 -g
-uname output: Linux sykes 2.6.5-22-default #1 SMP Fri Jul 2 13:43:23 UTC 2004 ia64 ia64 ia64 GNU/Linux
-Machine Type: ia64-unknown-linux-gnu
-
-Bash Version: 3.0
-Patch Level: 0
-Release Status: release
-
-Description:
-Bash doesn't use the current locale when formatting HISTTIMEFORMAT.
-
-Repeat-By:
-sykes:/tmp/bash/Build/:[0]$ locale
-LANG=de_DE.UTF-8
-LC_CTYPE="de_DE.UTF-8"
-LC_NUMERIC=POSIX
-LC_TIME=POSIX
-LC_COLLATE=POSIX
-LC_MONETARY="de_DE.UTF-8"
-LC_MESSAGES=en_US.UTF-8
-LC_PAPER="de_DE.UTF-8"
-LC_NAME="de_DE.UTF-8"
-LC_ADDRESS="de_DE.UTF-8"
-LC_TELEPHONE="de_DE.UTF-8"
-LC_MEASUREMENT="de_DE.UTF-8"
-LC_IDENTIFICATION="de_DE.UTF-8"
-LC_ALL=
-sykes:/tmp/bash/Build/:[0]$ history 1
- 1502  history 1
-sykes:/tmp/bash/Build/:[0]$ HISTTIMEFORMAT=%c
-sykes:/tmp/bash/Build/:[0]$ history 1
- 1504  Sun Aug  1 10:56:59 2004history 1
-sykes:/tmp/bash/Build/:[0]$ export LC_TIME=$LANG
-sykes:/tmp/bash/Build/:[0]$ history 1
- 1506  Sun Aug  1 10:57:24 2004history 1
-
---- bash-3.0/locale.c
-+++ bash-3.0/locale.c
-@@ -71,9 +71,10 @@ set_default_locale ()
-   textdomain (PACKAGE);
- }
- 
--/* Set default values for LC_CTYPE, LC_COLLATE, LC_MESSAGES and LC_NUMERIC
--   if they are not specified in the environment, but LC_ALL is.  This
--   should be called from main() after parsing the environment. */
-+/* Set default values for LC_CTYPE, LC_COLLATE, LC_MESSAGES, LC_NUMERIC
-+   and LC_TIME if they are not specified in the environment, but LC_ALL
-+   is.  This should be called from main() after parsing the
-+   environment. */
- void
- set_default_locale_vars ()
- {
-@@ -109,6 +110,12 @@ set_default_locale_vars ()
-     setlocale (LC_NUMERIC, lc_all);
- #  endif /* LC_NUMERIC */
- 
-+#  if defined (LC_TIME)
-+  val = get_string_value ("LC_TIME");
-+  if (val == 0 && lc_all && *lc_all)
-+    setlocale (LC_TIME, lc_all);
-+#  endif /* LC_TIME */
-+
- #endif /* HAVE_SETLOCALE */
- 
-   val = get_string_value ("TEXTDOMAIN");
-@@ -213,6 +220,13 @@ set_locale_var (var, value)
- 	return (setlocale (LC_NUMERIC, get_locale_var ("LC_NUMERIC")) != 0);
- #  endif /* LC_NUMERIC */
-     }
-+  else if (var[3] == 'T' && var[4] == 'I')	/* LC_TIME */
-+    {
-+#  if defined (LC_TIME)
-+      if (lc_all == 0 || *lc_all == '\0')
-+	return (setlocale (LC_TIME, get_locale_var ("LC_TIME")) != 0);
-+#  endif /* LC_TIME */
-+    }
- #endif /* HAVE_SETLOCALE */
- 
-   return (0);
-@@ -285,6 +299,9 @@ reset_locale_vars ()
- #  if defined (LC_NUMERIC)
-   setlocale (LC_NUMERIC, get_locale_var ("LC_NUMERIC"));
- #  endif
-+#  if defined (LC_TIME)
-+  setlocale (LC_TIME, get_locale_var ("LC_TIME"));
-+#  endif
- 
-   locale_setblanks ();  
- 
---- bash-3.0/variables.c
-+++ bash-3.0/variables.c
-@@ -3646,6 +3646,7 @@ static struct name_and_function special_
-   { "LC_CTYPE", sv_locale },
-   { "LC_MESSAGES", sv_locale },
-   { "LC_NUMERIC", sv_locale },
-+  { "LC_TIME", sv_locale },
- 
-   { "MAIL", sv_mail },
-   { "MAILCHECK", sv_mail },
diff --git a/app-shells/bash/files/bash-3.0-manpage.patch b/app-shells/bash/files/bash-3.0-manpage.patch
deleted file mode 100644
index 08e3143e5422..000000000000
--- a/app-shells/bash/files/bash-3.0-manpage.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Ripped from Fedora
-
-fix obvious display bug
-
---- bash-3.0/doc/bash.1
-+++ bash-3.0/doc/bash.1
-@@ -3929,7 +3929,7 @@
- .B SIGHUP
- to all jobs when an interactive login shell exits.
- .PP
--If \Bbash\fP is waiting for a command to complete and receives a signal
-+If \fBbash\fP is waiting for a command to complete and receives a signal
- for which a trap has been set, the trap will not be executed until
- the command completes. 
- When \fBbash\fP is waiting for an asynchronous command via the \fBwait\fP
diff --git a/app-shells/bash/files/bash-3.0-multibyteifs.patch b/app-shells/bash/files/bash-3.0-multibyteifs.patch
deleted file mode 100644
index 1e74832b638a..000000000000
--- a/app-shells/bash/files/bash-3.0-multibyteifs.patch
+++ /dev/null
@@ -1,281 +0,0 @@
-From: Tim Waugh <twaugh@redhat.com>
-To: bug-bash@gnu.org
-Subject: [patch] multibyte IFS values
-Date: Tue, 24 Aug 2004 13:34:59 +0100
-
-Hi,
-
-Here is a patch to address these problems:
-
-http://lists.gnu.org/archive/html/bug-bash/2004-07/msg00294.html
-http://lists.gnu.org/archive/html/bug-bash/2004-07/msg00296.html
-
-It works well for me at least.
-
-Tim.
-
---- bash-3.0/subst.c.multibyteifs	2004-08-20 15:22:48.366497771 +0100
-+++ bash-3.0/subst.c	2004-08-20 18:13:30.833624616 +0100
-@@ -124,7 +124,12 @@
- SHELL_VAR *ifs_var;
- char *ifs_value;
- unsigned char ifs_cmap[UCHAR_MAX + 1];
-+#if defined (HANDLE_MULTIBYTE)
-+unsigned char ifs_firstc[MB_LEN_MAX];
-+size_t ifs_firstc_len;
-+#else
- unsigned char ifs_firstc;
-+#endif
- 
- /* Extern functions and variables from different files. */
- extern int last_command_exit_value, last_command_exit_signal;
-@@ -862,8 +867,14 @@
-      char *charlist;
- {
-   register int i = *sindex;
-+  size_t slen;
-+#if defined (HANDLE_MULTIBYTE)
-+  size_t clen;
-+  wchar_t *wcharlist = NULL;
-+#endif
-   int c;
-   char *temp;
-+  DECLARE_MBSTATE;
- 
-   if (charlist[0] == '\'' && charlist[1] == '\0')
-     {
-@@ -872,18 +883,65 @@
-       return temp;
-     }
- 
--  for (i = *sindex; c = string[i]; i++)
-+  slen = strlen (string + *sindex) + *sindex;
-+  i = *sindex;
-+#if defined (HANDLE_MULTIBYTE)
-+  clen = strlen (charlist);
-+#endif
-+  while ((c = string[i]))
-     {
-+#if defined (HANDLE_MULTIBYTE)
-+      size_t mblength;
-+#endif
-+
-       if (c == CTLESC)
- 	{
--	  i++;
-+	  i += 2;
- 	  continue;
- 	}
- 
-+#if defined (HANDLE_MULTIBYTE)
-+      mblength = mblen (string + i, slen - i);
-+      if (mblength > 1)
-+	{
-+	  wchar_t wc;
-+	  size_t mblength = mbtowc (&wc, string + i, slen - i);
-+	  if (MB_INVALIDCH (mblength))
-+	    {
-+	      if (MEMBER (c, charlist))
-+		break;
-+	    }
-+	  else
-+	    {
-+	      if (!wcharlist)
-+		{
-+		  size_t len = mbstowcs (wcharlist, charlist, 0);
-+		  if (len == -1)
-+		    len = 0;
-+		  wcharlist = xmalloc (sizeof (wchar_t) * (len + 1));
-+		  mbstowcs (wcharlist, charlist, 1 + len);
-+		}
-+
-+	      if (wcschr (wcharlist, wc))
-+		{
-+		  break;
-+		}
-+	    }
-+	}
-+      else
-+#endif
-+
-       if (MEMBER (c, charlist))
- 	break;
-+
-+      ADVANCE_CHAR (string, slen, i);
-     }
- 
-+#if defined (HANDLE_MULTIBYTE)
-+  if (wcharlist)
-+    free (wcharlist);
-+#endif
-+
-   temp = substring (string, *sindex, i);
-   *sindex = i;
- 
-@@ -1456,11 +1514,36 @@
-   d2 = 0;
-   if (delims)
-     {
--      d2 = (char *)xmalloc (strlen (delims) + 1);
--      for (i = ts = 0; delims[i]; i++)
-+      size_t slength = strlen (delims);
-+#if defined (HANDLE_MULTIBYTE)
-+      size_t mblength = 1;
-+      DECLARE_MBSTATE;
-+#endif
-+
-+      d2 = (char *)xmalloc (slength + 1);
-+      i = ts = 0;
-+      while (delims[i])
- 	{
-+#if defined (HANDLE_MULTIBYTE)
-+	  mbstate_t state_bak = state;
-+	  mblength = mbrlen (delims + i, slength, &state);
-+
-+	  if (MB_INVALIDCH (mblength))
-+	    state = state_bak;
-+	  else if (mblength != 1)
-+	    {
-+	      memcpy (d2 + ts, delims + i, mblength);
-+	      ts += mblength;
-+	      i += mblength;
-+	      slength -= mblength;
-+	      continue;
-+	    }
-+#endif
-+
- 	  if (whitespace(delims[i]) == 0)
- 	    d2[ts++] = delims[i];
-+	  i++;
-+	  slength--;
- 	}
-       d2[ts] = '\0';
-     }
-@@ -1654,10 +1737,19 @@
- string_list_dollar_star (list)
-      WORD_LIST *list;
- {
-+#if defined (HANDLE_MULTIBYTE)
-+  char sep[MB_CUR_MAX + 1];
-+#else
-   char sep[2];
-+#endif
- 
-+#if defined (HANDLE_MULTIBYTE)
-+  memcpy (sep, ifs_firstc, ifs_firstc_len);
-+  sep[ifs_firstc_len] = '\0';
-+#else
-   sep[0] = ifs_firstc;
-   sep[1] = '\0';
-+#endif
- 
-   return (string_list_internal (list, sep));
- }
-@@ -1676,14 +1768,41 @@
-      WORD_LIST *list;
-      int quoted;
- {
--  char *ifs, sep[2];
-+  char *ifs;
-+#if defined (HANDLE_MULTIBYTE)
-+  char sep[MB_CUR_MAX + 1];
-+#else
-+  char sep[2];
-+#endif
-   WORD_LIST *tlist;
- 
-   /* XXX this could just be ifs = ifs_value; */
-   ifs = ifs_var ? value_cell (ifs_var) : (char *)0;
- 
-+#if defined (HANDLE_MULTIBYTE)
-+  if (ifs && *ifs)
-+    {
-+      size_t mblength = mblen (ifs, strnlen (ifs, MB_CUR_MAX));
-+      if (MB_INVALIDCH (mblength))
-+	{
-+	  sep[0] = *ifs;
-+	  sep[1] = '\0';
-+	}
-+      else
-+	{
-+	  memcpy (sep, ifs, mblength);
-+	  sep[mblength] = '\0';
-+	}
-+    }
-+  else
-+    {
-+      sep[0] = ' ';
-+      sep[1] = '\0';
-+    }
-+#else
-   sep[0] = (ifs == 0 || *ifs == 0) ? ' ' : *ifs;
-   sep[1] = '\0';
-+#endif
- 
-   tlist = ((quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) || (ifs && *ifs == 0))
- 		? quote_list (list)
-@@ -1732,6 +1851,7 @@
-   WORD_DESC *t;
-   char *current_word, *s;
-   int sindex, sh_style_split, whitesep;
-+  size_t slen = 0;
- 
-   if (!string || !*string)
-     return ((WORD_LIST *)NULL);
-@@ -1805,7 +1925,12 @@
- 
-       /* Move past the current separator character. */
-       if (string[sindex])
--	sindex++;
-+	{
-+	  DECLARE_MBSTATE;
-+	  if (!slen)
-+	    slen = strlen (string);
-+	  ADVANCE_CHAR (string, slen, sindex);
-+	}
- 
-       /* Now skip sequences of space, tab, or newline characters if they are
- 	 in the list of separators. */
-@@ -6796,7 +6921,27 @@
-       ifs_cmap[uc] = 1;
-     }
- 
-+#if defined (HANDLE_MULTIBYTE)
-+  if (!ifs_value)
-+    {
-+      ifs_firstc[0] = '\0';
-+      ifs_firstc_len = 1;
-+    }
-+  else
-+    {
-+      size_t ifs_len = strnlen (ifs_value, MB_CUR_MAX);
-+      ifs_firstc_len = mblen (ifs_value, ifs_len);
-+      if (MB_INVALIDCH (ifs_firstc_len))
-+        {
-+          ifs_firstc[0] = '\0';
-+          ifs_firstc_len = 1;
-+        }
-+      else
-+        memcpy (ifs_firstc, ifs_value, ifs_firstc_len);
-+    }
-+#else
-   ifs_firstc = ifs_value ? *ifs_value : 0;
-+#endif
- }
- 
- char *
---- bash-3.0/subst.h.multibyteifs	2004-08-20 15:51:08.301074583 +0100
-+++ bash-3.0/subst.h	2004-08-20 15:51:39.070206473 +0100
-@@ -231,7 +231,12 @@
- extern SHELL_VAR *ifs_var;
- extern char *ifs_value;
- extern unsigned char ifs_cmap[];
-+#if defined (HANDLE_MULTIBYTE)
-+extern unsigned char ifs_firstc[];
-+extern size_t ifs_firstc_len;
-+#else
- extern unsigned char ifs_firstc;
-+#endif
- 
- /* Evaluates to 1 if C is a character in $IFS. */
- #define isifs(c)	(ifs_cmap[(unsigned char)(c)] != 0)
diff --git a/app-shells/bash/files/bash-3.0-pgrp-pipe-fix.patch b/app-shells/bash/files/bash-3.0-pgrp-pipe-fix.patch
deleted file mode 100644
index 46df6213b7a4..000000000000
--- a/app-shells/bash/files/bash-3.0-pgrp-pipe-fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Fix an error when using pipes and PGRP_PIPE is enabled.
-( exec 3>&1; : `echo >&3` )
-bash: 3: Bad file descriptor
-
-http://bugs.gentoo.org/92349
-
-Patch from upstream
-
-*** a/jobs.c
---- b/jobs.c
-***************
-*** 3456,3459 ****
---- 3901,3907 ----
-    stop_making_children ();
-    start_pipeline ();
-+ #if defined (PGRP_PIPE)
-+   pipe_close (pgrp_pipe);
-+ #endif
-    delete_all_jobs (0);
-    set_job_control (0);
diff --git a/app-shells/bash/files/bash-3.0-protos.patch b/app-shells/bash/files/bash-3.0-protos.patch
deleted file mode 100644
index b1337b203954..000000000000
--- a/app-shells/bash/files/bash-3.0-protos.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-move prototypes around so they show up when needed
-
---- a/externs.h
-+++ b/externs.h
-@@ -327,6 +327,9 @@
- #undef xstrchr
- extern char *xstrchr __P((const char *, int));
- 
-+/* declarations for functions defined in lib/sh/zcatfd.c */
-+extern int zcatfd __P((int, int, char *));
-+
- /* declarations for functions defined in lib/sh/zread.c */
- extern ssize_t zread __P((int, char *, size_t));
- extern ssize_t zreadintr __P((int, char *, size_t));
---- a/jobs.h
-+++ b/jobs.h
-@@ -175,6 +175,8 @@
- extern void ignore_tty_job_signals __P((void));
- extern void default_tty_job_signals __P((void));
- 
-+extern void close_pgrp_pipe __P((void));
-+
- #if defined (JOB_CONTROL)
- extern int job_control;
- #endif
---- a/general.c
-+++ b/general.c
-@@ -39,6 +39,8 @@
- #include "bashintl.h"
- 
- #include "shell.h"
-+#include "test.h"
-+
- #include <tilde/tilde.h>
- 
- #if !defined (errno)
---- a/builtins/evalfile.c
-+++ b/builtins/evalfile.c
-@@ -39,6 +39,7 @@
- #include "../flags.h"
- #include "../input.h"
- #include "../execute_cmd.h"
-+#include "../trap.h"
- 
- #if defined (HISTORY)
- #  include "../bashhist.h"
---- a/lib/glob/strmatch.c
-+++ b/lib/glob/strmatch.c
-@@ -25,9 +25,6 @@
- #include "strmatch.h"
- 
- extern int xstrmatch __P((char *, char *, int));
--#if defined (HAVE_MULTIBYTE)
--extern int internal_wstrmatch __P((wchar_t *, wchar_t *, int));
--#endif
- 
- int
- strmatch (pattern, string, flags)
---- a/lib/glob/strmatch.h
-+++ b/lib/glob/strmatch.h
-@@ -57,6 +57,7 @@
- 
- #if HANDLE_MULTIBYTE
- extern int wcsmatch __P((wchar_t *, wchar_t *, int));
-+extern int internal_wstrmatch __P((wchar_t *, wchar_t *, int));
- #endif
- 
- #endif /* _STRMATCH_H */
diff --git a/app-shells/bash/files/bash-3.0-pwd.patch b/app-shells/bash/files/bash-3.0-pwd.patch
deleted file mode 100644
index 77f0918fb4d8..000000000000
--- a/app-shells/bash/files/bash-3.0-pwd.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Ripped from Fedora
-
-* Tue Mar 15 2005 Tim Waugh <twaugh@redhat.com> 3.0-30
-- Fix PS1 expansion crash when PWD is unset (bg #151116).
-
---- bash-3.0/parse.y.pwd	2005-03-15 14:22:36.000000000 +0000
-+++ bash-3.0/parse.y	2005-03-15 14:22:37.000000000 +0000
-@@ -4103,7 +4103,7 @@
- #define ROOT_PATH(x)	((x)[0] == '/' && (x)[1] == 0)
- #define DOUBLE_SLASH_ROOT(x)	((x)[0] == '/' && (x)[1] == '/' && (x)[2] == 0)
- 		/* Abbreviate \W as ~ if $PWD == $HOME */
--		if (c == 'W' && (((t = get_string_value ("HOME")) == 0) || STREQ (t, temp) == 0))
-+		if (c == 'W' && (((t = get_string_value ("HOME")) == 0) || STREQ (t, t_string) == 0))
- 		  {
- 		    if (ROOT_PATH (t_string) == 0 && DOUBLE_SLASH_ROOT (t_string) == 0)
- 		      {
diff --git a/app-shells/bash/files/bash-3.0-rbash.patch b/app-shells/bash/files/bash-3.0-rbash.patch
deleted file mode 100644
index e804d20f06a9..000000000000
--- a/app-shells/bash/files/bash-3.0-rbash.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Fix broken rbash functionality when used as a login shell via /etc/passwd
-
-http://bugs.gentoo.org/26854
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=170298
-
-Backported from bash-3.1
-
---- bash-3.0/shell.c
-+++ bash-3.0/shell.c
-@@ -1089,6 +1099,8 @@
-   if (restricted)
-     return 1;
-   temp = base_pathname (name);
-+  if (*temp == '-')
-+    temp++;
-   return (STREQ (temp, RESTRICTED_SHELL_NAME));
- }
- 
diff --git a/app-shells/bash/files/bash-3.0-read-builtin-pipe.patch b/app-shells/bash/files/bash-3.0-read-builtin-pipe.patch
deleted file mode 100644
index 0b90cc3dc2b2..000000000000
--- a/app-shells/bash/files/bash-3.0-read-builtin-pipe.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description:
-When using 'read -u 3' or the like, and the pipe-buf already contains
-more than one line, the first line is returned, and bytes up to the next
-multiple of 128 are skipped.
-
-http://lists.gnu.org/archive/html/bug-bash/2005-03/msg00168.html
-http://lists.gnu.org/archive/html/bug-bash/2005-03/msg00173.html
-http://bugs.gentoo.org/show_bug.cgi?id=87093
-
---- a/builtins/read.def
-+++ b/builtins/read.def
-@@ -276,7 +276,7 @@
-   input_is_tty = isatty (fd);
-   if (input_is_tty == 0)
- #ifndef __CYGWIN__
--    input_is_pipe = (lseek (0, 0L, SEEK_CUR) < 0) && (errno == ESPIPE);
-+    input_is_pipe = (lseek (fd, 0L, SEEK_CUR) < 0) && (errno == ESPIPE);
- #else
-     input_is_pipe = 1;
- #endif
diff --git a/app-shells/bash/files/bash-3.0-read-memleak.patch b/app-shells/bash/files/bash-3.0-read-memleak.patch
deleted file mode 100644
index 6cb769f3af34..000000000000
--- a/app-shells/bash/files/bash-3.0-read-memleak.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Ripped from Fedora
-
-http://lists.gnu.org/archive/html/bug-bash/2005-12/msg00013.html
-https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=173283
-
---- bash-3.0/builtins/read.def
-+++ bash-3.0/builtins/read.def
-@@ -461,6 +461,7 @@
-   if (retval < 0)
-     {
-       builtin_error (_("read error: %d: %s"), fd, strerror (errno));
-+      run_unwind_frame ("read_builtin");
-       return (EXECUTION_FAILURE);
-     }
- #endif
diff --git a/app-shells/bash/files/bash-3.0-strnlen.patch b/app-shells/bash/files/bash-3.0-strnlen.patch
deleted file mode 100644
index 056e00b3de57..000000000000
--- a/app-shells/bash/files/bash-3.0-strnlen.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-Add strnlen function for non-glibc systems, as one of Fedora's patches requires it.
-
---- bash-3.0/configure.in
-+++ bash-3.0/configure.in
-@@ -613,6 +613,9 @@
-   AC_LIBOBJ(vprint)
- fi
- 
-+AC_CHECK_FUNCS([strnlen])
-+AC_LIBOBJ(strnlen)
-+
- dnl signal stuff
- AC_TYPE_SIGNAL
- 
---- /dev/null
-+++ bash-3.0/lib/sh/strnlen.c
-@@ -0,0 +1,27 @@
-+/*
-+  Copyright (C) 2005 Gentoo Foundation
-+
-+  This program is free software; you can redistribute it and/or
-+  modify it under the terms of the GNU General Public License
-+  as published by the Free Software Foundation; either version 2
-+  of the License, or (at your option) any later version.
-+
-+  This program is distributed in the hope that it will be useful,
-+  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+  GNU General Public License for more details.
-+
-+  You should have received a copy of the GNU General Public License
-+  along with this program; if not, write to the Free Software
-+  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, US
-+*/
-+
-+#include <stdlib.h>
-+
-+size_t strnlen(const char *s, size_t n)
-+{
-+        int i;
-+        for (i=0; s[i] && i<n; i++)
-+                /* noop */ ;
-+        return i;
-+}
---- bash-3.0/configure
-+++ bash-3.0/configure
-@@ -10696,9 +10696,127 @@ _ACEOF
- fi
- 
- if test "$ac_cv_func_vprintf" = no && test "$ac_cv_func__doprnt" = "yes"; then
--  LIBOBJS="$LIBOBJS vprint.$ac_objext"
-+  case $LIBOBJS in
-+    "vprint.$ac_objext"   | \
-+  *" vprint.$ac_objext"   | \
-+    "vprint.$ac_objext "* | \
-+  *" vprint.$ac_objext "* ) ;;
-+  *) LIBOBJS="$LIBOBJS vprint.$ac_objext" ;;
-+esac
-+
- fi
- 
-+
-+for ac_func in strnlen
-+do
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_var+set}\" = set"; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef $ac_func
-+
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+#ifdef __cplusplus
-+extern "C"
-+{
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+   builtin and then its argument prototype would still apply.  */
-+char $ac_func ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+choke me
-+#else
-+char (*f) () = $ac_func;
-+#endif
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+int
-+main ()
-+{
-+return f != $ac_func;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  eval "$as_ac_var=yes"
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "$as_ac_var=no"
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+done
-+
-+case $LIBOBJS in
-+    "strnlen.$ac_objext"   | \
-+  *" strnlen.$ac_objext"   | \
-+    "strnlen.$ac_objext "* | \
-+  *" strnlen.$ac_objext "* ) ;;
-+  *) LIBOBJS="$LIBOBJS strnlen.$ac_objext" ;;
-+esac
-+
-+
- echo "$as_me:$LINENO: checking return type of signal handlers" >&5
- echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
- if test "${ac_cv_type_signal+set}" = set; then
diff --git a/app-shells/bash/files/bash-3.0-subshell.patch b/app-shells/bash/files/bash-3.0-subshell.patch
deleted file mode 100644
index a1d7dfe7d342..000000000000
--- a/app-shells/bash/files/bash-3.0-subshell.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Ripped from Fedora which took this from upstream
-
-* Tue Nov 22 2005 Tim Waugh <twaugh@redhat.com>  3.0-37
-- Applied patch from upstream to fix parsing problem (bug #146638).
-
-http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=146638
-
---- bash-3.0/parse.y.subshell	2005-11-22 13:19:11.000000000 +0000
-+++ bash-3.0/parse.y	2005-11-22 13:19:24.000000000 +0000
-@@ -2055,14 +2055,6 @@
-   if (uc)
-     shell_input_line_index++;
- 
--  if MBTEST(uc == '\\' && remove_quoted_newline && shell_input_line[shell_input_line_index] == '\n')
--    {
--	if (SHOULD_PROMPT ())
--	  prompt_again ();
--	line_number++;
--	goto restart_read;
--    }
--
- #if defined (ALIAS) || defined (DPAREN_ARITHMETIC)
-   /* If UC is NULL, we have reached the end of the current input string.  If
-      pushed_string_list is non-empty, it's time to pop to the previous string
-@@ -2078,6 +2070,14 @@
-     }
- #endif /* ALIAS || DPAREN_ARITHMETIC */
- 
-+  if MBTEST(uc == '\\' && remove_quoted_newline && shell_input_line[shell_input_line_index] == '\n')
-+    {
-+	if (SHOULD_PROMPT ())
-+	  prompt_again ();
-+	line_number++;
-+	goto restart_read;
-+    }
-+
-   if (!uc && shell_input_line_terminator == EOF)
-     return ((shell_input_line_index != 0) ? '\n' : EOF);
- 
diff --git a/app-shells/bash/files/bash-3.0-trap-fg-signals.patch b/app-shells/bash/files/bash-3.0-trap-fg-signals.patch
deleted file mode 100644
index c7010511853f..000000000000
--- a/app-shells/bash/files/bash-3.0-trap-fg-signals.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Don't barf on handled signals inside of scripts.  Makes for nicer output.
-
-patch by Martin Schlemmer <azarah@gentoo.org>
-
---- a/jobs.c
-+++ b/jobs.c
-@@ -2893,11 +2893,11 @@
- 		}
- 	      else if (IS_FOREGROUND (job))
- 		{
--#if !defined (DONT_REPORT_SIGPIPE)
--		  if (termsig && WIFSIGNALED (s) && termsig != SIGINT)
--#else
--		  if (termsig && WIFSIGNALED (s) && termsig != SIGINT && termsig != SIGPIPE)
--#endif
-+		  if (termsig && WIFSIGNALED (s) && termsig != SIGINT &&
-+#if defined (DONT_REPORT_SIGPIPE)
-+		  termsig != SIGPIPE &&
-+#endif
-+		  signal_is_trapped (termsig) == 0)
- 		    {
- 		      fprintf (stderr, "%s", j_strsignal (termsig));
- 
diff --git a/app-shells/bash/files/bash-3.0-ulimit.patch b/app-shells/bash/files/bash-3.0-ulimit.patch
deleted file mode 100644
index 8202b95d2769..000000000000
--- a/app-shells/bash/files/bash-3.0-ulimit.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-Ripped from Fedora
-
---- bash-3.0/builtins/ulimit.def
-+++ bash-3.0/builtins/ulimit.def
-@@ -34,15 +34,20 @@
-     -a	all current limits are reported
-     -c	the maximum size of core files created
-     -d	the maximum size of a process's data segment
-+    -e	the maximum scheduling priority (`nice')
-     -f	the maximum size of files created by the shell
-+    -i	the maximum number of pending signals
-     -l	the maximum size a process may lock into memory
-     -m	the maximum resident set size
-     -n	the maximum number of open file descriptors
-     -p	the pipe buffer size
-+    -q	the maximum number of bytes in POSIX message queues
-+    -r	the maximum rt priority
-     -s	the maximum stack size
-     -t	the maximum amount of cpu time in seconds
-     -u	the maximum number of user processes
-     -v	the size of virtual memory 
-+    -x	the maximum number of file locks
- 
- If LIMIT is given, it is the new value of the specified resource;
- the special LIMIT values `soft', `hard', and `unlimited' stand for
-@@ -199,7 +204,13 @@
- #ifdef RLIMIT_DATA
-   { 'd',	RLIMIT_DATA,  1024,	"data seg size",	"kbytes" },
- #endif
-+#ifdef RLIMIT_NICE
-+  { 'e',	RLIMIT_NICE, 1,		"max nice",		(char *)NULL},
-+#endif /* RLIMIT_NICE */
-   { 'f',	RLIMIT_FILESIZE, 1024,	"file size",		"blocks" },
-+#ifdef RLIMIT_SIGPENDING
-+  { 'i',	RLIMIT_SIGPENDING, 1,	"pending signals",	(char *)NULL},
-+#endif
- #ifdef RLIMIT_MEMLOCK
-   { 'l',	RLIMIT_MEMLOCK, 1024,	"max locked memory",	"kbytes" },
- #endif
-@@ -208,6 +219,12 @@
- #endif /* RLIMIT_RSS */
-   { 'n',	RLIMIT_OPENFILES, 1,	"open files",		(char *)NULL},
-   { 'p',	RLIMIT_PIPESIZE, 512,	"pipe size", 		"512 bytes" },
-+#ifdef RLIMIT_MSGQUEUE
-+  { 'q',	RLIMIT_MSGQUEUE, 1,	"POSIX message queues",	"bytes" },
-+#endif
-+#ifdef RLIMIT_RTPRIO
-+  { 'r',	RLIMIT_RTPRIO, 1,	"max rt priority",	(char *)NULL},
-+#endif /* RLIMIT_RTPRIO */
- #ifdef RLIMIT_STACK
-   { 's',	RLIMIT_STACK, 1024,	"stack size",		"kbytes" },
- #endif
-@@ -221,6 +238,9 @@
- #ifdef RLIMIT_SWAP
-   { 'w',	RLIMIT_SWAP,	1024,	"swap size",		"kbytes" },
- #endif
-+#ifdef RLIMIT_LOCKS
-+  { 'x',	RLIMIT_LOCKS, 1,	"file locks",		(char *)NULL},
-+#endif
-   { -1, -1, -1, (char *)NULL, (char *)NULL }
- };
- #define NCMDS	(sizeof(limits) / sizeof(limits[0]))
-@@ -647,11 +667,11 @@
- 
-   for (i = 0; limits[i].option > 0; i++)
-     {
--      if (get_limit (i, &softlim, &hardlim) < 0)
-+      if (get_limit (i, &softlim, &hardlim) == 0)
-+	printone (i, (mode & LIMIT_SOFT) ? softlim : hardlim, 1);
-+      else if (errno != EINVAL)
- 	builtin_error ("%s: cannot get limit: %s", limits[i].description,
- 						   strerror (errno));
--      else
--	printone (i, (mode & LIMIT_SOFT) ? softlim : hardlim, 1);
-     }
- }
- 
-@@ -670,7 +690,7 @@
-       else
-         sprintf (unitstr, "(-%c) ", limits[limind].option);
- 
--      printf ("%-18s %16s", limits[limind].description, unitstr);
-+      printf ("%-20s %16s", limits[limind].description, unitstr);
-     }
-   if (curlim == RLIM_INFINITY)
-     puts ("unlimited");
---- bash-3.0/doc/bashref.texi
-+++ bash-3.0/doc/bashref.texi
-@@ -3793,7 +3793,7 @@
- @item ulimit
- @btindex ulimit
- @example
--ulimit [-acdflmnpstuvSH] [@var{limit}]
-+ulimit [-acdeflmnpqrstuvxSH] [@var{limit}]
- @end example
- @code{ulimit} provides control over the resources available to processes
- started by the shell, on systems that allow such control.  If an
-@@ -3814,9 +3814,15 @@
- @item -d
- The maximum size of a process's data segment.
- 
-+@item -e
-+The maximum scheduling priority.
-+
- @item -f
- The maximum size of files created by the shell.
- 
-+@item -i
-+The maximum number of pending signals.
-+
- @item -l
- The maximum size that may be locked into memory.
- 
-@@ -3829,6 +3835,12 @@
- @item -p
- The pipe buffer size.
- 
-+@item -q
-+The maximum number of bytes in POSIX message queues.
-+
-+@item -r
-+The maximum RT priority.
-+
- @item -s
- The maximum stack size.
- 
-@@ -3841,6 +3853,9 @@
- @item -v
- The maximum amount of virtual memory available to the process.
- 
-+@item -x
-+The maximum amount of file locks.
-+
- @end table
- 
- If @var{limit} is given, it is the new value of the specified resource;
---- bash-3.0/doc/bash.1
-+++ bash-3.0/doc/bash.1
-@@ -8362,7 +8362,7 @@
- returns true if any of the arguments are found, false if
- none are found.
- .TP
--\fBulimit\fP [\fB\-SHacdflmnpstuv\fP [\fIlimit\fP]]
-+\fBulimit\fP [\fB\-SHacdefilmnpqrstuvx\fP [\fIlimit\fP]]
- Provides control over the resources available to the shell and to
- processes started by it, on systems that allow such control.
- The \fB\-H\fP and \fB\-S\fP options specify that the hard or soft limit is
-@@ -8398,9 +8398,15 @@
- .B \-d
- The maximum size of a process's data segment
- .TP
-+.B \-e
-+The maximum scheduling priority (`nice')
-+.TP
- .B \-f
- The maximum size of files created by the shell
- .TP
-+.B \-i
-+The maximum number of pending signals
-+.TP
- .B \-l
- The maximum size that may be locked into memory
- .TP
-@@ -8414,6 +8420,12 @@
- .B \-p
- The pipe size in 512-byte blocks (this may not be set)
- .TP
-+.B \-q
-+The maximum number of bytes in POSIX message queues
-+.TP
-+.B \-r
-+The maximum rt priority
-+.TP
- .B \-s
- The maximum stack size
- .TP
-@@ -8425,6 +8437,9 @@
- .TP
- .B \-v
- The maximum amount of virtual memory available to the shell
-+.TP
-+.B \-x
-+The maximum number of file locks
- .PD
- .PP
- If
diff --git a/app-shells/bash/files/bash-3.0-volatile-command.patch b/app-shells/bash/files/bash-3.0-volatile-command.patch
deleted file mode 100644
index 87b9f25ffc21..000000000000
--- a/app-shells/bash/files/bash-3.0-volatile-command.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Ripped from Debian
-
-# DP: current_command must be declared volatile to prevent assignments from
-#     being optimized away as dead code.  In reality, the use of setjmp/longjmp
-#     makes it not dead code at all.
-
---- a/eval.c
-+++ b/eval.c
-@@ -63,7 +63,7 @@
- reader_loop ()
- {
-   int our_indirection_level;
--  COMMAND *current_command = (COMMAND *)NULL;
-+  COMMAND * volatile current_command = (COMMAND *)NULL;
- 
-   USE_VAR(current_command);
diff --git a/app-shells/bash/files/bash-3.1-dev-fd-buffer-overflow.patch b/app-shells/bash/files/bash-3.1-dev-fd-buffer-overflow.patch
deleted file mode 100644
index 9d08856e5b00..000000000000
--- a/app-shells/bash/files/bash-3.1-dev-fd-buffer-overflow.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-https://bugs.gentoo.org/431850
-
-this is a backport of the upstream bash42-033 patch for bash 3.1/3.0/2.05
-
---- a/test.c
-+++ b/test.c
-@@ -194,7 +194,8 @@
-      trailing slash.  Make sure /dev/fd/xx really uses DEV_FD_PREFIX/xx.
-      On most systems, with the notable exception of linux, this is
-      effectively a no-op. */
--      char pbuf[32];
-+      static char *pbuf = 0;
-+      pbuf = xrealloc (pbuf, sizeof (DEV_FD_PREFIX) + strlen (path + 8));
-       strcpy (pbuf, DEV_FD_PREFIX);
-       strcat (pbuf, path + 8);
-       return (stat (pbuf, finfo));
diff --git a/app-shells/bash/files/bash-3.1-dev-fd-test-as-user.patch b/app-shells/bash/files/bash-3.1-dev-fd-test-as-user.patch
deleted file mode 100644
index 80a4b0a1a034..000000000000
--- a/app-shells/bash/files/bash-3.1-dev-fd-test-as-user.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Fix the /dev/fd test when running as a non root user
-after logging in as a root user #131875
-
---- bash-3.1/configure
-+++ bash-3.1/configure
-@@ -23098,7 +23098,7 @@
-   if test -d /dev/fd  && test -r /dev/fd/0 < /dev/null; then
- # check for systems like FreeBSD 5 that only provide /dev/fd/[012]
-    exec 3<&0
--   if test -r /dev/fd/3; then
-+   if test -e /dev/fd/3; then
-      bash_cv_dev_fd=standard
-    else
-      bash_cv_dev_fd=absent
diff --git a/app-shells/bash/files/bash-3.1-fix-dash-login-shell.patch b/app-shells/bash/files/bash-3.1-fix-dash-login-shell.patch
deleted file mode 100644
index 3ca7518fbb50..000000000000
--- a/app-shells/bash/files/bash-3.1-fix-dash-login-shell.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-http://lists.gnu.org/archive/html/bug-bash/2006-01/msg00054.html
-http://bugs.gentoo.org/118257
-
-Date: Fri, 13 Jan 2006 17:11:10 +0000
-From: Tim Waugh <twaugh@redhat.com>
-To: bug-bash@gnu.org
-Subject: [patch] fix 'exec -l /bin/bash'
-
-Configuration Information [Automatically generated, do not change]:
-Machine: i386
-OS: linux-gnu
-Compiler: i386-redhat-linux-gcc
-Compilation CFLAGS:  -DPROGRAM='bash' -DCONF_HOSTTYPE='i386' -DCONF_OSTYPE='linux-gnu' -DCONF_MACHTYPE='i386-redhat-linux-gnu' -DCONF_VENDOR='redhat' -DLOCALEDIR='/usr/share/locale' -DPACKAGE='bash' -DSHELL -DHAVE_CONFIG_H   -I.  -I. -I./include -I./lib  -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m32 -march=i386 -mtune=pentium4 -fasynchronous-unwind-tables
-uname output: Linux gene.surrey.redhat.com 2.6.13-1.1597_FC5 #1 Thu Oct 6 02:13:06 EDT 2005 i686 i686 i386 GNU/Linux
-Machine Type: i386-redhat-linux-gnu
-
-Bash Version: 3.1
-Patch Level: 1
-Release Status: release
-
-Description:
-	If bash has argv[0] as '-/bin/bash' it does not become a login
-	shell.
-
-Repeat-By:
-	exec -l /bin/bash
-	shopt
-
-Fix:
-
---- bash-3.1/shell.c.login	2006-01-13 16:52:14.000000000 +0000
-+++ bash-3.1/shell.c	2006-01-13 16:52:15.000000000 +0000
-@@ -1543,9 +1543,10 @@
-      any startup files; just try to be more like /bin/sh. */
-   shell_name = argv0 ? base_pathname (argv0) : PROGRAM;
- 
--  if (*shell_name == '-')
-+  if (argv0 && *argv0 == '-')
-     {
--      shell_name++;
-+      if (*shell_name == '-')
-+        shell_name++;
-       login_shell++;
-     }
- 
-
-
-_______________________________________________
-Bug-bash mailing list
-Bug-bash@gnu.org
-http://lists.gnu.org/mailman/listinfo/bug-bash
-
diff --git a/app-shells/bash/files/bash-3.1-protos.patch b/app-shells/bash/files/bash-3.1-protos.patch
deleted file mode 100644
index 32ae8cfe91a3..000000000000
--- a/app-shells/bash/files/bash-3.1-protos.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-move prototypes around so they show up when needed
-
---- a/jobs.h
-+++ b/jobs.h
-@@ -182,6 +182,7 @@
- 
- extern int count_all_jobs __P((void));
- 
-+extern void close_pgrp_pipe __P((void));
- extern void terminate_current_pipeline __P((void));
- extern void terminate_stopped_jobs __P((void));
- extern void hangup_all_jobs __P((void));
---- a/lib/glob/strmatch.c
-+++ b/lib/glob/strmatch.c
-@@ -25,9 +25,6 @@
- #include "strmatch.h"
- 
- extern int xstrmatch __P((char *, char *, int));
--#if defined (HAVE_MULTIBYTE)
--extern int internal_wstrmatch __P((wchar_t *, wchar_t *, int));
--#endif
- 
- int
- strmatch (pattern, string, flags)
---- a/lib/glob/strmatch.h
-+++ b/lib/glob/strmatch.h
-@@ -57,6 +57,7 @@
- 
- #if HANDLE_MULTIBYTE
- extern int wcsmatch __P((wchar_t *, wchar_t *, int));
-+extern int internal_wstrmatch __P((wchar_t *, wchar_t *, int));
- #endif
- 
- #endif /* _STRMATCH_H */
---- a/builtins/echo.def
-+++ b/builtins/echo.def
-@@ -31,6 +31,8 @@
- #include <stdio.h>
- #include "../shell.h"
- 
-+#include "common.h"
-+
- $BUILTIN echo
- $FUNCTION echo_builtin
- $DEPENDS_ON V9_ECHO
---- a/lib/sh/winsize.c
-+++ b/lib/sh/winsize.c
-@@ -55,6 +55,7 @@
- #if defined (READLINE)
- extern void rl_set_screen_size __P((int, int));
- #endif
-+extern void sh_set_lines_and_columns __P((int, int));
- 
- void
- get_new_window_size (from_sig, rp, cp)
---- a/support/bashversion.c
-+++ b/support/bashversion.c
-@@ -47,6 +47,9 @@
- extern char *dist_version;
- extern int patch_level;
- 
-+extern char *shell_version_string __P((void));
-+extern void show_shell_version __P((int));
-+
- char *shell_name = "bash";
- char *progname;
- 
diff --git a/app-shells/bash/files/bash-3.1-ulimit.patch b/app-shells/bash/files/bash-3.1-ulimit.patch
deleted file mode 100644
index 8c2474825cf1..000000000000
--- a/app-shells/bash/files/bash-3.1-ulimit.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-Ripped from Fedora
-
-Add support for RLIMIT_NICE/RLIMIT_RTPRIO and add missing documentation
-for many other options
-
---- a/builtins/ulimit.def
-+++ b/builtins/ulimit.def
-@@ -24,7 +24,7 @@
- $BUILTIN ulimit
- $FUNCTION ulimit_builtin
- $DEPENDS_ON !_MINIX
--$SHORT_DOC ulimit [-SHacdfilmnpqstuvx] [limit]
-+$SHORT_DOC ulimit [-SHacdefilmnpqrstuvx] [limit]
- Ulimit provides control over the resources available to processes
- started by the shell, on systems that allow such control.  If an
- option is given, it is interpreted as follows:
-@@ -34,18 +34,20 @@
-     -a	all current limits are reported
-     -c	the maximum size of core files created
-     -d	the maximum size of a process's data segment
-+    -e	the maximum scheduling priority (`nice')
-     -f	the maximum size of files created by the shell
--    -i  the maximum number of pending signals
-+    -i	the maximum number of pending signals
-     -l	the maximum size a process may lock into memory
-     -m	the maximum resident set size
-     -n	the maximum number of open file descriptors
-     -p	the pipe buffer size
--    -q  the maximum number of bytes in POSIX message queues
-+    -q	the maximum number of bytes in POSIX message queues
-+    -r	the maximum rt priority
-     -s	the maximum stack size
-     -t	the maximum amount of cpu time in seconds
-     -u	the maximum number of user processes
-     -v	the size of virtual memory
--    -x  the maximum number of file locks
-+    -x	the maximum number of file locks
- 
- If LIMIT is given, it is the new value of the specified resource;
- the special LIMIT values `soft', `hard', and `unlimited' stand for
-@@ -202,6 +204,9 @@
- #ifdef RLIMIT_DATA
-   { 'd',	RLIMIT_DATA,  1024,	"data seg size",	"kbytes" },
- #endif
-+#ifdef RLIMIT_NICE
-+  { 'e',	RLIMIT_NICE,  1,	"max nice",	(char *)NULL},
-+#endif
-   { 'f',	RLIMIT_FILESIZE, 1024,	"file size",		"blocks" },
- #ifdef RLIMIT_SIGPENDING
-   { 'i',	RLIMIT_SIGPENDING, 1,	"pending signals",	(char *)NULL },
-@@ -217,6 +222,9 @@
- #ifdef RLIMIT_MSGQUEUE
-   { 'q',	RLIMIT_MSGQUEUE, 1,	"POSIX message queues",	"bytes" },
- #endif
-+#ifdef RLIMIT_RTPRIO
-+  { 'r',	RLIMIT_RTPRIO, 1,	"max rt priority",	(char *)NULL},
-+#endif
- #ifdef RLIMIT_STACK
-   { 's',	RLIMIT_STACK, 1024,	"stack size",		"kbytes" },
- #endif
---- a/doc/bashref.texi
-+++ b/doc/bashref.texi
-@@ -3833,7 +3833,7 @@
- @item ulimit
- @btindex ulimit
- @example
--ulimit [-acdfilmnpqstuvxSH] [@var{limit}]
-+ulimit [-acdefilmnpqrstuvxSH] [@var{limit}]
- @end example
- @code{ulimit} provides control over the resources available to processes
- started by the shell, on systems that allow such control.  If an
-@@ -3854,6 +3854,9 @@
- @item -d
- The maximum size of a process's data segment.
- 
-+@item -e
-+The maximum scheduling priority.
-+
- @item -f
- The maximum size of files created by the shell.
- 
-@@ -3875,6 +3878,9 @@
- @item -q
- The maximum number of bytes in POSIX message queues.
- 
-+@item -r
-+The maximum RT priority.
-+
- @item -s
- The maximum stack size.
- 
---- a/doc/bash.1
-+++ b/doc/bash.1
-@@ -8490,7 +8490,7 @@
- returns true if any of the arguments are found, false if
- none are found.
- .TP
--\fBulimit\fP [\fB\-SHacdfilmnpqstuvx\fP [\fIlimit\fP]]
-+\fBulimit\fP [\fB\-SHacdefilmnpqrstuvx\fP [\fIlimit\fP]]
- Provides control over the resources available to the shell and to
- processes started by it, on systems that allow such control.
- The \fB\-H\fP and \fB\-S\fP options specify that the hard or soft limit is
-@@ -8526,6 +8526,9 @@
- .B \-d
- The maximum size of a process's data segment
- .TP
-+.B \-e
-+The maximum scheduling priority (`nice')
-+.TP
- .B \-f
- The maximum size of files created by the shell
- .TP
-@@ -8548,6 +8551,9 @@
- .B \-q
- The maximum number of bytes in POSIX message queues
- .TP
-+.B \-r
-+The maximum rt priority
-+.TP
- .B \-s
- The maximum stack size
- .TP
diff --git a/app-shells/bash/files/bash-3.2-dev-fd-test-as-user.patch b/app-shells/bash/files/bash-3.2-dev-fd-test-as-user.patch
deleted file mode 100644
index 8aca7767161d..000000000000
--- a/app-shells/bash/files/bash-3.2-dev-fd-test-as-user.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur bash-3.2.orig/aclocal.m4 bash-3.2/aclocal.m4
---- bash-3.2.orig/aclocal.m4    2006-12-30 20:00:31 +0000
-+++ bash-3.2/aclocal.m4 2006-12-30 20:02:02 +0000
-@@ -1544,7 +1544,8 @@
- if test -d /dev/fd  && test -r /dev/fd/0 < /dev/null; then
- # check for systems like FreeBSD 5 that only provide /dev/fd/[012]
-    exec 3</dev/null
--   if test -r /dev/fd/3; then
-+   # bash test builtin always works here, so we use the test binary
-+   if `which test || echo test` -e /dev/fd/3; then
-      bash_cv_dev_fd=standard
-    else
-      bash_cv_dev_fd=absent
-diff -ur bash-3.2.orig/configure bash-3.2/configure
---- bash-3.2.orig/configure     2006-12-30 20:03:24 +0000
-+++ bash-3.2/configure  2006-12-30 20:01:50 +0000
-@@ -27179,7 +27179,8 @@
- if test -d /dev/fd  && test -r /dev/fd/0 < /dev/null; then
- # check for systems like FreeBSD 5 that only provide /dev/fd/[012]
-    exec 3</dev/null
--   if test -r /dev/fd/3; then
-+   # bash test builtin always works here, so we use the test binary
-+   if `which test || echo test` -e /dev/fd/3; then
-      bash_cv_dev_fd=standard
-    else
-      bash_cv_dev_fd=absent
diff --git a/app-shells/bash/files/bash-3.2-ldflags-for-build.patch b/app-shells/bash/files/bash-3.2-ldflags-for-build.patch
deleted file mode 100644
index 2dc1dd6ef790..000000000000
--- a/app-shells/bash/files/bash-3.2-ldflags-for-build.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-http://bugs.gentoo.org/211947
-
-fix from Takashi YOSHII: dont use target ldflags for build apps
-
---- bash/builtins/Makefile.in
-+++ bash/builtins/Makefile.in
-@@ -63,7 +63,7 @@
- 
- LIBS = @LIBS@
- LDFLAGS = @LDFLAGS@ $(LOCAL_LDFLAGS) $(CFLAGS)
--LDFLAGS_FOR_BUILD = $(LDFLAGS)
-+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@ $(LOCAL_LDFLAGS) $(CFLAGS_FOR_BUILD)
- LOCAL_LDFLAGS = @LOCAL_LDFLAGS@
- #LIBS_FOR_BUILD = @LIBS_FOR_BUILD@
- LIBS_FOR_BUILD = $(LIBS)
---- bash/support/Makefile.in
-+++ bash/support/Makefile.in
-@@ -58,7 +58,7 @@
- 
- LOCAL_LDFLAGS = @LOCAL_LDFLAGS@
- LDFLAGS = @LDFLAGS@ $(LOCAL_LDFLAGS) $(CFLAGS)
--LDFLAGS_FOR_BUILD = $(LDFLAGS)
-+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@ $(LOCAL_LDFLAGS) $(CFLAGS_FOR_BUILD)
- 
- INCLUDES = -I${BUILD_DIR} -I${topdir}
- 
---- bash/Makefile.in
-+++ bash/Makefile.in
-@@ -143,7 +143,7 @@
- CCFLAGS_FOR_BUILD = $(BASE_CCFLAGS) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD)
- 
- LDFLAGS = @LDFLAGS@ $(STATIC_LD) $(LOCAL_LDFLAGS) $(PROFILE_FLAGS) $(CFLAGS)
--LDFLAGS_FOR_BUILD = $(LDFLAGS)
-+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@ $(LOCAL_LDFLAGS) $(CFLAGS_FOR_BUILD)
- 
- INCLUDES = -I. @RL_INCLUDE@ -I$(srcdir) -I$(BASHINCDIR) -I$(LIBSRC) $(INTL_INC)
- 
diff --git a/app-shells/bash/files/bash-3.2-loadables.patch b/app-shells/bash/files/bash-3.2-loadables.patch
deleted file mode 100644
index cd0e1e1a8e9e..000000000000
--- a/app-shells/bash/files/bash-3.2-loadables.patch
+++ /dev/null
@@ -1,239 +0,0 @@
---- bash-3.2/examples/loadables/basename.c
-+++ bash-3.2/examples/loadables/basename.c
-@@ -11,6 +11,7 @@
- #include <stdio.h>
- #include "builtins.h"
- #include "shell.h"
-+#include "common.h"
- 
- basename_builtin (list)
-      WORD_LIST *list;
---- bash-3.2/examples/loadables/cut.c
-+++ bash-3.2/examples/loadables/cut.c
-@@ -63,6 +63,7 @@
- #include "builtins.h"
- #include "shell.h"
- #include "bashgetopt.h"
-+#include "common.h"
- 
- #if !defined (errno)
- extern int	errno;
---- bash-3.2/examples/loadables/dirname.c
-+++ bash-3.2/examples/loadables/dirname.c
-@@ -11,6 +11,7 @@
- #include <stdio.h>
- #include "builtins.h"
- #include "shell.h"
-+#include "common.h"
- 
- dirname_builtin (list)
-      WORD_LIST *list;
---- bash-3.2/examples/loadables/finfo.c
-+++ bash-3.2/examples/loadables/finfo.c
-@@ -12,6 +12,7 @@
- #include <pwd.h>
- #include <grp.h>
- #include <errno.h>
-+#include <time.h>
- 
- #include "bashansi.h"
- #include "shell.h"
---- bash-3.2/examples/loadables/head.c
-+++ bash-3.2/examples/loadables/head.c
-@@ -21,6 +21,7 @@
- #include "builtins.h"
- #include "shell.h"
- #include "bashgetopt.h"
-+#include "common.h"
- 
- #if !defined (errno)
- extern int errno;
---- bash-3.2/examples/loadables/ln.c
-+++ bash-3.2/examples/loadables/ln.c
-@@ -18,6 +18,7 @@
- #include "builtins.h"
- #include "shell.h"
- #include "bashgetopt.h"
-+#include "common.h"
- 
- #if !defined (errno)
- extern int errno;
---- bash-3.2/examples/loadables/logname.c
-+++ bash-3.2/examples/loadables/logname.c
-@@ -11,6 +11,7 @@
- 
- #include "builtins.h"
- #include "shell.h"
-+#include "common.h"
- 
- #if !defined (errno)
- extern int errno;
---- bash-3.2/examples/loadables/mkdir.c
-+++ bash-3.2/examples/loadables/mkdir.c
-@@ -16,6 +16,7 @@
- #include "builtins.h"
- #include "shell.h"
- #include "bashgetopt.h"
-+#include "common.h"
- 
- #if !defined (errno)
- extern int errno;
---- bash-3.2/examples/loadables/pathchk.c
-+++ bash-3.2/examples/loadables/pathchk.c
-@@ -45,6 +45,7 @@
- #include "stdc.h"
- #include "bashgetopt.h"
- #include "maxpath.h"
-+#include "common.h"
- 
- #if !defined (errno)
- extern int errno;
---- bash-3.2/examples/loadables/print.c
-+++ bash-3.2/examples/loadables/print.c
-@@ -17,6 +17,8 @@
- #include "builtins.h"
- #include "stdc.h"
- #include "bashgetopt.h"
-+#include "builtext.h"
-+#include "common.h"
- 
- #if !defined (errno)
- extern int errno;
---- bash-3.2/examples/loadables/printenv.c
-+++ bash-3.2/examples/loadables/printenv.c
-@@ -11,6 +11,7 @@
- #include "builtins.h"
- #include "shell.h"
- #include "bashgetopt.h"
-+#include "common.h"
- 
- extern char **export_env;
- 
---- bash-3.2/examples/loadables/push.c
-+++ bash-3.2/examples/loadables/push.c
-@@ -11,6 +11,7 @@
- #include "shell.h"
- #include "jobs.h"
- #include "bashgetopt.h"
-+#include "common.h"
- 
- #ifndef errno
- extern int errno;
---- bash-3.2/examples/loadables/realpath.c
-+++ bash-3.2/examples/loadables/realpath.c
-@@ -34,6 +34,7 @@
- #include "builtins.h"
- #include "shell.h"
- #include "bashgetopt.h"
-+#include "common.h"
- 
- #ifndef errno
- extern int	errno;
-@@ -67,14 +68,14 @@
- 			vflag = 1;
- 			break;
- 		default:
--			usage();
-+			builtin_usage();
- 		}
- 	}
- 
- 	list = loptend;
- 
- 	if (list == 0)
--		usage();
-+		builtin_usage();
- 
- 	for (es = EXECUTION_SUCCESS; list; list = list->next) {
- 		p = list->word->word;
---- bash-3.2/examples/loadables/rmdir.c
-+++ bash-3.2/examples/loadables/rmdir.c
-@@ -8,6 +8,7 @@
- #include <errno.h>
- #include "builtins.h"
- #include "shell.h"
-+#include "common.h"
- 
- #if !defined (errno)
- extern int errno;
---- bash-3.2/examples/loadables/sleep.c
-+++ bash-3.2/examples/loadables/sleep.c
-@@ -27,6 +27,7 @@
- 
- #include "shell.h"
- #include "builtins.h"
-+#include "common.h"
- 
- #define RETURN(x) \
- 	do { \
---- bash-3.2/examples/loadables/tee.c
-+++ bash-3.2/examples/loadables/tee.c
-@@ -22,6 +22,7 @@
- #include "builtins.h"
- #include "shell.h"
- #include "bashgetopt.h"
-+#include "common.h"
- 
- #if !defined (errno)
- extern int errno;
---- bash-3.2/examples/loadables/truefalse.c
-+++ bash-3.2/examples/loadables/truefalse.c
-@@ -1,5 +1,7 @@
- /* true and false builtins */
- 
-+#include <config.h>
-+
- #include "bashtypes.h"
- #include "shell.h"
- #include "builtins.h"
---- bash-3.2/examples/loadables/tty.c
-+++ bash-3.2/examples/loadables/tty.c
-@@ -8,6 +8,7 @@
- #include "builtins.h"
- #include "shell.h"
- #include "bashgetopt.h"
-+#include "common.h"
- 
- extern char *ttyname ();
- 
---- bash-3.2/examples/loadables/uname.c
-+++ bash-3.2/examples/loadables/uname.c
-@@ -27,6 +27,7 @@
- #include "builtins.h"
- #include "shell.h"
- #include "bashgetopt.h"
-+#include "common.h"
- 
- #define FLAG_SYSNAME	0x01	/* -s */
- #define FLAG_NODENAME	0x02	/* -n */
---- bash-3.2/examples/loadables/unlink.c
-+++ bash-3.2/examples/loadables/unlink.c
-@@ -14,6 +14,7 @@
- 
- #include "builtins.h"
- #include "shell.h"
-+#include "common.h"
- 
- #ifndef errno
- extern int errno;
---- bash-3.2/examples/loadables/whoami.c
-+++ bash-3.2/examples/loadables/whoami.c
-@@ -8,6 +8,7 @@
- #include "builtins.h"
- #include "shell.h"
- #include "bashgetopt.h"
-+#include "common.h"
- 
- whoami_builtin (list)
-      WORD_LIST *list;
---- bash-3.2/examples/loadables/Makefile.in
-+++ bash-3.2/examples/loadables/Makefile.in
-@@ -68,7 +68,7 @@
- SHOBJ_CC = @SHOBJ_CC@
- SHOBJ_CFLAGS = @SHOBJ_CFLAGS@
- SHOBJ_LD = @SHOBJ_LD@
--SHOBJ_LDFLAGS = @SHOBJ_LDFLAGS@
-+SHOBJ_LDFLAGS = @SHOBJ_LDFLAGS@ @LDFLAGS@
- SHOBJ_XLDFLAGS = @SHOBJ_XLDFLAGS@
- SHOBJ_LIBS = @SHOBJ_LIBS@
- SHOBJ_STATUS = @SHOBJ_STATUS@
diff --git a/app-shells/bash/files/bash-3.2-process-subst.patch b/app-shells/bash/files/bash-3.2-process-subst.patch
deleted file mode 100644
index 94877c62b316..000000000000
--- a/app-shells/bash/files/bash-3.2-process-subst.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Fix process substitution on BSD
-
---- a/execute_cmd.c
-+++ b/execute_cmd.c
-@@ -2672,6 +2672,7 @@
- 
- 	  do_piping (pipe_in, pipe_out);
- 
-+	  subshell_environment = 0;
- 	  if (async)
- 	    subshell_environment |= SUBSHELL_ASYNC;
- 	  if (pipe_in != NO_PIPE || pipe_out != NO_PIPE)
diff --git a/app-shells/bash/files/bash-3.2-protos.patch b/app-shells/bash/files/bash-3.2-protos.patch
deleted file mode 100644
index 0a9ea74adfb0..000000000000
--- a/app-shells/bash/files/bash-3.2-protos.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-move prototypes around so they show up when needed
-
---- a/jobs.h
-+++ b/jobs.h
-@@ -182,6 +182,7 @@
- 
- extern int count_all_jobs __P((void));
- 
-+extern void close_pgrp_pipe __P((void));
- extern void terminate_current_pipeline __P((void));
- extern void terminate_stopped_jobs __P((void));
- extern void hangup_all_jobs __P((void));
---- a/lib/glob/strmatch.c
-+++ b/lib/glob/strmatch.c
-@@ -25,9 +25,6 @@
- #include "strmatch.h"
- 
- extern int xstrmatch __P((char *, char *, int));
--#if defined (HAVE_MULTIBYTE)
--extern int internal_wstrmatch __P((wchar_t *, wchar_t *, int));
--#endif
- 
- int
- strmatch (pattern, string, flags)
---- a/lib/glob/strmatch.h
-+++ b/lib/glob/strmatch.h
-@@ -57,6 +57,7 @@
- 
- #if HANDLE_MULTIBYTE
- extern int wcsmatch __P((wchar_t *, wchar_t *, int));
-+extern int internal_wstrmatch __P((wchar_t *, wchar_t *, int));
- #endif
- 
- #endif /* _STRMATCH_H */
---- a/quit.h
-+++ b/quit.h
-@@ -21,6 +21,8 @@
- #if !defined (_QUIT_H_)
- #define _QUIT_H_
- 
-+#include "sig.h"
-+
- /* Non-zero means SIGINT has already ocurred. */
- extern volatile int interrupt_state;
- extern volatile int terminating_signal;
---- a/support/bashversion.c
-+++ b/support/bashversion.c
-@@ -47,6 +47,9 @@
- extern char *dist_version;
- extern int patch_level;
- 
-+extern char *shell_version_string __P((void));
-+extern void show_shell_version __P((int));
-+
- char *shell_name = "bash";
- char *progname;
- 
diff --git a/app-shells/bash/files/bash-3.2-session-leader.patch b/app-shells/bash/files/bash-3.2-session-leader.patch
deleted file mode 100644
index 2e9286f34d40..000000000000
--- a/app-shells/bash/files/bash-3.2-session-leader.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-http://bugs.gentoo.org/231775
-http://lists.gnu.org/archive/html/bug-bash/2008-07/msg00010.html
-
-A parent bash shell sometimes will set the session leader tty (using tcsetpgrp)
-back to itself, taking control away from a child bash shell, due to a race
-condition.  A result is that the child can then not then execute some commands
-(like stty) from its init script (e.g. .bashrc).  The result I (and others)
-have seen is that the bash shell will hang while reading the init script.
-
-*** a/jobs.c
---- b/jobs.c
-***************
-*** 266,269 ****
---- 266,270 ----
-  static void set_job_running __P((int));
-  static void setjstatus __P((int));
-+ static int maybe_give_terminal_to __P((pid_t, pid_t, int));
-  static void mark_all_jobs_as_dead __P((void));
-  static void mark_dead_jobs_as_notified __P((int));
-***************
-*** 637,641 ****
-  	   */
-  	  if (job_control && newjob->pgrp && (subshell_environment&SUBSHELL_ASYNC) == 0)
-! 	    give_terminal_to (newjob->pgrp, 0);
-  	}
-      }
---- 638,642 ----
-  	   */
-  	  if (job_control && newjob->pgrp && (subshell_environment&SUBSHELL_ASYNC) == 0)
-! 	    maybe_give_terminal_to (shell_pgrp, newjob->pgrp, 0);
-  	}
-      }
-***************
-*** 3833,3836 ****
---- 3834,3863 ----
-  }
-  
-+ /* Give terminal to NPGRP iff it's currently owned by OPGRP.  FLAGS are the
-+    flags to pass to give_terminal_to(). */
-+ static int
-+ maybe_give_terminal_to (opgrp, npgrp, flags)
-+      pid_t opgrp, npgrp;
-+      int flags;
-+ {
-+   int tpgrp;
-+ 
-+   tpgrp = tcgetpgrp (shell_tty);
-+   if (tpgrp == npgrp)
-+     {
-+       terminal_pgrp = npgrp;
-+       return 0;
-+     }
-+   else if (tpgrp != opgrp)
-+     {
-+ #if defined (DEBUG)
-+       internal_warning ("maybe_give_terminal_to: terminal pgrp == %d shell pgrp = %d", tpgrp, opgrp);
-+ #endif
-+       return -1;
-+     }
-+   else
-+     return (give_terminal_to (npgrp, flags));     
-+ }
-+ 
-  /* Clear out any jobs in the job array.  This is intended to be used by
-     children of the shell, who should not have any job structures as baggage
diff --git a/app-shells/bash/files/bash-3.2-ulimit.patch b/app-shells/bash/files/bash-3.2-ulimit.patch
deleted file mode 100644
index 19ea7e6e5e33..000000000000
--- a/app-shells/bash/files/bash-3.2-ulimit.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-add missing docs for -e and -r options
-
---- a/builtins/ulimit.def
-+++ b/builtins/ulimit.def
-@@ -24,7 +24,7 @@
- $BUILTIN ulimit
- $FUNCTION ulimit_builtin
- $DEPENDS_ON !_MINIX
--$SHORT_DOC ulimit [-SHacdfilmnpqstuvx] [limit]
-+$SHORT_DOC ulimit [-SHacdefilmnpqrstuvx] [limit]
- Ulimit provides control over the resources available to processes
- started by the shell, on systems that allow such control.  If an
- option is given, it is interpreted as follows:
diff --git a/app-shells/bash/files/bash-4.0-configure.patch b/app-shells/bash/files/bash-4.0-configure.patch
deleted file mode 100644
index e57cb6b2402e..000000000000
--- a/app-shells/bash/files/bash-4.0-configure.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-http://bugs.gentoo.org/304901
-
-newer patches touch configure ... we don't want autotool deps, so update
-the files ourselves
-
---- bash-4.0/configure
-+++ bash-4.0/configure
-@@ -5806,7 +5806,7 @@
- 		# static version specified as -llibname to override the
- 		# dynamic version
- 		case "${host_os}" in
--		darwin[89]*)	READLINE_LIB='${READLINE_LIBRARY}' ;;
-+ 		darwin[89]*|darwin10*) READLINE_LIB='${READLINE_LIBRARY}' ;;
- 		*)		READLINE_LIB=-lreadline ;;
- 		esac
- 	fi
-@@ -5847,7 +5847,7 @@
- 		# static version specified as -llibname to override the
- 		# dynamic version
- 		case "${host_os}" in
--		darwin[89]*)	HISTORY_LIB='${HISTORY_LIBRARY}' ;;
-+ 		darwin[89]*|darwin10*) HISTORY_LIB='${HISTORY_LIBRARY}' ;;
- 		*)		HISTORY_LIB=-lhistory ;;
- 		esac
- 	fi
diff --git a/app-shells/bash/files/bash-4.0-ldflags-for-build.patch b/app-shells/bash/files/bash-4.0-ldflags-for-build.patch
deleted file mode 100644
index 089264f97e40..000000000000
--- a/app-shells/bash/files/bash-4.0-ldflags-for-build.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://bugs.gentoo.org/211947
-
-fix from Takashi YOSHII: dont use target ldflags for build apps
-
---- bash/Makefile.in
-+++ bash/Makefile.in
-@@ -143,7 +143,7 @@
- CCFLAGS_FOR_BUILD = $(BASE_CCFLAGS) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD)
- 
- LDFLAGS = @LDFLAGS@ $(STATIC_LD) $(LOCAL_LDFLAGS) $(PROFILE_FLAGS) $(CFLAGS)
--LDFLAGS_FOR_BUILD = $(LDFLAGS)
-+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@ $(LOCAL_LDFLAGS) $(CFLAGS_FOR_BUILD)
- 
- INCLUDES = -I. @RL_INCLUDE@ -I$(srcdir) -I$(BASHINCDIR) -I$(LIBSRC) $(INTL_INC)
- 
diff --git a/app-shells/bash/files/bash-4.0-negative-return.patch b/app-shells/bash/files/bash-4.0-negative-return.patch
deleted file mode 100644
index 32affa18c179..000000000000
--- a/app-shells/bash/files/bash-4.0-negative-return.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-http://lists.gnu.org/archive/html/bug-bash/2009-02/msg00158.html
-
-make `return` accept negative values again
-
-hack by me (vapier@gentoo.org) ... i'm not familiar with bash source code, so
-i imagine this isn't the best way to do it ...
-
---- bash/builtins/return.def
-+++ bash/builtins/return.def
-@@ -60,9 +60,23 @@
- return_builtin (list)
-      WORD_LIST *list;
- {
-+	int neg = 0;
-+	if (list && list->word && list->word->word) {
-+		char *word = list->word->word;
-+		if (*word == '-') {
-+			while (*word++)
-+				if (!isdigit(*word))
-+					break;
-+			if (!*word)
-+				neg = 1;
-+		}
-+	}
-+
-+	if (!neg) {
-   if (no_options (list))
-     return (EX_USAGE);
-   list = loptend;	/* skip over possible `--' */
-+	}
- 
-   return_catch_value = get_exitstat (list);
- 
diff --git a/app-shells/bash/files/bash-4.0-parallel-build.patch b/app-shells/bash/files/bash-4.0-parallel-build.patch
deleted file mode 100644
index 8384e2c9019c..000000000000
--- a/app-shells/bash/files/bash-4.0-parallel-build.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-http://bugs.gentoo.org/267613
-
-add missing dep
-
-patch by Peter Alfredsen
-
---- bash-4.0/Makefile.in
-+++ bash-4.0/Makefile.in
-@@ -1022,10 +1022,11 @@
- subst.o: flags.h jobs.h siglist.h execute_cmd.h ${BASHINCDIR}/filecntl.h trap.h pathexp.h
- subst.o: mailcheck.h input.h $(DEFSRC)/getopt.h $(DEFSRC)/common.h
- subst.o: bashline.h bashhist.h ${GLOB_LIBSRC}/strmatch.h
- subst.o: ${BASHINCDIR}/chartypes.h
- subst.o: ${BASHINCDIR}/shmbutil.h
-+subst.o: ${DEFDIR}/builtext.h
- test.o: bashtypes.h ${BASHINCDIR}/posixstat.h ${BASHINCDIR}/filecntl.h
- test.o: shell.h syntax.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
- test.o: general.h xmalloc.h bashtypes.h variables.h arrayfunc.h conftypes.h array.h hashlib.h
- test.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
- test.o: make_cmd.h subst.h sig.h pathnames.h externs.h test.h
-
-http://bugs.gentoo.org/284633
-
-and another ...
-
---- bash-4.0/lib/sh/Makefile.in
-+++ bash-4.0/lib/sh/Makefile.in
-@@ -136,6 +136,9 @@
- ${BUILD_DIR}/version.h: ${BUILD_DIR}/config.h ${BUILD_DIR}/Makefile Makefile
- 	-( cd ${BUILD_DIR} && ${MAKE} ${MFLAGS} version.h )
- 
-+${BUILD_DIR}/pathnames.h: ${BUILD_DIR}/config.h ${BUILD_DIR}/Makefile Makefile
-+	-( cd ${BUILD_DIR} && ${MAKE} ${MFLAGS} pathnames.h )
-+
- # rules for losing makes, like SunOS
- casemod.o: casemod.c
- clktck.o: clktck.c
-
-http://bugs.gentoo.org/300143
-
-and another ...
-
---- bash-4.0/lib/glob/Makefile.in
-+++ bash-4.0/lib/glob/Makefile.in
-@@ -119,6 +119,11 @@
- mostlyclean: clean
- 	-( cd doc && $(MAKE) $(MFLAGS) $@ )
- 
-+# Dependencies
-+
-+${BUILD_DIR}/pathnames.h: ${BUILD_DIR}/config.h ${BUILD_DIR}/Makefile Makefile
-+	-( cd ${BUILD_DIR} && ${MAKE} ${MFLAGS} pathnames.h )
-+
- ######################################################################
- #								     #
- #  Dependencies for the object files which make up this library.     #
-@@ -136,7 +141,7 @@
- strmatch.o: $(BUILD_DIR)/config.h
- strmatch.o: $(BASHINCDIR)/stdc.h
- 
--glob.o: $(BUILD_DIR)/config.h
-+glob.o: $(BUILD_DIR)/config.h $(topdir)/shell.h $(BUILD_DIR)/pathnames.h
- glob.o: $(topdir)/bashtypes.h $(BASHINCDIR)/ansi_stdlib.h $(topdir)/bashansi.h
- glob.o: $(BASHINCDIR)/posixstat.h $(BASHINCDIR)/memalloc.h
- glob.o: strmatch.h glob.h
diff --git a/app-shells/bash/files/bash-4.1-fbsd-eaccess.patch b/app-shells/bash/files/bash-4.1-fbsd-eaccess.patch
deleted file mode 100644
index 3c5b5dd98d9b..000000000000
--- a/app-shells/bash/files/bash-4.1-fbsd-eaccess.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Bash built-in test fails to correctly report exeuctable status for non-
-executable files when run by root on FreeBSD.
-
-See http://bugs.gentoo.org/303411
-
-Patch from Johan Hattne <johan.hattne@utsuthwestern.edu>
---- a/lib/sh/eaccess.c.orig
-+++ b/lib/sh/eaccess.c
-@@ -198,11 +198,19 @@
-      char *path;
-      int mode;
- {
-+  struct stat s;
-+  int ret;
-+
-   if (path_is_devfd (path))
-     return (sh_stataccess (path, mode));
- 
- #if defined (HAVE_EACCESS)		/* FreeBSD */
--  return (eaccess (path, mode));
-+  if (stat (path, &s) != 0)
-+    return (-1);
-+  ret = eaccess (path, mode);
-+  if (mode == X_OK && ret == 0 && !S_ISDIR(s.st_mode) && geteuid() == 0)
-+    return ((s.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)) == 0 ? -1 : 0);
-+  return (ret);
- #elif defined (EFF_ONLY_OK)		/* SVR4(?), SVR4.2 */
-   return access (path, mode|EFF_ONLY_OK);
- #else
diff --git a/app-shells/bash/files/bash-4.1-parallel-build.patch b/app-shells/bash/files/bash-4.1-parallel-build.patch
deleted file mode 100644
index ae44bcc0cf6d..000000000000
--- a/app-shells/bash/files/bash-4.1-parallel-build.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- bash-4.1/lib/glob/Makefile.in
-+++ bash-4.1/lib/glob/Makefile.in
-@@ -119,6 +119,11 @@
- mostlyclean: clean
- 	-( cd doc && $(MAKE) $(MFLAGS) $@ )
- 
-+# Dependencies
-+
-+${BUILD_DIR}/pathnames.h: ${BUILD_DIR}/config.h ${BUILD_DIR}/Makefile Makefile
-+	-( cd ${BUILD_DIR} && ${MAKE} ${MFLAGS} pathnames.h )
-+
- ######################################################################
- #								     #
- #  Dependencies for the object files which make up this library.     #
-@@ -136,7 +141,7 @@
- strmatch.o: $(BUILD_DIR)/config.h
- strmatch.o: $(BASHINCDIR)/stdc.h
- 
--glob.o: $(BUILD_DIR)/config.h
-+glob.o: $(BUILD_DIR)/config.h $(topdir)/shell.h $(BUILD_DIR)/pathnames.h
- glob.o: $(topdir)/bashtypes.h $(BASHINCDIR)/ansi_stdlib.h $(topdir)/bashansi.h
- glob.o: $(BASHINCDIR)/posixstat.h $(BASHINCDIR)/memalloc.h
- glob.o: strmatch.h glob.h
diff --git a/app-shells/bash/files/bash-4.2-dev-fd-buffer-overflow.patch b/app-shells/bash/files/bash-4.2-dev-fd-buffer-overflow.patch
deleted file mode 100644
index d50c269b7e71..000000000000
--- a/app-shells/bash/files/bash-4.2-dev-fd-buffer-overflow.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-https://bugs.gentoo.org/431850
-
-this is a minor tweak to the upstream patch to also apply to bash 4.1/4.0/3.2
-
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.2
-Patch-ID:	bash42-033
-
-Bug-Reported-by:	David Leverton <levertond@googlemail.com>
-Bug-Reference-ID:	<4FCCE737.1060603@googlemail.com>
-Bug-Reference-URL:
-
-Bug-Description:
-
-Bash uses a static buffer when expanding the /dev/fd prefix for the test
-and conditional commands, among other uses, when it should use a dynamic
-buffer to avoid buffer overflow.
-
-Patch (apply with `patch -p0'):
-
-*** bash-4.2/lib/sh/eaccess.c
---- bash-4.2/lib/sh/eaccess.c
-***************
-*** 83,86 ****
---- 83,88 ----
-       struct stat *finfo;
-  {
-+   static char *pbuf = 0;
-+ 
-    if (*path == '\0')
-      {
-***************
-*** 107,111 ****
-       On most systems, with the notable exception of linux, this is
-       effectively a no-op. */
-!       char pbuf[32];
-        strcpy (pbuf, DEV_FD_PREFIX);
-        strcat (pbuf, path + 8);
---- 109,113 ----
-       On most systems, with the notable exception of linux, this is
-       effectively a no-op. */
-!       pbuf = xrealloc (pbuf, sizeof (DEV_FD_PREFIX) + strlen (path + 8));
-        strcpy (pbuf, DEV_FD_PREFIX);
-        strcat (pbuf, path + 8);
diff --git a/app-shells/bash/files/bash-4.2-execute-job-control.patch b/app-shells/bash/files/bash-4.2-execute-job-control.patch
deleted file mode 100644
index 82b73e5157ca..000000000000
--- a/app-shells/bash/files/bash-4.2-execute-job-control.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-fix build when job control is disabled
-
-http://lists.gnu.org/archive/html/bug-bash/2011-06/msg00110.html
-http://lists.gnu.org/archive/html/bug-bash/2011-07/msg00057.html
-http://lists.gnu.org/archive/html/bug-bash/2011-09/msg00039.html
-https://bugs.gentoo.org/383237
-
-should be fixed in next release of bash ...
-
---- a/execute_cmd.c
-+++ b/execute_cmd.c
-@@ -2202,7 +2202,11 @@
-   /* If the `lastpipe' option is set with shopt, and job control is not
-      enabled, execute the last element of non-async pipelines in the
-      current shell environment. */
--  if (lastpipe_opt && job_control == 0 && asynchronous == 0 && pipe_out == NO_PIPE && prev > 0)
-+  if (lastpipe_opt && 
-+#if defined(JOB_CONTROL)
-+		job_control == 0 && 
-+#endif
-+		asynchronous == 0 && pipe_out == NO_PIPE && prev > 0)
-     {
-       lstdin = move_to_high_fd (0, 0, 255);
-       if (lstdin > 0)
diff --git a/app-shells/bash/files/bash-4.2-no-readline.patch b/app-shells/bash/files/bash-4.2-no-readline.patch
deleted file mode 100644
index 14eb6bf421e9..000000000000
--- a/app-shells/bash/files/bash-4.2-no-readline.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-fix building when readline is disabled
-
---- a/builtins/complete.def
-+++ b/builtins/complete.def
-@@ -49,6 +49,8 @@ $END
- 
- #include <config.h>
- 
-+#ifdef READLINE
-+
- #include <stdio.h>
- 
- #include "../bashtypes.h"
-@@ -867,3 +869,5 @@ compopt_builtin (list)
- 
-   return (ret);
- }
-+
-+#endif
diff --git a/app-shells/bash/files/bash-4.2-parallel-build.patch b/app-shells/bash/files/bash-4.2-parallel-build.patch
deleted file mode 100644
index ab2de86206a3..000000000000
--- a/app-shells/bash/files/bash-4.2-parallel-build.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-https://lists.gnu.org/archive/html/bug-bash/2011-10/msg00036.html
-
-the current yacc rules allow multiple runs to generate the same files.  usually
-this doesn't come up as the generated files are shipped in the tarball, but
-when you modify parse.y (applying a patch or developing or whatever), you can
-hit this problem.
-
-simple way of showing this:
-	make -j y.tab.{c,h}
-a correct system would not show the yacc parser running twice :)
-
-simple patch is to have the .h file depend on the .c file, and have the .h file
-itself issue a dummy rule (to avoid make thinking things changed).
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -579,16 +579,17 @@
- 
- # old rules
- GRAM_H = parser-built
--y.tab.o: y.tab.c ${GRAM_H} command.h ${BASHINCDIR}/stdc.h input.h
-+y.tab.o: y.tab.h y.tab.c ${GRAM_H} command.h ${BASHINCDIR}/stdc.h input.h
- ${GRAM_H}:	y.tab.h
- 	@-if test -f y.tab.h ; then \
- 		cmp -s $@ y.tab.h 2>/dev/null || cp -p y.tab.h $@; \
- 	fi
--y.tab.c y.tab.h: parse.y
-+y.tab.c: parse.y
- #	-if test -f y.tab.h; then mv -f y.tab.h old-y.tab.h; fi
- 	$(YACC) -d $(srcdir)/parse.y
- 	touch parser-built
- #	-if cmp -s old-y.tab.h y.tab.h; then mv old-y.tab.h y.tab.h; else cp -p y.tab.h ${GRAM_H}; fi
-+y.tab.h: y.tab.c ; @true
- 
- # experimental new rules - work with GNU make but not BSD (or OSF) make
- #y.tab.o: y.tab.c y.tab.h
-
-https://lists.gnu.org/archive/html/bug-bash/2011-10/msg00037.html
-
-the current code generates a bunch of local libraries in subdirs and then
-links bash against that.  those subdirs sometimes need version.h.  so they
-have a rule to change back up to the parent dir and build version.h (which is
-fine).  the trouble is that the top level objects and the subdirs are allowed
-to build in parallel, so it's possible for multiple children to see that
-version.h is not available and that it needs to be created, so they all do.
-
-there is even more trouble is that version.h depends on all the top level
-sources, some of which are compiled (like syntax.c).  so these parallel
-children all kick off a job to generate syntax.c which in turn requires the
-mksyntax helper executable.  obviously multiple processes rm-ing, compiling,
-and linking the same files quickly falls apart.
-
-so tweak the subdirs to all depend on the .build target which in turn depends
-on all of these top level files being generated.  now the subdirs won't try and
-recursively enter the top level.
-
-(noticed by David James)
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -597,6 +598,11 @@
- #	$(YACC) -d $(srcdir)/parse.y
- #	-if cmp -s old-y.tab.h y.tab.h; then mv old-y.tab.h y.tab.h; fi
- 
-+# Subdirs will often times want version.h, so they'll change back up to
-+# the top level and try to create it.  This causes parallel build issues
-+# so just force top level sanity before we descend.
-+$(LIBDEP): .build
-+
- $(READLINE_LIBRARY): config.h $(READLINE_SOURCE)
- 	@echo making $@ in ${RL_LIBDIR}
- 	@( { test "${RL_LIBDIR}" = "${libdir}" && exit 0; } || \
-
-http://lists.gnu.org/archive/html/bug-bash/2011-10/msg00107.html
-
-the top level Makefile will recurse into the defdir for multiple targets
-(libbuiltins.a, common.o, bashgetopt.o, builtext.h), and since these do
-not have any declared interdependencies, parallel makes will recurse into
-the subdir and build the respective targets.
-
-nothing depends on common.o or bashgetopt.o, so those targets don't get
-used normally.  this leaves libbuiltins.a and builtext.h.  at a glance,
-this shouldn't be a big deal, but when we look closer, there's a subtle
-failure lurking.
-
-most of the objects in the defdir need to be generated which means they
-need to build+link the local mkbuiltins helper.  the builtext.h header
-also needs to be generated by the mkbuiltins helper.  so when the top
-level launches a child for libbuiltins.a and a child for builtext.h, we
-can hit a race condition where the two try to generate mkbuiltins, and
-the build randomly fails.
-
-so update libbuiltins.a to depend on builtext.h.  this should be fairly
-simple since it's only a single target.
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -674,7 +674,7 @@
- 	$(RM) $@
- 	./mksyntax$(EXEEXT) -o $@
- 
--$(BUILTINS_LIBRARY): $(BUILTIN_DEFS) $(BUILTIN_C_SRC) config.h ${BASHINCDIR}/memalloc.h version.h
-+$(BUILTINS_LIBRARY): $(BUILTIN_DEFS) $(BUILTIN_C_SRC) config.h ${BASHINCDIR}/memalloc.h ${DEFDIR}/builtext.h version.h
- 	@(cd $(DEFDIR) && $(MAKE) $(MFLAGS) DEBUG=${DEBUG} libbuiltins.a ) || exit 1
- 
- # these require special rules to circumvent make builtin rules
diff --git a/app-shells/bash/files/bash-4.2-read-retry.patch b/app-shells/bash/files/bash-4.2-read-retry.patch
deleted file mode 100644
index 44903c68afe1..000000000000
--- a/app-shells/bash/files/bash-4.2-read-retry.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-https://bugs.gentoo.org/447810
-
-fix from upstream to workaround broken BSD kernels
-
-commit 208fdb509e072977ae7a621e916dfcd32c76047d
-Author: Chet Ramey <chet@caleb.ins.cwru.edu>
-Date:   Mon Mar 4 08:09:29 2013 -0500
-
-    commit bash-20130201 snapshot
-
-diff --git a/redir.c b/redir.c
-index d7da2f3..aa3d16d 100644
---- a/redir.c
-+++ b/redir.c
-@@ -650,7 +650,7 @@ redir_open (filename, flags, mode, ri)
-      int flags, mode;
-      enum r_instruction ri;
- {
--  int fd, r;
-+  int fd, r, e;
- 
-   r = find_string_in_alist (filename, _redir_special_filenames, 1);
-   if (r >= 0)
-@@ -666,7 +666,16 @@ redir_open (filename, flags, mode, ri)
-     }
-   else
-     {
--      fd = open (filename, flags, mode);
-+      do
-+	{
-+	  fd = open (filename, flags, mode);
-+	  e = errno;
-+	  if (fd < 0 && e == EINTR)
-+	    QUIT;
-+	  errno = e;
-+	}
-+      while (fd < 0 && errno == EINTR);
-+
- #if defined (AFS)
-       if ((fd < 0) && (errno == EACCES))
- 	{
diff --git a/app-shells/bash/files/bash-4.2-speed-up-read-N.patch b/app-shells/bash/files/bash-4.2-speed-up-read-N.patch
deleted file mode 100644
index b96ad0c887e1..000000000000
--- a/app-shells/bash/files/bash-4.2-speed-up-read-N.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-http://lists.gnu.org/archive/html/bug-bash/2012-11/msg00034.html
-
-From 530d4988afd68ea9d2cf1b0267d4dc821d0d204f Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 19 Nov 2012 17:58:51 -0500
-Subject: [PATCH] bash: speed up `read -N`
-
-Rather than using 1 byte reads, use the existing cache read logic.
-This could be sped up more, but this change is not as invasive and
-should (hopefully) be fairly safe.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- builtins/read.def | 21 ++++++++++++++++-----
- externs.h         |  1 +
- lib/sh/zread.c    | 15 +++++++++++++--
- 3 files changed, 30 insertions(+), 7 deletions(-)
-
-diff --git a/builtins/read.def b/builtins/read.def
-index e32dec7..81a1b3f 100644
---- a/builtins/read.def
-+++ b/builtins/read.def
-@@ -457,7 +457,10 @@ read_builtin (list)
-   interrupt_immediately++;
-   terminate_immediately++;
- 
--  unbuffered_read = (nchars > 0) || (delim != '\n') || input_is_pipe;
-+  if ((nchars > 0) && !input_is_tty && ignore_delim)
-+    unbuffered_read = 2;
-+  else if ((nchars > 0) || (delim != '\n') || input_is_pipe)
-+    unbuffered_read = 1;
- 
-   if (prompt && edit == 0)
-     {
-@@ -505,10 +508,18 @@ read_builtin (list)
- 	  print_ps2 = 0;
- 	}
- 
--      if (unbuffered_read)
--	retval = zread (fd, &c, 1);
--      else
--	retval = zreadc (fd, &c);
-+      switch (unbuffered_read)
-+	{
-+	case 2:
-+	  retval = zreadcn (fd, &c, nchars - nr);
-+	  break;
-+	case 1:
-+	  retval = zread (fd, &c, 1);
-+	  break;
-+	default:
-+	  retval = zreadc (fd, &c);
-+	  break;
-+	}
- 
-       if (retval <= 0)
- 	{
-diff --git a/externs.h b/externs.h
-index 09244fa..a5ad645 100644
---- a/externs.h
-+++ b/externs.h
-@@ -479,6 +479,7 @@ extern ssize_t zread __P((int, char *, size_t));
- extern ssize_t zreadretry __P((int, char *, size_t));
- extern ssize_t zreadintr __P((int, char *, size_t));
- extern ssize_t zreadc __P((int, char *));
-+extern ssize_t zreadcn __P((int, char *, int));
- extern ssize_t zreadcintr __P((int, char *));
- extern void zreset __P((void));
- extern void zsyncfd __P((int));
-diff --git a/lib/sh/zread.c b/lib/sh/zread.c
-index 5db21a9..af7d02b 100644
---- a/lib/sh/zread.c
-+++ b/lib/sh/zread.c
-@@ -101,15 +101,18 @@ static char lbuf[128];
- static size_t lind, lused;
- 
- ssize_t
--zreadc (fd, cp)
-+zreadcn (fd, cp, len)
-      int fd;
-      char *cp;
-+     int len;
- {
-   ssize_t nr;
- 
-   if (lind == lused || lused == 0)
-     {
--      nr = zread (fd, lbuf, sizeof (lbuf));
-+      if (len > sizeof (lbuf))
-+	len = sizeof (lbuf);
-+      nr = zread (fd, lbuf, len);
-       lind = 0;
-       if (nr <= 0)
- 	{
-@@ -123,6 +126,14 @@ zreadc (fd, cp)
-   return 1;
- }
- 
-+ssize_t
-+zreadc (fd, cp)
-+     int fd;
-+     char *cp;
-+{
-+  return zreadcn (fd, cp, sizeof (lbuf));
-+}
-+
- /* Don't mix calls to zreadc and zreadcintr in the same function, since they
-    use the same local buffer. */
- ssize_t
--- 
-1.7.12.4
-
diff --git a/app-shells/bash/files/bash-4.3-arrayfunc.patch b/app-shells/bash/files/bash-4.3-arrayfunc.patch
deleted file mode 100644
index f44d18478454..000000000000
--- a/app-shells/bash/files/bash-4.3-arrayfunc.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://lists.gnu.org/archive/html/bug-bash/2014-11/msg00178.html
-
-diff --git a/arrayfunc.c b/arrayfunc.c
-index 804e6da..0f900aa 100644
---- a/arrayfunc.c
-+++ b/arrayfunc.c
-@@ -498,7 +498,7 @@ assign_compound_array_list (var, nlist, flags)
- 
-   for (list = nlist; list; list = list->next)
-     {
--      iflags = flags;
-+      iflags = (flags & ~ASS_APPEND);
-       w = list->word->word;
- 
-       /* We have a word of the form [ind]=value */
diff --git a/app-shells/bash/files/bash-4.3-mapfile-improper-array-name-validation.patch b/app-shells/bash/files/bash-4.3-mapfile-improper-array-name-validation.patch
deleted file mode 100644
index 20bf340fdbd3..000000000000
--- a/app-shells/bash/files/bash-4.3-mapfile-improper-array-name-validation.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://lists.gnu.org/archive/html/bug-bash/2014-11/msg00097.html
-
---- bash-4.3/builtins/mapfile.def
-+++ bash-4.3/builtins/mapfile.def
-@@ -339,7 +339,7 @@
-   else
-     array_name = list->word->word;
-   
--  if (legal_identifier (array_name) == 0 && valid_array_reference (array_name) == 0)
-+  if (legal_identifier (array_name) == 0)
-     {
-       sh_invalidid (array_name);
-       return (EXECUTION_FAILURE);
diff --git a/app-shells/bash/files/bash-4.3-protos.patch b/app-shells/bash/files/bash-4.3-protos.patch
deleted file mode 100644
index 7af84ff707f3..000000000000
--- a/app-shells/bash/files/bash-4.3-protos.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/redir.c
-+++ b/redir.c
-@@ -31,6 +31,7 @@
- #endif
- #include "filecntl.h"
- #include "posixstat.h"
-+#include "trap.h"
- 
- #if defined (HAVE_UNISTD_H)
- #  include <unistd.h>
diff --git a/app-shells/bash/files/bash-4.4-jobs_overflow.patch b/app-shells/bash/files/bash-4.4-jobs_overflow.patch
deleted file mode 100644
index 8753d62ec6c1..000000000000
--- a/app-shells/bash/files/bash-4.4-jobs_overflow.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://lists.gnu.org/archive/html/bug-bash/2017-12/msg00025.html
-https://bugs.gentoo.org/644720
-
---- bash-4.4/jobs.c
-+++ bash-4.4/jobs.c
-@@ -750,7 +750,7 @@
-   else
-     nsize = bgpids.nalloc;
- 
--  while (nsize < js.c_childmax)
-+  while (nsize < (ps_index_t)js.c_childmax)
-     nsize *= 2;
- 
-   if (bgpids.nalloc < js.c_childmax)
diff --git a/app-shells/bash/files/bash-4.4-popd-offset-overflow.patch b/app-shells/bash/files/bash-4.4-popd-offset-overflow.patch
deleted file mode 100644
index cc6b622eca34..000000000000
--- a/app-shells/bash/files/bash-4.4-popd-offset-overflow.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://bugs.gentoo.org/600174
-https://lists.gnu.org/archive/html/bug-bash/2016-11/msg00099.html
-
-*** bash-4.4/builtins/pushd.def
---- bash-4.4/builtins/pushd.def
-***************
-*** 366,370 ****
-      }
-  
-!   if (which > directory_list_offset || (directory_list_offset == 0 && which == 0))
-      {
-        pushd_error (directory_list_offset, which_word ? which_word : "");
---- 366,370 ----
-      }
-  
-!   if (which > directory_list_offset || (which < -directory_list_offset) || (directory_list_offset == 0 && which == 0))
-      {
-        pushd_error (directory_list_offset, which_word ? which_word : "");
-***************
-*** 388,391 ****
---- 388,396 ----
-  	 of the list into place. */
-        i = (direction == '+') ? directory_list_offset - which : which;
-+       if (i < 0 || i > directory_list_offset)
-+ 	{
-+ 	  pushd_error (directory_list_offset, which_word ? which_word : "");
-+ 	  return (EXECUTION_FAILURE);
-+ 	}
-        free (pushd_directory_list[i]);
-        directory_list_offset--;
diff --git a/app-shells/bash/files/bash-4.4-set-SHOBJ_STATUS.patch b/app-shells/bash/files/bash-4.4-set-SHOBJ_STATUS.patch
deleted file mode 100644
index 96302c2030e7..000000000000
--- a/app-shells/bash/files/bash-4.4-set-SHOBJ_STATUS.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://lists.gnu.org/archive/html/bug-bash/2016-10/msg00004.html
-
---- a/configure
-+++ b/configure
-@@ -16124,6 +16124,9 @@ $as_echo_n "checking shared object configuration for loadable builtins... " >&6;
- 
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SHOBJ_STATUS" >&5
- $as_echo "$SHOBJ_STATUS" >&6; }
-+else
-+	SHOBJ_STATUS=unsupported
-+
- fi
- 
- # try to create a directory tree if the source is elsewhere
diff --git a/app-shells/bash/files/bash-4.x-deferred-heredocs.patch b/app-shells/bash/files/bash-4.x-deferred-heredocs.patch
deleted file mode 100644
index c6a6de44d36d..000000000000
--- a/app-shells/bash/files/bash-4.x-deferred-heredocs.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-http://bugs.gentoo.org/310197
-http://lists.gnu.org/archive/html/bug-bash/2010-03/msg00063.html
-
-fix heredocs handling in `set` output
-
-*** bash-4.1/print_cmd.c
---- bash-4.1/print_cmd.c
-***************
-*** 114,117 ****
---- 114,123 ----
-  #define CHECK_XTRACE_FP	xtrace_fp = (xtrace_fp ? xtrace_fp : stderr)
-  
-+ #define PRINT_DEFERRED_HEREDOCS(x) \
-+   do { \
-+     if (deferred_heredocs) \
-+       print_deferred_heredocs (x); \
-+   } while (0)
-+ 
-  /* Non-zero means the stuff being printed is inside of a function def. */
-  static int inside_function_def;
-***************
-*** 561,571 ****
-  {
-    print_for_command_head (for_command);
-- 
-    cprintf (";");
-    newline ("do\n");
-    indentation += indentation_amount;
-    make_command_string_internal (for_command->action);
-    semicolon ();
-    indentation -= indentation_amount;
-    newline ("done");
-  }
---- 566,578 ----
-  {
-    print_for_command_head (for_command);
-    cprintf (";");
-    newline ("do\n");
-+ 
-    indentation += indentation_amount;
-    make_command_string_internal (for_command->action);
-+   PRINT_DEFERRED_HEREDOCS ("");
-    semicolon ();
-    indentation -= indentation_amount;
-+ 
-    newline ("done");
-  }
diff --git a/app-shells/bash/files/bash-5.0-history-append.patch b/app-shells/bash/files/bash-5.0-history-append.patch
deleted file mode 100644
index 20f78bfe9f03..000000000000
--- a/app-shells/bash/files/bash-5.0-history-append.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-*** ../bash-5.0-patched/bashhist.c	2018-07-05 22:41:14.000000000 -0400
---- bashhist.c	2019-02-23 17:12:02.000000000 -0500
-***************
-*** 437,445 ****
-       char *filename;
-  {
-!   int fd, result;
-    struct stat buf;
-  
-    result = EXECUTION_SUCCESS;
-!   if (history_lines_this_session > 0 && (history_lines_this_session <= where_history ()))
-      {
-        /* If the filename was supplied, then create it if necessary. */
---- 437,445 ----
-       char *filename;
-  {
-!   int fd, result, histlen;
-    struct stat buf;
-  
-    result = EXECUTION_SUCCESS;
-!   if (history_lines_this_session > 0)
-      {
-        /* If the filename was supplied, then create it if necessary. */
-***************
-*** 454,457 ****
---- 454,461 ----
-  	  close (fd);
-  	}
-+       /* cap the number of lines we write at the length of the history list */
-+       histlen = where_history ();
-+       if (histlen > 0 && history_lines_this_session > histlen)
-+ 	history_lines_this_session = histlen;	/* reset below anyway */
-        result = append_history (history_lines_this_session, filename);
-        /* Pretend we already read these lines from the file because we just
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 8f862d5e23f8..9f84ccf6435c 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/ding/Manifest b/app-text/ding/Manifest
index 84f353f230cb..937164da7534 100644
--- a/app-text/ding/Manifest
+++ b/app-text/ding/Manifest
@@ -1,5 +1,5 @@
 DIST ding-1.8.1.tar.gz 6543141 BLAKE2B 5393113bc8952553b3b5e5ee8dcd98b4cf6fec2d92069354e83b38808289053b0cc5a2c08968068f9b393b5a5e296541718c129ccbe23076ce591f6254c8293b SHA512 7d1b459d40e26482c3c16a79565cb897a492fa5807f44c5c3ed1022bcf65ba90bec9cb503cc67970742c2beeb34bd653c684e56ef5492f536254bf475d3f70a4
 DIST ding-1.9.tar.gz 7864078 BLAKE2B 9a25a2eb940b96393f556e374167a5b0aae8d26ff81de364e693f01acf79b0a5896704c39e1fe1ab2b48a875785483b2bc71339b01d3999664b78b48ecb041dc SHA512 fa5500d1ced311ba21ef8a16a25f3a3cdcebc24daacff79c05351a46cc2a1d466891caa1dec3a77ae9a4d7e59332d991974917875f967d93ac1358f5532e8a72
 EBUILD ding-1.8.1.ebuild 564 BLAKE2B 1d23c835cc41e680564d6d82b64c145c967432189aa3f8eae75d77b2d5af9c8a4f7db3ff8afe4d87f30e777538ee0e9d51c7b0c733e1d2a9eccfbe2af2ef6aa2 SHA512 e374d2294f1f56c3d17f0bd7b36c0a24874480771595ed74e9675b061beadcfda97d9774b0833a72952fbe153fffe437ab28bdcc6d1bc361c0708a738e1ec2c2
-EBUILD ding-1.9.ebuild 582 BLAKE2B 785753a604911eee32c78c1ffbd5a6901aabf236f4ae211e89bc6a567cb553faed1f7e054ac744d964cc604ca3a00a33c2219555fcc2e711b1d1ed8b6d675512 SHA512 f6c399012816652fd50389324746f59866b1c3d86a802ad28b3c02a80bb680c2d96e2a7fc93baac6c8d0b2f22f2b3f894e97d9d75b508249c4aa92be95a3c78e
+EBUILD ding-1.9.ebuild 581 BLAKE2B 56c5c7fbaea02123d3d24e994c249821205bb8d5719c2206c669812cddaf2e992ded42dfa12938b2a5e5c733729e51320bbcf4f593b0540df637a1595453d9f8 SHA512 601652eb8bfc540febc79f539e326a0d837671dab41b9b02bc61dc7de70d828f70c80c393028a6b887ebda27e6f803721bb2892ff6b0ac2c0d4e54893cb300bc
 MISC metadata.xml 252 BLAKE2B 5dd8d0c83d6c9c396753f4e6674725483e0c7a005b4c529d3bd1fba5de36cee7f2b33e53aec48aa75f35ec663173677c2c964fb73f7f954b20631cc9c59533ca SHA512 afee4a606f4b70f265eb14178037c0459e32ddd98378c6c2978b829e906f83dc3607385173bd8f84ad988d307f8e44e1320310c92c070c802a4ccba93a96ae18
diff --git a/app-text/ding/ding-1.9.ebuild b/app-text/ding/ding-1.9.ebuild
index fb609a2d281f..d6a6cb861d68 100644
--- a/app-text/ding/ding-1.9.ebuild
+++ b/app-text/ding/ding-1.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://wftp.tu-chemnitz.de/pub/Local/urz/ding/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/tk-8.3"
diff --git a/app-text/gspell/Manifest b/app-text/gspell/Manifest
index 48874db3e435..c927b5de3f46 100644
--- a/app-text/gspell/Manifest
+++ b/app-text/gspell/Manifest
@@ -1,3 +1,5 @@
 DIST gspell-1.10.0.tar.xz 432484 BLAKE2B aee73d1745720d7c5bef1264ca717866321696953a8c0f2a538e7c8ea2133b8c666b1521280fd6c4f1a9333f178b2559bc21e462f94f7e217480bd3cb5068068 SHA512 8c776f2ea388ab145bc53de112ddc8e737c65ce7be0518edfe695f3e677a89c57a4826eb0fcdc39c5023bd1839ebd60a6a25eb8ac8e3363d0c406994828b743f
+DIST gspell-1.11.1.tar.xz 432216 BLAKE2B aa6e6873fcb9cc7d3e7e05fe0abdd3b2e271c0483b7dc4d1c28179b87cea66b0fef86aa6ca94b7a571447ab70ac4ec55ac04b4b1f78415bea2db6c4f8fbc69ce SHA512 df13ef76340b3f644b517f05941c4a11f90212511229a4644cda0d605af428222bf7dd15dbdf51da80e07b7689249728f5739020349226b78d1990707f9706d9
 EBUILD gspell-1.10.0.ebuild 1520 BLAKE2B c6df5d6053d5d53a0de4cc3a18e034cac8a09ed97ae488cc7b2db8827b1fc1c4f42d4ddecdbcc2b39898af2e54ea5ae80ec829ba9d86e7452f3495f32e6090ee SHA512 80093a05324dce95b86c79b3197201a3cf1a120ae5dc7b012ff171d521e59056daf3978431bcc8566bea65df96733ece84891b5f703bbfcac00987af6eeb1947
+EBUILD gspell-1.11.1.ebuild 1524 BLAKE2B e661270fff866f6f14d00ac6be9fab9e2b3c5db69c261d2d5ddb944e0e1cc23e65a9ecb99133b2407073a65b39dd3cb96471225f4257905a858dddf71032e931 SHA512 b05191ad4a46ced2f3814d13894d26b6ce087e3efc33e9c37f95703efd0f5cb8d8bf13c972c76541b90dcbee81fc414fa29a4182fcbf8c724508ce7f59163dc7
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/app-text/gspell/gspell-1.11.1.ebuild b/app-text/gspell/gspell-1.11.1.ebuild
new file mode 100644
index 000000000000..41d559da553d
--- /dev/null
+++ b/app-text/gspell/gspell-1.11.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2 vala virtualx
+
+DESCRIPTION="Spell check library for GTK+ applications"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gspell"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/2" # subslot = libgspell-1 soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="+introspection +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	>=app-text/enchant-2.1.3:2
+	>=dev-libs/glib-2.44:2
+	>=x11-libs/gtk+-3.20:3[introspection?]
+	dev-libs/icu:=
+	introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
+"
+DEPEND="${RDEPEND}
+	test? ( sys-apps/dbus )
+"
+BDEPEND="
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.25
+	>=sys-devel/gettext-0.19.6
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+	test? (
+		app-text/enchant:2[hunspell]
+		|| (
+			app-dicts/myspell-en[l10n_en(+)]
+			app-dicts/myspell-en[l10n_en-US(+)]
+		)
+	)
+"
+# Tests require a en_US dictionary and fail with deprecated enchant aspell backend:
+# So enchant[hunspell] + myspell-en ensure they pass (hunspell is ordered before aspell),
+# however a different backend like hspell or nuspell + their en_US dict might be fine too,
+# but we don't support them at this time (2020-04-12) in enchant:2
+
+src_prepare() {
+	use vala && vala_setup
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable introspection) \
+		$(use_enable vala)
+}
+
+src_test() {
+	virtx dbus-run-session emake check
+}
diff --git a/app-text/lesspipe/Manifest b/app-text/lesspipe/Manifest
index bab4acda4ef8..23a3ca92b062 100644
--- a/app-text/lesspipe/Manifest
+++ b/app-text/lesspipe/Manifest
@@ -3,5 +3,5 @@ DIST lesspipe-2.04.tar.gz 166831 BLAKE2B c33620b1c2714b01a89eaaeaeccfd72e62fd512
 DIST lesspipe-2.05.tar.gz 167135 BLAKE2B 6f54a68a3857fcafa19148ba798d6ac49b2693e547e88a4a4fb6a178768d75ba8ae08e808a9e08aabfe903538bd401e3bd25e22ec240bf3a52365df729d87b9e SHA512 b4220b28fb609060735663067f5a738cae32d12e90efc397db3749e4dcfa7bfc063a4458c1f39b8a43be3b04effdc00a25c4feebd6e9a3b23f0064b879bbb698
 EBUILD lesspipe-1.91.ebuild 1735 BLAKE2B f09055204a532dc057d43bbf1113c9bc7467f06a97c1ac26555dfc207842610fb863ee485a8b790e436c580f52bcc9ea3533c0ae771331bd031acca9189bdcba SHA512 7b47ec9975fa13326a09998fb059fa81f03f6c2b28e364a12e7e8b6e9e6ca201c64f5a650def68b132856f0b15a9524f82e5089992632db3069a42db7db3b43f
 EBUILD lesspipe-2.04-r1.ebuild 1241 BLAKE2B a74271a5e3777c9988cd1ae5221837468dd7ac241afc62413e06aac6e89b69fcf66ff94fdf2e029836786f9ae04d7011ccc0f00b49fea7f29c4fab83c5cf7598 SHA512 9ae0f89a7044b34ab5d6983e1e3dad36b42ccaa857554e551bef2b5ba059ee243a9d04b07c179426ae9d9a0604fa26ac56dd5289dec14d6854e5bc612b17d50d
-EBUILD lesspipe-2.05.ebuild 1240 BLAKE2B 091119c397ac6ca82e19daface9e9eb4fc167de392baf9a5e2d75a740f189e4b518e4fe91cebf2ede7a806b4d1d7b07ed5f51bf1b362e9b9d7466b7446d8c67c SHA512 d3f2d423c95a795555dcf557ade32a04db1ed4adb1322a25a62cf445b01a6793c759523bb460a3b89bf0c8d618191db2a5e028068356353307322fda323d59d5
+EBUILD lesspipe-2.05.ebuild 1239 BLAKE2B 2265355eb134120872f08556c2835d08326842fd6e988cc5db9dbee8646370997c4499b2e7275637904ffef8ac836e7766a294a900a10d5a36a36309e6ca6c91 SHA512 b294b4a0aad7a1d20eefd74c93494fe73248b1e75710219575f70a5c6203da3c8a1db0b8e28f6b5f1c18e415238005546f6c87218a87fd038ffa66c664fcae7b
 MISC metadata.xml 304 BLAKE2B bb5be96b5fd22ce82d800f6bd5ed3ceb04b955182eaadc1f34b6f4b633c21efd6148013fc29b5567f7ada4da5de6efd7e0e420fa63a2976a5cf6bcf719c34f2e SHA512 2c217e67c6c487f7f7f98588a50086daf434bc25ad229b68d37bc12f7ecc4f904b5bc4a3b7b6db4a1daa0267c7e13fde8538de1c16d11e95be6b8071ee675105
diff --git a/app-text/lesspipe/lesspipe-2.05.ebuild b/app-text/lesspipe/lesspipe-2.05.ebuild
index 8f2604612472..cee412a1d9fe 100644
--- a/app-text/lesspipe/lesspipe-2.05.ebuild
+++ b/app-text/lesspipe/lesspipe-2.05.ebuild
@@ -11,7 +11,7 @@ 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"
+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"
 
 # Please check again on bumps!
 # bug #734896
diff --git a/app-text/libetonyek/Manifest b/app-text/libetonyek/Manifest
index f12a313ea8af..2074d6b53214 100644
--- a/app-text/libetonyek/Manifest
+++ b/app-text/libetonyek/Manifest
@@ -1,5 +1,4 @@
 DIST libetonyek-0.1.10.tar.xz 1494000 BLAKE2B 1c47b410050380d134d96b5551f0c9186c24aa0ea52c801e26655e3013f030e92198d8e3f19e8a341744206eeaad2d10ca130f286fd42c8a9c3b56f773cfa7d5 SHA512 516a14fcb7b7b5898484a4263d593a036ac728b90144da9d1c22a5d0fdffc879839e19a7b390f99d924c390d433e64433fb08939b1e04ca24359315571c5772b
-EBUILD libetonyek-0.1.10-r1.ebuild 1295 BLAKE2B f2202d041774e65649934e93fadf538412d5b2c311867ecffe6f4e2df1766d7f57ebcca2420555a807561c207ce0f95c4d755e6ed35ffbbe1df62ab4fc73ac3f SHA512 d2352e5e69772e6269ab3fccb18bbfae305d4146d8f87f175c7ca19fc27d26229953667a0211387ba6702485de8996ac0cd01db17df11d00d819d77cbf483651
-EBUILD libetonyek-0.1.10.ebuild 1227 BLAKE2B 8b9d5d6e7f5ba4f359789de601f3342c402076f618ae8ef8a5d458cedc204f61ccabf1f7e105fbfd425fb777efaf0874b0df6ac13d2bfba8277c45f22b9d6d55 SHA512 6fcbe6c765e07e1bfa5b49436dfd30e334bd1b2a5f511b1009d1c59dabfdfdb3f77ac60cf61c71dd5048b63b65a100d972fbb2cef5df73a1a482dbba4c84d8a1
+EBUILD libetonyek-0.1.10-r1.ebuild 1293 BLAKE2B e49b12f90c75a62bf2bbb7663f16314bcbc1e5b3348d064e72c179398248989b30f1a7c810ebeaa61987fd8aef366f99d1b459f2ad05cad214630a6b550721ab SHA512 c0c7f4533ec7ae73605cc10bc0fb3669554b5585a77345319b1a0c08e59e781e808354d74d30bd26c6f9539b875761743bf1bf298424363e7769ef74e8f48041
 EBUILD libetonyek-9999.ebuild 1276 BLAKE2B 92899b54029c3adacd40ae83060d17453b8246cd748a334a9d694565699e4041c1e4d0152bae510f94146bd2a453ab1d6e2f6b05c920bd38c86479eb0d87d585 SHA512 a816f52f1d7f844db8ea56cd8bd10a04e94e55148ec46c7de80baa3c84825c2f67c4307acf8a0dde2a6fee7e64357d4f01c9e27c4f306a447e1360444a0d2ea9
 MISC metadata.xml 256 BLAKE2B 28554175365761f81817e75e2c125714b94680527103d72118d0daf2eb0d2359082c36f2c8b0e92574e93c9c00038c944486a31d7843108dcc285d809bd52fe6 SHA512 1a0e13dd42f80f5c8669910c7360c6c1542e9a2f143da3a812f874966ba4729248152efb36e03bdfd47f09086797e6e1410e1ac735925d304811c847aa2b6398
diff --git a/app-text/libetonyek/libetonyek-0.1.10-r1.ebuild b/app-text/libetonyek/libetonyek-0.1.10-r1.ebuild
index d7614db7d83a..0a06b6adefe4 100644
--- a/app-text/libetonyek/libetonyek-0.1.10-r1.ebuild
+++ b/app-text/libetonyek/libetonyek-0.1.10-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	MDDS_VER="2.0"
 	SRC_URI="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 fi
 DESCRIPTION="Library parsing Apple Keynote presentations"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
diff --git a/app-text/libetonyek/libetonyek-0.1.10.ebuild b/app-text/libetonyek/libetonyek-0.1.10.ebuild
deleted file mode 100644
index 141836ac1196..000000000000
--- a/app-text/libetonyek/libetonyek-0.1.10.ebuild
+++ /dev/null
@@ -1,58 +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://anongit.freedesktop.org/git/libreoffice/libetonyek.git"
-	inherit autotools git-r3
-else
-	SRC_URI="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-fi
-DESCRIPTION="Library parsing Apple Keynote presentations"
-HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
-
-LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-IUSE="doc static-libs test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-RDEPEND="
-	app-text/liblangtag
-	dev-libs/librevenge
-	dev-libs/libxml2
-	>=dev-util/mdds-1.5:1/1.5
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	media-libs/glm
-	sys-devel/libtool
-	test? ( dev-util/cppunit )
-"
-
-src_prepare() {
-	default
-	[[ -d m4 ]] || mkdir "m4"
-	[[ ${PV} == *9999 ]] && eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-werror
-		$(use_with doc docs)
-		$(use_enable static-libs static)
-		$(use_enable test tests)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/app-text/libnumbertext/Manifest b/app-text/libnumbertext/Manifest
index 9f1ebb5672ee..fea92f6c2b6e 100644
--- a/app-text/libnumbertext/Manifest
+++ b/app-text/libnumbertext/Manifest
@@ -1,5 +1,3 @@
 DIST libnumbertext-1.0.10.tar.xz 292852 BLAKE2B 1dfc5bd974525a3923325357c30cc80ecac0be856288cfc9effe13a0cda5f45eba22b333b606113bea8dff0bc08333a4b203f539b860ec48e214c35bc4dacb41 SHA512 6cb1b09b43c77f9fe1928d72deabdd06cbb3f7185823fcf045855b26ea6e0e017b2eba9dcd4725161012ed6d37a416c98b838145aa418bd0bd79ce52bf456417
-DIST libnumbertext-1.0.8.tar.xz 292568 BLAKE2B d385f0bdb19013673190533a21305e12211e1427d59503a9b3c54bc1deda27f405dae347c4cc43161766a901ec14c9ea4b0eed17ba468eb0855ef1a6b0ec95c3 SHA512 b29e544eac25a0603ba7fc68744ac54a372402af32f4bbf52f2373b280efce2eb6831c803d0a10e1f674988839f4c123b8a120e2697bcfa2510d3852d856fe2d
-EBUILD libnumbertext-1.0.10.ebuild 525 BLAKE2B ddfb244ce2f518c11048b62106b398a4341bf4626883d488ecbe9de5a1069b3f4e84cd96552f59453114f49c7a2edc0b86816424ac6a418dc25bede3fee7e2a6 SHA512 44590f2ea7b3807a8a41b972f485fe9e826dcea45d45cbed9111d2ee6d27c6bc57d6864e24789bede6f3a58454014f117df48e76a37238fafe0e9d2ac7047b7c
-EBUILD libnumbertext-1.0.8.ebuild 523 BLAKE2B 9b6d75ee1dfad2dd7d235d162e97b9f6794b3fbb49443af00556a24fc9fe3a4badb3ea8c22bdbe9ffeb3d7d6e8df101a655fa69a20c7e8e79c2659caaae1fd7d SHA512 7d1743a4682fc83315af6204d72ea37f68c76dbf66f8dcc108ef03138e0cbcad970a88938d86390e14954aabeb77f8c12fea2b6b9a834021125f2330698014cb
+EBUILD libnumbertext-1.0.10.ebuild 523 BLAKE2B 9b6d75ee1dfad2dd7d235d162e97b9f6794b3fbb49443af00556a24fc9fe3a4badb3ea8c22bdbe9ffeb3d7d6e8df101a655fa69a20c7e8e79c2659caaae1fd7d SHA512 7d1743a4682fc83315af6204d72ea37f68c76dbf66f8dcc108ef03138e0cbcad970a88938d86390e14954aabeb77f8c12fea2b6b9a834021125f2330698014cb
 MISC metadata.xml 256 BLAKE2B 28554175365761f81817e75e2c125714b94680527103d72118d0daf2eb0d2359082c36f2c8b0e92574e93c9c00038c944486a31d7843108dcc285d809bd52fe6 SHA512 1a0e13dd42f80f5c8669910c7360c6c1542e9a2f143da3a812f874966ba4729248152efb36e03bdfd47f09086797e6e1410e1ac735925d304811c847aa2b6398
diff --git a/app-text/libnumbertext/libnumbertext-1.0.10.ebuild b/app-text/libnumbertext/libnumbertext-1.0.10.ebuild
index 277f80c5fdb0..33ff29c4d146 100644
--- a/app-text/libnumbertext/libnumbertext-1.0.10.ebuild
+++ b/app-text/libnumbertext/libnumbertext-1.0.10.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/Numbertext/${PN}/releases/download/${PV}/${P}.tar.xz
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 src_configure() {
diff --git a/app-text/libnumbertext/libnumbertext-1.0.8.ebuild b/app-text/libnumbertext/libnumbertext-1.0.8.ebuild
deleted file mode 100644
index 33ff29c4d146..000000000000
--- a/app-text/libnumbertext/libnumbertext-1.0.8.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Number to number name and money text conversion libraries"
-HOMEPAGE="https://github.com/Numbertext/libnumbertext"
-SRC_URI="https://github.com/Numbertext/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-src_configure() {
-	econf \
-		--disable-werror
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 1dcbd2f337ea..3d4853ef7766 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -7,7 +7,7 @@ DIST poppler-22.05.0.tar.xz 1828628 BLAKE2B d1757893c841d35cbdeda493afea92046c44
 DIST poppler-22.06.0.tar.xz 1834980 BLAKE2B 6988480dc30f5fe67be0170f8f006bdb4d3e6b0e0ad8643aa6cbf4fe017d52d8747f108267a30aee5ec4567aa5d2fcc9ce9824fc4dac45a1d37291fa668c2dfe SHA512 79e1a1440a0903ea6238dcc7afc4ecdf1f8cc53af94ec5649f631fca568711d48a7ec4046fccb8520818420dc21e4ad1aaf602c22b13f9ce22f4d06edc83c8a3
 DIST poppler-22.06.0.tar.xz.sig 833 BLAKE2B e2a842fac83b5c42713aa45072d8ea1de5219cbbc35d04142a902f569fc7c558cbda9a2379fde6f9f933b701fabe98f93de71a0676837b2a21104f919a097bc8 SHA512 b61f706e52c57209bb180fbe5a65e366e2a841743ac2c24fc0828dc4bab8ae52da12330e4694e8dade1e1963112fc7b01c0c1b30141be2b7c8c0cf2aaab059c5
 EBUILD poppler-22.03.0.ebuild 3330 BLAKE2B 37880159ec5f793338c8449151889c386058580ac92251ec3394db60128413d173d072e86859c8d8737d36e2c49c62981a5ce923263dccea48ad434961beb3ec SHA512 c2b911637f3a267838bf7a5b106d15c444711d279cd2f1725580748a18764540afa4a3670176845a8eb795c32f7be5ad106e13e7663876a4fb5cb420fe723097
-EBUILD poppler-22.05.0.ebuild 3404 BLAKE2B b19cb2926a802240a0970d99664b23cc5bc59a7f29639e3e18b96b591ab237ad59f53bb2a0fb4732f5e98feb99c44770aa3767d95489e26f0fcfe4d28d28afd1 SHA512 f6200ef2cb218a588ea29393baa2c7e528aae38f9f362b69b727d64f7f629dd29327cb76a80c2a5f700254e19e4d159c1f8ee64ef5a4d2db9a541ed576ecec29
+EBUILD poppler-22.05.0.ebuild 3400 BLAKE2B a8af15cefb7e307f643197826a248ece4d1790bb9baefb630a7ae651dc3587d10bcb66e750116967b06e54dae0e7cf8dc5be75bbd97231ec7c1b1a1defbe8ff1 SHA512 bcb3fa59e0cf31f505603439cafee45ddef5a0a0e757812ee4b10046aff6da64bdf67ccd2945bab6d0d5332df75fc20342061bca9c27610c41e8089ccca7a229
 EBUILD poppler-22.06.0.ebuild 3627 BLAKE2B bb1ec0745496495ef86d376d2d1ca6982a5a5f94a7976fbf7c62305e0e02dfcaa2ca56c6f615e10607379ca28b2779ec0405202232257cf637519707691159dc SHA512 39d1d7e26eac8e3bd11e089d5ff44ad7ac0d39ec2f0245e831b59cb8a34c9d533ff25ea343aaf3ddb83ed867b6f5218897540ddc943d3df7341ca539940c6da6
 EBUILD poppler-9999.ebuild 3628 BLAKE2B be29c55201cdf0c4e31a77538984b0057722b464f548903dd07ff898b9276c4338f0a27d98c8f9ff825f6c07f1fc4a62b761f38ace0a5a3eb6ce5db477744d88 SHA512 f8b03fd6a733bfde1faf5bb8327d952ef8134bf773c1b9d7034b06d88b8f02da247510c84e087fb776701c4e6729b7767b30264b0e5227a785a7563db94f3148
 MISC metadata.xml 1078 BLAKE2B c5ce2245efedc75eb39a6c649d27698da0ac07b87da3240aeb9fea1435d48c3282a8a3bb9f002c78b79de2a518cb73f3eef563c05f41528bb55ffeca84409e13 SHA512 22c83f7f6a7632fc4fe94223be9e5edac085099bf5c0f6621b0179b16e35b98b0027e467e76c0ca365008d765258e05faf48dbc4b1e8d5eb507f348a533f88f6
diff --git a/app-text/poppler/poppler-22.05.0.ebuild b/app-text/poppler/poppler-22.05.0.ebuild
index 36fba432d30a..99e028917dd7 100644
--- a/app-text/poppler/poppler-22.05.0.ebuild
+++ b/app-text/poppler/poppler-22.05.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SLOT="0/121"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index e50790061103..4625cdc91daf 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/gemmlowp/Manifest b/dev-cpp/gemmlowp/Manifest
new file mode 100644
index 000000000000..0e5f4e070a80
--- /dev/null
+++ b/dev-cpp/gemmlowp/Manifest
@@ -0,0 +1,3 @@
+DIST gemmlowp-2021.12.20.tar.gz 842220 BLAKE2B 74139935c01683f894a2ee8bb6f5373a64b8346e5860addd9dcccd47ceffe8942509def3ed242fcd92021c7f82f2e8858313df12369257e2172143a14cec82ed SHA512 934bc79cc951dd18bff413148f3526332685bf0980ddcc0f990ba347bafcd73725e5ffd4bd255dcaa21f0fd71698d26726e2f9f36aa8df87380048041e536e20
+EBUILD gemmlowp-2021.12.20.ebuild 653 BLAKE2B be9ccf2f28c829ee843217feb22afedf200019f9779338381f31331924ef0c58e266da41b0b56f91d41fbae6108f0d7a71ddfdb3a1aa1c80799f8413b9bd091a SHA512 3c29e3cf82151f464885a81108503cd372e1ec6da5365a68fa337b9476aa2242ad1a39a6011e9afaee61688475a430fc457e6f5ea05d491f327939e742e30f6a
+MISC metadata.xml 328 BLAKE2B 6234efe94ede4aaae8283e935245f1c816b14b4d86ad1ec33872ef4b70eb56b27e4da1474e805368363ada175f11bf5a340110f30e72bbde120bf4bdac33b057 SHA512 d3dfd32799f5ca5da4a7c92d4d5f5163871d53bc5bfaadd7f992a4587ebc3d4a178ac37e87566052932da57331a3508dde08ee1995afc4af733fd9a4c22cf0ff
diff --git a/dev-cpp/gemmlowp/gemmlowp-2021.12.20.ebuild b/dev-cpp/gemmlowp/gemmlowp-2021.12.20.ebuild
new file mode 100644
index 000000000000..b7aebddd6910
--- /dev/null
+++ b/dev-cpp/gemmlowp/gemmlowp-2021.12.20.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit cmake
+
+CommitId=e844ffd17118c1e17d94e1ba4354c075a4577b88
+DESCRIPTION="Low-precision matrix multiplication"
+HOMEPAGE="https://github.com/google/gemmlowp/"
+SRC_URI="https://github.com/google/${PN}/archive/${CommitId}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND="test? ( dev-cpp/gtest )"
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}"/${PN}-${CommitId}/contrib
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test ON OFF)
+	)
+	cmake_src_configure
+}
diff --git a/dev-cpp/gemmlowp/metadata.xml b/dev-cpp/gemmlowp/metadata.xml
new file mode 100644
index 000000000000..13b16c5be808
--- /dev/null
+++ b/dev-cpp/gemmlowp/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tupone@gentoo.org</email>
+		<name>Tupone Alfredo</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">google/gemmlowp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-cpp/gflags/Manifest b/dev-cpp/gflags/Manifest
index 54d2b9f4867c..145dfa69ba56 100644
--- a/dev-cpp/gflags/Manifest
+++ b/dev-cpp/gflags/Manifest
@@ -1,6 +1,6 @@
 DIST gflags-2.2.1.tar.gz 96985 BLAKE2B 065dac9cf5d878e4179cb6d56ddf240052a552b72036fd06cb83197d9772a9b97fa544f809c6e1efd6f9ad8cd0222872fc6292c44bc013c5f70e235bcc5b290c SHA512 e919cbdcff1f993ddbfa9c06d8e595566a4717c27ff62f388a64c0e6b4683a93211c24ce78485eae84c2c76053341574064e6c56af185fc2782e2816b26e1fc9
 DIST gflags-2.2.2.tar.gz 98704 BLAKE2B 54cbf3b0a422d662e89c1921614ae9f20a4a383524d374d1e7ce1473eff0a6e121c1a2255df0b9d27ae9866c8e63094b908534c5fd2173737033cc0f184a5e4f SHA512 98c4703aab24e81fe551f7831ab797fb73d0f7dfc516addb34b9ff6d0914e5fd398207889b1ae555bac039537b1d4677067dae403b64903577078d99c1bdb447
-EBUILD gflags-2.2.1-r1.ebuild 1038 BLAKE2B 6666d0ab5579b787f77461c1553fa2597cb042043327311140e79dfc53a1d903b6c3d24c0b9963cd0d42c406f83966af2e0767a023de6f49770a90013459e591 SHA512 8df941707ffadd9478a8384b309026798adade851c285fc5fe4f217ed4c1bc976a846e59fd9884f4a7437f3150e2ad154ef83912925392fb4877bcd7e9bb17cb
+EBUILD gflags-2.2.1-r1.ebuild 1037 BLAKE2B 934c6a370f39c5e1180600682e6577546919babfa63a5bbce2c5a58eb6d86eba9e738fab211a74bd8fbc7f016596346413a7300a5f4971f3f747a8f5ea4488d0 SHA512 13d51fe2b0b92fe55058c864f39163d7d694e4943d520900dff975d79ca72546a2313e412aa52c0e7021db4292d859e52861d203564a0cd3f9bb81b0e8a60fc2
 EBUILD gflags-2.2.2.ebuild 1044 BLAKE2B 0824426c7cb331d8df858945af422c70642f3863652f9af65be121ba8408b78e3bfa9739a7479bd79e15895e770a8c4529befd9870cf752f73e1e8e5314ca05a SHA512 d5ea3b11c48c6a616a6cbf87eca865fe46f86a4fe2e9c3084baae6ca22c0ba04709adba7fe42ed94d95790f1d8efcd57f9775f1bc78e3d3550671c9f0f0c5842
 EBUILD gflags-9999.ebuild 1037 BLAKE2B 7b8a3392378b09f4e0cbe9dadb670fadc87678eae5b547fb63d7b2fcdf48c85af869f7fb089778db4c2a81e4ebbb291cde86bf3065726140283a1208d1a2dd73 SHA512 f83e489704c52ffc9c6788e6feeb29dd295ce9c1bb7390fbe3625cb2afcaef7b7bad3512759cbc8018f8c18a134440a1172a7170f7c872e799212b678745d207
 MISC metadata.xml 304 BLAKE2B 60a6da87c20f4ada3ec9a2422aff9f3fb9eb1a4705f95dbd571188162d2463c29816c96749afe2b79121111251152c41cad9c3ecc71c7cbff39b1b828fd3e1dc SHA512 d05d1c3c886539f75bc1edcac267dbe1c38db77563680091c2a3aab915a0982a43fe9570b5c8b6180a9d2b7fdc1cc96dca313e2a7339a4a6f398cd09eba90f9e
diff --git a/dev-cpp/gflags/gflags-2.2.1-r1.ebuild b/dev-cpp/gflags/gflags-2.2.1-r1.ebuild
index bed6548a3d96..bccf0d7e2b6c 100644
--- a/dev-cpp/gflags/gflags-2.2.1-r1.ebuild
+++ b/dev-cpp/gflags/gflags-2.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/gflags/gflags"
 else
 	SRC_URI="https://github.com/gflags/gflags/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Google's C++ argument parsing library"
diff --git a/dev-cpp/highway/Manifest b/dev-cpp/highway/Manifest
index 368a16d177ee..7c09d5b862ca 100644
--- a/dev-cpp/highway/Manifest
+++ b/dev-cpp/highway/Manifest
@@ -1,7 +1,7 @@
 AUX highway-0.16.0-fix-AVX512-detection-on-IceLakeClient.patch 569 BLAKE2B 89915c3fc3e934415026bbc8e19bd8d50b6e3e438f1942b0345832ae6067f7ffaf714d3b99efd3876c6774966cb0cdee05f1dc87788b37c072199d5c714cb937 SHA512 99333059c069f09c59281a7f464805eb41cc6da627dd11ac7dcc565fd688532f162776897ebf506c50e58f17dc7a9486214cc1ec683cb8b2c7efa8b767574410
 DIST highway-0.16.0.tar.gz 1639388 BLAKE2B 660b0079b25a12a2e982b4ba16147b923d167989a7dc1c0cb65ebe5219577f2f02c8774a554fd3fe9e1c10ef7b1cf5db747500bd8acf454e26952722f7b5ac9e SHA512 c08e66f43d9d0b307737b016cfa6c3d3a1df9bd528de435d193388104f34c264866c5ff0da633fc0a6f8c50f21df1ac653e9dd3f6fbfaf227d636411ac14cd47
 DIST highway-0.17.0.tar.gz 1694290 BLAKE2B 23ab48e11e8a79eb0469bb4fef7f32148ef6d2a266779a151345fc072213521f46828c2efcb4ab75823f977c619c7727fb064f05d6b3e0aa341698074e6b0e6a SHA512 7e55724c844a09a07cb981a7d8e913dcc5491e07d14ff3e7783a69060b0c470e7d5adc4f5dbeea526b3e109eea8cc9e80605d6b8d2da1b794382e56fd534ba06
-EBUILD highway-0.16.0-r1.ebuild 939 BLAKE2B a6aa0fde15b40bc750c41156ea0c5b8d1fb93f3d3395fa2cd1c72f40f62e734483b0a3a04edf3515356a009670aed9358c6cf964fa4b5503a4c84d4062005348 SHA512 21a03d073418a9311f506ae9fde3b001e2d7f251d8100d0aa6a54a257d5bffd5c76152a228387d0eeeb463852e6527752783d7c0775f36e1abe8910fc73dbc35
+EBUILD highway-0.16.0-r1.ebuild 935 BLAKE2B 8484a40941728da18999caf18af1726b9c40af9a4795e11964dcf2f3cd1a5c7bcea340154fc60cc52d9a5ce2ae0531e464b88a975542156b2e351f035e370918 SHA512 ef056830cc78222567662012d922833b027df578a557bfe64fb076cde91605a0a41b4a9fd08c11f87afcd19512471bada855841bd37ed794a7b5fd1d11fc00b2
 EBUILD highway-0.17.0.ebuild 865 BLAKE2B bcfacafc475dd05cb21bc1f757cde7f83798be0e0836987ec5289aa8628c0588363de2117b4bd86c816bc5f948c416d767a1660b297e1b86c49c9f3de6b715c7 SHA512 b020595afa836c92fe12549746cbaed9952f6ee485f521d85bb7276088d651cc8d89acb8bcb6181077a0913329e6cc07560f3fb5dcfd1fc88c6fc44174d04b2d
 EBUILD highway-9999.ebuild 865 BLAKE2B bcfacafc475dd05cb21bc1f757cde7f83798be0e0836987ec5289aa8628c0588363de2117b4bd86c816bc5f948c416d767a1660b297e1b86c49c9f3de6b715c7 SHA512 b020595afa836c92fe12549746cbaed9952f6ee485f521d85bb7276088d651cc8d89acb8bcb6181077a0913329e6cc07560f3fb5dcfd1fc88c6fc44174d04b2d
 MISC metadata.xml 617 BLAKE2B 85392a8a226aa984039fed26796d0baf6bdb38da7084932e59ec6dcf882ba11863066adff2caffcb34b2b9f337b539c64498cf48c4eea43364ebf2522ea9971f SHA512 5ec72623048e7c940af745ca256671402dc2126004b2be29e01891619c119f847ba1ed72b99f66ee44b8076510833444f5c733a9724e1b9eb13bc58a125e16e4
diff --git a/dev-cpp/highway/highway-0.16.0-r1.ebuild b/dev-cpp/highway/highway-0.16.0-r1.ebuild
index 98782f199f51..7d9849c329da 100644
--- a/dev-cpp/highway/highway-0.16.0-r1.ebuild
+++ b/dev-cpp/highway/highway-0.16.0-r1.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/google/highway.git"
 else
 	SRC_URI="https://github.com/google/highway/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index df1254d053d8..5410677a8d0c 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index cb1834033874..5fab16883b96 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -3,5 +3,5 @@ AUX myodbc-8.0.19-cxxlinkage.patch 812 BLAKE2B 18e0f62ceb6bb33ad282972a8aae2f755
 AUX odbc.ini.m4 406 BLAKE2B 3a20c28b1971753a14a4aa4d30efcc7de833488501a41d9404987567623d48250ce1daea1d3138adaef36741c4f2e0eafc60eba554e5262b45084f93f5205160 SHA512 84ab2a3aab594123d42b65205a7faf8e91fe9416a9e3c4c4c354533b9a298395f59172649c91dc0b671392bfbe5baeaddb6aa47119ce4c825917f3977d9dd521
 AUX odbcinst.ini.m4 118 BLAKE2B 6da835746e063f415ad7d640233cfd96e744cd56e12aaab4a21a2bf0bd5f1bd1e5c3d1c9a28522e3aa07c1261abac92301819d4112ac6a000a729aca9f7f7ad6 SHA512 6d929bbffd602a9f060a05998149a6b16334f8a5e3db30d02ff5d38c0065085d085042521e700b87a63766e32aa27ae92be72cef33c2a7aa8f6767b6b71c82c8
 DIST mysql-connector-odbc-8.0.27-src.tar.gz 3849283 BLAKE2B 6a2500cdd706c0f8cda83dd04d3e573baa0bfbad59c931e20bb25a3f09dd78d2380079d0a20e075c3f44482d58acb6e727f4cbcf490e9d4d7817dd26f98061ee SHA512 4f907b7647425c274d3bd1c3b3ebbb83ac2360f2ee56733dabb501c17b800a26ef1117e16e5b05180ff904bfc642d25393baa861b96a79edf9d35f186a8689b2
-EBUILD myodbc-8.0.27-r1.ebuild 3408 BLAKE2B a0aa95db130a8137214e88c9e5922a025e60fc0466d68cc71b26a441fc3b87c80794379584b3e47fdfb81a1ef03187f936a9281895084e74e46498b20ea35791 SHA512 2e12db4abb07d5c7cf1952230b4bcd40ab3e8ff0b7a630a28c81a37c092e89e4ad350cd1565a68fe86a5c182bf409fa1a257f1220c3ba58f57a95ce1f0997a89
+EBUILD myodbc-8.0.27-r1.ebuild 3410 BLAKE2B a919e2e970db665aca72254ec500398ac66c8764c9fe9facb80622f09315d0adff2361cbc8e519b662f537eb281969742b65ccd01ac00691f49a8c3a96f689b0 SHA512 be0c63f9c25595843a99466832609f93d059f526bcf3bf346e1babfc93f8b25deda97fc267b62311ed4a687e561bee8cbd486fa59594a69fb76ce3ca90db721c
 MISC metadata.xml 240 BLAKE2B cc93ae4da8408b221c296e092d9db6ae3879754ade669d81c1218d53a5f007c6b7717bda6f92dbb0af38ff9b5e45f44e91503b12d3603d9955ec7d5a2a67399b SHA512 0f41c32ce3d736e061302252f14913d7425bc97e19d0c2f3b80c50637ab3521aa6cfc67f82e5f70f91174cddb36bb5622837dc18fd9db3bf75eb860359aade27
diff --git a/dev-db/myodbc/myodbc-8.0.27-r1.ebuild b/dev-db/myodbc/myodbc-8.0.27-r1.ebuild
index 7689549feac7..7faa6c20acdc 100644
--- a/dev-db/myodbc/myodbc-8.0.27-r1.ebuild
+++ b/dev-db/myodbc/myodbc-8.0.27-r1.ebuild
@@ -53,7 +53,7 @@ multilib_src_configure() {
 		-DMYSQLCLIENT_STATIC_LINKING=OFF
 		-DMYSQL_CXX_LINKAGE=YES
 		-DWITH_UNIXODBC=YES
-		-DWITH_DOCUMENTATION_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}
+		-DWITH_DOCUMENTATION_INSTALL_PATH="${EPREFIX}"/usr/share/doc/${PF}
 		-DLIB_SUBDIR="$(get_libdir)/${PN}-${MAJOR}"
 		-DMYSQLCLIENT_NO_THREADS=ON
 		-DDISABLE_GUI=ON
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index a3d73400a79f..2eadab6116cd 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -5,9 +5,9 @@ AUX my.cnf.distro-client 637 BLAKE2B b0812e0e03aa9a3b2e55e08b933a0b41b6afd95ded6
 AUX my.cnf.distro-server 994 BLAKE2B 41dceff58edf748f9f60ac3c0d1682d2fc2f026fc1fd14b4c2dea398814beda3c09aabea04dd3a9e145464524c629e7e69dc257d1245e0a46dd8584b7f685172 SHA512 cf172edc23d3dda49c21af6b8adef8aa13694d8ceecddf1d612d4ae34d00ba53c51ae4ae7ca4d11083eeacb5d862f59a855a9d80e9e448ab8bbf17f42aac2650
 AUX mysql-8.0.27-gcc-12.patch 521 BLAKE2B 849f290e40e526e64dad0c39e9a980ad14f1061bd7465c965608670e65c3aabb68b3928120153e479f034af935ea32dd08394c06ed56d4ef24f5bea7e24ff0e4 SHA512 fb8023a5914242ae591d266905f83e241f480b58eef1748637bb139d4ae67f0e180b21cd0cdd684bfb858628845928c43c95559eacf74c712b5854d4e34c6768
 DIST mysql-5.7.36-patches-01.tar.xz 6396 BLAKE2B ed9783f207d40fc220992c4193bdd8e96523f69414daa756f1f30306c1aedff9e96216ba2294a4c41eefbaf39c8bb37784bf1e7cce656c93f829c9cf0682fa6d SHA512 b0fbd41ebb2d32067e6c81707dffa91fece2d368f4b2fa47951492936509972d425b64d7613748c42b31cf9ba9dab697efeff70debe7268855a90d322d3f3158
-DIST mysql-8.0.27-patches-02.tar.xz 7204 BLAKE2B 1a3548f8b48b63a1d38cd9826f8ed2daf3d396276e8887e0a02a73fb91e544e1d0f1da9560351f03d3345d2ea5e8f61e5a9df2bce80558143bd3bc2558372232 SHA512 86c660d67d883fb84e6a38c39994bc30669c18b1d5bdedf908f112c7ebb59f0acf23903e6a81f01de1e6862a8cb779c7b537659ff18b090306eacf668dea47f8
+DIST mysql-8.0.27-patches-03.tar.xz 9864 BLAKE2B 03136477a97a5bff0c5f1cbc7921a77d9b36e148e94f80463f00f0efd1a6859af4595f9cf15aa492bce043fdc9d6c6328bd64102f8b0127eacbc7795b1785ecb SHA512 8c00c8fef2b01389f59138eaa29399d8a9ce7930b6bdfb7689d1d7bf14a32fbb10a2b8dbe91933b805899ef3af0cf0bda704d4be14249991b381054bcc496058
 DIST mysql-boost-5.7.36.tar.gz 52968383 BLAKE2B 4d5e4fcf8d56f4a1d1d54ee889d432ee3265f55ff9c0ecf6fe216e67790a49ed052b94457680daef4cb42df29f14db7b0e678e0f0443c20b7e2324c772c24313 SHA512 a95580efd5b87776ee7f1aae9b50d50d88c70a48c16e7a2d8c6ada0b1cadc5ec6074a859291a65caa1b50a00e08a9e350df342bb0c6ef74edaf21055331c081b
 DIST mysql-boost-8.0.27.tar.gz 292184025 BLAKE2B 177209f3c62b0326ca9d021c751a701dec84c1b15c946ab0a68b1b4cf0620468eb3a1df77a918284007a0fde1aaa6a9767d0baed57936612813ef583df51c35e SHA512 6ef2426c0bee46bdf8e2fa5cb159d5ae19f0bed4f7c9bea9b33e0dd922b568c3c68ca063dcbcd7ea6904aaea31877c10064ea10b4bc63fb40d9f31778e3a7891
 EBUILD mysql-5.7.36-r1.ebuild 38618 BLAKE2B 88cbf474a83eb94fda420147ea1de13018e75662dba65a285d047e42c4c5207ee98b9db30d536549652d6d9b68bb5b965c1328fb9588886a228170dd61d7a175 SHA512 44bc69ac677e4f3f57310ea7c2837ab9bd0b7da046fdb88a2e5f6e65831e081d79051efee50878d3a372db3a9e246a1b90aa9c059cfbb37c7e24e332dcfc3d75
-EBUILD mysql-8.0.27.ebuild 40637 BLAKE2B 8493928a38f6bce741ead38279ce863e59c8777b1ee0958eb49962934bb82428c8dc0a5f4012f9b9bde3f0642de448973910ac0e91dca500574d8972577b1f4a SHA512 d3697399f2e07b7f79274260cb33037588de776618a17749b0d13925813d7b7956523f29b36dabe0b8f3bdb667a28e110b0574674d4d2d02e2326f68150ac246
+EBUILD mysql-8.0.27.ebuild 40649 BLAKE2B 697317775af7f5ac77223ee39ca07f9a0069f7f62d722ce6f49a3921cdbc4248944e1b7ae868e0514a922d4488046b854cfdffb70db9eb8f5200e1f95f4bcada SHA512 9c02e6c09562ceb0103ebe6c1d8fd43cfa377962f07206a14d48d6fe38cb98ed352fd723cfc016d5f872458771d59ce2531c407dd426a7203e9f88053274e65a
 MISC metadata.xml 1265 BLAKE2B ce4c9d4870ab4915abe269b27cba4854c0b5d1f44683ef6e9ed5ad7eb17e0e89b9f0b5ecce77477819afc16d9b769de4d084457b4a10032969d53dd093af209a SHA512 1cd8b25e9f1979ef95babf5a506b3978569e341a031b9e4d52b383166f3311310934338747b05363e11bcdf61f3c76f6a4eff62f7ed949bc151c1ed3c93dae42
diff --git a/dev-db/mysql/mysql-8.0.27.ebuild b/dev-db/mysql/mysql-8.0.27.ebuild
index 88957adeb167..18c7bf808582 100644
--- a/dev-db/mysql/mysql-8.0.27.ebuild
+++ b/dev-db/mysql/mysql-8.0.27.ebuild
@@ -12,12 +12,12 @@ MY_PV="${PV//_pre*}"
 MY_P="${PN}-${MY_PV}"
 
 # Patch version
-PATCH_SET="https://dev.gentoo.org/~whissi/dist/mysql/${PN}-8.0.27-patches-02.tar.xz"
+PATCH_SET=( https://dev.gentoo.org/~{whissi,dlan}/dist/mysql/${PN}-8.0.27-patches-03.tar.xz )
 
 SRC_URI="https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-${MY_PV}.tar.gz
 	https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-${MY_PV}.tar.gz
 	http://downloads.mysql.com/archives/MySQL-8.0/${PN}-boost-${MY_PV}.tar.gz
-	${PATCH_SET}"
+	${PATCH_SET[@]}"
 
 HOMEPAGE="https://www.mysql.com/"
 DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
@@ -37,7 +37,7 @@ REQUIRED_USE="?? ( tcmalloc jemalloc )
 	tcmalloc? ( server )"
 
 # -ppc, -riscv for bug #761715
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips -ppc ppc64 -riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips -ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
diff --git a/dev-db/pg_activity/Manifest b/dev-db/pg_activity/Manifest
index 79019479bb69..49c8172635d5 100644
--- a/dev-db/pg_activity/Manifest
+++ b/dev-db/pg_activity/Manifest
@@ -1,3 +1,3 @@
-DIST pg_activity-2.3.0.tar.gz 283467 BLAKE2B 2f480ebd8b628718a33a772a942e2abfdd91a20cbde2c4aad41d150414bf8cec4478bab475702cd0a31f66af535b373ea706f9b05f948637410a6ad1ef6dcfd4 SHA512 972abddb1871bf4d0b74778ea988f024f33f38335597543d30a2d7549165269a4e5269b1cb649449ff92491501a70b7e3b6b930a154a7ff377e62f7231abb9a7
-EBUILD pg_activity-2.3.0.ebuild 962 BLAKE2B d4c916189e0179baf7d5bd1e6a0eb6eee027e04df5c48aa66b4e7ff2ddd519c644543aa3e12b9df37ada76c617004e5f056db91f4bc87586663c4a97319a3de9 SHA512 997daa08a66a7fcdf4ec59b69a7e64c26786b8317d45282ae7d3f191b04fd464c395c69f7aa53d115363eddb92c43c376f3260be937450892932bbdc90a4a531
+DIST pg_activity-2.3.1.tar.gz 283216 BLAKE2B d8a7382f3343b0e339e69e31a19bdc628d3c79ff12b037500f67900c6875272dffec3fdda8f51e20dd05a2e4e917cdac1562a8e2a9e80362358ba43ba3bdf44f SHA512 26c29ec1701cd2eead8314d2a4df247557164231c53323fb3bed12fbf346e14247addfa508af94cee685a2f0084a26c26118896c4c3395e41fb0eee4a4da2d27
+EBUILD pg_activity-2.3.1.ebuild 962 BLAKE2B 4233bc3bc973c95fec3f592355a146a7573d2e4f8d9488d80a68deba0900c755ba80a12749c05152177cdaeb9cc62d6a801b82877bff95e5026d0ab370101451 SHA512 748f688b1bd4be3fef20926817f75370444070ff6c13a4fed78d4b7d8a667d08f1a02d34eee72eac86329b542b06a215427bad83ca0f6c08f37adb1ac1953bbb
 MISC metadata.xml 340 BLAKE2B 694c72866277373c6387ae8622ab5458f8846cf5ac04c23b2730e490196f8bca1c7d8e94f88b6041a2ecc917a30e78035801f5318fb7fe4c95b9f83f07b81b76 SHA512 3d8717a513c5dbc736585578fce771798540816efc9a683ca38746d03945f1f847aaca9123c07c18e2e7269a4b216a030640d2ec90f7c1951849d8037b656048
diff --git a/dev-db/pg_activity/pg_activity-2.3.0.ebuild b/dev-db/pg_activity/pg_activity-2.3.1.ebuild
similarity index 95%
rename from dev-db/pg_activity/pg_activity-2.3.0.ebuild
rename to dev-db/pg_activity/pg_activity-2.3.1.ebuild
index bfd352359e1d..a7e75c7ee86b 100644
--- a/dev-db/pg_activity/pg_activity-2.3.0.ebuild
+++ b/dev-db/pg_activity/pg_activity-2.3.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
-PYTHON_COMPAT=( python3_{8..10} )
+EAPI="8"
+PYTHON_COMPAT=( python3_{9..10} )
 
 inherit distutils-r1
 
diff --git a/dev-db/pgpool2/Manifest b/dev-db/pgpool2/Manifest
index edfc221ff5f0..158724449fc6 100644
--- a/dev-db/pgpool2/Manifest
+++ b/dev-db/pgpool2/Manifest
@@ -7,9 +7,13 @@ AUX pgpool2.confd 649 BLAKE2B 1c520c4fa954c7411c1b700c03bf4e39196c599eb239cf8641
 AUX pgpool2.initd 2162 BLAKE2B b04f6b952507b8e4815c7b27f09b59ffe64f6262719c5490377fdbc5f8490cdead18fdbeb0ce8379d9cbd4bbb1aa21221d61853ff49a456a5ef6a8d78f3f5129 SHA512 05dd358d20bae60cfdefd7116b1111288b5a2be6d68a9dc40eaf6ba641524d422f2faac79bd3c629cee4f8b1ca601a9b6e303d4228e538d742ea407b6190ee53
 DIST pgpool-II-4.2.1.tar.gz 4713114 BLAKE2B 207cb3c43e47d40385d6808195561117293e5acec6bc34664ec7a1d8754bf9beb8c5350252a4274d4c50520254089f0e5a5fdfc0faf778186fa8000db6124df2 SHA512 b859a3952f69dd98a3df60b33b801d3bc96b9a11757593795a89751abe558c6baab10a37701d69d415c9da26a16abcdc72e0209e74c62204facfb25cdbc512f8
 DIST pgpool-II-4.2.2.tar.gz 4734840 BLAKE2B 2b4d26991732293e1411d1219f85a8c9ad1dca72c63069381ae1377a02ae215e813356172f3b89b42b9140549c92c76d443b125bb65cbc6abf03d2b99cf18dab SHA512 a147c810cc691fb27b823a813cbd2eaad66822c7c9f5c0f829cc70d4ac65911bbe827640f2dbd8060913276ed97340b52167e4332e9cdf013b6c9bc144c7b5d8
+DIST pgpool-II-4.2.9.tar.gz 4642836 BLAKE2B 75cfaf86d2e7a4f9677b7d5a98b783e25458e282b682979d31023372dd827dd0b52bf684949e9c97e404c383ab8b2f526e40b00e643d3d6566c702b111a13e34 SHA512 b0256095298e1c1ee50133b4bdc5716aea52f2ab6dc4dc4152ca0415f9b5ccfc14f97d6af1167e69fa1e2b0fd37468a5a10a1cffd8dfcea8e93b11616a66cf42
 DIST pgpool-II-4.3.1.tar.gz 6034811 BLAKE2B 6ca2a27eefc2b20186d0e5cbdfd838f429d9996e299ab177e655ed69aa214e676029db728b16020dbdc49d9036fe7aad71d6abb12b486a4cf8fb8348bb201c6c SHA512 a5417d9f5baa1b39e3645f7d44accf0a2f04d5fc5cb4d28089169aaebbd15c20b4cd280d09f15fa764c3b793117086fc03f5d7be584c0c5ff9c5f8e11ddb9ef8
-EBUILD pgpool2-4.2.1-r2.ebuild 2383 BLAKE2B a90c4d3e66b39e2d9fc3b2a2c459cf803fdda286a229f7d56b1b1a73ee4b56350a445c82478a9fa418a3a8051e160d76b38c57722b6c61905200bfa064a5e5a0 SHA512 3737cf37b2d0bc21593e730c5d6a39cd3480905535e68eb5d9edfad7cf65a5382d7532af45ae37e6789d7213d863746ace65e73e6323ce9aff13033447d80e00
-EBUILD pgpool2-4.2.2-r2.ebuild 2384 BLAKE2B 2748df59a291c03e24533c69655c3415a769c6c901f68909581e190de6dc1d69b1687a9fb5e48978d427eb612d81eac9c04f0773ea037393d0c37ba39cc4935e SHA512 e3b4219bebe71e3c8d8458f1ebc9f811928014bdd202484abf5e4713682bb8d50a26ae87ba81cccff2f8743f2cb7f77e903e73774e0c7eabe00141a76d43ba95
+DIST pgpool-II-4.3.2.tar.gz 5846769 BLAKE2B 82cfe7095ad303ac3a910c533d6e57edb4e3d5b28a9a9bffb2df473dd3087ec329d3a77f9490d9bb738d5d1a443020d96d0e9a1b1d6adecc04cce5d1caa04e7d SHA512 771426257eddb5c48504c80a2c8cccf44a18f7ea50df55654b7e9e017bda561a73a3e1f0db79785785ff6893d6df26f73b55310d0184ef3301838d12290d3d4c
+EBUILD pgpool2-4.2.1-r2.ebuild 2385 BLAKE2B 02e2a2b25faf32d0cac4ded29ef6be7751e3fb02e6887ca0449375055c82711b095813890250cc7a3cffc1dd76392010a7bfb35a6f19809d0d1715afc7a9d19d SHA512 2c657926d9a44b369e424111def6d72ba7bf3979f33b516ff071d55d382b3bb89b0adc2c0bf60d1abbf2f94d077cac05b1ea14207fc249247a3e46bbb60b30dd
+EBUILD pgpool2-4.2.2-r2.ebuild 2386 BLAKE2B 877085b5eeceb6fcbfbaf097c85bf4090d855ed8adff5ac52f83efb613432899bb6b03ace5f7523ea248409e11c88b22aa956b837dca617b2b90071de086ef6e SHA512 b7136a85a7e6a4a696d7a3baf8cd97c9762a6e0cbfbbecd33da4ef583f98e65905c4fe49cdfbf961feb6435e1b90992a784013a65c36289acf5214ff474a9f18
+EBUILD pgpool2-4.2.9.ebuild 2370 BLAKE2B 2d5ac6f8983a3ae52ee1c0e4f95af7b8ba0d9c603fb99950b73fd66519b1ad4d0feab014b192d506c7d8adb6201a1470463e907804a6c5214112cf277f8266c7 SHA512 773356a22f55b2cb485d388013f681778b8955c2966c41de12c74c014f8e12a9cff6e311fad84cc4167f0b51cbde88ff2932d00f7c5f6d4fc145ce483189859e
 EBUILD pgpool2-4.3.1.ebuild 2319 BLAKE2B 3c5663663db3a4e5dc87ea1c522ae79ee07bb217fd6720f9eed2bcc53c22f99e69c0eb5e2361b1b37e54c9013c2d10ac5f258a2507607f430d5ec1f98397f593 SHA512 d62c1383ac31af5db62e72415de448e464471f4b133c8de26c12b03f2ebc72090fe241113d3dc84faafb416c97b45a1ac1642aaa73bb3a3aae8a9108ec2d4585
-EBUILD pgpool2-9999.ebuild 2427 BLAKE2B 7d5b7934db65ee25d2977c26cba86ad8d55b061aea162917afcc9df64b68bf57d56a0cbeafe7f4730d4e4ec24445f5af8ace10d9da61179a874c16545d8ef23f SHA512 3817053648c0bea88cb525a4c3a51a78755269fca76e4a6b7fa8f32239ddb9cb9eb7f32c9df86d05724e84c24fe7cb43dda268a51b60d3e38c230b683f08e9ec
+EBUILD pgpool2-4.3.2.ebuild 2319 BLAKE2B 3c5663663db3a4e5dc87ea1c522ae79ee07bb217fd6720f9eed2bcc53c22f99e69c0eb5e2361b1b37e54c9013c2d10ac5f258a2507607f430d5ec1f98397f593 SHA512 d62c1383ac31af5db62e72415de448e464471f4b133c8de26c12b03f2ebc72090fe241113d3dc84faafb416c97b45a1ac1642aaa73bb3a3aae8a9108ec2d4585
+EBUILD pgpool2-9999.ebuild 2429 BLAKE2B 6e153bb0a6369f55918b043f201ab9e3077098a6e638abbcd2a187014899ac516e1210d2f99c0d9a95e2740ea8533e8d4de67c7febb406fb8837d99785c98625 SHA512 97863b967c82901f19ad8ee64b22fd12b150225e2b8946a7209cd04ff6f92bd72c4619679c55fe22dd77c9b4e21657a4a2eb36ab996bb5bdd64553c046ccb2b4
 MISC metadata.xml 391 BLAKE2B c5855fde95e138709d778b50b897ea0dd75267547e89faf60988d1dfe78740c313291a226c30fdd618ef2893ad3dc11000b33026e04369fe294ca9ed1e18efb1 SHA512 374bd70841f1f13e2f8265f972e2debc7fb79a3f463efb897a75fd8ddc3163edf82c888d3d8d5bfede6c509fc27f67e74592599b8da8640035a5d4241cad98c1
diff --git a/dev-db/pgpool2/pgpool2-4.2.1-r2.ebuild b/dev-db/pgpool2/pgpool2-4.2.1-r2.ebuild
index d34913fcacc3..d3efaa96ffff 100644
--- a/dev-db/pgpool2/pgpool2-4.2.1-r2.ebuild
+++ b/dev-db/pgpool2/pgpool2-4.2.1-r2.ebuild
@@ -56,7 +56,7 @@ src_prepare() {
 src_configure() {
 	postgres-multi_foreach econf \
 		--disable-rpath \
-		--sysconfdir="${EROOT}/etc/${PN}" \
+		--sysconfdir="${EPREFIX}/etc/${PN}" \
 		--with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
 		--with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
 		$(use_enable static-libs static) \
diff --git a/dev-db/pgpool2/pgpool2-4.2.2-r2.ebuild b/dev-db/pgpool2/pgpool2-4.2.2-r2.ebuild
index d05f5c5dea0f..c8b5484a0cdb 100644
--- a/dev-db/pgpool2/pgpool2-4.2.2-r2.ebuild
+++ b/dev-db/pgpool2/pgpool2-4.2.2-r2.ebuild
@@ -55,7 +55,7 @@ src_prepare() {
 src_configure() {
 	postgres-multi_foreach econf \
 		--disable-rpath \
-		--sysconfdir="${EROOT}/etc/${PN}" \
+		--sysconfdir="${EPREFIX}/etc/${PN}" \
 		--with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
 		--with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
 		$(use_enable static-libs static) \
diff --git a/dev-db/pgpool2/pgpool2-4.2.9.ebuild b/dev-db/pgpool2/pgpool2-4.2.9.ebuild
new file mode 100644
index 000000000000..c2ce05764ea6
--- /dev/null
+++ b/dev-db/pgpool2/pgpool2-4.2.9.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( {10..14} )
+
+inherit autotools postgres-multi
+
+MY_P="${PN/2/-II}-${PV}"
+
+DESCRIPTION="Connection pool server for PostgreSQL"
+HOMEPAGE="https://www.pgpool.net/"
+SRC_URI="https://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc memcached pam ssl static-libs"
+
+RDEPEND="
+	${POSTGRES_DEP}
+	net-libs/libnsl:0=
+	virtual/libcrypt:=
+	memcached? ( dev-libs/libmemcached )
+	pam? ( sys-auth/pambase )
+	ssl? (
+		dev-libs/openssl:0=
+	)
+"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	postgres_new_user pgpool
+
+	postgres-multi_pkg_setup
+}
+
+src_prepare() {
+	eapply \
+		"${FILESDIR}/pgpool-4.2.0-configure-memcached.patch" \
+		"${FILESDIR}/pgpool-configure-pam.patch" \
+		"${FILESDIR}/pgpool-4.2.0-configure-pthread.patch" \
+		"${FILESDIR}/pgpool-4.2.0-run_paths.patch"
+
+	eautoreconf
+
+	postgres-multi_src_prepare
+}
+
+src_configure() {
+	postgres-multi_foreach econf \
+		--disable-rpath \
+		--sysconfdir="${EPREFIX}/etc/${PN}" \
+		--with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
+		--with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
+		$(use_enable static-libs static) \
+		$(use_with memcached) \
+		$(use_with pam) \
+		$(use_with ssl openssl)
+}
+
+src_compile() {
+	# Even though we're only going to do an install for the best slot
+	# available, the extension bits in src/sql need some things outside
+	# of that directory built, too.
+	postgres-multi_foreach emake
+	postgres-multi_foreach emake -C src/sql
+}
+
+src_install() {
+	# We only need the best stuff installed
+	postgres-multi_forbest emake DESTDIR="${D}" install
+
+	# Except for the extension and .so files that each PostgreSQL slot needs
+	postgres-multi_foreach emake DESTDIR="${D}" -C src/sql install
+
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+
+	# Documentation!
+	dodoc NEWS TODO
+	doman doc/src/sgml/man{1,8}/*
+	use doc && dodoc -r doc/src/sgml/html
+
+	# mv some files that get installed to /usr/share/pgpool-II so that
+	# they all wind up in the same place
+	mv "${ED}/usr/share/${PN/2/-II}" "${ED}/usr/share/${PN}" || die
+
+	# One more thing: Evil la files!
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/dev-db/pgpool2/pgpool2-4.3.2.ebuild b/dev-db/pgpool2/pgpool2-4.3.2.ebuild
new file mode 100644
index 000000000000..f78d11206305
--- /dev/null
+++ b/dev-db/pgpool2/pgpool2-4.3.2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( 9.6 {10..14} )
+
+inherit autotools postgres-multi
+
+MY_P="${PN/2/-II}-${PV}"
+
+DESCRIPTION="Connection pool server for PostgreSQL"
+HOMEPAGE="https://www.pgpool.net/"
+SRC_URI="https://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc memcached pam ssl static-libs"
+
+RDEPEND="
+	${POSTGRES_DEP}
+	acct-user/pgpool
+	net-libs/libnsl:0=
+	virtual/libcrypt:=
+	memcached? ( dev-libs/libmemcached )
+	pam? ( sys-auth/pambase )
+	ssl? ( dev-libs/openssl:0= )
+"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	eapply \
+		"${FILESDIR}/pgpool-4.2.0-configure-memcached.patch" \
+		"${FILESDIR}/pgpool-configure-pam.patch" \
+		"${FILESDIR}/pgpool-4.2.0-configure-pthread.patch" \
+		"${FILESDIR}/pgpool-4.3.1-run_paths.patch"
+
+	eautoreconf
+
+	postgres-multi_src_prepare
+}
+
+src_configure() {
+	postgres-multi_foreach econf \
+		--disable-rpath \
+		--sysconfdir="${EPREFIX}/etc/${PN}" \
+		--with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
+		--with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
+		$(use_enable static-libs static) \
+		$(use_with memcached) \
+		$(use_with pam) \
+		$(use_with ssl openssl)
+}
+
+src_compile() {
+	# Even though we're only going to do an install for the best slot
+	# available, the extension bits in src/sql need some things outside
+	# of that directory built, too.
+	postgres-multi_foreach emake
+	postgres-multi_foreach emake -C src/sql
+}
+
+src_install() {
+	# We only need the best stuff installed
+	postgres-multi_forbest emake DESTDIR="${D}" install
+
+	# Except for the extension and .so files that each PostgreSQL slot needs
+	postgres-multi_foreach emake DESTDIR="${D}" -C src/sql install
+
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+
+	# Documentation!
+	dodoc NEWS TODO
+	doman doc/src/sgml/man{1,8}/*
+	use doc && dodoc -r doc/src/sgml/html
+
+	# mv some files that get installed to /usr/share/pgpool-II so that
+	# they all wind up in the same place
+	mv "${ED}/usr/share/${PN/2/-II}" "${ED}/usr/share/${PN}" || die
+
+	# One more thing: Evil la files!
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/dev-db/pgpool2/pgpool2-9999.ebuild b/dev-db/pgpool2/pgpool2-9999.ebuild
index 2c9d504b504e..d14481554c21 100644
--- a/dev-db/pgpool2/pgpool2-9999.ebuild
+++ b/dev-db/pgpool2/pgpool2-9999.ebuild
@@ -55,7 +55,7 @@ src_prepare() {
 src_configure() {
 	postgres-multi_foreach econf \
 		--disable-rpath \
-		--sysconfdir="${EROOT}/etc/${PN}" \
+		--sysconfdir="${EPREFIX}/etc/${PN}" \
 		--with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
 		--with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
 		$(use_enable static-libs static) \
diff --git a/dev-db/pgtap/Manifest b/dev-db/pgtap/Manifest
index 2c1c095c76f7..3d93a97116e4 100644
--- a/dev-db/pgtap/Manifest
+++ b/dev-db/pgtap/Manifest
@@ -3,6 +3,6 @@ DIST pgtap-1.1.0.zip 306590 BLAKE2B efde91e26fafc8300fa39b80d90eef134ebf3a309fca
 DIST pgtap-1.2.0.zip 319374 BLAKE2B 1cea77860a1928ed7cbf4ddb0bb8ff418023bf88e377196ae2b505c065321e3003179227077567e676a8c551230d259ecd1cdb590001fc71bcc821b87fb3d0f6 SHA512 5569bea5e7879787a91fa9b2baae5cbff1db5b9a5a096db2a9a064012d65e02c52bd1520422b5e6f87fb5b6e64845371188ea53c43a277aee68ffc05d5152ed7
 EBUILD pgtap-0.99.0.ebuild 584 BLAKE2B d50187a368d9a9485183a2a3dc9f23aef3fdc9b4f304f7b01eb4b5da1649ca19fb2c9fe60fa4dfc968153946da1e8457b650f7e67a343e402114df02ce9a324c SHA512 e8b2bfbe1fd3bc012dc7b87d92ebc7c7f026296c4c09881255225f648a6540f2c092580ea351d9f780672db61cf4195cf35c2285ca2b6a58cdf3c5c32536d278
 EBUILD pgtap-1.1.0.ebuild 638 BLAKE2B 1c44e86675592fbbef365d8aec2194c83dfdd0e56dd175159eb77bc3ba5a3ce904af9e149cc385cbeedc9847e656c7d8276dc329d09a654edaece1a224182a2b SHA512 c6f7b1c68c3be187b9f7332794cdc51a08bc6507aa9e530aa1bf302869fd0f69c9ef08092bb23d52eba368963ead74bedca374e9d2a3b36b26479977a9d4ed39
-EBUILD pgtap-1.2.0-r2.ebuild 795 BLAKE2B 1f43593a1e5c1e448f3a8fe6bcd2d4de8d4596294d1203fb75c79e3e1bed03d430ed22d1bbb4e19f492a5d30b4dbbb1d55830802f4ce37b3a54b3fa8dfc40eb7 SHA512 e951c154f9571219aab874b79478732a6fa704170adb803406986711c94e080e31a2319694bc149db6d967ae95ee827e872078fd225d51a5657d75ddea2e3c55
+EBUILD pgtap-1.2.0-r2.ebuild 797 BLAKE2B 43a440476c05fad066d40510aaff966d77866a81c3b3579bb0c94d37263a038efb205d9609e901014d046b28853ebba33be820ac5d4ce28f5c6028c3453852de SHA512 f2f115d1e59a2605134830ebde414999bd8e830ba4a2238f9ff3902c4cf0679c2a00d889d4f3daf9fc9fc5cacac1f7abe575cbb38077f8c9ca854169fd4207fc
 EBUILD pgtap-1.2.0.ebuild 638 BLAKE2B ee4f80c5bc1891454996ca3a5572b66bbf5816b503eba567210527683691d8a08d67f6eef73f568dd2df98368d30bfc650e10e6219025cd3c88d7c5ac92f127e SHA512 087436540027476c4958df8536c34d00d1c8c8bcfe629bb158f22d342858c7a0342c1695e705a161e52521407bbfe522f24650f180561c6ac4bcf13bb135a699
 MISC metadata.xml 629 BLAKE2B e7052e443d1a9c728bce35231d7aa287b2844409cc69ecb42b563000a7908e1db49d1a85fe01e8bcafb27fc2741181869895582a77286a0eb16b101ca672d3c4 SHA512 9a3f6c41f8a6577b0c2e29d81549644cf2c74f742aa3f4fca182e6588cc380ac3d2fa5ca07b931d41b24ba0021b81f462d316071ecaa1c3d813cbfa76603f063
diff --git a/dev-db/pgtap/pgtap-1.2.0-r2.ebuild b/dev-db/pgtap/pgtap-1.2.0-r2.ebuild
index c622db920eb2..511d8d8d308b 100644
--- a/dev-db/pgtap/pgtap-1.2.0-r2.ebuild
+++ b/dev-db/pgtap/pgtap-1.2.0-r2.ebuild
@@ -33,6 +33,6 @@ src_configure() {
 src_install() {
 	postgres-multi_src_install
 
-	rm -r ${ED}/usr/share/doc/postgresql* || die "Failed to remove improper doc locations"
+	rm -r "${ED}"/usr/share/doc/postgresql* || die "Failed to remove improper doc locations"
 	dodoc doc/pgtap.mmd
 }
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index ffcccfaf6e9e..8ce77b381b55 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -26,7 +26,7 @@ DIST postgresql-13.6.tar.bz2 21257213 BLAKE2B f5ea95fd9ffc8846e0aaf5bac03b02afa7
 DIST postgresql-13.7.tar.bz2 21364433 BLAKE2B 2d8a505f6de4eb31cae415529eeac750a60abafcf45e7fde29043597b385a8150fac55df659f8c2ad200822e8063d388ed606dff9108d4407f9e26b893fa62f4 SHA512 9254f21519c8d4e926f70082503bb5593c91064a3d2a4ea18ac503dfd9aa94751d6f01ce00fca9fec9b2b7af40caf8d0951b661dd8be4d6aa87c1e35b6fa7a41
 DIST postgresql-14.1.tar.bz2 21887101 BLAKE2B a496dfd513c52339d1b3cb72773f9611721fd7c5d2a702d6fd71f650a1d41c3d7bf6574eba23671c7f9f11718e007f51f9547949bdc3d7fe1ea2248ebfb8d70b SHA512 4a0bec157d5464bb9e5f5c0eb0efdede55526e03f6f4d660b87d161a47705eb152fa0878960b1581bce42a5ed28a1f457825ea54e8d22e34b5b8eb36473ceefd
 DIST postgresql-14.2.tar.bz2 21964841 BLAKE2B 6460533a40064404f18642147b949cf7c85d036c45ede478fb9af8919895ee7b09dc78b89ed08a292226911f07cfc9e46d7f2d42e0aaea546c5e97a291d599b9 SHA512 19aeb6528605dbcf5df84048b2eed8f54b202576134d3fe3900bb8f073179c4258d2581acd745887e7e6fa86ebdb5f7b159ffaa0a645d601efee7c5f7730456b
-DIST postgresql-14.3.tar.bz2 22092190 BLAKE2B 8c9124cb758618d770a1084553f9e8f9a3fcb4e17e1aa4a1649e04f4c057f33ce1e5890bba3288bed2257236a4569735a77b3e5ddf989c2a2a4ef60ed494b3cc SHA512 70e6f67b5729a23f80b92b04e3fad2e09596b939660e3ddebf499d06af946459a45a019279e05413673e7b65d09a28a0440ed3c2ae565068466ed37e2d4f6f17
+DIST postgresql-14.4.tar.bz2 22094218 BLAKE2B 05b65083d826ed2f451b31b29b4b247dfd76b3d24ef05f6be128ee9e58d521d506a3ec4ae4839cbb74d8e217dfae81a95bd97894a778ef3c47b907b85b1fb25e SHA512 dd2f80248684e331d2ffb1e26cd2a285df1fb18710807a0c31aedabf917912ce9267f8ca26318e5371d916c6fe476f8a17886d82d3ff86a974e6f24c19a6aafb
 DIST postgresql-15beta1.tar.bz2 23518203 BLAKE2B 54398d2f6972e7640cbb1211b86c642b205b33ca879d6db7a93ef8a39e294e69a7d8bb0bc7ec5df3455e5a01a5aac63815506ad55b78bf5698d2a77e943031bf SHA512 ced71f4dca02803788890c71a192b0516a41b5bc5b8113623e52183eb143905185affa93b5399b27113e112b9669dbca20cb5783f96e31ff1f5ccd2f8ddc55d3
 EBUILD postgresql-10.19-r1.ebuild 13408 BLAKE2B 242cefd43604dfa557e83172783731f608a350467b1e546a935d1507acb54a2a714bc67175ce5846f82577516b07f4f74de59ae59481363c6c8cf40cb090e5e3 SHA512 2f02d8194f9a1eb51a69e6b8bf1f5b6bf461ce7b77dd983d13d2ccda3c10c1daab2a24c6472c7bd367548eeef53b5ce2dbcb77cfc3a00104787d426c140dbc09
 EBUILD postgresql-10.20-r1.ebuild 13416 BLAKE2B d70e618b0bc07941ff8dd794a64c3cf94798f470c24b0222f505e5c36188ccf51477e1c9a35e71dd753250a7f5fe744297a017289006bcffe2b38ddd3c744179 SHA512 aa03b4ac07f61e75b71ea664546f0a6011d6afe93e6e487c36a634156441422465f6e2680587f8ff3bde2fba04f071c60ab35502099a8657e942a5b24f76754c
@@ -42,7 +42,7 @@ EBUILD postgresql-13.6-r2.ebuild 13923 BLAKE2B 4affe91b5f0d9a50c5c4151614da2aa51
 EBUILD postgresql-13.7.ebuild 13870 BLAKE2B 20258249b38c7d6785a520e1905d07b9893e2324c74fa18b48380d91912bbc0a45031539abe48e586d8856d26ec535b60eedf3a3805c564b353ee11492f033ce SHA512 0d36a3191649a989243283a0d21cd36efc8c01aa3f217449a9d64e1846bec033e281fc4afc40f85e3b0c7ecab05a8c558d247acf765594b561d1082a95f37139
 EBUILD postgresql-14.1-r1.ebuild 13911 BLAKE2B 579d9eb3d1b3ecbbaabfe44c2fefc590ebc7cc3a638e7affc9e4c5235c0da9cfccbd5b21b91cca5455924adbb5cca033b7d0fbfcc444119dce2ce570741f580c SHA512 4a9839e479f1c851f28b9d8738b65ec973346a650190c94b3968bbfa2dd45807a24efeba806a973dff83a7dc90f685616d659735528eff4113b9fbf658c64642
 EBUILD postgresql-14.2-r1.ebuild 13844 BLAKE2B 96791ac26849a47c86282170d2bec9c1b0c2c794664f2429154d1f34ceb3f12c59fbf6ac54e12ecf3dc025f884520260dec8e317f8a28df83878c366e1d9d0f9 SHA512 717076f2136ee41a43825b30733801edc2717222b0dc103ccba74f2b600a3b36d51a9b669cd91adff7c2a2954138bc544738b30936906dda2340671299635108
-EBUILD postgresql-14.3.ebuild 13799 BLAKE2B 40af950a78f56c80e6ea14e3930e67408b53985a7298d857c634dabfe7b15f34cfd6b2c8559c4ae5000f59e5ad19b53000bf4eea1abed345f1697bee711178e9 SHA512 295043db0513669e2e23d6cf1ed36d78da2df4db21bd9dcb8d39497738b1638238b0ce0b7992ae0adda37fbfa8b440a60dd2ba3610a291a1fba923e0e9aa0a76
+EBUILD postgresql-14.4.ebuild 13799 BLAKE2B 40af950a78f56c80e6ea14e3930e67408b53985a7298d857c634dabfe7b15f34cfd6b2c8559c4ae5000f59e5ad19b53000bf4eea1abed345f1697bee711178e9 SHA512 295043db0513669e2e23d6cf1ed36d78da2df4db21bd9dcb8d39497738b1638238b0ce0b7992ae0adda37fbfa8b440a60dd2ba3610a291a1fba923e0e9aa0a76
 EBUILD postgresql-15_beta1-r1.ebuild 13665 BLAKE2B ce6a7544e317469603a81dbab5072a8d142bc2b3ada6f9dc7a72606176f64a1a8f9678e6734893ce320a6795839a8f9aee0d95e82044947999de51a63cc7a922 SHA512 5eb71847b3744f1f8145531e97a10089482631d28121d652fb91ddd2900cb7d4ffb70de58cd3c94fe312fe0777ea2a33f821f0967efe6aa9ea531b0a7cf214ef
 EBUILD postgresql-9999.ebuild 14102 BLAKE2B 821a52a05174b6b4d9c539d01563a45a0edded846b1533b5cc87ccfd45fcfd56bf2e77c49ec8ee1f5cf79d7174f0aaade405591e70aa5d7d81c068fc33fee923 SHA512 e1d8c3ce0347b9db2ba4aeec48cf08d99e522eb5663ae0b84b510baf07be4a06c83a9b6c951952a949a7c3984e373048db0f518ce234117d54ce773fc735ccb2
 MISC metadata.xml 571 BLAKE2B 52be4b6368dba1986339957137ed30eb80bd55407eabb4aa01bb7585e164050a1516e47ff8cde0ae89d79338f074d9b3ac3d46581f6ae5f548ff4f0e6a41c090 SHA512 058797d4559a0fd76b7f1e6af249c8f1e101b1e1d1e073506b80a9912b46776de4ff94c73de25020e3e4887940f004423f47e7cecdb96641d4df80f4d65bad28
diff --git a/dev-db/postgresql/postgresql-14.3.ebuild b/dev-db/postgresql/postgresql-14.4.ebuild
similarity index 100%
rename from dev-db/postgresql/postgresql-14.3.ebuild
rename to dev-db/postgresql/postgresql-14.4.ebuild
diff --git a/dev-db/pspg/Manifest b/dev-db/pspg/Manifest
index 301c2cb92366..688549ea3c69 100644
--- a/dev-db/pspg/Manifest
+++ b/dev-db/pspg/Manifest
@@ -5,5 +5,5 @@ DIST pspg-5.5.4.tar.gz 2415002 BLAKE2B 1b7712318069c5fe69afe5e7477aa2a415d007a1f
 EBUILD pspg-3.1.5-r1.ebuild 432 BLAKE2B fc486094f381b85cc81e56cb6f426d4fb355b24baf49a5a6319b7299e1f0d2083da07ad83e39c439e12b2018fbd5690237b300059dc48dcf05616966cb23142b SHA512 b99c9c778657f441ea545b9a128c4a9141bdcd4ebc6f40d0397027a6050e64a35c1a81370966f94731ec8f4876aa7c123379a7d39180f6662475864bcfb49e3e
 EBUILD pspg-4.3.0-r1.ebuild 434 BLAKE2B 6d2b9870c9f058968ef4ccb8acbad5cb92f0825251a62efea26c394f4e9fbec97f336be8ee42d44d5bac77fd75c23b07e15108cb2aff3cec29056eb567e882a3 SHA512 6351530e4b5c94270b6e2a86d6f3886e3e7974f5fec04512bd6df19d7649266f8c7ac53298e320a073bee3746c5f3d1d3573a296db0cb6d882a289dc4f2fcc0a
 EBUILD pspg-5.0.5.ebuild 432 BLAKE2B 8fc975ec259b534962236824f0993481cd425b42c811fee4c9cd30bdb1b7a3cdc2ab8ca262e467e5fb56532d2c53e2fd99c4f810462b1240a9632fa11421b72d SHA512 0fccec09a1692fca66525e18bdbd3c595385f194052f735c4c03a217e6ab16a93f8a88cbf23e6746734f68b74dc434bc8c607a90d25282bed3507cec5d3d834e
-EBUILD pspg-5.5.4.ebuild 440 BLAKE2B d50dc0535fa208a80f28746cf489b82e318281f18f74eff4cc6d663ecf019895a1f6bd1ff050893bffec5edc1bec84312c82255523f181c4968cae0e85b0a3ec SHA512 820cbaca5a11e57dce2c064301e30749d34067ac2f7d25128c39f3fd9a2c28726b1db14959190a63fa9c2a146c4e8c2ae545bc2c935e05912406671bdca7d668
+EBUILD pspg-5.5.4.ebuild 439 BLAKE2B db8b1de5b6be0673a72436bdae85c087ad23de36ce212e9601e3a698f85a8a73e5ac0b5333e42d0d663ab21ee79662cce97d68371df15271b02e7444672cee6f SHA512 27f6dde8fc504e29d059dac4a35189f46f95f45ecf4fbc234f6c51b7803ea96dcb8445ff5e3ea66783d2376912b47f84bbe357de27131c8cddebceead271b702
 MISC metadata.xml 661 BLAKE2B 20e3f40d583fa5cfd41028757d8b332ab5cced7d76c9aa8e96451bf3d10b549cbd42a25193fa20054bbed0782eb51663742fb25e95d93505f76c4916e8bc6a5e SHA512 0c2c8ce1aefd384146b27d84886783ea0bd8b7f1d62de60a485db501dc642778f2a016d2f848eaa2f9aa17204270d2b31833c7ad3219b93797424d569758250e
diff --git a/dev-db/pspg/pspg-5.5.4.ebuild b/dev-db/pspg/pspg-5.5.4.ebuild
index cf5391dcd304..479438bf0b0a 100644
--- a/dev-db/pspg/pspg-5.5.4.ebuild
+++ b/dev-db/pspg/pspg-5.5.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/okbob/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="sys-libs/ncurses:=
 dev-db/postgresql:=
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index 4130e7691b7a..e3c872638248 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -28,11 +28,13 @@ DIST redis-6.2.6.tar.gz 2476542 BLAKE2B d139479432171294911d99e7e8c2327dbbc6682e
 DIST redis-6.2.7.tar.gz 2487287 BLAKE2B 06f1b1e16cdf06c38b67c1f1dcccc025da50cc3719688b8c2bf23077d77dd97ea546909043fb65e60478ac3661cc033fa6e8d7a38e361e69eb93ba3db07b7c66 SHA512 d113094b8e31754915db7f0317d9b7969e034af3a7bac2ae0cbfad6cc61ba3aae35e9709c435abc1024a96f914df7a760b3cd18d06c375b541cfa837d1c5b953
 DIST redis-7.0.0.tar.gz 2943054 BLAKE2B 561cf591bacac51fddc375a1c725c385f9b0b4b4bb7fca7d889ee1b7760cf5ea986e26613a0f69fda9b6f8a02d02e055514d374be7913e26724e3857967fea22 SHA512 12ac925708c54b00b34c365dee39cb207fbe3cb3c99e8daad965e122b6e3a6543e3ca80e23e6a56f5dff6371d4f2b9c149ee51800ed540e1f1b9154a118ea07b
 DIST redis-7.0.1.tar.gz 2955839 BLAKE2B 67ff36e5e78ab9a90d4404d0f0bddbe9b539166c826d8a1b314bb32cdece7d40caf5eff57302cd641548ed3b1e19aff1b657ed31a20233550636708b6386c2db SHA512 e61d27695fd2d439f204612b97a3ea245ebf92d418949460f7144026191ade4fac1647717bbb48a2b3e238856f0392af08b4fdb4358d04f2ccd1088ff9d3dac4
-EBUILD redis-5.0.14.ebuild 4792 BLAKE2B c0626f4c87d3742ebc908134b0fa752fc9fa78f36d94e777042e97162b17e8a81caedd535ae7542e45bf2da946bd26fe08c4d5339a8247177239c14a1c77cb35 SHA512 f58c30fa14096690eb29036032098e9e4a3591b440b42323917f50caa7f0e68d3f6555cbd54023828048717eb6a922ea105296c3366bfdbb8c17a1eda1cbb334
-EBUILD redis-6.0.16.ebuild 5596 BLAKE2B 66ced37a8a115f2f75cb5c38d7d65fe1a700cc9c40f31f8ae73969fcd345d86ec53462a94a3c2a07a701cf9c4957a24037de0e884e226aa97296dfc0fe0208a6 SHA512 8fe4a9c2a92a4a0517dec0f2f41c82b367b270ffa4e3df4ba2b14b5828a6a42821d56be4bcdc8eb698646fd2cc655613612883090dd79abcc8c3700ab922968b
-EBUILD redis-6.2.6.ebuild 5352 BLAKE2B 9fd19e7daa609cc574b16562244769a3a3cec21bee1ad606e9b0fc5b57395f37055c0c3d03cbf2cabd73972a0c98e33243a6c4d5054b2238d74bba3270cbbf23 SHA512 32d5c2b7c0fe2ec51d12f126953a8107e0bd8582791838c8f4d039913c20f4657075e129a104759d260065f343926dc8f72b6473225d68b529145da0beac30ad
+DIST redis-7.0.2.tar.gz 2956784 BLAKE2B 418f6114662c9b9b67dc7f28f89f58fefee3eb5fec84a6193ca50034366c963986a56d1c96dadfdd88a88ea1ddd4542ed910b89c8a81c95b38aa4f7bdc5ae571 SHA512 bc8d679ecaad0220318b87be70476653f42b76815af61ff6f4e8885f5a5d17d41cea754fbf448f9e18e9a9f90227c5ac198fa9bc523370752f590ba01418a1b0
+EBUILD redis-5.0.14.ebuild 4792 BLAKE2B 091edcb9ac825bab031bec34d954e07f78702678ae02e23a24bd9544c43a51f91c270e8507827d1f7d69a7055f3a0e431745bbf61f9c9645ef108d7517fb9be7 SHA512 85e2c3496115c98f8b116b1e960e429cdac3acf83333c98ad880f692774e76212fd81ac40b97770ed8fc0691232f0b7f94581ad90c32fb8041e5829813cf7abd
+EBUILD redis-6.0.16.ebuild 5596 BLAKE2B 31fd97d2956903c97fd4a2997b488f2b4367871337cf4bb3d48141ff5534d550615a225aae8fe26182ee6037672f1920499676bbc605df3db185bad21fdc2f30 SHA512 916e2e80dda60b3a128aad7b53fc8d8a9fc8a44e4d5de5e00fbc68155111d2b4c69456f4217e11b6e53b1b27c76e871c181c91dd43b42b5c96027d7370e601ce
+EBUILD redis-6.2.6.ebuild 5352 BLAKE2B 2b0ac88bc478e1578a479a60bc8e20cfca0dc9e13333fd6e012aec87248866baea31671ed2dd61f90c2d765a0f256df45b3f2ea27f76767fbc766626ef413d9f SHA512 559291c386b7867e40de1af5a3ffd88c89555c7fbc110025853a583c8246bcd17f343e1c2166ae1c41ce6254588917bfd0f15710442ace4f0e531e8c2e63ec4d
 EBUILD redis-6.2.7-r1.ebuild 5482 BLAKE2B 820c3b7261a84cc6ae2313ef9adad5a43787b308b36b20525ee3ec3d1587095b979ebb4a00775c37aa6f54b2520de7fe204582120436fef94717fc7d101001e6 SHA512 2d28ededbd610a0d9d8d61229c67ebc747464b77214daff069a2acdea45d86170de1fe70cd465aa444dad72d7e466e46d8397c82643857a11d9347b0ecdf6396
-EBUILD redis-7.0.0-r1.ebuild 4771 BLAKE2B 8b7213dbbad1edc6b860572aacfc4ffda00a04de207c21fb01f868b8b7a5b49efdd78b2f49ae383ea610e8873989f60d5d62456396eac2bcd44c91a28ea88b78 SHA512 12228e55b4da7889e851f5284c99c33e340fe7fb0121d328925f25bbb3e6dc8deb0ad648885ec655713eba0af47874709eb911a5a62bef746bb4a3f08653b4f1
+EBUILD redis-7.0.0-r2.ebuild 4789 BLAKE2B 64af7c02d2782a4eeafcf370c583fd7ee510a479d7eaff0298633e4c5f6f5d086338427af559d527b847af49617bd01d2373e130b119f25448360798af00cf25 SHA512 4d084698dbe6dbdc9e0e40dae6cb25f79a3d5fba5b73f9651a1f705fed65eb8c0074be69ef3ec3578997762dc839e01b179244db3de4f94343a3af28d7758ac7
 EBUILD redis-7.0.0.ebuild 5664 BLAKE2B 1313598911fb74f6de7fdfc8e58061b2bee2d71125241216781b59c04e35b2d3bec09a9692c29d068f0e9e1a376129479a9c72961a280a390977fd3a8a397812 SHA512 e8ac856a3fd91b080941a486163b74abed1e715de7e8b2fe35338ec89dbafb335b65b7e6dc255c4f250afa7563e64075587a9b4c6dd505aedce5161dc68b1ee0
-EBUILD redis-7.0.1.ebuild 4771 BLAKE2B 8b7213dbbad1edc6b860572aacfc4ffda00a04de207c21fb01f868b8b7a5b49efdd78b2f49ae383ea610e8873989f60d5d62456396eac2bcd44c91a28ea88b78 SHA512 12228e55b4da7889e851f5284c99c33e340fe7fb0121d328925f25bbb3e6dc8deb0ad648885ec655713eba0af47874709eb911a5a62bef746bb4a3f08653b4f1
+EBUILD redis-7.0.1-r1.ebuild 4789 BLAKE2B 64af7c02d2782a4eeafcf370c583fd7ee510a479d7eaff0298633e4c5f6f5d086338427af559d527b847af49617bd01d2373e130b119f25448360798af00cf25 SHA512 4d084698dbe6dbdc9e0e40dae6cb25f79a3d5fba5b73f9651a1f705fed65eb8c0074be69ef3ec3578997762dc839e01b179244db3de4f94343a3af28d7758ac7
+EBUILD redis-7.0.2.ebuild 4789 BLAKE2B 64af7c02d2782a4eeafcf370c583fd7ee510a479d7eaff0298633e4c5f6f5d086338427af559d527b847af49617bd01d2373e130b119f25448360798af00cf25 SHA512 4d084698dbe6dbdc9e0e40dae6cb25f79a3d5fba5b73f9651a1f705fed65eb8c0074be69ef3ec3578997762dc839e01b179244db3de4f94343a3af28d7758ac7
 MISC metadata.xml 365 BLAKE2B a2a33da17b877c0e66732b18af4c41e78ad7f60403f7d63b43d16797228c2fe0b3e2af2d0ff56af23baa944ae489163732d84e0921335919f5cea26c589e12ea SHA512 54a8b9cb42305881b12ef37c4da78ba3760ab2de4b8f2663b099eba7188deaeae08f5649a0c101d6acae63cf20c20d4c5d33274dc3ec6ced80bed68114f32db2
diff --git a/dev-db/redis/redis-5.0.14.ebuild b/dev-db/redis/redis-5.0.14.ebuild
index b36fb5e71c04..b12534f6948d 100644
--- a/dev-db/redis/redis-5.0.14.ebuild
+++ b/dev-db/redis/redis-5.0.14.ebuild
@@ -94,7 +94,7 @@ src_prepare() {
 		LUAPKGCONFIG=lua
 	fi
 	# The upstream configure script handles luajit specially, and is not
-	# effected by these changes.
+	# affected by these changes.
 	einfo "Selected LUAPKGCONFIG=${LUAPKGCONFIG}"
 	sed -i	\
 		-e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \
diff --git a/dev-db/redis/redis-6.0.16.ebuild b/dev-db/redis/redis-6.0.16.ebuild
index f59c867797b2..45e59b644a37 100644
--- a/dev-db/redis/redis-6.0.16.ebuild
+++ b/dev-db/redis/redis-6.0.16.ebuild
@@ -91,7 +91,7 @@ src_prepare() {
 
 	# Use the correct pkgconfig name for Lua.
 	# The upstream configure script handles luajit specially, and is not
-	# effected by these changes.
+	# affected by these changes.
 	sed -i	\
 		-e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \
 		-e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
diff --git a/dev-db/redis/redis-6.2.6.ebuild b/dev-db/redis/redis-6.2.6.ebuild
index 2fe6b97c0f65..5f9d87086347 100644
--- a/dev-db/redis/redis-6.2.6.ebuild
+++ b/dev-db/redis/redis-6.2.6.ebuild
@@ -91,7 +91,7 @@ src_prepare() {
 
 	# Use the correct pkgconfig name for Lua.
 	# The upstream configure script handles luajit specially, and is not
-	# effected by these changes.
+	# affected by these changes.
 	sed -i	\
 		-e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \
 		-e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
diff --git a/dev-db/redis/redis-7.0.0-r1.ebuild b/dev-db/redis/redis-7.0.0-r2.ebuild
similarity index 99%
rename from dev-db/redis/redis-7.0.0-r1.ebuild
rename to dev-db/redis/redis-7.0.0-r2.ebuild
index 180394de9ee9..c8c1359e41d5 100644
--- a/dev-db/redis/redis-7.0.0-r1.ebuild
+++ b/dev-db/redis/redis-7.0.0-r2.ebuild
@@ -38,6 +38,7 @@ BDEPEND="
 
 # Tcl is only needed in the CHOST test env
 DEPEND="
+	${COMMON_DEPEND}
 	test? (
 		dev-lang/tcl:0=
 		ssl? ( dev-tcltk/tls )
diff --git a/dev-db/redis/redis-7.0.1.ebuild b/dev-db/redis/redis-7.0.1-r1.ebuild
similarity index 99%
rename from dev-db/redis/redis-7.0.1.ebuild
rename to dev-db/redis/redis-7.0.1-r1.ebuild
index 180394de9ee9..c8c1359e41d5 100644
--- a/dev-db/redis/redis-7.0.1.ebuild
+++ b/dev-db/redis/redis-7.0.1-r1.ebuild
@@ -38,6 +38,7 @@ BDEPEND="
 
 # Tcl is only needed in the CHOST test env
 DEPEND="
+	${COMMON_DEPEND}
 	test? (
 		dev-lang/tcl:0=
 		ssl? ( dev-tcltk/tls )
diff --git a/dev-db/redis/redis-7.0.2.ebuild b/dev-db/redis/redis-7.0.2.ebuild
new file mode 100644
index 000000000000..c8c1359e41d5
--- /dev/null
+++ b/dev-db/redis/redis-7.0.2.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# N.B.: It is no clue in porting to Lua eclasses, as upstream have deviated
+# too far from vanilla Lua, adding their own APIs like lua_enablereadonlytable
+
+inherit autotools edo flag-o-matic multiprocessing systemd tmpfiles toolchain-funcs
+
+DESCRIPTION="A persistent caching system, key-value, and data structures database"
+HOMEPAGE="https://redis.io"
+SRC_URI="https://download.redis.io/releases/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="+jemalloc ssl systemd tcmalloc test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	jemalloc? ( >=dev-libs/jemalloc-5.1:= )
+	ssl? ( dev-libs/openssl:0= )
+	systemd? ( sys-apps/systemd:= )
+	tcmalloc? ( dev-util/google-perftools )
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	acct-group/redis
+	acct-user/redis
+"
+
+BDEPEND="
+	${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+
+# Tcl is only needed in the CHOST test env
+DEPEND="
+	${COMMON_DEPEND}
+	test? (
+		dev-lang/tcl:0=
+		ssl? ( dev-tcltk/tls )
+	)"
+
+REQUIRED_USE="?? ( jemalloc tcmalloc )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.2.1-config.patch
+	"${FILESDIR}"/${PN}-5.0-shared.patch
+	"${FILESDIR}"/${PN}-6.2.3-ppc-atomic.patch
+	"${FILESDIR}"/${PN}-sentinel-5.0-config.patch
+)
+
+src_prepare() {
+	default
+
+	# Append cflag for lua_cjson
+	# https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61
+	append-cflags "-DENABLE_CJSON_GLOBAL"
+
+	# now we will rewrite present Makefiles
+	local makefiles="" MKF
+	for MKF in $(find -name 'Makefile' | cut -b 3-); do
+		mv "${MKF}" "${MKF}.in"
+		sed -i	-e 's:$(CC):@CC@:g' \
+			-e 's:$(CFLAGS):@AM_CFLAGS@:g' \
+			-e 's: $(DEBUG)::g' \
+			-e 's:$(OBJARCH)::g' \
+			-e 's:ARCH:TARCH:g' \
+			-e '/^CCOPT=/s:$: $(LDFLAGS):g' \
+			"${MKF}.in" \
+		|| die "Sed failed for ${MKF}"
+		makefiles+=" ${MKF}"
+	done
+	# autodetection of compiler and settings; generates the modified Makefiles
+	cp "${FILESDIR}"/configure.ac-7.0 configure.ac || die
+
+	sed -i	\
+		-e "/^AC_INIT/s|, __PV__, |, $PV, |" \
+		-e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
+		configure.ac || die "Sed failed for configure.ac"
+	eautoreconf
+}
+
+src_configure() {
+	econf
+
+	# Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164
+	# also, don't define ANSI/c99 for lua twice
+	sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die
+}
+
+src_compile() {
+	local myconf=""
+
+	if use jemalloc; then
+		myconf+="MALLOC=jemalloc"
+	elif use tcmalloc; then
+		myconf+="MALLOC=tcmalloc"
+	else
+		myconf+="MALLOC=libc"
+	fi
+
+	if use ssl; then
+		myconf+=" BUILD_TLS=yes"
+	fi
+
+	export USE_SYSTEMD=$(usex systemd)
+
+	tc-export AR CC RANLIB
+	emake V=1 ${myconf} AR="${AR}" CC="${CC}" RANLIB="${RANLIB}"
+}
+
+src_test() {
+	local runtestargs=(
+		--clients "$(makeopts_jobs)" # see bug #649868
+	)
+
+	if has usersandbox ${FEATURES} || ! has userpriv ${FEATURES}; then
+		ewarn "oom-score-adj related tests will be skipped." \
+			"They are known to fail with FEATURES usersandbox or -userpriv. See bug #756382."
+
+		runtestargs+=(
+			# unit/oom-score-adj was introduced in version 6.2.0
+			--skipunit unit/oom-score-adj # see bug #756382
+
+			# Following test was added in version 7.0.0 to unit/introspection.
+			# It also tries to adjust OOM score.
+			--skiptest "CONFIG SET rollback on apply error"
+		)
+	fi
+
+	if use ssl; then
+		edo ./utils/gen-test-certs.sh
+		runtestargs+=( --tls )
+	fi
+
+	edo ./runtest "${runtestargs[@]}"
+}
+
+src_install() {
+	insinto /etc/redis
+	doins redis.conf sentinel.conf
+	use prefix || fowners -R redis:redis /etc/redis /etc/redis/{redis,sentinel}.conf
+	fperms 0750 /etc/redis
+	fperms 0644 /etc/redis/{redis,sentinel}.conf
+
+	newconfd "${FILESDIR}/redis.confd-r2" redis
+	newinitd "${FILESDIR}/redis.initd-6" redis
+
+	systemd_newunit "${FILESDIR}/redis.service-4" redis.service
+	newtmpfiles "${FILESDIR}/redis.tmpfiles-2" redis.conf
+
+	newconfd "${FILESDIR}/redis-sentinel.confd-r1" redis-sentinel
+	newinitd "${FILESDIR}/redis-sentinel.initd-r1" redis-sentinel
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md
+
+	dobin src/redis-cli
+	dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-rdb
+	fperms 0750 /usr/sbin/redis-benchmark
+	dosym redis-server /usr/sbin/redis-sentinel
+
+	if use prefix; then
+		diropts -m0750
+	else
+		diropts -m0750 -o redis -g redis
+	fi
+	keepdir /var/{log,lib}/redis
+}
+
+pkg_postinst() {
+	tmpfiles_process redis.conf
+
+	ewarn "The default redis configuration file location changed to:"
+	ewarn "  /etc/redis/{redis,sentinel}.conf"
+	ewarn "Please apply your changes to the new configuration files."
+}
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index d68c6bdf2106..59f325e21ac9 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -7,4 +7,5 @@ DIST sqlite-src-3380500.zip 13245057 BLAKE2B d2deefbc918ab593146950c21047dbd9416
 EBUILD sqlite-3.38.2.ebuild 13252 BLAKE2B a11cf6540941038ac710c9bf6bce657da353b520f44119c6a68ace2d73ef9f8ea26062d8fa8bc6008bec0917a45597ae1dd1a35c9c4b7a162993e59b51df89b3 SHA512 df3d005656e2e4447cbf0beb950859870e33867d86716af2b92174ad0e40afa43c7efdba40bde85f3aa72cac8405dcf64688a3eb6e16a93a0441c661b1561e18
 EBUILD sqlite-3.38.3.ebuild 13253 BLAKE2B 476079498bc4172c2eac6500bee865ca793d5ff938353b28636fccc4a77ec067f558c39d7d96e9288dc87f05040852ac37f0ec61433cd550c10f0cd0f3c3366c SHA512 aead89b187f93f7529e07f55868390784ef2a499ae7c942227a8300467ac1415e48c24a9a2d6aa8800dc96cd018f9f834a796ce998171b657aa9d49a54dd7629
 EBUILD sqlite-3.38.5.ebuild 13253 BLAKE2B 476079498bc4172c2eac6500bee865ca793d5ff938353b28636fccc4a77ec067f558c39d7d96e9288dc87f05040852ac37f0ec61433cd550c10f0cd0f3c3366c SHA512 aead89b187f93f7529e07f55868390784ef2a499ae7c942227a8300467ac1415e48c24a9a2d6aa8800dc96cd018f9f834a796ce998171b657aa9d49a54dd7629
+EBUILD sqlite-9999.ebuild 13254 BLAKE2B 70c6c1f542340b97a48d1742acb9d1b1f804ce711fe7bfaa8feb5c3fe164d1cb5535e7451f598d810463e4dd7c2640d42179a03c5670475f20195f076617d7d0 SHA512 188c4356483f4031a1e6dfdb9e4b36c999916bbda4608e58cd70abf845f8a1bc366a24535d8d47c5d96041656df1b66a2b817df9d8d1e99e298598e532229f77
 MISC metadata.xml 771 BLAKE2B 34887e6d8a43fde66998787bfb3ca4bda644918a3a80afc650546547f132a9ff482a955ea5df8dded47a971a317be099bf5d9708a00ab25f00f78b714c3ed521 SHA512 e5955f59348abdee15c7fcaff38c220ab0ad84a717600525686e33a1fb7d29498c5b510d81c87ca49d48d7d11da782cf3840f38f1d4bd0e696fd7166aedeb597
diff --git a/dev-db/sqlite/sqlite-9999.ebuild b/dev-db/sqlite/sqlite-9999.ebuild
new file mode 100644
index 000000000000..89f000f4934c
--- /dev/null
+++ b/dev-db/sqlite/sqlite-9999.ebuild
@@ -0,0 +1,436 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+
+if [[ "${PV}" != "9999" ]]; then
+	SRC_PV="$(printf "%u%02u%02u%02u" $(ver_rs 1- " "))"
+	DOC_PV="${SRC_PV}"
+	# DOC_PV="$(printf "%u%02u%02u00" $(ver_rs 1-3 " "))"
+fi
+
+DESCRIPTION="SQL database engine"
+HOMEPAGE="https://sqlite.org/"
+
+# On version updates, make sure to read the forum (https://sqlite.org/forum/forum)
+# for hints regarding test failures, backports, etc.
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://sqlite.org/2022/${PN}-src-${SRC_PV}.zip
+		doc? ( https://sqlite.org/2022/${PN}-doc-${DOC_PV}.zip )"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="public-domain"
+SLOT="3"
+IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
+if [[ "${PV}" == "9999" ]]; then
+	PROPERTIES="live"
+fi
+RESTRICT="!test? ( test )"
+
+if [[ "${PV}" == "9999" ]]; then
+	BDEPEND=">=dev-lang/tcl-8.6:0
+		dev-vcs/fossil"
+else
+	BDEPEND="app-arch/unzip
+		>=dev-lang/tcl-8.6:0"
+fi
+RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]
+	icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
+	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
+	tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
+	tools? ( dev-lang/tcl:0= )"
+DEPEND="${RDEPEND}
+	test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )"
+
+if [[ "${PV}" == "9999" ]]; then
+	S="${WORKDIR}/${PN}"
+else
+	S="${WORKDIR}/${PN}-src-${SRC_PV}"
+fi
+
+_fossil_fetch() {
+	local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
+	local repo_id="${1}"
+	local repo_uri="${2}"
+
+	local -x FOSSIL_HOME="${HOME}"
+
+	mkdir -p "${T}/fossil/${repo_id}" || die
+	pushd "${T}/fossil/${repo_id}" > /dev/null || die
+
+	if [[ -n "${EVCS_OFFLINE}" ]]; then
+		if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
+			die "Network activity disabled using EVCS_OFFLINE and clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\""
+		fi
+	else
+		if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
+			einfo fossil clone --verbose "${repo_uri}" "${repo_id}.fossil"
+			fossil clone --verbose "${repo_uri}" "${repo_id}.fossil" || die
+			echo
+		else
+			cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" . || die
+			einfo fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}"
+			fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}" || die
+			echo
+		fi
+
+		(
+			addwrite "${distdir}"
+			mkdir -p "${distdir}/fossil-src/${repo_id}" || die
+			cp -p "${repo_id}.fossil" "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" || die
+		)
+	fi
+
+	popd > /dev/null || die
+}
+
+_fossil_checkout() {
+	local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
+	local repo_id="${1}"
+	local branch_or_commit="${2}"
+	local target_directory="${3}"
+
+	local -x FOSSIL_HOME="${HOME}"
+
+	if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
+		die "Clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\""
+	fi
+
+	if [[ ! -f "${T}/fossil/${repo_id}/${repo_id}.fossil" ]]; then
+		mkdir -p "${T}/fossil/${repo_id}" || die
+		cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" "${T}/fossil/${repo_id}" || die
+	fi
+
+	mkdir "${target_directory}" || die
+	pushd "${target_directory}" > /dev/null || die
+
+	einfo fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}"
+	fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}" || die
+	echo
+
+	popd > /dev/null || die
+}
+
+fossil_fetch() {
+	local repo_id="${1}"
+	local repo_uri="${2}"
+	local target_directory="${3}"
+
+	local branch_or_commit="${EFOSSIL_COMMIT:-${EFOSSIL_BRANCH:-trunk}}"
+
+	_fossil_fetch "${repo_id}" "${repo_uri}"
+	_fossil_checkout "${repo_id}" "${branch_or_commit}" "${target_directory}"
+}
+
+src_unpack() {
+	if [[ "${PV}" == "9999" ]]; then
+		fossil_fetch sqlite https://sqlite.org/src "${WORKDIR}/${PN}"
+		if use doc; then
+			fossil_fetch sqlite-doc https://sqlite.org/docsrc "${WORKDIR}/${PN}-doc"
+		fi
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	eapply_user
+
+	eautoreconf
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local -x CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}"
+	local options=()
+
+	options+=(
+		--enable-load-extension
+		--enable-threadsafe
+	)
+
+	# Support detection of misuse of SQLite API.
+	# https://sqlite.org/compile.html#enable_api_armor
+	append-cppflags -DSQLITE_ENABLE_API_ARMOR
+
+	# Support bytecode and tables_used virtual tables.
+	# https://sqlite.org/compile.html#enable_bytecode_vtab
+	# https://sqlite.org/bytecodevtab.html
+	append-cppflags -DSQLITE_ENABLE_BYTECODE_VTAB
+
+	# Support column metadata functions.
+	# https://sqlite.org/compile.html#enable_column_metadata
+	# https://sqlite.org/c3ref/column_database_name.html
+	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
+
+	# Support sqlite_dbpage virtual table.
+	# https://sqlite.org/compile.html#enable_dbpage_vtab
+	# https://sqlite.org/dbpage.html
+	append-cppflags -DSQLITE_ENABLE_DBPAGE_VTAB
+
+	# Support dbstat virtual table.
+	# https://sqlite.org/compile.html#enable_dbstat_vtab
+	# https://sqlite.org/dbstat.html
+	append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB
+
+	# Support sqlite3_serialize() and sqlite3_deserialize() functions.
+	# https://sqlite.org/compile.html#enable_deserialize
+	# https://sqlite.org/c3ref/serialize.html
+	# https://sqlite.org/c3ref/deserialize.html
+	append-cppflags -DSQLITE_ENABLE_DESERIALIZE
+
+	# Support comments in output of EXPLAIN.
+	# https://sqlite.org/compile.html#enable_explain_comments
+	append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS
+
+	# Support Full-Text Search versions 3, 4 and 5.
+	# https://sqlite.org/compile.html#enable_fts3
+	# https://sqlite.org/compile.html#enable_fts3_parenthesis
+	# https://sqlite.org/compile.html#enable_fts4
+	# https://sqlite.org/compile.html#enable_fts5
+	# https://sqlite.org/fts3.html
+	# https://sqlite.org/fts5.html
+	append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
+	options+=(--enable-fts5)
+
+	# Support hidden columns.
+	append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS
+
+	# Support memsys5 memory allocator.
+	# https://sqlite.org/compile.html#enable_memsys5
+	# https://sqlite.org/malloc.html#memsys5
+	append-cppflags -DSQLITE_ENABLE_MEMSYS5
+
+	# Support sqlite3_normalized_sql() function.
+	# https://sqlite.org/c3ref/expanded_sql.html
+	append-cppflags -DSQLITE_ENABLE_NORMALIZE
+
+	# Support sqlite_offset() function.
+	# https://sqlite.org/compile.html#enable_offset_sql_func
+	# https://sqlite.org/lang_corefunc.html#sqlite_offset
+	append-cppflags -DSQLITE_ENABLE_OFFSET_SQL_FUNC
+
+	# Support pre-update hook functions.
+	# https://sqlite.org/compile.html#enable_preupdate_hook
+	# https://sqlite.org/c3ref/preupdate_count.html
+	append-cppflags -DSQLITE_ENABLE_PREUPDATE_HOOK
+
+	# Support Resumable Bulk Update extension.
+	# https://sqlite.org/compile.html#enable_rbu
+	# https://sqlite.org/rbu.html
+	append-cppflags -DSQLITE_ENABLE_RBU
+
+	# Support R*Trees.
+	# https://sqlite.org/compile.html#enable_rtree
+	# https://sqlite.org/compile.html#enable_geopoly
+	# https://sqlite.org/rtree.html
+	# https://sqlite.org/geopoly.html
+	append-cppflags -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_GEOPOLY
+
+	# Support Session extension.
+	# https://sqlite.org/compile.html#enable_session
+	# https://sqlite.org/sessionintro.html
+	append-cppflags -DSQLITE_ENABLE_SESSION
+
+	# Support scan status functions.
+	# https://sqlite.org/compile.html#enable_stmt_scanstatus
+	# https://sqlite.org/c3ref/stmt_scanstatus.html
+	# https://sqlite.org/c3ref/stmt_scanstatus_reset.html
+	append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
+
+	# Support sqlite_stmt virtual table.
+	# https://sqlite.org/compile.html#enable_stmtvtab
+	# https://sqlite.org/stmt.html
+	append-cppflags -DSQLITE_ENABLE_STMTVTAB
+
+	# Support unknown() function.
+	# https://sqlite.org/compile.html#enable_unknown_sql_function
+	append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
+
+	# Support unlock notification.
+	# https://sqlite.org/compile.html#enable_unlock_notify
+	# https://sqlite.org/c3ref/unlock_notify.html
+	# https://sqlite.org/unlock_notify.html
+	append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
+
+	# Support LIMIT and ORDER BY clauses on DELETE and UPDATE statements.
+	# https://sqlite.org/compile.html#enable_update_delete_limit
+	# https://sqlite.org/lang_delete.html#optional_limit_and_order_by_clauses
+	# https://sqlite.org/lang_update.html#optional_limit_and_order_by_clauses
+	append-cppflags -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT
+
+	# Support soundex() function.
+	# https://sqlite.org/compile.html#soundex
+	# https://sqlite.org/lang_corefunc.html#soundex
+	append-cppflags -DSQLITE_SOUNDEX
+
+	# Support URI filenames.
+	# https://sqlite.org/compile.html#use_uri
+	# https://sqlite.org/uri.html
+	append-cppflags -DSQLITE_USE_URI
+
+	# debug USE flag.
+	options+=($(use_enable debug))
+
+	# icu USE flag.
+	if use icu; then
+		# Support ICU extension.
+		# https://sqlite.org/compile.html#enable_icu
+		append-cppflags -DSQLITE_ENABLE_ICU
+		sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+	fi
+
+	# readline USE flag.
+	options+=(
+		--disable-editline
+		$(use_enable readline)
+	)
+	if use readline; then
+		options+=(--with-readline-inc="-I${ESYSROOT}/usr/include/readline")
+	fi
+
+	# secure-delete USE flag.
+	if use secure-delete; then
+		# Enable secure_delete pragma by default.
+		# https://sqlite.org/compile.html#secure_delete
+		# https://sqlite.org/pragma.html#pragma_secure_delete
+		append-cppflags -DSQLITE_SECURE_DELETE
+	fi
+
+	# static-libs USE flag.
+	options+=($(use_enable static-libs static))
+
+	# tcl, test, tools USE flags.
+	if use tcl || use test || { use tools && multilib_is_native_abi; }; then
+		options+=(
+			--enable-tcl
+			--with-tcl="${ESYSROOT}/usr/$(get_libdir)"
+		)
+	else
+		options+=(--disable-tcl)
+	fi
+
+	if [[ "${ABI}" == "x86" ]]; then
+		if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then
+			append-cflags -mfpmath=sse
+		else
+			append-cflags -ffloat-store
+		fi
+
+		# Skip known-broken test for now
+		# https://sqlite.org/forum/forumpost/d97caf168f
+		# https://sqlite.org/forum/forumpost/50f136d91d
+		if use test ; then
+			rm test/atof1.test || die
+		fi
+	fi
+
+	econf "${options[@]}"
+}
+
+multilib_src_compile() {
+	emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
+
+	if use tools && multilib_is_native_abi; then
+		emake changeset dbdump dbhash dbtotxt index_usage rbu scrub showdb showjournal showshm showstat4 showwal sqldiff sqlite3_analyzer sqlite3_checker sqlite3_expert sqltclsh
+	fi
+
+	if [[ "${PV}" == "9999" ]] && use doc && multilib_is_native_abi; then
+		emake tclsqlite3.c
+
+		local build_directory="$(pwd)"
+		build_directory="${build_directory##*/}"
+
+		mkdir "${WORKDIR}/${PN}-doc-build" || die
+		pushd "${WORKDIR}/${PN}-doc-build" > /dev/null || die
+
+		emake -f "../${PN}-doc/Makefile" -j1 SRC="../${PN}" BLD="../${build_directory}" DOC="../${PN}-doc" CC="$(tc-getBUILD_CC)" TCLINC="" TCLFLAGS="$($(tc-getBUILD_PKG_CONFIG) --libs tcl) -ldl -lm" base doc
+		rmdir doc/matrix{/*,} || die
+
+		popd > /dev/null || die
+	fi
+}
+
+multilib_src_test() {
+	if [[ "${EUID}" -eq 0 ]]; then
+		ewarn "Skipping tests due to root permissions"
+		return
+	fi
+
+	local -x SQLITE_HISTORY="${T}/sqlite_history_${ABI}"
+
+	# e_uri.test tries to open files in /.
+	# https://bugs.gentoo.org/839798
+	local SANDBOX_PREDICT=${SANDBOX_PREDICT}
+	addpredict "/test.db:/ÿ.db"
+
+	emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test)
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
+
+	if use tools && multilib_is_native_abi; then
+		install_tool() {
+			if [[ -f ".libs/${1}" ]]; then
+				newbin ".libs/${1}" "${2}"
+			else
+				newbin "${1}" "${2}"
+			fi
+		}
+
+		install_tool changeset sqlite3-changeset
+		install_tool dbdump sqlite3-db-dump
+		install_tool dbhash sqlite3-db-hash
+		install_tool dbtotxt sqlite3-db-to-txt
+		install_tool index_usage sqlite3-index-usage
+		install_tool rbu sqlite3-rbu
+		install_tool scrub sqlite3-scrub
+		install_tool showdb sqlite3-show-db
+		install_tool showjournal sqlite3-show-journal
+		install_tool showshm sqlite3-show-shm
+		install_tool showstat4 sqlite3-show-stat4
+		install_tool showwal sqlite3-show-wal
+		install_tool sqldiff sqlite3-diff
+		install_tool sqlite3_analyzer sqlite3-analyzer
+		install_tool sqlite3_checker sqlite3-checker
+		install_tool sqlite3_expert sqlite3-expert
+		install_tool sqltclsh sqlite3-tclsh
+
+		unset -f install_tool
+	fi
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name "*.la" -delete || die
+
+	doman sqlite3.1
+
+	if use doc; then
+		if [[ "${PV}" == "9999" ]]; then
+			pushd "${WORKDIR}/${PN}-doc-build/doc" > /dev/null || die
+		else
+			pushd "${WORKDIR}/${PN}-doc-${DOC_PV}" > /dev/null || die
+		fi
+
+		find "(" -name "*.db" -o -name "*.txt" ")" -delete || die
+		if [[ "${PV}" != "9999" ]]; then
+			rm search search.d/admin || die
+			rmdir search.d || die
+			find -name "*~" -delete || die
+		fi
+
+		(
+			docinto html
+			dodoc -r *
+		)
+
+		popd > /dev/null || die
+	fi
+}
diff --git a/dev-db/sqlmap/Manifest b/dev-db/sqlmap/Manifest
index 9a698f21c3ec..72775d85c36d 100644
--- a/dev-db/sqlmap/Manifest
+++ b/dev-db/sqlmap/Manifest
@@ -1,7 +1,9 @@
 AUX sqlmap.bash-completion 5757 BLAKE2B f602d99b6b0a30cf405b390eaef355f7a4b4fa4260f0a18fe09a0fa7530af131b75ffc25ca161898f2ed4a93ef9251c0c88cb1ad25d78d870fd2ff19225e0609 SHA512 5024cfb2274a2798fcc7d12e59693253732f66c1389aed36cc31fb8e40d03f7e9a713e93e24711185b5d2d82dd2ac91ec2b6cdc4929c5ca3245fcb4f502d327a
 DIST sqlmap-1.6.2.tar.gz 7258723 BLAKE2B cc972eda5351683904e4c9d4f7e0ab9c127c22de597397e976060808812032b2041f68ab2d737784e499a20a7ca930167427390ca178269d744ee71738e5c270 SHA512 a3057486f5096fb2a242296b4ceeb1c500246fbd322c3e52f71e72cd91d1c676ca6f7746becf887625e45d0b14443a669410b28bd6a995124a6e8006c4534976
 DIST sqlmap-1.6.4.tar.gz 7203746 BLAKE2B 8e55805a59dbc7fa4a4be03d5edf34160858e624047dafe63d6280bfb59c83fef0bfe3f74b775adad3cbe3be312dad166c79c758fe18418d32788c22b2233d16 SHA512 304c8213ae4b1858066765fa5e6409e97ac90de46b319683e7daf6c89f610de04cac400a7044633aeb014648b7b57c880c3a2646b40049b93f84a626c12994d2
+DIST sqlmap-1.6.5.tar.gz 7204055 BLAKE2B 0ab5ff3ab8f27e0f944c65d84e9d66627dd09c22fd59a18002481a26db804d737702acf71768dfd44f88008fe82369c155144e9df58935e7feed644394299d89 SHA512 6812ab822119c0071077d87bbc7dd032560c6b85dedd6a568e63e12f885156959a89fa67045545a1433ab0ad6f4ad1f0335980adbc54a1af654d999ac07cee6d
 EBUILD sqlmap-1.6.2.ebuild 1331 BLAKE2B 40fdcfd802252b9a996da8be8a90d45925f1a06099a49d3c0cdd5af232b440003483fbc6e001e706149497ae224723fd2e32fd65953bd14074a7f2a82b8a5785 SHA512 31b004012264cc0a58dcfdc611df346382f1b613a90b08aa2a344a2b87b5025b90c10877c666452e5428f9bc8161bc6c78eb0782542fac0dea2e33686c18cf28
 EBUILD sqlmap-1.6.4.ebuild 1331 BLAKE2B 25be58350d9376ef9afedbd84a9c5081afc97588b54ae728c29b26a47aaf9fb96281c2c57532f992354101dc51b077d498cf731afda741856af22b336fa7c6d0 SHA512 0388de4592528c68067f074c44ddabe3a6cdf598fbc9886c15089c5161e26b7755cbb7869dcff75e4944765fc798974c0411c3e1ede146eb5f93079236dbdb26
-EBUILD sqlmap-9999.ebuild 1331 BLAKE2B 25be58350d9376ef9afedbd84a9c5081afc97588b54ae728c29b26a47aaf9fb96281c2c57532f992354101dc51b077d498cf731afda741856af22b336fa7c6d0 SHA512 0388de4592528c68067f074c44ddabe3a6cdf598fbc9886c15089c5161e26b7755cbb7869dcff75e4944765fc798974c0411c3e1ede146eb5f93079236dbdb26
+EBUILD sqlmap-1.6.5.ebuild 1331 BLAKE2B 7e9ed70fc509dd8251ff7652b7b53415b3ef43139fc04b4ad0ea6458db3048aff5eb1b44410d5f60d77f6a238eb234413b9e0d69043927afba5b559553af21c7 SHA512 ad034e9044054aec4796c7efbb090d2066124d670c83753f63ec16777d3b150c8763ed60dd46d39bfb74374b1aca84e27ff5fa14b0e94c2ec03efb43081b4ea0
+EBUILD sqlmap-9999.ebuild 1331 BLAKE2B 7e9ed70fc509dd8251ff7652b7b53415b3ef43139fc04b4ad0ea6458db3048aff5eb1b44410d5f60d77f6a238eb234413b9e0d69043927afba5b559553af21c7 SHA512 ad034e9044054aec4796c7efbb090d2066124d670c83753f63ec16777d3b150c8763ed60dd46d39bfb74374b1aca84e27ff5fa14b0e94c2ec03efb43081b4ea0
 MISC metadata.xml 714 BLAKE2B e1afbf31fcc7a0ed38af080c7b85248b0ca50ac6865252fff3eb8aacafae02380d833e3852601c7a5733d5947ea19818c7db303f49465fea337b4cd6cc373ff2 SHA512 0349fb06cca9483950d5325c4fea54b07c1621ae25296c6a743d235b95eaabf0533eb0396bbf1c72963097eda7b7f8d829a7a675dabd6a8a6ce4a2ab0fc96b16
diff --git a/dev-db/sqlmap/sqlmap-1.6.5.ebuild b/dev-db/sqlmap/sqlmap-1.6.5.ebuild
new file mode 100644
index 000000000000..7fe00f1370cf
--- /dev/null
+++ b/dev-db/sqlmap/sqlmap-1.6.5.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="sqlite"
+
+inherit bash-completion-r1 python-single-r1 wrapper
+
+DESCRIPTION="An automatic SQL injection and database takeover tool"
+HOMEPAGE="https://sqlmap.org/"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/sqlmapproject/sqlmap"
+else
+	SRC_URI="https://github.com/sqlmapproject/sqlmap/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+# sqlmap (GPL-2+)
+# ansitrm (BSD)
+# beautifulsoup (BSD)
+# bottle (MIT)
+# chardet (LGPL-2.1+)
+# clientform (BSD)
+# colorama (BSD)
+# fcrypt (BSD-2)
+# identitywaf (MIT)
+# keepalive (LGPL-2.1+)
+# magic (MIT)
+# multipartpost (LGPL-2.1+)
+# ordereddict (MIT)
+# prettyprint (BSD-2)
+# pydes (public-domain)
+# six (MIT)
+# socks (BSD)
+# termcolor (BSD)
+# wininetpton (public-domain)
+LICENSE="BSD BSD-2 GPL-2+ LGPL-2.1+ MIT public-domain"
+SLOT="0"
+
+RDEPEND="${PYTHON_DEPS}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DOCS=( doc/ README.md )
+
+src_install () {
+	einstalldocs
+
+	insinto /usr/share/${PN}/
+	doins -r *
+	python_optimize "${ED}"/usr/share/${PN}
+
+	make_wrapper ${PN} \
+		"${EPYTHON} ${EPREFIX}/usr/share/${PN}/sqlmap.py"
+
+	newbashcomp "${FILESDIR}"/sqlmap.bash-completion sqlmap
+}
diff --git a/dev-db/sqlmap/sqlmap-9999.ebuild b/dev-db/sqlmap/sqlmap-9999.ebuild
index bafc90f9951b..7fe00f1370cf 100644
--- a/dev-db/sqlmap/sqlmap-9999.ebuild
+++ b/dev-db/sqlmap/sqlmap-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="sqlite"
 
 inherit bash-completion-r1 python-single-r1 wrapper
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 68058da8b910..50e0c5818508 100644
Binary files a/dev-embedded/Manifest.gz and b/dev-embedded/Manifest.gz differ
diff --git a/dev-embedded/libftd2xx/Manifest b/dev-embedded/libftd2xx/Manifest
index bc7852d7a38e..2a5324bf85aa 100644
--- a/dev-embedded/libftd2xx/Manifest
+++ b/dev-embedded/libftd2xx/Manifest
@@ -1,5 +1,5 @@
 DIST libftd2xx-arm-v6-hf-1.4.8.tar.gz 882724 BLAKE2B 4ffe647272467698cfe10a2ef201f8adb4bc991df517945ee8f057a07e55c4804bc4d541b6e2bd523fc4f6375b0a28ae7241fdafaed9eae61739d83d0327540a SHA512 bd07f57f9a75c2195aaf71ed1c229e04256a9c9a59f3d2e8f2111bef8a1c58c05457b5d04d7a8f77f9daf076ce3f0b77e317ff1cedce4e3cd4146422cd5cf634
 DIST libftd2xx-i386-1.4.8.tar.gz 891331 BLAKE2B 742be8418ac598b0c4b6b1e4be99a57c85e70310c2a15936dba3a765b0168eac37a080619ed92816a96f93106f96b812545d1cf212f5d6d32b03e5100870f6a7 SHA512 d66415b9ecdc2b38370c2c6b97e5d14c3891910ceaf5aee2740b2e893891c4f2ebf395960748d55508f4b63edd3d829d9c0020898c1b83b453496d18b4a85528
 DIST libftd2xx-x86_64-1.4.8.tar.gz 898269 BLAKE2B e491b58f66ec64014511469e7eb0a628e799ffa4cc52cb94ca66c082dbc56793e3435a80bde7433ce1bea96eea1a52461606ce78a9b2e447f3f9c5a7faef1f1b SHA512 b738b764bcebb5f93f5a968b266547b8775cbc72df8587bfcf67591ce95557b6a43dce2f5dbd9de451f8c9421ec41c25c8fb9bed37b76aec4cd5bac854d4af06
-EBUILD libftd2xx-1.4.8.ebuild 1207 BLAKE2B f3561a38eb0b0c90699bf15ee7654562bbe1ce6f07a7d29eb954b0e2ea83d7f695e6cc70f92ea48f43853e27506dcfe9749ae016339257a7c8f405b7276c7093 SHA512 7f7a756a678e636884170e05e740c01ad8690e5abab54dc1369ace56f0bf672994b970df86e3b61c612068240936b35aa48a87f756e6dad05809b34423b3f8e6
+EBUILD libftd2xx-1.4.8.ebuild 1209 BLAKE2B 44a4512557b5101931aae5e807e90474893266d8d3e11593921a71aa7e5ec72e444d53e622878b44131867e4c87c7488a97f85a2027024b117fb88c1584eba5c SHA512 9de992a704581f028e20a68f2e4a26e8dfa5100ccfcc914fa63c88cfec7d4232d8428cdcb619aa867ee6819b918f13f8b6d098939030577cfa2ea0b8edb48cb8
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/dev-embedded/libftd2xx/libftd2xx-1.4.8.ebuild b/dev-embedded/libftd2xx/libftd2xx-1.4.8.ebuild
index 3fd89c0f77cc..84c41eeda6d5 100644
--- a/dev-embedded/libftd2xx/libftd2xx-1.4.8.ebuild
+++ b/dev-embedded/libftd2xx/libftd2xx-1.4.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -31,7 +31,7 @@ src_install() {
 	doins "${S}"/release/ftd2xx.h "${S}"/release/WinTypes.h
 
 	dodir /etc/env.d
-	echo "LDPATH=\"/opt/$(get_libdir)\"" > ${ED}/etc/env.d/50libftd2xx || die
+	echo "LDPATH=\"/opt/$(get_libdir)\"" > "${ED}"/etc/env.d/50libftd2xx || die
 
 	if use examples ; then
 		docinto sample
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index 7c1d3fe2af3f..bbd9f9f343fa 100644
Binary files a/dev-haskell/Manifest.gz and b/dev-haskell/Manifest.gz differ
diff --git a/dev-haskell/language-haskell-extract/Manifest b/dev-haskell/language-haskell-extract/Manifest
index 096589266d74..9c15b45ed991 100644
--- a/dev-haskell/language-haskell-extract/Manifest
+++ b/dev-haskell/language-haskell-extract/Manifest
@@ -1,4 +1,4 @@
 AUX language-haskell-extract-0.2.4-ghc-8.10.patch 761 BLAKE2B 1565bc0b79d2d45e3f191c0dff11e2552f4665b37c536c29561f0b04c500e4aff8994472f09a6c5780ffa754007fd5e6a4c692aa827e6c4cf10843b1f17b414a SHA512 a8b0f4c1bb17ff160a755a5ca004e16659a051d31d4feb6cac0d91596b69da4668bdfae4cb855f876268d47d5c0e50e1955088f4431004b9b4c6d9a4ad2e2e15
 DIST language-haskell-extract-0.2.4.tar.gz 2458 BLAKE2B 9655707a3195c82d5eda9cfbba150d3a91e103155cb522b0d9e13456e833b5530c808435d915456c230f92c438d2989512cbff956c7fd87493e481d39a53fbd8 SHA512 6408459abf9d531ccbe7d65766d38fcb93f4d3f9c77db1a706231bf6d8ad6f845fcefc4fbb03833f45c74f21f324a44760f3c89ff093c69f1f9999e64344ab4d
-EBUILD language-haskell-extract-0.2.4-r1.ebuild 651 BLAKE2B 0e2b5d8b60a1e99cb460b4867615bbfa52a5e9f7bde1df934a9e0b083061a2c8904db142cd52c417fcca9d417977b318dd4aa177f756f7838fc4535866b50ca3 SHA512 cdbcdb39cfccd7987077dbf22b287072afee55ab05f4c4201d6bbde56d41c6718933e78708332ecc5ef6b1a06f91f71903e1e218aba708aec78f0620f5d81167
+EBUILD language-haskell-extract-0.2.4-r1.ebuild 653 BLAKE2B 23572a466ce74b5c99b4a05197fd16073eaaec39f68d5b97798cc39635f37f20e37eae60e27c723d3775e0c25f9383c8231107800e8f6c43cd49e1b98227a84a SHA512 f444111d639713f8b99924f9dc2d2a8d5a2e67a9a40d9f9ea546b945a80caf8d96c91bcafe0e6e52f611b27dae1b0e5128e7764e42f664367faaf5a42cb45cea
 MISC metadata.xml 1476 BLAKE2B b1f7cd7468134bbde7be9be977e25f39da8475979de7d7a59491c1bb387eadd7e9e6d9f35921ccb96d7b74dd5b60f7f022b3765513bae8d3444eb8e0d8de97c2 SHA512 45ec94b3bbee94301428c55259237e2ed8de2e1c4925a9ff7e56a3f4dc6c8db868326617656387b23f47bde1e9a58e24b03c1625048ca8de214fedca1df1f86c
diff --git a/dev-haskell/language-haskell-extract/language-haskell-extract-0.2.4-r1.ebuild b/dev-haskell/language-haskell-extract/language-haskell-extract-0.2.4-r1.ebuild
index b34e2e9f9aea..f7c821fddeee 100644
--- a/dev-haskell/language-haskell-extract/language-haskell-extract-0.2.4-r1.ebuild
+++ b/dev-haskell/language-haskell-extract/language-haskell-extract-0.2.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,4 +22,4 @@ RDEPEND="dev-haskell/regex-posix:=[profile?]
 DEPEND="${RDEPEND}
 		>=dev-haskell/cabal-1.6"
 
-PATCHES=( ${FILESDIR}/${P}-ghc-8.10.patch )
+PATCHES=( "${FILESDIR}"/${P}-ghc-8.10.patch )
diff --git a/dev-haskell/wcwidth/Manifest b/dev-haskell/wcwidth/Manifest
index 486cd876a0d9..cfded5be1c91 100644
--- a/dev-haskell/wcwidth/Manifest
+++ b/dev-haskell/wcwidth/Manifest
@@ -1,4 +1,4 @@
 AUX wcwidth-0.0.2-fix-build-failure.patch 756 BLAKE2B c18ebd2a4c38875a2ab7120645d88dd62e69ab268bd147090cb0cedece3e4b621bf70c206d79e5e2b6d3991f72188fc2087b09b2345474328b25cbbe67c906f5 SHA512 8c0951b2251002eb3f0e5f56cd06d6571ead53e2a854cc79d1e496d7b0a82792a216a48e85deeef0d1c0b4f330da624729150b77bd444d911f6149c9c4109cb5
 DIST wcwidth-0.0.2.tar.gz 4168 BLAKE2B 4c6f3b490934aacef35b4fcbf8d9cc8f2c93b2d34a705e78dae4750f2adaf37d4d16d89e6595a50bf545d7a7dd486f589b1000f7d2f5b2893b45680ed31f1c4d SHA512 555c38183c7c402a66c151e52bbac9e6c501528cd661ad1708576444b6dc4daa19e0d75c9b79f8590843e0e40b3758d9bea08e426e754688cd32070dfce5a649
-EBUILD wcwidth-0.0.2.ebuild 839 BLAKE2B 2f3fb2070103d761bc4e824d69c6198f2f1d2012c062a191bd1cddd309286f6e1488fd10c291fb160182fd10f88d53926e3ed8e0b317e84e566fe97ebb35956c SHA512 88e6e1c1323988ec318077b3e5a6e081e04aa30c5a9ec89de55eb311b24e4a664b3503ff23107a6f037ed39fe2bf9e3f67d35653ac24966a93bd2ad05d318bc3
+EBUILD wcwidth-0.0.2.ebuild 841 BLAKE2B 184cc5a45c53dc8a48174bd663f196098d2cadf477d273b5e69e326a15451e50b2ca356983bf299d4730b4e11d75a469341e240896abe5a699523f0cccdc7a1f SHA512 c6584b102c25029319588f12edcc5badd1fc4afa68eb733335a1567f2701629604ef33debabd1e94847e12add3596cd7dc1874c42387c6940c8518f22193d40e
 MISC metadata.xml 574 BLAKE2B 286119410dcb9969a3ad403eb21e81b5a6df68014a7db244b421ad190718726513c293eeec1f55ee61f698b5d383b4fbd633dce3447ca2a28a8f5677796e0484 SHA512 caa37ca486ed34ccf1508dc703fc6d8c50c29e174ddd33aff6674b85a26740dfb9d5c0f188f5893339ccb2e36410f19d1b80620485f4a8eaf1458aa7f5921823
diff --git a/dev-haskell/wcwidth/wcwidth-0.0.2.ebuild b/dev-haskell/wcwidth/wcwidth-0.0.2.ebuild
index e46cf9838bb3..6f3ac35b91d4 100644
--- a/dev-haskell/wcwidth/wcwidth-0.0.2.ebuild
+++ b/dev-haskell/wcwidth/wcwidth-0.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -26,7 +26,7 @@ DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.6.0
 "
 
-PATCHES=( ${FILESDIR}/${P}-fix-build-failure.patch )
+PATCHES=( "${FILESDIR}"/${P}-fix-build-failure.patch )
 
 src_configure() {
 	haskell-cabal_src_configure \
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index f1268a18af85..06d0de209b45 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/byte-buddy-agent/Manifest b/dev-java/byte-buddy-agent/Manifest
index 90fd09b0192e..4aede9a694c1 100644
--- a/dev-java/byte-buddy-agent/Manifest
+++ b/dev-java/byte-buddy-agent/Manifest
@@ -3,5 +3,5 @@ DIST byte-buddy-1.12.8.tar.gz 149928045 BLAKE2B f1fceaea236a7d625739547556cd3775
 DIST byte-buddy-agent-1.12.10-sources.jar 204651 BLAKE2B f3e0db8e6c8f3380ee3bfd8969555c331689990b97e91206567c01ffbaabc58eeb25b0879e792ebce1044afa8d3b5596830349d9c233ab1af84d13213e046f4d SHA512 8569531e5f5343378037cd9740bdc42b91becb9adaf0f2cacbdcb0e5ccafb3e47fce9c7b71d8d8d8df1c7373ffd44d798b8b164136d87913faed1e19474f803d
 DIST byte-buddy-agent-1.12.8-sources.jar 204430 BLAKE2B fe62b36fccc1000b63cf4fdc9a0eda0b767baedbb795ed55d28068ca9bd01f10b47e28edb2ee2d0fccd28e82f531f882091386b9c58f2ca929e17e89f996876a SHA512 576cad5aec60bb1623faf6f2460e9550aab392124579a0ed467128c3cdbc20fb0c4e51dfaa8d56c8f2f314bcc494068aae5c199a0551cbfce053633a2ffb5bd2
 EBUILD byte-buddy-agent-1.12.10.ebuild 3900 BLAKE2B 683f9d03bfe04810f6b946b71039af441dd2835cbe7c37c532fbaaba3748d1b30f05dce7e2b8d4370b8e6d99c4070f242a97648e35a7e55205a9dbd33c9d90e1 SHA512 2927b9d5303df5250ef6380359c8fb3265e784003d10d41512e9aad02c2b3dad2250b53de61d620da9df0541885a2fe1a40c698f75d50fada7570ecf9ce709c4
-EBUILD byte-buddy-agent-1.12.8.ebuild 3932 BLAKE2B 4a909157bcd91623ccfe21e78d19e6d1ca0f74dd51b6eea0f8b0c36af4a9f3261292a9efc13d48e984f0611c44591b9bd54fc68d69be9dfcb39a4cf7800259b2 SHA512 15428934f7ba40f4dfa27296e52dc3e38ae9995339019662f3ba2b685b4dfdcbfaed7f0f40f26ded47c0b80c0d120927a3635d288513859113daf1c7ee8553a3
+EBUILD byte-buddy-agent-1.12.8.ebuild 3930 BLAKE2B 640741344f81ffd69dfb7ee1127bc6bf6c98d8ecf71cba6a3a2fe1f3b1b50e942b04e9c11b0bf3e2a5305f3dabe07a42944727bc4f419b1c194f0586cd5365f0 SHA512 87a254ee7e24ab53eed6c28a54a8c8bcb13fa3eefe32ab9159c671340b6397cd8d1e7225330c4f3c89499a5322b2c98ed95d6ccae24b3abf6104470d412177fc
 MISC metadata.xml 298 BLAKE2B 914c744490ae973853ca6466984c1037b03e9fca047e413a4c6981122c796312f56510069c6ac3c7cbc4ade7f45d480b4aa6ad0dbeb5e9c19e552aa136308626 SHA512 6483fd3b6cf22d595b2d925d81b5450f1bbe5b0b371bf4bd221a7433d9eeec5824c2dc644a77cb4206a6bcc017172f764f050eda9dd6f479fe408d491b325f5a
diff --git a/dev-java/byte-buddy-agent/byte-buddy-agent-1.12.8.ebuild b/dev-java/byte-buddy-agent/byte-buddy-agent-1.12.8.ebuild
index 050af69691a8..2bef6605a31f 100644
--- a/dev-java/byte-buddy-agent/byte-buddy-agent-1.12.8.ebuild
+++ b/dev-java/byte-buddy-agent/byte-buddy-agent-1.12.8.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://repo1.maven.org/maven2/net/bytebuddy/${PN}/${PV}/${P}-sources.j
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 # Compile dependencies
 # POM: ${P}.pom
diff --git a/dev-java/byte-buddy/Manifest b/dev-java/byte-buddy/Manifest
index 4cb4075d85ed..15c0e87c034b 100644
--- a/dev-java/byte-buddy/Manifest
+++ b/dev-java/byte-buddy/Manifest
@@ -1,5 +1,5 @@
 DIST byte-buddy-1.12.10-sources.jar 1331398 BLAKE2B 8732ac81514de40d3d2ffd67ddca05ab9b8a5d0a7f240ee4591fd02b41f410f9e834f389aa898829fbae6082e14a090f87052f537b2b6293c7f8f98d4a5d0583 SHA512 15cb4330598d9259afa29aac0317f8e0e003eb76fb26052bba0714ad30453db721938be7d46fcc6a0c7bbe124bffe68dfee6fcf11a3e4030e99ef01d0ae3d461
 DIST byte-buddy-1.12.8-sources.jar 1327088 BLAKE2B b20101a8e2f68c795ef102b8f2d581c1ebf223dee2170b675f0959bfe547c2793bf79c7e9508b405e43f3561f48423b980ed2e87c6297999a7d1257df4d6524e SHA512 a99d69be07049f4ed162566111c6524a9dd90af459d994a5e917596b5787b74aa88d67a8db7651008558ad687dccbefd0ee87207c6b28ab0660e02abdb43f9c6
 EBUILD byte-buddy-1.12.10.ebuild 1379 BLAKE2B 020baaed6a9a41c258a410eb48f56af3759565e44f842d7e27d6bd157ff82f4f896934d846592ffb1971c488252bb14d4901fd6c0ca33c9cdb82526fc5e17e77 SHA512 95f1ae38608e69f77245191b7783978e39c09d9244ee8c0a64f58eab28ac499796f30cd45cc5696120cf18586441a1e2e936839ee4f9795af0f7956c7e48ab39
-EBUILD byte-buddy-1.12.8.ebuild 1374 BLAKE2B 780becc5c6170b88a4d0f04e7a91764bcac5eb2a293a42cf094df34d32b84d39044b2f8a4c3c31b837d6d4264f9a19216ae935f159f606bac334859700715f4b SHA512 499c064697baf6f468fae2d847cc4568090c20091c105a420974b40c76550b8bc29c82eb2cc76015a07ff76e5ebdd3902db242987c2dd27946a83ff94d482274
+EBUILD byte-buddy-1.12.8.ebuild 1372 BLAKE2B e06dc59d4cb12a68c666df7d9d44c51420d58d23a9013cd3eb7f99b96fcd1a07feb8deb6c653b2faf9d1ddc0170808decee805b18b99997b868bef689a9dd54f SHA512 2127685eb355803d9820f53c45ca254b234664593910fd39a7de27381dd0cb99042e84bcc734bee06e3f1079b2e6cd4c00070a5f3db1159938e5bc7e352f6e65
 MISC metadata.xml 440 BLAKE2B ef73e69de33dc6bbea38c81b8744fad5ce4764644d9cc6168d7c0f175856e30c3a577ffc597f25f8caf26bacfd80663b55eddde047a346fcb582d883269233b9 SHA512 b27c92e768c2783c90c8b4693c3265a9533a09abe76b2b3bd54e3865d270eed91414fcd89513bc30feb0243ea21f63d354b907b74eb18e98f899811101a6c956
diff --git a/dev-java/byte-buddy/byte-buddy-1.12.8.ebuild b/dev-java/byte-buddy/byte-buddy-1.12.8.ebuild
index 3b658b7e1137..c8986cf4115b 100644
--- a/dev-java/byte-buddy/byte-buddy-1.12.8.ebuild
+++ b/dev-java/byte-buddy/byte-buddy-1.12.8.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://repo1.maven.org/maven2/net/bytebuddy/${PN}/${PV}/${P}-sources.j
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 # Compile dependencies
 # POM: ${P}.pom
diff --git a/dev-java/findbugs-annotations/Manifest b/dev-java/findbugs-annotations/Manifest
index e7c612858d57..4683606e315b 100644
--- a/dev-java/findbugs-annotations/Manifest
+++ b/dev-java/findbugs-annotations/Manifest
@@ -1,3 +1,3 @@
 DIST findbugs-annotations-3.0.1-sources.jar 25170 BLAKE2B aebd9acccae5d4fe209aa9393fb35868a67096889375eab5817eeb6b6cabe950e1a3479826c921254fa1faeaaa8231095b5ef88dc2f83fa3b6ca2a76a1572b42 SHA512 bf77991bcbad1dd3e072c65df36d7714cf2f2967a01ed9e8435b6b40c925d905fc879c83303a227cffa5c3db4c960c9c6813ebb520f5d1c0f178f27710075d43
-EBUILD findbugs-annotations-3.0.1.ebuild 1125 BLAKE2B 137c3f4b5ba506cedafd0f42a8d91250544d17c1f0ee8af0d89264596766abea6fc70d237d919d22f8e68098836db1bd83c66137d17d8923b5adfead499c9a2d SHA512 6bab9193745e4811ba8c5334adc7614c2bc70fe148ce3eb6733e8d1252b9cca91528b501b299f429e21fc7a2779a23d4a1ffcee57e179725f9a6f3a63367c09b
+EBUILD findbugs-annotations-3.0.1.ebuild 1123 BLAKE2B 4fcdd9ef1cae397eb67c1a66bc87a7549c8606a487f403aedcc5c9bf0aad69b11d5f7cc6faf14688b5dafe43b1ef72bb4d5de7f7e3353ef4ef0b12b4c8d9906d SHA512 8043369d6cc100d169b5a80686a04cf3e23ba3770eb70dda28667f27f48a466b0e300cbd4c1910e50cf768f48e2be2f06d3da2b4422040c94b3201bf9cf173b0
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/findbugs-annotations/findbugs-annotations-3.0.1.ebuild b/dev-java/findbugs-annotations/findbugs-annotations-3.0.1.ebuild
index 22b9af5b27f8..31be4193eba7 100644
--- a/dev-java/findbugs-annotations/findbugs-annotations-3.0.1.ebuild
+++ b/dev-java/findbugs-annotations/findbugs-annotations-3.0.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://repo1.maven.org/maven2/com/google/code/findbugs/${PN}/${PV}/${P
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 # Common dependencies
 # POM: ${P}.pom
diff --git a/dev-java/jna/Manifest b/dev-java/jna/Manifest
index 1095a088093d..7242d9f07ae4 100644
--- a/dev-java/jna/Manifest
+++ b/dev-java/jna/Manifest
@@ -6,6 +6,6 @@ DIST jna-4.2.2.tar.gz 58638853 BLAKE2B 3941202ad7839f748c65f1abf53a335f6de7959de
 DIST jna-5.10.0.tar.gz 106258319 BLAKE2B f5605fd91bacc1e900e835494c27b0fdb4ba91b0c04bad1757133bed5938603264ce9fba89c5ce7e4644456b752b934f6e205d0131659e77bf0c58c2b44c61cd SHA512 93e1ab659a60d711557eb93620bcbd05f3dbe9c739b256cfb647d8ac2a4038d0bc638c614b58339b2875017ac18b219a4ddeb0d92e5ca25fef2e326bc14ae256
 DIST jna-5.11.0.tar.gz 107424072 BLAKE2B 9f79a0b0e643c8213c159785814dffaeee2dc3b332647c5c887aa5a6e707be5241d392e75730b803b21362fcbdcee82d7049bcdfb7956039f1534e3cd8e170cf SHA512 0122b56c24125e5dea541bee71b43f127df50c8f90b2c240271c677a8d598d9640bb920bd3390856124e8b1bc89a9bd41d2b6c569ae7275f68a13c08fd07027d
 EBUILD jna-4.2.2-r3.ebuild 2140 BLAKE2B 02bf4fa0fddb60ea509a042244e6d450e0827b5002a01d55438028c3e9b67bde5be21bfd3ed11b0ce90faf7f19397bf6f1f6b890ac5a70d2dcc06e59ba63ba98 SHA512 e9b8ba2522bcd0582f8c29eaf7b8b66a687ddf3c28c07d13b8b2e0a9d666efeb7e51d399f57c26e6f178fcf0ae279e272455083663ecc729ef3b0ba4e8c2c885
-EBUILD jna-5.10.0.ebuild 2463 BLAKE2B e7d4f12b13feb036bc0b17613e74a87273c1872f9690e0aa8420e9f622e4153f920760d7a4257e11d6426d49717e4e72ba09a9c4af3b9ff5bc4bdaa14b394da1 SHA512 6d6288af5598eae79640ee0c2872f876046ca180fb24878898663b1f58619c609fc28fa93c3032fe30646b9739c666c5c0cbe9881326cfc0c95c016929da45e9
+EBUILD jna-5.10.0.ebuild 2459 BLAKE2B 86b61d92ab01caeb641565650fff5e9024ef39f163fccbcbdf2f167b6bb198e952ab21f2650031f85c9ca7436f7a3690a28d28957c58547c080eac12fd235d64 SHA512 408ef249df31976f88baf7ff7222796a402c0ed94154b280eb3c5333b8deee30fe4c22709e2bdbffa3b40e3196ea8b6c39c547fc76ae16c489caefcc2734766f
 EBUILD jna-5.11.0.ebuild 2490 BLAKE2B c97633d35bcaa3de72948587a4b56fea5a92a691428f20ba52da2a5111f36f4788e3a55c96b7b06df0c2445e0e34b005505229bfddfdf5d1ef02ccbb8e8b6a31 SHA512 2ed6e9dfeb73b9acc059597a28f59f03c3a93d70a35ee206c5a57c7c987c26c7d1889ea112b6c5d4bc7a0017e2ac6d145abb785aef98825b1b40f184a69ebc0d
 MISC metadata.xml 463 BLAKE2B 9ead7422212fdd6bebd8ec6aabafcdedf0d32420d312a8a0f2cd701dc7eeb940a30e91d1dc0449899a6134e1cb96d47cf95cea5dc20b4974b3d8714c6c00f93b SHA512 1365756d0d98cd7e7bcee2a608a77f1ca95c9546567a0bb37ba0033eb997ef6ae37d86e79c7c7fdc0916cb515658f9a37924181efc3215d00c825b10f9f99b45
diff --git a/dev-java/jna/jna-5.10.0.ebuild b/dev-java/jna/jna-5.10.0.ebuild
index 1d15c940f056..4e08475cbb53 100644
--- a/dev-java/jna/jna-5.10.0.ebuild
+++ b/dev-java/jna/jna-5.10.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/java-native-access/jna/archive/refs/tags/${PV}.tar.g
 
 LICENSE="|| ( Apache-2.0 LGPL-2.1+ )"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 BDEPEND="
 	virtual/pkgconfig
diff --git a/dev-java/jython/Manifest b/dev-java/jython/Manifest
index 19b539c2610a..159c117aad63 100644
--- a/dev-java/jython/Manifest
+++ b/dev-java/jython/Manifest
@@ -7,5 +7,5 @@ AUX jython-2.7_beta1-dont-always-recompile-classes.patch 309 BLAKE2B 72fe6e0afe6
 AUX jython-2.7_beta2-maxrepeat-import.patch 457 BLAKE2B a55f47a16264544608ba9916d3f2ced081a4f47d260bab2eeeb5959ad1aaf1074a69bea4d8083383d039f541f6b379a141c81c4376a7f7cf324ce06ddeb84ab1 SHA512 e06ddb36805e2545f351d9d5df651fa90b0b39d340e4772cbb24910f1e1c999463a21fbe4a62c9cc73f9ccdc0047f8900e6300602cb8d5b70cef7cacf1bd46d0
 DIST jython-2.7.0-sources.jar 15371691 BLAKE2B 7e1c29f2a2c03b034e89bb9c3a8fdddbaef6a0191a7320c82b76e31b41336f3d99c1995b2e9864c033ec53629d45669ad460fb4a1433ea7bc6b0390919500a24 SHA512 7583810245d694fd1d99a57ad504fcefdfbc1183def2cbb93ae3660f341104205c73041d846bdcf2b564b3cf4b770b481703c1dcdb1458396812c92d30ee9fa6
 EBUILD jython-2.7.0-r4.ebuild 4303 BLAKE2B e799c43f07df3c01ca6e2155c8201ae3c3151bf86e79f5b79a408395379adfd97e11bd9ded46199fc8e3aad174ab45ccf4bcb9dc90738491bbe66958f0d91147 SHA512 d76dc2820fdb18d6ca42ae4b4e2e0aa335abd5b3acd2e37726c6f0c166451f84b0f4f3edd59d4ceced3ade06fd65f6578bb29953b5b873dcd7668e1871437261
-EBUILD jython-2.7.0-r6.ebuild 4453 BLAKE2B 91f45695c95fcd42bacdd35fd3d4c1ff34de387046dc51a13ec9f7d5f2367dc9d4033b5110f55f0c5d1abed4cfdf25b820b630c28058d3b7806196d98e983653 SHA512 317dcd4ddd74d89ed8bbc62108d924c9a223f6e448a8f0148adf801151a46c9fedbb70bc370966245cc6f3f1838af603d8f6007a35673027eca1175001a82c60
+EBUILD jython-2.7.0-r6.ebuild 4451 BLAKE2B 336aa71985c9d6e07194c4cbf14d3dbbf9570f121b53d69f5a1fc5da96d35f33236903653d2645dfc2af91c13f8c3227eca5d6b25161f897b1656ef154de9e95 SHA512 c75b0141bf360bc61990683b1a7051869bc2ba4c6a174a6b7c14a5aafef790e76f9c49f09a27054e06b2fdff5dcbe5cfb1ca277b0c9a0987734ffa6a583c5dd7
 MISC metadata.xml 323 BLAKE2B 4c2b07b6a519fb3f1e4f7d0662e2488705d8ba2239a6cbd25b42aebd1bff1ca368105e1c5eee604915428c5b909ecc2547f6be4dfad126139a7f496bb276ae02 SHA512 de33eb0b1518ca8c0c9f8a44880946f491620bbcbfe0d5ebcb68dca71eba3965f0cf0ccd8c67128022c33845699222bd8b899c061cb5f7d7c0e09a4783fa3464
diff --git a/dev-java/jython/jython-2.7.0-r6.ebuild b/dev-java/jython/jython-2.7.0-r6.ebuild
index 7000a802e098..b9a9876e0798 100644
--- a/dev-java/jython/jython-2.7.0-r6.ebuild
+++ b/dev-java/jython/jython-2.7.0-r6.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://search.maven.org/remotecontent?filepath=org/python/${PN}/${MY_P
 
 LICENSE="PSF-2"
 SLOT="2.7"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="examples test"
 
 CP_DEPEND="dev-java/antlr:3
diff --git a/dev-java/logback-classic/Manifest b/dev-java/logback-classic/Manifest
index 265a6afb66b5..2dd4f402726f 100644
--- a/dev-java/logback-classic/Manifest
+++ b/dev-java/logback-classic/Manifest
@@ -1,3 +1,3 @@
 DIST logback-1.2.11.tar.gz 4133000 BLAKE2B 09ef74fb92c5a3f10a9ed401b0cc687f9dbc05daf17646f96fa216aefef1a150434b7ba4ca25b6ed751c01dab906c56be5c65908ca9baf6e29cc1a9f55e14773 SHA512 2482f7af5696034e9b412fb3d37be7f0bc7c8a2549808f88b0ae693c0be4f95c41acd82649f76a4572ea5c0bb9f8d7a78b9a64d7af6dd76a0b1b926d7419c084
-EBUILD logback-classic-1.2.11.ebuild 3253 BLAKE2B ca2e4d471073e0570b17c81a295574e4dc7192a9226e8bbbed2fc4de99717958bb16498912c35efd36446bdfadddd22b2e4cd4e681e173316e36e4969c7b3754 SHA512 e265a125363053545d2a3943da8e63154e7262ecfd2ecea222e7b42b2dc102bdd171e789bd24aa8614cf51166c467b0f7617e1d782d385714d3f3f14a5afd0b3
+EBUILD logback-classic-1.2.11.ebuild 3251 BLAKE2B dfc7cee58b219976115e89ccb39a68be3627fc201627c8e8b3d7ac5364048ca6b091625a3e6745369bb211c729cd336a58f604d65bd57209a4adc56b99eee00e SHA512 83c664d5f6650b549c1f95bd1ec8af119ddd11293713f7633a62fb30486c7b92aba50d8f1890bafff6e0320f63c99fd4f0ac2214f5f64fdfbfd86c4c82cd4427
 MISC metadata.xml 413 BLAKE2B 3ae8c9f27dadfe978d070866e0c0368b89b8532f2aa6fbd3e3fab9e057320e1c6b5c2bc7367cc191e189acaa88384a0b86741d674d1cd711d4dd5ee8a29c9662 SHA512 7c2739ff8e878766487804fabcb39cda969c81e47af7fd51ffebfcb85dbdec10b7eef85b1d9c873561456e1592f6cdb8f82fbb4233abee1f43f323a1c10f9ba2
diff --git a/dev-java/logback-classic/logback-classic-1.2.11.ebuild b/dev-java/logback-classic/logback-classic-1.2.11.ebuild
index 7654edfce259..3ea92f479d76 100644
--- a/dev-java/logback-classic/logback-classic-1.2.11.ebuild
+++ b/dev-java/logback-classic/logback-classic-1.2.11.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/qos-ch/logback/archive/v_${PV}.tar.gz -> logback-${P
 
 LICENSE="EPL-1.0 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/logback-core/Manifest b/dev-java/logback-core/Manifest
index b5fef1c99549..26118710efb6 100644
--- a/dev-java/logback-core/Manifest
+++ b/dev-java/logback-core/Manifest
@@ -1,4 +1,4 @@
 AUX logback-core-1.2.11-Ignore-test-failing-under-Java-16.patch 799 BLAKE2B 5ed73567f9ef6f6fb08c1f9d6fff43e71a22760a31bddcc454a75c62d26b50bad46510f6c748c019ab90e69e6e6007ee3de2507104f956b4c24b658716a6b6ed SHA512 5214fab891a28e02b6748a307e1741207c16dbf0f9fbfcef86f1303c2ab15714348a1f1750965ee928ed422ffa7261f0bc7340756805ba196fe86dce66039ae5
 DIST logback-1.2.11.tar.gz 4133000 BLAKE2B 09ef74fb92c5a3f10a9ed401b0cc687f9dbc05daf17646f96fa216aefef1a150434b7ba4ca25b6ed751c01dab906c56be5c65908ca9baf6e29cc1a9f55e14773 SHA512 2482f7af5696034e9b412fb3d37be7f0bc7c8a2549808f88b0ae693c0be4f95c41acd82649f76a4572ea5c0bb9f8d7a78b9a64d7af6dd76a0b1b926d7419c084
-EBUILD logback-core-1.2.11.ebuild 3575 BLAKE2B 88e882efdb626f6351f5768bdac686766836b74ebd07d9009c9d0770d448ebcbfb4977094c930837917a7a0003650839f99616cd558909d3a150d0590ae67920 SHA512 63a8adfdd0b0c8f2587119767e4cde3616e096c09833ed50d6ee2a0e1fefaf1d26900859dc730fb8cb595d21ca9504b1c41ca2614444be927852f8adec2e6f11
+EBUILD logback-core-1.2.11.ebuild 3573 BLAKE2B fc713a7dcb3a0ee8f2883ecea4e206a7d9709a1098f629855d8d9516a3ba38dac0a8b6282cd40a7a48d8dd29ebf7109fafd906dbb86e23a0d05ac880a1922cee SHA512 61cc3e231524c5071084b4c8961ed910c796b6a0342b3e89cfc8d1bd7fc621a75a6ccb0830ce7b695c98ab54f46b2e672e094c2a3379aecea2ac950e3c2bf96f
 MISC metadata.xml 413 BLAKE2B 3ae8c9f27dadfe978d070866e0c0368b89b8532f2aa6fbd3e3fab9e057320e1c6b5c2bc7367cc191e189acaa88384a0b86741d674d1cd711d4dd5ee8a29c9662 SHA512 7c2739ff8e878766487804fabcb39cda969c81e47af7fd51ffebfcb85dbdec10b7eef85b1d9c873561456e1592f6cdb8f82fbb4233abee1f43f323a1c10f9ba2
diff --git a/dev-java/logback-core/logback-core-1.2.11.ebuild b/dev-java/logback-core/logback-core-1.2.11.ebuild
index 82c0939dbb61..bd68a79797d0 100644
--- a/dev-java/logback-core/logback-core-1.2.11.ebuild
+++ b/dev-java/logback-core/logback-core-1.2.11.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/logback/archive/v_${PV}.tar.gz -> logback-${P
 
 LICENSE="EPL-1.0 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/mockito/Manifest b/dev-java/mockito/Manifest
index 9dc6a3fff8ec..70760750903a 100644
--- a/dev-java/mockito/Manifest
+++ b/dev-java/mockito/Manifest
@@ -2,6 +2,6 @@ DIST mockito-1.9.5.zip 6453870 BLAKE2B b577c4a82f03b5c345462ecc10e9fe25c03836d08
 DIST mockito-4.4.0.tar.gz 1030274 BLAKE2B 41b64456b8bf083f69889fdf7fb891a0bb790af8eb897fd0ba5ceca47050944fec102c33badcf6a68621a9fadc33439405b9ca307794f865637c3143c474ba3d SHA512 f0f4c3f585aad63a357d8b8f924124961e7fffdf95607945ae073ab32a05be6ff08794d3edfc60dea21b65ef7c827a4872315c2372d6a9aa822cf8700a08025f
 DIST mockito-4.6.0.tar.gz 1030497 BLAKE2B 0afc0f5874acbd290312a7eee2ce8b9f7d1a83da12338ff8851e02cd6a9ed0c99bfc109fade5ddfec5f9a5277ffaa0d04c53a726c31082dc53b512a2e551473b SHA512 18f76788e610ca169cf6b4eefd0fdd78c333b920122115d816d1f2ab94f0a84d5a9fd0d00d41d1c34e592c5634f7ac55f7f491061b7992d18aa69f3fc62561b6
 EBUILD mockito-1.9.5-r2.ebuild 892 BLAKE2B 5efb72fdf28d793ad9cfd14ee41b58b4ef9d9bdd21b638657ea9ea77444443a68e51177a992b2f3f48e13c56ab68a3821368fd6eb287182d2f60ada628cf6ff0 SHA512 44e08dcbe481a4bcf964227cf2c741403aa799ef98065b7f8f490451d15daa286f01cc944546875cfbc92844427ad2ccb305e44ed5dfa06fa5f04e673146c8a1
-EBUILD mockito-4.4.0.ebuild 1238 BLAKE2B 1e7ec3663d07e3eaa70b452a8f91fe19dc3a357e7d2203fd0464d6773d4b4b0b577f0494af57af86c2c767c5edb8c633e2a65c3b54be54cd6577c331e4560732 SHA512 f9054dce19d3ba277c00c937296df0e454b96cfb92c22e4771811ed4e80ee12c60db38f1a6cc7b75b7a3153f30a460d2cd848ff7caa535c1869db733ecfeb407
+EBUILD mockito-4.4.0.ebuild 1236 BLAKE2B c18ed83b198259694ba5d423dd279e4d46d4a2e6f96780daaaa22d4a69dac016860e23e3b41a7660b2721ccc9c3b6fbfd4598c50bd9478d67e26337b18eba923 SHA512 dba04ce747158ca89e9f98d9a8c676505d2e432f9b2480cb78848796ee59a009b9cbee8a76a6440e6f778776dd0bb4682a818d5b1f1df77e66fa733336bdc85f
 EBUILD mockito-4.6.0.ebuild 1237 BLAKE2B d1617ef96068aa664e3f1b75ff6d9128682c36c6a20c0aa1f291a283a5ccd63c45809bbf0a80271f2a6179ea44a04e437e611578e98a648c768bd750f861f1db SHA512 1f99f9ddb864787c3c6d9c7c613d24f61475122f7da98869a65bc0978f3bb1a48de118389c862a7368b6ed7af5523cdf8f216e44e31b683eaa183316c7225778
 MISC metadata.xml 317 BLAKE2B 209b27a429c1fdeca71c1e215f8fc43bfc66c961b1a3ad3dfcda16d5ea1df51e54cea248f4f152966aa1f91059b91c21fb734c6995f8033150dbda5e1813d121 SHA512 1f7be64d432b4004d2bbf1ec2c6776ec8618875356ea0308b8409f322d48bf3440d692732406ddb3fa7a273c9754c4cc5a6f6cd9808348d0ba8beb7159887a5b
diff --git a/dev-java/mockito/mockito-4.4.0.ebuild b/dev-java/mockito/mockito-4.4.0.ebuild
index f8a554b3ba6b..2c92c4df4a96 100644
--- a/dev-java/mockito/mockito-4.4.0.ebuild
+++ b/dev-java/mockito/mockito-4.4.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://codeload.github.com/mockito/mockito/tar.gz/v${PV} -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 # Common dependencies
 # POM: ${PN}-core-${PV}.pom
diff --git a/dev-java/netty/Manifest b/dev-java/netty/Manifest
index 8c76a1116395..850bf5dbca13 100644
--- a/dev-java/netty/Manifest
+++ b/dev-java/netty/Manifest
@@ -1,3 +1,3 @@
 DIST netty-4.1.35.Final.tar.gz 2447958 BLAKE2B 133adc2b37d3e681d11ac2e0187c0f79bb7aeeb6c622a1bf6e66a35bb78cd5730eeeffccfb960948f2e1df5dfadaa44f62b6f354c03065493ae43e1399a5ba2e SHA512 c3ba4e34ae9d309118ff3517467ffc218136789b06287d747b57df08be84779dacf5e29b19157afecd759a3516bc346e434295291b3dd546f80c4ae7c3f0a3ca
-EBUILD netty-4.1.35.ebuild 5857 BLAKE2B e49556f1ec09208ba8e06631a075d0763c11c7e30928520756653378a84e9e58b23c4f013bfc75a9fb984b34581317ea1afc89113ed630bc61ac793687f09b5f SHA512 1ad81114c4e8c7c5bfe30dff43b0b2d768280bac5f30216d8f07c10a9104199efacfe8a64c9c77064b6d5f47627f1ebd8878bf3e900b3c308edb224a0c1a6a87
+EBUILD netty-4.1.35.ebuild 5855 BLAKE2B 74696e77590aeaf5629fbc31d2ff7dfbce725f2493c227d4b88efd50da801965afa8f3e9eb60467db6c0035f6c46ffadb947cc75a37fc41fafe8878d804966aa SHA512 0c397aee0d59041b5c04240faf2a339c46f4218fa2f028df1b38793d82a15a240387ee630558bee497c8ffe9a5870235c0e323822a2c40a1098b6aa7f7289cff
 MISC metadata.xml 507 BLAKE2B 821a563701bddd615a49743269e82ef5f906d5f30d957accbba10cda171b3a8943911733247e05efc9c28b40fd75396e78c2b28c3297a74b15ea8b716dc50ad1 SHA512 5c237af46f2d99e807ad5d442c83af2d1bbd85f3d3ed71e5dc3595c91d2e8104e5025216911e74901817cfd495eb6e96e22248bd1a05c90018c7d13b99d1d494
diff --git a/dev-java/netty/netty-4.1.35.ebuild b/dev-java/netty/netty-4.1.35.ebuild
index 16ffa4df654d..68a2f3ee5111 100644
--- a/dev-java/netty/netty-4.1.35.ebuild
+++ b/dev-java/netty/netty-4.1.35.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/netty/netty/archive/refs/tags/netty-${PV}.Final.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 # We do not build the full range of modules provided by netty but only what
 # was available before in netty-common, netty-buffer and netty-transport.
diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index c96e8ebdc95e..e9cb1edab379 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1,3 +1,5 @@
 DIST tomcat-native-1.2.33-src.tar.gz 430359 BLAKE2B 2253907b5e3e0121ad520e1a5938cd8ceea55bd1403d320d382b959a0885c7e9374afb2b1828714d2f028dc0bfe6b6010d493e1e1b6d45942b4d27321d79614b SHA512 b9ffe0ecfd14482ed8c752caf2c28d880ab5fca1f5ea1d5b2a8330d26a14266406bdecda714644603ba2d4ca78c22ec5fc2341afd09172d073f21cf5a1099a0f
+DIST tomcat-native-1.2.34-src.tar.gz 435320 BLAKE2B 7b4f3feb36c1e4db36a67db835ab70169e64173674b0089fe844cd40b99b1a3a87c8b9f774b0df55689f1ad1e30b5606e8056a3e1707c929dcdbb8f25cc9e47e SHA512 03b167fdfaa16db6a0f3acd849b9dfed33aedad2316de6a2aba57b6b11ef4055790e8d96a66f14e6d5ce2200fafdf80b3e8ca0e8f206e4f28de841d8b217787f
 EBUILD tomcat-native-1.2.33.ebuild 1182 BLAKE2B ae624184e321f4eae4a1c26f028e230af06bd37f12a26bf86a3b143f29869408c7371b3f296ddbece209c968de2fef24b416ad71cd22c36d499493400ed1df08 SHA512 91222f3794cda0de3532af0f9e5d564e53662de5c73537a3b8e787e09dde61d43f6c03bf516d389789a01c2396d9607c85e44255017af74a85af0d0abcee68c4
+EBUILD tomcat-native-1.2.34.ebuild 1183 BLAKE2B 72151cd98fadc6c5b01b6d41335aa922546a866e67959b85429941a3f14279a7008251b60e511d69a01d71cd0936366b247cd826d3a457176d5461a7afb97541 SHA512 372060e6f4641fe0886a9f1a43788722c12d49c6497d52c277f1edab3b31e59b1cefa38873dc77c60f03b81bfde5d3ca201b50c2e8f5696f0bd79dc2b216b306
 MISC metadata.xml 807 BLAKE2B 38715d09df2df7390b4f1bb3179d2d5cb65874f438ea434cc30e52aa8068ae9d9fb60f147f69cda6300cef97aeaa8eb950c55027f5cc3ca67f9afdaf0457b21a SHA512 fc6ae086e1855089491a9ba0b1abb007005a15eb85b5b213d8d36451ff10968dbd810f229795dc384e0e48ab1b9dabffacac333397c4b526c5490de5f99d7d5d
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.34.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.34.ebuild
new file mode 100644
index 000000000000..1d527ab32b16
--- /dev/null
+++ b/dev-java/tomcat-native/tomcat-native-1.2.34.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Allows Tomcat to use certain native resources for better performance"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-libs/apr:1=
+	dev-libs/openssl:0=
+	>=virtual/jre-1.8:*"
+
+DEPEND=">=virtual/jdk-1.8:*
+	test? ( dev-java/ant-junit:0 )"
+
+S=${WORKDIR}/${P}-src
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+src_configure() {
+	local myeconfargs=(
+		--with-apr="${EPREFIX}"/usr/bin/apr-1-config
+		--with-ssl="${EPREFIX}"/usr
+	)
+
+	cd native || die
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	eant jar
+
+	cd native || die
+	default
+}
+
+src_install() {
+	java-pkg_newjar "dist/${P}.jar" "${PN}.jar"
+
+	cd native || die
+	default
+
+	! use static-libs && find "${D}" -name '*.la' -delete || die
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+pkg_postinst() {
+	elog "For more information, please visit"
+	elog "https://tomcat.apache.org/tomcat-9.0-doc/apr.html"
+}
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 137c5e91115f..f90cc09f1597 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -11,11 +11,12 @@ DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a88
 DIST apache-tomcat-8.5.77-src.tar.gz 5963037 BLAKE2B 63192409b148cf0691e6ad22180e4f79d8603e89633598ee3f1dcfdd7d55b88530ecb1aa7c585920e086a7582dea78fcbcd1498ed2552e0f8d17127658769f66 SHA512 a0d2f77540b5370e09d03d04340e0c7f539eb5761b84ea3c8ef924e2a3e7f9528b3ed83a0c8e413bc9335cee6052135788e48e30d95f231ba3ade7f0b53ec157
 DIST apache-tomcat-8.5.78-src.tar.gz 5972826 BLAKE2B 93acb2e997a877a2195642da7d896ec4f08bebd83aa12d868607056c23722bdb90147814173dde17fc142a9e4e434e4570a15ebfa1f8b1c7911a16408728b4bb SHA512 b58fdaa57420fcf7759420fba26bfd6edaa5174f5d3a81fdf8783f19d5385e2502d2ad4bfa0e4a77c6a084bf6d97a6d3cd274ab0ab3f2311d23079e273c41b32
 DIST apache-tomcat-8.5.79-src.tar.gz 5983349 BLAKE2B 8be7a268462c7edfd31636f2790ae83b8dbc16b8c0193f6a02f9f8591ffa9c91683b2042038661a0254fdab66f740b7ab99c1e6f11f0bd1245a836def9011533 SHA512 198f3eefe8445c050a98cf6d69597c17eee76158534c18a636f2285143c0cd248b939b8233618438330aedcd936d76505a064842619b077d8c2fa43244c7a8ff
+DIST apache-tomcat-8.5.81-src.tar.gz 5988747 BLAKE2B 569e1564cf6f5419aaa0d66a2497852021a244af1a858ad943b45e1c36939011a78edd83c717f346e4327278b95b95535e5c57bdd71af5662e052abc02528f49 SHA512 a9261e2a92e122f0f7f547d0b4e083d6c15cdb4d1ad750bdb3c9e3a597a1c4c1bb0f5dd7ad92f41ce18d15ac7fee47acc2cdd59e588b872f173467864120e581
 DIST apache-tomcat-9.0.62-src.tar.gz 6156545 BLAKE2B 414f4f7193a8db2bb3d0abcbd2d8c30ede5783e83ba01229ffb322e9bf6b08d2fb10d83ce4742d9e6a4ebc50c9b047679ae798fbd3db8ae165f76d2782034d71 SHA512 7e9cad2703473d9f096009c464b28d54d3765259fab1923ef8c9b1cbfa231fa51cedadfe771a3a95abffd258759a71023e036bda78b949440a5e826fbd4e9e09
 DIST apache-tomcat-9.0.63-src.tar.gz 6167222 BLAKE2B b608c61fa0584927f4a0ba1d945a41aa626f9441305855bcd2f613fa339fee8be5fbf1b85d96efe94ea5da7dbde2721761ea91d66a66ca11dc8195e33dd572e8 SHA512 9be4b85e2c39702fc4c80b285d7df1d192ab5024452c75d77e1072438a3051dd3056d080cab4834cc9682fd641a8c9ee0484a16b8d21008b944a870016fb04f3
 DIST apache-tomcat-9.0.64-src.tar.gz 6174208 BLAKE2B 3ec55872dc73279202faae10b4825ca8cd4f5d2763c43778445b2f1aee27ed1cd765e7345276735359e3a40779eaf2ef8f9120eaca8d38af07cbbcd0584078b4 SHA512 7e01a979d41f7d73204b7a7ae5a85b0094626bf64bcfa3a52f1fc46989369d504b6dd49718084ee0a10af775cab488aae1e18ce05eb2b527800e2a693c7b6386
 EBUILD tomcat-servlet-api-10.0.20.ebuild 3015 BLAKE2B 8326a595c857ea61fb4c7c684de79a3255822ba0235f9734cfbc64240b9e4917033f242ed12be88efaf8498fcf306c4b8e2162462fbaf0df808fdb33c40f4219 SHA512 a530aeb1d78bb9cb95ec8cb54113668995d3d6989ae50ddeeb1bf220d1629198b6b5d5a1009826aa329d1174eb99cf5b7c2df33e789f01f61d33b7521353775f
-EBUILD tomcat-servlet-api-10.0.21.ebuild 3018 BLAKE2B 7407df97c33c89d436e1d338f9c30a1dd2b2b0b90aad199e2e1d02a6a2d0360ef2f95f7b452d4b677d4daad016d5a27bc7a823e353355c7c28f6586117efa6e9 SHA512 7c08253ab8ec762c693902e17a0261023e9cbdd022b436944fd921b0969807bf79766d3ff6c951db1b9cae1580d073c6259d3d4688ae3a3ab88a8c3762cefc27
+EBUILD tomcat-servlet-api-10.0.21.ebuild 3022 BLAKE2B 64cd11eed9ba2a7ecacfa7c2d1824557a783e6db4468d769f414993fa5886615aaabb36be2aacd2d426d94492b876d9895717190cb5d211e874a40561d877da0 SHA512 9b0fd5d665cfe48ef517c37fb516f1e3329fd3fe24a9d36bf838ce4e1ddaaa326f7980e7d983d24e5b4e5a6ac9740d1aee4ba67ca14f800e4e57179091ebd866
 EBUILD tomcat-servlet-api-10.0.22.ebuild 3018 BLAKE2B 7407df97c33c89d436e1d338f9c30a1dd2b2b0b90aad199e2e1d02a6a2d0360ef2f95f7b452d4b677d4daad016d5a27bc7a823e353355c7c28f6586117efa6e9 SHA512 7c08253ab8ec762c693902e17a0261023e9cbdd022b436944fd921b0969807bf79766d3ff6c951db1b9cae1580d073c6259d3d4688ae3a3ab88a8c3762cefc27
 EBUILD tomcat-servlet-api-4.1.40.ebuild 1007 BLAKE2B 47367c64fb51f41908e0d04234e09306c56ed593120c5daa3ddd18e583d1ec3c1fa77b620613aa9b79dcd87e5a7b631cbe5c33443ae00380abfed671c93cd7d5 SHA512 c126e35ef153353c5cb5127ad7c6b46230a6ae0b70b873ce323e7906680becad7f99844792500281e4532e45ddb050e0f40079daea05ba514d733458aec4a715
 EBUILD tomcat-servlet-api-5.5.36.ebuild 1417 BLAKE2B 698cf8076448e7478124561d802e96cdb2d431778dced5de495f7ed2c665ff079300b37e658b3cad133c99bda92505eaf8add6c3e582d00ccdad61ebc4097c80 SHA512 7a571e537319eee86a34070e5e8e2baa722238fff2a57bea51a9e9ca746ec43ef07c7864a7235ef3ab33560b111c8d4971b8e4848f1e54f2719ed162857a7437
@@ -23,8 +24,9 @@ EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 961 BLAKE2B 66d34a80d320dd032acd712b2
 EBUILD tomcat-servlet-api-7.0.109.ebuild 2986 BLAKE2B 8bafa3c18cef415f0eb5b20ecf07ea4209313321288b8aa25e13463509e12aa58d250e8dbe52b3801ebf409cf0f013e42ee5cfb9bc1e548971263f7639b09240 SHA512 c3991e127f68c4e0ef6e1dde9ffefbcbfc72479d6dff48c048f8d56adb505ab8959da75422e52eb02c1f5d235c0051474f0329de4013774594289b011223a263
 EBUILD tomcat-servlet-api-8.5.77.ebuild 3002 BLAKE2B c45468894337c7e25099a50e10280a0e08b4be3c6f058ff4b1ead323f5c9713dbb618b8c47e8106cb7f1a8ca84e75cb14191bf263ec2ccc9f25e8220bb92992f SHA512 f05643a5452a73dbb03d451f576404b75fe1cd615aca31855d741223b70ec081b914311b063e16ec28c2779d92edcfa264a354a75bcc59ec56670b1ff426f634
 EBUILD tomcat-servlet-api-8.5.78.ebuild 3002 BLAKE2B c45468894337c7e25099a50e10280a0e08b4be3c6f058ff4b1ead323f5c9713dbb618b8c47e8106cb7f1a8ca84e75cb14191bf263ec2ccc9f25e8220bb92992f SHA512 f05643a5452a73dbb03d451f576404b75fe1cd615aca31855d741223b70ec081b914311b063e16ec28c2779d92edcfa264a354a75bcc59ec56670b1ff426f634
-EBUILD tomcat-servlet-api-8.5.79.ebuild 3006 BLAKE2B ffed57a50da25f7e5ba64026f6ed77a530f09b54f548a6e4ec99cc2f97313ed3c527a43f91e39d4b89d3ff016146ca9cfdfef22fcb9206914261afaa214e2bbb SHA512 8927451e4d1c067b17b758fbdf21c17f63fcf7e135b31e0f0b67e471dc0aa5eec0a10fc0e31f091a29614343b856cfff50e3a063674b9b1613edcd696793626d
+EBUILD tomcat-servlet-api-8.5.79.ebuild 3003 BLAKE2B eeaaedb31dae86e993db199bb2674d6854b84c519443a58c6bc8f13bbd7f64947705d7550ddb097e92837e596960df05bedccd7f6cabb76432908d5011c47b4c SHA512 ecfb21069a5a778fc9e12a9e09737d1b94f67c0ee9e75acf6190cca3d30fe61fb16159cde41381b3d2b4252abfbe82c6171c3b25ab2481444bb537f208a578b7
+EBUILD tomcat-servlet-api-8.5.81.ebuild 3006 BLAKE2B ffed57a50da25f7e5ba64026f6ed77a530f09b54f548a6e4ec99cc2f97313ed3c527a43f91e39d4b89d3ff016146ca9cfdfef22fcb9206914261afaa214e2bbb SHA512 8927451e4d1c067b17b758fbdf21c17f63fcf7e135b31e0f0b67e471dc0aa5eec0a10fc0e31f091a29614343b856cfff50e3a063674b9b1613edcd696793626d
 EBUILD tomcat-servlet-api-9.0.62.ebuild 3009 BLAKE2B bfcd05fd52b9fe8828076b1727c38fb62f3019f271e95c17a6b5a4ead3f0704e2e3449216dba58bc27c399c9c242e48bc3dc9f7e4b4f5d6c7a242ad36cce243a SHA512 e6ddc9b3168c85061a67941dc8860933df8d6479a966cd627ef9d3eb9d5d5a9e925a950cc8c740604b1c7520a3e7faf47dab41f07223a8bc1250219053a7444a
-EBUILD tomcat-servlet-api-9.0.63.ebuild 3013 BLAKE2B 642b4fd0b2c0703f48dc9b0354dc9df887d149485ca538a9450ee2110cee17dc145be54538d27c21da079db942543cc7e7ffa4206cb3e2c8f755b2dbf0159012 SHA512 adb2ef89bfa5e7b111b0135ae318ea5989d0f5350ccaa23053108a1c53a17aa2b908eab00879c3e384edb22630dec79d582ed682ffd8fff6eba58470d77e977d
+EBUILD tomcat-servlet-api-9.0.63.ebuild 3010 BLAKE2B 16bb68e3b8d9ec461e6490c9909a721045d17da0bd1dd55f38d7a04a8a20fae4fd0fe1d9618b9b841e9a937baf9a083a55429838fec3addb018ca79c92686c36 SHA512 4e122ed73a59d2e741eab440bed2a949038716051df77d01fea949d39a439f8582097d733bc27da58d6d2a199344dee4d701dabf3b5e23a22b6e1b6615d30153
 EBUILD tomcat-servlet-api-9.0.64.ebuild 3013 BLAKE2B 642b4fd0b2c0703f48dc9b0354dc9df887d149485ca538a9450ee2110cee17dc145be54538d27c21da079db942543cc7e7ffa4206cb3e2c8f755b2dbf0159012 SHA512 adb2ef89bfa5e7b111b0135ae318ea5989d0f5350ccaa23053108a1c53a17aa2b908eab00879c3e384edb22630dec79d582ed682ffd8fff6eba58470d77e977d
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.21.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.21.ebuild
index 5ed928878473..6029363ad505 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.21.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.21.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-10/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="5.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.79.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.79.ebuild
index c6359840b613..b4ed9827ad0c 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.79.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.79.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.81.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.81.ebuild
new file mode 100644
index 000000000000..c6359840b613
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.81.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${MY_P}/"
+
+JAVA_TEST_SRC_DIR="src/test"
+
+SERVLET_API_JAR="servlet-api.jar"
+SERVLET_API_SRC="src/main/servlet-api"
+SERVLET_API_RESOURCES="src/resources/servlet-api"
+EL_API_JAR="el-api.jar"
+EL_API_SRC="src/main/el-api"
+EL_API_RESOURCES="src/resources/el-api"
+JSP_API_JAR="jsp-api.jar"
+JSP_API_SRC="src/main/jsp-api"
+JSP_API_RESOURCES="src/resources/jsp-api"
+
+src_prepare() {
+	default
+
+	# The sources and also resources are mixed together so we first give it a structure to make it easier to compila and package
+
+	mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
+		${EL_API_SRC} ${EL_API_RESOURCES} \
+		${JSP_API_SRC}/javax/servlet ${JSP_API_RESOURCES} \
+		${JAVA_TEST_SRC_DIR} || die "Failed to create source directory"
+
+	pushd java || die "Failed to cd to java dir"
+
+	cp --parents -R javax/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources"
+	mv "${S}/${SERVLET_API_SRC}/javax/servlet/jsp" "${S}/${JSP_API_SRC}/javax/servlet" || die "Failed to copy jsp-api sources"
+	cp --parents -R javax/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources"
+
+	popd
+
+	for file in $(find src -type f | grep -vE "\.java$"); do
+		target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g")
+		mkdir -p ${target_dir} || die "Failed to create resource directory"
+		mv $file ${target_dir} || die "Failed to move resource file"
+	done
+
+	mv test/javax ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources"
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	JAVA_SRC_DIR="${SERVLET_API_SRC}"
+	JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}"
+	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
+	java-pkg-simple_src_compile
+	rm -fr target || die "Failed to remove compiled files"
+
+	JAVA_SRC_DIR="${EL_API_SRC}"
+	JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}"
+	JAVA_JAR_FILENAME="${EL_API_JAR}"
+	java-pkg-simple_src_compile
+	rm -fr target || die "Failed to remove compiled files"
+
+	JAVA_SRC_DIR="${JSP_API_SRC}"
+	JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}"
+	JAVA_JAR_FILENAME="${JSP_API_JAR}"
+	JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar"
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	JAVA_SRC_DIR="${SERVLET_API_SRC}"
+	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
+	java-pkg-simple_src_install
+
+	JAVA_SRC_DIR="${EL_API_SRC}"
+	JAVA_JAR_FILENAME="${EL_API_JAR}"
+	java-pkg-simple_src_install
+
+	JAVA_SRC_DIR="${JSP_API_SRC}"
+	JAVA_JAR_FILENAME="${JSP_API_JAR}"
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.63.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.63.ebuild
index 09fffd263372..620449873f13 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.63.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.63.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/wsdl4j/Manifest b/dev-java/wsdl4j/Manifest
index a22dc82f7f5d..a6560e100fb1 100644
--- a/dev-java/wsdl4j/Manifest
+++ b/dev-java/wsdl4j/Manifest
@@ -1,5 +1,7 @@
 AUX 1.6.2-tests-sandbox.patch 548 BLAKE2B aba74bdc87f3a35b46a80e20968e926f604a2dc13bfd48569f62fc72b7c8e2bbcb5df33af712c19a548a8c9668195cc340be92fa60e21ab36b0ab0c089de1d23 SHA512 bed0bcf00856309d8f628d4a41774a112bd26c651e9fdfa00af3113d780f430e6b50213fe0f743b486aafb78f11cdd924c4dd8eef64300715a8e88c64c11368b
 DIST jwsdltck-bin-1.2.zip 599377 BLAKE2B 0f99dc93a1b22019c572fe55585ee285c72e1dabcecc5cf93fa635b12a39a43686f0ff704a0c9ea25c682a882c4580fd82cf2015a9d4417dd28bc87d0b32a670 SHA512 a8f86d9895c588d752d266413e77c2a8db241e9cf9c199909f2e9d1d1b3b1b03eaa6b5841c62b0e7a7c779089eb6721797fdb4f2db841789a6a19884bd48711b
 DIST wsdl4j-src-1.6.2.zip 172400 BLAKE2B 96fa6a9098993ba20a277004515a4cd29bae84450b86398ceb1dc7835f14f17b39e5daf87d557b4378860c9d24e5928a80bb30b2d953fdc8fcae7d97ae8454f5 SHA512 55d0b8eb6a08cecd4a48223a9f29fe6ed0e00ec4dca99f44a04882efdba448601bb7dadcaa347e32e3ff5bb9e3334503d6666ca2a6276c7bb48b80acea57b751
+DIST wsdl4j-src-1.6.3.zip 173137 BLAKE2B 85ffe7a53b281307cd2d7072f611aa7ecbc10a5e13125f44f0dc934218b8d31ad15438adfc46a89431a5fc1ac68d4896c2415a95ee87c227d74babe664202e4f SHA512 eb5e16b0b51530a27b12aae5d897384d2a03db2e4df70f23ab435af5e8444f828dacfdb0ab0807a9e0b3423eebb165eea8790c129a173d376fc929a1c222be6e
 EBUILD wsdl4j-1.6.2-r1.ebuild 1376 BLAKE2B cb0628a913a4d93b32f8d2db8e59757bf31500ebfc7bbf7899e2f08e60e82ecfef6609dba997ec17aeaa9a96782326e3055e8a7808c52d9257010249d0cc53cb SHA512 32e0c7d1cd69884104ae305d7dd3e24e92fbb6f26c7e2eda07ba4ddc814f700b8c8986a8cfadc89bd4b57203b6219abcc2db30104ec929677036e63153303e00
-MISC metadata.xml 315 BLAKE2B 56dc646e9b7c4b648c7402c9ff7748b94409ab0a6c6e647be5e57c95c75df38ea3c1f500fd4dccc8ac36026f035cc5514f810b9787af6317b1aae4fbf056c28c SHA512 effacd54f59821dbda6550f490cd95baffdb89aecdc018291e05431eefe216c7af3e5590e80b1e4ea499f50c8e1a692db3bd82716d4389d46b8295e5b3c16483
+EBUILD wsdl4j-1.6.3.ebuild 599 BLAKE2B 60af9fd15e0fadeec0ef848404f314a9b4dffa58c193e7ceb82820cb9a5a17f6b0f51d3ca4b65f608df5ffeb437e9a257a96b04e890750c145b8bcfec4b39a49 SHA512 e15ab20d9f011a3009be198610a84679e2e61a5c98659c0163ac47fa9e9231072842adb867e89a9b7be75d10350758a1c340a4296ec3df253bd8f31cff5fe65f
+MISC metadata.xml 313 BLAKE2B aabc90f625441d1325eb089a25545ba18a7e323c758d183b8e5ca2c1531c12f33e71404209f8c7c70713cb9ecfac806ce1d59aceb34b21c1c83f44b409433f5d SHA512 13071d1d4f65f3e9ce63df3e7b15289167c9bd83b0a83df6b40faec8da89a69d271f83e22ceff5e003ca230259a986c96cf5765a94ec5c03d6cffac3ef4632ce
diff --git a/dev-java/wsdl4j/metadata.xml b/dev-java/wsdl4j/metadata.xml
index 5f130b9b7282..85df5402cc46 100644
--- a/dev-java/wsdl4j/metadata.xml
+++ b/dev-java/wsdl4j/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Java</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">jwsdltck</remote-id>
+		<remote-id type="sourceforge">wsdl4j</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/wsdl4j/wsdl4j-1.6.3.ebuild b/dev-java/wsdl4j/wsdl4j-1.6.3.ebuild
new file mode 100644
index 000000000000..3be69a6a39f3
--- /dev/null
+++ b/dev-java/wsdl4j/wsdl4j-1.6.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Web Services Description Language for Java Toolkit (WSDL4J)"
+HOMEPAGE="https://wsdl4j.sourceforge.net"
+TCK_V="1.2"
+SRC_URI="mirror://sourceforge/project/wsdl4j/WSDL4J/${PV}/wsdl4j-src-${PV}.zip"
+
+LICENSE="CPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+BDEPEND="app-arch/unzip"
+JAVADOC_ARGS="-source 8"
+
+S="${WORKDIR}/${P//./_}"
+
+JAVA_SRC_DIR="src"
diff --git a/dev-java/xmlgraphics-commons/Manifest b/dev-java/xmlgraphics-commons/Manifest
index fe9c883b837f..ee01050ae61b 100644
--- a/dev-java/xmlgraphics-commons/Manifest
+++ b/dev-java/xmlgraphics-commons/Manifest
@@ -1,4 +1,4 @@
 DIST xmlgraphics-commons-2.7-src.tar.gz 2021218 BLAKE2B a16dda389662a38d5ebf6cbd015ac5bf8154b5e2df9e36fd3a33987b04a4de08cc1ebc71e940c05793ef045249c68e7dbb54c418a7c6888020a800e039b0a188 SHA512 7d3993fc920767512f94edef3342757f0ffc9c9dbad80695fe3d77b0ec162380d9b467682ae41238e7ee719601709edb41b2dab06c385dfd9fa898577d8d2c22
-EBUILD xmlgraphics-commons-2.7-r1.ebuild 2099 BLAKE2B 29fb7aa42f6475cf5dceafe9b07b4ebdf0d713d666182e3b3e0ef6dd1e3b624e3ba98d917cfb5d74a46b42e797eff5f664364f6f4b206450a7b229cbc38354d5 SHA512 363ad46823ebd9fa7d218aa790ea429e97b3160478d85f866bec1a4345eb79d3f34e8809e1a6645f8a15d8743ce59f2bdca11a1985c771d4f706743b01f4436b
+EBUILD xmlgraphics-commons-2.7-r1.ebuild 2097 BLAKE2B 357e5598d4fd6870053dd82b211e3434c2361c28e7294a154c2a063ca2b52051498eac8674944112f3f1f5e81295dee556da8d384ce944f326f309ca7cdbc43f SHA512 94a2f7cc0970f1cc1af1b8ffa40c9d46c80a62560188dfd71982fce59309684f4353ac139584e9c25eb9b9ce220d093d30503be79f6c26b195fb7989bbed01d9
 EBUILD xmlgraphics-commons-2.7.ebuild 1820 BLAKE2B 3622f63c6571d09b621507b4f2a3e641e29f3e38a0bf1c6d6971d6c703518980c2d08de4e7f901b636c42890016150ed78a11f166957b940c77b6cfa8e3a8b73 SHA512 4a891359802ed69d9844415cdd3f7022a16fed7affe236ad807d68276d9b4b9cbcb9b888a9d94c8c4d3a45c0bd5eb22002aeca751882feaa82c09add7640070f
 MISC metadata.xml 328 BLAKE2B 0116b6e35d9f22341807f3da68bd8d38fc43447920207a08508c46796bf1ff9d2634f38002b22139b7142c912e531d27043f629f259ab2e87d12b8e590d4b92a SHA512 74979721cdcb0c26c82a27e23043487990f41691ea1dd6acf87fb4e403dc8a44402c9907d697ac3024d754b3c504c266d51753b3cad1e4e3a16d861758574a61
diff --git a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7-r1.ebuild b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7-r1.ebuild
index 2bc679b79fbe..6f7a6b4f1cc3 100644
--- a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7-r1.ebuild
+++ b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/xmlgraphics/commons/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 5aa18587400b..1f9afca94eb0 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index 3031fb2c1413..4da5e0da3ee2 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -6,5 +6,5 @@ DIST R-4.1.2.tar.gz 34009074 BLAKE2B 7ca14b28fc40548180dde979d57f93f41fb3966697d
 DIST R-4.2.0.tar.gz 37585694 BLAKE2B 5ba4d3b9397e92b72af729d88ff562655e0dd7c547bd371638aa76d4f1701f4f8a7911d500cf4f10d87b62457f8f8ce7a946d893477ceb7268b06bd59bc10f3d SHA512 99e71dad00b63e44bfcb8dc9539ff1951809112882d9ee7e06a4e99bce2e6ceac24e8348fd598c21e6d5ab0e0629a85170cde208bfa8145af91c398ac4ef7bcd
 DIST R-78d6830e28ea90a046da79a9b4f70c39594bb6d6.bash_completion 13596 BLAKE2B 53338e4a1c4f68beb69247216e553dbcac47f660fbf032bfebf7a660e32d2cff5b11ed35411c52de7e1fd6e00bbf5b5ea19369a325fa0a38bd93d63dc3288cbd SHA512 9ccd19bb1b0c18a2f13035ccd6809447429e197e298fb4d1df808ef345d723b42f75a1b91c349f6dbb46e4a82e59ef33e11300c495d79b63d670d0c0f2b16a06
 EBUILD R-4.1.2-r1.ebuild 7071 BLAKE2B c248d8ef6d65f694d7b5b93de6c6120115113542c6421eef5b6d61e5aec41c1c851883cdea82784e4e3c558f7edf4a95a7e0a726a36215285cde251129f08db9 SHA512 2bba5a3365c4fdafadc187fb9c6ad0a59596c4f24417567720fdb3c1923db38453078c666d541a6ed50a6309a53bcf71c808b42f662bc5af06ba364dcd637afc
-EBUILD R-4.2.0.ebuild 7325 BLAKE2B dcf1e3acbb461415d06e99eb1e7a6100641c1000e5417ec65e92a9bfea3b44a57ca69893d4fa31167053f34df6b7149a7452c1a9fb4c4c04dafb39be7fa3f1ea SHA512 e9528ecd63ce4f0b713696211bf0d235f98b04b1b8b434b3abd23d18742059f459647077b2727b5b51f95396376e88b2bde7bbdeadff3cec5897a3266f5c08a8
+EBUILD R-4.2.0.ebuild 7324 BLAKE2B f8022839eea0982186920677c86003724c62a088b4b2a6e41c9f12c11bc7379770ff2727e6dd99c2a9bc14e78a185c07d4386492e650461f2208d2327c5d8832 SHA512 b7343eeb892a2983544a9aa458c6746db7bf062d843e294aaaf8ec5cfe3d59e2253cad285f538baff7eff2172788a325e3d6d92584306dd5b5acde9db3484390
 MISC metadata.xml 1261 BLAKE2B 468178b60e894bd8dff85ecbf74d10dce61bdb21fc8b61f43d7778dbc345234fc6b5e28c7608534d558c95fa6583b5acd2e55cef7096c4cff88e84776e93e03a SHA512 0d42cb1e3b951e3b1cbf09e6e48d47cf7635c8b16708b5b1edb6c5d1b422cad2f16ce5c6f7c603efb365eb9d5b794d2d2653b408147aa9e921cd57feb3840013
diff --git a/dev-lang/R/R-4.2.0.ebuild b/dev-lang/R/R-4.2.0.ebuild
index fabfcdf26fc6..1ad97eea887e 100644
--- a/dev-lang/R/R-4.2.0.ebuild
+++ b/dev-lang/R/R-4.2.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~ia64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ~hppa ~ia64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cairo doc icu java jpeg lapack lto minimal nls openmp perl png prefix profile readline test tiff tk X"
 
 REQUIRED_USE="
diff --git a/dev-lang/execline/Manifest b/dev-lang/execline/Manifest
index 11860e293093..e6ec839599e4 100644
--- a/dev-lang/execline/Manifest
+++ b/dev-lang/execline/Manifest
@@ -1,5 +1,3 @@
-DIST execline-2.8.2.0.tar.gz 98438 BLAKE2B 66860a1abb3f8078bd625d13dda2caec71bc41d54a35275548897018818b8b881b37d4ab4f4dd7a9a36386802f1f830d345e7ade0e9638b49acc80314ae60ae1 SHA512 9a2c21fbddfc4bce69857fa906fcbb7b17b0cd1009a33a9f3bbcce69ff443af82704d74b792e2d4393eb6d7de9888a5bc74ff208c31485d3398b0dea07368a15
 DIST execline-2.8.3.0.tar.gz 98448 BLAKE2B f3dc1a194838f7973044b2d86e6026936697be4f34f9b01f5dfc98ddabfbde3dad7cfe95afd63f65cb266994b922d7d4c94368cf5dca2a2494fd0033b4ed6032 SHA512 40f4697a8165616848ed36dcb31a5859dee55a47439d13908a387550e8f53ca8fffe3bcb3e0462cb93f694c8fb483b14e152f92e6f9d0d536cdab9d94be9c53a
-EBUILD execline-2.8.2.0.ebuild 1133 BLAKE2B 569a468d77d0dfe0389b3ec9793450a8e35e9c20386ca968da480bc99fdf6eefabfec201c0017d5752c770b7b1940ec7d3b51e735cff3b0cb0f8c51a511f54a8 SHA512 42fac7d0804a54f27425e9d2638bcb3cf8d1d21b45f786e63caf202d7b5529bc1cbb098bde2e5e2046abfe44fe72ab1ab154dc7138da41be98e3a9bb68903e07
 EBUILD execline-2.8.3.0.ebuild 1133 BLAKE2B 98488d28e888392d47e63758836e9f230426ad3f51ec7949d597f1a8cb9a2327aee40cffcf9356b10b9599479f29eccaa165aa5f4092139b7e5fb7ed0cf04b44 SHA512 be36521ef51a25fb44257379bc47a83ef5d7d07fa491f1ab11858598357750766e103220003389a473a14c921df41912e195cb189624583796262c83fcc4ac71
 MISC metadata.xml 730 BLAKE2B 0144183b0f42cc421c44f8cfc4e0b5dc6b1639e4279facd59b70ba76d8399e63a9b5d053fca41fbcf987d6b5b8ae1c653430f3fa2d63488f6f73c134344d0a75 SHA512 b30e6f0bcb3499104c0cfcfd5687f6ac1016e89d4ffd8ebdf8409eaeaaae6dce9c4fcf6f97824846527b95cfb61a812bffe7017304ca94af74d7bde6ed0586f1
diff --git a/dev-lang/execline/execline-2.8.2.0.ebuild b/dev-lang/execline/execline-2.8.2.0.ebuild
deleted file mode 100644
index ba27a4716f2d..000000000000
--- a/dev-lang/execline/execline-2.8.2.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="A non-interactive scripting language"
-HOMEPAGE="https://www.skarnet.org/software/execline/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm x86"
-IUSE="static static-libs"
-
-REQUIRED_USE="static? ( static-libs )"
-
-RDEPEND=">=dev-libs/skalibs-2.10.1.0:=[static-libs?]"
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-	default
-
-	# Avoid QA warning for LDFLAGS addition
-	sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
-
-	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
-	tc-export AR CC RANLIB
-
-	local myconf=(
-		--bindir=/bin
-		--dynlibdir=/usr/$(get_libdir)
-		--libdir=/usr/$(get_libdir)/${PN}
-		--with-dynlib=/usr/$(get_libdir)
-		--with-lib=/usr/$(get_libdir)/skalibs
-		--with-sysdeps=/usr/$(get_libdir)/skalibs
-		--enable-shared
-		$(use_enable static allstatic)
-		$(use_enable static static-libc)
-		$(use_enable static-libs static)
-	)
-
-	econf "${myconf[@]}"
-}
diff --git a/dev-lang/gforth/Manifest b/dev-lang/gforth/Manifest
index 8ef2349239ac..ce319bf58566 100644
--- a/dev-lang/gforth/Manifest
+++ b/dev-lang/gforth/Manifest
@@ -4,5 +4,5 @@ AUX gforth-0.7.3-CFLAGS-LDFLAGS.patch 1097 BLAKE2B aa66797e6ebd04966f67275a8b0d9
 AUX gforth-0.7.3-rdynamic-auto.patch 634 BLAKE2B c824db023b690ef4e196715589017f2d74d607cefa8fd6a29e987a3df90aaf4e09f4ea7cc3475b93c8ea1f308049a117eb8ea258cc50e962ce5e501b513b3419 SHA512 32ad96b1de651088b375fa9b8decdd8f03f7c492ad6a11e7cbdc574557b2fe7458180ae71919e1f76c6175d443d50582c94876489af0c961a167b40b3d1a4b7d
 AUX gforth-0.7.3-rdynamic.patch 578 BLAKE2B 10e978a2f4edef4d66e839d2f9d047526e54235ed8c6a1a0b754a38149c2a2db2481bee898dfbc209cf8559b6f2cc408b13d594b7007b7710f3c619549321197 SHA512 2bb1491b82b87bcd387822da501078daad171950cf870f8644d909a848a4843e3fa99d8782d16524353edbffb71f704ff7bf5fa7bf326501f7dde2c294b2c8ee
 DIST gforth-0.7.3.tar.gz 2523433 BLAKE2B 1ba9095af7958aabf0d671f982c483f2046392fd9872678a58f314357875d286bee7f0d7bc38e9b21331acda80fd285c0489fed44d59c148ff6ec6b6bea7c174 SHA512 f034234acfb0fc727f28b564432219a100b916c6df4b847794a55b2fc3b8ed8714eca6de0df67c7c427b7c2bb4dd00f65cfd34e6eb60181e41ab84fea30304e4
-EBUILD gforth-0.7.3-r2.ebuild 1646 BLAKE2B 88ae4a4c991421ab11c74a65eb14104d94958b865ab2d57066de224a5050fbc3bcf762c867c96b28c86827c52d1993ac22fd67044544618f91520b5b8bb18c0d SHA512 b5b3d98867ecdbdc3be7033cd2545b40b86779f2ad04acbd8d2379deac101e3bb10e5493ecaaea96f748e6f1aa9189a3cfaaed5c16bd4037228f9d88267bedd4
+EBUILD gforth-0.7.3-r2.ebuild 1648 BLAKE2B 4b7ebfe9e2b8e81e0d566db1f653e2798296ef7817d2f7d5fba769bcf4949ac2f8b3cc9ec41ffedd27047451a9f43d2fe0d83df8c8dc76e9c688f1a56abdcfb5 SHA512 4335fc3e1fa53af6a4a05edb7e017ddf32257b4047e79f68834bc8ce0d93b2c551bfc2dd42ff9ba29e2cf75964aea911b4775e784ec1d7369156b37203efaa1e
 MISC metadata.xml 243 BLAKE2B 4fda5b7957b10262e59d99d603e6ae53c3f3918800665006ae11c825d1709d41f80b8df4f0ae7d02aa04eef13a88ad0f5a4475d9b00296edf197c11d0558b972 SHA512 1deca6a3ffd886a96cc4ba4a65ac44dad8a713e0f552705ed7be18aff282bdb769367310f66e8d10dec76f40466d6bd72808da00c90c67d488e490d47557221f
diff --git a/dev-lang/gforth/gforth-0.7.3-r2.ebuild b/dev-lang/gforth/gforth-0.7.3-r2.ebuild
index 2bf4b1dff982..503dc8016dc5 100644
--- a/dev-lang/gforth/gforth-0.7.3-r2.ebuild
+++ b/dev-lang/gforth/gforth-0.7.3-r2.ebuild
@@ -36,7 +36,7 @@ src_prepare() {
 		export GNU_LIBTOOL=$LIBTOOL
 		# ./configure does not generate it, but slibtool assumes
 		# it's around
-		ln -s ${EPREFIX}/usr/bin/libtool libtool || die
+		ln -s "${EPREFIX}"/usr/bin/libtool libtool || die
 	fi
 
 	# We patches both configure and configure.ac.
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index 8f0da34d7720..85d004ad79fc 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -1,11 +1,7 @@
 AUX go-sets.conf 313 BLAKE2B 03e94776e317d34b72bfb8385b8b0dfa6a599a6086e4d0c9214e7b49293768947c21d9afb323ffcc7fd85ba0af72d9cb243dbb571eee9eb81de9400fd5f5e79c SHA512 7d01b98bc8d1b609183682dd942bd4c9fa757a98243c7de3cf6c497c7bc20b8cdbe59dd669ce4bb11f914a0e9b6d100e65cea2dffd99f38be50b18e0ecf66315
-DIST go1.17.10.src.tar.gz 22196380 BLAKE2B 548d54aa27aca78b6a5b6338a4496c7072c37a9bbcea78456d0851f562278a872fe63d102a3d68bc3c91266bf07f9f4fc0b903ba047bbf8a0e51d973b6ae2a49 SHA512 92aa95927ce244cab339dd7f2fb7e416605515d496e96618e6e45ecfa7b022ae3a178bf88338a7a9e9e1afea4c9ab5f9c35f5716409cddbab3542daefb6ba425
 DIST go1.17.11.src.tar.gz 22197784 BLAKE2B d235137e18c3c05ba59540c66e40bab1e9ecd5dc9ac062c66207a117762404c511ccdaf131c2826f3ba7c4ebc25336132b83fb8192ce77844c9bc34734713c49 SHA512 cd08062e3357e8e73ad05572ac575b9d8b15599bdb3ea0ca743b04936fa5cca438886e6a06d6453334b8bb5fbe1ab3512657d11651f9199d2254736a6554e71d
-DIST go1.18.2.src.tar.gz 22837686 BLAKE2B 73bdbdcd7b78baacc123fbc9bb0ae603a5eb2b983192fafe7ccd35c79b526bd8f28979ba48a9fffce0a26dd1ba4d010968c01298671703b272bb0b009819b7e2 SHA512 9214cbc051cf26b49ab1bd4d8d30b060865944b831578a9ea7fcfe33f84009f77932a39f2948efbfc412b151e4734a3bc1f8332f3bea11b35a912b0e23a4118f
 DIST go1.18.3.src.tar.gz 22838104 BLAKE2B 031c34b1b7d45e6b0e357049581972c9f5fc6cabcac6162f27beae1140e03585d85df9d80509a3a64d8d13d691b8ca62f165b0dc782483a9504d46a137300b4e SHA512 bacbc74ab8fa4c8de46847cadbd245124491f960c087d6892e2231a73f689d597b9a992c2948c54c0ab4b6476d86d3a6a9a64e1714cb7b2cdfd0a7bcfcd7b5fe
-EBUILD go-1.17.10.ebuild 4813 BLAKE2B c4f3808ff284d5a6e9cfe43852073002dc204ac3832bd40c7a132f3661c459ff2e4be15e99530787b95844158e11f200d1cabfc2a2d4dbd28c5f3dd79e145017 SHA512 c30ee5f4110c8bbd292cb3d59eb264bb421d8bd78f06d840866fd39682b9b2691ea974e75b18bce58f6f7d9588652dbda3dfe61a58c6e71447df6aaf14998f2a
 EBUILD go-1.17.11.ebuild 4813 BLAKE2B c4f3808ff284d5a6e9cfe43852073002dc204ac3832bd40c7a132f3661c459ff2e4be15e99530787b95844158e11f200d1cabfc2a2d4dbd28c5f3dd79e145017 SHA512 c30ee5f4110c8bbd292cb3d59eb264bb421d8bd78f06d840866fd39682b9b2691ea974e75b18bce58f6f7d9588652dbda3dfe61a58c6e71447df6aaf14998f2a
-EBUILD go-1.18.2.ebuild 4813 BLAKE2B c4f3808ff284d5a6e9cfe43852073002dc204ac3832bd40c7a132f3661c459ff2e4be15e99530787b95844158e11f200d1cabfc2a2d4dbd28c5f3dd79e145017 SHA512 c30ee5f4110c8bbd292cb3d59eb264bb421d8bd78f06d840866fd39682b9b2691ea974e75b18bce58f6f7d9588652dbda3dfe61a58c6e71447df6aaf14998f2a
 EBUILD go-1.18.3.ebuild 4813 BLAKE2B c4f3808ff284d5a6e9cfe43852073002dc204ac3832bd40c7a132f3661c459ff2e4be15e99530787b95844158e11f200d1cabfc2a2d4dbd28c5f3dd79e145017 SHA512 c30ee5f4110c8bbd292cb3d59eb264bb421d8bd78f06d840866fd39682b9b2691ea974e75b18bce58f6f7d9588652dbda3dfe61a58c6e71447df6aaf14998f2a
 EBUILD go-9999.ebuild 4818 BLAKE2B 906a76bebb6036a5e2d5af8563cc2aa3d8c10d48c8926d5e1368026d97c9b00c65973be3f3937396fa35865f0119d9fd59586c66d2ef137c980695a3b62861eb SHA512 07796174e89485089232edfd712a4540bc8bb138894bfa119f8d79deedb3bb8fe770de018637f81c27629e277ea65fa369721b70fead893b600d0d554efae650
 MISC metadata.xml 463 BLAKE2B 133822f9d8be6d5aeb0bf8b9e41ee17637cc3e6f78590a36c1811b77a77a74dd541bb98ad57cfeb6b71a9bcb106c4ac58effcfcfbbef6db4e05b155ef196fd0b SHA512 2837a80088ac2e07cccfb78497c121902a3a0e2f6677b42b1cd82dd3b4e2703099b6d4c95c6c08fefbc647b9b279692e3a46b1126acaad9298c1ecd3b6899fe5
diff --git a/dev-lang/go/go-1.17.10.ebuild b/dev-lang/go/go-1.17.10.ebuild
deleted file mode 100644
index 7f1ce9304e51..000000000000
--- a/dev-lang/go/go-1.17.10.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-
-MY_PV=${PV/_/}
-
-inherit toolchain-funcs
-
-case ${PV}  in
-*9999*)
-	EGIT_REPO_URI="https://github.com/golang/go.git"
-	inherit git-r3
-	;;
-*)
-	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
-	S="${WORKDIR}"/go
-	case ${PV} in
-	*_beta*|*_rc*) ;;
-	*)
-		KEYWORDS="-* amd64 arm arm64 ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-		;;
-	esac
-esac
-
-DESCRIPTION="A concurrent garbage collected and typesafe programming language"
-HOMEPAGE="https://go.dev"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE="cpu_flags_x86_sse2"
-
-BDEPEND="|| (
-		dev-lang/go
-		dev-lang/go-bootstrap )"
-
-# the *.syso files have writable/executable stacks
-QA_EXECSTACK='*.syso'
-
-# Do not complain about CFLAGS, etc, since Go doesn't use them.
-QA_FLAGS_IGNORED='.*'
-
-# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
-QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
-
-# This package triggers "unrecognized elf file(s)" notices on riscv.
-# https://bugs.gentoo.org/794046
-QA_PREBUILT='.*'
-
-# Do not strip this package. Stripping is unsupported upstream and may
-# fail.
-RESTRICT+=" strip"
-
-DOCS=(
-AUTHORS
-CONTRIBUTING.md
-CONTRIBUTORS
-PATENTS
-README.md
-)
-
-go_arch() {
-	# By chance most portage arch names match Go
-	local portage_arch=$(tc-arch $@)
-	case "${portage_arch}" in
-		x86)	echo 386;;
-		x64-*)	echo amd64;;
-		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
-		riscv) echo riscv64 ;;
-		s390) echo s390x ;;
-		*)		echo "${portage_arch}";;
-	esac
-}
-
-go_arm() {
-	case "${1:-${CHOST}}" in
-		armv5*)	echo 5;;
-		armv6*)	echo 6;;
-		armv7*)	echo 7;;
-		*)
-			die "unknown GOARM for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_os() {
-	case "${1:-${CHOST}}" in
-		*-linux*)	echo linux;;
-		*-darwin*)	echo darwin;;
-		*-freebsd*)	echo freebsd;;
-		*-netbsd*)	echo netbsd;;
-		*-openbsd*)	echo openbsd;;
-		*-solaris*)	echo solaris;;
-		*-cygwin*|*-interix*|*-winnt*)
-			echo windows
-			;;
-		*)
-			die "unknown GOOS for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_tuple() {
-	echo "$(go_os $@)_$(go_arch $@)"
-}
-
-go_cross_compile() {
-	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
-}
-
-src_compile() {
-	if has_version -b dev-lang/go; then
-		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go"
-	elif has_version -b dev-lang/go-bootstrap; then
-		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap"
-	else
-		eerror "Go cannot be built without go or go-bootstrap installed"
-		die "Should not be here, please report a bug"
-	fi
-
-	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
-	export GOROOT="${PWD}"
-	export GOBIN="${GOROOT}/bin"
-
-	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
-	export GOHOSTARCH=$(go_arch ${CBUILD})
-	export GOHOSTOS=$(go_os ${CBUILD})
-	export CC=$(tc-getBUILD_CC)
-
-	export GOARCH=$(go_arch)
-	export GOOS=$(go_os)
-	export CC_FOR_TARGET=$(tc-getCC)
-	export CXX_FOR_TARGET=$(tc-getCXX)
-	use arm && export GOARM=$(go_arm)
-	use x86 && export GO386=$(usex cpu_flags_x86_sse2 '' 'softfloat')
-
-	cd src
-	bash -x ./make.bash || die "build failed"
-}
-
-src_test() {
-	go_cross_compile && return 0
-
-	cd src
-	PATH="${GOBIN}:${PATH}" \
-	./run.bash -no-rebuild || die "tests failed"
-	cd ..
-	rm -fr pkg/*_race || die
-	rm -fr pkg/obj/go-build || die
-}
-
-src_install() {
-	# There is a known issue which requires the source tree to be installed [1].
-	# Once this is fixed, we can consider using the doc use flag to control
-	# installing the doc and src directories.
-	# The use of cp is deliberate in order to retain permissions
-	# [1] https://golang.org/issue/2775
-	dodir /usr/lib/go
-	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
-	einstalldocs
-
-	# testdata directories are not needed on the installed system
-	rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print)
-
-	local bin_path
-	if go_cross_compile; then
-		bin_path="bin/$(go_tuple)"
-	else
-		bin_path=bin
-	fi
-	local f x
-	for x in ${bin_path}/*; do
-		f=${x##*/}
-		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
-	done
-
-	# install the @golang-rebuild set for Portage
-	insinto /usr/share/portage/config/sets
-	newins "${FILESDIR}"/go-sets.conf go.conf
-}
-
-pkg_postinst() {
-	[[ -z ${REPLACING_VERSIONS} ]] && return
-	elog "After ${CATEGORY}/${PN} is updated it is recommended to rebuild"
-	elog "all packages compiled with previous versions of ${CATEGORY}/${PN}"
-	elog "due to the static linking nature of go."
-	elog "If this is not done, the packages compiled with the older"
-	elog "version of the compiler will not be updated until they are"
-	elog "updated individually, which could mean they will have"
-	elog "vulnerabilities."
-	elog "Run 'emerge @golang-rebuild' to rebuild all 'go' packages"
-	elog "See https://bugs.gentoo.org/752153 for more info"
-}
diff --git a/dev-lang/go/go-1.18.2.ebuild b/dev-lang/go/go-1.18.2.ebuild
deleted file mode 100644
index 7f1ce9304e51..000000000000
--- a/dev-lang/go/go-1.18.2.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-
-MY_PV=${PV/_/}
-
-inherit toolchain-funcs
-
-case ${PV}  in
-*9999*)
-	EGIT_REPO_URI="https://github.com/golang/go.git"
-	inherit git-r3
-	;;
-*)
-	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
-	S="${WORKDIR}"/go
-	case ${PV} in
-	*_beta*|*_rc*) ;;
-	*)
-		KEYWORDS="-* amd64 arm arm64 ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-		;;
-	esac
-esac
-
-DESCRIPTION="A concurrent garbage collected and typesafe programming language"
-HOMEPAGE="https://go.dev"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE="cpu_flags_x86_sse2"
-
-BDEPEND="|| (
-		dev-lang/go
-		dev-lang/go-bootstrap )"
-
-# the *.syso files have writable/executable stacks
-QA_EXECSTACK='*.syso'
-
-# Do not complain about CFLAGS, etc, since Go doesn't use them.
-QA_FLAGS_IGNORED='.*'
-
-# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
-QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
-
-# This package triggers "unrecognized elf file(s)" notices on riscv.
-# https://bugs.gentoo.org/794046
-QA_PREBUILT='.*'
-
-# Do not strip this package. Stripping is unsupported upstream and may
-# fail.
-RESTRICT+=" strip"
-
-DOCS=(
-AUTHORS
-CONTRIBUTING.md
-CONTRIBUTORS
-PATENTS
-README.md
-)
-
-go_arch() {
-	# By chance most portage arch names match Go
-	local portage_arch=$(tc-arch $@)
-	case "${portage_arch}" in
-		x86)	echo 386;;
-		x64-*)	echo amd64;;
-		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
-		riscv) echo riscv64 ;;
-		s390) echo s390x ;;
-		*)		echo "${portage_arch}";;
-	esac
-}
-
-go_arm() {
-	case "${1:-${CHOST}}" in
-		armv5*)	echo 5;;
-		armv6*)	echo 6;;
-		armv7*)	echo 7;;
-		*)
-			die "unknown GOARM for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_os() {
-	case "${1:-${CHOST}}" in
-		*-linux*)	echo linux;;
-		*-darwin*)	echo darwin;;
-		*-freebsd*)	echo freebsd;;
-		*-netbsd*)	echo netbsd;;
-		*-openbsd*)	echo openbsd;;
-		*-solaris*)	echo solaris;;
-		*-cygwin*|*-interix*|*-winnt*)
-			echo windows
-			;;
-		*)
-			die "unknown GOOS for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_tuple() {
-	echo "$(go_os $@)_$(go_arch $@)"
-}
-
-go_cross_compile() {
-	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
-}
-
-src_compile() {
-	if has_version -b dev-lang/go; then
-		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go"
-	elif has_version -b dev-lang/go-bootstrap; then
-		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap"
-	else
-		eerror "Go cannot be built without go or go-bootstrap installed"
-		die "Should not be here, please report a bug"
-	fi
-
-	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
-	export GOROOT="${PWD}"
-	export GOBIN="${GOROOT}/bin"
-
-	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
-	export GOHOSTARCH=$(go_arch ${CBUILD})
-	export GOHOSTOS=$(go_os ${CBUILD})
-	export CC=$(tc-getBUILD_CC)
-
-	export GOARCH=$(go_arch)
-	export GOOS=$(go_os)
-	export CC_FOR_TARGET=$(tc-getCC)
-	export CXX_FOR_TARGET=$(tc-getCXX)
-	use arm && export GOARM=$(go_arm)
-	use x86 && export GO386=$(usex cpu_flags_x86_sse2 '' 'softfloat')
-
-	cd src
-	bash -x ./make.bash || die "build failed"
-}
-
-src_test() {
-	go_cross_compile && return 0
-
-	cd src
-	PATH="${GOBIN}:${PATH}" \
-	./run.bash -no-rebuild || die "tests failed"
-	cd ..
-	rm -fr pkg/*_race || die
-	rm -fr pkg/obj/go-build || die
-}
-
-src_install() {
-	# There is a known issue which requires the source tree to be installed [1].
-	# Once this is fixed, we can consider using the doc use flag to control
-	# installing the doc and src directories.
-	# The use of cp is deliberate in order to retain permissions
-	# [1] https://golang.org/issue/2775
-	dodir /usr/lib/go
-	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
-	einstalldocs
-
-	# testdata directories are not needed on the installed system
-	rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print)
-
-	local bin_path
-	if go_cross_compile; then
-		bin_path="bin/$(go_tuple)"
-	else
-		bin_path=bin
-	fi
-	local f x
-	for x in ${bin_path}/*; do
-		f=${x##*/}
-		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
-	done
-
-	# install the @golang-rebuild set for Portage
-	insinto /usr/share/portage/config/sets
-	newins "${FILESDIR}"/go-sets.conf go.conf
-}
-
-pkg_postinst() {
-	[[ -z ${REPLACING_VERSIONS} ]] && return
-	elog "After ${CATEGORY}/${PN} is updated it is recommended to rebuild"
-	elog "all packages compiled with previous versions of ${CATEGORY}/${PN}"
-	elog "due to the static linking nature of go."
-	elog "If this is not done, the packages compiled with the older"
-	elog "version of the compiler will not be updated until they are"
-	elog "updated individually, which could mean they will have"
-	elog "vulnerabilities."
-	elog "Run 'emerge @golang-rebuild' to rebuild all 'go' packages"
-	elog "See https://bugs.gentoo.org/752153 for more info"
-}
diff --git a/dev-lang/mlton/Manifest b/dev-lang/mlton/Manifest
index ae876cc0fa8e..7b09c1e6a972 100644
--- a/dev-lang/mlton/Manifest
+++ b/dev-lang/mlton/Manifest
@@ -2,5 +2,5 @@ AUX mlton-20180207-bootstrap.patch 980 BLAKE2B 4128d0d3aae1e30c6b234e9cc3e0d91ee
 AUX mlton-20180207-paxmark.patch 728 BLAKE2B 05bb27260dc8007a815ce74276a537a48127b4c336472afca571c39b0e29368be5be79ae03c21940dde6bd37f79613817adc8f22d986d570fab4cb184051b141 SHA512 78526ab383f481663cc892938f74ad1783aa7a2b1fcfd7032a67c4489daa5d141877806fb16232b8f0843e7b4e001d3f76a9a171a8da6413cd921688f493f7f9
 DIST mlton-20180207-1.amd64-linux.tgz 18772644 BLAKE2B 7fe2d9db7edfb2d3e301be88e90b7dffe1441ff315ddac1464ef42fb436be1a9dc4e2c03fdb93880779360aed04cb7662a1a5a733f2d4158082d228f718d8b93 SHA512 74ab847ff567cde365a113f8819bae69cc18df20c441a6c6666b600980d2687faf143311f42be21a261b2493dc5c45fbecb4737c599cf767c3680afec06c2e0c
 DIST mlton-20180207.src.tgz 25003695 BLAKE2B 8cddfe83c76e05fda446917ddc85035b3d74534fe4bc597a839cd13cb59a15538f40a3f68bb8f7136f9cf8cb27a582e88ca0d14b8f7a4582a202b3bd075f3c9a SHA512 3599159950e857d257abce92abf5c548dd9c0b0cdc4ba0d7cdf9badb5d997f73386cd1ff79f563221b394dd831cb344e287927f90683b0715678edb3ca0ae15a
-EBUILD mlton-20180207.ebuild 7013 BLAKE2B 43a594d3ec7f6055519250f0e7ecfc6baa4fc8918097620ac5fb13c24bd61a940c0a34802ed56ea0b718661023831e135199de525305df5ac849e5bf9cb38ed1 SHA512 caf657e82fe88b8eaf995d2a0f7bb7400f160aeb37875d8c1a140b000f10e6fa1cae827ac02f333040ac1df8c1a138af92cdd32c2f83c16d737f378241144e5e
+EBUILD mlton-20180207.ebuild 7015 BLAKE2B 2589c4d9e301c3e55fb221158a82d68e4bd704a7e1c9eb728a55caa3e1ae82fbf828c6b6c75885c415930307969a99e90104ced281a7c740da448e25becd2ef5 SHA512 8e3f7f1c3e27ff3b508bab80cb1bf8237a258f20d222b61c9e561187ed04315f158ba58c42a397fbafe10613bcfbdcf70d9922f2ca58b77eb81b76c1722727a5
 MISC metadata.xml 673 BLAKE2B 132c2780c36f09f961234616be1d6cdfe6206d7ec48116784c5905d1b7a8af9b2fb53c8aa9f8562bb4f6643410b89e223eceaeacbd1858f721816cb703e05f90 SHA512 c521c18447604bde8a241f65b29a784859378f81639529ee61e8e9949f456bed14df6bff8563602e9f3b17519528414827638db8a1b582281ab1cf46c8d47e7e
diff --git a/dev-lang/mlton/mlton-20180207.ebuild b/dev-lang/mlton/mlton-20180207.ebuild
index 8ef03ed2eee9..69c52b386626 100644
--- a/dev-lang/mlton/mlton-20180207.ebuild
+++ b/dev-lang/mlton/mlton-20180207.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -88,7 +88,7 @@ mlton_bootstrap_variant() {
 }
 
 mlton_bootstrap_build_dir() {
-	echo $(basename ${S})"-"$(mlton_bootstrap_variant)
+	echo "$(basename "${S}")-$(mlton_bootstrap_variant)"
 }
 
 mlton_bootstrap_bin_dir() {
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index fdc7fc9ad084..0c70052d9975 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -6,46 +6,28 @@ DIST Python-3.10.4.tar.xz 19342692 BLAKE2B c430ad9bed71729fda29433af0614b6c0110a
 DIST Python-3.10.4.tar.xz.asc 833 BLAKE2B 289f2e96bfc2b60c4ae94b1591779d604f203890c4f5db2ee16e305bf03c6ddb9c8d6da4471a06b5943e12888f37ca572ea30876e9a80382a26814f66b41b7bf SHA512 699e37bf09067083af159e3734b38c952bdc75432c8abfb7a7b8cce7ca975038da37490abeb5c13befd2dacb84a5341ad30de5d0a63d35af5c512215744f4d6d
 DIST Python-3.10.5.tar.xz 19361320 BLAKE2B 7f3629f8a16faeb0311947b7d5162bc45d9ed6b2c051f776027d01ebbbdd42e4849efd67921fa57975f68ec67dc34f3135345ce216f2d3f02bfcfa4245d266f1 SHA512 aa7f58a9b31de9824185b3e7bfa7da0dcf64ae9e89840664eae9d98d9048a650fa012cd5b873a62ff44b65b856db86f095c4003117406ec5e9583ec5f7e78e90
 DIST Python-3.10.5.tar.xz.asc 833 BLAKE2B 36da2d557a5c38cfc473b2138412f9bc011d19c8538475e623bf41d81eb2c8f8e977945a3065a48c5b234d2b2c7d0dd5e83112c948591628cec344651dc9055c SHA512 72d0ab09900e2a10b85ccac804efd5536251152798e7347576e0e28bff4ab4a84b08d646329b225f9949047586686f9f4e7f05652526657a0948951b739c14e0
-DIST Python-3.11.0b1.tar.xz 19416160 BLAKE2B b0eeb2d9ee9d54def7bf555d9d0dc9f343e98b48b77ce4d9a9ec5b7c45a4bfb11e70159cca8a4e384f8d21678f210dcaca5016f68ac59859a1bf336148498dc0 SHA512 f59f2905315593b2f486827ed7a1ffcce9e0faaac671c16026373c3e40d1e1c7b3e1f3384c2fbcbff8acc72c2466cd11c20fd04fbb6e839510d85966b38ebbf1
-DIST Python-3.11.0b1.tar.xz.asc 833 BLAKE2B d2e9fe9271d916133e3e9e13cef72af193cd3fd870143702f200ab77f14e85d1fdae2a59d12a62a361cc38f2a70d03aa0225f57f4c56c6ecdec9e687f9db245b SHA512 e47f2ad1ebc98681f82de74250b5d890e13d1c3c3573da24a4e646f9cdd41e035b9405646e0aee331df120d977f544a215df370b7a4b203082cf489776eca5ff
-DIST Python-3.11.0b2.tar.xz 19529360 BLAKE2B be2bb1b111d8fca4fe1a9d141c9ac82c9d7465ceed56955642d9addd946ac688cca97994c643ba6a66c42bed5516a12dfd273641304f4a8608e8ac60c48c876e SHA512 3298b2fe66fb04435138b995174245648f38f2bb75e2a8d8c4bcacf2d4510734b90e860dc37347eef22e298fa5772374238559815bbf546fb4fe9c1f0dd952f0
-DIST Python-3.11.0b2.tar.xz.asc 833 BLAKE2B 25ee4a13b449785192dc00d09c7bce1b5a3ec0798474bda50cc0896fc2fb884bbd67735febba17a7789de94143e6409fad2945b0c1349fbe3ea2acb0b00a1d42 SHA512 99a319fe3063af89c8b6201fef931b0748c8bf8781bed1ebb0ee55ce307f87c6524af23f80d1c57eb249153fcc3b5df5c06182f60ddc6eeeb59c5cce12c4e21f
 DIST Python-3.11.0b3.tar.xz 19532936 BLAKE2B b7edaecb57b99a76662dd22d28678108b3448a3acf09ffe2676d849e564da6e887184a82451095d98bbc33d0610d6ad72f961c545912480277b7fabfffb9bc55 SHA512 53c379311acc9d8ec645caea44f4b83b29fcbdacb7114eb7aac5a2f0229402eddb245abc8bd6665077e9c82ba0a821cc55ae7494d0667b84675248025e872498
 DIST Python-3.11.0b3.tar.xz.asc 833 BLAKE2B a43811360e01532bdec5166dd049b2d3bf9e33739152ffad85a33fcb94e0f81e128c3e3a30097b0c56d71ac908fd88058b894d3ef07e13a3467249839df39fbd SHA512 b51a02e47de73f4998effd15eb99d356ef69cd69521f208f50de1b8acf69d5cf9c8a2f774ec8bc5e0e75534fe59efe019cffcff39bc525aa4641dc9b47efb5ef
 DIST Python-3.8.13.tar.xz 19023016 BLAKE2B d3cb8624496e56d93d34f2aa5082746869a99210197529bc19e6a9d265f4ce246e0e83a3528a7602a28aac8855bf84e6bf6495b85e9202fcf04ef90600cb5e43 SHA512 5c732b5d21b189b99a0e9ccd3ae59466bed60a930d5d3f437a262d38f0797b776cecbf12a1852eaebcfb638a6f2e28e471cc2ebf94237cc728144be21842cb81
 DIST Python-3.8.13.tar.xz.asc 833 BLAKE2B 918894777e1a783f2a7c7958a808610631cb7a6039df84675158e8d2fd66782f29921d44ab9b4625c4ca3821852e0d0e0005163b086c7d0c3d617e3a76cb7033 SHA512 6683c4ae6cf20a97a29165f96b9f5dd09d618892583650d803aa677240695968dfe344294fc33db68fd4669c82021afcc29a1f6afe49915be51fae281eeeedbe
-DIST Python-3.9.11.tar.xz 19724780 BLAKE2B 25b017e36b22235790633eb1a88f52092225252f39963fc365c1ea863f5b5d98a796bceb01e5e34c02d9690f2a664959766b214b8c13350d6e22839218d0c097 SHA512 804e6e6b31922378f07f290023f6efc870c6fd3010204c499c2b375880f6e6ec0f72ce96a8fff81956f6fa3bea2123df2138ef0fda23a3d5d3cf757174a930c3
-DIST Python-3.9.11.tar.xz.asc 833 BLAKE2B c60c291f3dad39c842d16717239006f3ee703eaa586d95ea02ba4486d20a1e82065bbaf7af6f7cf6a04799229359791a72834096b6ce5f5d2b583ba5962d441b SHA512 a84bbfa68ec1c0e45bbd64af4481be7d68885021287731c69346a3cb25c9bf607be84dd72af2d3a6fbeabbde64975f37c4bb4f61274e72b92b4277fa48543e52
 DIST Python-3.9.12.tar.xz 19740524 BLAKE2B 05f2469aa53ca36221ef4976b17bfde3e5b86afd5a8114e5a7fd899f975a8e55022555ef718d5352ab68de1b7b23865a0bf713768c9c2b30d591438c9a396d25 SHA512 081981901e14149748fd35228db0b3b1d96fef227ae7404f07b8bad0fda4b02649bf31c348c94aefdaf3327565d78f9489437c2c02f647b15d41376a27a23e97
 DIST Python-3.9.12.tar.xz.asc 833 BLAKE2B 33436d0404a643215a8fd2b967ffd216201da24f374941bf65b888159ccfabcbe79b751eca2dd489b06605604338c8bbaab74aa10abbe4bcffaa54236301228e SHA512 dddaa27f8a29034f458edb6739398a5455c87fe37b6349e161865a9deedca118ffe9cb82663cc75bbe60b3b556399c0c6855f5262aac1fe90d36a3694fca65b2
 DIST Python-3.9.13.tar.xz 19754368 BLAKE2B 4f583f66c28b791e19cd6d79695fe9eb815fd333542be22aec8bd73d1f4d3f17f2c4e9de198e7b16c1ca6362a613a8a02fb965c7dc7db3e510fd31de15ba2d19 SHA512 e9664e7f908092df11236b22465d217531d6f0378e88d889108d19fe77f28f46ffb629b8733f84b41409e255367321893a2b1bd64518930d9d8cae5d1b774d23
 DIST Python-3.9.13.tar.xz.asc 833 BLAKE2B db01c01be9d56cd15f9ab4a9e2cfa800faf4ebecb92b01c133865d3b3134bc910258a33b766306c3d01f98e35bbf9c03c7cba697760b7095999cbd63ed6c276c SHA512 9367afe8ec32195adbb64fa32eb9e3881cfdbbb38efcb5e0804a15486232aecbc81ed20a8ffed652f06a881744f3efd2c2df3cc652d70671c94d6668a17a391e
 DIST python-gentoo-patches-2.7.18_p15.tar.xz 34956 BLAKE2B d173f276dd9c0ce31004dcc55a0d18e9ce25a47683c2df3c4dd62e967dfbbb35be59a2f08cf20f30a19475a8a2344dd95b17400eafa88b5fdbe9270a12ccbf32 SHA512 d9386808265f978808e5c0ffd384cefe54fb0e05aeccfd394167d5227d9cd66e25c8e93c54914762b2cfc3c2dd851b26a7a84d62634c6aa8a0798aacbb7ac25f
 DIST python-gentoo-patches-3.10.4.tar.xz 8592 BLAKE2B 67fba3e1fedb17430e5cd93da995b4acaf714db512031b5a2f775a25f793f007941561663cfa413d645ccddc2e22d65d250a40fa166cafda8805488d877ff57d SHA512 3ed2b8ff8f1eb8febe7dcd4b5d13d6d54468be1d525f8f1118977d3bbc78f690a597b09383939d023b03380a306e4bff1693382e29ff562312d803305b1709b2
-DIST python-gentoo-patches-3.10.4_p1.tar.xz 9648 BLAKE2B e89fa6d4d0d56614242e23d112931cab3447db258548f86e6d09af3db95a3c4f97bb4a939659b85fcc897c0ce4d613c5d55af5da3ae2bd074c2cfc91210d4d34 SHA512 d6bb91ce471cb01891bf5bc1f03914714a34e6a1780f279b937dfb21aea1cf65d84c89c792e0d46286f3c9030ad99bc42b2657aa7e8c6bf0ed0d973b381fb5f9
 DIST python-gentoo-patches-3.10.5.tar.xz 8584 BLAKE2B d4a812a33e485b1eae5629e519dca4dc6625b743b07c7f7bbc62562f345d87723ba499893702310b1e96e443d2946e27a8d4971f32ca1125d4827d0d594ccaa6 SHA512 77f0478f7d0491e103857a83a97d6e04a9ec68740a7f9357cbbdd316462e7d98ea8236bd05a30e7556457ece5fbcfa4a7a78a25d4eb12779455ce2bb5b6f30d0
-DIST python-gentoo-patches-3.11.0b1.tar.xz 3324 BLAKE2B aa54baab51376b63d7ec4783f9dd9d18581a07c935aaf3619d009d32e754b3a54cbcc2b4f9b0dd556bb91f74198a27ebee4e31baaac04907ba0f1fa87ad04121 SHA512 d609d95fe2e89550f70bb0cb3e4b468e571d00fa3e8a60020193a048c089685b7452146d8bb51e5e39203f08b0b53c661c156ba7711bdd7b107ceebd4ceec440
-DIST python-gentoo-patches-3.11.0b2.tar.xz 3324 BLAKE2B 6368fed7be55e0a04d19be09fe1a935ecba5f6f7a12ff4e7926e6f611cd7448bb7ffd83240022e245b5f4452529e7469de65bf9a388e93bbdd0ffef2ba352209 SHA512 fe2ecf265f94ef3954b528bbd7b25ee8f3bdb27ffde4e94dd105c440848509ba5da05614d855859ad56b840e8858ee1435af51e84add9fb212d8827044158da3
-DIST python-gentoo-patches-3.11.0b2_p1.tar.xz 4888 BLAKE2B d82a1c2e6e18a8d9ab8fbe5e1f81268442f45114f6ac58ce8d6204f8874c06769b725d480d5aaa7c624ef7f9d59c9dcff5371622a5b8c44d37ea0f9d960304fe SHA512 3b8b1859e4ca941d0ec21171d3ee491a19bffb612935217f9a0a59361270dcae3b97e366b6ef14aa4e5e6415871b2b1509e9a276a0783c86af9883e1345f71e7
 DIST python-gentoo-patches-3.11.0b3.tar.xz 3320 BLAKE2B 588762fe2698a814d0cb89f84620d3ca4754347cb9af4f0eb36429a126ca2386b64594f16621a25e88d518986aad5f3ef3a84d9ce746f58b5cc6d112167c41d1 SHA512 026cb5cc2f3a1b17829fb088ca1dc9af03764a250bebb1fe518a6f7734f731a3f6cc5d83a13b6ca29dd6fa8ca5f0249a7ef0a641b939cd511d05cdc645b9171f
 DIST python-gentoo-patches-3.8.13.tar.xz 16004 BLAKE2B 5c0c6c9263570a467391e60c324d1dbc1e50ffda9cad1e204df124441b593146f18e5f1529eb7d385b35c5f4b9e597807971b6b66f7f8eef156ad87c9ad32743 SHA512 4ceb831e2d62bd73909b53a3b553b2cd73d08bcf2a1c92b47eaeb1221d40daabcaed14977265bcb265df00b6bf363dbebbd61a62dca4bf6ef40c6b911e980597
-DIST python-gentoo-patches-3.8.13_p1.tar.xz 17704 BLAKE2B 9b8fa78945f62809cd146b8009a5bbdf7570bd3e470e602bc20567089f343ed99c2c4b9f99440dde0a7e7ea05e7be280c4756fcd50c88d6b9a39829736b2a435 SHA512 520b521b61128970481202eed57bc56eaeb491a1fb920aa65aa7c80fb96fe4e70e0b5c3ed0813583f6ac22dfc9738ba38247bc639f448c9756aa0dfd1e907b19
 DIST python-gentoo-patches-3.8.13_p2.tar.xz 18816 BLAKE2B 8612ca33e5569319c5d1a5a3fb1a81e860bd515bfde656b79f087ccf7020923fbd06b315178bef8630e4c36bb22c27299fe439aadc6a161f1ec93be8778314ee SHA512 be5668a0a4be0a03e61466436973125a3be4f33a61524e4a5c8d86745727cfcae59e5048477887c9f6bfc09727f3aef3652ad47a13a6bf0f1452d3172f1c34dc
-DIST python-gentoo-patches-3.9.11.tar.xz 12844 BLAKE2B de7ffa39e96127949d2b894fe15c8c1345180842791743af14a3728a7c950e877ab7c74f3e72da5518b16ecb2f3ff13e6132740bb067fe43a8359c673befbaf5 SHA512 0507792188587e66d63a70dde17c6aea1c9aab9e40ace3aeb585adbd2c62acf828782312ba7523f7a4ea49ab1125a30c7b091d10fe02874b018f2733fb8e141d
 DIST python-gentoo-patches-3.9.12.tar.xz 12848 BLAKE2B 5dd66fa94b136a463d2c4be3a5b7dfad770c3905467a1d81af02a35b2783ce7d614881c915ee8f8e764c1656963d6886d9c60c6e524f512e1bc496e42d01307b SHA512 07de63e47a8e547724099062239df8fcfd254f19d38be28131e6bbb094ffbab8483861fb6a5905e60d7fa7a1a5dc06785951fa31984ecad89516b0b742c47f91
 DIST python-gentoo-patches-3.9.13.tar.xz 12836 BLAKE2B ba687a3d6e00baf4d9640ab78a29c3e21bf1872b5019198991521cf37bb0780f592db742ee4fdfe6bfb1cab1c1f6587889dfdb024cae72766b6c83c2ffe319be SHA512 e393992ff92625771c6ffeb500637862f0163c689c685fd245a6e5bbdd3128154ce439ecab56eaf1359e67ea0d173dfb19f65a4098ea2266922bfb43aba517dc
 EBUILD python-2.7.18_p15.ebuild 9827 BLAKE2B 77ebeacfa236e518ec0c0a791e0da60f8158d369e870c88ce69d1eef25cdc99e658903abf313452b849254e97b4c9f583e0edb75ec845faf5b47fb2fc3173ce4 SHA512 19219cd43391d8d53838c9b0e15b30f8ccb5d5a23503a213cc961ff2fa545cd17a5ecc6ce253e2a01534db3bc931be212969c40885c2e99f203c23a5ecb689a1
 EBUILD python-3.10.4.ebuild 11761 BLAKE2B a51875cab569a32b2f311b33c9abca0707e4c3d7866c66019487bcd223dc9b75b4bd3f5eb2a62bf25c9dd11ca5af5dd626b8a01f16caac02f098b91c782a27da SHA512 cb2eb41022a7486cfc1ced18da412598509335df9db17c1333bed4679bd8dfff827bad9858bed7d1085cd2a14cddaebef739ffcade5e327737540372a879bef3
-EBUILD python-3.10.4_p1.ebuild 11884 BLAKE2B 6a19426c6d99916c00af531a6cecfbe1ec89499e7e315cface154c869059d03c8619b9683772fa0494e5d065b0e34f0f22eb571a4a4137a3a6f69b594231125a SHA512 1bda07c9a912d0566429cbdb6ebc18d6b0bb0a2712fc4785b008df2dd79d2fa3f6931cefbbb5f01c2fad5d0176f5951b7fcd72438afef051defc93af3f433815
 EBUILD python-3.10.5.ebuild 11709 BLAKE2B cd8ddf5c6548b16b66301541138f810204c0f33541a431ceb5ac9d6ef01137afbe656b3aea964ebc9292704d062c0e5298e8d9673534c3e1cadb21771d2b46d3 SHA512 b9b6383e221c7bfa52825489c493bfcefb854e2cc3609d68328393412c4fcb0bc6609b98b1a20ee03ae7cf2283fc52752c7b30bae80d81ecc7eed6b49c8997f1
-EBUILD python-3.11.0_beta1-r2.ebuild 11842 BLAKE2B 5426d1cd8190d71061b34bc5a6871cdbaeb477a0b95e9d680807fb343664c1a33aa8ed18abb6cdf34be065a6580aff1a772d3d067b22f67583dad5e6c32ddb76 SHA512 6f950833ee054af26b2e8ccb9ca17a21286d737e9d5f0ca027388236d07bb56047ad2d898f8aa4a913167a85e3fdab3422e514781c382a2e87bb1f38ecddd702
-EBUILD python-3.11.0_beta2.ebuild 11842 BLAKE2B 5426d1cd8190d71061b34bc5a6871cdbaeb477a0b95e9d680807fb343664c1a33aa8ed18abb6cdf34be065a6580aff1a772d3d067b22f67583dad5e6c32ddb76 SHA512 6f950833ee054af26b2e8ccb9ca17a21286d737e9d5f0ca027388236d07bb56047ad2d898f8aa4a913167a85e3fdab3422e514781c382a2e87bb1f38ecddd702
-EBUILD python-3.11.0_beta2_p1.ebuild 11842 BLAKE2B 5426d1cd8190d71061b34bc5a6871cdbaeb477a0b95e9d680807fb343664c1a33aa8ed18abb6cdf34be065a6580aff1a772d3d067b22f67583dad5e6c32ddb76 SHA512 6f950833ee054af26b2e8ccb9ca17a21286d737e9d5f0ca027388236d07bb56047ad2d898f8aa4a913167a85e3fdab3422e514781c382a2e87bb1f38ecddd702
 EBUILD python-3.11.0_beta3.ebuild 11782 BLAKE2B d8b96d674cfc9bbf88b600506ee13e8fa1cde111fd70b86a44f8dbc6d25b0025567728559c77dd6d6db32adcf2a0b09cafc93a992b7fe612c02d5e2133868888 SHA512 34704027a4d0e927dc1f18c838e7cdcf9a6c43e14b05ccaf301b64742eb826b627e490724aae937ef8ba560544c4e6449899165aaf14814808854ae3bcbd2367
 EBUILD python-3.8.13.ebuild 10279 BLAKE2B dc700b2729f44840d33306fa0e50565d3c134ff74db39c83aebcc9994899479736bad15897e4135904bf7a6f4914c40e9b73caa64a0376aba10664d07c351227 SHA512 51b826ed0c99f777b684341141c83fca557942496a670aa4385f6c8c6379e445d7ec953c2f1b9562d5b4ee921038677f597c27fc8f355f076d72f66e6ae6ee9e
-EBUILD python-3.8.13_p1.ebuild 10287 BLAKE2B ce359febff09eddefab02605dcd13446d99cd02ca2a50c70dba6f88735050a8a5bfd99442f2c8368238101d92988923cb453cadf970a952976920ef597150ae3 SHA512 f9dc35767f68ad637715aa9187391d85dd978f41bdbe70eab19820b396078faeec34e0da0aa4b390d2c1aa2b61e8767cc36dc67bb44389c1eb01c0e6de64638f
 EBUILD python-3.8.13_p2.ebuild 10227 BLAKE2B 5821782301c54d450dff4e5984f0374c2e8c6b27b2e771667f9f02014956be1d006cdc82783ac72ea3d1020c2f07a2928077473647df3640b7b6ff9d9a120e97 SHA512 3c43b0f787e85ede5f79c5624f09354dac717a25855809a675b8fa514025fcafcaccc106eeeac950392f292d091b252d45005514699e7ec16f71fee0520a8fdf
-EBUILD python-3.9.11.ebuild 11472 BLAKE2B 75c9593abd6eae18295ff32a3f9c67453d28cfaf23338e1efb0f4aa2ecda76594028b4474d9167e27472b1843e62f796d1138cc39bc4b2c4ebbac6ab84d73b4c SHA512 b8d4cb977af06cebb40f6c4a059f65ad8f04ae7e9ca395df88bfaa3852803a26c71dce4516bb1bef29376cda2a2c1953ad6c0e2c665207736accc6de5e4b4160
 EBUILD python-3.9.12.ebuild 11522 BLAKE2B a1847835a23e863957ab089d1449a01c377ce9e1460ab3ed3453d863d6ad38824802bed23490dfa27c88615c1d70b8690d086997da143987657bf595d592ef2b SHA512 0e0d46e25e1f353152daddd3d67b870f393124a48e1cb9f9f464b3174d5254cba2580e7351dcba91558885cda7342e843a2e69631100bf6d15d791fadc3d8d2b
 EBUILD python-3.9.13.ebuild 11470 BLAKE2B d4c221a9ac827c7deb2d63c3200fb4b380ca853cd861d5a1ecdd8f6898b21ef67e2533b3aea1184bbd2f9a08c6bbebdc49f6afde76d766032c5e3dcd7cd4ca44 SHA512 a7cf5e1fef9ea0a2059f14ea889f4b78d36957a152f2d516f2512c0ef2857891dae17960eb87e2c3925633c6e4a9449fadc2ba8c2aa66791412f9e2bd4ea0a05
 MISC metadata.xml 740 BLAKE2B 31abd8d03440517adf39f29f36e87f821dbf029602f40d4b252b1ec8e6a52955ad9325fe66a9a3bd2e9c4436e6c6865853f75c3169016c7a44327a06b07694df SHA512 b601a773d5fe4e29d43e9ce5d857bb525b706b95745056a74a2476a37f182075363cb44814f9d6f73b8be08a63d75ec322b608463796c6eef7aa8d636a2350b8
diff --git a/dev-lang/python/python-3.10.4_p1.ebuild b/dev-lang/python/python-3.10.4_p1.ebuild
deleted file mode 100644
index 87ba9d3a2e1d..000000000000
--- a/dev-lang/python/python-3.10.4_p1.ebuild
+++ /dev/null
@@ -1,414 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools check-reqs flag-o-matic multiprocessing pax-utils \
-	python-utils-r1 toolchain-funcs verify-sig
-
-MY_PV=${PV/_rc/rc}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="https://www.python.org/"
-SRC_URI="
-	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
-	)
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="bluetooth build examples gdbm hardened libedit lto +ncurses pgo +readline +sqlite +ssl test tk wininst +xml"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils:=
-	dev-lang/python-exec[python_targets_python3_10(-)]
-	dev-libs/libffi:=
-	sys-apps/util-linux:=
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? (
-		!libedit? ( >=sys-libs/readline-4.1:= )
-		libedit? ( dev-libs/libedit:= )
-	)
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? ( >=dev-libs/openssl-1.1.1:= )
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-	xml? ( >=dev-libs/expat-2.1:= )
-	!!<sys-apps/sandbox-2.21
-"
-# bluetooth requires headers from bluez
-DEPEND="
-	${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? ( app-arch/xz-utils[extra-filters(+)] )
-"
-# autoconf-archive needed to eautoreconf
-BDEPEND="
-	sys-devel/autoconf-archive
-	virtual/awk
-	virtual/pkgconfig
-	verify-sig? ( sec-keys/openpgp-keys-python )
-	!sys-devel/gcc[libffi(-)]
-"
-RDEPEND+="
-	build? ( app-misc/mime-types )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
-
-# large file tests involve a 2.5G file being copied (duplicated)
-CHECKREQS_DISK_BUILD=5500M
-
-QA_PKGCONFIG_VERSION=${PYVER}
-
-pkg_pretend() {
-	use test && check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	use test && check-reqs_pkg_setup
-}
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -fr Modules/expat || die
-	rm -fr Modules/_ctypes/libffi* || die
-	rm -fr Modules/zlib || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	# force correct number of jobs
-	# https://bugs.gentoo.org/737660
-	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
-	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local disable
-	# disable automagic bluetooth headers detection
-	use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
-	use gdbm      || disable+=" gdbm"
-	use ncurses   || disable+=" _curses _curses_panel"
-	use readline  || disable+=" readline"
-	use sqlite    || disable+=" _sqlite3"
-	use ssl       || export PYTHON_DISABLE_SSL="1"
-	use tk        || disable+=" _tkinter"
-	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-	export PYTHON_DISABLE_MODULES="${disable}"
-
-	if ! use xml; then
-		ewarn "You have configured Python without XML support."
-		ewarn "This is NOT a recommended configuration as you"
-		ewarn "may face problems parsing any XML documents."
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	append-flags -fwrapv
-
-	filter-flags -malign-double
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	# https://bugs.gentoo.org/700012
-	if is-flagq -flto || is-flagq '-flto=*'; then
-		append-cflags $(test-flags-CC -ffat-lto-objects)
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	tc-export CXX
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	if use pgo; then
-		local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-		export PROFILE_TASK="-m test -j${jobs} --pgo-extended -x test_gdb -u-network"
-
-		# All of these seem to occasionally hang for PGO inconsistently
-		# They'll even hang here but be fine in src_test sometimes.
-		# bug #828535 (and related: bug #788022)
-		PROFILE_TASK+=" -x test_socket -x test_asyncio -x test_httpservers -x test_logging -x test_multiprocessing_fork -x test_xmlrpc"
-
-		if has_version "app-arch/rpm" ; then
-			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
-			PROFILE_TASK+=" -x test_distutils"
-		fi
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		--without-static-libpython
-		--enable-ipv6
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--with-system-expat
-		--with-system-ffi
-
-		$(use_with lto)
-		$(use_enable pgo optimizations)
-		$(use_with readline readline "$(usex libedit editline readline)")
-	)
-
-	# disable implicit optimization/debugging flags
-	local -x OPT=
-	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-	# propagated to sysconfig for built extensions
-	local -x CFLAGS_NODIST=${CFLAGS}
-	local -x LDFLAGS_NODIST=${LDFLAGS}
-	local -x CFLAGS= LDFLAGS=
-
-	econf "${myeconfargs[@]}"
-
-	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-	# Prevent using distutils bundled by setuptools.
-	# https://bugs.gentoo.org/823728
-	export SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	# Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't
-	# end up writing bytecode & violating sandbox.
-	# bug #831897
-	local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
-
-	if use pgo ; then
-		# bug 660358
-		local -x COLUMNS=80
-		local -x PYTHONDONTWRITEBYTECODE=
-
-		addpredict /usr/lib/python3.10/site-packages
-	fi
-
-	# also need to clear the flags explicitly here or they end up
-	# in _sysconfigdata*
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Restore saved value from above.
-	local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	# Skip failing tests.
-	local skipped_tests="gdb"
-
-	if use sparc ; then
-		# bug #788022
-		skipped_tests+=" multiprocessing_fork"
-		skipped_tests+=" multiprocessing_forkserver"
-	fi
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-	# workaround https://bugs.gentoo.org/775416
-	addwrite /usr/lib/python3.10/site-packages
-
-	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-
-	emake test EXTRATESTOPTS="-u-network -j${jobs}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local result=$?
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
-	elog "and run the tests separately."
-
-	if [[ ${result} -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	emake DESTDIR="${D}" altinstall
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
-	use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	local -x EPYTHON=python${PYVER}
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		cat > python.wrap <<-EOF || die
-			#!/bin/sh
-			export LD_LIBRARY_PATH=\${PWD}\${LD_LIBRARY_PATH+:\${LD_LIBRARY_PATH}}
-			exec ./python "\${@}"
-		EOF
-		chmod +x python.wrap || die
-		local -x PYTHON=./python.wrap
-	else
-		local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
-	fi
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" \
-		"${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" \
-		"${scriptdir}/python-config" || die
-	# 2to3, pydoc
-	ln -s "../../../bin/2to3-${PYVER}" \
-		"${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" \
-		"${scriptdir}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" \
-			"${scriptdir}/idle" || die
-	fi
-}
diff --git a/dev-lang/python/python-3.11.0_beta1-r2.ebuild b/dev-lang/python/python-3.11.0_beta1-r2.ebuild
deleted file mode 100644
index e756eecece06..000000000000
--- a/dev-lang/python/python-3.11.0_beta1-r2.ebuild
+++ /dev/null
@@ -1,421 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools check-reqs flag-o-matic multiprocessing pax-utils \
-	python-utils-r1 toolchain-funcs verify-sig
-
-MY_PV=${PV/_beta/b}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="
-	https://www.python.org/
-	https://github.com/python/cpython/
-"
-SRC_URI="
-	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
-	)
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="bluetooth build examples gdbm hardened libedit lto +ncurses pgo +readline +sqlite +ssl test tk wininst"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils:=
-	app-crypt/libb2
-	>=dev-libs/expat-2.1:=
-	dev-libs/libffi:=
-	sys-apps/util-linux:=
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? (
-		!libedit? ( >=sys-libs/readline-4.1:= )
-		libedit? ( dev-libs/libedit:= )
-	)
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? ( >=dev-libs/openssl-1.1.1:= )
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-	!!<sys-apps/sandbox-2.21
-"
-# bluetooth requires headers from bluez
-DEPEND="
-	${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? ( app-arch/xz-utils[extra-filters(+)] )
-"
-# autoconf-archive needed to eautoreconf
-BDEPEND="
-	sys-devel/autoconf-archive
-	virtual/awk
-	virtual/pkgconfig
-	verify-sig? ( sec-keys/openpgp-keys-python )
-	!sys-devel/gcc[libffi(-)]
-"
-RDEPEND+="
-	!build? ( app-misc/mime-types )
-"
-if [[ ${PV} != *_alpha* ]]; then
-	RDEPEND+="
-		dev-lang/python-exec[python_targets_python${PYVER/./_}(-)]
-	"
-fi
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
-
-# large file tests involve a 2.5G file being copied (duplicated)
-CHECKREQS_DISK_BUILD=5500M
-
-QA_PKGCONFIG_VERSION=${PYVER}
-
-pkg_pretend() {
-	use test && check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	use test && check-reqs_pkg_setup
-}
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -fr Modules/expat || die
-	rm -fr Modules/_ctypes/libffi* || die
-	rm -fr Modules/zlib || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	# force correct number of jobs
-	# https://bugs.gentoo.org/737660
-	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
-	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local disable
-	# disable automagic bluetooth headers detection
-	use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
-
-	append-flags -fwrapv
-
-	filter-flags -malign-double
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	# https://bugs.gentoo.org/700012
-	if is-flagq -flto || is-flagq '-flto=*'; then
-		append-cflags $(test-flags-CC -ffat-lto-objects)
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	tc-export CXX
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	if use pgo; then
-		local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-		export PROFILE_TASK="-m test -j${jobs} --pgo-extended -x test_gdb -u-network"
-
-		# All of these seem to occasionally hang for PGO inconsistently
-		# They'll even hang here but be fine in src_test sometimes.
-		# bug #828535 (and related: bug #788022)
-		PROFILE_TASK+=" -x test_socket -x test_asyncio -x test_httpservers -x test_logging -x test_multiprocessing_fork -x test_xmlrpc"
-
-		if has_version "app-arch/rpm" ; then
-			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
-			PROFILE_TASK+=" -x test_distutils"
-		fi
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		--without-static-libpython
-		--enable-ipv6
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--with-system-expat
-		--with-system-ffi
-		--with-platlibdir=lib
-		--with-pkg-config=yes
-
-		$(use_with lto)
-		$(use_enable pgo optimizations)
-		$(use_with readline readline "$(usex libedit editline readline)")
-	)
-
-	# disable implicit optimization/debugging flags
-	local -x OPT=
-	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-	# propagated to sysconfig for built extensions
-	local -x CFLAGS_NODIST=${CFLAGS}
-	local -x LDFLAGS_NODIST=${LDFLAGS}
-	local -x CFLAGS= LDFLAGS=
-
-	econf "${myeconfargs[@]}"
-
-	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-
-	# force-disable modules we don't want built
-	local disable_modules=(
-		NIS
-	)
-	use gdbm || disable_modules+=( _GDBM _DBM )
-	use sqlite || disable_modules+=( _SQLITE3 )
-	use ssl || disable_modules+=( _HASHLIB _SSL )
-	use ncurses || disable_modules+=( _CURSES _CURSES_PANEL )
-	use readline || disable_modules+=( READLINE )
-	use tk || disable_modules+=( _TKINTER )
-
-	local mod
-	for mod in "${disable_modules[@]}"; do
-		echo "MODULE_${mod}=disabled"
-	done >> Makefile || die
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-	# Prevent using distutils bundled by setuptools.
-	# https://bugs.gentoo.org/823728
-	export SETUPTOOLS_USE_DISTUTILS=stdlib
-	export PYTHONSTRICTEXTENSIONBUILD=1
-
-	# Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't
-	# end up writing bytecode & violating sandbox.
-	# bug #831897
-	local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
-
-	if use pgo ; then
-		# bug 660358
-		local -x COLUMNS=80
-		local -x PYTHONDONTWRITEBYTECODE=
-
-		addpredict /usr/lib/python3.11/site-packages
-	fi
-
-	# also need to clear the flags explicitly here or they end up
-	# in _sysconfigdata*
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Restore saved value from above.
-	local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	# Skip failing tests.
-	local skipped_tests="gdb"
-
-	if use sparc ; then
-		# bug #788022
-		skipped_tests+=" multiprocessing_fork"
-		skipped_tests+=" multiprocessing_forkserver"
-	fi
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	# Expects to find skipped tests and fails
-	mv "${S}"/Lib/test/test_tools/test_freeze.py "${T}" || die
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-	# workaround https://bugs.gentoo.org/775416
-	addwrite /usr/lib/python3.11/site-packages
-
-	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-
-	emake test EXTRATESTOPTS="-u-network -j${jobs}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local result=$?
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	mv "${T}"/test_freeze.py "${S}"/Lib/test/test_tools/test_freeze.py || die
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
-	elog "and run the tests separately."
-
-	if [[ ${result} -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	# -j1 hack for now for bug #843458
-	emake -j1 DESTDIR="${D}" altinstall
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	use sqlite || rm -r "${libdir}/"sqlite3 || die
-	use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	local -x EPYTHON=python${PYVER}
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local -x PYTHON=./python
-		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
-	else
-		local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
-	fi
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" \
-		"${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" \
-		"${scriptdir}/python-config" || die
-	# 2to3, pydoc
-	ln -s "../../../bin/2to3-${PYVER}" \
-		"${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" \
-		"${scriptdir}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" \
-			"${scriptdir}/idle" || die
-	fi
-}
diff --git a/dev-lang/python/python-3.11.0_beta2.ebuild b/dev-lang/python/python-3.11.0_beta2.ebuild
deleted file mode 100644
index e756eecece06..000000000000
--- a/dev-lang/python/python-3.11.0_beta2.ebuild
+++ /dev/null
@@ -1,421 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools check-reqs flag-o-matic multiprocessing pax-utils \
-	python-utils-r1 toolchain-funcs verify-sig
-
-MY_PV=${PV/_beta/b}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="
-	https://www.python.org/
-	https://github.com/python/cpython/
-"
-SRC_URI="
-	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
-	)
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="bluetooth build examples gdbm hardened libedit lto +ncurses pgo +readline +sqlite +ssl test tk wininst"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils:=
-	app-crypt/libb2
-	>=dev-libs/expat-2.1:=
-	dev-libs/libffi:=
-	sys-apps/util-linux:=
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? (
-		!libedit? ( >=sys-libs/readline-4.1:= )
-		libedit? ( dev-libs/libedit:= )
-	)
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? ( >=dev-libs/openssl-1.1.1:= )
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-	!!<sys-apps/sandbox-2.21
-"
-# bluetooth requires headers from bluez
-DEPEND="
-	${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? ( app-arch/xz-utils[extra-filters(+)] )
-"
-# autoconf-archive needed to eautoreconf
-BDEPEND="
-	sys-devel/autoconf-archive
-	virtual/awk
-	virtual/pkgconfig
-	verify-sig? ( sec-keys/openpgp-keys-python )
-	!sys-devel/gcc[libffi(-)]
-"
-RDEPEND+="
-	!build? ( app-misc/mime-types )
-"
-if [[ ${PV} != *_alpha* ]]; then
-	RDEPEND+="
-		dev-lang/python-exec[python_targets_python${PYVER/./_}(-)]
-	"
-fi
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
-
-# large file tests involve a 2.5G file being copied (duplicated)
-CHECKREQS_DISK_BUILD=5500M
-
-QA_PKGCONFIG_VERSION=${PYVER}
-
-pkg_pretend() {
-	use test && check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	use test && check-reqs_pkg_setup
-}
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -fr Modules/expat || die
-	rm -fr Modules/_ctypes/libffi* || die
-	rm -fr Modules/zlib || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	# force correct number of jobs
-	# https://bugs.gentoo.org/737660
-	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
-	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local disable
-	# disable automagic bluetooth headers detection
-	use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
-
-	append-flags -fwrapv
-
-	filter-flags -malign-double
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	# https://bugs.gentoo.org/700012
-	if is-flagq -flto || is-flagq '-flto=*'; then
-		append-cflags $(test-flags-CC -ffat-lto-objects)
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	tc-export CXX
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	if use pgo; then
-		local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-		export PROFILE_TASK="-m test -j${jobs} --pgo-extended -x test_gdb -u-network"
-
-		# All of these seem to occasionally hang for PGO inconsistently
-		# They'll even hang here but be fine in src_test sometimes.
-		# bug #828535 (and related: bug #788022)
-		PROFILE_TASK+=" -x test_socket -x test_asyncio -x test_httpservers -x test_logging -x test_multiprocessing_fork -x test_xmlrpc"
-
-		if has_version "app-arch/rpm" ; then
-			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
-			PROFILE_TASK+=" -x test_distutils"
-		fi
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		--without-static-libpython
-		--enable-ipv6
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--with-system-expat
-		--with-system-ffi
-		--with-platlibdir=lib
-		--with-pkg-config=yes
-
-		$(use_with lto)
-		$(use_enable pgo optimizations)
-		$(use_with readline readline "$(usex libedit editline readline)")
-	)
-
-	# disable implicit optimization/debugging flags
-	local -x OPT=
-	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-	# propagated to sysconfig for built extensions
-	local -x CFLAGS_NODIST=${CFLAGS}
-	local -x LDFLAGS_NODIST=${LDFLAGS}
-	local -x CFLAGS= LDFLAGS=
-
-	econf "${myeconfargs[@]}"
-
-	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-
-	# force-disable modules we don't want built
-	local disable_modules=(
-		NIS
-	)
-	use gdbm || disable_modules+=( _GDBM _DBM )
-	use sqlite || disable_modules+=( _SQLITE3 )
-	use ssl || disable_modules+=( _HASHLIB _SSL )
-	use ncurses || disable_modules+=( _CURSES _CURSES_PANEL )
-	use readline || disable_modules+=( READLINE )
-	use tk || disable_modules+=( _TKINTER )
-
-	local mod
-	for mod in "${disable_modules[@]}"; do
-		echo "MODULE_${mod}=disabled"
-	done >> Makefile || die
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-	# Prevent using distutils bundled by setuptools.
-	# https://bugs.gentoo.org/823728
-	export SETUPTOOLS_USE_DISTUTILS=stdlib
-	export PYTHONSTRICTEXTENSIONBUILD=1
-
-	# Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't
-	# end up writing bytecode & violating sandbox.
-	# bug #831897
-	local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
-
-	if use pgo ; then
-		# bug 660358
-		local -x COLUMNS=80
-		local -x PYTHONDONTWRITEBYTECODE=
-
-		addpredict /usr/lib/python3.11/site-packages
-	fi
-
-	# also need to clear the flags explicitly here or they end up
-	# in _sysconfigdata*
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Restore saved value from above.
-	local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	# Skip failing tests.
-	local skipped_tests="gdb"
-
-	if use sparc ; then
-		# bug #788022
-		skipped_tests+=" multiprocessing_fork"
-		skipped_tests+=" multiprocessing_forkserver"
-	fi
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	# Expects to find skipped tests and fails
-	mv "${S}"/Lib/test/test_tools/test_freeze.py "${T}" || die
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-	# workaround https://bugs.gentoo.org/775416
-	addwrite /usr/lib/python3.11/site-packages
-
-	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-
-	emake test EXTRATESTOPTS="-u-network -j${jobs}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local result=$?
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	mv "${T}"/test_freeze.py "${S}"/Lib/test/test_tools/test_freeze.py || die
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
-	elog "and run the tests separately."
-
-	if [[ ${result} -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	# -j1 hack for now for bug #843458
-	emake -j1 DESTDIR="${D}" altinstall
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	use sqlite || rm -r "${libdir}/"sqlite3 || die
-	use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	local -x EPYTHON=python${PYVER}
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local -x PYTHON=./python
-		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
-	else
-		local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
-	fi
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" \
-		"${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" \
-		"${scriptdir}/python-config" || die
-	# 2to3, pydoc
-	ln -s "../../../bin/2to3-${PYVER}" \
-		"${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" \
-		"${scriptdir}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" \
-			"${scriptdir}/idle" || die
-	fi
-}
diff --git a/dev-lang/python/python-3.11.0_beta2_p1.ebuild b/dev-lang/python/python-3.11.0_beta2_p1.ebuild
deleted file mode 100644
index e756eecece06..000000000000
--- a/dev-lang/python/python-3.11.0_beta2_p1.ebuild
+++ /dev/null
@@ -1,421 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools check-reqs flag-o-matic multiprocessing pax-utils \
-	python-utils-r1 toolchain-funcs verify-sig
-
-MY_PV=${PV/_beta/b}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="
-	https://www.python.org/
-	https://github.com/python/cpython/
-"
-SRC_URI="
-	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
-	)
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="bluetooth build examples gdbm hardened libedit lto +ncurses pgo +readline +sqlite +ssl test tk wininst"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils:=
-	app-crypt/libb2
-	>=dev-libs/expat-2.1:=
-	dev-libs/libffi:=
-	sys-apps/util-linux:=
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? (
-		!libedit? ( >=sys-libs/readline-4.1:= )
-		libedit? ( dev-libs/libedit:= )
-	)
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? ( >=dev-libs/openssl-1.1.1:= )
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-	!!<sys-apps/sandbox-2.21
-"
-# bluetooth requires headers from bluez
-DEPEND="
-	${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? ( app-arch/xz-utils[extra-filters(+)] )
-"
-# autoconf-archive needed to eautoreconf
-BDEPEND="
-	sys-devel/autoconf-archive
-	virtual/awk
-	virtual/pkgconfig
-	verify-sig? ( sec-keys/openpgp-keys-python )
-	!sys-devel/gcc[libffi(-)]
-"
-RDEPEND+="
-	!build? ( app-misc/mime-types )
-"
-if [[ ${PV} != *_alpha* ]]; then
-	RDEPEND+="
-		dev-lang/python-exec[python_targets_python${PYVER/./_}(-)]
-	"
-fi
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
-
-# large file tests involve a 2.5G file being copied (duplicated)
-CHECKREQS_DISK_BUILD=5500M
-
-QA_PKGCONFIG_VERSION=${PYVER}
-
-pkg_pretend() {
-	use test && check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	use test && check-reqs_pkg_setup
-}
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -fr Modules/expat || die
-	rm -fr Modules/_ctypes/libffi* || die
-	rm -fr Modules/zlib || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	# force correct number of jobs
-	# https://bugs.gentoo.org/737660
-	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
-	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local disable
-	# disable automagic bluetooth headers detection
-	use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
-
-	append-flags -fwrapv
-
-	filter-flags -malign-double
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	# https://bugs.gentoo.org/700012
-	if is-flagq -flto || is-flagq '-flto=*'; then
-		append-cflags $(test-flags-CC -ffat-lto-objects)
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	tc-export CXX
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	if use pgo; then
-		local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-		export PROFILE_TASK="-m test -j${jobs} --pgo-extended -x test_gdb -u-network"
-
-		# All of these seem to occasionally hang for PGO inconsistently
-		# They'll even hang here but be fine in src_test sometimes.
-		# bug #828535 (and related: bug #788022)
-		PROFILE_TASK+=" -x test_socket -x test_asyncio -x test_httpservers -x test_logging -x test_multiprocessing_fork -x test_xmlrpc"
-
-		if has_version "app-arch/rpm" ; then
-			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
-			PROFILE_TASK+=" -x test_distutils"
-		fi
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		--without-static-libpython
-		--enable-ipv6
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--with-system-expat
-		--with-system-ffi
-		--with-platlibdir=lib
-		--with-pkg-config=yes
-
-		$(use_with lto)
-		$(use_enable pgo optimizations)
-		$(use_with readline readline "$(usex libedit editline readline)")
-	)
-
-	# disable implicit optimization/debugging flags
-	local -x OPT=
-	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-	# propagated to sysconfig for built extensions
-	local -x CFLAGS_NODIST=${CFLAGS}
-	local -x LDFLAGS_NODIST=${LDFLAGS}
-	local -x CFLAGS= LDFLAGS=
-
-	econf "${myeconfargs[@]}"
-
-	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-
-	# force-disable modules we don't want built
-	local disable_modules=(
-		NIS
-	)
-	use gdbm || disable_modules+=( _GDBM _DBM )
-	use sqlite || disable_modules+=( _SQLITE3 )
-	use ssl || disable_modules+=( _HASHLIB _SSL )
-	use ncurses || disable_modules+=( _CURSES _CURSES_PANEL )
-	use readline || disable_modules+=( READLINE )
-	use tk || disable_modules+=( _TKINTER )
-
-	local mod
-	for mod in "${disable_modules[@]}"; do
-		echo "MODULE_${mod}=disabled"
-	done >> Makefile || die
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-	# Prevent using distutils bundled by setuptools.
-	# https://bugs.gentoo.org/823728
-	export SETUPTOOLS_USE_DISTUTILS=stdlib
-	export PYTHONSTRICTEXTENSIONBUILD=1
-
-	# Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't
-	# end up writing bytecode & violating sandbox.
-	# bug #831897
-	local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
-
-	if use pgo ; then
-		# bug 660358
-		local -x COLUMNS=80
-		local -x PYTHONDONTWRITEBYTECODE=
-
-		addpredict /usr/lib/python3.11/site-packages
-	fi
-
-	# also need to clear the flags explicitly here or they end up
-	# in _sysconfigdata*
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Restore saved value from above.
-	local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	# Skip failing tests.
-	local skipped_tests="gdb"
-
-	if use sparc ; then
-		# bug #788022
-		skipped_tests+=" multiprocessing_fork"
-		skipped_tests+=" multiprocessing_forkserver"
-	fi
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	# Expects to find skipped tests and fails
-	mv "${S}"/Lib/test/test_tools/test_freeze.py "${T}" || die
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-	# workaround https://bugs.gentoo.org/775416
-	addwrite /usr/lib/python3.11/site-packages
-
-	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-
-	emake test EXTRATESTOPTS="-u-network -j${jobs}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local result=$?
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	mv "${T}"/test_freeze.py "${S}"/Lib/test/test_tools/test_freeze.py || die
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
-	elog "and run the tests separately."
-
-	if [[ ${result} -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	# -j1 hack for now for bug #843458
-	emake -j1 DESTDIR="${D}" altinstall
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	use sqlite || rm -r "${libdir}/"sqlite3 || die
-	use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	local -x EPYTHON=python${PYVER}
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local -x PYTHON=./python
-		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
-	else
-		local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
-	fi
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" \
-		"${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" \
-		"${scriptdir}/python-config" || die
-	# 2to3, pydoc
-	ln -s "../../../bin/2to3-${PYVER}" \
-		"${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" \
-		"${scriptdir}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" \
-			"${scriptdir}/idle" || die
-	fi
-}
diff --git a/dev-lang/python/python-3.8.13_p1.ebuild b/dev-lang/python/python-3.8.13_p1.ebuild
deleted file mode 100644
index b5db263829e0..000000000000
--- a/dev-lang/python/python-3.8.13_p1.ebuild
+++ /dev/null
@@ -1,359 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools flag-o-matic multiprocessing pax-utils \
-	python-utils-r1 toolchain-funcs verify-sig
-
-MY_PV=${PV/_rc/rc}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="https://www.python.org/"
-SRC_URI="https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz.asc
-	)
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="bluetooth build examples gdbm hardened +ncurses +readline +sqlite +ssl test tk wininst +xml"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils:=
-	dev-lang/python-exec[python_targets_python3_8(-)]
-	dev-libs/libffi:=
-	sys-apps/util-linux:=
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? ( >=sys-libs/readline-4.1:= )
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? ( >=dev-libs/openssl-1.1.1:= )
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-	xml? ( >=dev-libs/expat-2.1:= )
-"
-# bluetooth requires headers from bluez
-DEPEND="
-	${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? ( app-arch/xz-utils[extra-filters(+)] )
-"
-BDEPEND="
-	sys-devel/autoconf-archive
-	virtual/awk
-	virtual/pkgconfig
-	verify-sig? ( sec-keys/openpgp-keys-python )
-	!sys-devel/gcc[libffi(-)]
-"
-RDEPEND+="
-	build? ( app-misc/mime-types )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
-
-QA_PKGCONFIG_VERSION=${PYVER}
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -fr Modules/expat || die
-	rm -fr Modules/_ctypes/libffi* || die
-	rm -fr Modules/zlib || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	# force correct number of jobs
-	# https://bugs.gentoo.org/737660
-	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
-	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local disable
-	# disable automagic bluetooth headers detection
-	use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
-	use gdbm      || disable+=" gdbm"
-	use ncurses   || disable+=" _curses _curses_panel"
-	use readline  || disable+=" readline"
-	use sqlite    || disable+=" _sqlite3"
-	use ssl       || export PYTHON_DISABLE_SSL="1"
-	use tk        || disable+=" _tkinter"
-	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-	export PYTHON_DISABLE_MODULES="${disable}"
-
-	if ! use xml; then
-		ewarn "You have configured Python without XML support."
-		ewarn "This is NOT a recommended configuration as you"
-		ewarn "may face problems parsing any XML documents."
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	append-flags -fwrapv
-
-	filter-flags -malign-double
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	# https://bugs.gentoo.org/700012
-	if is-flagq -flto || is-flagq '-flto=*'; then
-		append-cflags $(test-flags-CC -ffat-lto-objects)
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	tc-export CXX
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		--enable-ipv6
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--with-system-expat
-		--with-system-ffi
-	)
-
-	# disable implicit optimization/debugging flags
-	local -x OPT=
-	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-	# propagated to sysconfig for built extensions
-	local -x CFLAGS_NODIST=${CFLAGS}
-	local -x LDFLAGS_NODIST=${LDFLAGS}
-	local -x CFLAGS= LDFLAGS=
-
-	econf "${myeconfargs[@]}"
-
-	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-	# Prevent using distutils bundled by setuptools.
-	# https://bugs.gentoo.org/823728
-	export SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	# also need to clear the flags explicitly here or they end up
-	# in _sysconfigdata*
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	# Skip failing tests.
-	local skipped_tests="gdb"
-
-	if use sparc ; then
-		# bug #788022
-		skipped_tests+=" multiprocessing_fork"
-		skipped_tests+=" multiprocessing_forkserver"
-	fi
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-
-	emake test EXTRATESTOPTS="-u-network -j${jobs}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local result=$?
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
-	elog "and run the tests separately."
-
-	if [[ ${result} -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	emake DESTDIR="${D}" altinstall
-
-	# Remove static library
-	rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
-	use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-
-	use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	local -x EPYTHON=python${PYVER}
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local -x PYTHON=./python
-		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
-	else
-		local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
-	fi
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" \
-		"${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" \
-		"${scriptdir}/python-config" || die
-	# 2to3, pydoc
-	ln -s "../../../bin/2to3-${PYVER}" \
-		"${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" \
-		"${scriptdir}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" \
-			"${scriptdir}/idle" || die
-	fi
-}
diff --git a/dev-lang/python/python-3.9.11.ebuild b/dev-lang/python/python-3.9.11.ebuild
deleted file mode 100644
index 1d98d0661523..000000000000
--- a/dev-lang/python/python-3.9.11.ebuild
+++ /dev/null
@@ -1,392 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools check-reqs flag-o-matic multiprocessing pax-utils \
-	python-utils-r1 toolchain-funcs verify-sig
-
-MY_PV=${PV/_rc/rc}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="https://www.python.org/"
-SRC_URI="https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz.asc
-	)"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="bluetooth build examples gdbm hardened lto +ncurses pgo +readline +sqlite +ssl test tk wininst +xml"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2:=
-	app-arch/xz-utils:=
-	dev-lang/python-exec[python_targets_python3_9(-)]
-	dev-libs/libffi:=
-	sys-apps/util-linux:=
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? ( >=sys-libs/readline-4.1:= )
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? ( >=dev-libs/openssl-1.1.1:= )
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-	xml? ( >=dev-libs/expat-2.1:= )"
-# bluetooth requires headers from bluez
-DEPEND="${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? ( app-arch/xz-utils[extra-filters(+)] )"
-BDEPEND="
-	virtual/awk
-	virtual/pkgconfig
-	sys-devel/autoconf-archive
-	verify-sig? ( sec-keys/openpgp-keys-python )
-	!sys-devel/gcc[libffi(-)]"
-RDEPEND+=" !build? ( app-misc/mime-types )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
-
-# large file tests involve a 2.5G file being copied (duplicated)
-CHECKREQS_DISK_BUILD=5500M
-
-pkg_pretend() {
-	use test && check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	use test && check-reqs_pkg_setup
-}
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -fr Modules/expat || die
-	rm -fr Modules/_ctypes/libffi* || die
-	rm -fr Modules/zlib || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	# force correct number of jobs
-	# https://bugs.gentoo.org/737660
-	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
-	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local disable
-	# disable automagic bluetooth headers detection
-	use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
-	use gdbm      || disable+=" gdbm"
-	use ncurses   || disable+=" _curses _curses_panel"
-	use readline  || disable+=" readline"
-	use sqlite    || disable+=" _sqlite3"
-	use ssl       || export PYTHON_DISABLE_SSL="1"
-	use tk        || disable+=" _tkinter"
-	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-	export PYTHON_DISABLE_MODULES="${disable}"
-
-	if ! use xml; then
-		ewarn "You have configured Python without XML support."
-		ewarn "This is NOT a recommended configuration as you"
-		ewarn "may face problems parsing any XML documents."
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	append-flags -fwrapv
-
-	filter-flags -malign-double
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	# https://bugs.gentoo.org/700012
-	if is-flagq -flto || is-flagq '-flto=*'; then
-		append-cflags $(test-flags-CC -ffat-lto-objects)
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	tc-export CXX
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	if use pgo; then
-		local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-		export PROFILE_TASK="-m test -j${jobs} --pgo-extended -x test_gdb -u-network"
-
-		# All of these seem to occasionally hang for PGO inconsistently
-		# They'll even hang here but be fine in src_test sometimes.
-		# bug #828535 (and related: bug #788022)
-		PROFILE_TASK+=" -x test_socket -x test_asyncio -x test_httpservers -x test_logging -x test_multiprocessing_fork -x test_xmlrpc"
-
-		if has_version "app-arch/rpm" ; then
-			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
-			PROFILE_TASK+=" -x test_distutils"
-		fi
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		--enable-ipv6
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--with-system-expat
-		--with-system-ffi
-
-		$(use_with lto)
-		$(use_enable pgo optimizations)
-	)
-
-	# disable implicit optimization/debugging flags
-	local -x OPT=
-	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-	# propagated to sysconfig for built extensions
-	local -x CFLAGS_NODIST=${CFLAGS}
-	local -x LDFLAGS_NODIST=${LDFLAGS}
-	local -x CFLAGS= LDFLAGS=
-
-	econf "${myeconfargs[@]}"
-
-	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-	# Prevent using distutils bundled by setuptools.
-	# https://bugs.gentoo.org/823728
-	export SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	# Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't
-	# end up writing bytecode & violating sandbox.
-	# bug #831897
-	local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
-
-	if use pgo ; then
-		# bug 660358
-		local -x COLUMNS=80
-		local -x PYTHONDONTWRITEBYTECODE=
-
-		addpredict /usr/lib/python3.9/site-packages
-	fi
-
-	# also need to clear the flags explicitly here or they end up
-	# in _sysconfigdata*
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Restore saved value from above.
-	local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	# Skip failing tests.
-	local skipped_tests="gdb"
-
-	if use sparc ; then
-		# bug #788022
-		skipped_tests+=" multiprocessing_fork"
-		skipped_tests+=" multiprocessing_forkserver"
-	fi
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-
-	emake test EXTRATESTOPTS="-u-network -j${jobs}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local result=$?
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
-	elog "and run the tests separately."
-
-	if [[ ${result} -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	emake DESTDIR="${D}" altinstall
-
-	# Remove static library
-	rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
-	use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	local -x EPYTHON=python${PYVER}
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local -x PYTHON=./python
-		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
-	else
-		local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
-	fi
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" \
-		"${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" \
-		"${scriptdir}/python-config" || die
-	# 2to3, pydoc
-	ln -s "../../../bin/2to3-${PYVER}" \
-		"${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" \
-		"${scriptdir}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" \
-			"${scriptdir}/idle" || die
-	fi
-}
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index 689da4e8ed4a..5166c2a88af7 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -21,7 +21,7 @@ DIST spidermonkey-68.6.0-patches-04.tar.xz 5956 BLAKE2B b1250391a5173e676272d592
 DIST spidermonkey-78-patches-04.tar.xz 3408 BLAKE2B f2fdd4882e1e4de1908c458dc8dfedd5665ef7118f19704dabf2b2a80e2fae48813e9bc3d0c3410287e32c21e3f9d09233d8e5d15917f53aa2f60e6190cd9cdb SHA512 87ac83c0ccc05f482913b1fbf043db1878536f935f934362a47283809c0cbfdeff040206a9c18c687384b606ba8a7bd9a7c1fc3c0bcfdd620987990a33ca1fe2
 DIST spidermonkey-91-patches-04j.tar.xz 4624 BLAKE2B d9cf47b39a165e8434d4f2f20ae3a9734c1bb81c32ddb75360e5edfa6817d6343be89aff0f8ec381485772cad80b00a069789decbc462129161afc3d4acfcb53 SHA512 bd574fee600cb4c6a262893b7d992d85c4059d512b829cd2f226aff86d8a6a83c2bdab466704e22f64bf6d29f90901037a34f9e90a42251952ba1cdbc0cab968
 DIST spidermonkey-slot0-patches-02.tar.xz 10952 BLAKE2B fb7bf5cdac6c821a48d407ff172fe0ec7297e047d3b3bab952f226f413b83ea70325175b41c1680725ff588111b424efc97a0c66e392989da510c43d38528ff1 SHA512 cd62890c4b58658d99fc1b52f05ccb35c07da835b168bb9d5e6b219de5021122c199cc2255c5b0be01ef582f53dd51c9975921e6bde9f14e9b43536e2bee85f2
-EBUILD spidermonkey-1.8.5-r10.ebuild 3994 BLAKE2B 3a46925f00bcffaf11e678de6de6070797077b7ac4776396e048a8110b01be1b3b2a8a70cf4135dcbce4b5809dc2e396ee5ed4c022e5353e233752dc1731e00e SHA512 c73b507070555c7a5bdfe3609b5fa5cf41fc5d05e41a70bf106250982274b3de0290a8b2a652505384bcd3f70605514f2026ca5f5fc5344b63c28ad2145ff93f
+EBUILD spidermonkey-1.8.5-r10.ebuild 3998 BLAKE2B c54b791025b3416f96068a20e8f5526d15223aa4f5d4b5dedc5451ea711f5376d26ff9823226a7617dc53e4beece4ef48dc608a5f6fd02c03221e46c69be3add SHA512 8a33566ef0d15caf811d79d17862ccaaa708c9c6a4171bfc3889bc3f3268e6bcfc61090ebff1014b5369f469c0b9e516a340ab32930888a07cce1ac95faf6fb3
 EBUILD spidermonkey-60.5.2_p0-r6.ebuild 4032 BLAKE2B 396632dfadc26ad8dd04e59b3948aef8872ba8d20eec27c5f0f8abb58091cec7ac160418d433cd547b7fa94cf04f702c69b2fd2a2af0fbae103d23c4773ca25b SHA512 4362077743a90149bb31f14f388c442346d289c182ae1d7c7035332ca81666c1656fe4ed25c197c183d131b07f82411c7f8d235854ae034ed72ab0e5261885d5
 EBUILD spidermonkey-68.12.0-r1.ebuild 7834 BLAKE2B 35252f841078dc8b0f06c2c2dab0d0a17abbfa23f025c3b2534232a82951298722a7ee5c3c7bcd56055879c5a886961a8ac34bb325fca7a466dc7d59f7b391ec SHA512 4ecbf27cddb67cdef15aa2c93cb4acfb4851973a07b7b9040186555027f5bc4d7126351b5bb1646640d0493afa78e63151d39b0bf37a6899c87ff20a7ea22198
 EBUILD spidermonkey-78.15.0.ebuild 13137 BLAKE2B 41f192dcaf5028f994c02b68e6f6f3adb8241cff0fc0d240d400b1c3f5819ee2a100a2e2e5c45ec1d948ae5e5b4667a2b550033b246342f55beadf8cb6585696 SHA512 b24733065cafe800337a59797263182af5ee120839895ea11095bd8d05995958651908caa3943fb6bd81b557500854fb60ee8264bb90417215da5c48585e8f67
diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5-r10.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r10.ebuild
index 9ea95562915c..99ebd7b97664 100644
--- a/dev-lang/spidermonkey/spidermonkey-1.8.5-r10.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.5-r10.ebuild
@@ -51,8 +51,8 @@ PATCHES=(
 	"${FILESDIR}"/${P}-LTO.patch
 )
 
-DOCS=( ${S}/README )
-HTML_DOCS=( ${BUILDDIR}/README.html )
+DOCS=( "${S}"/README )
+HTML_DOCS=( "${BUILDDIR}"/README.html )
 
 pkg_setup() {
 	if [[ ${MERGE_TYPE} != "binary" ]]; then
diff --git a/dev-lang/teyjus/Manifest b/dev-lang/teyjus/Manifest
index cec13d18ccac..ee19c61e4f5c 100644
--- a/dev-lang/teyjus/Manifest
+++ b/dev-lang/teyjus/Manifest
@@ -3,6 +3,6 @@ AUX teyjus-2.1-p001-Fixes-arity-for-pervasive-modulo-operation.patch 1144 BLAKE2
 AUX teyjus-2.1-p002-Add-string-literals-from-proper-character-groups.patch 2083 BLAKE2B 4480c4cc607988fe4b55e5d0405298d37ca3f7364a694b750dd2a544a5cee71d27f84745a5559b33ed67ec215b389b349e9a73fa3d65ce6f69e949b6bc19e205 SHA512 9bca80da36bcb300fca23553205e1ce459e7b52e6d2b3a8b27e9e330413cd8b49ca928bd92d47fe16546854f945d05e2280143ff75cc45aa93d7850c2da8a916
 AUX teyjus-2.1-p003-Removing-deprecated-function-String.set.patch 1599 BLAKE2B e264e64eda3b877e1042fbef4173d4483697fab19e33ceb51176c65a57df651cc0566df486ab551cc50cbf43a47bf60cdfdbd72cc42a2156b195b4f711c06fc3 SHA512 627dd8328a33fa3489ba3da59b4e8c43202b327c27ddecbef2beeddaeecff9f749522d7d9e3e105781b1e60cd633a87aedff39a7e6aa0ec8e1f76556e58ff1f3
 DIST teyjus-2.1.tar.gz 723763 BLAKE2B ab6a98c2d2291620b586ab0b419a214b0f7c0b27aad444324e5a417c1a0b27382e2d5c622f798ea88cab77853bca3305ec37904c50a7304ace20237afb993b91 SHA512 1f71d19502f4f4da00f635d2c3d4e141403182d65f039e0d43660edf84c5fcd900e7225ac92dc5bdbe0c8379c4e2ce6e27879af504fcfafddf2695a0c8a13379
-EBUILD teyjus-2.1-r1.ebuild 2942 BLAKE2B ed6459e0afb88618e788ed09a6375ec47f983c72c241344462a183130711ffb695310b510d9a0f7fc390ea21fcae850eaea0850bca510dae374eceae3357ce4c SHA512 0b1cc997dfeb63e768bb98c8aa5f154b66d67589eae4a05a0e930c0ffbbf64ba2366c65fb58eb7513ff59eb19b2192bae60376e99b21a038b40499639cb05ebd
-EBUILD teyjus-2.1.ebuild 2907 BLAKE2B ea6e92b665791e776f737885a883fe4f04bc05dec026cfbf0e9b3da84ec9cb6d54aeb5c9f124ce958a27eadc624eefec651b3f69e35c0a4e7175241e9887d764 SHA512 809cbdce2b3ffd69e7fb1281feaad43220e688539be1ce63fc99febe3ac2adf57da12ed2f8f4b5ffe86df13dec3f08557afe6c7321da75f1b631b54f2488ecd1
+EBUILD teyjus-2.1-r1.ebuild 2940 BLAKE2B 25186b27d4c2d69f4e6bc9cfc5e49edc43110b75664270eb7d459c5cc85587d85a4f29255a1f7a3df771beedc3f6fc1b988ccbfeea437fabe071610a7b2edc99 SHA512 8af839bedc5049f1ac4b4128425ea1f71abeb3b38d9c3739b46ce7bc0466ce4e1df64dac0923cbd4f7017dc48eb9746ace712ca7ac32bd880a5aa7a3b70acd42
+EBUILD teyjus-2.1.ebuild 2905 BLAKE2B c3035b05c8c2c398b9c4baf4545a9c06f3bdfb978626fa8aaaf50d2765e7fca411195d3b8612b9680ea8788660dbeefd8e595d9895b81749e882cfae941b7f1b SHA512 21af8eabfc012c1e435dfaca528a1689103ff53f74c901973ab52477753a60ff6a1a9a29e9ff8403e7b33a25ea0d5f20a1ac80ef29049c21936dbb92586cefe1
 MISC metadata.xml 1654 BLAKE2B 6361e555cae1b12db47e36e7362c78262a5753ecdb9fb3e8e5386d3945d6f7aeeaeb32e98c3a71e40a017c0bd9ff2d576205e3db96771f67ce7ad888cc2f12cf SHA512 077b511496bda9dfa0f577bac466a33fd5d4b5b759ae243157b385b244c7e9b210c3f7fc0221ed48c7f4277dd86f9f05fed484c375747bcda590258f278cda41
diff --git a/dev-lang/teyjus/teyjus-2.1-r1.ebuild b/dev-lang/teyjus/teyjus-2.1-r1.ebuild
index 508113c464bd..7e48f5daab8f 100644
--- a/dev-lang/teyjus/teyjus-2.1-r1.ebuild
+++ b/dev-lang/teyjus/teyjus-2.1-r1.ebuild
@@ -85,7 +85,7 @@ src_install() {
 	if use emacs ; then
 		elisp-install ${PN} emacs/*.{el,elc}
 		cp "${FILESDIR}"/${SITEFILE} "${S}"
-		sed -e 's@/usr/bin/tjcc@'${EPREFIX}/usr/bin/tjcc'@' -i ${SITEFILE} \
+		sed -e "s@/usr/bin/tjcc@${EPREFIX}/usr/bin/tjcc@" -i ${SITEFILE} \
 			|| die "Could not set tjcc executable path in emacs site file"
 		elisp-site-file-install ${SITEFILE}
 	fi
diff --git a/dev-lang/teyjus/teyjus-2.1.ebuild b/dev-lang/teyjus/teyjus-2.1.ebuild
index a571b19301d1..ba530e02034d 100644
--- a/dev-lang/teyjus/teyjus-2.1.ebuild
+++ b/dev-lang/teyjus/teyjus-2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -83,7 +83,7 @@ src_install() {
 	if use emacs ; then
 		elisp-install ${PN} emacs/*.{el,elc}
 		cp "${FILESDIR}"/${SITEFILE} "${S}"
-		sed -e 's@/usr/bin/tjcc@'${EPREFIX}/usr/bin/tjcc'@' -i ${SITEFILE} \
+		sed -e "s@/usr/bin/tjcc@${EPREFIX}/usr/bin/tjcc@" -i ${SITEFILE} \
 			|| die "Could not set tjcc executable path in emacs site file"
 		elisp-site-file-install ${SITEFILE}
 	fi
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 75eecdce2868..7e898558e679 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 16ffc5d6b0dd..3e9d7f79abfe 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -7,5 +7,5 @@ AUX boost-1.78.0-interprocess-musl-include.patch 676 BLAKE2B 4278a20b6494a8653c4
 DIST boost_1_78_0.tar.bz2 110675550 BLAKE2B ed7da98862ec1e0a28472544400e6f44ffadbc967eed969ce6cb62b1c4f0b7a4b98a395269eb374b57326eff9cdb1dd6e47df9d1a9730aff7c926cc44388fb2d SHA512 9c34a387a203b99aa773eb0c59f5abac7a99ba10e4623653e793c1d5b29b99b88e0e4e0d4e2e4ca5d497c42f2e46e23bab66417722433a457dc818d7670bcbbf
 DIST boost_1_79_0.tar.bz2 113456811 BLAKE2B 61f47ca022e60745868e6bdd3b5c75603dd68d878e126dcbb73de5b40fc03c0eec8eede3ec304ece58050435ef2fc1ed7eb763773c20673f85e32bbf4d5f978a SHA512 70909e0561c213d10a1fdd692f9ae7b293d3cdc63e925bdc207da9e9bba6e86474341100e7ee5de6d94f9561196b1a3a1597055a7b7382babf8931131170a312
 EBUILD boost-1.78.0-r2.ebuild 10684 BLAKE2B 98527e0715d126b28c1bd417da4260278b50d60c03d1fd498466cf49fc5e544e3592ac5ed1b92d71ca1ff1103c62362d20d298282bdb1c4ab7da9e839ca81b8f SHA512 702fe6679f80ccfdfc754a9684289a078c2a14e0c5099a12fe31d4beccc50a2139afdaad8e146b7426dd8ff8642aa06b29ca132f0a82cf0a73b7422b3c2308f6
-EBUILD boost-1.79.0.ebuild 10626 BLAKE2B 915626828434a3dc15c66a84e019483452b2643694bb65c2442bb5d5b9cd4dd9edb0f552ceb868933ae5607b8041dd7b131a08a69fee1f3759997bcfac934c43 SHA512 5609ab1e36ddb9926bfe1d248f7826c0df8fc6f5891a33b1b11e0abbb0e8af743067b9f0f4bd33dff51ac7068bc6c5e373d5b73d7d692718a6fc51a3acdb704f
+EBUILD boost-1.79.0.ebuild 10622 BLAKE2B 6ee01b54d84fbdc2b419d88f19b759a68cb987a0d85aa21e27c3d89bfdd9cadd6cb6a2cec6798382f5cfc53a3ce8caf327a979d060ec2e154ecbf20b7b87f1b3 SHA512 75a66ed332e5d3963da66ca30e626d5aff1926e23b9e5b3c20736e6bdd792ec2c72e11afd88358ffe9b43ed2e53b54eddfef5a44810923b50170178da07ae363
 MISC metadata.xml 1296 BLAKE2B 68366717e95027dc72733a63960c674a710cd3f05ca6adc4d0ce96d1da03725800c39d11b788e063401c1661b67b27972a729861c6d7abecf42a343df889d990 SHA512 52ef93567f2ea6ff7be566eff974407d508d3c1b05d691f8753b6dafb39afaf03ca1d5b0d4d23e6f411099aa8b8a177a0b6b05c668c1cfb387c87d5df5342cad
diff --git a/dev-libs/boost/boost-1.79.0.ebuild b/dev-libs/boost/boost-1.79.0.ebuild
index d577fe4c603c..2408361220cf 100644
--- a/dev-libs/boost/boost-1.79.0.ebuild
+++ b/dev-libs/boost/boost-1.79.0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}_${MY_PV}"
 
 LICENSE="Boost-1.0"
 SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python tools zlib zstd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 # the tests will never fail because these are not intended as sanity
diff --git a/dev-libs/cxxtools/Manifest b/dev-libs/cxxtools/Manifest
index 2c18e419812b..f23f64ddb664 100644
--- a/dev-libs/cxxtools/Manifest
+++ b/dev-libs/cxxtools/Manifest
@@ -1,5 +1,8 @@
+AUX cxxtools-3.0-gcc12-time.patch 244 BLAKE2B 2bd3c5713f68e261607d21273c8a98893ae4bf757ab6d97a019a4e0e02f965b6e1a45be2995562f0544554aa01c0ef86174b0208bec3626511ce35abff1df5d5 SHA512 3c5d7b391ee6184c3e57e99b27a0f2972a53a63a9adbe30133d804b7d0e1c9163b63f47ad1e6f05b04b0baac50de6670f1f2cd1c3726e3965d3eb6669ccc6f32
+AUX cxxtools-3.0-lld-linking-openssl.patch 323 BLAKE2B 32cd482d39132bb9793383e2afb1d7f2c10b1526fda67ae8f896c2081d61a07e9a2251e9339e166937dd2365fe5c9165a32413bb850eb0ef6d61079c1a29f43c SHA512 04c86dbb1aaac5549adaad0a8b8f0e09805924c69e3d759537e1a3b97690c9a7e7e9321df7671479780b2aa1d18951cba9d0f00fdabe5a7cdc9b15ff02e3da51
 AUX cxxtools-3.0_gcc11.patch 847 BLAKE2B ae4c4caf2d33351a33e7f54addeda32a922dabab867d1ca41684a3fa73b040a2b4df515a0af7fc33a1e3a8159c03d8189b4b97f2d36dab882c6d237e6d50faf8 SHA512 cb53d59849c8034fde4bb81e9db2f71ea34ccb809671e269dce47bd4d9847369213f43f1a32bb578547fd03f60df31f96d678249c34613ee4619fe1f32af8355
 DIST cxxtools-3.0.tar.gz 1079247 BLAKE2B 536680373e194dbdb6a79bdb09960830b6aad34c2657a0024b218321154de81653f1e47db13abfcf13f0179fa6f85e0a30a4b97f0e64ca0ac5f1cc7be003270d SHA512 839be18a8bf40c1cbaa016ac50ddacfd879d1f9bea6521209c65790d67d5ee81377519aac2fb373a5de154a293e33185401848e41a697aa57ad6aa42d4854250
 EBUILD cxxtools-3.0-r1.ebuild 716 BLAKE2B 73caa9b56a2796bda7b29abdc4f34ea84bdca1ad04dbf6f1a4b9192ae65e257500caf543a406a70818cc3cfe8329012161ce6e9e43132f89a1bb4e14519b3c65 SHA512 689b9531a324c04d7cd9f153d567eabe00866508c839804cd0d3eb5ed4539d41b2a07de976e1778e9a887d00aa96097dbd51fcdf80930bd50463b9323d7ebcc8
+EBUILD cxxtools-3.0-r2.ebuild 838 BLAKE2B 00068e6d77b56ca501c01eaa7582f927525b236ef2e1fa8f419254f1389dd25063fd28f377d6dd367f08adff007c3f72149228753086f3af1680b65738772fb6 SHA512 44fcbb208193759a127795353877881d6825d1b1a04c5b0f5b73e24edc67fccd7cc81c0ee6058daf1795eff5f517557974ac479920da6972493ba0a85b6caff9
 EBUILD cxxtools-3.0.ebuild 676 BLAKE2B f640431bf4c41b1f1d87d1ece7005638c8e6b4caf9c7e365a03550f1d4c0b540e57cc78114185e9ad60d21599eab699177f9cf3d4973004f11d8705b4d0225b9 SHA512 4d10b859219f52027fab420a5e215076513705481b84b59b06df59320ffb4f960cb35593a60b5d0fe0c901de4a3056d2ae12e22acd3381db1b2a4e0b9007842d
 MISC metadata.xml 244 BLAKE2B 7222dd1e8f714217b90fa86e81e31b345a4b2e861ca846f3cfcaab3f6820dea4b067d0d335336af53dfd7985287fc213d27ca777bd876cb2bb72fadba79cc1ec SHA512 d066cd23818ff8a6ace46dde4dd13e5da409672c7843057ff90819a7d691fd53c2e7de7b696a0a08945a4e770f63722f4923e78b22c40568db755ddca6a58f0e
diff --git a/dev-libs/cxxtools/cxxtools-3.0-r2.ebuild b/dev-libs/cxxtools/cxxtools-3.0-r2.ebuild
new file mode 100644
index 000000000000..10143b5f51ad
--- /dev/null
+++ b/dev-libs/cxxtools/cxxtools-3.0-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Collection of general purpose C++-classes"
+HOMEPAGE="http://www.tntnet.org/cxxtools.html"
+SRC_URI="http://www.tntnet.org/download/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+
+RDEPEND="virtual/libiconv"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS )
+
+PATCHES=(
+	"${FILESDIR}"/${P}_gcc11.patch
+	"${FILESDIR}"/${PN}-3.0-gcc12-time.patch
+	"${FILESDIR}"/${PN}-3.0-lld-linking-openssl.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-demos \
+		--disable-unittest
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	einstalldocs
+
+	# remove static libs
+	rm -f "${ED}"/usr/$(get_libdir)/libcxxtools{,-bin,-http,-json,-unit,-xmlrpc}.la || die
+}
diff --git a/dev-libs/cxxtools/files/cxxtools-3.0-gcc12-time.patch b/dev-libs/cxxtools/files/cxxtools-3.0-gcc12-time.patch
new file mode 100644
index 000000000000..d80763dd4c1d
--- /dev/null
+++ b/dev-libs/cxxtools/files/cxxtools-3.0-gcc12-time.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/851837
+--- a/src/timer.cpp
++++ b/src/timer.cpp
+@@ -27,6 +27,7 @@
+ #include "cxxtools/clock.h"
+ #include "cxxtools/selector.h"
+ #include "cxxtools/datetime.h"
++#include <ctime>
+ #include <stdexcept>
+ 
+ namespace cxxtools
diff --git a/dev-libs/cxxtools/files/cxxtools-3.0-lld-linking-openssl.patch b/dev-libs/cxxtools/files/cxxtools-3.0-lld-linking-openssl.patch
new file mode 100644
index 000000000000..e2696fd094b0
--- /dev/null
+++ b/dev-libs/cxxtools/files/cxxtools-3.0-lld-linking-openssl.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -173,7 +173,7 @@ libcxxtools_la_LIBADD = $(LIBICONV)
+ libcxxtools_la_LDFLAGS = -version-info @sonumber@ @SHARED_LIB_FLAG@
+ 
+ if MAKE_OPENSSL
+-libcxxtools_la_LDFLAGS += -lssl
++libcxxtools_la_LIBADD += -lssl -lcrypto
+ libcxxtools_la_SOURCES += \
+ 	sslcertificateimpl.cpp
+ endif
diff --git a/dev-libs/flatbuffers/Manifest b/dev-libs/flatbuffers/Manifest
index dc6ad0991266..103f4ba3e3bc 100644
--- a/dev-libs/flatbuffers/Manifest
+++ b/dev-libs/flatbuffers/Manifest
@@ -1,5 +1,3 @@
-DIST flatbuffers-2.0.0.tar.gz 1538022 BLAKE2B ccd827a43da39cf831727b439beed0cea216cdf50dbfe70954854bbe388b2c47ed4e78cc87e3fc0d5568034b13baa2ea96480914cc8129747bccbf8ea928847c SHA512 26a06b572c0e4c9685743bd2d2162ac7dcd74b9324624cc3f3ef5b154c0cee7c52a04b77cdc184245d2d6ae38dfdcc4fd66001c318aa8ca001d2bf1d85d66a89
 DIST flatbuffers-2.0.6.tar.gz 1724250 BLAKE2B b6969b28dba753c4551b33d27409d9925c10a640ae860264f8054c19a470ce3da366c0bf7917bf7fe4f6cb57acbfbe1837f175fde40b84d311df6d1378d146ce SHA512 be631f34064c28d81876bf137c796e9736623cf2cc4f2a05dd45372e7195729c99fad1fa795f8ce71a408756a842edbdc0c3bc714a7cf63203a1de8681d86fb6
-EBUILD flatbuffers-2.0.0-r1.ebuild 831 BLAKE2B 68d76c63ca1b7e7952029c697401b27d3d16917a1bace1b98df7ca5a4751f4e6d0c9be6f85a655c517add23d13b60c804004f243854a46cd2bf9feef71bc956a SHA512 dd77a7b4ede065ae9e6e8494a85f47f7350cb31cf5d861369f0e0f1f233b3e05847ab03ab528f52134caccae90b63dd8bf02f6e4672785592044eef5229d9435
 EBUILD flatbuffers-2.0.6.ebuild 915 BLAKE2B 88c4359a8c163cfafa64a7ff8100b88fc1c50dff33e7beb7defed3730b1293c720532dfc12dbb2537a294c864e4b284c0cab36b5f6e2a35e3078007ce4ddb0b6 SHA512 2383d41cc3e82415604d71cac9cb9a833702af2374eae812e8a0176213ed1177c45c8e5db5eab7f43b912c952763e66c96cbdf7e3d1f563224189cbecde97c55
 MISC metadata.xml 333 BLAKE2B 406420eb792181bdf5e8c93153e9306c84fd6f3fd1148454ec57e858b411b698cff132f5ee4695866ab8984d665201a8ebc942ae425545bd67641e9c1d364b21 SHA512 b9d41f9dc12a72fe220b3b9673fac2656d060be1ed80b1935142e4706e6dc0663dc2667e84245328c8968b5a534fe48800b9b2e8e2b2635365ae741c126f757e
diff --git a/dev-libs/flatbuffers/flatbuffers-2.0.0-r1.ebuild b/dev-libs/flatbuffers/flatbuffers-2.0.0-r1.ebuild
deleted file mode 100644
index 66d76389cfc2..000000000000
--- a/dev-libs/flatbuffers/flatbuffers-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Memory efficient serialization library"
-HOMEPAGE="https://google.github.io/flatbuffers/"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-# From 1.2.0->2.0.0, incremented SONAME, although the interface didn't actually change.
-# (Apparently to adopt semver.)
-SLOT="0/2"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="static-libs test"
-
-RESTRICT="!test? ( test )"
-
-DOCS=( readme.md )
-
-src_configure() {
-	local mycmakeargs=(
-		-DFLATBUFFERS_BUILD_FLATLIB=$(usex static-libs)
-		-DFLATBUFFERS_BUILD_SHAREDLIB=ON
-		-DFLATBUFFERS_BUILD_TESTS=$(usex test)
-	)
-
-	use elibc_musl && mycmakeargs+=( -DFLATBUFFERS_LOCALE_INDEPENDENT=0 )
-
-	cmake_src_configure
-}
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index 89f34fce6b11..5298bc144b13 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -1,3 +1,3 @@
 DIST gobject-introspection-1.72.0.tar.xz 1040936 BLAKE2B fd7600a927e57d5a076c203a084afe56a738d3a93109055be7bee22a96d6d5b08892300260288e5b83f883e54ca658cb24ef5c862abe435820c963bbf0cf8496 SHA512 b8fba2bd12e93776c55228acf3487bef36ee40b1abdc7f681b827780ac94a8bfa1f59b0c30d60fa5a1fea2f610de78b9e52029f411128067808f17eb6374cdc5
-EBUILD gobject-introspection-1.72.0.ebuild 1974 BLAKE2B afa6f0ab584a83754d21029c93f45c09519f2902ab735125984dedc92a28d1c2f9f2bdda26482613c56e85da34035a69cd1cd093caef338a22a60bce609faf07 SHA512 0e242f52653859b89cf3d947725384c806095e7c7475b31e63878ddeb73cedb40b37aa755adc5501c42b324c24fb4785c53d7517d5dd49120f0c8b7c36ac5324
+EBUILD gobject-introspection-1.72.0.ebuild 1987 BLAKE2B 47563c2399970af94e72ed72542c440afd4f6a4aeddf15c43897fc059b4fcc136d0c466848e7a40ad735f644028b3564bb7a7260453a60830dd2a7670476b323 SHA512 77f5664ff9bb2a5af147c7ae937a3d4b787f2fbedba26910ebfe44798e7b7bb9bb4b6410ade632d1ac5fe5755de09853fc062f90320f162a26fda87d82e6b6f3
 MISC metadata.xml 368 BLAKE2B 5734e81d2929cef33ae5a3e57d48717f2079944a26a34206d0c674a607068047e24c17e76435683dd6f9b369ba8abcbd6ff98037ba219e7f4ea8225d3980a3eb SHA512 e8a3b181add420cbfbffa78ba6a8bf7d7b82593ba9a54e89e52a9d0eb3a7c92f577d71080912067c16364e267bb1438ba1c8839ed62af24da39cc9e1b6f7d864
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.72.0.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.72.0.ebuild
index 16459b1e0796..10f35c92331b 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.72.0.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.72.0.ebuild
@@ -32,8 +32,10 @@ RDEPEND="
 	${PYTHON_DEPS}
 "
 # Wants real bison, not virtual/yacc
-DEPEND="${RDEPEND}
-	gtk-doc? ( >=dev-util/gtk-doc-1.19
+DEPEND="${RDEPEND}"
+BDEPEND="
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.19
 		app-text/docbook-xml-dtd:4.3
 		app-text/docbook-xml-dtd:4.5
 	)
diff --git a/dev-libs/icu-layoutex/Manifest b/dev-libs/icu-layoutex/Manifest
index d71a8c7fb858..59230c20c955 100644
--- a/dev-libs/icu-layoutex/Manifest
+++ b/dev-libs/icu-layoutex/Manifest
@@ -3,5 +3,5 @@ DIST icu4c-70_1-src.tgz 25449582 BLAKE2B e229376ee45322db99aa963465048ab5e694ce9
 DIST icu4c-71_1-src.tgz 25701340 BLAKE2B 182972d87fe5b69b5e08c39ab9bb0ac7ffc7b36530168b3548faa051cce2b73b9f1c1d23198a4b1c655442155e369da76929e4f54fe4e32265160363428d4916 SHA512 1fd2a20aef48369d1f06e2bb74584877b8ad0eb529320b976264ec2db87420bae242715795f372dbc513ea80047bc49077a064e78205cd5e8b33d746fd2a2912
 DIST icu4c-71_1-src.tgz.asc 659 BLAKE2B ac281e0a9b94bf6bfddee2dd5dc7553836aa50ae84f55478a662d0cd1e116a944de92dd5fd701164d62fb5b8e8effcdb3456a151a6b198d603e2324ccd76e334 SHA512 3371e14f3959defa7fb8d3eb0308084646ed553169b7a845bff89f9a8c1054ef5bee45c26c1834a84cab38fa87710f1585e6c5787be1fe2df356eb5c2ba20aae
 EBUILD icu-layoutex-70.1.ebuild 2505 BLAKE2B 3197805d41f024b6cf3aadba1db8b305f6d45af609305f8af4f9fc24154ccc651299b571e37e83f5dbfc4f86cf315443b972139ed87b54856a9af128d7b8830f SHA512 57c95d2a5e2a4b1c5876d5b4becfde3a27ce519a4a6e81db38ea10e8e4423cb4a2b335b153ddd031253713f455b5e09faf6c656ec5ecddc2dcf89a055b961487
-EBUILD icu-layoutex-71.1.ebuild 3586 BLAKE2B e7343cb0d29874a643de4eff307cfc656bd6396d66a3c32ea320610926a29935bfaba95bb00414954686172ca8bf4800d87593ee99c2e6bf238286c0c65ac033 SHA512 1974f49312947eac5046adb746023534e3bb188a315c3491766c8f44e86307740f6cf5493d544d36e774a94a6a9ac6bd9f57ea5264b3bbfea658f7ef186268cf
+EBUILD icu-layoutex-71.1.ebuild 3584 BLAKE2B 5c0839454445d395eb96da8229f4e282fd015e9aec76ca140e2139e4ddf8f14d9bf417def9ad634cb2ec1dbf1879f90651289903581a32f9f4021df9084c2178 SHA512 c8f9493eb5d1fe906134782327d0d563b7e817a2de429826b2b8cdca49cfed22bf0622886105c3000ac7f649c3b0d58d0433f37c1f0af587bf6c40b34e1b8f87
 MISC metadata.xml 262 BLAKE2B 5f01484e6cd16c1234d97ca24813fe4b74cafdc61d6e3c1ae58ead74558909ef052e406aba4abd7440f8dc45ff6548aaf4a863f0eb46c23e1e389ba52e0c1353 SHA512 3d2f08eb53da96ec680d73c3fad400ac4c2081db37d104647fc53008abef2dd78fab180d6295f850469e0c5da2375b083577a9713ae7701c046eaa24c0115ca2
diff --git a/dev-libs/icu-layoutex/icu-layoutex-71.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-71.1.ebuild
index 86a04ea7795f..6efb47e59545 100644
--- a/dev-libs/icu-layoutex/icu-layoutex-71.1.ebuild
+++ b/dev-libs/icu-layoutex/icu-layoutex-71.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN/-layoutex}/source"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE="debug static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index 2b54817fb96b..636cdafa65b0 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -8,6 +8,5 @@ DIST icu4c-70_1-src.tgz 25449582 BLAKE2B e229376ee45322db99aa963465048ab5e694ce9
 DIST icu4c-71_1-src.tgz 25701340 BLAKE2B 182972d87fe5b69b5e08c39ab9bb0ac7ffc7b36530168b3548faa051cce2b73b9f1c1d23198a4b1c655442155e369da76929e4f54fe4e32265160363428d4916 SHA512 1fd2a20aef48369d1f06e2bb74584877b8ad0eb529320b976264ec2db87420bae242715795f372dbc513ea80047bc49077a064e78205cd5e8b33d746fd2a2912
 DIST icu4c-71_1-src.tgz.asc 659 BLAKE2B ac281e0a9b94bf6bfddee2dd5dc7553836aa50ae84f55478a662d0cd1e116a944de92dd5fd701164d62fb5b8e8effcdb3456a151a6b198d603e2324ccd76e334 SHA512 3371e14f3959defa7fb8d3eb0308084646ed553169b7a845bff89f9a8c1054ef5bee45c26c1834a84cab38fa87710f1585e6c5787be1fe2df356eb5c2ba20aae
 EBUILD icu-70.1-r1.ebuild 3694 BLAKE2B 3e47d60528a8330807d3238de5c4e55c5179d77b676ead14bbe421289424758199967665ce2236a98636ee252e6245c8184e5535e1aed922043860c3b785c2f2 SHA512 9abfec28beb93afa6a7faf3eb55ab7e4c2492c1e433e12b8d7bf8b65fbb89478fc18f5dd732245d932009f070aec70321800bbe0649570e6dbbc1fd970352cc6
-EBUILD icu-71.1-r1.ebuild 4186 BLAKE2B 210a1dd9718653bb9050dde3f7caed32bd7b62ed59c0d4c5ea33061037996c1dec7d5829f81f50a1c25380f9c2f4db5ac8880bbf95658525bf96b84c1201afd0 SHA512 2e0e07ea2e4fd06e1818b3d5bb8b2fd2ed309dceb5ce45061549c88c0b43c80d2ab0917eabfde02fb4237c23c286f9af689f95acc8c2596ff894d310352d172e
-EBUILD icu-71.1.ebuild 4134 BLAKE2B 74e1ee5dc80f2dfada04089f5a2b942ed2e3bd8574aa77089bb0f195471026d15adeee7c8e2a5395fb18d1f2474feed7635ddd650d061e0a109c2b9e6d410c2f SHA512 ca7efcca1d9edd6f495afc378a788254c238976a1e656b5bf4376c916abf0b71f8e5e9bedee63dcbf72cb377c53196a7e133c2e67973456b4313cad6b0771ca3
+EBUILD icu-71.1-r1.ebuild 4182 BLAKE2B 22ee632df09b3bd30594269f0766396ed4793ff342bab376dc131a70776f7c7763186d39bb094a84d7e2f0ffd3f01196a551b8a728a13d97becdc7b763e2c020 SHA512 3f3c51841e8888e89b3df829c6acd2724f279a4faf6febefbf0668ca6e19eb3a4a0c04016ffa0807580addd38f9c420f217686056458f485bbec8ce15ff2f5f6
 MISC metadata.xml 256 BLAKE2B 28554175365761f81817e75e2c125714b94680527103d72118d0daf2eb0d2359082c36f2c8b0e92574e93c9c00038c944486a31d7843108dcc285d809bd52fe6 SHA512 1a0e13dd42f80f5c8669910c7360c6c1542e9a2f143da3a812f874966ba4729248152efb36e03bdfd47f09086797e6e1410e1ac735925d304811c847aa2b6398
diff --git a/dev-libs/icu/icu-71.1-r1.ebuild b/dev-libs/icu/icu-71.1-r1.ebuild
index df2e473b409b..73b1c68394fb 100644
--- a/dev-libs/icu/icu-71.1-r1.ebuild
+++ b/dev-libs/icu/icu-71.1-r1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}/source"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="debug doc examples static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/icu/icu-71.1.ebuild b/dev-libs/icu/icu-71.1.ebuild
deleted file mode 100644
index 9b9d7ebf841a..000000000000
--- a/dev-libs/icu/icu-71.1.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Please bump with dev-libs/icu-layoutex
-
-PYTHON_COMPAT=( python3_{8..10} )
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/icu.asc
-inherit autotools flag-o-matic multilib-minimal python-any-r1 toolchain-funcs verify-sig
-
-DESCRIPTION="International Components for Unicode"
-HOMEPAGE="https://icu.unicode.org/"
-SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${PV//./-}/icu4c-${PV//./_}-src.tgz"
-SRC_URI+=" verify-sig? ( https://github.com/unicode-org/icu/releases/download/release-${PV//./-}/icu4c-${PV//./_}-src.tgz.asc )"
-S="${WORKDIR}/${PN}/source"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="debug doc examples static-libs test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="${PYTHON_DEPS}
-	sys-devel/autoconf-archive
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )
-	verify-sig? ( sec-keys/openpgp-keys-icu )
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/icu-config
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-65.1-remove-bashisms.patch"
-	"${FILESDIR}/${PN}-64.2-darwin.patch"
-	"${FILESDIR}/${PN}-68.1-nonunicode.patch"
-)
-
-src_prepare() {
-	default
-
-	# Disable renaming as it assumes stable ABI and that consumers
-	# won't use unofficial APIs. We need this despite the configure argument.
-	sed -i \
-		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
-		common/unicode/uconfig.h || die
-
-	# Fix linking of icudata
-	sed -i \
-		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
-		config/mh-linux || die
-
-	# Append doxygen configuration to configure
-	sed -i \
-		-e 's:icudefs.mk:icudefs.mk Doxyfile:' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# ICU tries to append -std=c++11 without this, so as of 71.1,
-	# despite GCC 9+ using c++14 (or gnu++14) and GCC 11+ using gnu++17,
-	# we still need this.
-	append-cxxflags -std=c++14
-
-	if tc-is-cross-compiler; then
-		mkdir "${WORKDIR}"/host || die
-		pushd "${WORKDIR}"/host >/dev/null || die
-
-		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
-		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
-		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
-		"${S}"/configure --disable-renaming --disable-debug \
-			--disable-samples --enable-static || die
-		emake
-
-		popd >/dev/null || die
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-renaming
-		--disable-samples
-		--disable-layoutex
-		$(use_enable debug)
-		$(use_enable static-libs static)
-		$(use_enable test tests)
-		$(multilib_native_use_enable examples samples)
-	)
-
-	tc-is-cross-compiler && myeconfargs+=(
-		--with-cross-build="${WORKDIR}"/host
-	)
-
-	# Work around cross-endian testing failures with LTO #757681
-	if tc-is-cross-compiler && is-flagq '-flto*' ; then
-		myeconfargs+=( --disable-strict )
-	fi
-
-	# ICU tries to use clang by default
-	tc-export CC CXX
-
-	# Make sure we configure with the same shell as we run icu-config
-	# with, or ECHO_N, ECHO_T and ECHO_C will be wrongly defined
-	export CONFIG_SHELL="${EPREFIX}/bin/sh"
-	# Probably have no /bin/sh in prefix-chain
-	[[ -x ${CONFIG_SHELL} ]] || CONFIG_SHELL="${BASH}"
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use doc; then
-		doxygen -u Doxyfile || die
-		doxygen Doxyfile || die
-	fi
-}
-
-multilib_src_test() {
-	# INTLTEST_OPTS: intltest options
-	#   -e: Exhaustive testing
-	#   -l: Reporting of memory leaks
-	#   -v: Increased verbosity
-	# IOTEST_OPTS: iotest options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	# CINTLTST_OPTS: cintltst options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	emake -j1 VERBOSE="1" check
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi && use doc; then
-		docinto html
-		dodoc -r doc/html/*
-	fi
-}
-
-multilib_src_install_all() {
-	local HTML_DOCS=( ../readme.html )
-	einstalldocs
-}
diff --git a/dev-libs/libdbusmenu/Manifest b/dev-libs/libdbusmenu/Manifest
index 310bb396d9d1..2af414fd58d0 100644
--- a/dev-libs/libdbusmenu/Manifest
+++ b/dev-libs/libdbusmenu/Manifest
@@ -2,4 +2,5 @@ AUX libdbusmenu-16.04.0-configure-fix.patch 1268 BLAKE2B 9b7c045b46b9b8ad6af069d
 AUX libdbusmenu-16.04.0-werror.patch 1131 BLAKE2B 0f08e797095a8f9358abe1784b64f8f4126f6ba6c271991a4cf95781485e6ddda30cc98db8c50c7f3cae61f398cec6d236fbccc7063073f041337832fa132536 SHA512 ba1144695110cd8ecf89deaea28e0aacc40b00a500a1dc86c28e67754599117e0a2217c4d6066c1061fa009af82e463dd303ba78c479053857ef6e793959068e
 DIST libdbusmenu-16.04.0.tar.gz 760376 BLAKE2B 6996ce09bc2b81a8f415a46490ecb3189a064a64f1716919bb1495dccefa220ab058af06f4b3391c954ec76ec38e62db9c092b620cb69cacffb064e590ec1297 SHA512 ee9654ac4ed94bdebc94a6db83b126784273a417a645b2881b2ba676a5f67d7fc95dd2bb37bfb0890aa47299ed73cb21ed7de8b75f3fed6b69bfd39065062241
 EBUILD libdbusmenu-16.04.0-r1.ebuild 3881 BLAKE2B a98ac44ba760b367bfb0473ece2d77419d6ba659700e412a8b6a6d335e7cb9d3e680a496621c2ac2ff0df2cb4d90345484a17b3f81feba56a549db6e3a1cc9a3 SHA512 23ff195bf5c1eb0e37f7dc7de5adf6e242b287c843d192544fca5234978c093bfea4a5159dd0dfe1db34d9c0aa91f86375e18baea1b9254a2d1678c677dd4e39
+EBUILD libdbusmenu-16.04.0-r2.ebuild 3860 BLAKE2B 7a0fffc637e98a01e9cb9af1402ebbc417a25cab400379f772aeeed96a6b97fdb8d249c1ba05c3e10ba21d160c3b982a9cc82fdbb731d64fe2d0ea3ab9ada256 SHA512 089545eb708a2c50539fbf4127847465d3deedd11bcca28554d4c8fa18e45bd6f08ed929f72a92534616fedaae98134186e3f62065a3182700fda12844d5ae9e
 MISC metadata.xml 362 BLAKE2B 30fac8611210ba6263d5a91f9975741f1c799d5b841d278ccdf440e67f7dc3040f9937a79bbf6028b1ff6d1f2389eea6746e0772048b7c9b71978cc75fbac20f SHA512 80dff178352278089470bd2465f750e336056cba3321719b18dce1188c5dfde302c6bc0efcaa84fcc049840616a9949fd1a39e143ca2c61e7a8eaeb317b74c4d
diff --git a/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r2.ebuild b/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r2.ebuild
new file mode 100644
index 000000000000..4754b3f644b0
--- /dev/null
+++ b/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r2.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VALA_MIN_API_VERSION=0.16
+VALA_USE_DEPEND=vapigen
+VIRTUALX_REQUIRED=manual
+
+inherit autotools flag-o-matic multilib-minimal vala virtualx xdg-utils
+
+DESCRIPTION="Library to pass menu structure across DBus"
+HOMEPAGE="https://launchpad.net/libdbusmenu"
+SRC_URI="https://launchpad.net/${PN/lib}/${PV%.*}/${PV}/+download/${P}.tar.gz"
+
+LICENSE="LGPL-2.1 LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="debug gtk gtk3 +introspection test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.35.4[${MULTILIB_USEDEP}]
+	dev-libs/libxml2[${MULTILIB_USEDEP}]
+	gtk? ( x11-libs/gtk+:2[introspection?,${MULTILIB_USEDEP}] )
+	gtk3? ( >=x11-libs/gtk+-3.2:3[introspection?,${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1 )"
+# tests also have optional dep on valgrind which we do not enforce
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	introspection? ( $(vala_depend) )
+	test? (
+		>=dev-libs/json-glib-0.13.4[${MULTILIB_USEDEP}]
+		>=dev-util/dbus-test-runner-15.04.0_p100
+		gtk? ( ${VIRTUALX_DEPEND} )
+		gtk3? ( ${VIRTUALX_DEPEND} )
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${P}-configure-fix.patch"
+	"${FILESDIR}/${P}-werror.patch"
+)
+
+src_prepare() {
+	default
+
+	xdg_environment_reset
+
+	if use introspection; then
+		vala_setup
+		export VALA_API_GEN="${VAPIGEN}"
+	fi
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# bug #414323
+	append-flags -Wno-error
+
+	local myconf=(
+		--cache-file="${BUILD_DIR}"/config.cache
+		--disable-gtk
+		--disable-static
+		# dumper extra tool is only for GTK+-2.x
+		--disable-dumper
+		$(multilib_native_use_enable introspection)
+		$(multilib_native_use_enable introspection vala)
+		$(use_enable debug massivedebugging)
+		$(use_enable test tests)
+	)
+
+	local ECONF_SOURCE="${S}"
+	econf "${myconf[@]}"
+
+	GTK_VARIANTS=( $(usex gtk 2 '') $(usex gtk3 3 '') )
+	local MULTIBUILD_VARIANTS=( "${GTK_VARIANTS[@]}" )
+	local top_builddir=${BUILD_DIR}
+
+	gtk_configure() {
+		local gtkconf=(
+			"${myconf[@]}"
+			--enable-gtk
+			--with-gtk="${MULTIBUILD_VARIANT}"
+		)
+
+		mkdir -p "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+		econf "${gtkconf[@]}"
+
+		rm -r libdbusmenu-glib || die
+		ln -s "${top_builddir}"/libdbusmenu-glib libdbusmenu-glib || die
+	}
+
+	[[ ${GTK_VARIANTS[@]} ]] && multibuild_foreach_variant gtk_configure
+}
+
+gtk_emake() {
+	emake -C "${BUILD_DIR}"/libdbusmenu-gtk "${@}"
+	multilib_is_native_abi && \
+		emake -C "${BUILD_DIR}"/docs/libdbusmenu-gtk "${@}"
+}
+
+multilib_src_compile() {
+	emake
+
+	local MULTIBUILD_VARIANTS=( "${GTK_VARIANTS[@]}" )
+	[[ ${GTK_VARIANTS[@]} ]] && multibuild_foreach_variant \
+		gtk_emake
+}
+
+multilib_src_test() {
+	emake check
+
+	gtk_test() {
+		# please keep the list of GTK+ tests up-to-date
+		emake -C "${BUILD_DIR}"/tests check \
+			TESTS="test-gtk-objects-test test-gtk-label
+				test-gtk-shortcut test-gtk-reorder test-gtk-remove"
+	}
+	local MULTIBUILD_VARIANTS=( "${GTK_VARIANTS[@]}" )
+	[[ ${GTK_VARIANTS[@]} ]] && virtx multibuild_foreach_variant \
+		gtk_test
+}
+
+multilib_src_install() {
+	emake -j1 DESTDIR="${D}" install
+
+	local MULTIBUILD_VARIANTS=( "${GTK_VARIANTS[@]}" )
+	[[ ${GTK_VARIANTS[@]} ]] && multibuild_foreach_variant \
+		gtk_emake -j1 install DESTDIR="${D}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+	# Kill old symlinks that Portage will preserve and break install
+	if [[ -L ${EROOT}/usr/share/gtk-doc/html/libdbusmenu-glib ]]; then
+		rm -v "${EROOT}/usr/share/gtk-doc/html/libdbusmenu-glib" || die
+	fi
+
+	if [[ -L ${EROOT}/usr/share/gtk-doc/html/libdbusmenu-gtk ]]; then
+		rm -v "${EROOT}/usr/share/gtk-doc/html/libdbusmenu-gtk" || die
+	fi
+}
diff --git a/dev-libs/libffi-compat/Manifest b/dev-libs/libffi-compat/Manifest
index 0baf5f53e0c6..3d997180ba67 100644
--- a/dev-libs/libffi-compat/Manifest
+++ b/dev-libs/libffi-compat/Manifest
@@ -16,5 +16,5 @@ AUX libffi-3.3_rc0-ppc-macos-go.patch 2100 BLAKE2B 7ae1309b08be9293acee042d141bb
 DIST libffi-3.2.1.tar.gz 940837 BLAKE2B d202ccaa185acfd2476ed2a9b011891507cd8efbbda60f67c583268d1563853442ed829acecbf81c9b6b9a930345780bb7a4bd80e71e50ef544c7f4eab8cb01f SHA512 980ca30a8d76f963fca722432b1fe5af77d7a4e4d2eac5144fbc5374d4c596609a293440573f4294207e1bdd9fda80ad1e1cafb2ffb543df5a275bc3bd546483
 DIST libffi-3.3.tar.gz 1305466 BLAKE2B cddc40729a30a9bd34d675809f51f8d1b4ccaffa54bc6dd6f7e965f4e260edd34754719f9f6247c8957aeb7cf154d56ce1fe16a54c3f1ad39afbebdf41d23caa SHA512 61513801a156f11420f541d325de697131846487122d6bdcf5491b18b4da788589f5c0bb07e88e396495d3be5830d74e9135595e2b8ddbfe95c448d8597fbd6f
 EBUILD libffi-compat-3.2.1-r3.ebuild 1534 BLAKE2B e148290c7b6c8b0c783dd758863c471c73bad73bcdbe58cd3ff0e0637094877697de7d2e8929f647db9525234d5723fd861b68ad2f9dd1998fdb1b75c6ff64e6 SHA512 31cb87e70e761b05a9b8e464dbb524ab8d86ac29923decb073d150c10556a0fe37120741d79bcb352815c93cf4fd998f55dc1d94ee8e47319662ae4d534d1fb5
-EBUILD libffi-compat-3.3-r2.ebuild 2232 BLAKE2B 5748abb00034cbc59966f5dab9832548f3bf933923d6f6cf4b13e55fe4ededdcb2dccd884faed6bd7866ae82265307baf436b8be19086e28e809967811487e53 SHA512 1d727d6c8da072be94b0e71d98dda124814c5fedcf914923f6c84ba41cfadb7635b28b0327ee7e4a50a38ee25f237adbaf88a335ce5bbc65dec979946940ea4f
+EBUILD libffi-compat-3.3-r2.ebuild 2230 BLAKE2B fdc59c9545b02a147198e05fa8064e29b4c39c8c747bdd29853ec0e022a83bbf93a1268086231f525077e94e0617f236916866db989aa00cb9f7f8cb114fd991 SHA512 b79ede0f6af5bc2d784a5c10921c54bbd8e91cdcfc0596499d576fb527288e2f4c8ee5345c280f0826925899642a26fb5e47081fb3c41d5944eff9fd8c986502
 MISC metadata.xml 1957 BLAKE2B 567c2909e3799d2f3266bc6817f4e3a1024bb4985593cf7e81439d8a8b9499fa996e4a44f12e6e755c3d5538879dc890abb0bcda6279c73eb996f52f05851c71 SHA512 1ea70c162253294aad59ab9cb75e3ffce0aebe566163d702b0f7f49d6d4ee9a06c6e4f36fc9e1b3fbcad0aca4dcd0ff2dac4b3cfb587a68936f97f24ab2e2b55
diff --git a/dev-libs/libffi-compat/libffi-compat-3.3-r2.ebuild b/dev-libs/libffi-compat/libffi-compat-3.3-r2.ebuild
index 2db083d7054e..3ae81a7d2e4f 100644
--- a/dev-libs/libffi-compat/libffi-compat-3.3-r2.ebuild
+++ b/dev-libs/libffi-compat/libffi-compat-3.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libffi/libffi/releases/download/v${PV}/libffi-${PV}.
 
 LICENSE="MIT"
 SLOT="7" # SONAME=libffi.so.7
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug pax-kernel test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index 7cfc0c24b398..0cc73b3ef1b3 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -10,5 +10,5 @@ DIST libffi-3.3.tar.gz 1305466 BLAKE2B cddc40729a30a9bd34d675809f51f8d1b4ccaffa5
 DIST libffi-3.4.2-loongarch64-20220428.patch.xz 64932 BLAKE2B d144dc28a7fce008bc5cd43d9e04125ea8e972324d77951d42039d46e818014079c871f87a0cdbec758b55320c02dff718cf2449f9c630cc899e8e1610784a60 SHA512 33715b21fe027692cc584d6524c03510af7876cc35f318221e1b2b91644cf165c02979c8b426228a8cc6c471e6a59d0435e761b6b7aef589c41a4f28caa36e62
 DIST libffi-3.4.2.tar.gz 1351355 BLAKE2B a8137bc895b819f949fd7705e405be627219c6d1fdef280253330f7407d4a548bb057d7bb0e9225d1767d42f9bf5f0ab3c455db1c3470d7cc876bb7b7d55d308 SHA512 31bad35251bf5c0adb998c88ff065085ca6105cf22071b9bd4b5d5d69db4fadf16cadeec9baca944c4bb97b619b035bb8279de8794b922531fddeb0779eb7fb1
 EBUILD libffi-3.3-r2.ebuild 2257 BLAKE2B 5a212c60da8441e8fa7ae839bde431f4f74025cfb975836f3369138931ece80d140c109d79d5fba45bd5d684ae96abd273004e211c4782cfcd56d83714b76e93 SHA512 8d4be46533328714d161a6d52ef0316c2286f50d6cce723fa8c1ae9b2bb29336fbb666992c9662da4eaf0dd9d983be79f3177b3d398edceb1223a358340320be
-EBUILD libffi-3.4.2-r1.ebuild 2536 BLAKE2B 2de1e9338aa5bc3ede5406a4572ce4f691f6bb893dbfc12825afcbcae422da9cd5063e3a2f4c5d0c8a01849767056ac05e7b05e6fece7bbb64b72927a9504b62 SHA512 41ceb3dbaf0d54831016042bf5e0eafd1e28086e79a0b7442b153e3987c2f163a77f38a6e602c1188849eead1b2dd69ca228d50d7e2a1150788bb75f0c16d83b
+EBUILD libffi-3.4.2-r1.ebuild 2528 BLAKE2B e94c8e41d88a5c24914d36fbcdc84b5ad9bf5454d1a440e2a6e8fb1a9e2f6da5ae4acc8fa4387422a949a200aab092cabd0fc324acd7fc58e1a95b6c9aa27795 SHA512 27b02c6d584a01b63b7ef542dee022fbdb550e4748c2c57f2d0b19c563793fe780a4fd73a00a7a3d25089699ea1d4a1489e5eaf5773ddb00994a48bd699658f4
 MISC metadata.xml 2134 BLAKE2B 55a67beb917d8f4b342712b0de198d11b6a579ed7b3fa29a523869162d9103c0a9c4034db69835f1583963ffabf33573632266ae4c4206c957f5fe8897dae3da SHA512 e8d0867e4aa99a0227c5e62f2ee28e4235ea100789328168b061fd318af5b705cff097bbd9e98540457dc8f3da09e12b0c94f5fda6fd2240e592bd20595eaa45
diff --git a/dev-libs/libffi/libffi-3.4.2-r1.ebuild b/dev-libs/libffi/libffi-3.4.2-r1.ebuild
index 9c4a5672ce13..c5d52adb0a81 100644
--- a/dev-libs/libffi/libffi-3.4.2-r1.ebuild
+++ b/dev-libs/libffi/libffi-3.4.2-r1.ebuild
@@ -20,7 +20,7 @@ LICENSE="MIT"
 # with FEATURES="-preserved-libs" or another package manager if SONAME
 # changes.
 SLOT="0/8" # SONAME=libffi.so.8
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug exec-static-trampoline experimental-loong pax-kernel static-libs test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 2fc6df2a507c..e8064f7f5742 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -1,3 +1,4 @@
+AUX libgcrypt-1.10.1-fix-no-asm-hppa.patch 1166 BLAKE2B 17b27fd88b0e9ccf97c3f46780f16495d6df84e3d58ed9073af6f200908422273a6cbaa18a7285b87db2203c12a9f45f6d2853caf05d667be94a95979b5a0c47 SHA512 02e0c174844fd56da7212518f41b582894e72714e9cbc013448a5eea748cedc7d6ee5719af4049ee6695b83b5f44eb63e6c95972096ba0fc180c2cfe2482ad6e
 AUX libgcrypt-1.6.1-uscore.patch 843 BLAKE2B a1023bf915e342dd52d07d4c497d3e514c8c4b6c621e4f8704c4841fd95d48773f0af850a456c6f80b80deed878be1334f08f8181f97dce64ed9e61f5cb1bae5 SHA512 971814ac34f17464a96fbc110fe995923d873981949a0126e50c206d39499d6146fd00414e837774e6932e4b491cc68c4147278d6216dda630fb876bc8f61791
 AUX libgcrypt-1.9.4-arm-neon-compile-fix.patch 1389 BLAKE2B 548fc764050f322786f3c0ec8f806a6a897987115db0cfd8a2a4f1ffc134a31e9069dca4e334a7a5288f5176ce8e2e8450dc2003c56915d5fdd4dc3c11012c0a SHA512 0b83ab2585502d65d1ccf36440f4a73aa9a9d3a8cb40375ca6a4e81fcc962040fb233df9a345c823281605c061b8ea0e509e0e16a5c3a32581a279e5904bbfd0
 AUX libgcrypt-multilib-syspath.patch 588 BLAKE2B 6a8d30246263339571455df3c1cccfc9f38e50117cef34bc92ce37a296c3e31017c0190923ea992f51706c55a63c6f75b1d9fc7d8d40930707486f419e1795c4 SHA512 913c1a474aba50ec3589fb5a991f65204ba2cc28203b92353fdef8fb092350c3be814a57f29a26a2176627509a4f573f6db02ebdbcde3f04a2f1d632879293dc
@@ -9,6 +10,7 @@ DIST libgcrypt-1.8.9.tar.bz2 2988243 BLAKE2B d778bc3007dfcc08f3fab0325609911aa2c
 DIST libgcrypt-1.8.9.tar.bz2.sig 119 BLAKE2B 147fd4701eb5c91c43e1ca21f56b36f8d999c5b1a23bb2f454a05e1ef657a4a96c06b27f2d5c867c8adb9764b9d6d80480a69160b2cd2ad1704c1ff18a37fac5 SHA512 785cb3b3950e6b7102d81cee3690b99b11aa60102ab4333370e60874ad8bbdb2f89ce1b5e0ce9215adce1cdc2a3fe84bb7a92a80830594aa3f74e4129d16ad95
 DIST libgcrypt-1.9.4.tar.bz2 3239704 BLAKE2B b8244bc12a68955797b0c2b474ac5c95df1014231f7180a2ffa113e3aacedc98eed60ee1e4b30b032a5fcd6a04855ae07142c223906d5db9c28328a71e014f33 SHA512 d0e117ac73c94d70e9521ee1e6328691498cc8328f8c4e21338096908f5c04c7b838966eb63d59494565f4e19f506c07dab4f4d922150d75610d9f7b57abbf60
 DIST libgcrypt-1.9.4.tar.bz2.sig 119 BLAKE2B 4012c22259a9fd56f9da6c87d60077cea0dbfef85d4d4ad1ff6a2375ddefafc4cd03ee9083d18e080c14c95887b495062af886732a9593bcf1b8f187d21073fe SHA512 4aee16449b4b50dac62bd80217e769f32f43fb7cd994402b7d9cffbb1934b2771041c8c0c41a63ced9c8d9408025f9c5608ffc7f00e5e9a9b92a07cb5118a98a
+EBUILD libgcrypt-1.10.1-r1.ebuild 4973 BLAKE2B 9b4e61d861451d60dc27e330a4c8573033e602b96a2ecd871ad8998740c81a1642487f53a4f0442db95ac1f1147afc459cc0cab8fd0bb67ec873958161dafef7 SHA512 240b5b4fce16dcf8da47329616036ac9bc60a3297da01c2d2424b520852e8e3fb1025fbd19735a1b70b62f590df5b05d306dee9af8e50c00e161964b2230659c
 EBUILD libgcrypt-1.10.1.ebuild 4923 BLAKE2B 2472a743b9355dd76d927e955cd23cc2ad3abccc84323ec988b370e49691fd762dc8ddd4927073ae7ad75b6d9046bbf8aedf405bdac4cdcb6e1abc91330ec6a1 SHA512 2924021b10b4f6d49533d9d5a2704ad902a441e0021a3aa294545b8d6058f9d54ba1e58d7fdbbebfeac0f75c1d688c8a8c32e2a367d4ffbed90e7eb994a77a83
 EBUILD libgcrypt-1.8.8.ebuild 2372 BLAKE2B 21f92c71781df1c5a9aee35607d715862a7e783b3cbd0bc1d485d301561b93575eec52de5719340fd12ab70deaae597986d018ed54843b6b0ad2dcc3c688e862 SHA512 e3b54b5d8e03fd05635f743d88810df26e30b7a49f0e2b97357c9d6e817069d1dd67fea06c5ff9868fc82c4b08aa6f15c6cc0c162b4cfd6e07fe612471751b38
 EBUILD libgcrypt-1.8.9.ebuild 2988 BLAKE2B fcaf467155ca9920783968abca12c3fd38f08feac71bd2761ad20c7ccedc6bbd2ac4d135b50aa15725513fe575f23f44aa442d2cac984dfbf9c902a3c4bb836e SHA512 57b5be8ed25acf4c8e94619daaa420e44629e0e0d2edf7895ca071f587b90e9ca564845ba5d78443e317a99f1a9fd32de6e4baec3853db7f03a3d4f0f8374f3b
diff --git a/dev-libs/libgcrypt/files/libgcrypt-1.10.1-fix-no-asm-hppa.patch b/dev-libs/libgcrypt/files/libgcrypt-1.10.1-fix-no-asm-hppa.patch
new file mode 100644
index 000000000000..e665749db3a5
--- /dev/null
+++ b/dev-libs/libgcrypt/files/libgcrypt-1.10.1-fix-no-asm-hppa.patch
@@ -0,0 +1,35 @@
+https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commitdiff;h=c0692324fe8b3806eefc5017767917dca9cd94d0
+https://dev.gnupg.org/T5976
+https://bugs.gentoo.org/832871
+
+From c0692324fe8b3806eefc5017767917dca9cd94d0 Mon Sep 17 00:00:00 2001
+From: NIIBE Yutaka <gniibe@fsij.org>
+Date: Tue, 17 May 2022 10:44:55 +0900
+Subject: [PATCH] mpi: Allow building with --disable-asm for HPPA.
+
+* mpi/longlong.h [__hppa] (udiv_qrnnd): Only define
+when assembler is enabled.
+
+--
+
+GnuPG-bug-id: 5976
+Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
+--- a/mpi/longlong.h
++++ b/mpi/longlong.h
+@@ -430,14 +430,14 @@ extern UDItype __udiv_qrnnd ();
+ #  define UMUL_TIME 40
+ #  define UDIV_TIME 80
+ # endif
+-# ifndef LONGLONG_STANDALONE
++# if !defined(LONGLONG_STANDALONE) && !defined(ASM_DISABLED)
+ #  define udiv_qrnnd(q, r, n1, n0, d) \
+   do { USItype __r;							\
+     (q) = __udiv_qrnnd (&__r, (n1), (n0), (d)); 			\
+     (r) = __r;								\
+   } while (0)
+ extern USItype __udiv_qrnnd ();
+-# endif /* !LONGLONG_STANDALONE */
++# endif /* !LONGLONG_STANDALONE && !ASM_DISABLED */
+ # define count_leading_zeros(count, x) \
+   do {								       \
+     USItype __tmp;						       \
diff --git a/dev-libs/libgcrypt/libgcrypt-1.10.1-r1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.10.1-r1.ebuild
new file mode 100644
index 000000000000..b7a3aa4aaf26
--- /dev/null
+++ b/dev-libs/libgcrypt/libgcrypt-1.10.1-r1.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs verify-sig
+
+DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
+HOMEPAGE="https://www.gnupg.org/"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
+
+LICENSE="LGPL-2.1 MIT"
+SLOT="0/20" # subslot = soname major version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+asm cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3 cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_padlock cpu_flags_x86_sha cpu_flags_x86_sse4_1 doc static-libs"
+
+# Build system only has --disable-arm-crypto-support right now
+# If changing this, update src_configure logic too.
+# ARM CPUs seem to, right now, support all-or-nothing for crypto extensions,
+# but this looks like it might change in future. This is just a safety check
+# in case people somehow do have a CPU which only supports some. They must
+# for now disable them all if that's the case.
+REQUIRED_USE="
+	cpu_flags_arm_aes? ( cpu_flags_arm_sha1 cpu_flags_arm_sha2 )
+	cpu_flags_arm_sha1? ( cpu_flags_arm_aes cpu_flags_arm_sha2 )
+	cpu_flags_arm_sha2? ( cpu_flags_arm_aes cpu_flags_arm_sha1 )
+	cpu_flags_ppc_vsx3? ( cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 )
+	cpu_flags_ppc_vsx2? ( cpu_flags_ppc_altivec )
+"
+
+RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( virtual/texi2dvi )
+	verify-sig? ( sec-keys/openpgp-keys-gnupg )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-multilib-syspath.patch
+	"${FILESDIR}"/${PN}-powerpc-darwin.patch
+	"${FILESDIR}"/${PN}-1.10.1-fix-no-asm-hppa.patch
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/libgcrypt-config
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	if [[ ${CHOST} == *86*-solaris* ]] ; then
+		# ASM code uses GNU ELF syntax, divide in particular, we need to
+		# allow this via ASFLAGS, since we don't have a flag-o-matic
+		# function for that, we'll have to abuse cflags for this
+		append-cflags -Wa,--divide
+	fi
+
+	if [[ ${CHOST} == powerpc* ]] ; then
+		# ./configure does a lot of automagic, prevent that
+		# generic ppc32+ppc64 altivec
+		use cpu_flags_ppc_altivec || local -x gcry_cv_cc_ppc_altivec=no
+		use cpu_flags_ppc_altivec || local -x gcry_cv_cc_ppc_altivec_cflags=no
+		# power8 vector extension, aka arch 2.07 ISA, also checked below via ppc-crypto-support
+		use cpu_flags_ppc_vsx2 || local -x gcry_cv_gcc_inline_asm_ppc_altivec=no
+		# power9 vector extension, aka arch 3.00 ISA
+		use cpu_flags_ppc_vsx3 || local -x gcry_cv_gcc_inline_asm_ppc_arch_3_00=no
+	fi
+
+	# Workaround for GCC < 11.3 bug
+	# https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commitdiff;h=0b399721ce9709ae25f9d2050360c5ab2115ae29
+	# https://dev.gnupg.org/T5581
+	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102124
+	if use arm64 && tc-is-gcc && (($(gcc-major-version) == 11)) && (($(gcc-minor-version) <= 2)) && (($(gcc-micro-version) == 0)) ; then
+		append-flags -fno-tree-loop-vectorize
+	fi
+
+	local myeconfargs=(
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+
+		--enable-noexecstack
+		$(use_enable cpu_flags_arm_neon neon-support)
+		# See REQUIRED_USE comment above
+		$(use_enable cpu_flags_arm_aes arm-crypto-support)
+		$(use_enable cpu_flags_ppc_vsx2 ppc-crypto-support)
+		$(use_enable cpu_flags_x86_aes aesni-support)
+		$(use_enable cpu_flags_x86_avx avx-support)
+		$(use_enable cpu_flags_x86_avx2 avx2-support)
+		$(use_enable cpu_flags_x86_padlock padlock-support)
+		$(use_enable cpu_flags_x86_sha shaext-support)
+		$(use_enable cpu_flags_x86_sse4_1 sse41-support)
+		# required for sys-power/suspend[crypt], bug 751568
+		$(use_enable static-libs static)
+
+		# disabled due to various applications requiring privileges
+		# after libgcrypt drops them (bug #468616)
+		--without-capabilities
+
+		# http://trac.videolan.org/vlc/ticket/620
+		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
+		# causes bus-errors on sparc64-solaris
+		$([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
+
+		$(use asm || echo "--disable-asm")
+
+		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" \
+		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+}
+
+multilib_src_compile() {
+	default
+	multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C doc gcrypt.pdf
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf
+}
+
+multilib_src_install_all() {
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index a66eb434c31d..8784eb5919cc 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -6,5 +6,5 @@ DIST libgpg-error-1.44.tar.bz2 1014475 BLAKE2B dc101769510bc9edff38048216a961df8
 DIST libgpg-error-1.45.tar.bz2 1015954 BLAKE2B 277892df6691ff2807335954fa786c1d452d58e6f15aa2f73bffd1ddc97b9276646afe8831c0b67107ac768e0590f046030da6d370eb2871e94154f50dabf67b SHA512 882f2dd617e89137d7a9d61b60488dac32321dd4fdb699e9687b6bd9380c056c027da502837f4482289c0fe00e7de01210e804428f05a0843ae2ca23fdcc6457
 EBUILD libgpg-error-1.42.ebuild 1898 BLAKE2B 05436135f19c5e2422f08274f1f3ad755b8683fcd9dfa56914ed8822b816e070cf910c92a6dc385e824ead0f5e85cc89e9fc4f4652e4119a2a5a5571b2cc7666 SHA512 fe0532eaa898e8a39c79651121593e907cc0fca3ddf5db54dcc2889309c2980055e52a54438452d320c38e3f45ff705327185962d4c6c7fb40cca7013c311cab
 EBUILD libgpg-error-1.44.ebuild 1866 BLAKE2B 0071a99bf76003193009345c97d685e4030495c529e5b5bc74b0e5cbf29c73c3bbe4290acaecf09d2a9818b2a7331b264c6e430cad84822ffa31ca441372ec41 SHA512 7c12fca0e1fd6ba8f446de4d1234c90ee7afa836a38bb81ba0712ba337ce9a3a5d84a37341d8a96ada56912a1044d0bc0176116dcfdaa2bb1c2cc06212b2d31c
-EBUILD libgpg-error-1.45.ebuild 1932 BLAKE2B 24b3838aeca28f25de146761c8e9dae337131c32f6f03c5193beb5f31da73938025ddace136c7ed72897a63b6a5dadd3fec12cd0247aa9a34839a3a59b8d3d2d SHA512 ad4e432606655a53769165e229f66963327ef40a7bb2990796fe1c631ef4f38ec12bfc90f84f51d71bf4c9fd42a88e878c79370536dd06f1ed13758585774aa2
+EBUILD libgpg-error-1.45.ebuild 1924 BLAKE2B a082e0038c6372f379492fbbd381fff2c1ede5eb56077b14eeba019fdde88cd3978c35d4f08bcf31e3f814c25cd95b1db91511f57d1c3be691d7b61a23803354 SHA512 a0f50c1e76f2ecf9c1550e2b95dd27d888ffa96bf3cf13abe5a0f4514ef973534ff75fe6e3449c7624ac23dff32dfd1d925ffe0e40c69dae02fef57d39df43ce
 MISC metadata.xml 414 BLAKE2B 3d1e1094b2527b3462c9791d278b82e0003201c1ac9a4fca2fceb1f1265384b6a0cb3617bf2e6416afd2a1044564e6cb2beeb7df926017bfdeb88fa61177faa8 SHA512 2254c2fb4aebd808a733fc5264c722b374e85ceabe540257ab7ecd4f46d6ce6a12bfbf4c4ec59af62c8a1601189d693bb33eb69eb28a7a6fdf8210458d173fb8
diff --git a/dev-libs/libgpg-error/libgpg-error-1.45.ebuild b/dev-libs/libgpg-error/libgpg-error-1.45.ebuild
index 70d0c2d8b3e4..9fa4a0eb08bd 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.45.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.45.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="common-lisp nls static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libixion/Manifest b/dev-libs/libixion/Manifest
index ba0cbff34133..cc61f3bf3a59 100644
--- a/dev-libs/libixion/Manifest
+++ b/dev-libs/libixion/Manifest
@@ -1,7 +1,4 @@
-AUX libixion-0.16.1-clang.patch 621 BLAKE2B 2ab9add51942858edfa7fb6ee65747a0723c1a7160f4b68a0fec3e6a4712d21c157ed22e06651984cd60f2c2f7028a48dd47686c7df1bcdfabe0a0e3690c5e58 SHA512 1ee44c798dc04cb4e5ae91f37d9cd432e8b84128245232a4bf30797d0a5d19a812d208c4e4b322f65d15a7aafca81effae9519f1599856c510a300cbe08d76a4
-DIST libixion-0.16.1.tar.xz 482500 BLAKE2B 26075c819a952f48c4e136fa28b4ef5075b455dea52d51940e4fc55344e19e404d70b44222631d0b0f85280d09bb8a05955bfcbe0a228b97d72d8f00f1639248 SHA512 979c631e9536f6d2c3ae32f7892756ac8889d27c551d80eb9d519bf912bd323da4b6ecd363fe2719e74e04bc3661e5d56e03a582f68f5293ffcac59b74f4c7de
 DIST libixion-0.17.0.tar.xz 499836 BLAKE2B c8c31b07ad14dd49be259686af3e39e6f5d4aeeb8680030ea7bd2697c8baa72123f2659b3087f224f956612dc444c97e6a6d331fd3deff780981bab4d5b6ad25 SHA512 0acdb2eae5250236a94b1a3344ca990058ea8db7b1e741545bcb7160f9e28d21a3c2ec336621fd590df10188a4d5feadfbb3a63f57e9bfd2cc1bffc04009ffad
-EBUILD libixion-0.16.1.ebuild 1252 BLAKE2B 75b64af1f6eea1a0d4dd256cfa579137555e9c0476e485ea70b3ec5dd4c65a39a78080bdce38ac49575219e03c7e37595e0647cd7efff43fa664d7a35d7c7de5 SHA512 c13486e9162c1b0e81ad859f65fee8cba74128ac8a5cbddabea96ae7787f248468fc7d10b797e600c2ea8e10b1a4e6dbdbd4de472c84005801e41f06137b4030
-EBUILD libixion-0.17.0.ebuild 1209 BLAKE2B f0c48c4dc3b2d3607eb4be1a8d560d9534039833460533ea8cf35b995b3c82801486c4816a38c0bfde670e5adc57d30dbb02d1705885dfd65cf2c8583cf4ce39 SHA512 1248791b073c2a39e412e07d10bf4892b72af5d9e6489b7eddce8667a228d5ad38945f842a30b5f2b886f60617b2752e8caea4a3501137407dd46d032983ae23
+EBUILD libixion-0.17.0.ebuild 1207 BLAKE2B b88a9b28d276d6f2be1d5f97e2cedadf9013722096fc58d31a6e6c59c181877df4f76703bfee6d26dbf6c32f48421f4ce2fb7e47f88334535e4dd900a728dcc9 SHA512 c4c054e05d93058cc3c810e3e055fc4f487efa38057e33620001b98d19893dfe060eef451f7daf047d5bb7bd4aad059a81e4dd6e974347fdb654390a06269242
 EBUILD libixion-9999.ebuild 1211 BLAKE2B 4c7340dc18b7640b81d83c1ac6c3e0f9063c50c84d6d0f000b6889ec44833a165eaf5a1bf5c28b758cbcf51b03254826f20a74990a8ec9385ad00ae069efecbc SHA512 344450f3e309eec3b422792a21478a9714379828abe6a7c8890ed690d5b32147d6ce8227db867570b8cc98dcc2799a538b9089b7484bf663968643d20cc720c5
 MISC metadata.xml 398 BLAKE2B 0c2320063cc47c8a993ed456ac3a68466ce443b910d43739552d0f365dd178ed59ff76b2e23bab38b1962b9ce8cc973c03125096074a8bc33b09c8789ef236a5 SHA512 6599412f7feebc12c72eba06522563ff16d700e953d6ebc54f88544e49ad5e48e265b939a4fcfd788776abfb03110a8a27800dee71f031ae27eb207a8f924451
diff --git a/dev-libs/libixion/files/libixion-0.16.1-clang.patch b/dev-libs/libixion/files/libixion-0.16.1-clang.patch
deleted file mode 100644
index 802d43e71592..000000000000
--- a/dev-libs/libixion/files/libixion-0.16.1-clang.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://gitlab.com/ixion/ixion/-/commit/1992b8ab9c7765b8da06b6054bb3c0ab990c62f7
-https://bugs.gentoo.org/793917
-
-From: Jory Pratt <anarchy@gentoo.org>
-Date: Wed, 2 Jun 2021 10:19:01 -0500
-Subject: [PATCH] Fix nullptr_t for clang/musl users
-
---- a/src/libixion/model_context.cpp
-+++ b/src/libixion/model_context.cpp
-@@ -17,7 +17,7 @@
- 
- namespace ixion {
- 
--model_context::input_cell::input_cell(nullptr_t) : type(celltype_t::empty) {}
-+model_context::input_cell::input_cell(std::nullptr_t) : type(celltype_t::empty) {}
- model_context::input_cell::input_cell(bool b) : type(celltype_t::boolean)
- {
-     value.boolean = b;
diff --git a/dev-libs/libixion/libixion-0.16.1.ebuild b/dev-libs/libixion/libixion-0.16.1.ebuild
deleted file mode 100644
index 0f397c8828ef..000000000000
--- a/dev-libs/libixion/libixion-0.16.1.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
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit python-single-r1
-
-DESCRIPTION="General purpose formula parser & interpreter"
-HOMEPAGE="https://gitlab.com/ixion/ixion"
-
-if [[ ${PV} == *9999 ]]; then
-	MDDS_SLOT="1/9999"
-	EGIT_REPO_URI="https://gitlab.com/ixion/ixion.git"
-	inherit git-r3 autotools
-else
-	MDDS_SLOT="1/1.5"
-	SRC_URI="https://kohei.us/files/ixion/src/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
-fi
-
-LICENSE="MIT"
-SLOT="0/0.16" # based on SONAME of libixion.so
-IUSE="debug python +threads"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-util/mdds:${MDDS_SLOT}
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-clang.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	[[ ${PV} == *9999 ]] && eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-static
-		$(use_enable debug)
-		$(use_enable debug debug-utils)
-		$(use_enable debug log-debug)
-		$(use_enable python)
-		$(use_enable threads)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/dev-libs/libixion/libixion-0.17.0.ebuild b/dev-libs/libixion/libixion-0.17.0.ebuild
index 8ec57903007d..b9d1533f4c4a 100644
--- a/dev-libs/libixion/libixion-0.17.0.ebuild
+++ b/dev-libs/libixion/libixion-0.17.0.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	MDDS_SLOT="1/2.0"
 	SRC_URI="https://kohei.us/files/ixion/src/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/libksba/Manifest b/dev-libs/libksba/Manifest
index f4f8277608e6..d666e3182481 100644
--- a/dev-libs/libksba/Manifest
+++ b/dev-libs/libksba/Manifest
@@ -3,5 +3,5 @@ DIST libksba-1.5.1.tar.bz2 659280 BLAKE2B f247a2c9545e3c3ae3bbcf50344ca530ef320d
 DIST libksba-1.6.0.tar.bz2 662120 BLAKE2B 59bee23f764ab3e0f79fae6074ffe568845b6089ff29b8c5112973490ff5e1436834d5d0b50954ba9fbd6be655f47043a6345181c5c7e552322ceb331d030780 SHA512 a7c76d41dfd8ec6383ac2de3c53848cd9f066b538f6f3cd43175e3c8095df51b96d0a24a573481c0c4856b09b7c224e2b562d88f5c0801e7acfb582ea2739c2b
 EBUILD libksba-1.5.0.ebuild 1044 BLAKE2B 53a3c6515f07e397a33e68214c3569a29e1c146c38310ba8aefb009b89f5e0055cc721ba0f74c0ff339ef394369c367338cc5830da7d1e567bc95f2fd7f7b7f1 SHA512 b4eb5db5c7e043235df8c2ae1f7f480983e0f7833533460e49ae3fe9b25d165913a755b6068ddd4deb5593785cf0345dfb6a33a423d3ffff895a467193f6b35c
 EBUILD libksba-1.5.1.ebuild 1044 BLAKE2B 53a3c6515f07e397a33e68214c3569a29e1c146c38310ba8aefb009b89f5e0055cc721ba0f74c0ff339ef394369c367338cc5830da7d1e567bc95f2fd7f7b7f1 SHA512 b4eb5db5c7e043235df8c2ae1f7f480983e0f7833533460e49ae3fe9b25d165913a755b6068ddd4deb5593785cf0345dfb6a33a423d3ffff895a467193f6b35c
-EBUILD libksba-1.6.0.ebuild 1065 BLAKE2B a8e8a1eee7b90fc0fd12e5a657414a652564336e345c3570ae51ccf5a82bac52a74c00bb2c516eb3d88916ffdc3ae5ec3fcf087761feb02cae4320c038becfd3 SHA512 09efffc5f7a0be3e77f1597f3550367218895a38b3ab29346939e2b3d4e2e8f752269671abbcd2776bf8eee39b75598613a0c92db1bd7c44f163c945e56c99dc
+EBUILD libksba-1.6.0.ebuild 1057 BLAKE2B e3a7e0a602785a3277e7b1a121d5a25377c867f437d4ff43498bae0aad654a0f7b56ec64895ec6f02d4051beddfc72e17f6ea31e7f0e198325ddb3f86f494007 SHA512 20ca2f2811d4cf0aa53e71d45531dd91d588aebedc25056bb0dcff3c2be653cf1cace7aa39850f7b4b3390cee858a652959796da1ad3d1f0bdc2a72c73132376
 MISC metadata.xml 253 BLAKE2B 7e48c64087529094ef45b4d0dd6189f87d61cf691a04d5b35b97fe6503a83f2e31f1e69ef42819cc21ee057a51e45fa54311618df7f02a111658e6021c5a0288 SHA512 fa83b2f2ca7d6d9f56d9302d1fd2d3593ae553bc352085e8d51e7aa858bbe22088a00cf6e17b1971ac9683669aa22f37f06f1f81aa7b1aca690f371857879ee8
diff --git a/dev-libs/libksba/libksba-1.6.0.ebuild b/dev-libs/libksba/libksba-1.6.0.ebuild
index 4ac50963a7b4..59e487368563 100644
--- a/dev-libs/libksba/libksba-1.6.0.ebuild
+++ b/dev-libs/libksba/libksba-1.6.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnupg/libksba/${P}.tar.bz2"
 
 LICENSE="LGPL-3+ GPL-2+ GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.8"
diff --git a/dev-libs/libltdl/Manifest b/dev-libs/libltdl/Manifest
index 15ee1255dfd6..5ac18ab3e5a5 100644
--- a/dev-libs/libltdl/Manifest
+++ b/dev-libs/libltdl/Manifest
@@ -1,5 +1,5 @@
 DIST libtool-2.4.6.tar.xz 973080 BLAKE2B 0865af9f8701ca9dc62eec8294a088d24f4a3ff541bc76acfe7b69f70637d7e8261a17d69f7d54a4177f974c429be68467883a1560edb539061966cbf7d4a356 SHA512 a6eef35f3cbccf2c9e2667f44a476ebc80ab888725eb768e91a3a6c33b8c931afc46eb23efaee76c8696d3e4eed74ab1c71157bcb924f38ee912c8a90a6521a4
 DIST libtool-2.4.7.tar.xz 1016040 BLAKE2B 5e022586337637dd634bd40578ad944bec6e3b8de41f95d55777b90cc88cbc4badb3d76cbf0e638166ece1ea7de828e83590e1e6bac30c1e4b1c254a11a742f2 SHA512 47f4c6de40927254ff9ba452612c0702aea6f4edc7e797f0966c8c6bf0340d533598976cdba17f0bdc64545572e71cd319bbb587aa5f47cd2e7c1d96f873a3da
 EBUILD libltdl-2.4.6.ebuild 1089 BLAKE2B 0adab6d846d7b0582778434cab8efe131a930dd35ffca24e0ba208e2e1eb2f7f5daaaf8ef9cada8b39d0735e50ff0de2364273965812e7caa98d5e8f62540572 SHA512 834278fbd9e8c5579f90d5e652a0c588d1f2e7cb12a42b5308f8dfb97b5496bb4da611f10d370177416684154f4c016a718f7cdc3a4da88d10e29351d710dc99
-EBUILD libltdl-2.4.7.ebuild 1090 BLAKE2B a6b495c108b55e950d09f6a7c5871c5210e187862b01c0a9ffc54e7f1265acbc3d8c7d387a198fc7b365c3b7c269b5b21dd1da650f297fc53553bd56fa13311d SHA512 5b4c1a90f8fc9b8c8625330a87323e277074158e68571107046daea9fa489be72819bf07ed4e3f8cab354a1f4f6f4155c577543382c52346ad0934f59c622fbc
+EBUILD libltdl-2.4.7.ebuild 1083 BLAKE2B 64ac83aa3d345d3de828ebb257573938ea7240c93fac03f83571c651b9c3481de0869dd878160700be259fbeb463cde5a5f0161d907e435e4175e460cd28b8f2 SHA512 c549ad0f6b059d214f24d64de3c0ea1aa7e90acebda00068203381f75e2dfd75fa542e873f6eaab18cf06c816d07b464f55aa27fca3f543b45ee7a23f81886dc
 MISC metadata.xml 331 BLAKE2B 4a4cfaad20b2f1c22b0b5ab23b4557e1bef50dbc49d0b7d821d4099e06bf488fdc6c7cb4a29431910d0e1b8cfb7c8b565cd3296afb30925a08389e023c777150 SHA512 9ca8e937181de31beb06558475dc8c10e61765d5280a882576a2d1e4e87fb750bc1c2e99aafdfffe343343797e0565814c0a5f8c18c7fba5b7fe9275100f2609
diff --git a/dev-libs/libltdl/libltdl-2.4.7.ebuild b/dev-libs/libltdl/libltdl-2.4.7.ebuild
index c752f33fcf64..ed9e4930b113 100644
--- a/dev-libs/libltdl/libltdl-2.4.7.ebuild
+++ b/dev-libs/libltdl/libltdl-2.4.7.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${MY_P}/libltdl
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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="static-libs"
 # libltdl doesn't have a testsuite.
 
diff --git a/dev-libs/liborcus/Manifest b/dev-libs/liborcus/Manifest
index a95533881968..40f222e7d1f6 100644
--- a/dev-libs/liborcus/Manifest
+++ b/dev-libs/liborcus/Manifest
@@ -1,8 +1,5 @@
-AUX liborcus-0.15.4-gcc11.patch 1874 BLAKE2B b01e145fc9204e1504e34959c0c1c97101eed287e7291734e32e81a1e219a3bbcb6487ad7cc8c248019feccbebc94e03e3b3f7346c38074c9f284a159eb1d55e SHA512 61cd9afe40f6a3da6fc1177627fb17716286d48168d282fc90de3729f46bcd4cf22cb4fa9ed2962b59806d58d0569365f80b633e74225257ff9beb5eab01ad7a
 AUX liborcus-0.17.0-test-fix.patch 1691 BLAKE2B eff681313577d7964eb9c58bf9e2e68951ea6430303b81cefc26ef1e63337188f415b4a5f2b44cbe44111776c99ade992aa40ca6692e126608a9d15bd89fb44b SHA512 fb46233985a69fc9b5991efddf9e855217b4641eb558aa1b5df7bed4d1639e702500b03ce8526cdcee9cd22f139b4efabef18aa36367f840754aee49b3ec9f66
-DIST liborcus-0.16.1.tar.xz 1805436 BLAKE2B 7df89da5a175daa6fcf759d28f8a0eaebf3db6405af3b06a01b8dad41c7706acedc74876a0b68ff9cabd5780bb7cb311cd7c98390c9ecd265e62513eadde81eb SHA512 6d75591820af65181dd3a418f051a359695083f29c7d9c77edbcab3e89d9ea367824be0b19f27a31267525f446936145f5780a0ce3c6ee2d89823742837d4739
 DIST liborcus-0.17.2.tar.xz 1839188 BLAKE2B d274e3af71df16866e305403d63d3978613915753412ac9de19d7de7802930c3886d8653d6d48a8d9a971dc0ee284f8f83af8dc07850b5f28fcdab2815b6d9b2 SHA512 8ad8db46c23673260057aff555286d95ebfeff0a027bdeae24f11f8aa12456284f7f4446edddb91936b3011eb1227cfe1618ab3c4d909f8356c8c151f5739d79
-EBUILD liborcus-0.16.1.ebuild 1477 BLAKE2B af207820355c3f6839538034fd406335d1cf2ac1e426ceb4aac19baadd953e2ffc45ccff7c965779bd21b22aa7e0a5a235ce0505ac7a59dcdf5c55775a146f62 SHA512 cb189f615cf0c5f040f5cefbc832c4ca3322de32015907454d479e9c1e60048f8c1db912a74ef0e2b6e003ba6645936c73b5b4338181fd375328dbabba934117
-EBUILD liborcus-0.17.2.ebuild 1383 BLAKE2B 3f85ac7bc9802ff6e2cefb43fe062c5bdc549c3908bbed1c6f527bc4484d1adfa443f9a5c9c279867bd51391879e6ff0eae343d37e7294c384d63a73ba765596 SHA512 fb4864d9f7cc0d249209615795a9b183fc7e8e032d0a8f297de1856db4b92ff134484ef5d976c2df300bab166dee7febd0b685210d2d90bba35b2efba5fa3bf4
+EBUILD liborcus-0.17.2.ebuild 1381 BLAKE2B 4589e29dce3c750ae40bc23705c9e6f7496d706d24df531b117f7e8875add16118c500bd114f5ae9074a8a5ba61c55c30cb1dc7c8de035d6399babe9d3ba325e SHA512 b4daa61baf09769a86a36b61719eee01a2076fba1aa862816438830aec5947e053e74074e66e41ace23533dc04a1d670601e39588426029eb861b41a532de230
 EBUILD liborcus-9999.ebuild 1449 BLAKE2B c993233e271bb4cfc885bcae0bdf8422267e949ccf0bc3f411edaa2a0773c1c8e8980387710c87c3d1605a86a60e8011df471cf04574e74c14a59da9cf82f6ae SHA512 89e0d1acb0be5ab01e179f43f9dae77ce1f3a161f7e28adec10961ceda4201eefb5e1ea9c6bb303f31fdc2efecff381f2a081cb192ec43f938b1d169a01d3b02
 MISC metadata.xml 557 BLAKE2B b8dd01b0df50a1c6dafedc40f4cebbbd7851ee67fd1ac94f4c8107f052db8721ce12b0ae486e42f459e0b5d337525edc0359e9e94b8da1261e3521c11f66ef64 SHA512 2eca4f5fd25121bdb3ecb9470b66c2c5373ab266c53bf7af55b3f46245ad6973f3cd65ff80c6d1c33cb738136cddf22489b61dc1863701225842ca9dfa4e2c9d
diff --git a/dev-libs/liborcus/files/liborcus-0.15.4-gcc11.patch b/dev-libs/liborcus/files/liborcus-0.15.4-gcc11.patch
deleted file mode 100644
index f1dda1390539..000000000000
--- a/dev-libs/liborcus/files/liborcus-0.15.4-gcc11.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 50506d534230d90de2b0a2af3fb072428c942a4e Mon Sep 17 00:00:00 2001
-From: hedmo <hedmoo@yahoo.com>
-Date: Fri, 8 Jan 2021 07:30:16 +0000
-Subject: [PATCH] Update orcus_xlsx.cpp to build with gcc-11
-
----
- src/liborcus/orcus_xlsx.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/liborcus/orcus_xlsx.cpp b/src/liborcus/orcus_xlsx.cpp
-index 6df72a32..a59b2b9d 100644
---- a/src/liborcus/orcus_xlsx.cpp
-+++ b/src/liborcus/orcus_xlsx.cpp
-@@ -32,6 +32,7 @@
- 
- #include <cstdlib>
- #include <iostream>
-+#include <limits>
- #include <string>
- #include <cstring>
- #include <sstream>
--- 
-GitLab
-
-From 3bfa1a000e4639fe68781c584356ceea7c6b1a72 Mon Sep 17 00:00:00 2001
-From: hedmo <hedmoo@yahoo.com>
-Date: Fri, 8 Jan 2021 07:32:53 +0000
-Subject: [PATCH] Update xls_xml_context.cpp to build with gcc-11
-
----
- src/liborcus/xls_xml_context.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/liborcus/xls_xml_context.cpp b/src/liborcus/xls_xml_context.cpp
-index 538f5607..ca3dc4d0 100644
---- a/src/liborcus/xls_xml_context.cpp
-+++ b/src/liborcus/xls_xml_context.cpp
-@@ -16,6 +16,7 @@
- #include <mdds/sorted_string_map.hpp>
- 
- #include <iostream>
-+#include <limits>
- 
- using namespace std;
- namespace ss = orcus::spreadsheet;
--- 
-GitLab
-
-From 5e8fb255dc6bc9b7084a05b8dc24f31417542e5e Mon Sep 17 00:00:00 2001
-From: hedmo <hedmoo@yahoo.com>
-Date: Fri, 8 Jan 2021 07:34:17 +0000
-Subject: [PATCH] Update xlsx_revision_context.cpp to build with gcc-11
-
----
- src/liborcus/xlsx_revision_context.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/liborcus/xlsx_revision_context.cpp b/src/liborcus/xlsx_revision_context.cpp
-index edfd9eed..0b6ec0af 100644
---- a/src/liborcus/xlsx_revision_context.cpp
-+++ b/src/liborcus/xlsx_revision_context.cpp
-@@ -16,6 +16,7 @@
- #include "orcus/global.hpp"
- 
- #include <iostream>
-+#include <limits>
- 
- using namespace std;
- 
--- 
-GitLab
-
diff --git a/dev-libs/liborcus/liborcus-0.16.1.ebuild b/dev-libs/liborcus/liborcus-0.16.1.ebuild
deleted file mode 100644
index 18b38d862e5e..000000000000
--- a/dev-libs/liborcus/liborcus-0.16.1.ebuild
+++ /dev/null
@@ -1,69 +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 autotools python-single-r1
-
-DESCRIPTION="Standalone file import filter library for spreadsheet documents"
-HOMEPAGE="https://gitlab.com/orcus/orcus/blob/master/README.md"
-
-if [[ ${PV} == *9999* ]]; then
-	MDDS_SLOT="1/9999"
-	EGIT_REPO_URI="https://gitlab.com/orcus/orcus.git"
-	inherit git-r3
-else
-	MDDS_SLOT="1/1.5"
-	SRC_URI="https://kohei.us/files/orcus/src/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
-fi
-
-LICENSE="MIT"
-SLOT="0/0.16" # based on SONAME of liborcus.so
-IUSE="python +spreadsheet-model test tools"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/boost:=[zlib(+)]
-	sys-libs/zlib
-	python? ( ${PYTHON_DEPS} )
-	spreadsheet-model? ( dev-libs/libixion:${SLOT} )
-"
-DEPEND="${RDEPEND}
-	dev-util/mdds:${MDDS_SLOT}
-"
-
-PATCHES=( "${FILESDIR}/${PN}-0.15.4-gcc11.patch" ) # bug 764035
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# bug 713586
-	use test && eapply "${FILESDIR}/${PN}-0.17.0-test-fix.patch"
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-static
-		--disable-werror
-		$(use_enable python)
-		$(use_enable spreadsheet-model)
-		$(use_with tools)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -type f -delete || die
-	use python && python_optimize
-}
diff --git a/dev-libs/liborcus/liborcus-0.17.2.ebuild b/dev-libs/liborcus/liborcus-0.17.2.ebuild
index e6fc54399ab3..1bf855fc46a8 100644
--- a/dev-libs/liborcus/liborcus-0.17.2.ebuild
+++ b/dev-libs/liborcus/liborcus-0.17.2.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	MDDS_SLOT="1/2.0"
 	SRC_URI="https://kohei.us/files/orcus/src/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/libpwquality/Manifest b/dev-libs/libpwquality/Manifest
index 32bfeec5dccc..3b82cbaaf945 100644
--- a/dev-libs/libpwquality/Manifest
+++ b/dev-libs/libpwquality/Manifest
@@ -1,3 +1,3 @@
 DIST libpwquality-1.4.4.tar.bz2 426923 BLAKE2B 732e349a89b418d0b29d433551cd67e7b5f0daacb50ea73cfa7e45623801f6b559322645b4f4b0d741512964556d7e004d6a1c63b20e395c3c1b96923506e8bb SHA512 2d49b79105361663f009f7183fde9123e6f1e63bd678dfe5418143f611e763af8dd44374b826b3c22a00e721047c539741dc44d99a2289b9ab229791768d6e76
-EBUILD libpwquality-1.4.4-r1.ebuild 2090 BLAKE2B 07b0a1c7db71a0ffb07afc1a1131dbc6463eb5acccada0b3a153523bfc3a2c6ccd4e1ad7223f6d41c61cd2c3550be1ea0c1a39d5b51882b22a3c78bd44c7bc22 SHA512 5b755a77091ff5320c0186f84a9a02795d5b9d538e080abb1b19acfd27659ced78ae94f8107f0c3e9d267adc51e572da5f5e85ef2b14f515c7e8557ee84f58a0
+EBUILD libpwquality-1.4.4-r1.ebuild 2088 BLAKE2B 45114a8a0e6fad03eb18ed2e8f0a7229115ed715a2c5a986e734f2cf26bdacacc4c4b357c72bf1bafdc8c733390d5fdc194bd0892fbbd6b588cff35be546dadf SHA512 eb83fcec8077595910448d3be5580438e7842e395d0066d34f4a708fffb9c766c2fe5baccc00180d0ea885f9d41ad60ae749c526bb41d14a31b6a16d5782d676
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-libs/libpwquality/libpwquality-1.4.4-r1.ebuild b/dev-libs/libpwquality/libpwquality-1.4.4-r1.ebuild
index 8321fd7f1623..1da2d9795e4d 100644
--- a/dev-libs/libpwquality/libpwquality-1.4.4-r1.ebuild
+++ b/dev-libs/libpwquality/libpwquality-1.4.4-r1.ebuild
@@ -30,7 +30,7 @@ DEPEND="${RDEPEND}"
 src_prepare() {
 	default
 	# ensure pkgconfig files go in /usr
-	sed -e 's:\(pkgconfigdir *=\).*:\1 '${EPREFIX}/usr/$(get_libdir)'/pkgconfig:' \
+	sed -e "s:\(pkgconfigdir *=\).*:\1 ${EPREFIX}/usr/$(get_libdir)/pkgconfig:" \
 		-i src/Makefile.{am,in} || die "sed failed"
 
 	if use python ; then
diff --git a/dev-libs/libtomcrypt/Manifest b/dev-libs/libtomcrypt/Manifest
index 24b03bd77775..2626354270c7 100644
--- a/dev-libs/libtomcrypt/Manifest
+++ b/dev-libs/libtomcrypt/Manifest
@@ -1,5 +1,5 @@
 AUX libtomcrypt-1.18.2-slibtool.patch 4038 BLAKE2B 5fe1dadfc6afbc8f85f104299ff7b45706df3df5698f3375c83f4f573ea662a61158602e03b4c89da57969896181865f1f6b29ae6695ad71a3ab19adf4c559d8 SHA512 9486ae1abfe429d1dbe54185bb8b1fb1dc0550ae1089a000baf7afa4b6aa5011a4f1ad1b404b87a90fdae078125fcfd809298a46962a3cbba44d233231a834f7
 DIST libtomcrypt-1.18.2.tar.xz 2638064 BLAKE2B fad67e9e2a2002425488db9987a853bda631d6638c2cb1052a1d0d1f393945e38037cc75c54cd3a4bf87bb2e13b1e868e81da054a84bbdb393519ddef5e27300 SHA512 f6117a12a42b07f8de4a8aedbccf6ff4ee94b4b81cb7263af99627c32eae646ca8ead7d3063737918db4aa118673001fcf2cfa8e4ca8b528fb00045fda7cc893
 EBUILD libtomcrypt-1.18.2-r3.ebuild 3201 BLAKE2B b83c6bfb36a8bf22d704dc6f474283c49a29d59234df4c2c62ba16a8752cef6fc03199941600f6576e72f8e5c55846cbe048a05790acf35e2ff65c41000c38ee SHA512 63a526071754eab16b3609457018a389712e80d6e13ef0c5d8a1fbdeddc32f8110b7ca4ac6b966b60801112987669cd7f972f07d8a3274ef0e662229a5ed03dd
-EBUILD libtomcrypt-1.18.2-r4.ebuild 3201 BLAKE2B 3516e2d18eec91b20c2081fe6c2820e2cbcebd384f46914c445d38f16afaaf701ca5e07104c06b06b918af1c2e9f443da8005823c24ec422269506caf337e53c SHA512 7c64efd2753b1be8fe9cbac0419886dbdb44af1436dec4edbae4589b4ded445fe398d0a05ee1affa5209f95f5a72816d9e7179babfbb4620cc8d53268c4c2a5b
+EBUILD libtomcrypt-1.18.2-r4.ebuild 3200 BLAKE2B ca325b5a908fbcc046b59ef309c6ff679c0436ce804fd4f22feadc8267bc0106a92141bdf2f3386adad55e25fb3c6897c88bf80340db50fb81e788448a211c3d SHA512 687aabb5bd24ba6d6a273bc8fe02ee5aaa7ac1b479488cc56a35177ecd55d15356d49a8d98bba83ab018a6152e641517d81a3e9dd82a9a755ae22e823c01ef8c
 MISC metadata.xml 644 BLAKE2B 112aa0ed4b144bc52466f2e247814612bca0ddae22539aa4262826f5bba0c7daac8810939fff61cb3330bc6f921a606a81dae06db9200d22d722a3b6586c17e5 SHA512 2e2fcc358f5f2d0f3ae6566e1af4a5eb4dc40b8eede752bc408d0d77177c6d0540ef5c7b4ed6ca0ebd9822b3260fca3e367b59c1c52d8e7133cd0f92e2b1c957
diff --git a/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r4.ebuild b/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r4.ebuild
index 4088514554ff..b808570c6342 100644
--- a/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r4.ebuild
+++ b/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r4.ebuild
@@ -17,7 +17,7 @@ LICENSE="|| ( WTFPL-2 public-domain )"
 # Helpful site:
 # https://abi-laboratory.pro/index.php?view=timeline&l=libtomcrypt
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+gmp +libtommath tomsfastmath"
 
 # Enforce at least one math provider
diff --git a/dev-libs/libtraceevent/Manifest b/dev-libs/libtraceevent/Manifest
new file mode 100644
index 000000000000..af5a2b7901ba
--- /dev/null
+++ b/dev-libs/libtraceevent/Manifest
@@ -0,0 +1,3 @@
+DIST libtraceevent-1.5.2.tar.gz 135283 BLAKE2B e4202fc3c9b09d20bed375bc1833a4f49b63cf484e63ecf3cc5f1f3950a1de7607464e6c2ae194085e78978e5f480a7ae392a4cde739c3a244367eaf1000f70d SHA512 3804a84d2a4771335ba14a7383f977d641e6437f055837c2faece811b8ef931cfa9d38082bef48d96092aeae8cdcb543222a3042b2c11c41749dddbbb4813d94
+EBUILD libtraceevent-1.5.2.ebuild 1086 BLAKE2B b7625d8f70636e138c51a655c59dc8f4bd332884bcfa2acf47737768b953952ad233f0f5f0c73b03d1989b831b83f30cda57b59d7bf61ace2eb11e76ed0a944d SHA512 4177d49d2bd7764a2366b72dae656ba4bec30f97d99c4eafface485250b184826574d79abbc5b7a22aba1f48e3e4d53ea9a50eb3d0402f2363838795fc1ae286
+MISC metadata.xml 256 BLAKE2B e4fb7b4732dc88ff20c10bd7e5425beca8310c14d3934046ad6fcd99d8f401ea8610a6df5444d094f5bae4e5120cb7aedc15b45f0862b73f83bd7d5e54617337 SHA512 d37651285ce883fc1c73b41e09e66788d47b2451a4f96ac4237e6bef59643b3171a7a24900f204f0ca1accdbd5961d74e4bd7c8c41e1d29492874e4cbc737611
diff --git a/dev-libs/libtraceevent/libtraceevent-1.5.2.ebuild b/dev-libs/libtraceevent/libtraceevent-1.5.2.ebuild
new file mode 100644
index 000000000000..b2d09cecabb4
--- /dev/null
+++ b/dev-libs/libtraceevent/libtraceevent-1.5.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Linux kernel trace event library"
+HOMEPAGE="https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/"
+
+if [[ ${PV} =~ [9]{4,} ]]; then
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/"
+	inherit git-r3
+else
+	SRC_URI="https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/snapshot/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="doc"
+BDEPEND="
+	doc? ( app-text/xmlto app-text/asciidoc )
+"
+
+src_configure() {
+	EMAKE_FLAGS=(
+		"prefix=${EPREFIX}/usr"
+		"libdir=${EPREFIX}/usr/$(get_libdir)"
+		"CC=$(tc-getCC)"
+		"AR=$(tc-getAR)"
+		VERBOSE=1
+	)
+}
+
+src_compile() {
+	emake "${EMAKE_FLAGS[@]}"
+	use doc && emake doc
+}
+
+src_install() {
+	emake "${EMAKE_FLAGS[@]}" DESTDIR="${ED}" install
+	# can't prevent installation of the static lib with parameters
+	rm "${ED}/usr/$(get_libdir)/libtraceevent.a" || die
+	use doc && emake "${EMAKE_FLAGS[@]}" DESTDIR="${ED}" install-doc
+}
diff --git a/dev-libs/libtraceevent/metadata.xml b/dev-libs/libtraceevent/metadata.xml
new file mode 100644
index 000000000000..7c1651eba3e0
--- /dev/null
+++ b/dev-libs/libtraceevent/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chutzpah@gentoo.org</email>
+    <name>Patrick McLean</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-libs/libtracefs/Manifest b/dev-libs/libtracefs/Manifest
new file mode 100644
index 000000000000..fdcc83c87c6f
--- /dev/null
+++ b/dev-libs/libtracefs/Manifest
@@ -0,0 +1,3 @@
+DIST libtracefs-1.3.1.tar.gz 175453 BLAKE2B d9801c9f50513a8b2d2de57f768aec69c3e47b4c41ba1e887b28465d3a0a6bf10e5d2c60f81615615176bdb65e10ef7e2b7dee5cbb214705cc69e55bb923231c SHA512 1d8423ff1033a4ab601dd8e9fa4a801c27425234505070733641c8c9a4dd382cc6563d3fde89958f18e0bc95e2cbbdf65e69a2935fe208d5de9fd3ac26374ec1
+EBUILD libtracefs-1.3.1.ebuild 1163 BLAKE2B 83039d72b15e31e05acabdaa25040fc1c59921e40911771c6dfaf5c8ab4535f744f552926c703f861caf5eb423b9e23602f0367b6a36809c504b0bf0fc3da21e SHA512 177de36870ffa7413808927e27a1ebb5e6c23f84df0dd2a5e8482926577881b0055dea628b19f3ba3713b2abf90788ee47da12166a3655b24bae7e1ac6b0c79a
+MISC metadata.xml 256 BLAKE2B e4fb7b4732dc88ff20c10bd7e5425beca8310c14d3934046ad6fcd99d8f401ea8610a6df5444d094f5bae4e5120cb7aedc15b45f0862b73f83bd7d5e54617337 SHA512 d37651285ce883fc1c73b41e09e66788d47b2451a4f96ac4237e6bef59643b3171a7a24900f204f0ca1accdbd5961d74e4bd7c8c41e1d29492874e4cbc737611
diff --git a/dev-libs/libtracefs/libtracefs-1.3.1.ebuild b/dev-libs/libtracefs/libtracefs-1.3.1.ebuild
new file mode 100644
index 000000000000..72cb28be45e4
--- /dev/null
+++ b/dev-libs/libtracefs/libtracefs-1.3.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Linux kernel trace file system library"
+HOMEPAGE="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/"
+
+if [[ ${PV} =~ [9]{4,} ]]; then
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/"
+	inherit git-r3
+else
+	SRC_URI="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="doc"
+RDEPEND="
+	>=dev-libs/libtraceevent-1.3.0
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-text/xmlto app-text/asciidoc )
+"
+
+src_configure() {
+	EMAKE_FLAGS=(
+		"prefix=${EPREFIX}/usr"
+		"libdir=${EPREFIX}/usr/$(get_libdir)"
+		"CC=$(tc-getCC)"
+		"AR=$(tc-getAR)"
+		VERBOSE=1
+	)
+}
+
+src_compile() {
+	emake "${EMAKE_FLAGS[@]}"
+	use doc && emake doc
+}
+
+src_install() {
+	emake "${EMAKE_FLAGS[@]}" DESTDIR="${ED}" install
+	# can't prevent installation of the static lib with parameters
+	rm "${ED}/usr/$(get_libdir)/libtracefs.a" || die
+	use doc && emake "${EMAKE_FLAGS[@]}" DESTDIR="${ED}" install-doc
+}
diff --git a/dev-libs/libtracefs/metadata.xml b/dev-libs/libtracefs/metadata.xml
new file mode 100644
index 000000000000..7c1651eba3e0
--- /dev/null
+++ b/dev-libs/libtracefs/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chutzpah@gentoo.org</email>
+    <name>Patrick McLean</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest
index 7f96aebacc7d..c54b3b4f74a3 100644
--- a/dev-libs/libzip/Manifest
+++ b/dev-libs/libzip/Manifest
@@ -1,3 +1,5 @@
 DIST libzip-1.8.0.tar.xz 760604 BLAKE2B 7aadbd4df909806ff728f9315f91c2f4b4e884464ef36acd668b23739fa57e4f65987b368cae0d728dd6cc1468718e40086cf0dc21f437a5c2cad91b455c0bb1 SHA512 fe94a26a2797dff7c9b27334f29982f8e523dd5095bf32ebcadc6443726864f0ff7b2e8bf243e52cad8f79297bc7a87d73fdbc35edae4ffc8ab6aa0bcc93b03e
+DIST libzip-1.9.0.tar.xz 763704 BLAKE2B 204952e96ddcff0d799cd7f4ce4be868aad6f6555999673eba9bd85382ab26546f6423034fa68461009d095d4a2513b490b2b144aca0caa8c0be0980b35ba124 SHA512 dd0c7046f5b1faf00690774572982e870edaa1819563f9ebf7caf823c9c5718623576a7135a64c9acfed9cefac5601cf944b7aa0b623986f5c85743f3014b349
 EBUILD libzip-1.8.0-r1.ebuild 2444 BLAKE2B adc40f870375d1c3bd5753018108985f34b4e2eebd20b8205c6368086bc9dd0a289b7f3c6484969740712b9ef315d18abb0fbe628256b72ffb8c6f3c789abc1c SHA512 467c9a3a7f17c018384b10e679364ecaf9c41762f155d1da0c3438a2cdcd210426726ea7662a532f44c058bb0958a9b0371c1b6ac776b205949448f9ca3fe4c2
+EBUILD libzip-1.9.0.ebuild 2452 BLAKE2B 0e9a40f854339b7a206ebbea483835524f59b2a37d829f17195fba8e2238ee39035ec24fb4b1eb928f905f58ef45e873b8c36f76296e7aa7736fd5ad0379f281 SHA512 97123443fc12a1b521202b907b7cf877913b81dc3cbe49a960a975b966391e82ef0a149df58320af269692e3caa09033acc4a06c84a85d4ca4789f0794213848
 MISC metadata.xml 510 BLAKE2B cd0e88d175985805badcbe4b6aa771fd65ab9e8e86a3d37e18531e61ef9fac92ba191ba4a3806c37743a51541b1f353f5bf58b7195898de74eb2c389623a6994 SHA512 e073a6f074e9d5dc8abffada8338c608915527ab3c76f693cd261c6a99aef73e18c0e0088d508d62032619f779f1c6d9445cdd0273aeb61e41b9e3b449762337
diff --git a/dev-libs/libzip/libzip-1.9.0.ebuild b/dev-libs/libzip/libzip-1.9.0.ebuild
new file mode 100644
index 000000000000..0a706c57e930
--- /dev/null
+++ b/dev-libs/libzip/libzip-1.9.0.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake multibuild flag-o-matic
+
+DESCRIPTION="Library for manipulating zip archives"
+HOMEPAGE="https://nih.at/libzip/"
+SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="bzip2 gnutls lzma mbedtls ssl static-libs test tools zstd"
+REQUIRED_USE="test? ( tools )"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	sys-libs/zlib
+	bzip2? ( app-arch/bzip2:= )
+	lzma? ( app-arch/xz-utils )
+	ssl? (
+		gnutls? (
+			dev-libs/nettle:0=
+			>=net-libs/gnutls-3.6.5:=
+		)
+		!gnutls? (
+			mbedtls? ( net-libs/mbedtls:= )
+			!mbedtls? ( dev-libs/openssl:0= )
+		)
+	)
+	zstd? ( app-arch/zstd )
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	# Upstream doesn't support building dynamic & static
+	# simultaneously: https://github.com/nih-at/libzip/issues/76
+	MULTIBUILD_VARIANTS=( shared $(usev static-libs) )
+}
+
+src_configure() {
+	append-lfs-flags
+	myconfigure() {
+		local mycmakeargs=(
+			-DBUILD_EXAMPLES=OFF # nothing is installed
+			-DENABLE_COMMONCRYPTO=OFF # not in tree
+			-DENABLE_BZIP2=$(usex bzip2)
+			-DENABLE_LZMA=$(usex lzma)
+			-DENABLE_ZSTD=$(usex zstd)
+		)
+		if [[ ${MULTIBUILD_VARIANT} = static-libs ]]; then
+			mycmakeargs+=(
+				-DBUILD_DOC=OFF
+				-DBUILD_EXAMPLES=OFF
+				-DBUILD_SHARED_LIBS=OFF
+				-DBUILD_TOOLS=OFF
+			)
+		else
+			mycmakeargs+=(
+				-DBUILD_DOC=ON
+				-DBUILD_REGRESS=$(usex test)
+				-DBUILD_TOOLS=$(usex tools)
+			)
+		fi
+
+		if use ssl; then
+			if use gnutls; then
+				mycmakeargs+=(
+					-DENABLE_GNUTLS=$(usex gnutls)
+					-DENABLE_MBEDTLS=OFF
+					-DENABLE_OPENSSL=OFF
+				)
+			elif use mbedtls; then
+				mycmakeargs+=(
+					-DENABLE_GNUTLS=OFF
+					-DENABLE_MBEDTLS=$(usex mbedtls)
+					-DENABLE_OPENSSL=OFF
+				)
+			else
+				mycmakeargs+=(
+					-DENABLE_GNUTLS=OFF
+					-DENABLE_MBEDTLS=OFF
+					-DENABLE_OPENSSL=ON
+				)
+			fi
+		else
+			mycmakeargs+=(
+				-DENABLE_GNUTLS=OFF
+				-DENABLE_MBEDTLS=OFF
+				-DENABLE_OPENSSL=OFF
+			)
+		fi
+		cmake_src_configure
+	}
+
+	multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+	multibuild_foreach_variant cmake_src_compile
+}
+
+src_test() {
+	run_tests() {
+		[[ ${MULTIBUILD_VARIANT} = shared ]] && cmake_src_test
+	}
+
+	multibuild_foreach_variant run_tests
+}
+
+src_install() {
+	multibuild_foreach_variant cmake_src_install
+}
diff --git a/dev-libs/simdjson/Manifest b/dev-libs/simdjson/Manifest
index 9a1210dbd809..3a7da033f868 100644
--- a/dev-libs/simdjson/Manifest
+++ b/dev-libs/simdjson/Manifest
@@ -6,13 +6,13 @@ AUX simdjson-1.0.0-tests.patch 383 BLAKE2B dc3dcbc08ec78608a94e5d04ff217a774e1c4
 DIST simdjson-1.0.0.tar.gz 1546728 BLAKE2B 6b70416404776b4fcc30cd3ab07b8048899bbe3497af779504a685bc2459424e82bd40bf100d7ed8ccfa05e871a0a1edd9eebd11294cdc3d1780797d7f79ba1e SHA512 dbf8abfeec5c079f4d87e8bf31d1af27601f7f0578ebb8ad28a25f496b4b771b68a75f9a11f61706c539d54c36a493a2d2819bd15427c3b7f7a0b36811177f17
 DIST simdjson-1.0.2.tar.gz 1551616 BLAKE2B 534e312de977b82604595ccf889348545ed355fb9cfb6f618d42236122578f6102ce7bcd31204c3013dbeeff17c35effaff62531a7e17e5e83ac07150b1456ab SHA512 04a3bee2d847680aa1f55115007ceec01652bebb8d5187cfbca0af81bedff355cbac949862a82e3060071da1a58b62d5b028bcd91562b962756aa5cab614f073
 DIST simdjson-1.1.0.tar.gz 1555845 BLAKE2B 6dfd4e938b9f1f6a6314f39929b74a7e822fbb37510914eb3db0660b9bbf68ef0b2fb4c45aa2e1246f6530d3848d0055220d4c5ead3093f97956a6154b22a899 SHA512 f8718bd039e1a25f0b95880b957c43e6eba6eada6bb7f58cedde37669a46b15b3ff9f4c4ea775e1cf949657642ef0472fa8bac5bdc98882df63e7f292fb5a723
-DIST simdjson-2.0.3.tar.gz 1609988 BLAKE2B 048dd1c54a89f84ee388489b59f49217d9b4b7883541493e60ae8a17165ddbc2eaacda9f46be04c54aa475aaa5befbd359f9ea03da520393e44acfc446a29e90 SHA512 f07de33af3d1489d2597e531ef3edc416dd1491a72b5e863d906e3a3a37a0dc5a2656de31e59e6f0597237bc765f3c85626cd0b6a7ef704c2fd25866f2ad79be
+DIST simdjson-2.0.4.gh.tar.gz 1612055 BLAKE2B af60f4ae6780eb4068ac85c2d6784539b14fad6b7871c091f2ec3dc4f8cc9add8510f4d92a8db6ea305a1c2cc6919c8f8604d31d4e939677f3ed121b53891c24 SHA512 5d993939aece8555dc7fc5d63be14103af4ca164fb0cd53ac96578ed8a9fac61f974c247544ad007710c7a710bfaea7ad94098a143c713097237cd47c7792463
 DIST simdjson-data-1.0.0.tar.gz 6635706 BLAKE2B 563376147f18d590a176a5a0398365db1a3e677b773c018f335efa7fff05ac22ac5dc37613792082a32e6c9b91a773a590f7dfd15efa5ba660f9142b128b28a7 SHA512 168198404b11b8c76ff4f53645d7b5a88a5c72b4a5b6646b4410859ec3416ae9b37fc59f7d2f014ccc785615ea5c31dc00b145dbb1a7acb701b94029dd4ea1e1
 DIST simdjson-data-1.0.2.tar.gz 6635706 BLAKE2B 563376147f18d590a176a5a0398365db1a3e677b773c018f335efa7fff05ac22ac5dc37613792082a32e6c9b91a773a590f7dfd15efa5ba660f9142b128b28a7 SHA512 168198404b11b8c76ff4f53645d7b5a88a5c72b4a5b6646b4410859ec3416ae9b37fc59f7d2f014ccc785615ea5c31dc00b145dbb1a7acb701b94029dd4ea1e1
 DIST simdjson-data-1.1.0.tar.gz 6635706 BLAKE2B 563376147f18d590a176a5a0398365db1a3e677b773c018f335efa7fff05ac22ac5dc37613792082a32e6c9b91a773a590f7dfd15efa5ba660f9142b128b28a7 SHA512 168198404b11b8c76ff4f53645d7b5a88a5c72b4a5b6646b4410859ec3416ae9b37fc59f7d2f014ccc785615ea5c31dc00b145dbb1a7acb701b94029dd4ea1e1
-DIST simdjson-data-2.0.3.tar.gz 6635706 BLAKE2B 563376147f18d590a176a5a0398365db1a3e677b773c018f335efa7fff05ac22ac5dc37613792082a32e6c9b91a773a590f7dfd15efa5ba660f9142b128b28a7 SHA512 168198404b11b8c76ff4f53645d7b5a88a5c72b4a5b6646b4410859ec3416ae9b37fc59f7d2f014ccc785615ea5c31dc00b145dbb1a7acb701b94029dd4ea1e1
+DIST simdjson-data-2.0.4.gh.tar.gz 6635706 BLAKE2B 563376147f18d590a176a5a0398365db1a3e677b773c018f335efa7fff05ac22ac5dc37613792082a32e6c9b91a773a590f7dfd15efa5ba660f9142b128b28a7 SHA512 168198404b11b8c76ff4f53645d7b5a88a5c72b4a5b6646b4410859ec3416ae9b37fc59f7d2f014ccc785615ea5c31dc00b145dbb1a7acb701b94029dd4ea1e1
 EBUILD simdjson-1.0.0-r1.ebuild 1835 BLAKE2B 1ee4777881353dedeeb986d5d3cb309cff58353b71ebe97a2bcfbf209c53e29f8dccd1780307248f310370c8f4b2da9f47311bff3a0abf1fddfa72e4c204a8e3 SHA512 39815d3422d6fdab49d9684295c48ac84a1d1e1f68835edd89a766d809cdd857dbc5f65d5da3a41fb4a67e05add726f6bce91dc24fc2a596a8fdc7f66651b7dd
 EBUILD simdjson-1.0.2.ebuild 1836 BLAKE2B 942a16cd6611fba7763ff2bf1498eafa240c5a1cec900baf2d9f9e0c41bb41004ea491dcb2e5bff1c51265b7d4afea5bebe1b9944b91e3878cf111fc50598c4c SHA512 d0380c7e3d7d351136d95acf5e4b01577baf79fcb7a132af243bbbc99c1e5fc5c471e3322db3e7a30b31420fc7fe7a011aebbbe743725dd9fa5215518d9b45fe
 EBUILD simdjson-1.1.0.ebuild 1836 BLAKE2B 4138055e3875f3fbe8179bf6a28763f269f1e91bb72ded3ace4a7b158fe2e701e0ae7b6de4e615085d7348fa9951d3eb09cf16ec6a103279c29812d3ebbab536 SHA512 b02ed933a900e8a43a9e9bf31c50367dae27e40dce1da1f6532607a3154b53e197cb0d30897f0e40b08480afd7c4ae29531b463d5a1cb60b49f320858d4167db
-EBUILD simdjson-2.0.3.ebuild 1836 BLAKE2B 4138055e3875f3fbe8179bf6a28763f269f1e91bb72ded3ace4a7b158fe2e701e0ae7b6de4e615085d7348fa9951d3eb09cf16ec6a103279c29812d3ebbab536 SHA512 b02ed933a900e8a43a9e9bf31c50367dae27e40dce1da1f6532607a3154b53e197cb0d30897f0e40b08480afd7c4ae29531b463d5a1cb60b49f320858d4167db
+EBUILD simdjson-2.0.4.ebuild 1842 BLAKE2B f7ddb79888fc5224565e6e58203db7c22f444732d159ca55efd6a0af4617f23db7e8a7ea0eebf828ab2285dc4a6ce9b030238bcaa10c7c162313a3b0ccc21e7c SHA512 c42d70b050e1819f0e735bd06a7cf306fb3bd57328499a573f69775a362089c6eb214d5171f385384e6c66bbd6cc6df02c70c8b553d8aae322db127267a2a4c3
 MISC metadata.xml 336 BLAKE2B e734f879a36d4e77dade86545e210039d032a5b9a909b414c63855f62d9015122305496eb7faeb752a6bc96cc7c6287164da29ab9442faf13e3d261e0329b299 SHA512 fdc9e0f98c2d9f7e7e5997f2922d9ad7be2defa93ca3b30e29e7a458147a32fe9e02cda9fe9df4035bde0a077372d7f109337a08a4dea1b898a0444082c858c0
diff --git a/dev-libs/simdjson/simdjson-2.0.3.ebuild b/dev-libs/simdjson/simdjson-2.0.4.ebuild
similarity index 93%
rename from dev-libs/simdjson/simdjson-2.0.3.ebuild
rename to dev-libs/simdjson/simdjson-2.0.4.ebuild
index 01fbcc889778..c4d2349ceae7 100644
--- a/dev-libs/simdjson/simdjson-2.0.3.ebuild
+++ b/dev-libs/simdjson/simdjson-2.0.4.ebuild
@@ -12,8 +12,8 @@ HOMEPAGE="
 	https://github.com/simdjson/simdjson
 "
 SRC_URI="
-	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://github.com/${PN}/${PN}-data/archive/${DATA_HASH}.tar.gz -> ${PN}-data-${PV}.tar.gz )
+	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
+	test? ( https://github.com/${PN}/${PN}-data/archive/${DATA_HASH}.tar.gz -> ${PN}-data-${PV}.gh.tar.gz )
 "
 
 LICENSE="Apache-2.0 Boost-1.0 BSD MIT"
diff --git a/dev-libs/skalibs/Manifest b/dev-libs/skalibs/Manifest
index 7bd47a431986..146bcac45d51 100644
--- a/dev-libs/skalibs/Manifest
+++ b/dev-libs/skalibs/Manifest
@@ -1,6 +1,3 @@
-AUX skalibs-2.11.1.0-respect-user-provided-flags.patch 1207 BLAKE2B caaf3b25d9b588aa2edf974fb1c680da80aa7eb0a46764faa65e7faa3dcd0cd0483114094fdbb855f2300be73f32914127a8a1405ec79f5340b7995278bf0389 SHA512 6637398016c16be07429cbb58d150bb7ca75768b162b2ae0a05c77dfbd0f0346b60cfc53b1ef2df7b887caebda9350cba4b1d396b8d3f16357861a7468695bba
-DIST skalibs-2.11.1.0.tar.gz 218300 BLAKE2B 9ab30a43065745a8d2d846167dc9887b0353ec55ec7d4b26f663870fef8dee5eebbf73056346829c1187946f1a64de05eea5067e7b6ea4d5be522f586915ba27 SHA512 7db390b887234437d52f3b9388f7398e92877cde4c93de76532abff64ee1a127524181c53a0fdddd86bd84247d84f704527bd89c5581e27433081862e9970af7
 DIST skalibs-2.11.2.0.tar.gz 219085 BLAKE2B a8aeca79890465784cae5e958d73359544416b11ac3ca4fb412ba00e59db28ee041c745653efb9f1553944974579238b0d9e8e5b3696de9a07d4e2e11333d631 SHA512 174e92be03cfb8ee41d9dc78bfd183a435d01481ad9835b74b38e000012cf6fbadd30f97c27203dbc942102641349626f92000510636dc73f413a5aebd7f7942
-EBUILD skalibs-2.11.1.0.ebuild 982 BLAKE2B 5da34d1c1400f249c0e364eeaddea15a307e9a695fcd5ee5dcd63f3b842f755f6ae0f8b6b79cdeeeacb7d8483d3a79adbe498e013ee63b80aa4e85d1ab9fe74b SHA512 03c6c97b9fbf23260dc96f83b32c99a2ecc24ea19a00ae2171a0add5d575a6607178fd150b195fe0fc5ef40c05f6957bf0b98ef9d553454dd720a290d2dbf6ec
 EBUILD skalibs-2.11.2.0.ebuild 923 BLAKE2B 425d25ea8f525abbec4b6019c3ce2a234f7170a193d613f98752225876942a17bd2ee33a766286bd009ad99c8a5ef1e37d78c1463e1a2306f13b7224272edb42 SHA512 c57af30c867da127abc76165b0814704c5aa686e247f1d77a3a25c853834c2e249cf995a91c935fc8a6731c869edc80197e8a80b6267eff349814454576a8d31
 MISC metadata.xml 500 BLAKE2B a0a2130490a01139a57fa7cfe6fb63532250b5d26b3d94bce3cc5da02552f53b84c0f6e714604040026c95ef6031adcec3cfae5f002e2d4f830aab5c594c9d20 SHA512 401f71564f9d41c07bf1271789654f4a1ff6bb957ff03945dc62a501c1dd9f3f3a49c5f1a4177d6f79182283cd9ef62243a7083d0f0c3efd076935d304f0cdc9
diff --git a/dev-libs/skalibs/files/skalibs-2.11.1.0-respect-user-provided-flags.patch b/dev-libs/skalibs/files/skalibs-2.11.1.0-respect-user-provided-flags.patch
deleted file mode 100644
index 3092d86f3f6e..000000000000
--- a/dev-libs/skalibs/files/skalibs-2.11.1.0-respect-user-provided-flags.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Laurent Bercot <ska-skaware@skarnet.org>
-Date: Mon, 24 Jan 2022 11:44:29 +0000
-Subject: [PATCH]  Apply user-provided CPPFLAGS, CFLAGS and LDFLAGS during
- autodetection
-
-Upstream-commit: d9f541c2b3af (" Apply user-provided CPPFLAGS, CFLAGS and LDFLAGS during autodetection")
-See-also: http://skarnet.org/lists/skaware/1656.html
----
-diff --git a/configure b/configure
-index 1aa8fc7..430e57e 100755
---- a/configure
-+++ b/configure
-@@ -99,7 +99,7 @@ stripdir () {
- tryflag () {
-   echo "Checking whether compiler accepts $2 ..."
-   echo "typedef int x;" > "$tmpc"
--  if $CC_AUTO "$2" -c -o "$tmpo" "$tmpc" >/dev/null 2>&1 ; then
-+  if $CC_AUTO $CPPFLAGS_POST $CFLAGS_POST "$2" -c -o "$tmpo" "$tmpc" >/dev/null 2>&1 ; then
-     echo "  ... yes"
-     eval "$1=\"\${$1} \$2\""
-     eval "$1=\${$1# }"
-@@ -113,7 +113,7 @@ tryflag () {
- tryldflag () {
-   echo "Checking whether linker accepts $2 ..."
-   echo "typedef int x;" > "$tmpc"
--  if $CC_AUTO -nostdlib "$2" -o "$tmpe" "$tmpc" >/dev/null 2>&1 ; then
-+  if $CC_AUTO $CPPFLAGS_POST $CFLAGS_POST $LDFLAGS_POST -nostdlib "$2" -o "$tmpe" "$tmpc" >/dev/null 2>&1 ; then
-     echo "  ... yes"
-     eval "$1=\"\${$1} \$2\""
-     eval "$1=\${$1# }"
--- 
-2.34.1
-
diff --git a/dev-libs/skalibs/skalibs-2.11.1.0.ebuild b/dev-libs/skalibs/skalibs-2.11.1.0.ebuild
deleted file mode 100644
index c2ffd2478c25..000000000000
--- a/dev-libs/skalibs/skalibs-2.11.1.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
-
-inherit toolchain-funcs
-
-DESCRIPTION="General-purpose libraries from skarnet.org"
-HOMEPAGE="https://www.skarnet.org/software/skalibs/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm x86"
-IUSE="doc ipv6 static-libs"
-
-HTML_DOCS=( doc/. )
-
-PATCHES=( "${FILESDIR}/${P}-respect-user-provided-flags.patch" )
-
-src_prepare() {
-	default
-
-	# Avoid QA warning for LDFLAGS addition
-	sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
-
-	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
-	tc-export AR CC RANLIB
-
-	local myconf=(
-		--datadir=/etc
-		--dynlibdir=/usr/$(get_libdir)
-		--libdir=/usr/$(get_libdir)/${PN}
-		--sysdepdir=/usr/$(get_libdir)/${PN}
-		--enable-clock
-		--enable-shared
-		$(use_enable static-libs static)
-		$(use_enable ipv6)
-	)
-
-	econf "${myconf[@]}"
-}
diff --git a/dev-libs/tlsh/Manifest b/dev-libs/tlsh/Manifest
index 6829ffe6a1d3..2642ae21b79c 100644
--- a/dev-libs/tlsh/Manifest
+++ b/dev-libs/tlsh/Manifest
@@ -1,5 +1,5 @@
 AUX tlsh-4.8.2-gnuinstalldirs.patch 1244 BLAKE2B 1369902e03db4837e02c01d63262545725b241a02f02462fd4fb41e7204dee9bae668bf16daf0990b083ced13d4234348ba3df220eab6d69fd77a1e3979b71f3 SHA512 68cf688a8587a301299efb5779ab47473a508e0f0cf6dc90e3ada21bda3cae25142da7d83b67098adef0f03cfbbea40952acffffcaf75c18842efeacb5bcfda8
 AUX tlsh-4.8.2-respect-flags.patch 820 BLAKE2B 9159f50d554168497ad9f416e4e002fd757a88543529fe6e2a180f6250399956bb6d967b06bc458e71b9dcf7f01cbb5d98d762ee65d9fd61392fd59b81dd25c4 SHA512 4b90021f2a01992d68d52f11b20a2ce9c4900216c8a6cd7c6fb95cfad20b44fbe37ab118ceee2811e65da7380e12960b5ddbf883198573491c2cf40f25b0fed1
 DIST tlsh-4.8.2.tar.gz 3345458 BLAKE2B 27d5eece16bb36225b9ae8b3d3a9d055a0f214fffae08a58c39211c3d918dd842497315a62237b291ee1055dfadad78826bbd24f7b9d88f510e9a31f74654039 SHA512 5355c7734f5356a3a7a31ccc078254835871fc0369f1889a34131a0f810735201c68f674eb18e975b6a03a32e5c284899ca9ffdc1f583e42192188c172d2aad0
-EBUILD tlsh-4.8.2.ebuild 689 BLAKE2B 4b323e168b7821b317dc89c67114a98d92ea12a7e7e7f506baac27f16b74a2d333860cbc9ecc9f41de81a4a944e4761c14bbdfb606a92b63bf940a4927c6e8be SHA512 2b15c0ddc4414465f098af31ddf4911847bb60c3fb1e802f53245b63762ae2c38c071bf8c5ef263b54c370ca95486ae125ab8cc72da65405bd9a1a6843eca0c0
+EBUILD tlsh-4.8.2.ebuild 694 BLAKE2B 414ce9579dc2d43248930cc2a1d5d16dedc4897772ac95ef312a56d837707af0fcd925ac286f0de2ec719271150d99c779d153c0b68c19afde04906389b3a9f6 SHA512 93fd5250912ffdac7b19941cbe51fc844c8bc1eae9465796cb9f852e907a7b165aab07e99881892658f3fbc6fe12457f1e4e9a639756ba1481ba81e94ac24627
 MISC metadata.xml 471 BLAKE2B 2e17c59829f15d1439933fef59fd14a8525723aae1de1c640c8a83a9df612776ff33d24904a30ffcf27eddcd9c778af09d6d65c3b4e66542288810f416ca0ec4 SHA512 e8a8759d526e1d0b9607f84df503440a650f5835c864c0c5c89c5f978b58839620e2ed7e0bc39af51e38e1da1fe86fac1a398394069f4b3820219db40254a284
diff --git a/dev-libs/tlsh/tlsh-4.8.2.ebuild b/dev-libs/tlsh/tlsh-4.8.2.ebuild
index 5e7848823157..f6ae6017fb1b 100644
--- a/dev-libs/tlsh/tlsh-4.8.2.ebuild
+++ b/dev-libs/tlsh/tlsh-4.8.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/trendmicro/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gnuinstalldirs.patch
diff --git a/dev-libs/tre/Manifest b/dev-libs/tre/Manifest
index 9f1777e687cb..76662a2ecc08 100644
--- a/dev-libs/tre/Manifest
+++ b/dev-libs/tre/Manifest
@@ -10,6 +10,6 @@ AUX tre-tests.patch 235 BLAKE2B 11c601f9b352dee9e2d36e60c537a4c2969beefd04bdab21
 DIST tre-0.8.0.tar.bz2 380714 BLAKE2B b2af6e805e9e19fd69debf2f881ddfb591317f69db4e29a04e1899eb69100b8ac7744f86fa438530509ca2ee8aa1d346d416c6391f13247cd9398f4c59c2ed85 SHA512 db7465993e0d25eee8e52f974427b8a040234cf0f017769eb94ee88bc6261821336aad7f762bfa82db7e2212d8449bc221592586f061c528a59a550773cbc263
 DIST tre-0.8.0_p20210321.tar.gz 146294 BLAKE2B d740bd0e99f50f5e4d8105f5260e43a81b6af9857a21e386e437ab8d48a9e0de23eae03e96cf6b9f4d2d37f72d0fa73ef7343086271ea80f166bdba3f04475a9 SHA512 950c81f681970fc737cfdd6815445f05a018fc742b964cea3ce19f0249c677dd715ece4ff8e543fa9f3fd23b503eafa00aea00dbae063af9bc7e08dc1bc33aed
 EBUILD tre-0.8.0-r2.ebuild 1461 BLAKE2B bf3725fde8e7a6c740d958956ab2b8789abee70619576a41c863b8e7be744cdfd879b598a545f287613e241f21fb96b5e5397d3ae9dc4f287895b37e2a4acb47 SHA512 2a33c2871e81f7671d10aa6b2cb2de9397ea8d8e9ea9ec419c9450208124aa153e64cdb2c3b88e20aa128b2580b777c130ebcb5c88ee830416d8e745243dbda4
-EBUILD tre-0.8.0_p20210321-r1.ebuild 2391 BLAKE2B 07753354fa4c5b869a02ee60e97c721496c5515a9b256a66915f84d926af208f5a769e0a82e464b2232e6e1d8161687c01b707b9beafba20d3adc925ca6d0990 SHA512 fb1115a979942f6616e3cca02e6b1908eb6af9a4f1105803915e1de31652a25401c7decf26fe77442b831c0dc25ae3bd9aa204cf8af1f124481798a5ebdc1cdf
+EBUILD tre-0.8.0_p20210321-r1.ebuild 2385 BLAKE2B 19df5fa97f225c9aab709837cdb2165fc4250560f9794482ee1ee4ba692eedafafb446fc0598037389e4ff8593af236813248e916481bc17a38e4a5438693856 SHA512 48abe4c6dcbd3b82662ffa43f1fc346827b6b839964404bab83a994e2d3a0bf33438d9d9c813dc56884e75e33e34847be1172878700a3377a6f7044418e7dc28
 EBUILD tre-0.8.0_p20210321.ebuild 2420 BLAKE2B 51ac2ef53355f730e18a51dc7e2d61a835b8f14cf165dd452426b557d17f40190a6aceb0d06bead1e3f42ce303be47d199e3bd05cad437e9dad546f660ad4426 SHA512 fe2b7d1b57f1231bfa310e821e3ff0811c3b8a6adc2089f7f35a702565dd9600a0347972a28dfe158cb10f063bd468a9174d91fc1b898ae3a8c535e8500e016c
 MISC metadata.xml 638 BLAKE2B 4e02f7673a19acc091ee21459551e6d40f6a78d5a25cbbffe877d46f0a181067e2163d1ac79d0f7d38ff383b8775abf6f69309ad97b25fd2af55b0ac2223ab40 SHA512 9f725eebbee4753cb05b0adcda1edec2aa50265257db359ca0ec4596761072ec335fffb5a5035cf5ec43c13b8c8a7dd7ed916bbf82acd57c6d8ee5e4c89cb622
diff --git a/dev-libs/tre/tre-0.8.0_p20210321-r1.ebuild b/dev-libs/tre/tre-0.8.0_p20210321-r1.ebuild
index 58ab13bf0acc..e890119ae5f4 100644
--- a/dev-libs/tre/tre-0.8.0_p20210321-r1.ebuild
+++ b/dev-libs/tre/tre-0.8.0_p20210321-r1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+agrep +alloca +approx debug nls profile python"
 
 RDEPEND="
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index cd3432e8498e..6f95067e0ce5 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/Net-Subnet/Manifest b/dev-perl/Net-Subnet/Manifest
index b230101d1ac2..4d959f036b2b 100644
--- a/dev-perl/Net-Subnet/Manifest
+++ b/dev-perl/Net-Subnet/Manifest
@@ -1,4 +1,4 @@
 AUX 1.30.0-pod-spelling.patch 491 BLAKE2B b8ac6e5132ae00d69a18a2882473638481c27e8618cfcdfd6e6f6cd350f71b54e4e53fd677621b2f1ac6f65bb3c999bf6745080595fca559853359dc7d734c2f SHA512 0eb9cdd317f78fd2d49e5d90eed52538f00a24f9019c757acc2280bf5d21bc606999197806816acc665ed13a9456b8a53eeee81e41222f2b0b0959734a697dc7
 DIST Net-Subnet-1.03.tar.gz 4305 BLAKE2B 95f9a04920196c1161a26f7f4ad1fc4a88e564c4f359e1f000a2560399024ff3ad11c5eabd52e26c843bcb7f8c5ec1adabc127c362ba3e02e0cd524a883b32b1 SHA512 a28518e63736021c2c33959c13b54ec4dce0f43854f824c551b585db96ef001e62f6ce413cbc946aaa6cfa28cc4631973074c8980c1b0507f37390f4d8c70fd4
-EBUILD Net-Subnet-1.30.0-r2.ebuild 511 BLAKE2B a63c75a7a7196ec8e1b437fec6708d6ed1d58b34666d5b2d2010a2d3480cff41005591721813a3806eb780cf9b5a18aaf0efe24228b9f7b8cdc9c9b8c304f75a SHA512 914813edf1314c2786a7585ec28b36df0cb370e99c00ad25e8d386255770c2a2f53f08e43134a67b91c39041dd20061d0cb5a475b3d6ec900dd4709dced0b621
+EBUILD Net-Subnet-1.30.0-r2.ebuild 513 BLAKE2B e5843edf089b59a5332b5e480bb52c87546bf333fd8a9432c86345b13c4b2b6faefba4e3af3b3543106ffc4480eaee3a5e48090c48007f4ab30ef8910971a893 SHA512 fe72399092352cf674073883d68739b12785852e46ca5dd2582b44caf4b015d60128c0043b53b3352ad9fd7f621f3cc3f8904c801a3a910c4a78561bd37c1b4a
 MISC metadata.xml 393 BLAKE2B 7624369c3aa2bdd800bdde9412cb3b57e41704fde6c11dfa7d114df59fa66402cdb0c8017956323f2fa72828b6677e51e0c90d91e6c12fe9bf662513aa078b31 SHA512 db2c6ce6d3da32132d2f6c7476794ee1b70c33988966a28fc0acb0d63e5cdb8593573faf3f3135880d8e126b47a7cd5549303204258fbaf7efaf5afe9c8c6864
diff --git a/dev-perl/Net-Subnet/Net-Subnet-1.30.0-r2.ebuild b/dev-perl/Net-Subnet/Net-Subnet-1.30.0-r2.ebuild
index 767da50d4694..e056c4ecb3fc 100644
--- a/dev-perl/Net-Subnet/Net-Subnet-1.30.0-r2.ebuild
+++ b/dev-perl/Net-Subnet/Net-Subnet-1.30.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,4 +17,4 @@ RDEPEND="
 "
 BDEPEND="${RDEPEND}"
 
-PATCHES=( ${FILESDIR}/${PV}-pod-spelling.patch )
+PATCHES=( "${FILESDIR}"/${PV}-pod-spelling.patch )
diff --git a/dev-perl/Specio/Manifest b/dev-perl/Specio/Manifest
index 165fb4b12841..fc1f90369439 100644
--- a/dev-perl/Specio/Manifest
+++ b/dev-perl/Specio/Manifest
@@ -1,5 +1,7 @@
 DIST Specio-0.42.tar.gz 101641 BLAKE2B 9c527cd1b306d1a8394ad5b6757153aa00edcf111a444b3792cf088aec0a00597c655f59971eef7a8a6a7689e9b683ca78789b7adf1c9d19a0b6861cd4b90733 SHA512 7a9ff3e96cf3957d7857cd5f6af5efd9e35fc4c888fcd8177041e34a2388f54269e7a3da84ec60961fb61307beb882ebf54e19ae4346876e06197b1ff57891a0
 DIST Specio-0.47.tar.gz 108288 BLAKE2B 187ecd5ff0db27faeec03bd9cda6500d8e38d60d4c31aedc50d29fe3666fec68343c04294008941d92618622fc27b88623a8e18b29a63812ccddf79174bdc10f SHA512 68cdcf22818b27c38ce92b497adae81f27605aa385e9156d51d5e8e63da121d6bf26b7339a7ee3c9408cc6e3731702b008bc4b2e3c8eab67728f959f03682f44
+DIST Specio-0.48.tar.gz 108298 BLAKE2B 700f58109bf81eae07a9a66dbe5ab5ff1f257874258f8e08b632422bd07be7fc9ac7f1e7d20adf1e9f0bfa48fb44abea287c88591cb9c9ad38839a785f5a4b6e SHA512 76fd2aa398008238d55714700581782c95b635a4d4198b1c51daecfec770b61b9898351cbc2bf999f4d837691de657c51a94581c0f0b21b67b605770d507729a
 EBUILD Specio-0.420.0.ebuild 1013 BLAKE2B 35dd74a3f2c6d1dc04f434f761c30afccd842b2b1eafc9300461bb9b080e50125915f2291b1258c5c15a72d142d03a42839f37efc3e350d57993cde6f1444771 SHA512 bce97616294757c560a95d91d247c5aa4d2f1f4201dd484762be7929bc3b880aa53d493a238287883c8671e1f8f43b9499bf54dd552bfb43a2244360543607f1
 EBUILD Specio-0.470.0.ebuild 949 BLAKE2B f923058924d79ba3b45bae9ad60005503f6a38f9b102490fcce8c8f9e0a68e24f654d869a206975d7209421f88aebd8bf8c5836b547183ae4d7f50d1b1b430e8 SHA512 fb5dffe26cc845e6c974b1d23563dd880b36ee7a6b7d65b05c5886547aea7a8ebc0a07fff5c0efdc7fd849ac32ed8f8ed48ca15e12b78501711de0ed40ec3e95
+EBUILD Specio-0.480.0.ebuild 978 BLAKE2B 5760136ecc05282aef5dd3e89ab1609979972d31e5b528302a7ea8b2e9ab2ec5545d865fbadde16795332eb7425bbc0d75fdbefa69b11519ae2e5e9796b51d69 SHA512 f4828aafe37e85a6bd67d438deca153b582bdb94726ce0fd176dc2fddf1117fe2fa2756a3d1066756ff06c6a7c70f4115d361dfa951de846752259309a8af573
 MISC metadata.xml 3182 BLAKE2B 7a2dcca648d380fb70b0ec0c9a88904b7eab40f946bfe6628623a648d48c31da42eb03248c68b95a581657aa6f1cf581df906f2f85aa1114492562a8f47595d7 SHA512 a7c0321adc9ab021d9b3b9095923aca9d1714c1421969e04f7e911861fba3b1b6af95894ed9aa9fb2184eb8488483037355347a0a0926c80bb18e9de707a3c19
diff --git a/dev-perl/Specio/Specio-0.480.0.ebuild b/dev-perl/Specio/Specio-0.480.0.ebuild
new file mode 100644
index 000000000000..55befd2ecf3b
--- /dev/null
+++ b/dev-perl/Specio/Specio-0.480.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=DROLSKY
+DIST_VERSION=0.48
+inherit perl-module
+
+DESCRIPTION="Type constraints and coercions for Perl"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="minimal"
+
+RDEPEND="
+	!minimal? ( >=dev-perl/Ref-Util-0.112.0 )
+	virtual/perl-Carp
+	dev-perl/Devel-StackTrace
+	dev-perl/Eval-Closure
+	virtual/perl-Encode
+	virtual/perl-Exporter
+	virtual/perl-IO
+	dev-perl/MRO-Compat
+	dev-perl/Module-Runtime
+	>=dev-perl/Role-Tiny-1.3.3
+	>=virtual/perl-Scalar-List-Utils-1.330.0
+	virtual/perl-Storable
+	dev-perl/Sub-Quote
+	dev-perl/Test-Fatal
+	>=virtual/perl-Test-Simple-0.960.0
+	dev-perl/Try-Tiny
+	dev-perl/XString
+	virtual/perl-parent
+	>=virtual/perl-version-0.830.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-File-Spec
+		dev-perl/Test-Needs
+	)
+"
+
+mydoc="TODO.md"
diff --git a/dev-perl/Sys-Virt/Manifest b/dev-perl/Sys-Virt/Manifest
index 605bed7de097..8a2067d9233e 100644
--- a/dev-perl/Sys-Virt/Manifest
+++ b/dev-perl/Sys-Virt/Manifest
@@ -1,9 +1,12 @@
+AUX Sys-Virt-8.4.0-lib-Fix-parameter-detection-for-save-restore_domain.patch 1821 BLAKE2B d09ec5031b86ae32b7479353e274dc6c0281e71025994ea278b750603d8dd64f2898228462f999c2c2d942bb0252e888d73ea1c5aab51729cfa0996bed37e8bf SHA512 dd3af8d893c9bc820edcc770bef2116d5b40f69f2686241bcd89475c17e71f9154f1933e22b9327f7b7024ed4bf0fd67b1e86cba5f502936888c36a35a9f92c0
 DIST Sys-Virt-v7.0.0.tar.gz 165365 BLAKE2B 9cb7aa66ce00c95957171fedad4fefbae5319e17706e2839f8b3e057ab05c52b9d7e5ad222ad6aeecb7437e70bee9447a6a5845d729a93f10df3ffa4bbee0429 SHA512 c0ab179af11526a9dc983374765bd04400821f6f334d22f56b1f6452f54f880fe6882e9e0e121ae36010eb305d0632d574c969febefd8a32c9a731879d8fadb6
 DIST Sys-Virt-v7.5.0.tar.gz 166656 BLAKE2B 466341cc081d1dedc0ad5ae9042a829256a310730aa410a93c795a983c6ee60099646d2a804626a076e435d3bd6d7742b4aa014f4642ee6b6078cd144b3cd8c0 SHA512 7da51e75fa53e81a68c32499ea865de0532fdb17f269b28310133d246be7dc59dfd6568850ffe66e393a7b7c2edbf4409618e2b461cdc35a62776ffbb97d7962
 DIST Sys-Virt-v8.1.0.tar.gz 169008 BLAKE2B 23d3aee186b4ede35c1b5b99691a491e64995abf34e7ce65143c7b88851dca0841cfa27a3033e246f35bacda879dd09c3b31f9dcff54d04c0d47a77b4b61d723 SHA512 9d7660f96cf370a0e08140bf7badddae2dac84d7231f1fe7a616650ac4d333ba17c6531ab0662f34c4cb12b00ce39abe36ff24a1913f554026346725d0148fa7
 DIST Sys-Virt-v8.3.0.tar.gz 169060 BLAKE2B cff54463afe9cc8ac2c6fab5f00bb00b3bb38eba816e09e417fc3d9881ae6efe8c076066b7d5c61bda2043eb6c728d025072069a059f61e954f8b482793cfa94 SHA512 902a1a16fbe64b1146998c57dce35dc32d9c717d3609933a288c9f449c12faeab9a1ef178c53b627869261b8036df50c2f39596df657d3a20cc6ceb9612634a3
+DIST Sys-Virt-v8.4.0.tar.gz 170680 BLAKE2B 0b6c40bcfeba0f5c98fea0e17e3ecc434cc5adf14ed5a92c9c7424a5745e3327c1a8ef05c79ba182d4eebd04b50abcafc68c59e8064ba28faf78bebbb500dbc2 SHA512 25c5b9013df2a916352c07be693c9a9410a4d3caf92a1da106176df314efa534078b5d4dc2501b9afda5ae1628ccf1394a346410972f6ebdd2282971c3efc17a
 EBUILD Sys-Virt-7.0.0.ebuild 767 BLAKE2B 91778504d48bbf174a780e88a85450f0ea315267f16d004e61208c3d6a0c8458976899e1f312a2076d44790f8869d781fcbb78934adf6b98c4eba3a91d967ff0 SHA512 e17ed83d3d16535ad5089739da918f8f3234860f006e87677279c19ebe76695e93632be4ae33e2197451a21a1d17e8f765a5e949fdb5ce46fc47420d8eb2e1c5
 EBUILD Sys-Virt-7.5.0.ebuild 728 BLAKE2B bf373e31030ed74f341848b96c64d78b3d09c954e5d105860c61836460c92f32420de3125c314647d741e31c232b6e3a03f8a92d452da4cbf1330b1a8e5c6896 SHA512 bd03fafa2dc08471c61468f73b786f51b5f4290fbefb34833edeb27309c2d527c4fdf920ac2a77d9483f9e250d7a1c637ad8e12227c528fb53ff94fb1b55c9b8
 EBUILD Sys-Virt-8.1.0.ebuild 622 BLAKE2B 92bf555780e98adc1c802570cf67dfc7e576970f0fbc70c0033f8002afa769c90aa60ea721288d2cd628f29b5bdb166c3a6e907e9503f56ccbf7fe5672e0754a SHA512 8eb71ab58a95bf20ca781c1238dae19965322bf82b8a56589fadd45c2c82c54452729776b5117b27f95ab58f905cdb2e26a00bcabbccb24fb22070c03fca17bb
 EBUILD Sys-Virt-8.3.0.ebuild 797 BLAKE2B 724e99fe9d274020ec2b9df941ab5b1cd1ae6b70a86016308db09713566afc9624303ebb96682ae52bd1293404960971fba547bc58b2cff371a7295c7fcb418b SHA512 5a487e9d4533df30b200b60f7b9682c2fe51ea49c26ef0efc3ec4a421b37f23767a2eddc0016be9b545e3fe075154c03aeccdd486fcbe7307638039625504d3e
+EBUILD Sys-Virt-8.4.0.ebuild 1002 BLAKE2B 9338f433b9b2f5b7614f4184f55507de000a557d45449455069f0d8fe00d6b50bb2075a0baa78ff91b74128923d213063690995e14522883d0cd88a3934d4d97 SHA512 b29f9fe2758354c29e3b40a0ff67ce1486960370562f6475861dd70abb5d75233f5aa1daf85db6305ac0ce7fe4ed552c2a0c40c4c51662215909dd354e9875f0
 MISC metadata.xml 1130 BLAKE2B c1c34f2f313c7d431950b792ed7ec80d5153926a3b91afea5a1a05e79758efcc7fda6b955832a7dc1593ec159449345304500ca9ca6f84b8cdb73e90db9bc224 SHA512 14353b0cb12bb25dd660923fef5443e526e8017240b6eb8f51963d4fd66dbc9aa3da5abbdf61afc995474d95b53533d147a3b70d65f043935ffeef616a09954e
diff --git a/dev-perl/Sys-Virt/Sys-Virt-8.4.0.ebuild b/dev-perl/Sys-Virt/Sys-Virt-8.4.0.ebuild
new file mode 100644
index 000000000000..1c05a0dc8b88
--- /dev/null
+++ b/dev-perl/Sys-Virt/Sys-Virt-8.4.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Packages which get releases together:
+# app-emacs/nxml-libvirt-schemas
+# dev-python/libvirt-python
+# dev-perl/Sys-Virt
+# app-emulation/libvirt
+# Please bump them together!
+
+DIST_AUTHOR=DANBERR
+DIST_VERSION=v${PV}
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="API for using the libvirt library from Perl"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=app-emulation/libvirt-${PV}
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-CBuilder
+	dev-perl/Module-Build
+	virtual/pkgconfig
+	test? (
+		dev-perl/CPAN-Changes
+		dev-perl/Test-More-UTF8
+		dev-perl/Test-Pod-Coverage
+		dev-perl/XML-XPath
+		virtual/perl-Test-Simple
+		virtual/perl-Time-HiRes
+	)"
+DEPEND="
+	>=app-emulation/libvirt-${PV}
+"
+
+PATCHES=(
+	# Can be dropped for 8.5.0
+	"${FILESDIR}"/${PN}-8.4.0-lib-Fix-parameter-detection-for-save-restore_domain.patch
+)
+
+src_compile() {
+	MAKEOPTS+=" -j1" perl-module_src_compile
+}
diff --git a/dev-perl/Sys-Virt/files/Sys-Virt-8.4.0-lib-Fix-parameter-detection-for-save-restore_domain.patch b/dev-perl/Sys-Virt/files/Sys-Virt-8.4.0-lib-Fix-parameter-detection-for-save-restore_domain.patch
new file mode 100644
index 000000000000..ae2597b68c75
--- /dev/null
+++ b/dev-perl/Sys-Virt/files/Sys-Virt-8.4.0-lib-Fix-parameter-detection-for-save-restore_domain.patch
@@ -0,0 +1,48 @@
+From be960176a8b045d54ac1dfa0cb76cef8ed9cc660 Mon Sep 17 00:00:00 2001
+Message-Id: <be960176a8b045d54ac1dfa0cb76cef8ed9cc660.1655221618.git.mprivozn@redhat.com>
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Tue, 14 Jun 2022 10:45:53 +0200
+Subject: [perl][PATCH] lib: Fix parameter detection for save/restore_domain
+
+Libvirt gained params alternative for
+virDomainSave/virDomainRestore APIs. As usual in our bindings, we
+don't expose these variants under new methods, rather wire them
+under existing ones and then have a small code that decides
+whether the old API or params API should be called. In case of
+save/restore_domain this is done by checking whether path to
+save/restore from was provided. However, the actual check is not
+written properly and checks for decoded string rather than perl
+argument. Not to mention this is done before the perl argument is
+decoded.
+
+Fixes: 1bdf37223b4870581deb0d5310489223ca34e88a
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ lib/Sys/Virt.xs | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/Sys/Virt.xs b/lib/Sys/Virt.xs
+index de9f907..2fbfd99 100644
+--- a/lib/Sys/Virt.xs
++++ b/lib/Sys/Virt.xs
+@@ -2390,7 +2390,7 @@ restore_domain(con, fromsv=&PL_sv_undef, dxmlsv=&PL_sv_undef, params_sv=&PL_sv_u
+       virTypedParameterPtr params;
+       int nparams;
+   PPCODE:
+-      if (!from && !SvOK(params_sv))
++      if (!SvOK(fromsv) && !SvOK(params_sv))
+           croak("Either $from or $params parameter must be supplied");
+ 
+       if (SvOK(dxmlsv))
+@@ -4553,7 +4553,7 @@ PREINIT:
+       virTypedParameterPtr params;
+       int nparams;
+   PPCODE:
+-      if (!to && !SvOK(params_sv))
++      if (!SvOK(tosv) && !SvOK(params_sv))
+           croak("Either $to or $params parameter must be supplied");
+ 
+       if (SvOK(dxmlsv))
+-- 
+2.35.1
+
diff --git a/dev-perl/Tk/Manifest b/dev-perl/Tk/Manifest
index ce2c76de2a62..73afd9f25825 100644
--- a/dev-perl/Tk/Manifest
+++ b/dev-perl/Tk/Manifest
@@ -1,4 +1,4 @@
 AUX Tk-804.034-xorg.patch 1741 BLAKE2B 06b07dd1d2c189677bffc0be09872f8b480fa1f597103509d2bf5d10bce993a21075936a7b62c793a4eae087b95a0b5c1198f20a2093dfa9f11ea03b9def3787 SHA512 368f68fe1a6c48d01adbd9a411ce38131f11bf9fc260e281f13c81bc5234bc8f2d364deda538db5ab8a88400aba30cd5e319304693e156fc6d7caeebd3fb049c
 DIST Tk-804.036.tar.gz 7024993 BLAKE2B 0ec47bc7f24af7ea5cf3fb539b2636e978a22707d591cea0a5c1ba9182a70afcf749a9fbc03fd2bf7e969ddb1a57572bd6e1b7b68210ad38b1804c877cb771ee SHA512 7d8b82127a5fdbb2f0387f541af8844a09f1230f377b92d511ecb12e81bfd5ef56d4fe925cac064a798a96a003bb8465b6df37cff18a960f3631bb3a214cd812
-EBUILD Tk-804.36.0.ebuild 1795 BLAKE2B 7af98122470b6a89e3369b6e1691f10313973cf562ca7c9558589ce4a90b3395e8a04557e54ccb04a7e59f0a5199f82fb06015952ee74cc9e6b18ef40ff49c5c SHA512 07b14e39c1694c4fb9e3625efcc58366780611d133e7a65aefe2d4a71cf3980b76017acd72322d027f8eea89d8f16baa9939a68bb776463caf1b455978a84a62
+EBUILD Tk-804.36.0.ebuild 1801 BLAKE2B b7f96b975108d5e118e7adbcf2f9da85edf87655ed81a6babaa2270a64a5141cf08af4afac7b6c5783e97d1510782841fe50aa97408433f2bfe3ade21998ae20 SHA512 35613eca25a0e7148938a11e12e44043b16edacee77c739e6d5b92c5b32338b5cf0816405950f52e404e1bddb1434345f1669149bf42b5952cabf36ab0376b3e
 MISC metadata.xml 7606 BLAKE2B d893e5bed29497b8c444eb6ed1f32d2cc0f378a27398e6299560eed4ca4202a7e58c9cbd604395c62b2ad126a2c501a406297c746db04a6cb2b523b754d8b0ae SHA512 6d593703f6ad6141faf2d6b4e46fb633fabbd808e7377c0510e6bc877d34d708beb81f8788340a90d37ddfa430e729607f0dd986b4cc70e8b8e079b1b85782d9
diff --git a/dev-perl/Tk/Tk-804.36.0.ebuild b/dev-perl/Tk/Tk-804.36.0.ebuild
index 855c42abfa12..98700df9eec2 100644
--- a/dev-perl/Tk/Tk-804.36.0.ebuild
+++ b/dev-perl/Tk/Tk-804.36.0.ebuild
@@ -30,7 +30,7 @@ PATCHES=(
 PERL_RM_FILES=( "t/pod.t" )
 
 src_prepare() {
-	myconf=( X11ROOT=${EPREFIX}/usr XFT=1 -I${EPREFIX}/usr/include/ -l${EPREFIX}/usr/$(get_libdir) )
+	myconf=( X11ROOT="${EPREFIX}"/usr XFT=1 -I"${EPREFIX}"/usr/include/ -l"${EPREFIX}"/usr/$(get_libdir) )
 	mydoc="ToDo VERSIONS"
 
 	perl-module_src_prepare
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index d98ea437a804..563eec33cc4d 100644
Binary files a/dev-php/Manifest.gz and b/dev-php/Manifest.gz differ
diff --git a/dev-php/libvirt-php/Manifest b/dev-php/libvirt-php/Manifest
index 26d38481cc2a..3e1f7d68ad38 100644
--- a/dev-php/libvirt-php/Manifest
+++ b/dev-php/libvirt-php/Manifest
@@ -1,7 +1,9 @@
 AUX remove-imagick-check.patch 331 BLAKE2B 2d9c164055c3f54baf259326abe22d5aa478141df7f6ea05ba33f040701947038490c1898e89a7019cc1e41008fde5cb43c338730ef7ec3020f5005edd612d9c SHA512 1e949f8c704a2e6b541a276b8cb53e9cf09f009dadc01f4f50ad02e92258cfe30130b2d22b811e0b5b07e1bad4023fad05040c6031bd0063999212c2d6483bcf
 DIST libvirt-php-0.5.5.tar.gz 761250 BLAKE2B 9899d2f0e5ea387333decce5071afc81d4160d54ef570dcbe04422dc3e93479ee57520f9bf33a0275ee86cd4b1c87e5a3f7d5118e0cd87658faed44d2ccd4807 SHA512 2ea263561a0bf5d155314e06dcf3c3b5c278640bc5edfa674cdd777cb6d0810bda0492c6cf77a02bc88fb6aa99b0ff1f0cbaeea87ff2e45bff9b5774a2507684
 DIST libvirt-php-0.5.5_p20211020.tar.bz2 359477 BLAKE2B f4be3cf138364997911b58b07e128e4b5c9e6f1520d876b51466a30cd2ade4035a06488e07b8be4cce65b1bc6585b768997214c9d0ba72cc51855b4fc0827ff4 SHA512 b935c910e8754000de45e88f5d5e61e2e95fbb1b007f0d747bf4cd3531ee9cb0ff5bc2ec6f561c79711df9b70e1c4cdaf2e046774341d29d3f2382d27ab8c494
+DIST libvirt-php-0.5.6.tar.xz 386372 BLAKE2B 30d6a1c8dd18a4bd9d46e9c20551978fa0c20f2d671a359fdbf86def5166df7f882e65c509087efe0acef7d0dc468b3eb520689f9e7ba552e966809c8f647390 SHA512 5d1b3a2afc697051a5a0d4750ce4d02b31f482b1c17ef2cf4a593b705de438d8ccb4b1543ce6b2520b450734b3634e64ccf9200227f5681cbd2daad5a9f5ee9c
 EBUILD libvirt-php-0.5.5-r1.ebuild 1475 BLAKE2B 32551b061e397285edf1ba9a2165cd459c673aa415c1b743ab7745982f5eda7c13f55b0bcf7f685408a6d813803acd321abbbc56431cb935b0788a796acb7a3e SHA512 90cf2a297540f06e2535b689fdb94ac116574049277bcb453d8ed0883cc59b428f5ce7fb6ed4d860efff129d41955a14763e9cd47be4e7c1a400944b63102e30
 EBUILD libvirt-php-0.5.5_p20211020.ebuild 1610 BLAKE2B c1e92e856a58e9893b8a8c3d984b6442d2069e6520a98809ebe8957c62d0ae3c4305325bfd6bab210c7eb7f66cd2d4325408431e089a0fa1418f3ec830e0cd48 SHA512 b5ed81c28c5ef319bf7de60b0a954fa204fe8917277604faac208ff2c758694baf0f2db77c7b10bba40cbaa2b3bde3bf8e45f23bb359a2cb6fa01738b049e8c8
+EBUILD libvirt-php-0.5.6.ebuild 1453 BLAKE2B 2d30fa5fe60d8015ad498cbd6368c059e0fc4f8345a0d56a17ce31de99d4f3ef5f4e659b085f51d5ebdb72854c5f7b72d7cc55c87a0f45c796857f882a1d7d96 SHA512 54aef6536f38ffdded99ee8fa4f5982adab87e88f68e8bbd57aa8ea3e7af68732d3431331433f3ac6bf3ab1d97b1e08aa6a794d1550413b49feb305aafa125f0
 EBUILD libvirt-php-9999.ebuild 1463 BLAKE2B d482021104136ac237690ed9ffec6ffde66d54fd8adec41d3c2e6caf68ff0bcde507f6792d27ea6727eb6279d0dc7fc972a3021157872d5cff02ddb391649395 SHA512 8d982f4c805b5a485c6a12cbb1604d5c6a9041c1b594dc74c3577ea217b567325ec034673362bb46381793e8fb918d116ecb2095aa78d293f62120d7328ec57f
 MISC metadata.xml 372 BLAKE2B 2dd1ade6ec545cb0a2574dcc308dfa41608de5d7d666adf0bffd8d0441230ce835c78507e23d02b2f3b2b10d8dde130e64985156f2de322710f05078c6690034 SHA512 eabd4a207f5e76a04d6de32b3c4e4b103ac795d310559d3278b2f39dc251795de60f2ba8b07b8bd91d2785a2e1f2e10fec1cbfe734926005f0aee600bf0ebca5
diff --git a/dev-php/libvirt-php/libvirt-php-0.5.6.ebuild b/dev-php/libvirt-php/libvirt-php-0.5.6.ebuild
new file mode 100644
index 000000000000..9c565addf6bb
--- /dev/null
+++ b/dev-php/libvirt-php/libvirt-php-0.5.6.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PHP_EXT_NAME="libvirt-php"
+PHP_EXT_SKIP_PHPIZE="yes"
+USE_PHP="php7-4 php8-0 php8-1"
+PHP_EXT_ECONF_ARGS=()
+
+inherit php-ext-source-r3 autotools
+
+DESCRIPTION="PHP bindings for libvirt"
+HOMEPAGE="http://libvirt.org/php/"
+SRC_URI="http://libvirt.org/sources/php/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+RDEPEND="app-emulation/libvirt
+	dev-libs/libxml2"
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	virtual/pkgconfig
+	doc? ( app-text/xhtml1 )"
+
+DOCS=( ChangeLog NEWS README )
+# Remove the insane check for pecl-imagick which is only used in examples
+# and is not called upon in any build
+PATCHES=( "${FILESDIR}/remove-imagick-check.patch" )
+
+src_unpack() {
+	default
+
+	# create the default modules directory to be able
+	# to use the php-ext-source-r3 eclass to configure/build
+	ln -s src "${S}/modules" || die
+}
+
+src_prepare() {
+	php-ext-source-r3_src_prepare
+
+	local slot
+	for slot in $(php_get_slots); do
+		php_init_slot_env "${slot}"
+		eautoreconf
+	done
+}
+
+src_install() {
+	local slot
+	for slot in $(php_get_slots); do
+		php_init_slot_env ${slot}
+		insinto "${EXT_DIR}"
+		doins "src/.libs/${PHP_EXT_NAME}.so"
+	done
+
+	php-ext-source-r3_createinifiles
+	einstalldocs
+
+	if use doc ; then
+		docinto html
+		dodoc -r docs/*
+	fi
+}
+
+src_test() {
+	for slot in $(php_get_slots); do
+		php_init_slot_env ${slot}
+		default
+	done
+}
diff --git a/dev-php/pecl-redis/Manifest b/dev-php/pecl-redis/Manifest
index 6bdc7f260375..a4dc1e9d7eb7 100644
--- a/dev-php/pecl-redis/Manifest
+++ b/dev-php/pecl-redis/Manifest
@@ -1,5 +1,5 @@
 DIST redis-5.3.6.tgz 274235 BLAKE2B 8479b3060abb99f765b27fd8937cb4c7ef92c55c0581ae6a69dd06113367547d546a9f96a8418df928f258520cb0fed6f5d39f6d88972c74b8446134be08edc4 SHA512 e5047ba9974ff6065be0fe8614aea8bf7d7c77b3a4ca08b19d0bb53069dd164614ffd19bf09bda458511abddce438fd816c28a169536388c8c4cd923596aadf0
 DIST redis-5.3.7.tgz 275200 BLAKE2B 50cff3d36e189593a741ed3fe05c3558e6a0621e7ff906e4902ba39e3f7d3ae5b9bfa554480a131e32bcc0334bccbd3aa5507dc714b6d4b20ac808139c525a95 SHA512 b945d5aa86d3f58e75094369b0f324e987202f104aca7d7b46ba23cfaed54d186bb66931e200dd16d2dbeea11732dd0311da4e3d7485c3b725027f7924652832
 EBUILD pecl-redis-5.3.6.ebuild 1530 BLAKE2B 0a3a03b2089fa90564fa0e88deb1cc985f075f2cea6e9ba24384e5cafd4b44c769db78c7f03724d7e8d7569f358c70ffc249f9177cee05cf758a11939a94c97b SHA512 0a5d17ac5010a68635e551e1d1202a76cf1d656ed94ebcf12b01ae1fb44eb93f042d278ba2dc14c198bbcec8b43468264071e627e5b3963fd1598fb0b9b3f461
-EBUILD pecl-redis-5.3.7.ebuild 1501 BLAKE2B 9bdbee0361e58c9d3a3b5be1a63e0c60bd5c41cb832c1bc8d1ccf599b1e9ed736fcada66308b0712843818f1518ca33cc86926f2e20fb939d38c36f89bcb03d6 SHA512 583062f9e022cee86d0488640ff6bacaeb7656c84418f5a8ec942b0232c549588302d57930b71e284c5361f27d531b141c17877ec7ffd5539ff7dd4b89d72885
+EBUILD pecl-redis-5.3.7.ebuild 1508 BLAKE2B 83833ea972811c1f8932c72d129eb8afce4577f638a65c6da4e4270bdbd15738af23e71003a2f48c08d2001bfb17d1954c37141991e3ddb82f02b9bb9f14a94d SHA512 842cf19bf21796b15eb90d2e37cabe1996aa6bbb8aa9c8655c526ea3cb5904e0789363c8efbfb0809a1fac2e57bdd75302ad3eef0434c895840b78334a47e5a0
 MISC metadata.xml 384 BLAKE2B 4a1a6b326526bb3f5b9d9d57158d6abbfe3c65b1cfc11980ce849d5f7278558ee0daf580aefc521939aae175cd8e2cb990e046fce8faf6774348b24fa6465ef8 SHA512 851e1fb9f6612105640028262a4821f0da5b1ee5949fdd99067e821ce1d22c41888ee53e102becc93c918a605c2b8dbb2d493cd7cad516530912fec652011364
diff --git a/dev-php/pecl-redis/pecl-redis-5.3.7.ebuild b/dev-php/pecl-redis/pecl-redis-5.3.7.ebuild
index 2b26e3e0df6d..437cd906213e 100644
--- a/dev-php/pecl-redis/pecl-redis-5.3.7.ebuild
+++ b/dev-php/pecl-redis/pecl-redis-5.3.7.ebuild
@@ -16,7 +16,7 @@ inherit php-ext-pecl-r3
 DESCRIPTION="PHP extension for interfacing with Redis"
 LICENSE="PHP-3.01"
 SLOT="0"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~arm64"
 IUSE="igbinary +json lz4 +session zstd"
 
 DEPEND="
diff --git a/dev-python/Babel/Babel-2.10.2.ebuild b/dev-python/Babel/Babel-2.10.2.ebuild
new file mode 100644
index 000000000000..02e77dc3bc66
--- /dev/null
+++ b/dev-python/Babel/Babel-2.10.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+# see scripts/download_import_cldr.py
+CLDR_PV=41.0
+DESCRIPTION="Collection of tools for internationalizing Python applications"
+HOMEPAGE="
+	https://babel.pocoo.org/
+	https://pypi.org/project/Babel/
+	https://github.com/python-babel/babel/
+"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	https://unicode.org/Public/cldr/${CLDR_PV%.*}/cldr-common-${CLDR_PV}.zip
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/pytz[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/backports-zoneinfo[${PYTHON_USEDEP}]
+	' 3.8)
+"
+# RDEPEND in BDEPEND for import_cldr.py usage, bug #852158
+BDEPEND="
+	app-arch/unzip
+	${RDEPEND}
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+src_prepare() {
+	rm babel/locale-data/*.dat || die
+	rm babel/global.dat || die
+	distutils-r1_src_prepare
+}
+
+python_configure() {
+	if [[ ! -f babel/global.dat ]]; then
+		"${EPYTHON}" scripts/import_cldr.py "${WORKDIR}"/common || die
+	fi
+}
+
+python_test() {
+	local -x TZ=UTC
+	epytest
+}
diff --git a/dev-python/Babel/Manifest b/dev-python/Babel/Manifest
index 46c1590b078e..336d0a4938d9 100644
--- a/dev-python/Babel/Manifest
+++ b/dev-python/Babel/Manifest
@@ -1,3 +1,6 @@
 DIST Babel-2.10.1.tar.gz 9342917 BLAKE2B fe9f4cff416a57b4964481afcf9cf154b3d9e2c0c88b2b97786cbede1cb068f9637a2168a819dd94770ce3a5836ee8096b2fe7131d2dff16eb0a31a924b9fae1 SHA512 d6f8876bc47d2ad88277f5a9512abb177518b79d4f477cdba11d1cd1af8fb92bfd033c2c05c7a6c32dbd087a28189288f8ac80f9b654027b3e026a06c4ade127
+DIST Babel-2.10.2.tar.gz 9346156 BLAKE2B f6d8c3ccc00c5384c52d98d9939e58a2ec6f16dafd89b5ae5b5a302db16ff1d773d5843d1aca6a4cede859aa7dfa33ebbe4c49bd06c2720e0aa916a097d26fdd SHA512 d292cd26e8eeeed699a8307540a10bb5521a118940928eecf56622d22c01fd566b1c22cd86b33d92c0c1fe3eaaf8c0d634636d288f74f18cb297137de6fdc842
+DIST cldr-common-41.0.zip 29364494 BLAKE2B 1960e860017c3e5f31d935d66a1ff551720975dca0af459adc72b8dc54100938fbd2d2ef00eb457f3fd04d4f1e90a4783229c350b125029dcda5c1e6903f9a54 SHA512 c64f3338e292962817b043dd11e9c47f533c9b70d432f83e80654e20f4937c72b37e66a60485df43f734b1ff94ebf0452547a063076917889303c9653b4d6ce5
 EBUILD Babel-2.10.1.ebuild 910 BLAKE2B 895df4bfb515d22b3cd49264846ad12a5a401faec5b036730abe4edba17c001ec2603db24cb7bee301466db9e7cdaea303bc2dd3b5cca42d46f4e3f68e8839cc SHA512 f596d31082076c89b37c7ce1388cc5d5abb544980147832c50c4cf53dd53f57379755535e6b9150e23bd9ae67dc14d771e38a4eec1627631548d418416a97ed5
+EBUILD Babel-2.10.2.ebuild 1372 BLAKE2B 38fafd6c6a00ab9f702b69c5c6f4db87e43bdaec25ccffe32e0464e2f8cf1719a01f3ec5cf061be8e54ce5f98f2ff746834fd5a605e0f17f54f37f6ece5dceea SHA512 3ee1db1f977a1466984106474140913481ad142bdce055759cdef7a31a8cb8c9ebd0c63e9aff206e9b10c0a24dfad50287a903af487e1c128a872479103b511c
 MISC metadata.xml 840 BLAKE2B b0f46186ca0a319d3e4e1a658007b2cc59fe3a3ea9ede567af5084593f907e88dbe714d2b70c6a882ec95a5f90d4c0e3620ea0a939ad6e52650e770de88a45ba SHA512 621b66293259fd20c94a62ecf64673f7afcd714c18f054c8c0afe2d14e6e98c8abbdf6b4c5cc0043b5d30e513acab292d85c5587a02a9ae99ca007a28720c921
diff --git a/dev-python/Faker/Faker-13.11.1.ebuild b/dev-python/Faker/Faker-13.11.1.ebuild
deleted file mode 100644
index e6e86886aeab..000000000000
--- a/dev-python/Faker/Faker-13.11.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="
-	https://github.com/joke2k/faker/
-	https://pypi.org/project/Faker/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	!dev-ruby/faker
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/random2[${PYTHON_USEDEP}]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/Faker/Faker-13.12.0.ebuild b/dev-python/Faker/Faker-13.12.0.ebuild
deleted file mode 100644
index d8e24e8d32e7..000000000000
--- a/dev-python/Faker/Faker-13.12.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-inherit distutils-r1
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="
-	https://github.com/joke2k/faker/
-	https://pypi.org/project/Faker/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	!dev-ruby/faker
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/random2[${PYTHON_USEDEP}]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/Faker/Faker-13.12.1.ebuild b/dev-python/Faker/Faker-13.12.1.ebuild
deleted file mode 100644
index d8e24e8d32e7..000000000000
--- a/dev-python/Faker/Faker-13.12.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-inherit distutils-r1
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="
-	https://github.com/joke2k/faker/
-	https://pypi.org/project/Faker/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	!dev-ruby/faker
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/random2[${PYTHON_USEDEP}]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index 6b79ebdf5df2..47b763a0b1c0 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -1,9 +1,3 @@
-DIST Faker-13.11.1.tar.gz 1501239 BLAKE2B 1ccf33e7a054d33921696ea917670fc0ff88c0b805700b32d9d4e5ed3b12d6e52ea164f762600315370eed06415e70923002b99f0c32fa9cd40cdeb437e338c0 SHA512 291517669143119099ac6bcc69a08091fb156728c465198079f764996849d8416ccaf169e1cf0d0dd02d99b2090494084dad7fdef9dfd2702411701bf71f54b5
-DIST Faker-13.12.0.tar.gz 1528234 BLAKE2B ca85e172d75f009802486fd5299581c0bd08f273f049df12b44159fb0c79d6b267579172da3c25f5aebaa0b897ea1e1067fe8e6a2527b0ccbf1e60de0257289c SHA512 9883e1a82b8d00ad83a31c71929ebb8f13e31bb34ada29772ab0bd8e9ac5e59ea44cf1a876e8c58a519814207fbc5ed950fdce7f7c259e5ca897e23662cd6511
-DIST Faker-13.12.1.tar.gz 1528407 BLAKE2B 2e4dd3c72c8531e523a4906c982d0652e6826b8e4b4af5400ec247070c79b2c07f2977bf40daf4be3166cb0e612945547f1a36489fdf5d072e7e5d0b0b4c1764 SHA512 75d9c30c1163ee6746c23870abdf11c32a07ca0f1e4d13aa71a28024ae897e352500c27c3c2709bd704d162a4352ec557a74ccf25fefbe9a5587541a5aea2f20
 DIST Faker-13.13.0.tar.gz 1528907 BLAKE2B be4593ba271330822f10590aa8e15c4658cd8a19333ab769d32178b72c15b504b8a5269443100250a863af25e40c582244e815cf612dbf8a57833f470ddeec09 SHA512 9e794bf95d40040dfa98439d0d9da19a90dd202905d4825c82453e202adad80bbea6da74ce0d36d8e205381d419a19b8b1fb60b32e20e97ee69b315f4f0c8eb9
-EBUILD Faker-13.11.1.ebuild 743 BLAKE2B c954188574c55e07e1737acf6558e83712dba7981040e05ed49864397a18e27217bcdb2da6d033f56553e9af826347302938035ed84d087d3b28b64a137a4b1b SHA512 71a025aa9e4571bd9e0a5d123ece8c128327653915730cc5ba1f6887258a348f339b4955ec01dc5ae88fe393e5699fba74354ca7bef0e83fbc4ca9c3c7c4182d
-EBUILD Faker-13.12.0.ebuild 743 BLAKE2B 5018d7828a83837233d7e23c875e4c710665e4322e79329a49cc426d97b630627f9aa64df85f92449f06d1e11f772e8e84064b389b586b9ef5214d7200ffa305 SHA512 a8de56e0b42bedd66f8f9b5a512ff79d30b29e728c5d6227f6c9b4f11c22b284941f342ec8c531345e4a89af15aade1192941fa0f4400b2d3e2efb3bc9f7e724
-EBUILD Faker-13.12.1.ebuild 743 BLAKE2B 5018d7828a83837233d7e23c875e4c710665e4322e79329a49cc426d97b630627f9aa64df85f92449f06d1e11f772e8e84064b389b586b9ef5214d7200ffa305 SHA512 a8de56e0b42bedd66f8f9b5a512ff79d30b29e728c5d6227f6c9b4f11c22b284941f342ec8c531345e4a89af15aade1192941fa0f4400b2d3e2efb3bc9f7e724
 EBUILD Faker-13.13.0.ebuild 743 BLAKE2B 5018d7828a83837233d7e23c875e4c710665e4322e79329a49cc426d97b630627f9aa64df85f92449f06d1e11f772e8e84064b389b586b9ef5214d7200ffa305 SHA512 a8de56e0b42bedd66f8f9b5a512ff79d30b29e728c5d6227f6c9b4f11c22b284941f342ec8c531345e4a89af15aade1192941fa0f4400b2d3e2efb3bc9f7e724
 MISC metadata.xml 474 BLAKE2B 337c8b17b4ca092edc2e59bd61dd847e4b9f2bd7e0651d07dad5b3e3eb4f311de9e27e6cad1f6a4835f618446cfa4cdb95e578a8af11498cf7bed1ec697990ce SHA512 35f4a2a50ad5589ba50e619670d1f1eac423fec920bb9c07b3f8bd7d7f2a0bb4e88dde286b062339b30ba304bd1a834bf3318c0b0ad0552ce9eb45fa72e5f44e
diff --git a/dev-python/GridDataFormats/GridDataFormats-0.7.0.ebuild b/dev-python/GridDataFormats/GridDataFormats-0.7.0.ebuild
deleted file mode 100644
index 1abd9feeea58..000000000000
--- a/dev-python/GridDataFormats/GridDataFormats-0.7.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Reading and writing of data on regular grids in Python"
-HOMEPAGE="https://pypi.org/project/GridDataFormats/ https://github.com/MDAnalysis/GridDataFormats"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-3"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/mrcfile[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.0.3[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/GridDataFormats/GridDataFormats-1.0.0.ebuild b/dev-python/GridDataFormats/GridDataFormats-1.0.0.ebuild
deleted file mode 100644
index 430e043f76da..000000000000
--- a/dev-python/GridDataFormats/GridDataFormats-1.0.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Reading and writing of data on regular grids in Python"
-HOMEPAGE="
-	https://pypi.org/project/GridDataFormats/
-	https://github.com/MDAnalysis/GridDataFormats/
-"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-3"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/mrcfile[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.0.3[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/GridDataFormats/Manifest b/dev-python/GridDataFormats/Manifest
index 91ddd260f0a8..3b4e535f3210 100644
--- a/dev-python/GridDataFormats/Manifest
+++ b/dev-python/GridDataFormats/Manifest
@@ -1,9 +1,5 @@
 DIST GridDataFormats-0.6.0.tar.gz 1984859 BLAKE2B b53e6a43a06fdcb42fbef4c10dbdb1b5740fc04fff468b666c687ba5a839b8129b49358d54c6d7e4229ebaa67af01d897fe960f87a868950657bbcbb85ec7487 SHA512 b876eacd7b1d3a7dd6fe35e2092783183fb0ffadf7fbf583773e6a3401bef51bd33ebb2e73f8b4ec9cd404c153c30ce09dfb75d5e4aacba53915d085f090d0ea
-DIST GridDataFormats-0.7.0.tar.gz 2159247 BLAKE2B 7969f80960b5a29c44a645725a53dc6eb7c99d02e4fe1369700aaff85e4b98f3c7636768340c95b4ac44f6971558ab2efc5dc4e4968fb410e90e2228635e19ee SHA512 333c7f77c9c65f6be788c58efb0822eb05580893e96522c0bef04d84d3c5deae5498c1721353ece2ecd4ed8785acb6413b43123c0d895a855f0ee59e44b1d310
-DIST GridDataFormats-1.0.0.tar.gz 2155373 BLAKE2B 9570d2f61d5ee2fdd1aa1578e30bbbcc60bd98c60db7fa4e7030055b551170c6eac8eefabb2aecddc3938cccef1ee76c9d01a0ac99f8c56be8384ca9164615fb SHA512 03e250872f3e00b9208c16f179d18f899ed67c7656edaf79cfbba410ed8d1fb2ede2c878a57d3a818168efd9af6135b1a91e1c30d5cb256e88f7af1f4ca59686
 DIST GridDataFormats-1.0.1.tar.gz 2155370 BLAKE2B 8bf5ce65cefdcf490b75212bca8831957769118fbad7fdce42b5634ed67a1f5d4ac454f7429b984bafd89f5bc883fff1bca9dc71f529794cdd585e186e41e063 SHA512 2cfb8c50b4d17fa978924a0e65ae27f6e125bd1055bfdc9096ea35511f4c2a8a16f6bd9c652b9130fbdd66d4d464d8074b14f47c175f98df94c02fe973a0107b
 EBUILD GridDataFormats-0.6.0.ebuild 620 BLAKE2B 25c320580183c150d77c9e10a103dd425b1cf005749a8686676c1fa8c1a1cf747df6b437a62783e39f1764a82c73e5c00ca754a076c79231d2b39e0a2edcf078 SHA512 74e25dc0724e53585cc03d7c4726531c9169d86c79dfd2d01faaaf03ec320eab4712cc826aca7e8a02a88e0215484276776d45a1f94e982c5886c80afabb4201
-EBUILD GridDataFormats-0.7.0.ebuild 662 BLAKE2B 312cc77f8342a9afcc70336a45ceac36319594904dd66be392f68b861ee714dc69db07e96bc4fc654c86c755a446ead74df0013a59fa79b0b0d92ff514745e6a SHA512 4964bcea0ad4010e1cbfe288f8bb97b9f56a38beb45092d8b71e34877d86259b609c6c7f88913d2cdb4b976d19990fad3b1fccc5054db4cac029af3f729b8236
-EBUILD GridDataFormats-1.0.0.ebuild 667 BLAKE2B 353d752b55d881da2891855e0511b5fb69bbbf8be8bd4d81ce185ef79834ef4cab72b1d62d70646ce61b5b92d00ab0294ad13e00114100db5e9e92a15dcb7c2b SHA512 bf5d0c86d762ed9cd06ddaccab5a86d60233c44545434ce0efa69218fdf7935afdd5375398de560d589f4866a88eeefe2917574585035804db4ddd5c08eedf60
 EBUILD GridDataFormats-1.0.1.ebuild 667 BLAKE2B 353d752b55d881da2891855e0511b5fb69bbbf8be8bd4d81ce185ef79834ef4cab72b1d62d70646ce61b5b92d00ab0294ad13e00114100db5e9e92a15dcb7c2b SHA512 bf5d0c86d762ed9cd06ddaccab5a86d60233c44545434ce0efa69218fdf7935afdd5375398de560d589f4866a88eeefe2917574585035804db4ddd5c08eedf60
 MISC metadata.xml 608 BLAKE2B 25b3e613ce6776ecc00b7ab3e65ba253be7715f167b37d4fc4d625b035e8d24706cd56bc14f2f0cac2b3f4da6b84c8bcd2b219914490b9e3bc9fab0cbbc2ddfc SHA512 48ca119e78978f100a3212a59d716d49766e6bd523813c5395d05f705f1258e1899183d52faabfef95162b82ccfa08b5b771c1a00c53d7c42a54aaa97eb9ae52
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 17e9042f473a..76b3e87b9a0b 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/PyPDF2/Manifest b/dev-python/PyPDF2/Manifest
index 23e3284d8e10..d771a1bfa592 100644
--- a/dev-python/PyPDF2/Manifest
+++ b/dev-python/PyPDF2/Manifest
@@ -6,6 +6,7 @@ DIST PyPDF2-1.28.4.gh.tar.gz 4397029 BLAKE2B 2db9aacc55d06e961708ee455562e28f59b
 DIST PyPDF2-2.0.0.gh.tar.gz 4574406 BLAKE2B 8554fdb7ab9ea1b9990ba72fb05ed02ef8732788b896013f3410f74bad482a95dfb42215cff247d411e6e84bd1afa3437af36f203b7aa45890c4c5681853dfb9 SHA512 8bdd9c2cdd20758a183696d8d33a207f9be9183e63b7757e09d281f4ae4a6a61714a49c940d5bd57df8a6074ad7498f17354b5d4984b1b2ad4bd119b62d93138
 DIST PyPDF2-2.1.0.gh.tar.gz 4728411 BLAKE2B 00949842da43136afc7ee3482dc0b61182a0bf3ee4479d8794891ecf0a7cac9ec92a94d480a2ab75d35be9f667b5c27cdf17c8e7ce76bb5355cf2c43c7fc814b SHA512 d82f05fe6e7f944f045600c1fd7d451181803769b38911a2d6e0553ae7b16cbfd6838883809c71fddcdfc386f62e0a5f5aaa6d947236a3c8cdedb5fe8f338a5f
 DIST PyPDF2-2.1.1.gh.tar.gz 4729162 BLAKE2B ec7af774d8fd6af5985af1119e414082d99c2ba832d22093a0f1ee08606436e129139f9f3dc85633660d14c860b49dfd026e2d2b9aa9d29c70ca8a44b749404f SHA512 ecc0fb1e7e0d3cd512439c26a04e81fe339e98b88ea75821c7d2797f056fb370c061f89701927dd238d8cad9f431d3f8847de47fd9f45b8e76322ffd797293d3
+DIST PyPDF2-2.2.0.gh.tar.gz 5015612 BLAKE2B e9fd2b193a3ea1477a92de6c7a0680e49017e6daccfe648d8479bb55b0bdbcaf7de3df032010a6010dcc779b7b651963a7cb94beff14a8bba6144849cf3fe551 SHA512 73a0d2faa253b53622f175ec9a9dca25bc0dd4cf94f3fe60e3cccae67faab45819212c4fcc4963b7dc530e6d06781d110c5ad5887fb3240cebfb56a9e7aaea65
 DIST PyPDF2-sample-files-41b5cd4f774f8fbd8ac42d93b9962f0376352a15.gh.tar.gz 5406287 BLAKE2B 8ddad01235bdb55cee596d9114e5b6c3b153919bcff5203d229311243516f3595cb36dcca87cae27514a8231d72daa94782115795bff8c1c3d046236811c21e0 SHA512 6c38d5ee0e1c5c0ffdd78f7c2fe56dbf357a1e82d2af642a10264a6102ae8fb95cba6d2f76b26df6a33a5d84cfd5111885d39c1747cf95a5ce545f26bdb37263
 DIST PyPDF2-sample-files-41b5cd4f774f8fbd8ac42d93b9962f0376352a15.tar.gz 5406287 BLAKE2B 8ddad01235bdb55cee596d9114e5b6c3b153919bcff5203d229311243516f3595cb36dcca87cae27514a8231d72daa94782115795bff8c1c3d046236811c21e0 SHA512 6c38d5ee0e1c5c0ffdd78f7c2fe56dbf357a1e82d2af642a10264a6102ae8fb95cba6d2f76b26df6a33a5d84cfd5111885d39c1747cf95a5ce545f26bdb37263
 EBUILD PyPDF2-1.27.12.ebuild 1049 BLAKE2B c35ea4aa3e945b72eee65291cb07c0c7160f3bc0581dd35930e849cd6efc0cc6545c2b8079aa7b1494fff3d6e45fd23f6afe89cbc3052ff957a723f4be335dbc SHA512 f2c4d841ed062264bd6ac58632bc8ddfba269c06325f262bfd63323a9bdc5325e2ec3dd379f9b1fa04f7695557ec392a1014851466abc769a247ff5e3256791a
@@ -16,4 +17,5 @@ EBUILD PyPDF2-1.28.4.ebuild 1054 BLAKE2B 73fe77a89753485cfcfb0a8b800af8e8574b912
 EBUILD PyPDF2-2.0.0.ebuild 974 BLAKE2B 92f3d667ca519fe3e17ea9780b382da612a7e80d155e5c59caa96615e864a300ca6d59aa03990c4b68716fb8eb76f43e5d8aff8db3f852aa695d8665d3e12201 SHA512 20f78b9d10e4460cb002c28f728eeacc82d4b02739e2177b082e1b274795313d627662d61118a050200941c3e6944d6fb5a5cb8ed5d13e12797f51832399fd34
 EBUILD PyPDF2-2.1.0.ebuild 1259 BLAKE2B 00471ca66667bfd7a267706bb44d069a9b1a121da94cbfd9c669a20b988524552455e708b26d1179d7e7273de99827f5bcbd3dd899e73bcf1a11d61cc5b47719 SHA512 6bee3c31c5047c199ee42b670db0a45fdaac569d2dcf8a511082c3af0a93fb2a54f6ced80b2d8a7b296fc213d92408610bd479373f1fe79be5b362f565e96fbb
 EBUILD PyPDF2-2.1.1.ebuild 1259 BLAKE2B 00471ca66667bfd7a267706bb44d069a9b1a121da94cbfd9c669a20b988524552455e708b26d1179d7e7273de99827f5bcbd3dd899e73bcf1a11d61cc5b47719 SHA512 6bee3c31c5047c199ee42b670db0a45fdaac569d2dcf8a511082c3af0a93fb2a54f6ced80b2d8a7b296fc213d92408610bd479373f1fe79be5b362f565e96fbb
+EBUILD PyPDF2-2.2.0.ebuild 1259 BLAKE2B 00471ca66667bfd7a267706bb44d069a9b1a121da94cbfd9c669a20b988524552455e708b26d1179d7e7273de99827f5bcbd3dd899e73bcf1a11d61cc5b47719 SHA512 6bee3c31c5047c199ee42b670db0a45fdaac569d2dcf8a511082c3af0a93fb2a54f6ced80b2d8a7b296fc213d92408610bd479373f1fe79be5b362f565e96fbb
 MISC metadata.xml 375 BLAKE2B 2493f7d2ef79342af0ef890e3683fa55255d869c684bba7224ab3afab61e77a239e323c8e63138ce4fea23c32348458cd27a0c58a3b6640854ec27b26cdb40cb SHA512 5e0d6e18e0005e4f323468b8fbfa26dc7ba33d26a94d5fda11c40f62ece84578c1f08843c9f0cf96f0d918d22063f494d486a6d692cecb5b407efaaf92aa9b8b
diff --git a/dev-python/PyPDF2/PyPDF2-2.2.0.ebuild b/dev-python/PyPDF2/PyPDF2-2.2.0.ebuild
new file mode 100644
index 000000000000..0af1c36fdea7
--- /dev/null
+++ b/dev-python/PyPDF2/PyPDF2-2.2.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+SAMPLE_COMMIT=41b5cd4f774f8fbd8ac42d93b9962f0376352a15
+DESCRIPTION="Python library to work with PDF files"
+HOMEPAGE="
+	https://pypi.org/project/PyPDF2/
+	https://github.com/py-pdf/PyPDF2/
+"
+SRC_URI="
+	https://github.com/py-pdf/PyPDF2/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	test? (
+		https://github.com/py-pdf/sample-files/archive/${SAMPLE_COMMIT}.tar.gz
+			-> ${PN}-sample-files-${SAMPLE_COMMIT}.gh.tar.gz
+	)
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+BDEPEND="
+	dev-python/pillow[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Needs network access
+	tests/test_workflows.py::test_extract_textbench
+	"tests/test_page.py::test_page_operations[https://arxiv.org/pdf/2201.00029.pdf-None]"
+	tests/test_reader.py::test_iss925
+
+	# Broken test
+	tests/test_utils.py::test_deprecate_no_replacement
+)
+
+src_unpack() {
+	default
+	if use test; then
+		mv "sample-files-${SAMPLE_COMMIT}"/* "${P}"/sample-files/ || die
+	fi
+}
diff --git a/dev-python/adblock/Manifest b/dev-python/adblock/Manifest
index ba134b0f037b..0d3d8a78e290 100644
--- a/dev-python/adblock/Manifest
+++ b/dev-python/adblock/Manifest
@@ -63,4 +63,4 @@ DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9d
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD adblock-0.5.2-r1.ebuild 2073 BLAKE2B a6b7e55196ecb26b3a6bf9f7793b11f6a4396706e21c97293cc8b4e8be0e6e4092837c59e0fc035f848e1dab529f4dfe1f243b3f2046789bbf39c70a68d51d14 SHA512 3d18a98f2fb9c94a6ab1589a0cc728a4389f20dcf228e70e9737671e3c86f646cd740d0da40d1fea82443ce56b3b93983e799f5f01d672f124ab33837f2e3f37
-MISC metadata.xml 488 BLAKE2B c6813b6b4c00dc1282ab21a9e37b4c035c9d75cdd1c0bf0a2903e4f40d074eedf5ae972b68aac91f46146e339bcd3cf799c45b96c94e6209d100811c2254daff SHA512 3f62c544ec8f4b2da7f04e3af1a81a702d719a0957a187ace37e638c1f00e0d3dbc67728e6915a05a6cb0bcb46366670c2e0a5837734cd0a51b7c3b021d4ffae
+MISC metadata.xml 488 BLAKE2B 8c58b29bbc160b2139fc54058c48da79ae48963e2cfbf97b6eb6c78678b6c57d7ff63c32d65dd082b3ceaffc383c0b03b27467e331738b086bfd6c5ee45c6cc0 SHA512 1a5fb02550400b8a25118982cd9b3651b2ac236208b8f933438786ca18cd8dabc17fe98a447379a0067004f8429439e1af9567e7e04c6ed13100bbe6c6321b04
diff --git a/dev-python/adblock/metadata.xml b/dev-python/adblock/metadata.xml
index 64e24f8f95d2..d961806e1925 100644
--- a/dev-python/adblock/metadata.xml
+++ b/dev-python/adblock/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>steils@gentoo.org</email>
-		<name>Stefan Strogin</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>ionen@gentoo.org</email>
 		<name>Ionen Wolkens</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>steils@gentoo.org</email>
+		<name>Stefan Strogin</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ArniDagur/python-adblock</remote-id>
 		<remote-id type="pypi">adblock</remote-id>
diff --git a/dev-python/aesara/Manifest b/dev-python/aesara/Manifest
index 72718a47832f..02a7800b7f44 100644
--- a/dev-python/aesara/Manifest
+++ b/dev-python/aesara/Manifest
@@ -2,7 +2,9 @@ AUX aesara-2.6.5-compiledir-tid.patch 1707 BLAKE2B 77f8fa3618f930dddad8e864dee3e
 DIST aesara-rel-2.6.6.tar.gz 7847814 BLAKE2B e4edd575d49f548fab0ef971dbab88beeb43859ec7b80612145ed490b31d6e7dc6b6818653396938124a22fa2f54f8d151c5039cc2e9c9070c88cce9cb1c5596 SHA512 028a208fc7e5921ce1df34dd23a42cf90d419e06f0192d9a006ebfb8c5f36e35e347214e53f53e688a1144063c7f4853a8cd44eef6fc205225147116839008de
 DIST aesara-rel-2.7.0.gh.tar.gz 7854953 BLAKE2B 0daee9dcad9c39d1eddd469930cb540369f9463f947d706691fe1552b8e39340743aa8d8a809fe8b7943bba253ef1b93018738ca13be7147114ab6cf77a3ee37 SHA512 b03a182f366624b496bee46b86d43c68b94d840503317af74113bd5b1c6fefc31e4e4d96d6c5dd129212904729127da949cebf05c5a162711d3872e1747c93a8
 DIST aesara-rel-2.7.1.gh.tar.gz 7857341 BLAKE2B edc31030810ec4193901d258c8666080219befccca17bc6165968f959bd57661f92de86720561ab54266906e2be1a83e0fef3e81a62c2810f0b78cda1dbc5265 SHA512 85a4b24a5f58cbb95db448d01140ff64f9ea39242b204a49ddbb2ff8827a16d0ba454764ed3ce9d2b6ed58a7494c452cda39582ae89691d44d8f91ec43e1f50d
+DIST aesara-rel-2.7.2.gh.tar.gz 7922993 BLAKE2B cc8e287003d0984de253925585fbb5d27c33efc1a5472ae83b2ade7cf97f91ec01f4a0c5f736df948ea5b604ea10cdfecff20fa097b1e25243ee0882bc47b9bc SHA512 c95db5dd13c5abdb9772fc376e8196b4bb763b0c16bdb6c0987d60b5b43b0232349126938aea8f8b534ac3c0627a9d7fe4fcaa910598b75c0798c224b0b8836e
 EBUILD aesara-2.6.6.ebuild 2596 BLAKE2B 8559deaccfe85f53d5889c98a2eac4d43c94862e1c24e13a3470057d6c4737f906e7b0351bc0cc2d8c61bbd1210d655dcf2c9c51cf2c8eb4a06f6aa2ca4cbdfc SHA512 37f6ea5bf1920441f3780dcb85129f73c3954413ca87929d6cda3c5d0bd928748f3143649ddee08dda109fe418c2ff0b6cf8ef55bd69f2569a44000770624225
 EBUILD aesara-2.7.0.ebuild 2601 BLAKE2B 004be043e44f1ae16fe8c502114ac47f7e5e818c1a705b8b0a0198fda0ad367ecba4a57aed86bd20b870d52e8d44ec69afb5f7e36f72342d77bc98aed53bd29e SHA512 7bc13b8cf04c7bda7feb91632a3b4126765d2c0b3fa750c69248cc4d4597cfee1753d9425d6c6044facb090e5f46030026a3735f6361871bda1655d806b06ef0
 EBUILD aesara-2.7.1.ebuild 2581 BLAKE2B 4f17dcfeda1e40e614b1df46fccea04e6342620b95624e8252e133cd9b777add9e915e9b1b37814f06967f70119c2da572b37b0f11caa3cefb4aae253bbddebe SHA512 869ce185fba22ccce6ead914f9246cc286c1a146fe3b74ea6b87521bcdc7dac90541d041f3d4f832fd1e9d301bf48bd563ceb8ee1283984aa3c88ff857e03b74
+EBUILD aesara-2.7.2.ebuild 2581 BLAKE2B 4f17dcfeda1e40e614b1df46fccea04e6342620b95624e8252e133cd9b777add9e915e9b1b37814f06967f70119c2da572b37b0f11caa3cefb4aae253bbddebe SHA512 869ce185fba22ccce6ead914f9246cc286c1a146fe3b74ea6b87521bcdc7dac90541d041f3d4f832fd1e9d301bf48bd563ceb8ee1283984aa3c88ff857e03b74
 MISC metadata.xml 506 BLAKE2B be65b6be62282fa47152985d79892fd04105a47e00a427ee8341d27aeff21b144bee7e7d0f16b2f4b617c941bdf5ebd9de37a42c39d117cdfd579c3035d35a74 SHA512 a207ec3db85a8e6f03feabd14da588f0b9ca9a88ab2495ade0f40b516b3bbd20fe78b14698d28da7ceed238737a9f4d63f587156ef609e846b485132d598c6bb
diff --git a/dev-python/aesara/aesara-2.7.2.ebuild b/dev-python/aesara/aesara-2.7.2.ebuild
new file mode 100644
index 000000000000..2baff9130511
--- /dev/null
+++ b/dev-python/aesara/aesara-2.7.2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing optfeature
+
+MY_P=aesara-rel-${PV}
+DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
+HOMEPAGE="
+	https://github.com/aesara-devs/aesara/
+	https://pypi.org/project/aesara/
+"
+SRC_URI="
+	https://github.com/aesara-devs/aesara/archive/rel-${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/cons[${PYTHON_USEDEP}]
+	dev-python/etuples[${PYTHON_USEDEP}]
+	dev-python/logical-unification[${PYTHON_USEDEP}]
+	dev-python/minikanren[${PYTHON_USEDEP}]
+	dev-python/filelock[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.17.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/aesara-2.6.5-compiledir-tid.patch
+)
+
+distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# speed tests are unreliable
+		tests/scan/test_basic.py::test_speed
+		tests/scan/test_basic.py::test_speed_rnn
+		tests/scan/test_basic.py::test_speed_batchrnn
+		tests/link/test_vm.py::test_speed
+		tests/link/test_vm.py::test_speed_lazy
+		tests/tensor/test_gc.py::test_merge_opt_runtime
+
+		# rounding problem?
+		# https://github.com/aesara-devs/aesara/issues/477
+		tests/tensor/test_math_scipy.py::TestGammaUBroadcast::test_good
+		tests/tensor/test_math_scipy.py::TestGammaUInplaceBroadcast::test_good
+	)
+	local EPYTEST_IGNORE=(
+		# we do not package numba
+		tests/link/test_numba.py
+		tests/link/test_numba_performance.py
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x AESARA_FLAGS="cxx=${CXX}"
+	AESARA_FLAGS+=",config.gcc__cxxflags=\"${CXXFLAGS}\""
+	AESARA_FLAGS+=',compiledir_format="compiledir_%(thread_id)s"'
+
+	epytest -p xdist.plugin -n "$(makeopts_jobs)"
+	# clean up the compiledir, as it can grow pretty large
+	rm -r "${HOME}"/.aesara || die
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	rm "${BUILD_DIR}/install$(python_get_sitedir)/bin/__init__.py" || die
+}
+
+pkg_postinst() {
+	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
+	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
+}
diff --git a/dev-python/aiosignal/Manifest b/dev-python/aiosignal/Manifest
index cbe78090f01a..cfc0bfaed227 100644
--- a/dev-python/aiosignal/Manifest
+++ b/dev-python/aiosignal/Manifest
@@ -1,4 +1,3 @@
 DIST aiosignal-1.2.0.gh.tar.gz 26171 BLAKE2B 02657c11f5ee96173c94ab889993f835904a79e3fee58121fb332583f8d81cb680087e667dc0f8e89cd9704bc338362f2878bef7080907a5a3f86bef7a30cac1 SHA512 e75df2fcaeeea7ff7688c20838600f6315bec25b82c48ed7a23b7853edd3d53d72f76a686ad9b0d856f43b0d476398196a8ce4eb98c8859234710ff008f8ba42
-EBUILD aiosignal-1.2.0-r1.ebuild 753 BLAKE2B 24617c8d9e9302004a94ec2c39540faea0bfc62eb272f3d13d35efb210a98cb624efb65cd5653822a904a471a67c183c0ab95ddecc787d4c39ede435cfcab28d SHA512 bbf185bf161242b285103940405bfbbe3c4700be7feb9de1e869ee8ccf2e0156afb30a37a4a51e0235cb6fc6a1f0ae5509948a12b03cabf648acf080feeaa405
-EBUILD aiosignal-1.2.0.ebuild 709 BLAKE2B 6a1a2d0eebf70c48ca3fff0ef4e1c8c80907b37641f126e9101d1c888d8909091397cef4c776bee12f33549f459208cafff73855b111bb43406b3f9ddf484fd3 SHA512 a95422395161b8002524dda8047c88a1455299853518f3c5947fe0fd2fde6bb9f3c715190bc7dc5df7eb11d08fd1bbe53163d4869707621d7968a4139578d2a2
-MISC metadata.xml 349 BLAKE2B cd7189a76f846812aedf465d859340944989ebeafe01e68a9dc3949bfcb2d2af0d85e33f33b79503b608ed205690def79892756c06e74ba47c91f9d642fa314b SHA512 70ad9782948e862b0b1324e2efbc16470785f0e42a5959aa1120323d61abff857541d585d7e1411a3f998e58eb7dd3e2ed7022bef4675fb897904a076d7b613d
+EBUILD aiosignal-1.2.0-r1.ebuild 745 BLAKE2B 534cff054719187cb2e97bd71ad1be3c6aad90397ab8c7e5fb9252bc3fa947e833e4a17497ce15fbf1f8539822a24bac190a4bc03702ea675f5e178fb6129408 SHA512 bde5dd6bc1c08e1c2847e8fb5093ea03d3546064c652ab8f71e4aee32aeae56e5b7ba89ead194574b10fcbaa936a442feaa5a57138175f7601d3f4da582291bc
+MISC metadata.xml 373 BLAKE2B b209b111344a544f995cee1af49f03f317e0747f11ba9cd3b34720b48f944efb52b622dfeea2abea1fa0d95207b711a16ddd19a16d86ae6935f2c3095ac94cb1 SHA512 74dee89fde8e295c370ca51ba1f8c041539da01ab54849adc8e90d5b67c238c9c54f19b5f0608dfa52271a5f1880995a2c61f1d649aa34fea650ef5e0c6927fb
diff --git a/dev-python/aiosignal/aiosignal-1.2.0-r1.ebuild b/dev-python/aiosignal/aiosignal-1.2.0-r1.ebuild
index 09b960da36b7..2961fee18787 100644
--- a/dev-python/aiosignal/aiosignal-1.2.0-r1.ebuild
+++ b/dev-python/aiosignal/aiosignal-1.2.0-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/frozenlist-1.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/aiosignal/aiosignal-1.2.0.ebuild b/dev-python/aiosignal/aiosignal-1.2.0.ebuild
deleted file mode 100644
index 0e0ac7e0e868..000000000000
--- a/dev-python/aiosignal/aiosignal-1.2.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="A list of registered asynchronous callbacks"
-HOMEPAGE="
-	https://pypi.org/project/aiosignal/
-	https://github.com/aio-libs/aiosignal/"
-SRC_URI="
-	https://github.com/aio-libs/aiosignal/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/frozenlist-1.1.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/addopts/d' pytest.ini || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/aiosignal/metadata.xml b/dev-python/aiosignal/metadata.xml
index 83e16614cbd5..d267902d0f80 100644
--- a/dev-python/aiosignal/metadata.xml
+++ b/dev-python/aiosignal/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">aiosignal</remote-id>
 		<remote-id type="github">aio-libs/aiosignal</remote-id>
diff --git a/dev-python/alabaster/Manifest b/dev-python/alabaster/Manifest
index e5b2a125bb57..a885f9c79fac 100644
--- a/dev-python/alabaster/Manifest
+++ b/dev-python/alabaster/Manifest
@@ -1,4 +1,3 @@
 DIST alabaster-0.7.12.tar.gz 11242 BLAKE2B 5690d9c0b8aabfc2c95c4279183d174d6a5768f89732028f7ec6eb790531499a2017b9f3b9896442e298f3189f79070178b3e281b6d0bcfad3741625caa99c48 SHA512 e3bfd0c92ce01f08d5e6d9dc1ef0967ca1f54827e08756f4a0ba7be8d3b8bec7f2e53a169b831ff5ce2d2548f7f52c6e518bcc513e49bb3e4c38274293aebbac
-EBUILD alabaster-0.7.12-r1.ebuild 511 BLAKE2B 17d38bea37c6c10e21bd311547b8d80380f528021983dfc4c681185a50b05cfbd5fed6d1e7c48cb4d9260fc1dac7e5d30e15fefd6d1a719feb84a1c993262834 SHA512 be34d4418a916af20d55bdef33e1c5129416dde249a3e61bc784d95941cc54b43f2a9e2a40424cfcdda49a8beb5ea4db5c1e9569d106ad2ce2c0847e4aef1181
-EBUILD alabaster-0.7.12.ebuild 471 BLAKE2B 60bd05b5e75c49c96f99685d782a44586defaa3f3ef0676533f6e04942e2b2e61a6bb5337024a281a2b779c5836ff6653512792fa9bb3c5d15883208dff8ff5e SHA512 e00b15edf74da77d107c65d86c1fddcf6b340928b5af23629379ca2c52f210a5312660eb9488e16e86e5bb8ec3c493256097bc66b26b3f9573fea21b70ba01ea
+EBUILD alabaster-0.7.12-r1.ebuild 503 BLAKE2B 5042f2462f8f8d377bbda1f0f9c6cfd9ce5ad328d4c4e6d478ac18bd26a158fa8578e0ca89d229c40f5221c8a86902ffc019989b740c49cb773dc7047a837211 SHA512 45540521fdc79bcde0d43f33a11d84f0f538c387c3b5a0f56d644e22da59b6585c65280a6c6cbd208b45dbe820edf07578097331eb3c8e7155d81b3b2a1226c1
 MISC metadata.xml 410 BLAKE2B 1419bfb66f3dbb231c8f106fd95012bd8a2e1c0c50d7eeac0620519b0e8246117f4c73d704dd55739f0a853e79321a08060299156050ca70b34a66e54447e3e4 SHA512 0265a6729c8c32a6ca98b04dd35fe569d8b800fe2a679b54e4c40cb79b2838e301e5a7edd59aa861aa12a55c525108b8b0f90d31a1d6d8488be88c14ad2f3541
diff --git a/dev-python/alabaster/alabaster-0.7.12-r1.ebuild b/dev-python/alabaster/alabaster-0.7.12-r1.ebuild
index aa5ef7b0b3e5..473cfbe0ffde 100644
--- a/dev-python/alabaster/alabaster-0.7.12-r1.ebuild
+++ b/dev-python/alabaster/alabaster-0.7.12-r1.ebuild
@@ -14,4 +14,4 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris"
diff --git a/dev-python/alabaster/alabaster-0.7.12.ebuild b/dev-python/alabaster/alabaster-0.7.12.ebuild
deleted file mode 100644
index 6f239988481c..000000000000
--- a/dev-python/alabaster/alabaster-0.7.12.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
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A configurable sidebar-enabled Sphinx theme"
-HOMEPAGE="https://github.com/bitprophet/alabaster"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris"
diff --git a/dev-python/alagitpull/Manifest b/dev-python/alagitpull/Manifest
index 3572455d8f8a..bfbf9d9dcca0 100644
--- a/dev-python/alagitpull/Manifest
+++ b/dev-python/alagitpull/Manifest
@@ -1,3 +1,5 @@
+DIST alagitpull-0.0.23.gh.tar.gz 6692 BLAKE2B 63af3da6e98521487fad233dd648d9217d8e89c0d17e49dd771e934c0808a52c0659661ca8104c53c2d0fddf458650458e676e14b2e9c3820f353ab42044a490 SHA512 1620c0e25299f694f29f6e54105a2f336dee90535370a691a6e23a879a68626ef4aa19ae40ecc835553fe3b0272d48e4f5213c1ada054ad20d47034fc20dea3c
 DIST alagitpull-0.0.23.tar.gz 6692 BLAKE2B 63af3da6e98521487fad233dd648d9217d8e89c0d17e49dd771e934c0808a52c0659661ca8104c53c2d0fddf458650458e676e14b2e9c3820f353ab42044a490 SHA512 1620c0e25299f694f29f6e54105a2f336dee90535370a691a6e23a879a68626ef4aa19ae40ecc835553fe3b0272d48e4f5213c1ada054ad20d47034fc20dea3c
 EBUILD alagitpull-0.0.23-r1.ebuild 552 BLAKE2B 7e19442f581ffbd6d11c5da8b0b7fc796b15400fecd77bcc2c57c0015132dadcd3d0a9ffdc8659d639dbfec3777441a6a68c78dbdf795c9d80f2e9937081f9c2 SHA512 e6836892d2f99b83d5d3588b87936dd23f2d62326184da2f89f4692dfff8892565afb2cfcaca90193d0648eb483e7233f27476057a2af7e84762905252b4d215
+EBUILD alagitpull-0.0.23-r2.ebuild 558 BLAKE2B 436c68e42a999604244cc8e1bc2ae9d4dac909491a7037263fa68ab45d4b0a8b7059d2ca847a2bf6c957de20a2504b8a74d4f79ff6d2dea88dac39bd0aa43ac6 SHA512 c8ac747c5dc0634707ac5a4911735b80839e6320f5ed53b5ad54a755d9168673c21c35baa36ec65a1d1b994c2b61b67fa904200480ff1d813915f3ca9ee19317
 MISC metadata.xml 347 BLAKE2B 7f394b6b5262adc148a746a72308a74d8b7ae3d9c0896c775779415c3a4119026593957a58ea08bdf621309865759a4856a63221d3925258a34e026c1fd61044 SHA512 a5b91da9672da28f77f1ce059f00965de86de54b3f7b45a580b5d5509d42a38f256cf6525cc87a52cf0203713fd81f8cef06fd4dc8a1febf6c7690d6db57dcb8
diff --git a/dev-python/alagitpull/alagitpull-0.0.23-r2.ebuild b/dev-python/alagitpull/alagitpull-0.0.23-r2.ebuild
new file mode 100644
index 000000000000..ce9528abbf6f
--- /dev/null
+++ b/dev-python/alagitpull/alagitpull-0.0.23-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{7..11} pypy3 )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="alabaster sub-theme used on git-pull docs"
+HOMEPAGE="https://github.com/git-pull/alagitpull"
+SRC_URI="https://github.com/git-pull/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+SLOT="0"
+
+RDEPEND="
+	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}"
+
+# no tests...
diff --git a/dev-python/ansible-compat/Manifest b/dev-python/ansible-compat/Manifest
index d7fd56b8e288..e4d5c3f3daa0 100644
--- a/dev-python/ansible-compat/Manifest
+++ b/dev-python/ansible-compat/Manifest
@@ -1,7 +1,3 @@
-DIST ansible-compat-2.0.3.tar.gz 35328 BLAKE2B cd5a476eb23de667381c9a6667d6bd781821fc50e1aec65ca47e8bb9d47beccbea0ee62f763ed421c18c95d9f1d1c14f5cc2a62bcc77d664213eb614ccd568e4 SHA512 0887e5da23041d02be0371bfd9569256252c586f80cd92ab855b32172328989c8160e57169aff6d72f1c3c89c9d3a00b56293e3badc0dc4aad135b1992d06599
-DIST ansible-compat-2.0.4.tar.gz 35447 BLAKE2B 53aa93ef3144071c2d9022bce99c6d20a67650fa98a6896db4fd1c866ada292390cc8e6bb6e7bd3b2b05cef8b3cab2803522ca1bbb7dbacb7b9da29b16f1fbb7 SHA512 8fd6738cf2caf4cae3590e839edd76fdb21ebbb88f50bda470e6711fda4ac8ef18eded3ae4ff72e3b53925afc5649658892e434da943ebd7e986d18afe9cc6af
 DIST ansible-compat-2.1.0.tar.gz 37840 BLAKE2B 5ac74cdaef1c932094996f331ed94418836b3351cbd376ae35ef22046b68dad0a8ab68fd293015db9954e0a5e1df4b5c529b3845cee5778daed2bb207733ca4f SHA512 a85681aff3d34ef4a4cdad8f419017a174bf315034495bc032a7e33d586cbcf72de74d163b6faf3cd21988704e5dbb922872b83a23981891311dbb18e53797a3
-EBUILD ansible-compat-2.0.3.ebuild 1752 BLAKE2B 0cd874164f298c45b39041a23c5b1de34398473eebd168cb48af5efcf777b4bf22c7afac88fed59d36d71c0ae3125df4de4f7aa32dd31c4360a10c6ca5540721 SHA512 0c9128bc5a377bf278b07981ee4404393e7164f1a1621d5f75b566f5b08ae8e189f276a21d146d306686727fba090455df37360c36ef4d82c8f18a125830a061
-EBUILD ansible-compat-2.0.4.ebuild 1752 BLAKE2B 0cd874164f298c45b39041a23c5b1de34398473eebd168cb48af5efcf777b4bf22c7afac88fed59d36d71c0ae3125df4de4f7aa32dd31c4360a10c6ca5540721 SHA512 0c9128bc5a377bf278b07981ee4404393e7164f1a1621d5f75b566f5b08ae8e189f276a21d146d306686727fba090455df37360c36ef4d82c8f18a125830a061
 EBUILD ansible-compat-2.1.0.ebuild 1801 BLAKE2B 429e761c9a8dc220ef53274cba9f0da1a1647ee483e6afb0bf98fe14e25507d907b4515d4fc266ddbd53cc96cb105c172fc800c98c2a1becbc85c43900f64be6 SHA512 8c299014a4005e2a6e199e848e8829b792368c1862311c07b77d8df258ef6b16ec2bca27c2cf3a78f879052aa883267f37f91b2ac725a53787bb84923d1d7e62
 MISC metadata.xml 510 BLAKE2B 3f47270866cb9acc5944b71547640b69003891268ffc07b5cd10e6ba8842b6f644ab4dea3b3da2d20b17f34d90e565b6f03a4dbb8ea38fa282fed283ac22fac1 SHA512 65d8604e46581bf9ecb3d8e358f3a211b18c51beea22c92a1cd3668ba86140e3bd8d91a38c221e73fe13a3e0da1cbfc2030b3f7733ee55e045530b49cd77d46d
diff --git a/dev-python/ansible-compat/ansible-compat-2.0.3.ebuild b/dev-python/ansible-compat/ansible-compat-2.0.3.ebuild
deleted file mode 100644
index 5b3828e761ae..000000000000
--- a/dev-python/ansible-compat/ansible-compat-2.0.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Contains functions that facilitate working with various versions of Ansible"
-HOMEPAGE="
-	https://pypi.org/project/ansible-compat/
-	https://github.com/ansible/ansible-compat/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-RDEPEND="
-	>=app-admin/ansible-base-2.9.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/subprocess-tee-0.3.5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-6.3.1[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm_git_archive-1.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pytest-markdown[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-plus[${PYTHON_USEDEP}]
-	)
-"
-
-# All these tests attempt to connect to galaxy.ansible.com
-EPYTEST_DESELECT=(
-	test/test_runtime.py::test_install_collection
-	test/test_runtime.py::test_install_collection_dest
-	test/test_runtime.py::test_prepare_environment_with_collections
-	test/test_runtime.py::test_prerun_reqs_v1
-	test/test_runtime.py::test_prerun_reqs_v2
-	test/test_runtime.py::test_require_collection_no_cache_dir
-	test/test_runtime.py::test_require_collection_wrong_version
-	test/test_runtime.py::test_require_collection
-	test/test_runtime.py::test_upgrade_collection
-	test/test_runtime_example.py::test_runtime
-)
-
-distutils_enable_sphinx docs \
-	dev-python/ansible-pygments \
-	dev-python/myst_parser \
-	dev-python/sphinx_ansible_theme
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -p pytest_markdown.plugin
-}
diff --git a/dev-python/ansible-compat/ansible-compat-2.0.4.ebuild b/dev-python/ansible-compat/ansible-compat-2.0.4.ebuild
deleted file mode 100644
index 5b3828e761ae..000000000000
--- a/dev-python/ansible-compat/ansible-compat-2.0.4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Contains functions that facilitate working with various versions of Ansible"
-HOMEPAGE="
-	https://pypi.org/project/ansible-compat/
-	https://github.com/ansible/ansible-compat/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-RDEPEND="
-	>=app-admin/ansible-base-2.9.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/subprocess-tee-0.3.5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-6.3.1[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm_git_archive-1.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pytest-markdown[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-plus[${PYTHON_USEDEP}]
-	)
-"
-
-# All these tests attempt to connect to galaxy.ansible.com
-EPYTEST_DESELECT=(
-	test/test_runtime.py::test_install_collection
-	test/test_runtime.py::test_install_collection_dest
-	test/test_runtime.py::test_prepare_environment_with_collections
-	test/test_runtime.py::test_prerun_reqs_v1
-	test/test_runtime.py::test_prerun_reqs_v2
-	test/test_runtime.py::test_require_collection_no_cache_dir
-	test/test_runtime.py::test_require_collection_wrong_version
-	test/test_runtime.py::test_require_collection
-	test/test_runtime.py::test_upgrade_collection
-	test/test_runtime_example.py::test_runtime
-)
-
-distutils_enable_sphinx docs \
-	dev-python/ansible-pygments \
-	dev-python/myst_parser \
-	dev-python/sphinx_ansible_theme
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -p pytest_markdown.plugin
-}
diff --git a/dev-python/anyio/Manifest b/dev-python/anyio/Manifest
index c50b57db5c21..50711e1f46a3 100644
--- a/dev-python/anyio/Manifest
+++ b/dev-python/anyio/Manifest
@@ -1,6 +1,3 @@
-AUX anyio-3.5.0-pytest-7.patch 2624 BLAKE2B e9a1fd06838f2d8fd9c2a2a1e33f6d55d5d9b0edfbb3eb1cc703164a2c85e1f7c3a1a099b6b659826098b5710352b289dcb129b5248c1a6fa392efd26652f258 SHA512 207d7e4cd4b3be7399625874bfae47be94b7593e53a1fd61f84ee87810992c0a06a466ca47b1419858d81879c25ba6666e043015ce5271034186d77a506e290f
-DIST anyio-3.5.0.tar.gz 136934 BLAKE2B 422d604c23658844467926f42c09895e54debfd3ddf2f7fa561eccae0c9cbc225f51d663cb9f98a2455736ad7a81eb4ae40a6f3ad66f3d2f0b02d0a5157203e0 SHA512 b91124c95d194eb7e4542405a973895d21562a2636d9600d528465da52536d1ffedbf5a6fc3ea5b1ff3e83e7dca2b42f090bb2ff6b077e32f5a2c314f07d3206
 DIST anyio-3.6.1.tar.gz 140240 BLAKE2B 391892591bee88df8fd5c099b6670af8e01af0610f7659e2f2e717c2dfd94d6e5212260acf3acca6c8b149cab6781044fb665d579a63b322332bf87767374858 SHA512 99ae55eada2df971405a1592afd980ac964c80a4502465a2016423182409691d0c943280a3a7448efc78036e481614451585238b62ebea924709f0ba888f7604
-EBUILD anyio-3.5.0-r1.ebuild 1384 BLAKE2B f8e9e433032e988ddfea16c92c9958fa6e0361de2f16fa266fb90c281042accfd91325ffc8e82f5c2029ac6ec07f01768c1bf4e67e0ebfa3aef025d9afd1978f SHA512 1d76d8380944877dc4eea7faca809744fd3cf4d5debde055d6e396bf6bce4661c60dcd29e827995e8cc03eb19dfb95ed43096ec73374244752dd633ec658642e
-EBUILD anyio-3.6.1.ebuild 1308 BLAKE2B b274faba27fbce2d852cb8d85f8952487914e41e679f83fdefd3a9a00298ffb1f5c65e83c1103865eae86654b6fc721e7ea44cf9418f63352c8319ff55fa6dc8 SHA512 ad08c4f2c16afe1f0cb9599c0049c30626e64383e76b620971b720497064eefc44cdff718dbf35b804c39c1b3e9bb733f0af954803893cfd3d46c53082c0db11
+EBUILD anyio-3.6.1.ebuild 1300 BLAKE2B 42ceb4294e4567c3491dd6b82d5461d7b8ea8e335dc56fa727bb2374e94b392c45a682613024726230aa72e1bd8a39c8ad088e317f502ceea89e14f3bfb60289 SHA512 aa362a78e27a0340f21cdea392124841a17909e36cb859775c4f8b7045b20e11866054e972d23d562cefde81c1b69689bbe2cc056347a09dd89c35d6313a2c2e
 MISC metadata.xml 1422 BLAKE2B 63acae587e7088e33ee5eb93a2a222899e54a5eb511118794f88e7c5a012d10983eb925427688a0b509b094e30a9cc9acc5f0c1765ea73e569161e0c30722000 SHA512 e0b540d5d739b7673a5a8682477f209f8b3648aad06a1c0610543a2e9dcbeca1cb1e52212d8088a5987a1c3bc3152cc5984ad5b5d0706fcdb5866b22de07b1eb
diff --git a/dev-python/anyio/anyio-3.5.0-r1.ebuild b/dev-python/anyio/anyio-3.5.0-r1.ebuild
deleted file mode 100644
index a90f9a7309cb..000000000000
--- a/dev-python/anyio/anyio-3.5.0-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Compatibility layer for multiple asynchronous event loop implementations"
-HOMEPAGE="
-	https://github.com/agronholm/anyio/
-	https://pypi.org/project/anyio/
-"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/idna-2.8[${PYTHON_USEDEP}]
-	>=dev-python/sniffio-1.1[${PYTHON_USEDEP}]
-"
-# On amd64, let's get more test coverage by dragging in uvloop, but let's
-# not bother on other arches where uvloop may not be supported.
-BDEPEND="
-	test? (
-		>=dev-python/hypothesis-4.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-7[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-		amd64? (
-			$(python_gen_cond_dep '
-				>=dev-python/uvloop-0.15[${PYTHON_USEDEP}]
-			' 'python*')
-		)
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme \
-	dev-python/sphinx-autodoc-typehints
-
-PATCHES=(
-	"${FILESDIR}"/${P}-pytest-7.patch
-)
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -m 'not network'
-}
diff --git a/dev-python/anyio/anyio-3.6.1.ebuild b/dev-python/anyio/anyio-3.6.1.ebuild
index b386087da308..1b5b39a19de0 100644
--- a/dev-python/anyio/anyio-3.6.1.ebuild
+++ b/dev-python/anyio/anyio-3.6.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/idna-2.8[${PYTHON_USEDEP}]
diff --git a/dev-python/anyio/files/anyio-3.5.0-pytest-7.patch b/dev-python/anyio/files/anyio-3.5.0-pytest-7.patch
deleted file mode 100644
index 858404632959..000000000000
--- a/dev-python/anyio/files/anyio-3.5.0-pytest-7.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From fed7cc4f95e196f68251bcb9253da3b143ea8e7e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Alex=20Gr=C3=B6nholm?= <alex.gronholm@nextday.fi>
-Date: Mon, 7 Feb 2022 00:16:18 +0200
-Subject: [PATCH] Upgraded pytest to 7.0
-
----
- setup.cfg                   |  2 +-
- tests/test_pytest_plugin.py | 14 +++++++-------
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/tests/test_pytest_plugin.py b/tests/test_pytest_plugin.py
-index 4255702..f3b0e0c 100644
---- a/tests/test_pytest_plugin.py
-+++ b/tests/test_pytest_plugin.py
-@@ -1,5 +1,5 @@
- import pytest
--from _pytest.pytester import Testdir
-+from _pytest.pytester import Pytester
- 
- from anyio import get_all_backends
- 
-@@ -9,7 +9,7 @@ pytestmark = pytest.mark.filterwarnings(
- pytest_args = '-v', '-p', 'anyio', '-p', 'no:asyncio'
- 
- 
--def test_plugin(testdir: Testdir) -> None:
-+def test_plugin(testdir: Pytester) -> None:
-     testdir.makeconftest(
-         """
-         import sniffio
-@@ -67,7 +67,7 @@ def test_plugin(testdir: Testdir) -> None:
-     result.assert_outcomes(passed=3 * len(get_all_backends()), skipped=len(get_all_backends()))
- 
- 
--def test_asyncio(testdir: Testdir) -> None:
-+def test_asyncio(testdir: Pytester) -> None:
-     testdir.makeconftest(
-         """
-         import asyncio
-@@ -140,7 +140,7 @@ def test_asyncio(testdir: Testdir) -> None:
-     result.assert_outcomes(passed=2, failed=1, errors=2)
- 
- 
--def test_autouse_async_fixture(testdir: Testdir) -> None:
-+def test_autouse_async_fixture(testdir: Pytester) -> None:
-     testdir.makeconftest(
-         """
-         import pytest
-@@ -177,7 +177,7 @@ def test_autouse_async_fixture(testdir: Testdir) -> None:
-     result.assert_outcomes(passed=len(get_all_backends()))
- 
- 
--def test_cancel_scope_in_asyncgen_fixture(testdir: Testdir) -> None:
-+def test_cancel_scope_in_asyncgen_fixture(testdir: Pytester) -> None:
-     testdir.makepyfile(
-         """
-         import pytest
-@@ -204,7 +204,7 @@ def test_cancel_scope_in_asyncgen_fixture(testdir: Testdir) -> None:
-     result.assert_outcomes(passed=len(get_all_backends()))
- 
- 
--def test_hypothesis_module_mark(testdir: Testdir) -> None:
-+def test_hypothesis_module_mark(testdir: Pytester) -> None:
-     testdir.makepyfile(
-         """
-         import pytest
-@@ -235,7 +235,7 @@ def test_hypothesis_module_mark(testdir: Testdir) -> None:
-     result.assert_outcomes(passed=len(get_all_backends()) + 1, xfailed=len(get_all_backends()))
- 
- 
--def test_hypothesis_function_mark(testdir: Testdir) -> None:
-+def test_hypothesis_function_mark(testdir: Pytester) -> None:
-     testdir.makepyfile(
-         """
-         import pytest
--- 
-2.35.1
-
diff --git a/dev-python/anyqt/Manifest b/dev-python/anyqt/Manifest
index b919a2152d22..a2fa6351c8cb 100644
--- a/dev-python/anyqt/Manifest
+++ b/dev-python/anyqt/Manifest
@@ -1,3 +1,3 @@
-DIST anyqt-0.0.14.gh.tar.gz 48200 BLAKE2B 15b17e2cb1067dd176d08a267b7fa0272dc9cdaa32c4cae3260053564df22c210a609dad8e4764c9cafeb0241dcabb93bbf8703e0a2ffef38c7f035e9f9f253b SHA512 e3a191cb5e94ee0287405ffff9261100400a78b261fce347268759352ff23a220e46b26882cfdd449be0191080d551d3b16c2feb0a411582ab0aaf1dc79e58cc
-EBUILD anyqt-0.0.14.ebuild 438 BLAKE2B 6f250fed435be2118abbe2cab7828af55b87deb8493a1f82a2574b83e3be34b837e81962fd77291a1a3e606b994cc54395d9164b97d1091bf8115cf66bbbd700 SHA512 d35422f6120cf63f691176155947c5439c0e4051ef5814fe95ad819447068dfb8c8cc782e1d6317081c0aefce7d12369f6f4e0e44e97f943e0075e2cdf6f84c0
+DIST anyqt-0.1.1.gh.tar.gz 54461 BLAKE2B ec78ecf5d326412b953f95379203bc81c92f13ad7b11e44630cf43062a08b9cfa8436b7c18ef6762d43968c87cebc0eadb33b1cecd159c3278e65538cfb80967 SHA512 5e3f6784fe3826b3017365945bc7053a58c4d7db5745c664fa845780212bf89db2b136459afe90df00d63d1507b56fa5b4a579526d9a9f4169943e5d52e230c4
+EBUILD anyqt-0.1.1.ebuild 1131 BLAKE2B 55597d93bea192f212e3581105cf0fcb7535ba0a4b0a67bde02b48fc1f16c883c4066be43e3e09fb3d267809ed7d86b87777d3d4cef3a16319d03bce81b638e0 SHA512 00a6dac4d70f251545103d16bdc7f881fb74787f952edd31f503ded446176b0e26efa05d11110018895f8492298e661c91e6709ffb42db6bc911da83d66a6243
 MISC metadata.xml 286 BLAKE2B 0498e01030909d49b890a4174b0b198548a3cb324b4c85e3cb29108004bcfb71adf01ca64be576bd5a1ac9b36a09a6b600d799e6a0c29152018b4519f18f567b SHA512 0797b1c07ad778e31012eb93070599ddfd687dedf0a073f463c950dd1c213d417708d0a95b26dbf07d4aa11c66c24a22891d285896d87bc2a29728519e5f2cf2
diff --git a/dev-python/anyqt/anyqt-0.0.14.ebuild b/dev-python/anyqt/anyqt-0.0.14.ebuild
deleted file mode 100644
index 73085a977eb7..000000000000
--- a/dev-python/anyqt/anyqt-0.0.14.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="PyQt4/PyQt5 compatibility layer"
-HOMEPAGE="https://github.com/ales-erjavec/anyqt"
-SRC_URI="
-	https://github.com/ales-erjavec/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/anyqt/anyqt-0.1.1.ebuild b/dev-python/anyqt/anyqt-0.1.1.ebuild
new file mode 100644
index 000000000000..66988862ec73
--- /dev/null
+++ b/dev-python/anyqt/anyqt-0.1.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="PyQt4/PyQt5 compatibility layer"
+HOMEPAGE="
+	https://github.com/ales-erjavec/anyqt/
+	https://pypi.org/project/AnyQt/
+"
+SRC_URI="
+	https://github.com/ales-erjavec/anyqt/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	|| (
+		dev-python/pyside2[${PYTHON_USEDEP}]
+		dev-python/PyQt5[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/pyside2[${PYTHON_USEDEP}]
+		dev-python/PyQt5[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local -x QT_API
+	# plugins may preload Qt modules
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	for QT_API in pyqt5 pyside2; do
+		local EPYTEST_IGNORE=()
+		[[ ${QT_API} == pyside2 ]] && EPYTEST_IGNORE+=(
+			tests/test_qaction_set_menu.py
+		)
+
+		einfo "Testing ${QT_API}"
+		nonfatal epytest tests ||
+			die "Tests failed with ${EPYTHON} / ${QT_API}"
+	done
+}
diff --git a/dev-python/asteval/Manifest b/dev-python/asteval/Manifest
index 5a4bb6394e7e..9e137e7c2a51 100644
--- a/dev-python/asteval/Manifest
+++ b/dev-python/asteval/Manifest
@@ -1,5 +1,3 @@
-DIST asteval-0.9.26.tar.gz 40113 BLAKE2B 9d63b78c500e521ea2740a3068087c42fdb00913c1e110d71fba3dbc9187bd02169a095d08db16c6b2b10d7e066a0e0578ff81d220d0cadcf994bb75790ff450 SHA512 8d568edb018416ff40d09d9dd123ccf595426d84e1f1554a22a19dae045703494fabacf1e15a2778c3ed042b1ad2f3b318fd37a20a15c50301e651d657902e57
 DIST asteval-0.9.27.tar.gz 41789 BLAKE2B 6db628dfc90479b605370e6cd4c3eb27a6fdabd2422016aab200ddb217fc5459df77ae99397145511600ae4a79e259c9e7c75c3be50bf5201e08915a76ca5571 SHA512 b56fb81f1055ab66868084edb89775ec87f40ee45563531bf4661ee65656e777b388856e691740af60b4a3891e872683768ac590a78fda2fed9173e613aa7263
-EBUILD asteval-0.9.26.ebuild 439 BLAKE2B 1aaa47fafa628a6194959c2bf024eff4cd679daf083363e32857b13cb3955d352365aa51947c77e13469819493fd5a33e4588117630605aa91c10171890db3d3 SHA512 32455cec6a570d5799a37b91fd74e77476dccc0425bab217880eca0f87b5a50d6ceb608d0fc9135ed3ed1de50950611bcfe9af0511930acda30ca5d914014048
 EBUILD asteval-0.9.27.ebuild 610 BLAKE2B cb14facf2eb312582fd5395da3514d891d1c45f3dc94db15918e746f5c4f56110fa47287353a1f95f68b48f783cec3434c75196964c174e0c3e9eb36ded0cbbd SHA512 4f10dbb6ed34ffc47f169e1bafe31508a95ff9425d6b7f35c37da19d2e19bfd979cd39c0e5a31a3ed8e85fde63d044da9527f5760232fe3b39ca3b93fe932112
 MISC metadata.xml 388 BLAKE2B 8167e3615c8fbf4fdbee5ac6aa354ed365c255ece5a3793a5a9b9db68206781230437f824360c5ff7223ee70c33da9f2c2be1d9b7c9d7f4413b9da82b1a96c2f SHA512 a4185b786faa55a63dedb33b0a2ec1900f2e9fca3887d1531963047be795271c4300c51238afeaab98f39778b1cdace3193b1fa4b3e400d83f7201392b09f221
diff --git a/dev-python/asteval/asteval-0.9.26.ebuild b/dev-python/asteval/asteval-0.9.26.ebuild
deleted file mode 100644
index 753aecd981d7..000000000000
--- a/dev-python/asteval/asteval-0.9.26.ebuild
+++ /dev/null
@@ -1,17 +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 distutils-r1
-
-DESCRIPTION="Evaluator of Python expression using ast module"
-HOMEPAGE="https://newville.github.io/asteval/ https://github.com/newville/asteval"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-distutils_enable_tests pytest
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index fec02380afc6..42b73d327cc2 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,3 +1,5 @@
 DIST astroid-2.11.5.tar.gz 414503 BLAKE2B 3bdd93c8c958dc8ede9b5c4b0d01399578c1c8824c511aa6697e6653ef6caec2e2597a862e03a72fc0dc6d0bc63d327a0cf4b62b9632604e9b8485f84512b5b2 SHA512 6b6d1e35b95c68d7219534ceda6e2802cc6f2d9cd9bed6a880eaf0937dfb288d9fb58dac9be33072f4676a568f778eb26a78f447d4a44842a98d8677e151e1bb
+DIST astroid-2.11.6.gh.tar.gz 414842 BLAKE2B 3300037aad912be25d99cc20576f472b907c064c2cb434d9a40a9014df44749760cd8921411f3abdf8e08bd08e612cf6aec13d73ca38ec8ac31cd1ed007282bb SHA512 2276385d74d9bbfd0d99c786d2598105161b2c71c96ca73183b6e2672f8b61c31667c337a1d3967956ef5fdbb54392d604a84da5ac456354d04fb4ad37b11f61
 EBUILD astroid-2.11.5.ebuild 1783 BLAKE2B a1006a85d74f9412adcb9f57ab080b616e8e4dd33968c8c9aa0f4fc0402970eb2b21c1111f96302b41fa506357154e4c759429de4595d2547827f8874b7d477a SHA512 c5864ee70ddb96a53101bd4e759c1f5c3865be6c1c1d64fdd3c9d2959b5b6269b43d905c67359aeb0dc534ad22ef6556648af0ba93ca8c497abd014f56d846c7
+EBUILD astroid-2.11.6.ebuild 1794 BLAKE2B 79d94a97b10cc1410cbe8da6ca6b44f484fefb712a630bd7dde7d52f7c25cb4247d3e60594d605ec4844dbe210acbb59b19fefef51bc5b6609fbb0fcd3a8e2c2 SHA512 1273a20a8750416d73a5294131967c24c85ea0f2f017da9b0f07f712c311e82c74d8b65f9de65325f0cfbe84ae2364985a751b8dd72de51072b8ea2dd12d1ef3
 MISC metadata.xml 1143 BLAKE2B 1f6c4e004277eebed2e29cb935ef01e5f18fb0a526f99f0e875ae3815308dce0483b5274b4e23bed076464aa62a035937a7a3817e2d4a5fb9211b9043271e04c SHA512 56b07d0f08a49772661bc3d233cf1f628aa7c241c51b91d75dfbd44995e169d8ab5bbd99863d7b9b67792486346982a7b8eebefb462e7e212cd7dff920d80840
diff --git a/dev-python/astroid/astroid-2.11.6.ebuild b/dev-python/astroid/astroid-2.11.6.ebuild
new file mode 100644
index 000000000000..feef28506480
--- /dev/null
+++ b/dev-python/astroid/astroid-2.11.6.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="
+	https://github.com/PyCQA/astroid/
+	https://pypi.org/project/astroid/"
+SRC_URI="
+	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# Version specified in __pkginfo__.py.
+RDEPEND="
+	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-3.10[${PYTHON_USEDEP}]
+	<dev-python/wrapt-2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# no clue why it's broken
+		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
+		tests/unittest_brain_dataclasses.py::test_pydantic_field
+		tests/unittest_regrtest.py::NonRegressionTests::test_numpy_distutils
+		# some problem with warnings (our options?)
+		tests/unittest_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_one_arg
+		tests/unittest_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_two_args
+		tests/unittest_scoped_nodes.py::test_deprecation_of_doc_attribute
+	)
+
+	# Faker causes sys.path_importer_cache keys to be overwritten
+	# with PosixPaths
+	epytest -p no:faker
+}
diff --git a/dev-python/asyncstdlib/Manifest b/dev-python/asyncstdlib/Manifest
index d162131e787a..59f86f81f00a 100644
--- a/dev-python/asyncstdlib/Manifest
+++ b/dev-python/asyncstdlib/Manifest
@@ -1,5 +1,3 @@
-DIST asyncstdlib-3.10.4.gh.tar.gz 52905 BLAKE2B 7b71e816395ab9e33ad4bd3d78d62e8260b78d736ba8b70bb6c47d9d4bbcc431f4a54b8c604e4b520df11a5317a7ab1a70d765e40089b323f985217a943eb96b SHA512 ced64809f1a8d1f60ed045bef69ff6cef84fbcf1b4587c70421112cdc65d6344bb1fceeb55e64e17237a00672bbfff19d4627371b45e1e7659e405d506abf216
 DIST asyncstdlib-3.10.5.gh.tar.gz 54697 BLAKE2B b8a99a83e97084c4e09ddac0402ca23a8d42921b72774c0658aa0b9a1aa0ac1329baae782f105a52a4b6d979d490d97814ea6eac0e7570a7ca27784a27fa5c4d SHA512 3dfa8d1e5e2ef02dbf52fe7094b68496066978cfa9839cad59222ace40e0871369b45d93c1caa87e0f029c328253f6d72d8377625a8ed182498280662fcb7545
-EBUILD asyncstdlib-3.10.4.ebuild 515 BLAKE2B 202c4c54d1b7fc4a5e751bae83d369fd6e3c4a4ede1e1253d6709bd841f5a1a2509c61b5029b6197ec1d5120236a3b49c62ad781c06437038721c56297c9e335 SHA512 59783834379683699095adbbd6255677067ddd4a20e1b59a945ea251e58b8639bfef37d53bbdb51e33afcc84f60ec334e02e7c9b3a396e93f65dee7376abbf98
 EBUILD asyncstdlib-3.10.5.ebuild 515 BLAKE2B 202c4c54d1b7fc4a5e751bae83d369fd6e3c4a4ede1e1253d6709bd841f5a1a2509c61b5029b6197ec1d5120236a3b49c62ad781c06437038721c56297c9e335 SHA512 59783834379683699095adbbd6255677067ddd4a20e1b59a945ea251e58b8639bfef37d53bbdb51e33afcc84f60ec334e02e7c9b3a396e93f65dee7376abbf98
 MISC metadata.xml 359 BLAKE2B 10bdbf5adba9cefa912d8e1f195f20d4040bc2e8e3efb3fdc6efcb8272bb58160c6d772de3fe9ad9c4cb43e2817139319ffece082c3c043f1d97cb36ed8ac7a8 SHA512 e56f712f7446a3e68137a945a1ab212f6254740ce2f962fc7ab0061f41cb0d314809ad4fe3317fd10d8ebb594fb20d690d06b0a73636b13b5fdb5184cde2e306
diff --git a/dev-python/asyncstdlib/asyncstdlib-3.10.4.ebuild b/dev-python/asyncstdlib/asyncstdlib-3.10.4.ebuild
deleted file mode 100644
index c1603924e233..000000000000
--- a/dev-python/asyncstdlib/asyncstdlib-3.10.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="The missing async toolbox"
-HOMEPAGE="
-	https://github.com/maxfischer2781/asyncstdlib/
-	https://pypi.org/project/asyncstdlib/
-"
-SRC_URI="
-	https://github.com/maxfischer2781/asyncstdlib/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/authres/Manifest b/dev-python/authres/Manifest
index 009f66722c16..33f2c5e8743e 100644
--- a/dev-python/authres/Manifest
+++ b/dev-python/authres/Manifest
@@ -1,4 +1,3 @@
 DIST authres-1.2.0.tar.gz 23226 BLAKE2B ecae8e08a72cfca48a8264ae8d93bc29a8a7afc080a120b08380fe29be1ac50bb68a74e6741dbf7ada2f9eb901d2da0b1567e8aa10b7a82ba4953cd32cc94f57 SHA512 b801b24127f90608c4e7870a3a15bfb6e350f7d8bbe7b7cd9e1c6d541fd360afb9bdd15f35e864f01f8ff2d33d65650e712c932c9402ab2affb86bc7536b63e1
-EBUILD authres-1.2.0-r1.ebuild 586 BLAKE2B 70cf5fb565dbf6a3793734c7a4b0350dbad43db97636ce861dab5f662aa9df989fd15644865d6434412ff551747b41c8de203099e927bdbcbd1a8396668c573a SHA512 c9b7fc0285531bfa45126458c09c9892f6bc2235f96c0458f410362d57bd85d4aa64b7d4852eef588dbaa8e49da02b91e91e8952cb8958cf392d76d73e69b545
-EBUILD authres-1.2.0.ebuild 546 BLAKE2B b0d91da6e1744447675c74732e997596d177fa8a6cf17341050b35ccd6e91af702d1a538f3239e69014f802468809f161ade549f7c79f0ef4d5c42b87a2b7207 SHA512 1045bbb9e81ed1735c0872e7afee49e67c3bb9e9012167dfd71e3bf9aa31f3a9569200ebafef9141f6979dbf359d0afd3676b2d4fd6040e296c24965c7bd91fa
+EBUILD authres-1.2.0-r1.ebuild 583 BLAKE2B ec569e35db15b7907c976fe8c22dda5f9e6f619bcbbb6e01eee90ce8774fca5a3b352421f3c4d3d5a9a8acf5ea818499103821587a8ffa0a2d04a91543a3fac7 SHA512 7651b0613789dbe8a721fbea3e56ace61997d79686ae8d417e6131c937bf1bcc90523a28c4dc1320fe9a8dd894b2f22953be618729fe704f774ed172804a25de
 MISC metadata.xml 684 BLAKE2B 42c30f654a56951219acfbdde20fb17a13ba61f8206baf6e7f46727fc27c07f29b0ade7ed72c9a752055f96fe9f0b078cef689dab834a2b77f6c959944344e67 SHA512 237e59ab7f7ccced9743a8dbc8f0737845e120b8cf7a53fb91b41811db14c2cef93f913b5f873b150a05302dd17a45721cbe4795f63034c5524aafb5f82575f5
diff --git a/dev-python/authres/authres-1.2.0-r1.ebuild b/dev-python/authres/authres-1.2.0-r1.ebuild
index d925a072a73f..c9278ab80d4c 100644
--- a/dev-python/authres/authres-1.2.0-r1.ebuild
+++ b/dev-python/authres/authres-1.2.0-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 SLOT="0"
 
 python_test() {
diff --git a/dev-python/authres/authres-1.2.0.ebuild b/dev-python/authres/authres-1.2.0.ebuild
deleted file mode 100644
index 3eb7608b317a..000000000000
--- a/dev-python/authres/authres-1.2.0.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
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Parse and generate Authentication-Results headers"
-HOMEPAGE="https://launchpad.net/authentication-results-python
-	https://pypi.org/project/authres/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-KEYWORDS="amd64 arm64 x86"
-SLOT="0"
-
-python_test() {
-	"${EPYTHON}" -m doctest -v authres/tests ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/automat/Manifest b/dev-python/automat/Manifest
index 5d652f51599e..c7a112ae4d98 100644
--- a/dev-python/automat/Manifest
+++ b/dev-python/automat/Manifest
@@ -1,7 +1,6 @@
-AUX automat-0.8.0-no-setup-py-m2r-import.patch 826 BLAKE2B 835956b8e3ab657d09d683a173c43626f0af59056ccd25e3a7bc9167da4d5d081e095e91e96ee943e7329d28c3a70b9e001e8977d64bb85581ef19f73a9ecf93 SHA512 b89fd865e8b95283efdc96614b1230d3e8e6d70cdb0ba07842cdf07e1a546a5a89b7c88a0cd774ec47148579981d41cd7261cdd7069e2736807b64422b3ca56f
+AUX automat-20.2.0-ignore-m2r.patch 835 BLAKE2B 5ea7ced5d5dc65c0439ef3ada83359177f0625ef9b463148a63545784c0842cf2cfc24d04c58415ecb3071d88acf490aff4f774c163d3ca8e2e3bbdf0efa4e5d SHA512 f03ae46feb1d6e10b07168de5bf86cfbc07703e326c66606fca76bb077b9c547ad3356143e06842423255da72b191793734d5173fbb0d19b8a0c640cfad9f4af
 AUX automat-20.2.0-py311.patch 777 BLAKE2B fe26ab800644d6930a17690aa033c9b60ac9c50802c6fcab52bb13222dad34a356a1df03996e4b60c0b5af0d7a71668d8597c045bc7ea47129e25a1bef69b096 SHA512 0b06cee66e4193da7aed7caa007b2d89e1ab4bf6f29b22de5d85ada7e001f467847375a93a38a394d64d0dd716c696b403c5bafc4e84a1d7f0c75e4e8a7c8d6a
 AUX test_visualize-twisted-import-errors.patch 1999 BLAKE2B e551520aeb24b3df293eeda358fa3b9b3e33934af54ff6a7a205a0e1b5b7e916e34f8c81c103fa0fee93a22e7d0bc6ca3f7b8a17dedadeaccb02131ac23f94e4 SHA512 67f14d0b64333b872c0057eba32f77132a4bbf61c8867ec475c87552b3b553162c3e2a668ffeda0c75d85906273d50e4d80231213a3f46d1855316bb229fb6cb
 DIST Automat-20.2.0.tar.gz 61679 BLAKE2B 9dfb93a0bf0a348d8f7de0796b3e5715947eb84cc0aa507a453f438d2027ae877280ed6d7896192cee46f31c7d1c0eb6cb3dee36e1f13a315071513920c5b6d0 SHA512 715cb5dc087288492e6465a29e7d8502a84fadf451bc3d29da86335ea1c20f8efd9549f0c1eaac8800559dd8001dd73736c3bfacdc6321c83a35d2288d69632c
-EBUILD automat-20.2.0-r1.ebuild 1384 BLAKE2B 0466851652b1cf9b235e33018cc28cceb96dfd97f468b9ced7f17df0e5783fb211bf4f4e8229371091f698daab3888b7cb9b3af8f188c55be3020464f52a70fa SHA512 e14be1d127e013eb455d86d01df5be2fdbf798f4684cca0f0022273fccf4c3946dded81090c2472ffd1fe8e47e8c9d38209c2be4a8fb27626857342553624580
-EBUILD automat-20.2.0.ebuild 1605 BLAKE2B a727d52b663602e4ec23984e79fbd3692a0a439467721e6aa8866e82c14d427d7fc76152536286baefb9eec1d30fefcc29a15e87fe8a36e918b217a5590e4cb0 SHA512 bbf0f2c7e85e9a8ad17a7e2fa8cc3613b79112cafa8e0f6f2a21233a162594ff667c80b92a9a1cba10ece38758f2fd35a92be701152a7d2a3550da2ab8079012
+EBUILD automat-20.2.0-r1.ebuild 1411 BLAKE2B f88e012d28b2f22c178002b406b7b06301d3bb6c4a11f8a90981c5a1a6821ca30f8018a119eb8d9a02885688b5aa67e7515bdab52aa7eb0290f53d59003eda9e SHA512 8b0b6c4e3c7bee28bddfa2dcc2e9bc5bca455eb2f9a48a0aab16f53de35c47ccabc9f567940fbd3d82bf2887e62886c7a4104b8f4ee65210066491e7eafb5a05
 MISC metadata.xml 670 BLAKE2B a71e9da919b5a2d171c96df7f1de0f5ad0431fa6227d90fdf3a0ac47e5d0f9f56a4dbf7b247708c9f47a50756c5dfc78c90691ec38a6fbe543d4ce840c8c1ea6 SHA512 06362e4e337d503492b51d21164c858b071374cf8fe5a974bcf4b2f8bc870bfae21b1aa6e630f8b4c44ec5f900659b082b36a408e143e8d0e83916eb53f3ffd8
diff --git a/dev-python/automat/automat-20.2.0-r1.ebuild b/dev-python/automat/automat-20.2.0-r1.ebuild
index f2407e0572a0..b80987fef5ec 100644
--- a/dev-python/automat/automat-20.2.0-r1.ebuild
+++ b/dev-python/automat/automat-20.2.0-r1.ebuild
@@ -25,12 +25,12 @@ RDEPEND="
 "
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	!!dev-python/m2r
 "
 
 PATCHES=(
 	"${FILESDIR}/test_visualize-twisted-import-errors.patch"
 	"${FILESDIR}/${P}-py311.patch"
+	"${FILESDIR}/${PN}-20.2.0-ignore-m2r.patch"
 )
 
 distutils_enable_tests pytest
diff --git a/dev-python/automat/automat-20.2.0.ebuild b/dev-python/automat/automat-20.2.0.ebuild
deleted file mode 100644
index b4084934543a..000000000000
--- a/dev-python/automat/automat-20.2.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-MY_PN="A${PN:1}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Self-service finite-state machines for the programmer on the go"
-HOMEPAGE="https://github.com/glyph/automat https://pypi.org/project/Automat/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="examples"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/automat-0.8.0-no-setup-py-m2r-import.patch"
-	"${FILESDIR}/test_visualize-twisted-import-errors.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	if use test ; then
-		# Remove since this is upstream benchmarking tests
-		rm -r benchmark || die "FAILED to remove benchmark tests"
-	fi
-
-	# avoid a setuptools_scm dependency
-	sed -r -i "s:use_scm_version=True:version='${PV}': ;
-		s:[\"']setuptools[_-]scm[\"'](,|)::" setup.py || die
-	# strip m2r dep
-	sed -i -e "/'m2r'/d" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	if use examples; then
-		docinto examples
-		dodoc docs/examples/*.py
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	einfo "For additional visualization functionality install both these optional dependencies"
-	einfo "    >=dev-python/twisted-16.1.1"
-	einfo "    media-gfx/graphviz[python]"
-}
diff --git a/dev-python/automat/files/automat-0.8.0-no-setup-py-m2r-import.patch b/dev-python/automat/files/automat-0.8.0-no-setup-py-m2r-import.patch
deleted file mode 100644
index 161b219626da..000000000000
--- a/dev-python/automat/files/automat-0.8.0-no-setup-py-m2r-import.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/setup.py b/setup.py
-index d0dec04..7a85a6e 100644
---- a/setup.py
-+++ b/setup.py
-@@ -4,14 +4,6 @@ Setup file for automat
- 
- from setuptools import setup, find_packages
- 
--try:
--    from m2r import parse_from_file
--    long_description = parse_from_file('README.md')
--except(IOError, ImportError):
--    print("\n\n!!! m2r not found, long_description is bad, don't upload this to PyPI !!!\n\n")
--    import io
--    long_description = io.open('README.md', encoding="utf-8").read()
--
- setup(
-     name='Automat',
-     use_scm_version=True,
-@@ -19,7 +11,6 @@ setup(
-     description="""
-     Self-service finite-state machines for the programmer on the go.
-     """.strip(),
--    long_description=long_description,
-     packages=find_packages(exclude=[]),
-     package_dir={'automat': 'automat'},
-     setup_requires=[
diff --git a/dev-python/automat/files/automat-20.2.0-ignore-m2r.patch b/dev-python/automat/files/automat-20.2.0-ignore-m2r.patch
new file mode 100644
index 000000000000..5e3ef39f33e1
--- /dev/null
+++ b/dev-python/automat/files/automat-20.2.0-ignore-m2r.patch
@@ -0,0 +1,25 @@
+Completely ignore m2r (which is now last-rited) so we can drop the hard-blocker
+which makes world upgrades a pain (installed m2r would break b/c of newer
+mistune, and would break automat build).
+
+https://github.com/miyakogi/m2r/issues/66
+https://bugs.gentoo.org/848900
+https://bugs.gentoo.org/847532
+--- a/setup.py
++++ b/setup.py
+@@ -4,13 +4,8 @@ Setup file for automat
+ 
+ from setuptools import setup, find_packages
+ 
+-try:
+-    from m2r import parse_from_file
+-    long_description = parse_from_file('README.md')
+-except(IOError, ImportError):
+-    print("\n\n!!! m2r not found, long_description is bad, don't upload this to PyPI !!!\n\n")
+-    import io
+-    long_description = io.open('README.md', encoding="utf-8").read()
++import io
++long_description = io.open('README.md', encoding="utf-8").read()
+ 
+ setup(
+     name='Automat',
diff --git a/dev-python/autoprop/Manifest b/dev-python/autoprop/Manifest
index 57d4375e49ca..b7df050483df 100644
--- a/dev-python/autoprop/Manifest
+++ b/dev-python/autoprop/Manifest
@@ -1,5 +1,3 @@
-DIST autoprop-4.0.2.tar.gz 20050 BLAKE2B 06165a02dfee0755ccf375041487f015e632b56b24766ac3d4bd484caaf1c99a0506994f16ace753f5890b782690b640196ee0cd6fcce0078ef51f8addcfcfe6 SHA512 27c8578e8f023715b07ebe21f4f46e98e606c863d3257bb1c8c31d9f59551d2494ef99e24eed856b308c8c77e1a3276f9e370434aa3e61ebb0b32a9b44fceee7
 DIST autoprop-4.1.0.tar.gz 20254 BLAKE2B 2229ac42ffaa8a874bc4ab8b0bd032b5898e4c93badfa8e8d7a6f93309cd6d922932e0c2a5753b048cf98caff802a9545a706a8d776a648af67cae95b42338f4 SHA512 be356ca41935d77719cfb51db397e48fca74663f00c65862cd0c776c9f5ac9f4af891951ae14a6006736493f3721dfc7edf195fe83e73ebfb486cd8f492bd778
-EBUILD autoprop-4.0.2-r1.ebuild 533 BLAKE2B c4ba075a1e6ab3a1cb17235693001a1af6d007094a312f4df9d5ea8d9f76bb63d2a9e641c5d97d7991fdb98f4e7b1fc85bc6302a4d8927550e222d1f038c9ee4 SHA512 cac7dd30bb26816c5a76eb6e4caae643434c0c1205e124d5b2cdfe89512131e198c3644b927a1ceca82f9ad0f13217461f797f1bd67fcc61fda882fab0c3e332
 EBUILD autoprop-4.1.0.ebuild 535 BLAKE2B 78f61d60d1cf6d6974e548b7940ec2197796be5957e13d828dd34614cfb57e2b603ec96e86ad0b819523670a44871c96b58dbd18cc0da9339d4271a6f25d31ad SHA512 d73550c15a60b4036170c5ad27dc60fc74f14c563a4c9445057f26aa0564130c07a4b41ad302f79e93f9d9a03f428c839e7e74fbe0ab61de9809c3505f81d14e
 MISC metadata.xml 1376 BLAKE2B 4546775f81e9b3002d39733fceb5b0c505a909c8de9a81159ba6458147c1f7b632464fa55ab43b94c210ec1a2e07a8f4259bf5bd7a07ae3c5f0edee316741648 SHA512 76e109f6d16d5e8de55fa6d613ecaa0c47873ac46b5c5818b7569045eac6108ea6088031a5c9f1c2335dcc3f527cf90443bf5c6346443835c763e7dce07fbd18
diff --git a/dev-python/autoprop/autoprop-4.0.2-r1.ebuild b/dev-python/autoprop/autoprop-4.0.2-r1.ebuild
deleted file mode 100644
index aaa4275f756a..000000000000
--- a/dev-python/autoprop/autoprop-4.0.2-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Infer properties from accessor methods"
-HOMEPAGE="
-	https://github.com/kalekundert/autoprop/
-	https://pypi.org/project/autoprop/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/signature_dispatch-1.0.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/awxkit/Manifest b/dev-python/awxkit/Manifest
index 4d95179d9377..c9c8688ac7e8 100644
--- a/dev-python/awxkit/Manifest
+++ b/dev-python/awxkit/Manifest
@@ -1,5 +1,3 @@
-DIST awxkit-21.0.0.gh.tar.gz 16493147 BLAKE2B 9b89f9f6f2e231efcde0edeb7d39a1b328b9b534a38663a2463f974028ce96aa13677d8e14d4b4a55fd3de252d5e53dbab2d104e018ad60eaca1ddb1b7bf937c SHA512 e100359eb9be184924c9b562473dd23dcfddf270e72f2f0fc1f71f8774dc1d3fbfce6b365f13ecffe20b25b116690fcca504d373663c497e74d2d1185b98f01f
 DIST awxkit-21.1.0.gh.tar.gz 16516204 BLAKE2B 2891244e7dcb0aef7b2053713c4479b94528a69f1225a77c46243cb293ebfa2e86d59939bc906223e598c34a322a726c9b3f5fb9aa7859191385f9c15bae57a0 SHA512 2e2ff1ae5a1893e3ba464ff0ab3c5e98b7d0711c3ba1512b8a8f89e55385ab85df9623b23d6a81b2a800b0b184de1ef82fd23a655173fcbcebb1160e9eef973c
-EBUILD awxkit-21.0.0.ebuild 960 BLAKE2B e05e602d0daf612c9b4818838600e71682202d4c87189c0c13797e80e958659b2b33c0f72bcc45bd9f961d6294597922c301ba82f27b2b10580500c4d9e5c62f SHA512 d374a109811987644fad287ddec4e83759de82e67d94435927d0d44f8b19e2f480eaaf08ac124317aaa77e6866b0f88bdbac7bb2c7123f6d510c6374f3d292f4
 EBUILD awxkit-21.1.0.ebuild 960 BLAKE2B e05e602d0daf612c9b4818838600e71682202d4c87189c0c13797e80e958659b2b33c0f72bcc45bd9f961d6294597922c301ba82f27b2b10580500c4d9e5c62f SHA512 d374a109811987644fad287ddec4e83759de82e67d94435927d0d44f8b19e2f480eaaf08ac124317aaa77e6866b0f88bdbac7bb2c7123f6d510c6374f3d292f4
 MISC metadata.xml 512 BLAKE2B be7f98bdaff6b814e03c9f6c816a0f1f59dc2e8763298f8a48107ea50b0534eddb314bb6d8b8a0f8c1d7c89c381916031544eea4a06068fb9acab4d2c8c48a57 SHA512 7322d992e1d67ea200df0cbf144d08fd387d7cd6ccb72191fc94dd605c9aeecb4b8083917760e2203296d5514fccd7ca621133aef6622658d1ef2c33171c8b7d
diff --git a/dev-python/awxkit/awxkit-21.0.0.ebuild b/dev-python/awxkit/awxkit-21.0.0.ebuild
deleted file mode 100644
index f63cc6bc217b..000000000000
--- a/dev-python/awxkit/awxkit-21.0.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Command line interface for Ansible AWX"
-HOMEPAGE="https://github.com/ansible/awx"
-SRC_URI="https://github.com/ansible/awx/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}/awx-${PV}/awxkit"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/websocket-client[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-	sed -e 's|websocket-client==[[:digit:]\.]*|websocket-client|' \
-		-e "/'clean'/d" \
-		-i setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/bibtexparser/Manifest b/dev-python/bibtexparser/Manifest
index 83a93b7b4cbb..4f3c14950356 100644
--- a/dev-python/bibtexparser/Manifest
+++ b/dev-python/bibtexparser/Manifest
@@ -1,4 +1,3 @@
 DIST bibtexparser-1.2.0.gh.tar.gz 88600 BLAKE2B f02fca0330f035b3d9051c04ab5da57232178c637d250839c3939780424d2be9afa619d7a7781cbc92917da12aeb5f35847a54f460823b46a2a717f4b0ca6f8e SHA512 c8775f17d963c6dc5cf3f9dda52c798b70c939cf4c7a90501194561abd7f2386d6681cc236615366a9d8917ad01238fc2e6a4299f98b50b594c74c99bdb3ecee
 EBUILD bibtexparser-1.2.0-r2.ebuild 906 BLAKE2B adedf9b1fce5b4f76b39c72e877ca75773e744a5fcc2e19dba72f25c51273421c53eaacd7094370c0d2462f47d3b1df6d95c3fa89ee07cab88a8ef62f8fadb8c SHA512 96582a7d9b69afc1677fde89d80443490c677034dfcd559b6c580be777dc71012aa2894b2342d7e3be973591053bce935362313569730d5b2df75effd51dae28
-EBUILD bibtexparser-1.2.0.ebuild 751 BLAKE2B df35bc66a8e57314ea5bfdc3397049c0a56b954999680c3c185aa5135a3842f4ca6e9e30a06618bef143ca4fded392a9017736bfce4ecc13b2539cdbab899c69 SHA512 bdbd245fe0ab5099e77963221c94e08d25f6eb13466624979fbc8985fbf4915a960e49a249b60b8b0a88ca76eed1aa3166b594a98095bce3e419686977fae4e4
 MISC metadata.xml 420 BLAKE2B 931e6f1915be7d1b809bd2f59fec9f057fe3f6c6219ae3d5d8103a5e5155d13dc6decfbb5865d7a333247178371adae7f2712d12f0e001badb941d5fb2b8e6e7 SHA512 254ba66a5078b040ff86a77ae890c70f4d49374f2094b67c5046a8acc308901048fe8c46d1eb8d9716f13c0ac6a6c48625aa799837a1c586b2ce450a50704d33
diff --git a/dev-python/bibtexparser/bibtexparser-1.2.0.ebuild b/dev-python/bibtexparser/bibtexparser-1.2.0.ebuild
deleted file mode 100644
index d973deb63dd5..000000000000
--- a/dev-python/bibtexparser/bibtexparser-1.2.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A BibTeX parser written in python"
-HOMEPAGE="https://github.com/sciunto-org/python-bibtexparser"
-SRC_URI="
-	https://github.com/sciunto-org/python-bibtexparser/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/python-${P}"
-
-LICENSE="|| ( BSD LGPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/pyparsing[${PYTHON_USEDEP}]"
-
-distutils_enable_tests nose
-
-src_prepare() {
-	# fixed in upstream 5f98bac62e8ff3c8ab6b956f288f1c61b99c6a5d
-	sed -e 's:unittest2:unittest:' \
-		-i bibtexparser/tests/test_crossref_resolving.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/bleach/Manifest b/dev-python/bleach/Manifest
index e4803bf472b3..b4465a907947 100644
--- a/dev-python/bleach/Manifest
+++ b/dev-python/bleach/Manifest
@@ -1,5 +1,4 @@
 AUX bleach-4.1.0-py39.patch 1216 BLAKE2B 15bd8b862610ca68b5a2d6d7569bb72a6293c85c0dd0a2b9dda58ab50a25c021fd8306219c47d851a738e57acee3e0ddd43a55dc5a30a789010a3d385cb8ba69 SHA512 10d2aff6c5f62a56589f8f129df1f5f3b514a57a8518669b909491b801d6994b548ec4f7f7c04f161bf06c82aee397a5610787682e07aa40e0d469242bd2c5bd
 DIST bleach-5.0.0.tar.gz 198789 BLAKE2B 0b2847e9342be1854a08679230b3ea0fcb1a514eaa6c11f344057e59310b6d769e2bee91272295a0f60fa0ed1c2e4503340276d99794d260b6a63e2c4ea76703 SHA512 5b8e0c94a7bd8270581719928ec869c5c3c91900be0a293adfb342acfc55df7e63211e95786e6a39b3661b3852e91a8b37ff805387fb3e6a286e8a5dce8e3655
-EBUILD bleach-5.0.0-r1.ebuild 1109 BLAKE2B f2544d0cc5b4b1cd12f676e0a1658dea4a25828057cb28c7a6040e3a5f452dace8c2b2ecafe32642229cfa069e3ebe67b57415666395b825a9633ca1d1570553 SHA512 0cbb9b6b73886edf7463bf4ae0b16fdfc6d006bacd5840b136068bfa7e0a7cfc258fd8d362930cce9f2182ac911a5d9ac95b6387c26dd50f0db997a3ea69f0cd
-EBUILD bleach-5.0.0.ebuild 1067 BLAKE2B 985c307a06214540e85a7ff1dcc81604723b8d17d626c26033c23411a1c42b4f0c7e937595cc0d186d8797e2b6caff06695d97aa77157609540884944f035a43 SHA512 bac520911fe80ba570a7f1c84630b3d7dccb8fb8341f343e61836aac1532fcb488fdc701a66f19df94a28db3de4c93ee98005834b583e703b242507226589489
+EBUILD bleach-5.0.0-r1.ebuild 1101 BLAKE2B 4e34d0f4918b39b3c29d260714008bcce5a84a65ad7e72b4aec08b9f3c74dde52e768ea748d750a4cff8e377cc4116cf02b700076fd8c04a0dc6928b0a2fcdf9 SHA512 c07586ab99178517c1f84d73b45e4c46018706d10ef60895527e58b522c93b4d0cc6dea21f8f99fea65ad0ee7236e77046d544f38fe346bd1e038f266b42cf40
 MISC metadata.xml 401 BLAKE2B 9250e95731d3269e92b401f17d066e70838fa4009e9b62e6ec88420ada2b4695179fad49a8b010eab162ed0af2e2398fa987e04cd8ad34813dfb1ed1ad1208e4 SHA512 e5ba74a86efa4450b9181fb5f32dfd63ac5d3e34b8e1c447b21acb4cb615d77711761352a8e1e4807bde17b1b2e688eded99d8a9785cd42a915d470084b98a04
diff --git a/dev-python/bleach/bleach-5.0.0-r1.ebuild b/dev-python/bleach/bleach-5.0.0-r1.ebuild
index 461937a17e8a..2fe9eb311b0e 100644
--- a/dev-python/bleach/bleach-5.0.0-r1.ebuild
+++ b/dev-python/bleach/bleach-5.0.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/bleach/bleach-5.0.0.ebuild b/dev-python/bleach/bleach-5.0.0.ebuild
deleted file mode 100644
index 15421afc82d7..000000000000
--- a/dev-python/bleach/bleach-5.0.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="An easy whitelist-based HTML-sanitizing tool"
-HOMEPAGE="
-	https://github.com/mozilla/bleach/
-	https://pypi.org/project/bleach/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/html5lib-1.0.1-r1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.1.0-py39.patch
-)
-
-src_prepare() {
-	# unbundle unpatched broken html5lib
-	rm -r bleach/_vendor || die
-	sed -i -e 's:bleach\._vendor\.::' \
-		bleach/html5lib_shim.py \
-		bleach/sanitizer.py \
-		tests/test_clean.py || die
-	# indirect html5lib deps
-	sed -i -e '/six/d' -e '/webencodings/d' setup.py || die
-
-	sed -i -e '/import/s/parse/urllib.&/' bleach/sanitizer.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index aeaea7bf29c5..b5ecb499e1bb 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,16 +1,22 @@
 DIST boto3-1.23.10.gh.tar.gz 504080 BLAKE2B 1840715ec72b10131a430abdb303adf7619fb4dc542cb22acefffe378c96d094eb7d024c068df1df48882a22fc52e3883791da39d0e4fb34abdddad4d78c0ce8 SHA512 88d0abfc990eba2118698c27fe9f556a2b2ef27d0e287c2b3d65a1d485d4be264a5e9ccc02c017c404941c34efdb5f9d480ceb7c5752f99ebf95d3fab184dded
+DIST boto3-1.24.10.gh.tar.gz 508606 BLAKE2B 5f4a4a8a39fb48d8cb15d3e0aec7304df57ce5a5c40d4dc41f7780645fb7e09fbfafe96588d92ea85af3c6d26d319510b534ee7b8c52f56aa166116edde7fc7d SHA512 98433526006e16af552e22722b5c913eca0d7de63f172312c168ccab7bdc2b587f265a89c2f4d7e948962393907044a0a493e49e627d731d27733e66fcae0407
 DIST boto3-1.24.2.gh.tar.gz 505904 BLAKE2B e5fe9aa089caaa91aa41554a07ba97da55b04f5cc77be58df10ad4b6b9d3ab8ce22f988f658cb653d9f3890a307ea895c1cd57c30b6729ba12a1ee61f475ba1d SHA512 23b550194805859e37b8f3a7b75390bba500e7043e32930ab1ac46d2fca672472def9f4821e0deadaba6e6010afa05e4385a0f6fe229798250746b079fa27810
 DIST boto3-1.24.3.gh.tar.gz 506694 BLAKE2B 5049ad69810c0fcb4d4133fae8efb7d5f44a5b766c3a53710692136231c2f147b08a6782e51f12ab0e22189cb8bbaf90805ca03d0f6eeffe047678b1b21cf72f SHA512 7652ffbfb41df2dde924e85c251dba84643d67b719ea7dc366dcb0f6988815474b0e2a44dba74ebda5f9b1f5576df715dbd16b70ad4109e846766bf34e9d92d0
 DIST boto3-1.24.4.gh.tar.gz 507020 BLAKE2B 2689aa84d0cc5a8c7978d18c480576015bb212a2714eb4edf3f9dd59e0be09da4a866e64fad1f3033cf02b807af7f827cceb56716bec5f04048c2eeb49b12804 SHA512 d23d1d7cb11d45d4419a5c4c1fcadacbfff8e8ebae69c8e522aa00e966048cd341bff8587e18bd0f043f1abd0558522aecede3aa83b84498df95c5a06068f15b
 DIST boto3-1.24.5.gh.tar.gz 508100 BLAKE2B 5ad9e6325a507ea94738eebee58200b4c4e967db5afb5a3076ad55b64df8637f961074377375d9bf4df233c1d53444738e82a868515d04dbd9632dad0889e2c0 SHA512 9387c70c54e05b1007135a896e69934d128a31735cdf0b61ccadd9412c7be5d53259c60a2b4410157037f9a95afaf8ef4f4a97d35e290ff12b7deb125a73d903
 DIST boto3-1.24.6.gh.tar.gz 508258 BLAKE2B 705b01006dfa63e386b39a0c4e791e0d9f2e4c5ae72bda3245843ba802556b1328214f80df788497d8b646882af816cfdba6d2769fe5bef82cbaf629fe9fcac6 SHA512 198df4e2f1e5f42bf0faa8baaea0bbc3d88fffda435afc3eccfdcc56940773dcdf43e8cb533a48265907bd118d8e969c7f9b37affb6508a8147ecee486017d92
 DIST boto3-1.24.7.gh.tar.gz 508670 BLAKE2B d526f6a4dc4c6126c61ca7c9074b4341c742f84a6e95b38cd8a450fb74df379cee44513e1be6bc7cd0c8f728598d0ecfc06240120a8da71f75f86371498f5233 SHA512 4d57e38c18138b950f93a234132ac1d31c9a29ad00ca5e1298517d6b16ff2849802ce6cfeb8de390c2eb25086043d45e0276a7a563707595649ca1905367be52
+DIST boto3-1.24.8.gh.tar.gz 508760 BLAKE2B b904db3d57e2f7b6399670884f1c82d144840ed30b1a2e2955b33322ef24dba051aa1e19e49fcf3e449b8d0948d7715a37e300030c490a28a836e6c16923f82c SHA512 6abd7eb7591269c9b74c4cea1a8c52f4ccb1d7503ef2784e010ae20cd623bae340ff23301646dd51d1442a3a6a920e235362e2c6f872834fbb6233304c1a69fc
+DIST boto3-1.24.9.gh.tar.gz 508882 BLAKE2B 67943139aebcbe67a3a084ed696b66c088a28beba90ba86758a22e2544ad9604fb507590f500deea75db4d189a7ffbccd687fe636de02ed68908bdc960c03a50 SHA512 250be46943df9b89da3ebb687144592b77fd233785da854c45a4e7c06e7a663c4a7779ef404a257ac72082dda776693d410b20a261859dd7866624e204f770a7
 EBUILD boto3-1.23.10.ebuild 1579 BLAKE2B 92b7396288aaa6c640581a1983d94077d77c59cce7ac656ee45c82877b99e8ba4d3fdaa6f0e6457763b54ab1bdbbb4c8027f47aafa0440a4e041f8e1e7b17547 SHA512 79fec851f65d212066cf50b0c43a0ebf973a9afc17108ce7542d35cd4a56f0fcc58479ba03bb22dae86be78362a36d68cc64e1080fb0c693c5c90b7b27a90b9a
+EBUILD boto3-1.24.10.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.24.2.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.24.3.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.24.4.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.24.5.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.24.6.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.24.7.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
+EBUILD boto3-1.24.8.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
+EBUILD boto3-1.24.9.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-9999.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.24.10.ebuild b/dev-python/boto3/boto3-1.24.10.ebuild
new file mode 100644
index 000000000000..6edcc751d54b
--- /dev/null
+++ b/dev-python/boto3/boto3-1.24.10.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="
+		https://github.com/boto/boto3/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/boto3/boto3-1.24.8.ebuild b/dev-python/boto3/boto3-1.24.8.ebuild
new file mode 100644
index 000000000000..6edcc751d54b
--- /dev/null
+++ b/dev-python/boto3/boto3-1.24.8.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="
+		https://github.com/boto/boto3/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/boto3/boto3-1.24.9.ebuild b/dev-python/boto3/boto3-1.24.9.ebuild
new file mode 100644
index 000000000000..6edcc751d54b
--- /dev/null
+++ b/dev-python/boto3/boto3-1.24.9.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="
+		https://github.com/boto/boto3/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 7a113dc4a9ef..fe6c698c9a1b 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,17 +1,23 @@
 AUX botocore-1.26.0-py311.patch 2164 BLAKE2B bbe6b3db1a2369293894e8d7ef610301223e0e569b1b21d5ade581af42f09ac59a67a9b8e960140b81a184b4bc0962805c6cc352253f3cbeb411563bd3d1a74b SHA512 375589f268b37a9c92f816887356f1d1713d182126566dfa8abd370df605f77a55aca88a5562182fe8b1574f402409ce6bfe49b0c6705f7f06e441649ae5aa99
 DIST botocore-1.26.10.tar.gz 9008316 BLAKE2B a05078ec5732015cbd8ea4da2d2d82e28f4241b7c3164f3410ae396a19f79c116f7a9059a3361e99eacc952f860a516b187375dbf64ee5e4e5648e8c3b0f95a5 SHA512 b12e9002dc8e0912a9681938f343b51d628f0b2798693dc81636fe7ede01d006d5bc8a901f92edf10a88d97c3c6311aaf97206a6f55070e645747536fe39b144
+DIST botocore-1.27.10.tar.gz 9107238 BLAKE2B 9bf9d6d0789acc84e1328704d6db0a36d5d036be38aa61b26f776aa42ab91889faa1f871a5373808a76906973c897dcd4a6d07d914c29fd4edf8b6ac2fae3511 SHA512 1a178ca96d126b74d63d0a3199cbb55370c8ba77559d87173f496aef961364ab1df13a8f5e5565cbf79ec8f17cf2d2178952e1739b40b29a34b8b78118d18982
 DIST botocore-1.27.2.tar.gz 9026413 BLAKE2B 013724df76fb87c8e7731401d09774bec303aced7c3a01bb97935865f34193d1f313d49f32c1f6b7addab9b24384f26caca44b03ba0e77014821dc7cab5142ef SHA512 85045c13fa935b017f66edc132d2a31da2ecbe0c7bfcab369cb1d5f76d8a1401d303ab7d3e2ce95d53e9a59ea81dbf5380c1106169d84f40b21cbb926e35abb9
 DIST botocore-1.27.3.tar.gz 9078424 BLAKE2B 62414c2474ec44b3385c589793fd0c54984d2302239b78295bfbdc3739160bbae5bb910207dc7252b7adb96d6cd69add7413000399bcb20b671e3fbdad860c02 SHA512 47ed3e68c10e4175cdbe2122dab9319b9059f9457e27258a142224311042c5ae4692d293d29dc9b4855e65eea561fb7b703f7ddc663064413144aaf72fda33a5
 DIST botocore-1.27.4.tar.gz 9079162 BLAKE2B 3707e0b53022185248d5c086860ddf99f6d43803414929252a6b090fbeb765606e1fa97896f6d9016e97a0a6b5388d754941f3a88645f5c1ea18f206d73127a7 SHA512 3743d79febcf33302de20b364267ae39a0887c7fa5e116a7209b1281b4985e593b5d3f0ea7bb6e608036d99d4df46931192f5a3a63c98f7b3da26a16ea6b5a3f
 DIST botocore-1.27.5.tar.gz 9110489 BLAKE2B 0cafef7d573de45613b3a03e94c7ddedc6fcf13bc450c5a7509748062d29e5ac2de96982a606cd7af007a2c01004bead3575e7150c4120964edb290d0002c9c9 SHA512 8fc4a81da092e3b3bfa5b347d6a03fc6b969aeecc7a13b0b5de75d96d8c826411cf82bd22e373d6a8b5a9da323468bf1fd9b036b2b72d1801c49056c5c991858
 DIST botocore-1.27.6.tar.gz 9109990 BLAKE2B ca3b1f4d14f4bbce87dcd989caf2fa79e475471c951ae13b2804e89f21a1dbf4949cbaba0abcf766f7a324f2b214135643b8d33f02a0866a06a5d81a1e50aa33 SHA512 a2e40d6b875b50bc8fe4180d8ad74a6f72c01f79d0130f9f4107436027fd0b40634359a5b9273bc9fd2eded16d14f40bd297467e57cc65707a495c312618d766
 DIST botocore-1.27.7.tar.gz 9102259 BLAKE2B 094ec463531f1dfd54ff32d0f44ebc39cdc0a6d4c3e19b49a25e25d9d13acdcd26c782c1d4819ea4f1cb8954a858aa6e997411785678700b7ca03cd8844527b5 SHA512 d4a1327f4314279548af00fbc6da2f9fc5f25f704da3f6ddfa90773878f28ac9f03556b00fa4c0207ec2e952eb716aa98c1c22abffbd51d82dc55d9e4ceeca5c
+DIST botocore-1.27.8.tar.gz 9103145 BLAKE2B c4e5605ba17219e39499e0809b67b0834bd561bd5dcfa43846cd3132305ba1d811044a1630ecb1bd8315ebc65bae5443efe89a15b6a4f11971aa758bdaa2162c SHA512 61bd87164104135684a6e01b89102eabd5cf9b9115d014d3c08450508d776cbea007b2f072171d380507eb745725919438a742d3cfd6fe32d74bf0f5ac97f04a
+DIST botocore-1.27.9.tar.gz 9104233 BLAKE2B 673b209aa07ff82233d11dcc7661ceddb92bfd97699917840fc95391103f676b28f3fc55488be9e75eb822333ef8f4ad16a2fc7397067fd6271ffc200d806216 SHA512 5d7537287e8a7ede91296c5ac2313ef590f2fcabce5b615ecf0cf58a557b7cba68d826bb014f0e1b26484e16db1f3db8a78b0abe084cfc5f53406f4c830d9c9a
 EBUILD botocore-1.26.10.ebuild 1628 BLAKE2B d42a7b3e64fa2a66eb055490c1525faedaf9178fcfbb8aec42fa09841ddca13b276a8872699d7e5b2cea725fd2e835570a59c2eb9783a63bb728266499185321 SHA512 cacfaeb4cee9165055b59b287a2bcf73759c4d1291b3fd0831ca309ef6937347655be22c715328e212264c62e41bd03b024eed020826b07165f5518e52f4729a
+EBUILD botocore-1.27.10.ebuild 1635 BLAKE2B fa5b1fc2a47df0e4f5932aa89a5f84d50b25e36b186cc87f8acd3069bae7eda9ba405a99fd38633480cc5bcefebdfac8456aa49a855d7a221c05d329b211b18a SHA512 1dc2cd74fc9d7d205abba35e494f2189e7ba4dfdd2ded0e7fdbfc44c6aaad840074c5b676bbe2aadc84b738e1223d26d8c9e4ed57489503482879a49b0da1305
 EBUILD botocore-1.27.2.ebuild 1635 BLAKE2B fa5b1fc2a47df0e4f5932aa89a5f84d50b25e36b186cc87f8acd3069bae7eda9ba405a99fd38633480cc5bcefebdfac8456aa49a855d7a221c05d329b211b18a SHA512 1dc2cd74fc9d7d205abba35e494f2189e7ba4dfdd2ded0e7fdbfc44c6aaad840074c5b676bbe2aadc84b738e1223d26d8c9e4ed57489503482879a49b0da1305
 EBUILD botocore-1.27.3.ebuild 1635 BLAKE2B fa5b1fc2a47df0e4f5932aa89a5f84d50b25e36b186cc87f8acd3069bae7eda9ba405a99fd38633480cc5bcefebdfac8456aa49a855d7a221c05d329b211b18a SHA512 1dc2cd74fc9d7d205abba35e494f2189e7ba4dfdd2ded0e7fdbfc44c6aaad840074c5b676bbe2aadc84b738e1223d26d8c9e4ed57489503482879a49b0da1305
 EBUILD botocore-1.27.4.ebuild 1635 BLAKE2B fa5b1fc2a47df0e4f5932aa89a5f84d50b25e36b186cc87f8acd3069bae7eda9ba405a99fd38633480cc5bcefebdfac8456aa49a855d7a221c05d329b211b18a SHA512 1dc2cd74fc9d7d205abba35e494f2189e7ba4dfdd2ded0e7fdbfc44c6aaad840074c5b676bbe2aadc84b738e1223d26d8c9e4ed57489503482879a49b0da1305
 EBUILD botocore-1.27.5.ebuild 1635 BLAKE2B fa5b1fc2a47df0e4f5932aa89a5f84d50b25e36b186cc87f8acd3069bae7eda9ba405a99fd38633480cc5bcefebdfac8456aa49a855d7a221c05d329b211b18a SHA512 1dc2cd74fc9d7d205abba35e494f2189e7ba4dfdd2ded0e7fdbfc44c6aaad840074c5b676bbe2aadc84b738e1223d26d8c9e4ed57489503482879a49b0da1305
 EBUILD botocore-1.27.6.ebuild 1635 BLAKE2B fa5b1fc2a47df0e4f5932aa89a5f84d50b25e36b186cc87f8acd3069bae7eda9ba405a99fd38633480cc5bcefebdfac8456aa49a855d7a221c05d329b211b18a SHA512 1dc2cd74fc9d7d205abba35e494f2189e7ba4dfdd2ded0e7fdbfc44c6aaad840074c5b676bbe2aadc84b738e1223d26d8c9e4ed57489503482879a49b0da1305
 EBUILD botocore-1.27.7.ebuild 1635 BLAKE2B fa5b1fc2a47df0e4f5932aa89a5f84d50b25e36b186cc87f8acd3069bae7eda9ba405a99fd38633480cc5bcefebdfac8456aa49a855d7a221c05d329b211b18a SHA512 1dc2cd74fc9d7d205abba35e494f2189e7ba4dfdd2ded0e7fdbfc44c6aaad840074c5b676bbe2aadc84b738e1223d26d8c9e4ed57489503482879a49b0da1305
+EBUILD botocore-1.27.8.ebuild 1635 BLAKE2B fa5b1fc2a47df0e4f5932aa89a5f84d50b25e36b186cc87f8acd3069bae7eda9ba405a99fd38633480cc5bcefebdfac8456aa49a855d7a221c05d329b211b18a SHA512 1dc2cd74fc9d7d205abba35e494f2189e7ba4dfdd2ded0e7fdbfc44c6aaad840074c5b676bbe2aadc84b738e1223d26d8c9e4ed57489503482879a49b0da1305
+EBUILD botocore-1.27.9.ebuild 1635 BLAKE2B fa5b1fc2a47df0e4f5932aa89a5f84d50b25e36b186cc87f8acd3069bae7eda9ba405a99fd38633480cc5bcefebdfac8456aa49a855d7a221c05d329b211b18a SHA512 1dc2cd74fc9d7d205abba35e494f2189e7ba4dfdd2ded0e7fdbfc44c6aaad840074c5b676bbe2aadc84b738e1223d26d8c9e4ed57489503482879a49b0da1305
 EBUILD botocore-9999.ebuild 1635 BLAKE2B fa5b1fc2a47df0e4f5932aa89a5f84d50b25e36b186cc87f8acd3069bae7eda9ba405a99fd38633480cc5bcefebdfac8456aa49a855d7a221c05d329b211b18a SHA512 1dc2cd74fc9d7d205abba35e494f2189e7ba4dfdd2ded0e7fdbfc44c6aaad840074c5b676bbe2aadc84b738e1223d26d8c9e4ed57489503482879a49b0da1305
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.27.10.ebuild b/dev-python/botocore/botocore-1.27.10.ebuild
new file mode 100644
index 000000000000..2fb86c59b25e
--- /dev/null
+++ b/dev-python/botocore/botocore-1.27.10.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/botocore-1.26.0-py311.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/botocore/botocore-1.27.8.ebuild b/dev-python/botocore/botocore-1.27.8.ebuild
new file mode 100644
index 000000000000..2fb86c59b25e
--- /dev/null
+++ b/dev-python/botocore/botocore-1.27.8.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/botocore-1.26.0-py311.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/botocore/botocore-1.27.9.ebuild b/dev-python/botocore/botocore-1.27.9.ebuild
new file mode 100644
index 000000000000..2fb86c59b25e
--- /dev/null
+++ b/dev-python/botocore/botocore-1.27.9.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/botocore-1.26.0-py311.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/brotlicffi/Manifest b/dev-python/brotlicffi/Manifest
index 435a6318f359..86133ac9eada 100644
--- a/dev-python/brotlicffi/Manifest
+++ b/dev-python/brotlicffi/Manifest
@@ -1,5 +1,5 @@
 DIST brotli-46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz 19840371 BLAKE2B b9a1c3c2e5b62bd63b392debe54bd1732ac1cb31f88500f0142108b453649d96901d9a03b6db98642cb9abaf9188c06d440f2b8bd3cf57fbbb52196a931f5079 SHA512 dc573c90491032a205f32f0ce9c93e95b06c70a3107caa9501e038a212226c37117d63709a29843367344bf7d18cf32d0c0578b11166387198e12b38b1522406
 DIST brotlicffi-1.0.9.2.gh.tar.gz 22714 BLAKE2B 463cff7aed04718d1c77e6b3477dbbdb40cf61f0e045a7759bf1e8656e3b07e7b9f3ff5c5356069e752d750774a6ab203588a4094d27ad7ab9ae80f091c6ea3a SHA512 3d200f606c9851f0049835b53dd1f117727786505b5887e246934f41a978d375e1fa5a078e0811f130c009931e41c51575bd9d55b602ee7b6daebe9759ed15d5
-EBUILD brotlicffi-1.0.9.2-r1.ebuild 1476 BLAKE2B 273695f74c2bbdb38995ca785535f5c49083f17ff278d4c2285be879999a43ca680f6726c88562ac01feef6b096ed7f8b11ee4f54a6ccb8c9530d435ccb51eaa SHA512 893ff4f9c20ab70d443577fdb37d99037abb0247e932b1daa64507f6332ece06289c810566ad21f7a107aada7c3ddc620f80305c1227ecc4547d9cd80a7c1dee
+EBUILD brotlicffi-1.0.9.2-r1.ebuild 1473 BLAKE2B b9666a74ff380dfc8bfa0f1976153715fcaa2ebab0e652cf0ef8680b29a84ac59b3fcc14334da0b8c8214600c25240e68e992f4b99ec2626344b8f2a249de5c0 SHA512 df9a1344ac657a3be6a42534135e4e18b6e710fae1b417d6de0f602a5ea7ad6c362663d6e3b68434a8f245ef8870a255652a2f96d582f8ab1ef40fcacadd1701
 EBUILD brotlicffi-1.0.9.2.ebuild 1454 BLAKE2B 6589d0f4f6d33f85c763572b70cc3e69856ffa292eb0acc298876e08c5a70dc634d792980697c2492d31f15f5606ae2a92815a7d4a6b9a88304b21145b4788ec SHA512 b644f341362526fdd9ea5527f107eacae72d5f294dfaa39e66afb5f29312d5b684d7943beaa704f4de96ee83f918350ef6cf85d6409619dbcce5d24a98c5fcb6
 MISC metadata.xml 377 BLAKE2B 13782cfbd514306140bb23753666679d94d15f89f0c2c84c13972151bd17d5c4ccd88930d60d732632f5e9a263d864b7aa5dcd741aae60508240e0f6d6f29230 SHA512 e440ae16d42ea9ab96317d26d88bf2955e0d8d5b4a6c41aca96a46c4f1e1c149d710d4cf52a569d6eb6d34ead71007fc2b2a7f67ff3c241e83d9573fe4d41e38
diff --git a/dev-python/brotlicffi/brotlicffi-1.0.9.2-r1.ebuild b/dev-python/brotlicffi/brotlicffi-1.0.9.2-r1.ebuild
index aa45e1af7fef..8e789bb97fbb 100644
--- a/dev-python/brotlicffi/brotlicffi-1.0.9.2-r1.ebuild
+++ b/dev-python/brotlicffi/brotlicffi-1.0.9.2-r1.ebuild
@@ -28,7 +28,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	app-arch/brotli:=
diff --git a/dev-python/cachelib/Manifest b/dev-python/cachelib/Manifest
index 047de166de34..676e103a6498 100644
--- a/dev-python/cachelib/Manifest
+++ b/dev-python/cachelib/Manifest
@@ -1,5 +1,5 @@
-DIST cachelib-0.6.0.tar.gz 21842 BLAKE2B a886e0d6558dd7b3e5cb70124ac48b1fd55de13bc15998da32111300505501252f96c419c2bf82f6101c51e70d2d98f5a49362554891513ea3d1c8522d17ab4c SHA512 a828b6a9e425efcfbae46c148f1f56fd6f4df2ce37ed72b90fc4c3ea9edec1273aa2f2e1f9ad59fad30d1b8e37d6794176b85a7b5afb2b65264bd992dfc5c4f6
 DIST cachelib-0.7.0.tar.gz 20650 BLAKE2B 427101910200e4b13e1cc98582499d4f78066c5b904797ae1e9565c5bc6ea445a9ab8f9eed4e6a9a18dcf8aa0ce369ed455edf6f551ff5476a8101aa75cec192 SHA512 034bc14a2de2eb7a7fe52a51f5ff1f96c700c1d915430c0fae5f95bb045989fbbe82458c1dc17cd8ea54e016d014679628a7470e8564f43cd763480eb06d3153
-EBUILD cachelib-0.6.0.ebuild 790 BLAKE2B 0939bf9ab5d15a42d5c711d88e8477cf11a210317bc927db6c55e82777f6ef818b52d1207e5dfc8fe8ca70e2c2e82f926d27efec7b2320a90ef94cef644d4040 SHA512 a5e7d3161ee066961d70f9a7d64f80499b8aa1fd0e86d0d126e76790527d20dcf67cbef0b5f9de672240d9aaf973d30bd25c2341e38760724e88dbf6dbc68091
-EBUILD cachelib-0.7.0.ebuild 802 BLAKE2B 326f568966b6ada58d635de4691708afe2888edabb87f2b197bcdaf9490336bf9806722383b7856a46a600cd0d47b3565cdc58ad614286757af2292ede6c2d4e SHA512 8d595c60ca5116866d65f49a12c503898a58a18ecceda4648239b7d556c5d10e6b4655097ed42907c8ba8ac3ff4326b34676248f6a80d6ab66b2317d7ac62d65
-MISC metadata.xml 511 BLAKE2B 91d347ae3d102f0831213680f93183f31f69e37391a173295dfd089158ea48a7fdd667637a827d499aa9a2f824c906e36f35d09ca6de5dc6136249f789ee2ee4 SHA512 fcd3c2942861b6c836c82a0a8acc068f7bbef731ce45fad046bb00fe50a67f0eccbfab061f879c5f824fcf34d3fe5e84f93aa151c75f04408d0d2e3609f86dd1
+DIST cachelib-0.8.0.tar.gz 20532 BLAKE2B 5c9eea33f52fc1ddb4eb6c25be64f43e08ed9c17f8fe233b492f293adee022ad840107a9806654d9446d2f249a78ff18d3c85c8964229df8341e7ce499e8431f SHA512 da9ba99e9c6c70542883a183558561486f37098266c4eb38920494653229f78ac47c2c26499e660241231a606040940105434f260ee977599f605a42e9b3f802
+EBUILD cachelib-0.7.0.ebuild 800 BLAKE2B 70509990e6ef68f643862633f323e194b2893f1cec2c509acd1d0101027e48ab23f65d78ffc091bf74f8af9ab5d4e182c014e1c0c8442fd546ed7740a67e4fb5 SHA512 f1e37a1feee7cf795989d685b2502599efee74625181b882ce51ce51f356d38ea92a66c98cad38c165cbb8ddb818ff4328b73bbfe450fd7a37015e3f8a3aa1cf
+EBUILD cachelib-0.8.0.ebuild 802 BLAKE2B 326f568966b6ada58d635de4691708afe2888edabb87f2b197bcdaf9490336bf9806722383b7856a46a600cd0d47b3565cdc58ad614286757af2292ede6c2d4e SHA512 8d595c60ca5116866d65f49a12c503898a58a18ecceda4648239b7d556c5d10e6b4655097ed42907c8ba8ac3ff4326b34676248f6a80d6ab66b2317d7ac62d65
+MISC metadata.xml 510 BLAKE2B 456e0e3b13e50fe5fa9fb866ca2a20a63c180a55691d3cc5e63cea2d16e9e98c61d4f0f5d043f8cf73c2fa80f68eb1b29f182b5bec04356fe1c5965799ea4d7f SHA512 caef760fc497745b37e82a3603d360eb3ca173d1c6d1ee47d8cc358c28db2683446e5ce67a60e267f509e6f7688c9ee3aa5c499539752c014f0830af9896d3c6
diff --git a/dev-python/cachelib/cachelib-0.7.0.ebuild b/dev-python/cachelib/cachelib-0.7.0.ebuild
index c3b5d4c04719..d18a01eb133e 100644
--- a/dev-python/cachelib/cachelib-0.7.0.ebuild
+++ b/dev-python/cachelib/cachelib-0.7.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/cachelib/cachelib-0.6.0.ebuild b/dev-python/cachelib/cachelib-0.8.0.ebuild
similarity index 83%
rename from dev-python/cachelib/cachelib-0.6.0.ebuild
rename to dev-python/cachelib/cachelib-0.8.0.ebuild
index 29b7473deca9..c3b5d4c04719 100644
--- a/dev-python/cachelib/cachelib-0.6.0.ebuild
+++ b/dev-python/cachelib/cachelib-0.8.0.ebuild
@@ -9,12 +9,15 @@ PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Collection of cache libraries in the same API interface. Extracted from werkzeug"
-HOMEPAGE="https://pypi.org/project/cachelib/ https://github.com/pallets/cachelib"
+HOMEPAGE="
+	https://pypi.org/project/cachelib/
+	https://github.com/pallets-eco/cachelib/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 BDEPEND="
 	test? (
@@ -23,7 +26,8 @@ BDEPEND="
 		dev-python/redis-py[${PYTHON_USEDEP}]
 		net-misc/memcached
 		www-servers/uwsgi[${PYTHON_USEDEP}]
-	)"
+	)
+"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/cachelib/metadata.xml b/dev-python/cachelib/metadata.xml
index 0b5609227c48..93b55ca7ecdf 100644
--- a/dev-python/cachelib/metadata.xml
+++ b/dev-python/cachelib/metadata.xml
@@ -12,6 +12,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">cachelib</remote-id>
-		<remote-id type="github">pallets-echo/cachelib</remote-id>
+		<remote-id type="github">pallets-eco/cachelib</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/cachetools/Manifest b/dev-python/cachetools/Manifest
index 632a02cd4bfc..3036774b30e4 100644
--- a/dev-python/cachetools/Manifest
+++ b/dev-python/cachetools/Manifest
@@ -1,9 +1,3 @@
-DIST cachetools-4.2.4.tar.gz 25487 BLAKE2B 91979f72b8719f4fbc57421ded6edcca38106814997abd2a17c1147af55a1b64e11b347c8ef790cd8cdafbd83b8492d377540b872430d285584aa3d3228f6435 SHA512 29a6bb3a064e5603cd3e3882d8e5a6a6ef95ba3029716692c9a82d7186a0befcfb8ed4a0ee3ecb591fdff93a46836d5b25acca7ba5eab1ba837e86404aea8fcf
-DIST cachetools-5.0.0.tar.gz 26119 BLAKE2B 29d3c9d9859c4848d807dcf8d84614b23a125bdabd4188191e7ccb1536da249226ed4b21798b49c2eb764bfea4ba16b557440438a827b1bfd8d4c5b0984695e4 SHA512 3d311969a4fcc180767f4546f384e16d47bbeb5c1d97884006872317514ea2739560346d62d0afed1916def249d92f9ff14e4d964e9521de09132d3a83463a76
-DIST cachetools-5.1.0.tar.gz 26656 BLAKE2B 709b4e5ee7a0e86ccd0d947828f36b7c98765dddb0d628b28d17ed745633b747c16f17df7ffff79a87e8916702c4a513432b832a6d06f2ac57c1c9199e2adeef SHA512 6732c5a305c506843caa13cdacb210a83695a9cb65d065b95e1505530ffb6899200c1d89b66ede33b194b5af1a01ad99e79aa85ec754d854de476f243380bd53
 DIST cachetools-5.2.0.tar.gz 27342 BLAKE2B 905986bca98996fbc74c74bc5710b429ae63b4bf6283a3910e83a92cac461ef4a0271b1691a694fe8ecacf38eeeb921d7345c9e015f1400705662081d5e29dbd SHA512 e12766aef1725091edcdd0ef3687b891242f711de069c0d0642680d61dcca79e645e6ecb5f2e22470f189aba59daa2b5a830dc76791256517368f8912a065eef
-EBUILD cachetools-4.2.4.ebuild 419 BLAKE2B 0cb00cc291fba7a29b18af9b3e25202cd36891bc52f1d1d5ba9134e0fa5de557545b3572a835d0584ee8fa7ad77a08b3716c983e0335605438f6e6f63bd33338 SHA512 e52ebe03812ca4317222d0cb040f498d4f87fdb99cc624b5415ee171efab35f8ca9072fd913cfcf299d871a0a61a5a4703a9d7232962a28c3ec3c255b54a606e
-EBUILD cachetools-5.0.0.ebuild 426 BLAKE2B 2bb25e4179e8f1b91cbfdc665b1289004ec7743e6f52022579dd925bfb12b65cd2af25ba8bcff54661de31aa82114757a3b3fad2084bea80b07ebe9f3ee7dac9 SHA512 ee5d35d82477fb585959f3a5d0ef3d188ea641c4a4d1738fed6888d475fdc01f82f4c0a9868e07fbdc55b1140696649f7a4bbe77b0a75411558d1bbcfd60fc18
-EBUILD cachetools-5.1.0.ebuild 501 BLAKE2B 316c1686233e60167582db0f1e63d25382aeddca5924747387cd795f0b39366c9843cfbeef82498346d38529686754a8f0878678e153f1e512b9aa0f973a2625 SHA512 624296118f582e0a84c5b544875b2abd7cd79b0183675763620ef542311fd2f6c9e08e80a4b211942adcd81b3aba4929f5e27b7a148ded9dcad3d5f81226ab4d
-EBUILD cachetools-5.2.0.ebuild 501 BLAKE2B 316c1686233e60167582db0f1e63d25382aeddca5924747387cd795f0b39366c9843cfbeef82498346d38529686754a8f0878678e153f1e512b9aa0f973a2625 SHA512 624296118f582e0a84c5b544875b2abd7cd79b0183675763620ef542311fd2f6c9e08e80a4b211942adcd81b3aba4929f5e27b7a148ded9dcad3d5f81226ab4d
+EBUILD cachetools-5.2.0.ebuild 499 BLAKE2B be43a613a2131a511955a055556b393cb4ebb385f406e50a10f20d9401d6264ff29cb629007495af865a5634371ed861a12ba46d35b5fac017e4d088c88c55e7 SHA512 e6de3f33d885699b170f4069823107e8f47b99b8d0975c14ef1a6004bf2ab1b8daa40b821172b9f39041d72813122e8fa1971e3a11c68fd4e2ce1e37b8fce04f
 MISC metadata.xml 508 BLAKE2B 46dd3d86627746b2b26d9980c2773a25cde3fe6d8ef25bffd88edf1cd2f66a9457f09eea791efc1dab3d354f405bf755992e4a44acd721e4e72f085eabf9b61e SHA512 63d48b1e710965f09538e71b982df8e2fdf5693c6043d5498e4536f76e139584f8783479c1742f91fbe45b4e7bf9eec8d8a54d698734c196bbd8d5a14712b59b
diff --git a/dev-python/cachetools/cachetools-4.2.4.ebuild b/dev-python/cachetools/cachetools-4.2.4.ebuild
deleted file mode 100644
index 9746966fa6e9..000000000000
--- a/dev-python/cachetools/cachetools-4.2.4.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Extensible memoizing collections and decorators"
-HOMEPAGE="https://pypi.org/project/cachetools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/cachetools/cachetools-5.0.0.ebuild b/dev-python/cachetools/cachetools-5.0.0.ebuild
deleted file mode 100644
index 913ab3eaa0fe..000000000000
--- a/dev-python/cachetools/cachetools-5.0.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Extensible memoizing collections and decorators"
-HOMEPAGE="https://pypi.org/project/cachetools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/cachetools/cachetools-5.1.0.ebuild b/dev-python/cachetools/cachetools-5.1.0.ebuild
deleted file mode 100644
index 07e5f7a7371b..000000000000
--- a/dev-python/cachetools/cachetools-5.1.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Extensible memoizing collections and decorators"
-HOMEPAGE="
-	https://github.com/tkem/cachetools/
-	https://pypi.org/project/cachetools/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/cachetools/cachetools-5.2.0.ebuild b/dev-python/cachetools/cachetools-5.2.0.ebuild
index 07e5f7a7371b..a6ee88f5bf22 100644
--- a/dev-python/cachetools/cachetools-5.2.0.ebuild
+++ b/dev-python/cachetools/cachetools-5.2.0.ebuild
@@ -17,6 +17,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/carbon/Manifest b/dev-python/carbon/Manifest
index d54cf7d04159..01b468c5e4c0 100644
--- a/dev-python/carbon/Manifest
+++ b/dev-python/carbon/Manifest
@@ -1,7 +1,5 @@
 AUX carbon.confd 119 BLAKE2B 75505b3aedcc65306a1cd16645e349012652a268d838dc1fd32d8a143d18dfca3c9e3233a0bfcdeee22a26592bb49408a3e4708d96796361219f73dc5e32adb4 SHA512 049d2e3c9e9ae9375f485568185b14fb326a85f13a5f40e19a5d26aaecd0b98a61f011dbe4335110b6e3314ec52d308fea8f577df8b29b5d675fd7763a02788f
 AUX carbon.initd2 1329 BLAKE2B 7990f8ee25f2554ce5997075c7fda4cfc69d73ae060657a917498bed4ef237a6e0b43b522ef15b0587d15c71fdb03a26f562d1147212c50f8d838f97522cc9cd SHA512 08d9a7ddc763bb49763b1c873504b0dfb45763ed871f22632885692f41d5d8c86616677c2669b0b8c2160170a7c507c2415571d300e2045675c7002556a4063e
 DIST carbon-1.1.10.tar.gz 77091 BLAKE2B 367beb81a4dcf4c5fff6bf9884c7accb8aea9daa88d6d890bb977c926268b7ae041c9ac8e4b537f07d08d6c970f536ccc87ae6b4caef555883aadeab155fedce SHA512 a5c8d730e311bb65682c701b79a5e3e02e35eec5c0d923fece3f63d7036ca1f85775100fba9a2090487f2cf75bae7708dae9580deccd8fc586f2820b03e14b4c
-DIST carbon-1.1.8.tar.gz 72452 BLAKE2B d76a281925645ebf6f74ff83f8ea6a52016f29ae0e35143e48e9aa0f2fcc267ceee1b5040ad756bbab8b2c1ffde5040231b8e0b581bd177bfb31ddf33fab7933 SHA512 b679d0329a5c8701af8aad3bdc51d64fbab7d05214c09368a218f1c925593002596a04b50fd2aadf26bd21ea7ef4b8262ae7f8169ef0d6ee40dccbc933539161
 EBUILD carbon-1.1.10.ebuild 1980 BLAKE2B ebc2f6abb82016b13c9e6085a047dd72245aa776422099af9b1b99a16077b672133bc29c5b30e0d1217159de10a24ca0f4df38a5bcb0396a6a53d9a8af6b8919 SHA512 a14d73197e7a89dce4f53ecdc9bff399f72f3cad4b137e9875240fb047631bc902613d7dca1c52d42a929f5f280cbdadc772af856532d899018316f8cf2ba26f
-EBUILD carbon-1.1.8-r1.ebuild 1980 BLAKE2B afe8b0c091f13cbe066ba42f0bd4633f33f5eb8355669df8eb014931a14d931f97cea636f5e01de7c933435ac9242b557520032aecb8f78892ec76a635ce4a74 SHA512 851fa45ccc3ef30811572b7cc7c94eb7d5d8fd839c3c2b5920eca463b8a0696e10c13e84c193cff07ebb9571980b2a7bb5dfe0c4f455cb2d302ea7d2ea7f2e08
 MISC metadata.xml 442 BLAKE2B e3ab8eb53738bdacc8fb73e7514c28290609200a34d6d6fc0111e30bd44d7806f91a4c3906cf473f8dc58b6d8012ecdaf320d943f770d05e26f3b0b44d99a57f SHA512 0deb6d56a05c7b0ee70787dad985a0f250d8328c1edd54690092dceeab8ba90e96ec2ddb326202f01eeb702776e448b746a5c92392ea02cba1892155d3eb60ec
diff --git a/dev-python/carbon/carbon-1.1.8-r1.ebuild b/dev-python/carbon/carbon-1.1.8-r1.ebuild
deleted file mode 100644
index 599fbc318f06..000000000000
--- a/dev-python/carbon/carbon-1.1.8-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Backend data caching and persistence daemon for Graphite"
-HOMEPAGE="https://graphiteapp.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-
-# whisper appears to have been missed from listing in install_requires in setup.py
-RDEPEND="
-	dev-python/twisted[${PYTHON_USEDEP}]
-	dev-python/cachetools[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	=dev-python/whisper-${PV}*[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# Do not install the configuration and data files. We install them
-	# somewhere sensible by hand.
-	sed -i -e '/data_files=install_files,/d' setup.py || die
-	# We want FHS-style paths instead of /opt/graphite
-	export GRAPHITE_NO_PREFIX=yes
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /etc/carbon
-	doins conf/*
-
-	keepdir /var/log/carbon /var/lib/carbon/{whisper,lists,rrd}
-
-	newinitd "${FILESDIR}"/carbon.initd2 carbon-cache
-	newinitd "${FILESDIR}"/carbon.initd2 carbon-relay
-	newinitd "${FILESDIR}"/carbon.initd2 carbon-aggregator
-
-	newconfd "${FILESDIR}"/carbon.confd carbon-cache
-	newconfd "${FILESDIR}"/carbon.confd carbon-relay
-	newconfd "${FILESDIR}"/carbon.confd carbon-aggregator
-}
-
-pkg_postinst() {
-	einfo 'This ebuild installs carbon into FHS-style paths.'
-	einfo 'You will probably have to set GRAPHITE_CONF_DIR to /etc/carbon'
-	einfo 'and GRAPHITE_STORAGE_DIR to /var/lib/carbon to make use of this'
-	einfo '(see /etc/carbon/carbon.conf.example).'
-	einfo ' '
-	einfo 'OpenRC init script supports multiple instances !'
-	einfo 'Example to run an instance b of carbon-cache :'
-	einfo '    ln -s /etc/init.d/carbon-cache /etc/init.d/carbon-cache.b'
-	einfo '    cp /etc/conf.d/carbon-cache /etc/conf.d/carbon-cache.b'
-}
diff --git a/dev-python/cerberus/Manifest b/dev-python/cerberus/Manifest
index cb5b1be47419..ebfd1fb65d12 100644
--- a/dev-python/cerberus/Manifest
+++ b/dev-python/cerberus/Manifest
@@ -3,6 +3,5 @@ AUX cerberus-1.3.4-raw_docstrings.patch 695 BLAKE2B af53c17d8b683e1d88e744330ff9
 DIST cerberus-1.3.2.tar.gz 149344 BLAKE2B ce65f3c4c612f87562c28f913cac95c1c7af9b2dfa72955bce3f0e0459e4ff9024a126ceea4587e2c72cf606be2a249046a090a2e2d5e908bfe4b700ba5e9b92 SHA512 e9cfef5a936783eb0576afd3d23397dab38d8c88b6b43f98de0ad7e20739e5ff983eaf4ac769206adb7fe9692c651583f6a5f2bab263b81b8de96f45707c84fb
 DIST cerberus-1.3.4.tar.gz 926258 BLAKE2B 6fabfcf32e26ee7f4881b64ce9c3098a27949d95fd0998e09b7adcc3b834033f904a07b6e9b2cadea218b952142f6c2bc6051d8c208a14d6e8172a0c3823c38b SHA512 c816b426ed1b32367d1e8f1c26d6ddd4b49c6578540e688baf693e3094a05800f645cfe879be6378c1e9be9899cad7bc2ad1ed9844d6762d2ef6e0cc54a7476a
 EBUILD cerberus-1.3.2.ebuild 555 BLAKE2B a2daf7c5987368b3c9c85ac67137f263200fa99819c204ecd89f7175a91a39a7415d9b567a944be7dc4e71d4adf0efb0c0faa97040eafde1772931c0f684b8fa SHA512 7be0b457e94d62f49d6b24c448ec98c07394a31c8f9f773aa0f8d0090664a23ac7d0b232d26a3b9546bf0d48ef8b7da9078b160026282388c3e8aefa5000afb1
-EBUILD cerberus-1.3.4-r1.ebuild 823 BLAKE2B b827066ffeeb8e34548bed2ea65a6cf24c633387785306b66af5dd278a00d3f4a5d1a655b4197448e7599272a5991e0f253139e9b553dc5686968b697c2c2e52 SHA512 3360f9b2c17dd378568b3e99f9c041c261666d2a82d50b67470e96c07f41a26dc3a9ab20e6cfdbda8cb45b0ec6280df1566f68d80db073032540980e790a4f2f
-EBUILD cerberus-1.3.4.ebuild 753 BLAKE2B 31016b995d74d64f7bf2824a00db1feedb4b97784d39f3e57d1a90458c8da28a0b9f3f5466667091540c812d48684be88f8afab53baf0a8a213a082b1de6ed8d SHA512 c106b7fd42a01057014267b836ae494e46bdc7d30df74e2ccceea828d65de3171e9f60a637355fab89de2b761849757c68634ece94f0dc4d0b4675bce4d2a4c2
+EBUILD cerberus-1.3.4-r1.ebuild 822 BLAKE2B e4514c42b3565c336ca3ab646cb0f6d0c93c1ff37431701ee5c067e57af04e024b671604b472ebf964e31aa9b794e0901c2184c09925fad8d3035f32b1269622 SHA512 1de9372782161f02b011e85805a0cb2cff04d3c72e2c1c2c6f0703f70c6b9b4ebfee4d36dada763458af0262e39d7ce2b49389e2e80a4e8d8916e03352046ecc
 MISC metadata.xml 395 BLAKE2B c9dc795ac8b1daba3bb10e3aef517b28be2e88b26f5e1192c380bca300ef929608e2b2bcef23adc710e01d41fcbc640c97429d6d8ee61fe4a78014aa181b528d SHA512 c1abc73709d977c4f7a3e989c335f0d1312d07dc843dd88faadc633e2dbfa3371c1cee566a481ebfaabdba60e0a8f00068ce8a83ce9b05ab091c35917b8c146a
diff --git a/dev-python/cerberus/cerberus-1.3.4-r1.ebuild b/dev-python/cerberus/cerberus-1.3.4-r1.ebuild
index 887523526a6c..21c3a141c938 100644
--- a/dev-python/cerberus/cerberus-1.3.4-r1.ebuild
+++ b/dev-python/cerberus/cerberus-1.3.4-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv ~x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.2_no-pytest-runner.patch
diff --git a/dev-python/cerberus/cerberus-1.3.4.ebuild b/dev-python/cerberus/cerberus-1.3.4.ebuild
deleted file mode 100644
index f9243673a7fe..000000000000
--- a/dev-python/cerberus/cerberus-1.3.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A lightweight and extensible data-validation library for Python"
-HOMEPAGE="https://docs.python-cerberus.org/"
-SRC_URI="https://github.com/pyeve/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 ~riscv ~x86"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.2_no-pytest-runner.patch
-	"${FILESDIR}"/${PN}-1.3.4-raw_docstrings.patch
-)
-
-# Require currently unpackaged pytest-benchmark, more useful to developers than to end users.
-EPYTEST_DESELECT=(
-		cerberus/benchmarks/
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/cffi/Manifest b/dev-python/cffi/Manifest
index 34a85e5710a1..ac3485d33f4e 100644
--- a/dev-python/cffi/Manifest
+++ b/dev-python/cffi/Manifest
@@ -1,5 +1,4 @@
 AUX cffi-1.14.0-darwin-no-brew.patch 568 BLAKE2B 43afdb086a0385e913f287bc5c1534df1b881058cf7efdfdecd9df063c27ebd26683edad43e3010e1c01d9d93c5d98785ffbe65a5e3317d96ebb6a3132aecdab SHA512 75335871b8f98223e0247defc3d08f1c10ebed58c79790826c4e39057e6757b8bdc07e2773ad25482ed17c13480b3e72b3667e48697a456ed0cc4a39e7d91b79
 DIST cffi-1.15.0.tar.gz 484058 BLAKE2B 0d2d470c7eb11b8a9526be816b153c4483a5cfb529d3d220a804842facae1f06e2a822aa2be9abb1b5648cb36a97033bffc1dd235d83bdf8c075d67a907aa7d9 SHA512 ee83efde6f77f4a0c5889088c4c208ed7b9071fe06dfc16a8d2396de07f78fe859e1e39866760198a9d700f3b7359e8715e8a3e4907feb81d3fc4b8dd0dbaca1
-EBUILD cffi-1.15.0-r1.ebuild 1753 BLAKE2B 5ae6d903f5b529e0e5d824e70e843da0fdaeb0708538e7638d72e5c7c03cd2bb2f2e307ba5053ba6b2cc76c571d58a260b55a86ec27b7ff47ae11c279b0de400 SHA512 fd864eb446f48d38154215869d2b2884e2514a9710719baf5c919b7061908da3074a20cde2373b54bdc1a0fbe461ba80fa993d72002c8fb563964c28c3e6e460
-EBUILD cffi-1.15.0.ebuild 1485 BLAKE2B a9f8510152784def395016099cac7c46891542dd6b716fac8f083d186c6f23fb184604f1ae672e99d4bf027ae3a14ff1a32fc83efaea5160af9f15acefdeb0bc SHA512 580cf0213aef8c5a9629b1a72ce2d41c9e88c2d552e62a93fa50fcc92e5235ca7332ba292a8ca6d8c81b3b684bac67b4c4b226fe571dd3b7de6d6a50821568cd
+EBUILD cffi-1.15.0-r1.ebuild 1749 BLAKE2B c710a237cfe7792896a08d61896fc195ba5cc4f50a2a545dde4ed54dfed4a37baed202d5a94717805375caf853ed82ec68bae4abb81a995d2755c65f091b2b6c SHA512 3ede32681e8ce94d3988ac3d58e5788bb73f5bacc6c52c98df654aedae1f07b1377bd33ae133a7d79ee155bedce36a07bd46be7e4516423c77b93c70d932a12b
 MISC metadata.xml 318 BLAKE2B f914459fac4ae3d8ac9273fb721c52494513b932676f570f02cc4cfb2283705d8cfc761806ffed23c6f31c95a967398edee01c1536547c1830def5ca4144c003 SHA512 ec451f8c535f0d01dc7bcd248c002745947982cd469a02ac247d0d34f4d7a33374fa10c28d8f074932f0548dc500c3270b499dd08b18acbb9d308777bcc7e4f0
diff --git a/dev-python/cffi/cffi-1.15.0-r1.ebuild b/dev-python/cffi/cffi-1.15.0-r1.ebuild
index 24540e12113c..56c019e4c357 100644
--- a/dev-python/cffi/cffi-1.15.0-r1.ebuild
+++ b/dev-python/cffi/cffi-1.15.0-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="
 	dev-libs/libffi:=
diff --git a/dev-python/cffi/cffi-1.15.0.ebuild b/dev-python/cffi/cffi-1.15.0.ebuild
deleted file mode 100644
index e764edcc0b5d..000000000000
--- a/dev-python/cffi/cffi-1.15.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-# DO NOT ADD pypy to PYTHON_COMPAT
-# pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Foreign Function Interface for Python calling C code"
-HOMEPAGE="https://cffi.readthedocs.io/ https://pypi.org/project/cffi/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="dev-libs/libffi:="
-RDEPEND="${DEPEND}
-	dev-python/pycparser[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-distutils_enable_sphinx doc/source
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/cffi-1.14.0-darwin-no-brew.patch
-)
-
-src_prepare() {
-	if [[ ${CHOST} == *darwin* ]] ; then
-		# Don't obsessively try to find libffi
-		sed -i -e "s/.*\-iwithsysroot\/usr\/include\/ffi.*/\tpass/" setup.py || die
-	fi
-	distutils-r1_src_prepare
-}
-
-src_configure() {
-	tc-export PKG_CONFIG
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# these tests call pip
-		testing/cffi0/test_zintegration.py
-	)
-
-	"${EPYTHON}" -c "import _cffi_backend as backend" || die
-	epytest \
-		c/ testing/
-}
diff --git a/dev-python/cgroup-utils/Manifest b/dev-python/cgroup-utils/Manifest
index 7bc0df254cf0..efc3f9538580 100644
--- a/dev-python/cgroup-utils/Manifest
+++ b/dev-python/cgroup-utils/Manifest
@@ -1,7 +1,5 @@
 AUX cgroup-utils-0.8-tests-builddir.patch 644 BLAKE2B f2ff44542b2883f33aebb43bea4178cc8bfb55c4544f456fb657e901c00847ea0f53cb140c4acaa0b6cec1d8f0bfed993fb842c1d9bb7d08ab9459e2187fd31b SHA512 930c1513b79fd1bf81085bbfbb0bd1031fa61bf7e5cd227347f8976b930c441585c91003ff9345d43cd1fe7a7b8ba0d12b07536a7127fe0d9790ebfea7cbc7e3
 AUX cgroup-utils-0.8-tests-mountpoint.patch 713 BLAKE2B 1f92579b823ad8f0fd26df19226017d5c81a781e4eb368bcb7efcf1cc7aa0930e150f26d237fb3134e583079f8db42642ae366f3e4d9630d90c137f395bc20e9 SHA512 477c8a48bb82a1470ed5afe8b6d48963247ef6b7617e1b316547372fe785661fbd59dfb713d9e1dc88bd55a3e9b8b2593b92eb2ccc3dfbebda83649cb611b9c3
 DIST cgroup-utils-0.8.gh.tar.gz 35260 BLAKE2B 11187a917d5159699eb46fb67f5057eb16317f86c32e6471d8543955e1d40107663517395226ae75e3b0739fb59c7521590a3d04a5d818b151970cbea559dee7 SHA512 fcc31fb6d2bdfa761c248553d056ea1bdcf697ae9ab8ccdc895feefdec7bc4e560bf2352968866b3064548545d98527d2a4092d4c8d2f335ef76e3c4b721bcf0
-DIST cgroup-utils-0.8.tar.gz 35260 BLAKE2B 11187a917d5159699eb46fb67f5057eb16317f86c32e6471d8543955e1d40107663517395226ae75e3b0739fb59c7521590a3d04a5d818b151970cbea559dee7 SHA512 fcc31fb6d2bdfa761c248553d056ea1bdcf697ae9ab8ccdc895feefdec7bc4e560bf2352968866b3064548545d98527d2a4092d4c8d2f335ef76e3c4b721bcf0
 EBUILD cgroup-utils-0.8-r1.ebuild 657 BLAKE2B d98d7bb62ddab53975fcf7452f007c599b21c4bc76b134b1d0d0585f7ca1a2fdc53efb3aeeabdd5b64c9ef2d04ac3f77c16b8be4fc9efa9169532e8f13771d00 SHA512 6ae9697dac2094dc9ddb99a509a5ef34126a7058355261c939cfe0ad49c1b3770f6255df922ad44969ee7e0f9fc9cbb1dccedba35e72c76c06340b8dee8b2e5c
-EBUILD cgroup-utils-0.8.ebuild 622 BLAKE2B 3a0ac4eb97648e6222c88a92e3af790a3ff1f9439609eeb6e10ad3134bb290e166937b7795af789be4722e34a16d54a37f4b9dbc7702b7970f84bd3b77eefaf9 SHA512 097370f66f6a58febd7526fc515970d5d101040304edd2e7b7345e7c08050b6d156ea582a6953d00efa2da9330a041a1ef3bbb51351005feb3e0f482d7f3b9b2
 MISC metadata.xml 486 BLAKE2B b15881b19a24abf60b9a8f92b5f43307faad1432f6fd0fac43bc18b265eac2a359cd9a4f7d130d6872aeaca23d7eb7d532380093d05ea2a8d480a2a2a26bf46b SHA512 46325fbefa6f1ccad0147d9b98761ff638fc250f35e92753bd60325f24a5c4bd741c2b30bf78020e6f1b84927fcde476968e4e28c9d676ef26e4c6199ca768e7
diff --git a/dev-python/cgroup-utils/cgroup-utils-0.8.ebuild b/dev-python/cgroup-utils/cgroup-utils-0.8.ebuild
deleted file mode 100644
index 86b5672a275f..000000000000
--- a/dev-python/cgroup-utils/cgroup-utils-0.8.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
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit distutils-r1
-
-DESCRIPTION="Tools and libraries for control groups of Linux"
-HOMEPAGE="https://github.com/peo3/cgroup-utils"
-SRC_URI="https://github.com/peo3/cgroup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.8-tests-builddir.patch
-
-	# Upstream: https://github.com/peo3/cgroup-utils/pull/12
-	"${FILESDIR}"/${PN}-0.8-tests-mountpoint.patch
-)
-
-python_test() {
-	sh ./test_all.sh || die
-}
diff --git a/dev-python/chump/Manifest b/dev-python/chump/Manifest
index bb65e89a2fb0..a633454e73b0 100644
--- a/dev-python/chump/Manifest
+++ b/dev-python/chump/Manifest
@@ -1,4 +1,3 @@
 DIST chump-1.6.0.tar.gz 15646 BLAKE2B 8cab76e633fd4084d349115fae925c152439d06acbe629d5c23c474f2dc0a3cb1b5b727b856a9d54a82e39698b3cfd7470086a976cfc6b4870f1af02bac71f87 SHA512 d219f1b9e28dd17f834dc807cd42a288adc4f5579bf97cf6b1833e63f339bd811953c3a74cafad9021beb05cd5fddb46cf49b62a4803c62ece62d037fe38a4ee
-EBUILD chump-1.6.0-r1.ebuild 514 BLAKE2B 61c3ccdfaaf0553289332c448e6c49fb27dfbe14966fe149d48a57c4f475b555716086b328970542c480f294353bb38a967d035a9e37dd60bdb3f0bbf88bee37 SHA512 49fad45d4146955096692db472d6913f743f41eb20268fd9842efa010838a3e237fce6460db64da851df7f087b86dc6feddfced15dcfaa3a262a892583f3f80a
 EBUILD chump-1.6.0-r2.ebuild 546 BLAKE2B 480e892e338092e3db64ba6a1e11fb03926c8171ce65b7fd3894509e3b8bc8305a37c1353d4a442a629ee3126d989abc5975db78b12bb4b936e6f3436e27cb45 SHA512 96b71933316aebf74344370d268d0d1f3a27516bbe8678bdbacba89bc10be8f4b208d0b143db66da5e082e9532aaa845db9155b3f983024c3cb0ae4777430c15
 MISC metadata.xml 519 BLAKE2B b2f62dec1353adb13bb15e1d292618290b14a2646fb8e4064530c2cae8373c10d2f0ea1d1a7bfed73eb200c161e596820f7e46fc09108563e7915a24bc5c5eb6 SHA512 11391903486d3953e979bce22542ba4e412dace7932f3319c228371d68754b6f78bb4843455ad71fab7136fee1f2b90f98b67685b7fc1681988f85182c83efff
diff --git a/dev-python/chump/chump-1.6.0-r1.ebuild b/dev-python/chump/chump-1.6.0-r1.ebuild
deleted file mode 100644
index 81de5ce4916a..000000000000
--- a/dev-python/chump/chump-1.6.0-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="API wrapper for Pushover"
-HOMEPAGE="https://github.com/karanlyons/chump"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# 'html_theme' is unset, meaning alabaster will be used
-# and sphinx depends on it
-distutils_enable_sphinx docs
-
-# The package has no test suite
diff --git a/dev-python/click-log/Manifest b/dev-python/click-log/Manifest
index 7715cbb84446..9ca8280cee2f 100644
--- a/dev-python/click-log/Manifest
+++ b/dev-python/click-log/Manifest
@@ -1,5 +1,3 @@
-DIST click-log-0.3.2.tar.gz 9523 BLAKE2B 212ac421b402fc0f32a9aec11a9e20c87a8148c461af87af78f8068ca95d60cab0c47bf24162aefd1c299ba783fb7a70e7e9dde01f0fc1f7c44a69fa8cb07121 SHA512 8ae5c43d739127367bbcdcf32bfd4b34b2ea1c377948df3b8588e4bfe2b0f5e7a61d1ccc6cb32c77045b15251222866daffa5a7bfb7a907487548784ba345351
 DIST click-log-0.4.0.tar.gz 9985 BLAKE2B 8a7ce0c2a7617253f08d011958bce158e987faa0008065c9dac382d46b905cc88cd5cb19d0d0859bf522da6448f7c9a20c0a8efe53b3feb5efc9ca3f64cfbc27 SHA512 95d3cb2fa9821e4f58b25072f39d34f21fe4a7600923f59f4b57b92dbcd9fa2584d710de1d4a1aa2a757c048398342aabbb1b5ab32cf4128ccecee10f9f15a5a
-EBUILD click-log-0.3.2.ebuild 539 BLAKE2B b16dbc750507bb0329ae146a81c104bb2e3f0a550a88d6850f4e2dbffde2c3bf2c7965a10822a57bf86b07e85d253d99a663943e8273345badb78b541158c0b8 SHA512 4f69ffedd2040330179185fd5e2dca4c3b837ae141f15b378dda770744e3c275d2184e7bd55ea25971561c7ebd4a0f0fba9732da9c1eec022843c2ae3fefb1b6
 EBUILD click-log-0.4.0.ebuild 560 BLAKE2B 4737f0a1c9ddba2c0c5cd82e2a51dab54d42361b3662c72329cbcc7a38a9f0b94fc31a58b62d1cdf2cd9b023a438e4ea1f0994ac59d68cb49624b31e2329621f SHA512 de7c867ebe6bea45a6c6aa48993008889ee45606a922a90c25f2f8970f7d25d91e1874fbd43087a665ebdfec65cbbc12ab69a950203ab06f8a5da9804ef422ff
 MISC metadata.xml 454 BLAKE2B 65f660ce0ec54eeefdda3a03fb806c1d80213db10e3641b91a15bf0628d0099f05311113ab5531ea9a931014c21437b9fd42a3a8d811782e503617c8dda2fc63 SHA512 f5cd97058ff64333f1504497d38effe6d530e47632633ec341847944eafae050caff68ca6aca9e3bcd5517ed420da6e5ea06829b42f3f9300b52862514e23afa
diff --git a/dev-python/click-log/click-log-0.3.2.ebuild b/dev-python/click-log/click-log-0.3.2.ebuild
deleted file mode 100644
index 36b03d2523cc..000000000000
--- a/dev-python/click-log/click-log-0.3.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-inherit distutils-r1
-
-DESCRIPTION="Logging integration for Click"
-HOMEPAGE="https://github.com/click-contrib/click-log https://pypi.org/project/click-log/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="dev-python/click[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.rst )
-
-distutils_enable_tests pytest
diff --git a/dev-python/click-threading/Manifest b/dev-python/click-threading/Manifest
index c3d7bd53217d..ab9a22d7ef83 100644
--- a/dev-python/click-threading/Manifest
+++ b/dev-python/click-threading/Manifest
@@ -1,4 +1,3 @@
 DIST click-threading-0.5.0.gh.tar.gz 9836 BLAKE2B 245c63476e58cd370ec49275a4a8ff8007d71386328c2631970a0bf9ac0b81c14150966a3cab54a7616dfc1fdd5e5b3f601fe1e08d1c9c65ec168b96b6b773d5 SHA512 134daf779a56a18cc36a94cd6818801896f171ad91f0b34995d92de5ccd62ea61b7a4fcb0afe2634e5fe80869a616263952e687c5d8d490f17d1d27d00ab3fe2
 EBUILD click-threading-0.5.0-r1.ebuild 624 BLAKE2B c448c03d5b7faa207c3ae8006f58aa664d25c36767b37bb80a9c5eb47dd6d222dd599a40ce6638a1820d224acaf3f98fafbf71f894efc4813ab25d1ff035613b SHA512 dbb8d590cfe6ceb79cd888f0df469e39ba5a8e3400d1f2e1212ae30341d89a2a6cfe162b63ad6bc6503ce5e59c20aba16481ef1d43527d7d6f9c15648a604d8c
-EBUILD click-threading-0.5.0.ebuild 586 BLAKE2B 63b355977e635633b21d40c7ef366ee355caf92375abc6b55a208d367a9abfdb3891fee5585f30708d498d292f97685fbaac86a5b703cde7c3f4c0edf26d89ff SHA512 029447d478ef67d469074056d0924de7b74eb656db95bc3d2883bd1b70ecd814943a728bb638b13456c46328384a4402ded2bcbd0c687bc99c1ce78416e3b71d
 MISC metadata.xml 466 BLAKE2B 79ac7c235225c5ff71240a9d9d01ac9f478f7d6ef2a3671a4cc38eaa9a2cb59609b2432c3a470da45f14449302a09c88c2e1aeef7e0127df63f0af734ff1f35a SHA512 f68f7e49a579969c6f6e5dc5c37651ed3a1cf1a564a0e8a243f2874c05bd71a817e6bc02398852a6127022b8f36e4c09fae8b60d35c574e73915a040e1c63ac6
diff --git a/dev-python/click-threading/click-threading-0.5.0.ebuild b/dev-python/click-threading/click-threading-0.5.0.ebuild
deleted file mode 100644
index 937a499aa62a..000000000000
--- a/dev-python/click-threading/click-threading-0.5.0.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
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Multithreaded Click apps made easy"
-HOMEPAGE="
-	https://github.com/click-contrib/click-threading/
-	https://pypi.org/project/click-threading/"
-SRC_URI="
-	https://github.com/click-contrib/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND=">=dev-python/click-5.0[${PYTHON_USEDEP}]"
-
-DOCS=( README.rst )
-
-distutils_enable_tests pytest
diff --git a/dev-python/cloudpickle/Manifest b/dev-python/cloudpickle/Manifest
index a1d93d8dea73..d35b49b43438 100644
--- a/dev-python/cloudpickle/Manifest
+++ b/dev-python/cloudpickle/Manifest
@@ -1,6 +1,3 @@
-DIST cloudpickle-2.0.0.tar.gz 60038 BLAKE2B 21f3c170c21c5b5c44fbe5317d788e7b09cc4d15789d91227cfcf736807ee11cbbc003ea66dae4fb90de99ea5fd1c6096827efe4d438b92b8b73ec981e12e784 SHA512 4f2c0019a9b6b7ca4c8749b0c2b600ac502450f6fec9c23fe5b9ddece34c77105c86666274e24c6672d405c3e0e800b0a7da055a95ada8fcc060a63214aa9666
 DIST cloudpickle-2.1.0.tar.gz 60093 BLAKE2B b6d210f9da7c16be66f3538109207a652331fdb5389361acfccb414bf36865ecafea15fd57ab24741f9e01d362c188f2c246388688c38a4d09a670053b0f9c4f SHA512 c38bf1044e18e673a89676c78d2f49422a36f6ccbcd29719aa9adfd157210e38e84befcc44b4b6ffcd60537748fccd3e384ed52aa4e1b939d84d127c302e2bb1
-EBUILD cloudpickle-2.0.0-r1.ebuild 863 BLAKE2B a1c19fbfe16c0e7903857acd248a58769799d168df901e847b023f622ebf57d49415b926d12ab037582d2d7cd6f34e4682b5cfbab6e2cb8f398367604f6b4340 SHA512 18ed70833514d437650c63fa5ce0dfb5624c21aa7c49e0e7fd5322dd1d9b5ed954b31cc984c806a49ff22ac5111cd2417c24bad291f99f928a7cefb3308b958f
-EBUILD cloudpickle-2.0.0.ebuild 820 BLAKE2B 5eaef866c9f30d6342230c6b8b0c2ab994be98939ad7616e5fb3bf212190b9455158332a582706a5206d84c1e23f7e02ae465cc0e69292fe478a68b94499d360 SHA512 820cee4c0eb96c45536b02984d52b6fb67899e96178d82a1f37cb318c40410f323d3d7b37530785d9719760ccd69f48370759e6ea754d79dd105ca6240cd7498
-EBUILD cloudpickle-2.1.0.ebuild 863 BLAKE2B ccc093ecce33ef45d25ba3c8c5e7b30f63e1237f019ca57f5d1efc04149ba21d3561f77bccf5e43abd151793aa59aa2f73ce53311d07191add0c6a7bd3af4804 SHA512 d460ea3581df58d71044e0434bf177b816a59ffe6f3c12cba4b968f431659ed1ccfdc75a26e1e793f7f616e1e1f6dda251cbeca2e58fc2b61f181497ef8d032e
+EBUILD cloudpickle-2.1.0.ebuild 855 BLAKE2B 3178e55834b0bac61b490a219f452ea24ec07a5b90190dfeda492ccf74f97fac8a4876b492bd0983e70cf2d97251b0b85e80d33930519b42e8cf7793030e9adb SHA512 b7b72edb1f442de3a516dc5a9456e3742d9adb0d8f77b3c3c68a2bb573f6093fb890e1ca385e072a21c7c534992d86b90c17cd06ad6597fddbe955512350a5d4
 MISC metadata.xml 400 BLAKE2B 6b8036e6fee459cd45ff48884ade7ba9471d948ff06e46062584e5953fdaea8197525ec02e2dc44d4daa6326c7a1859680340e616f27d72ea1d98fe5c011a5cd SHA512 70c88c748d18923d3205c9f2ebc683e6b73240d4f8215f1bf3c3c91bb5eaac259066dc735f10806c43375432df581545831c616ab3aa7218981193956e6c0450
diff --git a/dev-python/cloudpickle/cloudpickle-2.0.0-r1.ebuild b/dev-python/cloudpickle/cloudpickle-2.0.0-r1.ebuild
deleted file mode 100644
index 523ccffafeca..000000000000
--- a/dev-python/cloudpickle/cloudpickle-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Extended pickling support for Python objects"
-HOMEPAGE="
-	https://github.com/cloudpipe/cloudpickle/
-	https://pypi.org/project/cloudpickle/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTHONPATH=${PYTHONPATH}:tests/cloudpickle_testpkg
-	# -s unbreaks some tests
-	# https://github.com/cloudpipe/cloudpickle/issues/252
-	epytest -s
-}
diff --git a/dev-python/cloudpickle/cloudpickle-2.0.0.ebuild b/dev-python/cloudpickle/cloudpickle-2.0.0.ebuild
deleted file mode 100644
index feaee0529a69..000000000000
--- a/dev-python/cloudpickle/cloudpickle-2.0.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Extended pickling support for Python objects"
-HOMEPAGE="
-	https://pypi.org/project/cloudpickle/
-	https://github.com/cloudpipe/cloudpickle/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTHONPATH=${PYTHONPATH}:tests/cloudpickle_testpkg
-	# -s unbreaks some tests
-	# https://github.com/cloudpipe/cloudpickle/issues/252
-	epytest -s
-}
diff --git a/dev-python/cloudpickle/cloudpickle-2.1.0.ebuild b/dev-python/cloudpickle/cloudpickle-2.1.0.ebuild
index 5abcb6078849..8efdbfe094ac 100644
--- a/dev-python/cloudpickle/cloudpickle-2.1.0.ebuild
+++ b/dev-python/cloudpickle/cloudpickle-2.1.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/cookies/Manifest b/dev-python/cookies/Manifest
index 29db9e75caae..db63d2ee8560 100644
--- a/dev-python/cookies/Manifest
+++ b/dev-python/cookies/Manifest
@@ -1,6 +1,5 @@
 AUX cookies-2.2.1-fix-warnings.patch 9038 BLAKE2B 78692c413a2a5495dc43c544cbc27410a341088c8ffc8cfb8543ef0a6f7e7393ae37379912dada2cf0e4ce8b238160244305869a12629ede435dfcb6df334910 SHA512 cc18c782d07bda0518a1d0824281ac068bc97684abc505ba24bc895e6f43f70bc16835c9781ffada42175ac2cb9dde7a200b0746910e7106c3b41e8a9a0cb382
 AUX cookies-2.2.1-tests.patch 1131 BLAKE2B c98b40cab2a20b5779e670bfb481f34abaa080d0780a76127f12783f0fd108b67c590d01304f2f173ab5808fd8f9ad7ef65d0227a1f31eac4296302b7610ea81 SHA512 ff571d810ca576a9dbcea1960056ed05ceaf738148324d434409b03cf399d43ecb5b13fe228da54465d020c6cabe109a447f1a04a37d1276feaf5be6cf38eea9
 DIST cookies-2.2.1.tar.gz 40704 BLAKE2B 422d70f15e93193ac9c4865f988b22a895a81c59ae98a86cb90289940c283f3998a7e1d3b7ecc0a4f4b004d6b4b64de6743cae7a10f45d9bd1e6136ff35518c0 SHA512 76f362a9a1d74b87c90c5b91ad806d872612d31f487e4067a627409316f6099602c9e5a429f85ce20adcb0a7b63dd131b9e1ecc5c0c6444d1569367432a719de
-EBUILD cookies-2.2.1-r1.ebuild 665 BLAKE2B 9c75046e0482bad609f5cbcd8488af7f7e353da84aaed42ec8e2626840adea10786d7015036df7cbefe4bfc40927803363fda634b93c6d6c6e92c82925b66647 SHA512 f39411c310db27a16a36d4b9dfa9ad32c8e0f4b3d8664d2a9fad31d20ef7232752038446e2324a04b8eaed811fefe3a950cea8e01f02981f82e8c16676fc6849
-EBUILD cookies-2.2.1-r2.ebuild 705 BLAKE2B 74219a18a6ba44dcf5272df5c1a086486fd98da03e6dd0ed7d6bcb1a45d108d1c9468a89a78143e8329e05ace0b7b8f9dbc5112928d91b60930d78c0973e3789 SHA512 4b2e026fc95c50b92a382eafd2cdd10d3c859bfc3f4c5d1d2de68e5ca2d36ff322adbf108b0a25fbd284d3bcab272f1298f19e4aec36e095ae28b9cadc41ed12
-MISC metadata.xml 311 BLAKE2B 7a85df041493c4715edcf9edb7494bc2257b5e3a204e9ca178aea1b3a8b8eacaee001a4cab9e2f6aef626d0128ac4c46d4b60aba4c1323185de46e12c9bb667f SHA512 508ac189b85e2fee0aa4f54b5df1815f78ba64f13e2ab2e58de1c278e6317334f5e70f39463d362038c98cb999ca8aed921de724acb023b034b9eac0d664eb34
+EBUILD cookies-2.2.1-r2.ebuild 697 BLAKE2B ba4d41d963983686f620d38b44512dab56d19fbe6e572553e5d553df42ab7f13222f36842a109a7a8084fd1e487ffadbe1d92604b4b070b653ca745ba2368567 SHA512 7754ce974abbf21ffc72780443330c6f693bcd45caa3d8313b15364f0156195d846d5b7358aff8e7b90401649f7dd5e6ba3142d1bc653d2b276209cfbfe6d1a8
+MISC metadata.xml 335 BLAKE2B 2944ac332c29a9eee7fd1ac6fcdccb1ee2b44d866995c4c27cdeff07ed3ef29145a06ccfe0850c703605e1f1ad368a7a030d24ef4347e8e14c3872a85499c1a1 SHA512 fdc6b3f32c17c0df4fd6f1541d8ff13e2a7bfadeabb67adb68db36639620fe049e805f4f1b285366f0d30aca7f87defca3b3045fd2d9f4c12f32f6587a8e892c
diff --git a/dev-python/cookies/cookies-2.2.1-r1.ebuild b/dev-python/cookies/cookies-2.2.1-r1.ebuild
deleted file mode 100644
index 8c46a0eeb2fb..000000000000
--- a/dev-python/cookies/cookies-2.2.1-r1.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
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Friendlier RFC 6265-compliant cookie parser/renderer"
-HOMEPAGE="https://gitlab.com/sashahart/cookies"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-PATCHES=(
-	# https://gitlab.com/sashahart/cookies/merge_requests/2
-	"${FILESDIR}/cookies-2.2.1-fix-warnings.patch"
-
-	"${FILESDIR}/cookies-2.2.1-tests.patch"
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/cookies/cookies-2.2.1-r2.ebuild b/dev-python/cookies/cookies-2.2.1-r2.ebuild
index ea53320a5a8c..e3378cf99352 100644
--- a/dev-python/cookies/cookies-2.2.1-r2.ebuild
+++ b/dev-python/cookies/cookies-2.2.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 PATCHES=(
 	# https://gitlab.com/sashahart/cookies/merge_requests/2
diff --git a/dev-python/cookies/metadata.xml b/dev-python/cookies/metadata.xml
index d33209246a07..7ff355639eca 100644
--- a/dev-python/cookies/metadata.xml
+++ b/dev-python/cookies/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">cookies</remote-id>
 	</upstream>
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index c4b044e1d179..9a9cd27fc475 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -4,6 +4,6 @@ DIST coverage-6.4.1.tar.gz 719971 BLAKE2B 047c57ffae092a9e04470a64d090ee7c3274c5
 DIST coverage-6.4.tar.gz 715897 BLAKE2B 69fd1979da2c652d5cf8b83adcde4755824faf832867c0181e610ef1369bae217c487b230aa649f03692440efc78628474d72303635568f8e7e5b41f83afc1ed SHA512 e834ff2329eb930ea40a28e8be7f665322558a1f00b5297a2daaaefc986ae451f333ea76bf6e345cad1560d721ebd990cdd5b79b30bddd9e17223acc85508089
 EBUILD coverage-6.3.2-r1.ebuild 1635 BLAKE2B f935c180220b93c732e8fe65a3b103632f4af5c7191fdcd9f3b2c4ba7c8ade58cc0e6a88e27d96b8f0e975b4c26f0cbfd2baa0b1955049177792f82c2fdb4deb SHA512 8d6a3bef51cc8873460a546dee206d91a394dc7aaf81250fcb6080585216fb211af64676ad9176d28e9d0e03f1bd050976c604659b634a4d9d2c7ee884203ebb
 EBUILD coverage-6.3.3.ebuild 1643 BLAKE2B 3d8859823ce522fcf7746c51e5a266f5cc04eeedd17a83c5778a5fb60b9032b9803757f96d545732a1b6175fed7988f259dc038d71e478087523f1f7967c2aee SHA512 93fb60aed276e6986985fa5288208d7532415d43cfdd32f47d584e56af0b796fa493140ca8b4427040d2e6ae7aa73d00ad8a9c4feb7a8d8710d155e7407868a3
-EBUILD coverage-6.4.1.ebuild 1686 BLAKE2B 433e48ff442b0b5523eb1bcc841e54baaa77704328ec322fbf2431b3e249022cce2007cca81b5e074024c83b5382eeb934543a38d1be54b1aa4b840a13be64dd SHA512 a339c3326b111097b5812beaf12da90ba021ea9bb2dff68f97754af3ca4e21d28de607445441709180a3d14c847bc8021bfab657f79b310f2d5b7745b564ce2b
+EBUILD coverage-6.4.1.ebuild 1680 BLAKE2B 982b7670fd7374856bdc2a0c4beb7bfe46e33df146f14e947ca8c2d514df0c8a8b9238ad53fea82bcdf7af3aca50a7c953aa8a84bef29adb895d19746d3d4e7d SHA512 44e54230cc4351157e2393901378c34d38a8f408e6b11ecb94c45754c820a0e17a1108d02a5ff5a2f94bc43f2494c284b215393b9bd1c869d69ca8f35810f9c8
 EBUILD coverage-6.4.ebuild 1686 BLAKE2B 433e48ff442b0b5523eb1bcc841e54baaa77704328ec322fbf2431b3e249022cce2007cca81b5e074024c83b5382eeb934543a38d1be54b1aa4b840a13be64dd SHA512 a339c3326b111097b5812beaf12da90ba021ea9bb2dff68f97754af3ca4e21d28de607445441709180a3d14c847bc8021bfab657f79b310f2d5b7745b564ce2b
 MISC metadata.xml 714 BLAKE2B c0d2641f795a21a80b6fa36206973f41421effe055e4c5e41bf752869759eb48e8fe42a0ab00af55b5d5111bfaccd330676d63e263013dc9bd3c344cb038a3a6 SHA512 412d70b7c9c2871bb93ae6ed6ae110a9f29c26957f6e1b24cc531c7d49f292ecb5206df10b409f2e44d2f814b119ef4ed973bca608df999026bda8df2156df24
diff --git a/dev-python/coverage/coverage-6.4.1.ebuild b/dev-python/coverage/coverage-6.4.1.ebuild
index 8a27c2c95f30..76c0a76234eb 100644
--- a/dev-python/coverage/coverage-6.4.1.ebuild
+++ b/dev-python/coverage/coverage-6.4.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/croniter/Manifest b/dev-python/croniter/Manifest
index 353f64e4c691..2029a69b65f3 100644
--- a/dev-python/croniter/Manifest
+++ b/dev-python/croniter/Manifest
@@ -1,5 +1,5 @@
 DIST croniter-1.3.4.tar.gz 39351 BLAKE2B 38701e865b67a382e8c6f511ebf801c83e27aec31cc0f0636b9f8a7b13405a27531b3314523ac819d5193c3907f8aecfc6132901856a1565e6c986ea73dceed0 SHA512 aa55f8849abfa0c8ff24514051362e21fab821d2ffcde182d9e0f267b3b5e1706278710eae80df3ced82a1444323af44eff25cfc34ab92bd15fbb31d7d791037
 DIST croniter-1.3.5.tar.gz 38606 BLAKE2B 45586ef4ef6622caca3611fd596818a875a451ade6353cf4a99219f38ab76e72656c885bd61238670a809203d487d78d884d700c5e2e4c6eb1bdf44dfc14a1c4 SHA512 9b59334f8537cd5b48e17be2c83fcb78f2c0a8c62b7c28091600c84cf202e6847d7d1d40ff5ebb57cac3a713013ca247620e348aa9f3a408483cf4110a88545f
 EBUILD croniter-1.3.4.ebuild 650 BLAKE2B 89cb525f6f3aa36302839450af0e53a556fb709904955ede69a2b640592f69d802ad43486d4c370c2b2be659fddb326a47e7ef1e7edf4380b4b4f43cf4c10a5f SHA512 c3260199ff52801817a92e16052dcf2330e26c9e1027cb61a141637716da99f01cc7645e245e1bd8222f5ebb2e9e549592b9a5031bcc0cbe655fe843b3cb9429
-EBUILD croniter-1.3.5.ebuild 658 BLAKE2B f4b5903279a33bd4546722b60e0d19345cd95aaae5397305b1cbd24e2aab0a612fe662f85f110e5aec6bed70b43e1e2f4d5d4dbb5107ba5a9316fbedd529b7b0 SHA512 6b8bd7c0059d957d3b07185312871c921e8a3d5fe3dc407f3d701ec4787bd1a407b7d6596eb5b342a035cabc075f189631fe3b87cddade13fef83811eb968842
+EBUILD croniter-1.3.5.ebuild 656 BLAKE2B 97a74e04cbb2025661b8a3becbadf2c677061c34fd68bcf9fa5fb7173f4e04d77fd60e3802443fef041509a133838d62c3742dbc605160076cd18a26d86bca7b SHA512 ff46fc214548e114a89e8058881110b5de3924c27e4c2a977df0c6bcfdacd36fa37d5ebae331e9a4e40ddcdc6c6580a30155aa72a11239278f7e6bee11c6ecef
 MISC metadata.xml 470 BLAKE2B ee6bfe88287fe27cb8bb33258f6fbb3275daf8294a834e899975e27c34d9103e21dcdef3f43b5df3a9a9e5d741f971d0117ad6e4410c1117306d9b913c8f2bc6 SHA512 e2167dfde1b79b2ec613ad671868a7ad28e64705515534b7911d2bc1f2cfeb6e68e14b1d93e6e29ab2f60c2b49b60454d4b6d9bba2f7bcf9cc3f3a20424fe3a7
diff --git a/dev-python/croniter/croniter-1.3.5.ebuild b/dev-python/croniter/croniter-1.3.5.ebuild
index 07402f10627d..5fedffe476ce 100644
--- a/dev-python/croniter/croniter-1.3.5.ebuild
+++ b/dev-python/croniter/croniter-1.3.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/python-dateutil[${PYTHON_USEDEP}]"
diff --git a/dev-python/cssutils/Manifest b/dev-python/cssutils/Manifest
index 89e0ffa6062f..97ab3ae13f90 100644
--- a/dev-python/cssutils/Manifest
+++ b/dev-python/cssutils/Manifest
@@ -3,5 +3,5 @@ DIST cssutils-2.4.1.tar.gz 726348 BLAKE2B a6049a6326c9ffaf399b163a1819bff58445ab
 DIST cssutils-2.4.2.tar.gz 726519 BLAKE2B c087e06d25aa78cac35e936fe06d37ffc973b022a611a4a294683929b4c553adfbeb475330e8ce4b27b5aea3b9d4c89df6f52d02fef49236a81245505ab80d5b SHA512 0757fa73170c0287ee7be9c931103bb1781c93fba63870bb11e257797af7033e77e5417ed1c7aa219eeaff5c524a84c920ead0e2b8a4599ce499b17a83fdc8f7
 EBUILD cssutils-2.4.0.ebuild 908 BLAKE2B 9ab0f74daca9b3845b326459c6ccc760c28bf50441489901c05955ea5b10fb3bf238d17ea591a7e8d6022affa0b287c97d64de469ba7a86475b4678e6a0cb151 SHA512 44e411d5b60586331c623c4c827acc4f1b40d8420be5955cdceac41d5cdc8f415952a87d8b4103aabc598b8026bfbecd87487771199666ae6f1a2c129f11d715
 EBUILD cssutils-2.4.1.ebuild 925 BLAKE2B 25b889fcb417cd1a084d85665116a3a2914f591a674bd5252651aa00b729a0f2d06504835d9761a66cdfab0fbcd558cf41250628c33c00a29dfd1f8327afc5b7 SHA512 1c9324739623c0e2df3db857adb8f9c883637ca17c94980b89eae1536fe00cfa7a71fbbedba69579183ec557e3437cd9efa237a29d3b754928599551385506cc
-EBUILD cssutils-2.4.2.ebuild 952 BLAKE2B f1d16e4062bdcc028f571f6aa20ed14ebf499084e7ad8df996f0b03d5c2f51c7628e81537cdbc6b21add4e599106a0acf6ed35852196742739eff3571e212584 SHA512 a905babfc25872244e9d1e621ecf24eb4a081a7d9ace071badffa76b2361c536405cee600b217884326bd42cc8db6a9d0889ad1df3803b26e9df781e9412c391
+EBUILD cssutils-2.4.2.ebuild 974 BLAKE2B 9e98833018105a8dc6d092847e8e511482a075027e84296ee32c39016f8bbb5603be54ac5b42c079a00630eb263e5fddf548087bca350e85cfb8f35fda0562bf SHA512 b091be7c243b4bb3acb9bedcc9abc8057a97631a8a3e51229a15bbd8afb138387eb31b2401286b74d74a6b92728caf0a6ff7b4e068a0973d14d95bd5129f7a7d
 MISC metadata.xml 404 BLAKE2B 799ecc65093102f5dc56c272245253ad76e69ade2196953bc37547408cbec9c3259c05dd75838c23027cb6a348d03586d2e1d61d37713401ae3cbcfb330275e9 SHA512 b009e78386aee2e8405406ed455c5432e00d5990ca86b49e6ac5db4e3e06102fb968cdc7b55b824c3451156fe2501e3f1deed1f31b48cd1916f90ef515dd8e4e
diff --git a/dev-python/cssutils/cssutils-2.4.2.ebuild b/dev-python/cssutils/cssutils-2.4.2.ebuild
index 20d8c05f523d..272b19e506aa 100644
--- a/dev-python/cssutils/cssutils-2.4.2.ebuild
+++ b/dev-python/cssutils/cssutils-2.4.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index f8df2453b646..63497e72ad20 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -8,5 +8,5 @@ DIST cython-74073417c4f7e616af0a139a55f790f1ec7fe728.gh.tar.gz 2106765 BLAKE2B c
 EBUILD cython-0.29.28.ebuild 1884 BLAKE2B 6a96c180a690924a6ec689404146f19bf3ae96b3f8d71afe02624789c73c0e9377ce2839904ee09af9e6bfdeb5520bdfd2bb0a2aefade7132afc19c9dd0a433a SHA512 6c54d580e08fbca4c4ade822e66ef84883b9fe762b9edf2e54f1ad7588ac275ca142524b0d444f92e48264cb8c600759d4542351b96ab829fb45273a303c0b94
 EBUILD cython-0.29.28_p20220503.ebuild 2109 BLAKE2B 737da8f36474c52295e3ad2e9de530087273f48099216a635ac6b7018539131281bcb110e22da1852aaf80f9ca9d1b19c77ff69c656c7ef0f760d6bbc05594af SHA512 130dcf8eb8e2627d5d83e1747b4daa6b38d6b58cc1e9e73a7e7f00e9770f7965a44c630fdd7b20901ab9692552a81b189ca2dce84604aee71a82de3cb45e9a9c
 EBUILD cython-0.29.29.ebuild 1997 BLAKE2B 492efdda99a00989c1aa04b431ea6c8a5ca323a5ac493b1915204d682f097f1bc7a0ae421b4b96336267aa36b9f6d227260826e3dbfe978186da507da3fe8dc7 SHA512 278aa29f46e02782f01be6523adef658a42e5345cb77abc69d270095f90e686b1113462486fd28991dbe27b59765354e55880ce074c3bcbffea9efeddee80a43
-EBUILD cython-0.29.30.ebuild 1995 BLAKE2B 36586e741c8f3cde107f8e7805f35b3c5a918a2ad67c20890ff933bd9a66499d6d228cc52c3e1780fdd0ad20a4811bd2c7339871aa0ae55dd59718f9924b2f91 SHA512 175b2dd59b5645f5422685bc5d32f28cfe708435449f92601af5cc534725a05175b44147d5b0fb0bfdb68558492b6878ee0c114f4e3284d9b0146cda7fc5a6e6
+EBUILD cython-0.29.30.ebuild 1991 BLAKE2B 56f4945d2c0656b8db0dd4ff31e239ef1096a793af1dfe08d4a72a44ba0a1df76f8a02ba6b69f44aaac4592e8437d74c8f90ed257143dc96759e9657bd538010 SHA512 2df2575df8ba03e969d43eabcf64baadba4e0f79005265c6edd8ce2f528c6c552adf73ba8f52e8e70193b396ee4c64423e972409b6e157265f19c317e36f8a8f
 MISC metadata.xml 606 BLAKE2B 1ee3fc75852383aa0618afeb7521c3ae0e95b518c85b2c58ff958905092cf68017d313a09d25031a50b649f9dd1b452e751036f2552df9d91447baaeff0a8f0b SHA512 b7917c2e417cee9e59c8011246f7223f5095c87f0294ea140dbfc8fda0b09cf61c9f055380a9d3f74a07e71bb49d75f219d6224ea95f1f4d4b451e5688c13f78
diff --git a/dev-python/cython/cython-0.29.30.ebuild b/dev-python/cython/cython-0.29.30.ebuild
index f174596d8317..cc7a5039f68a 100644
--- a/dev-python/cython/cython-0.29.30.ebuild
+++ b/dev-python/cython/cython-0.29.30.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="emacs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/daemonize/Manifest b/dev-python/daemonize/Manifest
index 2401253b35d4..6ea9a93479c2 100644
--- a/dev-python/daemonize/Manifest
+++ b/dev-python/daemonize/Manifest
@@ -1,5 +1,3 @@
 DIST daemonize-2.5.0.gh.tar.gz 10126 BLAKE2B 10e13f93825309d48ef67d0725ed53dcca2220b3940b3b81e1e7f29cf7b6d89af40f94488a2398bec74c0f6235ef8b1626871bda4fb33c233a872a9ccea47558 SHA512 c17a14c073e22fc98b3663da207238d183c12e95750f14cddcf90419c51c95ebc36251bb95d0bb4db84a2fb243499329473e7d14172d855d3ee204757a2a1a65
-DIST daemonize-2.5.0.tar.gz 10126 BLAKE2B 10e13f93825309d48ef67d0725ed53dcca2220b3940b3b81e1e7f29cf7b6d89af40f94488a2398bec74c0f6235ef8b1626871bda4fb33c233a872a9ccea47558 SHA512 c17a14c073e22fc98b3663da207238d183c12e95750f14cddcf90419c51c95ebc36251bb95d0bb4db84a2fb243499329473e7d14172d855d3ee204757a2a1a65
 EBUILD daemonize-2.5.0-r1.ebuild 586 BLAKE2B 5c1e17c98adc93fecb1184dcdbac44e2670c3052a3600cf0009237aafbc2bea8ea6279b59f322917fc0d2a9cdde07f00588a524e7160109e29bd6fb699f28c83 SHA512 9b5bdcf685e8c5135419ebfebb567a14b64ca6a738cdaa0eb45ea0c1440cf70fd43cf83553e790c4428ccd61fe54741a45c280ad3c41c3dea4c716da390c9230
-EBUILD daemonize-2.5.0.ebuild 501 BLAKE2B 0f73c0d3893fdc7a3a5c4055cfec7b2d166a43e8e26a60994f7977b4a5f2ecaf98fb5ad89df444f427e2c5bbb0bb325f5053a0b6400dd185d5204ed08b36c10f SHA512 58f79b4193b91a9c07f7ae76267ca2f3b22f19258041828ea2947120286ba010f1665c6f2bed4d15080548e778c40acd54a3a58e61b6a5371ae0aa9d1c746922
 MISC metadata.xml 378 BLAKE2B 9dbc711651a817ecb3d38a5bc02976df91a9a87b477c2a88e63894590f1271f2e4b9838e06c5c54eafaeaf1b1bcb00f285317978fba26f564728ae88ed36366d SHA512 dc1bf98d261bb298722f2c9a7d0c4732161970664853e6849868c44370e7e9e9096cc2059eaf72b29323f3a7484e40b9aaa6fd2e1b2d9237c88f3f91374030c1
diff --git a/dev-python/daemonize/daemonize-2.5.0.ebuild b/dev-python/daemonize/daemonize-2.5.0.ebuild
deleted file mode 100644
index c284be800ff3..000000000000
--- a/dev-python/daemonize/daemonize-2.5.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for writing system daemons in Python"
-HOMEPAGE="https://github.com/thesharp/daemonize"
-SRC_URI="https://github.com/thesharp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-
-python_test() {
-	"${EPYTHON}" tests/test.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/dbus-next/Manifest b/dev-python/dbus-next/Manifest
index 4c6217d01178..0519c2334f80 100644
--- a/dev-python/dbus-next/Manifest
+++ b/dev-python/dbus-next/Manifest
@@ -1,5 +1,4 @@
 AUX dbus-next-0.2.3-glib-crash.patch 1361 BLAKE2B 879f66971e1a4e341ff2b5f396c8e26bc02e4c1ee7af0e72a34e2f672f156f93d40590bd9aff8d0ea8ae0ea15449d504a3b971c7745962de3607c57bb8e16806 SHA512 b32795726021fe25e41e1ed453e2040f76619f28e316a0707cde35dafd68316647a20d6865a6bb7b3d2baf7e703c0524d164d82b56c731277fe0a1265f2b6419
-DIST dbus-next-0.2.3.tar.gz 81711 BLAKE2B 6acc38a05511b3de7e13893d82dd1ecd55f9a6124b4d859574294602b921ff012776c12ddb02e1be437b258c7bd5120a3a9625fc5b06bbbe02915dcc4c14897b SHA512 7836d855c755c8ac6cbbb251ca0cbd2f4df9b573f31b1ea1cab480e47896d36b4cb0d479b2469b0bf0b5c700068361a18874b4a087f73020cdcb4e04a2d7dbe7
-EBUILD dbus-next-0.2.3-r1.ebuild 1154 BLAKE2B 51178ce579844b011df9bb8978323e70924ff7769b0b2761173697770dbb347ccb6b5de83b78c0a90fb2885893c03d1f0a68b4c9421f4c90ed227e68cc5afc27 SHA512 8c70c133ee2d1be21c68f1fc9edb327888630e42bf344fcb0fbb16a20abcf34cdc6e865bda5c4815b31aa30d4ea52f55c0b40d2e36a27e9c9f259a9572086dd4
-EBUILD dbus-next-0.2.3.ebuild 1085 BLAKE2B 949c2bd4de63ef95ca76afacfd2dc051aabf968f7537b9968346c6a4def7a6dea210162ece14913a1abe35364a3c98a2add528d5370b2f4ddf5aaae5a7ed66e2 SHA512 ffb5395fb9da01484ebf9b2181c1ccd791c67923fe413de2955aa11558238f31865cd2834d03eecffa6031068a8315d14b0696d9fd9096f3b5b8597a5ece3fcd
+DIST dbus-next-0.2.3.gh.tar.gz 81711 BLAKE2B 6acc38a05511b3de7e13893d82dd1ecd55f9a6124b4d859574294602b921ff012776c12ddb02e1be437b258c7bd5120a3a9625fc5b06bbbe02915dcc4c14897b SHA512 7836d855c755c8ac6cbbb251ca0cbd2f4df9b573f31b1ea1cab480e47896d36b4cb0d479b2469b0bf0b5c700068361a18874b4a087f73020cdcb4e04a2d7dbe7
+EBUILD dbus-next-0.2.3-r1.ebuild 1245 BLAKE2B fe5509caef808862e2a3e398bafa29d5364ad6b6a7e7b2d9dd977778a3e2c10c646d143d9eb6aa17a423069f2e4769863a93166934a6151dfbd0cf0a5639aeea SHA512 fcf6b5d0aa126614cdbb8f81cb948e4a9a47c92acc291f016a3e06f6078d18138b05ff58df52047d344d8d91453e8c9f09b7dfd703121a9b2a2ae0ec7c480557
 MISC metadata.xml 382 BLAKE2B 6974331ea2db5dfedbbd9667a4fb923bfc4ed5b5c0c940f30270e02c18f1c2a4763039d90454d74b8da4740545dd282527d7a73a0448af1ec38600eaa76858a1 SHA512 64e6df55127e43b249830ba06ac13b069cd4f1c236c424b2ea3ea32c7846c980c30b9d8170e26e4b4ebecde0abc596b93c2796b3812371f4a69356cb55a7386b
diff --git a/dev-python/dbus-next/dbus-next-0.2.3-r1.ebuild b/dev-python/dbus-next/dbus-next-0.2.3-r1.ebuild
index bd406332677e..be0d45236976 100644
--- a/dev-python/dbus-next/dbus-next-0.2.3-r1.ebuild
+++ b/dev-python/dbus-next/dbus-next-0.2.3-r1.ebuild
@@ -4,23 +4,33 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
+
 inherit distutils-r1 virtualx
 
 DESCRIPTION="The next great DBus library for Python with asyncio support"
-HOMEPAGE="https://python-dbus-next.readthedocs.io/en/latest/"
-SRC_URI="https://github.com/altdesktop/python-dbus-next/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="
+	https://python-dbus-next.readthedocs.io/en/latest/
+	https://github.com/altdesktop/python-dbus-next/
+	https://pypi.org/project/dbus-next/
+"
+SRC_URI="
+	https://github.com/altdesktop/python-dbus-next/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
 S="${WORKDIR}"/python-${P}
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~riscv ~x86"
 
-BDEPEND="test? (
+BDEPEND="
+	test? (
 		dev-python/pygobject[${PYTHON_USEDEP}]
 		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)"
+	)
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.2.3-glib-crash.patch
diff --git a/dev-python/dbus-next/dbus-next-0.2.3.ebuild b/dev-python/dbus-next/dbus-next-0.2.3.ebuild
deleted file mode 100644
index 6e7d9b789770..000000000000
--- a/dev-python/dbus-next/dbus-next-0.2.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1 virtualx
-
-DESCRIPTION="The next great DBus library for Python with asyncio support"
-HOMEPAGE="https://python-dbus-next.readthedocs.io/en/latest/"
-SRC_URI="https://github.com/altdesktop/python-dbus-next/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/python-${P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND="test? (
-		dev-python/pygobject[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)"
-
-EPYTEST_IGNORE=(
-	# "interface not found on this object: org.freedesktop.DBus.Debug.Stats"
-	# Seems like we build dbus w/o this?
-	test/client/test_signals.py
-)
-
-distutils_enable_tests pytest
-
-src_test() {
-	local dbus_params=(
-		$(dbus-daemon --session --print-address --fork --print-pid)
-	)
-	local -x DBUS_SESSION_BUS_ADDRESS=${dbus_params[0]}
-
-	virtx distutils-r1_src_test
-
-	kill "${dbus_params[1]}" || die
-}
diff --git a/dev-python/decorator/Manifest b/dev-python/decorator/Manifest
index 0e862595488b..a80e91642803 100644
--- a/dev-python/decorator/Manifest
+++ b/dev-python/decorator/Manifest
@@ -1,4 +1,3 @@
 DIST decorator-5.1.1.tar.gz 35016 BLAKE2B 0e38ee2dea6793d489f5c50692549022f1b252ab3a7b75da5b785f856b7f18faaf5570dde2c68f6936c11460599839063e9eb8a133789a00f683761393a5103d SHA512 584857ffb0c3e52344b473ceb9e28adfd7d789d480a528471f8ab37be055ebe5feb170f41077010e25350e1c311189d45b90773cf12f0043de98ea8ebcde20ab
-EBUILD decorator-5.1.1-r1.ebuild 697 BLAKE2B d04600f0fe58856a1b1cda7bd3f8b6ca1060e82bb551950478920272c26b493b4d04a044fa8ab97e3acaa1bb361f40a6d720099b56144f71e7f50b4382a935e3 SHA512 4770882d25b5200fc4ca0d4faee46ba1dd78c29029e2b94b11c44d6037f8049b74b5662d5d8718a7ee5ad228226d44317801d9f876ea29d0a8fe93913994d165
-EBUILD decorator-5.1.1.ebuild 651 BLAKE2B 8a57114f972eddcab2d7d26883d7a99465bea189dda8702f69a65d15823b409b14ac1ec71d953856bd2ffa9b77d7bdbe8204e95eba8dda9b6e3e7095326afb49 SHA512 82c07fd8fe947cf1719a6d6cc0d99ed21ee81283d33ad5a2d5e386022d2b540c9125ba5908f27507dce18aa778cf63d3b8446c858c1c71174ba340ffebafe336
+EBUILD decorator-5.1.1-r1.ebuild 689 BLAKE2B afedc2c824b080ddc5f58b3c0da95a14d698c26145127d2ef3a2b199967fd791dd186ce2eb4c813c3874de42db11cc8194b7a39017f4141d38d15ab3bac404dd SHA512 9b0545db4d9436985f689f569a7020511be9f4e9c3db479b354bd68f4b3eda01d07cf10ac4d8ab8cc0fea57a68e5c9602ae550efe9ef0f01b900feb4dfd62883
 MISC metadata.xml 756 BLAKE2B 231d25578555eda8a5f6d5598dafdebbb3695656eff92178f664eb29eee5d9f18f82235c40d974c58959aa1f4692d4818edca6c640f146520186cf5390cd21d2 SHA512 a9d79d6dd55a349e41d861f1c4b2526c8bc71261fc5ea796675ebed8a9389b3945da86814acbd0a67edd4379dee36b4d99f2cf788fba5d2eadf77e87f6c0dde9
diff --git a/dev-python/decorator/decorator-5.1.1-r1.ebuild b/dev-python/decorator/decorator-5.1.1-r1.ebuild
index 9e0a329fddd4..973f23286924 100644
--- a/dev-python/decorator/decorator-5.1.1-r1.ebuild
+++ b/dev-python/decorator/decorator-5.1.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 DOCS=( CHANGES.md )
 
diff --git a/dev-python/decorator/decorator-5.1.1.ebuild b/dev-python/decorator/decorator-5.1.1.ebuild
deleted file mode 100644
index 6a8b2349c2a6..000000000000
--- a/dev-python/decorator/decorator-5.1.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Simplifies the usage of decorators for the average programmer"
-HOMEPAGE="https://github.com/micheles/decorator https://pypi.org/project/decorator/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-DOCS=( CHANGES.md )
-
-python_test() {
-	"${EPYTHON}" src/tests/test.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/defcon/Manifest b/dev-python/defcon/Manifest
index 9d7a5d90f89e..7a8e4f896968 100644
--- a/dev-python/defcon/Manifest
+++ b/dev-python/defcon/Manifest
@@ -1,5 +1,5 @@
 DIST defcon-0.10.0.tar.gz 426111 BLAKE2B 6750ac064677bd1b2a2b49d37792b4e35c923ddd239c521490dd3aa0c40f55a96dcdac156a2511c3bb40605505beb920c66053488bb2bc2508899d4a81f77ddb SHA512 69d48701bdf419080b7acafe2b92c1897358d969d6ea5b78330969b79b9e393a1c53cfb1a17b4d58719329c403ac3a52a4e12828d99b8793d8dd19ddda151c76
 DIST defcon-0.10.1.tar.gz 426234 BLAKE2B 0d4f0749c061860603d343bd8d0291699a64794ec8f3f1e6f1cff0af0f22cd0cfc4ae60d578c5f55131d1de694b3234017afd124a4266c972217b39d70071473 SHA512 12cb1512321b91676f8be380999dfb00942eb8355389db409ef896f7e7100fc97186a920c1c0a741b660e57134e880d068446e5ad00e2768221f80a26608819c
 EBUILD defcon-0.10.0-r1.ebuild 720 BLAKE2B 544665158c21e30346d8ae88de808927cde265723d91c1f1feed491b757f061921c092e5c83eab63e8214fc5b78220195862b23dafd7c73a59a7c6ce51877b87 SHA512 b0b0389b4a500f0d61a2ffbe461c157d6d2acd1931fb87c0a7cf5430991eef77979f1a5b21f5530601a580b60ead57b0d38025343ec7696a2b7db703fa8585b8
-EBUILD defcon-0.10.1.ebuild 730 BLAKE2B 38c1fb5f7744a427f5b1f1acd4feb548f186d4ce49fb6f3295c9d79f417e87c6e40d11f3c8d0457ef6b0569aeb8deff1ce75561caa543d77263e401750f1e50f SHA512 afd1344f1df5e583d0b7a3e5691a068e2108cda5eb098f7e208275587ab6cba30b17139c44dd8153ae28919e252f2c94f8e94f740920778a8d45bb76904c8957
+EBUILD defcon-0.10.1.ebuild 727 BLAKE2B a09734e16ce0002e9b75c238f1e8555b3ffc9dfbac325e4c2b73f04d4687b0f583fb737e12b393cd6bb18e004fdfc168f846cf35302dc3f46303c295bbdf9923 SHA512 b194f38777e85a0ce86a892da56589e1897c41d4611f214e31028672a985ddb8f02fdfb6a78b48c2e0b82e2f7aa8b7a90caa3cd50df9eed00660dcbed364d4ce
 MISC metadata.xml 494 BLAKE2B 9770fc2e1922d5caf6a2c8022f450e2ac3b6bdcb4da6ef77f1cfa66c2b96e32a2a4503e2404a2574fba9a41ff19f2255638eaa39c0bd367981b1bbe79945fc17 SHA512 02425eb4725a172ff8b869099bd6903ca62669687969be51f5dd3b072bd397e7192f0469bf38d0349e47b95586e34e531c05ed6b0b5f284eb3d521b8ca27b6d5
diff --git a/dev-python/defcon/defcon-0.10.1.ebuild b/dev-python/defcon/defcon-0.10.1.ebuild
index 9a06af9ed8e1..b233adb09855 100644
--- a/dev-python/defcon/defcon-0.10.1.ebuild
+++ b/dev-python/defcon/defcon-0.10.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/robotools/defcon/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/fonttools-4.28.5[${PYTHON_USEDEP}]
diff --git a/dev-python/deprecated/Manifest b/dev-python/deprecated/Manifest
index 7b6c181396a1..16f9e0eac793 100644
--- a/dev-python/deprecated/Manifest
+++ b/dev-python/deprecated/Manifest
@@ -1,4 +1,3 @@
 DIST deprecated-1.2.13.gh.tar.gz 2971610 BLAKE2B 00c1fad34e869b143ad7cada2426f999f1d353d23e33076b0197a7ca6c87b0f2d240d7f4944b7c7669974c89304a6cf04f5d2b4c44e6fee22c27522ec2cc9711 SHA512 c170b086bc4e37462181a0f53edbe745aa4f4924c7fd64d9693de267e070392b74445f9cba935e85c878b755603ca6cada8b4130ac96ab071be284047aa35619
-EBUILD deprecated-1.2.13-r1.ebuild 859 BLAKE2B 10beff48f1631d641f1c7106fd819272f7f3ca49dbbcfbc33095cdfa87c0d99cacfcc250cac87827f3ac94f2e2cba7d79be0c206ba70c3d1f164d89d4bbe9df7 SHA512 c09b31da00975899c30bfb3428a10f3e7da71d4348a93b421feb0310f205c0ddc24a6f78cb0d1a4dad06b3421eec9e0a62e5c10b3a39e91a579db71b2c0e7c3b
-EBUILD deprecated-1.2.13.ebuild 773 BLAKE2B 2ea600f88df3e7f2f8ca35478372f4a0945fb393ef79d4763ae48f43cbd01b12eb69913cb95c8becda7e2b99e8ece2f440e1b6b203b1096f64b897317c8aefef SHA512 87424dc9289778ea148e4ec0e23f15b7bbe78f6515796d7a7b6aa743fa7a0d6d40706c48e77cb785a6c079367fb0db1f173694f17e53b6015eb0c284d9c02eae
+EBUILD deprecated-1.2.13-r1.ebuild 852 BLAKE2B 42d4cb43ab5eb227c2e1d8ef7bda767b64dff205f0f04dad2d9b36210bd033c821c841128382558ef07fd31fcd3e71933b3bbaa90ade3a6d7c1792ed743921a4 SHA512 73b60c6af975cf46c2e8b5c567abdb9a522f46bd88993f7bef63d074d79fc253887d1b443f7cd40abfd3c932d3e579e899091c3b6f842aafee45e034cbec017d
 MISC metadata.xml 316 BLAKE2B 0275fd3fa62ad50251204b24fa83ede995c3b25ae8547fe507ae5b61812ad760db24cc2fba35d7af629b8e520e5c2c058c412ad0bd71554b3b350dc085f2f35a SHA512 c7237b466a2f0b791713cb36edf731ead6f37757faaf193fc4889ba17e2e25b5ef68ddbabcf0644c7948e23f13248023f84cda9f1c49723cb5221c603ffb1d5b
diff --git a/dev-python/deprecated/deprecated-1.2.13-r1.ebuild b/dev-python/deprecated/deprecated-1.2.13-r1.ebuild
index 39fc23902db5..7bf2c03296f6 100644
--- a/dev-python/deprecated/deprecated-1.2.13-r1.ebuild
+++ b/dev-python/deprecated/deprecated-1.2.13-r1.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1
 DESCRIPTION="Python @deprecated decorator to deprecate old API"
 HOMEPAGE="
 	https://github.com/tantale/deprecated/
-	https://pypi.org/project/deprecated/
+	https://pypi.org/project/Deprecated/
 "
 SRC_URI="
 	https://github.com/tantale/deprecated/archive/v${PV}.tar.gz
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	dev-python/wrapt[${PYTHON_USEDEP}]
diff --git a/dev-python/deprecated/deprecated-1.2.13.ebuild b/dev-python/deprecated/deprecated-1.2.13.ebuild
deleted file mode 100644
index 000465c10a44..000000000000
--- a/dev-python/deprecated/deprecated-1.2.13.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Python @deprecated decorator to deprecate old API"
-HOMEPAGE="https://github.com/tantale/deprecated"
-SRC_URI="
-	https://github.com/tantale/deprecated/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="dev-python/wrapt[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=()
-
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		tests/test_deprecated.py::test_respect_global_filter
-		tests/test_deprecated_class.py::test_class_respect_global_filter
-	)
-
-	epytest
-}
diff --git a/dev-python/discogs-client/Manifest b/dev-python/discogs-client/Manifest
index 0f3a8dbaf6be..4e11060887b2 100644
--- a/dev-python/discogs-client/Manifest
+++ b/dev-python/discogs-client/Manifest
@@ -1,4 +1,4 @@
-DIST python3-discogs-client-2.3.14.tar.gz 34461 BLAKE2B 7212e220e1ea68bf71e8ddf54ee5d820e7cb7203e1d34b34abf818227e1f842b6ea680101e7a761ae448d0dbc298e8c33ae9969c7c3d1c93ca912d92274d52c0 SHA512 356faf54025691a3af74d947589132d5c159176146669572d14490ece05a0e4546bf0a05bfee4669518c157957cc52eb7842008e7da5555347365236ae19b63d
-EBUILD discogs-client-2.3.14.ebuild 807 BLAKE2B 614df884987c5cd638ed17ce6ecc0f9ffa6e39fee33acad8affaaa9e9a382b2e5adc5d3a9289a8dc26caffe43f6c9bbc4ba4af341de6f8d4a4a42bdcf248a42f SHA512 94ab655efc5c5086f58e01a3c569f41f94231dea8380f5fe1ff95f0e5d100371bfc02ab6c599b6442d38f46061e311e1d849e3c550ee9e9563bf8fb9363bda35
-EBUILD discogs-client-9999.ebuild 803 BLAKE2B b7ef19b97fa49802689ae02e7e4f006f9bd7fdcabd16175373813e22b6e4b6f3f96b7d4ae24d367a77e5855b5120b9a02cee948a595dbc4976a88efcd27d5b24 SHA512 4ef1dc5904f8098df61ad1fffb74b4250f045ec4dad6f7bda9b9447bb701ea8bb784e1ff6b53c6fdb6b8c1a232a3eb4dd4827acd94e4870f7039197fcf7ed507
+DIST python3-discogs-client-2.3.15.tar.gz 35059 BLAKE2B fe2b577b4810480fcad8a76c8f961809baa5b217c0d01c262f4a6a0a2993b2a6d2515edf90f276f7a104f6bdf0a1edb0f439c69e51507e3c0cf1ab927049e7f7 SHA512 8da52cc6c125cc4b3c5fb93626075ba32046798f71f72cc9f685fdf10a92a813fbd74b35625994cd4c6b7e394e36265ce01a33b52b607bf498a5f11f68d82ad9
+EBUILD discogs-client-2.3.15.ebuild 807 BLAKE2B 614df884987c5cd638ed17ce6ecc0f9ffa6e39fee33acad8affaaa9e9a382b2e5adc5d3a9289a8dc26caffe43f6c9bbc4ba4af341de6f8d4a4a42bdcf248a42f SHA512 94ab655efc5c5086f58e01a3c569f41f94231dea8380f5fe1ff95f0e5d100371bfc02ab6c599b6442d38f46061e311e1d849e3c550ee9e9563bf8fb9363bda35
+EBUILD discogs-client-9999.ebuild 807 BLAKE2B 614df884987c5cd638ed17ce6ecc0f9ffa6e39fee33acad8affaaa9e9a382b2e5adc5d3a9289a8dc26caffe43f6c9bbc4ba4af341de6f8d4a4a42bdcf248a42f SHA512 94ab655efc5c5086f58e01a3c569f41f94231dea8380f5fe1ff95f0e5d100371bfc02ab6c599b6442d38f46061e311e1d849e3c550ee9e9563bf8fb9363bda35
 MISC metadata.xml 674 BLAKE2B 5c0dd431ad4633cbc7ddaa97e54e9f5b3eb67ed28e07ac313f218fd055e0042365c270e83153627decd196aca49db12304da87f2c74f20bc454fd8e5b4b8fb46 SHA512 ad582419be3887c5fa3c0d630ad32575f378453dd4f7a8c33df91db31b495caa88707214f7e456d69027532540a474c41ad8336b40e90229f1f31cd3193d7f82
diff --git a/dev-python/discogs-client/discogs-client-2.3.14.ebuild b/dev-python/discogs-client/discogs-client-2.3.15.ebuild
similarity index 100%
rename from dev-python/discogs-client/discogs-client-2.3.14.ebuild
rename to dev-python/discogs-client/discogs-client-2.3.15.ebuild
diff --git a/dev-python/discogs-client/discogs-client-9999.ebuild b/dev-python/discogs-client/discogs-client-9999.ebuild
index 6866fa012da6..6e7748b475a9 100644
--- a/dev-python/discogs-client/discogs-client-9999.ebuild
+++ b/dev-python/discogs-client/discogs-client-9999.ebuild
@@ -18,8 +18,10 @@ else
 fi
 
 DESCRIPTION="Continuation of the official Python API client for Discogs"
-HOMEPAGE="https://github.com/joalla/discogs_client
-	https://pypi.org/project/python3-discogs-client/"
+HOMEPAGE="
+	https://github.com/joalla/discogs_client/
+	https://pypi.org/project/python3-discogs-client/
+"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/dev-python/django-cacheops/Manifest b/dev-python/django-cacheops/Manifest
index 3a7d2080461e..5774e92ade4e 100644
--- a/dev-python/django-cacheops/Manifest
+++ b/dev-python/django-cacheops/Manifest
@@ -1,5 +1,3 @@
-DIST django-cacheops-6.0.tar.gz 70280 BLAKE2B 9efe5a10d86f9ad25ad67701005de962185d2c491305bb56920203718c2d5fd0b28d43f2463e28c7c00c7592a78a3adea66090b398a205d5e361dfbcf90ae887 SHA512 54ecec62ff255a867b382bb1157117c8d14d7185891aacaae33ea11283beeae2fae60659621699a52f86d536b5a582d31f24f3b00f16c2e81c1a78ea4079504e
 DIST django-cacheops-6.1.gh.tar.gz 52972 BLAKE2B bdcd045912100ebdfdfd9add23b0df634b029cc2ffe41c351176e327f1e21c90457cfca9e45348dddce60e39fee5c431428ff7f2c954194e4c06c8bc09d78945 SHA512 43dcd4f302afee1acf73125aae7c2e2eece560cc6f07f3374391ac54e0438fd59b80a24e65f52bd7aa4978fd8a428939a8d607c7aa4b25f47d68373cfc12772f
-EBUILD django-cacheops-6.0.ebuild 1343 BLAKE2B 4fb0a485ebca18e0826ce6838cf11afb3712c13752537e95d6dc28bf4f13e20f772f940547b5babe38ce6214e7dfb29b6e07647f5bdc93156bd2a8ad279ce388 SHA512 901a88bbe46c43d767c0f68715c251c3df9b4a559f25f316da07598faaf73abc8b679c1b819611c3b5196ff397f3e0adf75f928b66eb576d6da024b1b9fe0d4e
 EBUILD django-cacheops-6.1.ebuild 1488 BLAKE2B 2904bd8d68e8ce6e69e11f3b0e12902ad452a5d3ee670fb688e3c552b8ddb371d3b341086fca4ce0120f22f5eda0bc928248bb1baf7ba5d412fdceaeec23ebe6 SHA512 2d09d1a1b390a6b9ae760a3bb1828c94cbdc7d369fde0d6451ce9153c4d4480e711b7acae039cf3256f2a21cfa6bdbb37f70b723c3225193455e905d5b4dc406
 MISC metadata.xml 381 BLAKE2B b8bf138d65b463c15b22be44750822bf6d49f1e651ecc6884dc008b9f1c93ff314967d8d3793825e129c8ac5d98348ac2726ec36ad43b8ec5d0829a78a16a26b SHA512 ad1f2ac5abcfc3705d70cc717bc076115d299a3b973852a542a7d41fabccc695b79ada0297a48cbe8f04815d66e696b437eca896e291c7da9682a85542d3e469
diff --git a/dev-python/django-cacheops/django-cacheops-6.0.ebuild b/dev-python/django-cacheops/django-cacheops-6.0.ebuild
deleted file mode 100644
index ecfd5010beb1..000000000000
--- a/dev-python/django-cacheops/django-cacheops-6.0.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
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="ORM cache with automatic granular event-driven invalidation for Django"
-HOMEPAGE="https://github.com/Suor/django-cacheops"
-SRC_URI="mirror://pypi/${PN:0:1}"/${PN}/${P}.tar.gz
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/django-1.8[${PYTHON_USEDEP}]
-	>=dev-python/redis-py-2.9.1[${PYTHON_USEDEP}]
-	>=dev-python/funcy-1.8[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-db/redis
-		dev-python/dill[${PYTHON_USEDEP}]
-	)
-"
-
-src_prepare() {
-	# Remove test dependent on unpackaged before_after
-	sed -e 's/test_lock/_&/' -i tests/test_extras.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x DJANGO_SETTINGS_MODULE=tests.settings
-	django-admin test -v 2 || die
-}
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-
-	einfo "Spawning Redis"
-	einfo "NOTE: Port ${redis_port} must be free"
-	"${EPREFIX}"/usr/sbin/redis-server - <<-EOF || die
-		daemonize yes
-		pidfile ${redis_pid}
-		port ${redis_port}
-		bind 127.0.0.1
-	EOF
-
-	# Run the tests
-	distutils-r1_src_test
-
-	# Clean up afterwards
-	kill "$(<"${redis_pid}")" || die
-}
diff --git a/dev-python/django-cors-headers/Manifest b/dev-python/django-cors-headers/Manifest
index 68d79ca134d0..cfbb14f762ce 100644
--- a/dev-python/django-cors-headers/Manifest
+++ b/dev-python/django-cors-headers/Manifest
@@ -1,5 +1,3 @@
-DIST django-cors-headers-3.12.0.gh.tar.gz 26638 BLAKE2B 7725f7db4e9a67d7cd7f4add74abb5bfd27bac4c65cf4120dee3ba412c27fd89d6e39502249ea4b253c6a7d7d0f5328296ed69ac8b3ceb337bbb89a04f93a6ce SHA512 16d1d03bf1f5336703168280ff585168eb239f454aaec1f1e9928a362c7e7da17b54e896d7428ecdc91657045bede0b3c239a7f2f271c58c1b7b265b2e52aef5
 DIST django-cors-headers-3.13.0.gh.tar.gz 27361 BLAKE2B 2d0729ae6f0e0ff7c572c5f25482fd88dfa03e8f03a7f640ba32f56208fccb91712cd3067bc3376428469cc7f03dd8003069b79e98dd438fad9e5f4b15cd9c71 SHA512 153ae0d2e0b1e390c72993ca629f7ed521fd907481bb2944ee2f805c0081a1db334fd72f0b3fdb77cbb57b3392691f32564bb646bfb8e388a942a8a3da138a8e
-EBUILD django-cors-headers-3.12.0.ebuild 709 BLAKE2B 8ff4cbdff6cfdf3a4d423a67f96878239d88e6d1f318c4d2c99e2be8d526d843ca4f7f51d4462223906b70041b17bb7b3e567e9424cc207aa3735aed58e96340 SHA512 c76bc5a43cbae4cdb0a282a89496ed670c07c8df4fd3a962fdb624cd8b396569a65b81dfbf803d2165c35465cbc58b2e367fdd0fe6457d97e21baa2f69426560
 EBUILD django-cors-headers-3.13.0.ebuild 709 BLAKE2B 8ff4cbdff6cfdf3a4d423a67f96878239d88e6d1f318c4d2c99e2be8d526d843ca4f7f51d4462223906b70041b17bb7b3e567e9424cc207aa3735aed58e96340 SHA512 c76bc5a43cbae4cdb0a282a89496ed670c07c8df4fd3a962fdb624cd8b396569a65b81dfbf803d2165c35465cbc58b2e367fdd0fe6457d97e21baa2f69426560
 MISC metadata.xml 393 BLAKE2B bfe5bf69a5cdf23648e6058016fa53d402db8141ebf97a8471b3335f13eb0adb3ac328c2a013bea02529ee012b00e77fbf43284500cc9e58937fae16d3a2d743 SHA512 b028f371bae9e3bb8e0e94890ee2a5a8c2d93a774eac7cccd6a1ff91886a82ed52ae4fb93442de89034cdbf4ca9d4186dad29b014b989690020db00c492fed04
diff --git a/dev-python/django-cors-headers/django-cors-headers-3.12.0.ebuild b/dev-python/django-cors-headers/django-cors-headers-3.12.0.ebuild
deleted file mode 100644
index 11302037f21b..000000000000
--- a/dev-python/django-cors-headers/django-cors-headers-3.12.0.ebuild
+++ /dev/null
@@ -1,34 +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="Django App that adds CORS (Cross-Origin Resource Sharing) headers to responses"
-HOMEPAGE="
-	https://github.com/adamchainz/django-cors-headers/
-	https://pypi.org/project/django-cors-headers/
-"
-SRC_URI="
-	https://github.com/adamchainz/django-cors-headers/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/django-2.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/dns-lexicon/Manifest b/dev-python/dns-lexicon/Manifest
index d5d4dc7285ee..1302d56b6b91 100644
--- a/dev-python/dns-lexicon/Manifest
+++ b/dev-python/dns-lexicon/Manifest
@@ -1,5 +1,3 @@
-DIST dns-lexicon-3.11.1.tar.gz 8478920 BLAKE2B 6c437c678a2872a81f316ac064390e5ab6ac458b7fca199a3fe67152a46e87c82990cec0287651634f50e572691a778dfdcafd2aea4fd4d305dc223a8c327818 SHA512 3947e0de0733bb329b0d13b9aff59760ed7de9e34c320ed9de3a3c44ff8b813c78d54f31d0d9b5a97b4b57279adef432f8458f912cfae942437c3275df92fa7d
 DIST dns-lexicon-3.11.2.tar.gz 8479426 BLAKE2B aced03c62f809bbb22d2456da8d7a66c4b3cdfd47903a67cafd8a97cbc7cdbbe22fe7e79ad3eada716a569241def4e42cf7d910ba9837dfe05a31ce3f8ed2bdb SHA512 bf77cee4e483b36c8cc8cb176291f0170a1d611551246e27ddd91d9712e8750c9ee57863697e975065f6924c03fdfd636c5c7df29a620d37441b12dd0a1c597d
-EBUILD dns-lexicon-3.11.1.ebuild 1686 BLAKE2B 0201070142787bb0d528451b8e661546a83e3504d89bcf220f4a92c52ff7fbc234745c3a0eef85178edba629d962d15c4fe29254586082a08f5084fdc3aebdf2 SHA512 31eee4ea5e066c78fa36708ca0d76b74f0a543d88aa98c829fbaca3282585dc73fb12f0de82fce88277d9c8b0899b0d6162ac4a548ad9590b54d512a949dd4c5
 EBUILD dns-lexicon-3.11.2.ebuild 1779 BLAKE2B 9ae8f9050f5d22d5da832cbb8d1bb8b4aaa89968f3d789f02712e703f3f8555e4b7ab4b64f041e8712dd202140d1b873ddf1775b8d03dbad640161089205887d SHA512 f922bc0862a22b8cfb14d22269d69287fed4fcb6c0c225181d4c3b058b1307110bb2dcafcb9917078c43d1a4046f78378a2bea18ed4125b33430b0ac3e0bfb33
 MISC metadata.xml 541 BLAKE2B a22266eac0bc7b4c22d9552cf64cbf88bbc1c2953e3ef0daaf059b81519909e0f8808e0d74cec6db3296e43f98082d57b8ae3779d694432e8578112ac18c3ea6 SHA512 79e2b43a685bfcc8dace1faa1c1a08cc648b39a3fef2834a57b6e801f72e7309276604253089db7a2fbe1d5d776b2ba1427c90a9cb9c44a0c1b2812d4e1901db
diff --git a/dev-python/dns-lexicon/dns-lexicon-3.11.1.ebuild b/dev-python/dns-lexicon/dns-lexicon-3.11.1.ebuild
deleted file mode 100644
index bd75f1201713..000000000000
--- a/dev-python/dns-lexicon/dns-lexicon-3.11.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Manipulate DNS records on various DNS providers in a standardized/agnostic way"
-HOMEPAGE="https://pypi.org/project/dns-lexicon/"
-SRC_URI="
-	https://github.com/AnalogJ/lexicon/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-S="${WORKDIR}/lexicon-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/tldextract[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/boto3[${PYTHON_USEDEP}]
-		dev-python/zeep[${PYTHON_USEDEP}]
-		dev-python/vcrpy[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# Requires the "localzone" module
-	lexicon/tests/providers/test_localzone.py
-	# Requires the "softlayer" module
-	lexicon/tests/providers/test_softlayer.py
-	# Requires the "transip" module
-	lexicon/tests/providers/test_transip.py
-	# Requires the "oci" module
-	lexicon/tests/providers/test_oci.py
-	# Uses tldextract which needs Internet access to download its database
-	lexicon/tests/providers/test_auto.py
-	# All recordings seem to be broken
-	lexicon/tests/providers/test_namecheap.py
-)
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		optfeature_header \
-			"Install the following packages to enable support for additional DNS providers:"
-		optfeature Gransy dev-python/zeep
-		optfeature Route53 dev-python/boto3
-		optfeature DDNS dev-python/dnspython
-	fi
-}
diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
index 5104280c67c9..fa1bcf3a8974 100644
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -1,8 +1,6 @@
 AUX docutils-0.18.1-py311.patch 4637 BLAKE2B d103e5f4fa6b8c1ab06f2b07c33ee3f707f0c1224d9bfa6f57504c3f30177dcb46cb8ed32dcc03c413937a94212bc64a9963cc0cede766e50b81b1f73531fcef SHA512 7c7c97e150914ddc12948236f84314b3ce49d043a7e5245ae0defbbf1d0845a8e3b06ebd63fb466c92bc970305578243dc97103230d80a810fa3cd54528b70bd
 DIST docutils-0.17.1.tar.gz 2016138 BLAKE2B aa0b6525ba2e3eaebc17010806952ed5f40919876fcb813f50cc05b628dfd22e6073a9a4b2bfe989089ae68d9b7111ae3a97dda2bde5c0536f8fb76c0942fe29 SHA512 5ec2087116bd5356fdffc54f07f6b0355aac5fa9d6caeefa77e8d201fd4706c0d419193c4d9a3964ae493da3091fe2c7dc36b74f81a1e1b9282173658b06e71b
 DIST docutils-0.18.1.tar.gz 2043249 BLAKE2B 3959199236baade9601d61c3f6d7b6f840fbefdd46d9ea05869fde2cd2c800356a01faba891f51e220c85e66f3029f49f616f2046b85041b674c64825a4242ec SHA512 44404a6cc9d4c1e79c73a6ffee2898e459c9925ab9661e5d41394e13b3d861334cf0c5efcd18e87eb03041374e326cfd00539a6b2ec5979678889e8a536c9542
-EBUILD docutils-0.17.1-r1.ebuild 1838 BLAKE2B 282f920117a968d289709bc4472d2136f43540631725427abd2fc0189f04c54a9586a77b191503ff777d2cf7ccc6b6d27cf84d512988ec8759cae27c98f7f640 SHA512 1cd54662515f169746f7560337ea6eb2655194514d3bf3586d820e78afad6df509d22bf592c9cd34c1bc716d934339df03715f67d10ea13b64bc84e29b948e87
-EBUILD docutils-0.17.1.ebuild 1755 BLAKE2B 80aedacfe801d0843e922db5c43cf0e0f2c3072c1340dae848c91cb3e152c645996eb472c5684bf7fdafbd00a70983a5c7b2c823657cc51dc79402d01fba3d57 SHA512 d668880f53ec2f3f3e449ce49851ad1b3f3f37d5cf2261caf5a1771ad078d1ee0da054a7cd3bbe9d7647bfaee45c778b0ecef3e65168bdf198e27c59f0d29e82
-EBUILD docutils-0.18.1-r1.ebuild 1827 BLAKE2B 1267e438cdd7037d1bcf0d4839abb08fb533e369d6d9f01f122627fd8838be496899dbb3bd75e2ad4f4995f03c1a2105e5a39fcafebec999dd483957c134cf20 SHA512 186ea770e2e5ddca5b89b72194a6e3923c36acbe6dca14bc033e8cb95736eb7083de53a53b4ec00af649001f698b9485d79b3d1d0602b3e45e72595203fe7a10
-EBUILD docutils-0.18.1.ebuild 1755 BLAKE2B 880ab3f863af75a8531b5b5d3f48beaa9eb09b011ce2c6e2fee496f8b160a8281ba486ed020c70ffc28ededa00dc6b0d195ab65b4a47543df34ca0f6723e5429 SHA512 ee54df064180c08ff4bba0583088e63cba7b802f706e04575952ae23d71ed9164ac23fd661864a3d7d97bcf437de38c2632b181c8cf45174effcfd1af469d4b8
+EBUILD docutils-0.17.1-r1.ebuild 1830 BLAKE2B d13ba2e4998192d440e02fa4832ce67862d01b3731db0eb10f0c8df1a1403e5e356487d56599ef56cd154cc24ec37ac5dfaf6d9eec7b9aa429e54d5fc8ba4c3e SHA512 6cc1a8a27d9bcd575f9b9ab92629869583a28ac78592d47257bec360169987aea1a3a9d167f72e0ba6c38cd0868ca109ec8f0da739823b1ae24b923ff19e9215
+EBUILD docutils-0.18.1-r1.ebuild 1819 BLAKE2B 3a9611e2f5d592d762eeae1b72ab8fa364f0c0fef173d8c93a8bc6f5959d43fb4b2cd28d6d29ec8da3a096e3e0b6684d96b442070c97d044637d5a82eb6f7cbd SHA512 b36683561ef5367b0e1937693b14a867408b4d051b6a6680804c8c748da8f6c0369013a4aa5de40797fdf306f72490edc5219dd41fa5f0bbc8920d6d0945ec6b
 MISC metadata.xml 389 BLAKE2B b586fccb92f88e7f2ee68879bb919298953da9eb629fc1042f5f35b316b59ffcc614f23135fe1ab4af8ba9646bcbc33f194ac74af795094e20d288817b5e227b SHA512 ac8975a27694a2a0efd07c944a769f1a210bbf4a1550f92f0ead3ac2dc9ffb4d82206858f2a8631f751c81fdace88433b9d89f8c3d6af72907e102da5696693f
diff --git a/dev-python/docutils/docutils-0.17.1-r1.ebuild b/dev-python/docutils/docutils-0.17.1-r1.ebuild
index 14547bfb4e2f..388cb8be2276 100644
--- a/dev-python/docutils/docutils-0.17.1-r1.ebuild
+++ b/dev-python/docutils/docutils-0.17.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-3 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-python/pygments[${PYTHON_USEDEP}]
diff --git a/dev-python/docutils/docutils-0.17.1.ebuild b/dev-python/docutils/docutils-0.17.1.ebuild
deleted file mode 100644
index 4f20978f653a..000000000000
--- a/dev-python/docutils/docutils-0.17.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Documentation Utilities"
-HOMEPAGE="https://docutils.sourceforge.io/ https://pypi.org/project/docutils/"
-#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2 GPL-3 public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}"
-
-python_compile_all() {
-	# Generate html docs from reStructured text sources.
-
-	# Place html4css1.css in base directory to ensure that the generated reference to it is correct.
-	cp docutils/writers/html4css1/html4css1.css . || die
-
-	cd tools || die
-	"${EPYTHON}" buildhtml.py --input-encoding=utf-8 \
-		--stylesheet-path=../html4css1.css, --traceback ../docs || die
-}
-
-src_test() {
-	cd test || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	"${EPYTHON}" alltests.py -v || die "Testing failed with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Install tools.
-	python_doscript tools/{buildhtml,quicktest}.py
-}
-
-install_txt_doc() {
-	local doc="${1}"
-	local dir="txt/$(dirname ${doc})"
-	docinto "${dir}"
-	dodoc "${doc}"
-}
-
-python_install_all() {
-	local DOCS=( *.txt )
-	local HTML_DOCS=( docs tools docutils/writers/html4css1/html4css1.css )
-
-	distutils-r1_python_install_all
-
-	local doc
-	while IFS= read -r -d '' doc; do
-		install_txt_doc "${doc}"
-	done < <(find docs tools -name '*.txt' -print0)
-}
diff --git a/dev-python/docutils/docutils-0.18.1-r1.ebuild b/dev-python/docutils/docutils-0.18.1-r1.ebuild
index 14298078d9f9..d916deb851d3 100644
--- a/dev-python/docutils/docutils-0.18.1-r1.ebuild
+++ b/dev-python/docutils/docutils-0.18.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-3 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-python/pygments[${PYTHON_USEDEP}]
diff --git a/dev-python/docutils/docutils-0.18.1.ebuild b/dev-python/docutils/docutils-0.18.1.ebuild
deleted file mode 100644
index ec09fc9ea24c..000000000000
--- a/dev-python/docutils/docutils-0.18.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Documentation Utilities"
-HOMEPAGE="https://docutils.sourceforge.io/ https://pypi.org/project/docutils/"
-#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2 GPL-3 public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}"
-
-python_compile_all() {
-	# Generate html docs from reStructured text sources.
-
-	# Place html4css1.css in base directory to ensure that the generated reference to it is correct.
-	cp docutils/writers/html4css1/html4css1.css . || die
-
-	cd tools || die
-	"${EPYTHON}" buildhtml.py --input-encoding=utf-8 \
-		--stylesheet-path=../html4css1.css, --traceback ../docs || die
-}
-
-src_test() {
-	cd test || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	"${EPYTHON}" alltests.py -v || die "Testing failed with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Install tools.
-	python_doscript tools/{buildhtml,quicktest}.py
-}
-
-install_txt_doc() {
-	local doc="${1}"
-	local dir="txt/$(dirname ${doc})"
-	docinto "${dir}"
-	dodoc "${doc}"
-}
-
-python_install_all() {
-	local DOCS=( *.txt )
-	local HTML_DOCS=( docs tools docutils/writers/html4css1/html4css1.css )
-
-	distutils-r1_python_install_all
-
-	local doc
-	while IFS= read -r -d '' doc; do
-		install_txt_doc "${doc}"
-	done < <(find docs tools -name '*.txt' -print0)
-}
diff --git a/dev-python/eventlet/Manifest b/dev-python/eventlet/Manifest
index 7abd3503803a..21c47ac7ae30 100644
--- a/dev-python/eventlet/Manifest
+++ b/dev-python/eventlet/Manifest
@@ -4,5 +4,5 @@ AUX eventlet-0.30.2-test-timeout.patch 1421 BLAKE2B 11730b1a5827d1b30537eaecb896
 DIST eventlet-0.33.0.tar.gz 414929 BLAKE2B cfb2500d25ed56f5eb7b81968286b1d7d0286511e1658dca8ab4fcf07029390168aea1f95092b5f1b486bd6fb34a96b762c2087cd19f903d232f1da183508888 SHA512 52ef5c6997d0c8a3b55d5f6e969320e06950503984c90440b484020ba346d622ba99abf2bd389b962534849b0c70d80b06f110b2586417f27fb6dde725bfaef4
 DIST eventlet-0.33.1.tar.gz 415294 BLAKE2B 25efb9b9848a6e0db2040d111288447aa07ceb70d2cbd9b3d189a2ca58aadad6b6d64054f76f3329ff7ca832efccbabb780c839c4db6d95a5b623d80079b7da3 SHA512 c8ece6a26039631b13ecc188f480f348a42551267fb6135551899dec7a23d0cfd032c14728e114901e4d256bf580203bfbdb1795881abdd71e49a53f8ed58964
 EBUILD eventlet-0.33.0.ebuild 1277 BLAKE2B dff2f9505dbe912b27993c5e0bf0b08dee2d9bdc234fa1cd7bb4c9f6ea42c1828e7dcc203c41e82bbaa7431f93575dc75444f377b9ea2ccc205f8b9fe7617b9c SHA512 35af5ce16281c54817f5b188770e8fc75d36f711f13655162839732a7ee506617fcd07e94d288efbceb127b6e583ac8b03a6355fb3053bfd8388731df58ceea4
-EBUILD eventlet-0.33.1.ebuild 1328 BLAKE2B 7d49e73449e88d38162448f6efe4209083e2c9068b12cc10f8fc7e5775b8db965dd61f0f253d5c1f7cbafd9c5cfc0efa987df7ab1aa9fce9dbc0555c7a762169 SHA512 4551057772ed9e8e42b4b0daf6bd9ef54004298a15aa26ba64541b5929aa1cb3824675e4cf13ea134984b3ffbc2aff0fca8bfae1475faee62c8b3d612a079c5a
+EBUILD eventlet-0.33.1.ebuild 1323 BLAKE2B 5158015367d8c6aeb4a49f04d9e249be2068782add27591b214f9adba18840542694aa2cd3d6eee4517646dd858ec8f1d0b376c7bf2b0ade0a16b547e8086230 SHA512 1ae34e079b972e2a88ce0f4a154da48ee0de9d0a71496a702a95737f50315951d9cb1c0f59625a0e3a312e91451cd61238b8a5914b87a6decf87f3a4e9d91ed9
 MISC metadata.xml 381 BLAKE2B 13525cba2b71b496ca49573beacbd552a86320d40200747ce991163060aef7746dd568eaf572f19e990eb22ad3791f20a546264109c3a47687b03bbcf25a5115 SHA512 f7be09d2e34f1259e1e9ae685cb591e061452974789b0027878d7514e956a216068dcd139f4e3f57ed50530d828941caec12598e9f8d79e98e820c9683c71c05
diff --git a/dev-python/eventlet/eventlet-0.33.1.ebuild b/dev-python/eventlet/eventlet-0.33.1.ebuild
index e5aa76347fad..c51f5cb8aaa6 100644
--- a/dev-python/eventlet/eventlet-0.33.1.ebuild
+++ b/dev-python/eventlet/eventlet-0.33.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 ~riscv ~s390 sparc x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/exceptiongroup/Manifest b/dev-python/exceptiongroup/Manifest
index 952cdd288c04..9adfc38a5e32 100644
--- a/dev-python/exceptiongroup/Manifest
+++ b/dev-python/exceptiongroup/Manifest
@@ -1,5 +1,3 @@
-DIST exceptiongroup-1.0.0rc7.gh.tar.gz 17323 BLAKE2B fc96a1a7978c4ac403132fbb9fba57cd61e8078e1d99e7103e37d7273737c2d8fbf84441a9cfc3c21a355713b13ec78f9befedcc05a74d9bb954ca80965dc789 SHA512 272675f3322f904b6270689696b2a770d8a96f195d8b142986f574e9c67735865afbde8bba0c5bdd43d299fc1f44a3360d273f9b15097efdcfa46f21f40d62bf
 DIST exceptiongroup-1.0.0rc8.gh.tar.gz 17562 BLAKE2B 617e174e32f4c062f576b12c9dfe96e5495003097dc0da82e383019a65b2a043546d4b73181081defb641d453127e056be52e55e76fdf0ec0247513f5eb211ff SHA512 f7f1700403f345755a1e32c77eb43744b366b1f55446e1898dd960988d23396ad8334bef072ecc7ec5ac7075300f0f3e8e9a0d454d9dd80677ae55b4166fc6e4
-EBUILD exceptiongroup-1.0.0_rc7.ebuild 695 BLAKE2B 1d9de079da97cb77b753f96b59674c85c4c738d6e1feb342953639ecd25ca4ef952fb6ecf6fd66688f51fad080507f144db1836cbec7a5eb6403e04ba9cfa71e SHA512 45790a03b2225bd273c4544a18c7cd9f10eaece3fcf14099a70df0cd710e9dc8b01872d1b2d5bf907ff51234dbb0a079b58d76147a53573767952c0340ea0d86
-EBUILD exceptiongroup-1.0.0_rc8.ebuild 702 BLAKE2B 9b1e89143338481878f3536ebfb16be9dcb4561238c7459180fa53d14be1688de634a942ded0896736517e642d46ffadd50cb80b2ecf707f420f9e9e3770d986 SHA512 2e7632f87d5122b0baa1424d439ccfd314bd540ba5d4d28429366950ac214e8c4faa7a47ed14cbc4a9bda62e55af8528b942943b6a60a9721cc543d52489a81a
+EBUILD exceptiongroup-1.0.0_rc8.ebuild 732 BLAKE2B 67f28be9eea81df6ff00f6118fbfe1b9ffe32d61940d0ac2c2b78c2dfdae3f96d322d3c27e27c8fe3147a599b36d3d00ab52abfe6976693433a83868b9bccc89 SHA512 58a3481844be1430628b0410a162ca70c89f53f26058c79520eccff6f2a9062b46e44a7ee04bcaea933323f473aef5188400c987c6b3f39850293dc4488067ef
 MISC metadata.xml 360 BLAKE2B accdc2d9dc39a31238555b937189f135482f2094a570396a741ba6202a1243ad46c99003e829e59e4e5fd0db0a01b050cc0e385bf28b44892e3e3c5615351028 SHA512 d740125cf760309a4dc5de1981b5ad704e880c37588e8a0e17816709065d80ad2ffecb3b5e50725b5665a38594a53f9659c17b35eb34bffbb06d11b830d740cd
diff --git a/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc7.ebuild b/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc7.ebuild
deleted file mode 100644
index 2571619d98a3..000000000000
--- a/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc7.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit_scm
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-MY_P=${P/_}
-DESCRIPTION="Backport of PEP 654 (exception groups)"
-HOMEPAGE="
-	https://github.com/agronholm/exceptiongroup/
-	https://pypi.org/project/exceptiongroup/
-"
-SRC_URI="
-	https://github.com/agronholm/exceptiongroup/archive/${PV/_}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT PSF-2.4"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV/_}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc8.ebuild b/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc8.ebuild
index 3cfe11504dd8..dcf242e1d5a0 100644
--- a/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc8.ebuild
+++ b/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc8.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT PSF-2.4"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/filelock/Manifest b/dev-python/filelock/Manifest
index 294a0cc3241f..dc00fb097bd7 100644
--- a/dev-python/filelock/Manifest
+++ b/dev-python/filelock/Manifest
@@ -1,7 +1,3 @@
-DIST py-filelock-3.6.0.tar.gz 204238 BLAKE2B f65a6e8ca8645dbeaf5ebbad00a8001cd88065da997097ef2ce74b5eee4dabfaf44d53a240498e82905589943f045422b44776c3b8de3077656a3b9612396156 SHA512 f55ad90d79e90eb5a915afffecc632566456604a62b89fb13304c5812e05a34c508c863e76246a254acd98f55930d3179b0908a06d1e5a203d578a826a048ae2
-DIST py-filelock-3.7.0.tar.gz 204366 BLAKE2B 9ef0a488603a5d210a232e472d2bcdce7f867b7b3fdb8dbe167dde54cd8c7085561f09d5a746ad7565ae7853495bd84c0b14cfa136a9d466f18f037ea0b9e8d1 SHA512 1b01a25a1ec194be1727a7245d6bada3a5f6e38bc16c0c78793ec0cf3dcdee6cc6b5c04fc74ae3687afd354379c73e189f7f3a8964853b8533a489ed2a0c6a04
 DIST py-filelock-3.7.1.gh.tar.gz 204373 BLAKE2B e3ef657488a68caf8dc8158d5060a07447b74b53b26a2ad05eb67211a5ae7ef5deadeb8527cb6cd95ce225e0fcd29a0ce2dd53b68b7e2cacde4c0f2242966b21 SHA512 66708398ae3c4dcd97a6031feca6a1b7d1010a5ee605c5adce29a9cfabe67c5464eefb3812c66e2c32c3547240fdc7acac6eec25cc8dfb2d5255079c5e6b44b4
-EBUILD filelock-3.6.0.ebuild 780 BLAKE2B 519660d5bbc19b0c7e2fab334d5c567f3c2093a73e0cd38dbac68bf462bff14f5544a389fefab07bf0685685dbf28a6f2e77a50810f2ac3d01b63302ae9a71af SHA512 85084da031422b1fb024dc11f7da1b57ff4e29092f06fc5cef8d1403ad9c5aa26e325ef5693556460045288602e0839917d33450d22afd4214074bbb2aa67a2d
-EBUILD filelock-3.7.0.ebuild 788 BLAKE2B d34a9af059bd9d6a6e0ac69c750e0927a362acbce93586853167092fcda78e1cabae2463e43944abea37842e51d9fa7f2313128a18d18ce62707bcce997ad05e SHA512 8e6f410ffa2e0e54c8cd7cfc1859dbc7d356ab10a30e160454f9de5950e1176d0695ca66b535e2a8e11194d92a3991f9572704d359ec0f34b645d5a4e84d3c13
-EBUILD filelock-3.7.1.ebuild 791 BLAKE2B d4a804f1fc1d68e591ded7d192eca313a2b33ce36af7cda13b3441424a75bf0bc1db76001ef14e6c5fb97272fc5bf82c935cb9e415b6ea0c24fada114c4b4675 SHA512 9624a802ca2c87980c6dcd8aeaa7da80fac70170eee3d4b5a6a3e63b1de9688563a54734d0fd10958469cbc291df77d7e6404dfa4c15301d7dd1fcdced8da5ec
+EBUILD filelock-3.7.1.ebuild 783 BLAKE2B 53160203c699d14062b0d0a4a504a15b1de07e02bcd881f2bb8ace6e39fd640c0af0caad548a9e5e21c11d5444bfa6e3958e938f60dc62013f4147d137172af7 SHA512 cb26dc32c6c44a1dbe237bc217d7ae0dc015e26b4e4716d5992930a29382c762f4aa59b6b374ad8cc1a374cb56d3a794bfdee123318f3f30f9ef2df573276feb
 MISC metadata.xml 373 BLAKE2B 8923cea15313a2a4cad1af3e5e6c5623ac9855d3de37b6e43ff5249504d2bf07e1e334ce6ea8d9c397e03e3a05585cec0233e841a0a9f6c30d43eaa26b488933 SHA512 c114595146c326243756d0053476677b8b8c7541a253a0c739827e9b0f93c2a695d7289ee5a17c4a1a79639c02bf1396d2df4d8e20aaac9402c9d80f55be2f7b
diff --git a/dev-python/filelock/filelock-3.6.0.ebuild b/dev-python/filelock/filelock-3.6.0.ebuild
deleted file mode 100644
index 618da9440f4e..000000000000
--- a/dev-python/filelock/filelock-3.6.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2018-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-MY_P=py-filelock-${PV}
-DESCRIPTION="A platform independent file lock for Python"
-HOMEPAGE="
-	https://github.com/tox-dev/py-filelock/
-	https://pypi.org/project/filelock/
-"
-SRC_URI="
-	https://github.com/tox-dev/py-filelock/archive/${PV}.tar.gz
-		-> ${MY_P}.tar.gz
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/filelock/filelock-3.7.0.ebuild b/dev-python/filelock/filelock-3.7.0.ebuild
deleted file mode 100644
index 7a2524fc927f..000000000000
--- a/dev-python/filelock/filelock-3.7.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2018-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-MY_P=py-filelock-${PV}
-DESCRIPTION="A platform independent file lock for Python"
-HOMEPAGE="
-	https://github.com/tox-dev/py-filelock/
-	https://pypi.org/project/filelock/
-"
-SRC_URI="
-	https://github.com/tox-dev/py-filelock/archive/${PV}.tar.gz
-		-> ${MY_P}.tar.gz
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/filelock/filelock-3.7.1.ebuild b/dev-python/filelock/filelock-3.7.1.ebuild
index 320e582a2a70..3ebc63a65960 100644
--- a/dev-python/filelock/filelock-3.7.1.ebuild
+++ b/dev-python/filelock/filelock-3.7.1.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/findimports/Manifest b/dev-python/findimports/Manifest
index 57679816b69c..af8a4fb3313a 100644
--- a/dev-python/findimports/Manifest
+++ b/dev-python/findimports/Manifest
@@ -1,4 +1,3 @@
 DIST findimports-2.2.0.gh.tar.gz 36275 BLAKE2B e6a39620647434448d68f30e3cf212188bdc35993c1a2841614683273d41eb572b5a123ea42f1eff3730a2ba02055a2afdeb2607538dc0c3b55f38430e38581e SHA512 807d07b0cd5c1ba66d03121ef83a85291b84cf15b798074c39fc0858eeb7f36a77a787724b8072a9897186647dc92abca793ec6fa96f4448eb16709448364ec4
 EBUILD findimports-2.2.0-r1.ebuild 543 BLAKE2B 6c5ebbf9f9300c6682e00d6465ec2181b1b26f8fcbaaa55579e90f17d4fc6fe7457f25bff27d9a99666a341131ab55aaf6235b7caa827ac3694d0347e041fafc SHA512 a86d3ac2759b24a8c2732ed589a13c2ed81b6ddc2a60edcab58a5ba9c3f6b9f0643cdc33ed8775b7b0a77c7eb309438225bdffe6dc641142d92fe0a28a96eb33
-EBUILD findimports-2.2.0.ebuild 443 BLAKE2B 73a899a8a5f934a6249dee70c8d2555b78588011a41192a4fd62a6491dc3c5643483d83ecde49829b012bf5698b62892220e49a9dce56185e9e19bc0bd7273c0 SHA512 f2603d97632491fe9650f01f720dad78dca064ac45c3d92058ffba01077db980828bb14dc139198513b4a81f73140c203f27d99e591ac408507c24226533bab2
 MISC metadata.xml 322 BLAKE2B fab9ee7b0dc462a2c034e3cdfc0f5d5b3d6486218515a0e18c8348491f89c5164f8fc7e7878bac35ef15a7aa0483b0064f467ab0bab9ff355f9c7996de97c400 SHA512 df594d456e3f7a5387ce1d3f018dc8467e38cb7820f30c64db7988499d1b35ccb301ad6798796dd7dd7123d1e598c8bea81e84f8fdef662fc8e025cf3cb2fa7f
diff --git a/dev-python/findimports/findimports-2.2.0.ebuild b/dev-python/findimports/findimports-2.2.0.ebuild
deleted file mode 100644
index 396a6e44f8dc..000000000000
--- a/dev-python/findimports/findimports-2.2.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python module import analysis tool"
-HOMEPAGE="https://github.com/mgedmin/findimports"
-SRC_URI="
-	https://github.com/mgedmin/findimports/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/flit_scm/Manifest b/dev-python/flit_scm/Manifest
index 5e217d97541c..e3679da09eea 100644
--- a/dev-python/flit_scm/Manifest
+++ b/dev-python/flit_scm/Manifest
@@ -1,5 +1,3 @@
-DIST flit_scm-1.5.0.tar.bz2 3230 BLAKE2B f29f7c0cc341fe12d621d0a8f91b5d983f8f7e4259155a7119b07d8e159a12755ae60e007d1ace9054385104aa2a572454653ef9f92a3043777b1e631dfd5f20 SHA512 1b8d4a653dffb4685ad91843147ba6dc693b6d1d4f21e8766782d04edc1ec992e3ad4a3ce82d25e01a089816648f86228db75024e39a7a277b6fae9f8fc4567a
 DIST flit_scm-1.6.2.tar.bz2 3230 BLAKE2B 3977f1be820f2f590f4f781f065661adfc4a05427a87882093acad81f87eee2ba20d910ba3662b5b19997735f0356d262a4f150ba940310166b62a019b68ba05 SHA512 32690af4d24eb704338c78fdb0080d9f910a0741066d282e79eb88c473ada8d9a3daeba1a9aecfe830b2a6d0cea8da471bf6ef904b105fd8036994e4a0e12d12
-EBUILD flit_scm-1.5.0.ebuild 842 BLAKE2B a49c7e6f53f5ca840f3ebcf5d23f0adb10d126a50a3ba261485b8e2b204b7b62c238995d7e971e89a14c9a09c73efd3a15e579c635e416e744c3360da9a45754 SHA512 864c29941abf9fa93e6540b2fb10cdc57e7f4387bf3f15baabd7566476001937e8cecb3a7cd3a3fd9c7116cf7e491a060a0373ae8d89a3d6536d3f6d726fd32e
-EBUILD flit_scm-1.6.2.ebuild 849 BLAKE2B b1afe6f21ddb45485de7e91f36d4a02354b9127845537600b13a1bf8c72c4bb441b9fe13c88c6a89a68af3cceb213d1b5fcd24c6994ed3a94afe7fb8ca455b8f SHA512 86b045670ef70d0c07a04038b8db41088122d12da0bc676bcee9efef3723aba21880ee8d79ffd21a193aa3a7e5d5b0daf3f18eb4c552b9dd429c98f79d3b2b68
+EBUILD flit_scm-1.6.2.ebuild 879 BLAKE2B 336f1cf8c05f05f9944d5bd4279830c13bf20274befc0a1b6348d61ad61873048e0df90f50a35825788e23a372f76dc1c97e7c1848ff61f9003e317c947798cf SHA512 836aba9f77b4837daa11ce411503eb028f0571b7b171c8b41e5a2a5740daf91996ccb15e09c0fabba2de648419fd6bb623607f058adcceb26409cc5d0bdb037b
 MISC metadata.xml 290 BLAKE2B 555156b5f21d6d87b8077755a5e7ce59b7341380e29c073535e55fe44aa668db2837e42416f88d8802ef879be0dcc1ce85e27545db479add9b4273de348083c3 SHA512 7c3f74c83b9e928eac698099602db5e75cb9878354bd465c063f0e050fdc16ebcfa0e7ead8e26e5c82cd54684e9eea9b2657376c26330bb8c77bfee42116b889
diff --git a/dev-python/flit_scm/flit_scm-1.5.0.ebuild b/dev-python/flit_scm/flit_scm-1.5.0.ebuild
deleted file mode 100644
index 1c762f8ad837..000000000000
--- a/dev-python/flit_scm/flit_scm-1.5.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A PEP 518 build backend combining flit with setuptools_scm"
-HOMEPAGE="
-	https://gitlab.com/WillDaSilva/flit_scm/
-	https://pypi.org/project/flit-scm/
-"
-SRC_URI="
-	https://gitlab.com/WillDaSilva/flit_scm/-/archive/${PV}/${P}.tar.bz2
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/flit_core-3.5.0[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-6.4.2[${PYTHON_USEDEP}]
-	<dev-python/tomli-3[${PYTHON_USEDEP}]
-	>=dev-python/tomli-2[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	# unpin deps
-	sed -i -e 's:==[0-9.]*::' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/flit_scm/flit_scm-1.6.2.ebuild b/dev-python/flit_scm/flit_scm-1.6.2.ebuild
index 6a96d69942c2..af0bfa6c1b76 100644
--- a/dev-python/flit_scm/flit_scm-1.6.2.ebuild
+++ b/dev-python/flit_scm/flit_scm-1.6.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/flit_core-3.5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/gcs-oauth2-boto-plugin/Manifest b/dev-python/gcs-oauth2-boto-plugin/Manifest
index ddfd8cc63642..c2060d7bb3b6 100644
--- a/dev-python/gcs-oauth2-boto-plugin/Manifest
+++ b/dev-python/gcs-oauth2-boto-plugin/Manifest
@@ -1,3 +1,5 @@
 DIST gcs-oauth2-boto-plugin-2.7.tar.gz 20929 BLAKE2B 79db6c7bdf76320c2f74ab5edca0dd1cf7967bd38fb9a7a0a34c05fca3cab51317fb3ebd3e9ba195b42af2944cc951d150e3ee90cc93cdeab176f79d027a9800 SHA512 0ea8d4b01a2da79397e06de9dc0279594017e58e3874a2633b32007590efa2e8a29b5d2127d0218663cf7e63042adcc9801dbbb11bdfcb40d0c5d67c47267a09
+DIST gcs-oauth2-boto-plugin-3.0.tar.gz 20908 BLAKE2B 85c20d8b39dde8ed8a0bad887572040b8eb1eab91b41558c57ef7c190fff9cc5e0502579881a08ed514de87d5fe91a393779e2de071a53bb21e2371f8f13c047 SHA512 84cef64c2b0cc5e38685bb39b3939c54ceced2c0995a67787bf3541bf8a93b91ffec3da83094b7d6957d5afb60833c5ba4ffe7fb688ba8aa943c5f72c719e93b
 EBUILD gcs-oauth2-boto-plugin-2.7.ebuild 1211 BLAKE2B 20ec3d0636161344386f906867c25dacc57acb0628579708edf84d0b1c954a7db9b55517caccdd36899001c63c27c9e7eecb16bfe958d16d27675a9916298f6e SHA512 bc1af718b3f5ce71dbd6bf8679c4bfb587b82f65d30e3c131e2881dbf4cb5623a8553d3dd218517250ab4a60971101522c68ef98d021aecdcb8f10206faace61
+EBUILD gcs-oauth2-boto-plugin-3.0.ebuild 1212 BLAKE2B a79aff22f28422c09423bc89cc4dd232a56881561f7c81c7ce392df5b435c8e2b3632d0e841b07a7bcbd12aa29a3d31ee389a1aecac8069414e342c70924b52d SHA512 13eab01cbe763bf4a2e3a86a3ceb728fdc6741e5c620dd71dfc197810d6ce8558a073c3a9d39c065b3f1af3d38fa7cd06a9a80523408b373d9b237cb4a29bfdd
 MISC metadata.xml 456 BLAKE2B 5846fe15c17d14329e1f44eea25bd0528750cb92c5b0abb1c2413775f13e4a37470a0d03a8a96af4c05cee69d552e913746cef73c7379fb93511f9a1567e9294 SHA512 13c1f905b7e732be95f44268c176fe4e15c0a7b27d64f7581bafc4c0ce943f66d21f3d025b4001e7284404e354f61a6e08a1a2119295918981f7271cb6f04625
diff --git a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-3.0.ebuild b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-3.0.ebuild
new file mode 100644
index 000000000000..f81b7637e25f
--- /dev/null
+++ b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-3.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="OAuth 2.0 plugin for Google Cloud Storage credentials in the Boto library"
+HOMEPAGE="https://pypi.org/project/gcs-oauth2-boto-plugin/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Keep versions in sync with setup.py.
+BDEPEND="
+	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )
+"
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/boto-2.29.1[${PYTHON_USEDEP}]
+	>=dev-python/google-reauth-python-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.18[${PYTHON_USEDEP}]
+	>=dev-python/oauth2client-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	# Make sure the unittests aren't installed.
+	mv gcs_oauth2_boto_plugin/test_oauth2_client.py ./ || die
+}
+
+python_test() {
+	"${EPYTHON}" "${S}"/test_oauth2_client.py -v \
+		|| die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/gmpy/Manifest b/dev-python/gmpy/Manifest
index 54e03ed365ab..a65c88841551 100644
--- a/dev-python/gmpy/Manifest
+++ b/dev-python/gmpy/Manifest
@@ -1,5 +1,5 @@
 AUX gmpy-2.1.0_beta5-test-input.patch 436 BLAKE2B c0cea44d17b1a44470c13893500dbad327b9f1b694eeeb65a62a307dadfcae06ad57450aeddfd410432a04d7d877dc14c330c0174c49784c676d4079b628f9ea SHA512 9647d199be4017495e1525223e6b40bef50655bc86ce348fd0db78ea56b832795925848ad6897c7c83f7ae92e0a683105a16ad8fcb312c5676005ddb6d35c7dc
 DIST gmpy2-2.1.2.tar.gz 258445 BLAKE2B 5fd89478bb7c48c317a7af74fd872e5a9c1141f8f23c110aba7298d1a325caa13e24f1a2e601d6b3c6f6af30d60505f9161a03def16df59dddabe611fb600ef4 SHA512 abfeb0d8a155235e3aa797ca7b34ab6947f0714273e9d381167a9f6273bad34689e1985c139080b146e072b5bfbb4fa2b937566a14f4b94cc09ed21b3f2082b7
-EBUILD gmpy-2.1.2-r1.ebuild 1004 BLAKE2B 3a5b5abb1bb1d6473748969c8f72204af7b14749eed248cf8dccb59764fbf58db3390ed809ab333a2f412b44660b29bb9672d0c42ba0c87955a35e62819ffa95 SHA512 91881650541b38b9e8bd267e6e2f1cb6a84379ea1ae18f0f06ef4726a0692038b419c73cd200d4529a3801e121ed316356e057c340043c1bdaf060c5ac860d0e
+EBUILD gmpy-2.1.2-r1.ebuild 1003 BLAKE2B 6dc31fe7fe32dbba10399903bf21da548fb2407c56a0df87b0f920f6bf756fcbec36a04e36c0a4d87e3110dc72cd0f9630203aa5e1b1c0657448842d7ff537aa SHA512 751566abb06cbcb7c1bd367e701d655069e1b2019cbde216118d4cd300ec1f96433d3db331e7456a7b129e1e43674b9f306bc2a1585b1ec94582900901e38990
 EBUILD gmpy-2.1.2.ebuild 932 BLAKE2B 6b5d52f62790efc52d1b797f138d33093a60365eb632807ccc9175804d9fb2877e34880e31b61cc0cbace5e1f092d36b1828153eefb661229029daa6190a4cb1 SHA512 f6211e3de0601687e5caa0c6d00af695db8e8a12640d8ca3c814911de32c8250b9b5898efce839b1b8206c4bf0aea9087fc5497ae4c66a7e27bce827fca03491
 MISC metadata.xml 687 BLAKE2B 9cf9e1c3dad11819000600a2ce28b5f140101cfa37553df7bf07edeb8513d7b8d80b15d561e37ca960a23d3470fc7f83608f9163d46b54fe7c41782302c53963 SHA512 eb1aacdf09d56ac73a1ce37d4562987c900f658bc517ccb6bd34cafefdf9a790d0e0d4318f70b57d68c5ec0c2832d0960b2bd619002fe690f484cd2702b77f79
diff --git a/dev-python/gmpy/gmpy-2.1.2-r1.ebuild b/dev-python/gmpy/gmpy-2.1.2-r1.ebuild
index 0462a9eca9c6..e7aea1bccea6 100644
--- a/dev-python/gmpy/gmpy-2.1.2-r1.ebuild
+++ b/dev-python/gmpy/gmpy-2.1.2-r1.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="LGPL-3+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 DEPEND="
 	>=dev-libs/mpc-1.0.2:=
diff --git a/dev-python/google-api-core/Manifest b/dev-python/google-api-core/Manifest
index 506c90eeaa69..d09b68014d48 100644
--- a/dev-python/google-api-core/Manifest
+++ b/dev-python/google-api-core/Manifest
@@ -1,5 +1,7 @@
 DIST google-api-core-2.7.3.tar.gz 164219 BLAKE2B c394fd95bff3ac393174372e0c49f9a7974a006de6f14d07af7b15b4c531d6dae7af8c38e00263289a895cb9dae9ef23368d793f5ae3649b9b029337a72cc0ef SHA512 2bf49738216cd52dad2bdfb3367e370390c366b49a8c3c4f6f49a2a3f17b27120d99933b57c8eb8c9a1f0f25ef5ea6d876cf8c3c6c759d3585d625e57b1153f9
 DIST python-api-core-2.8.1.gh.tar.gz 164630 BLAKE2B 88db73f210ae5ee4aa2e7382ea34ef59fb51f88e196622556327c130057b74594884bbe21719bf12cc6ddc9975cf12ac71fa24ac4dfde4681b4742af57702b5d SHA512 f3bfa476562428246203592b53c22e8e52af167af10b1fa68afb51fe6e8ca8090e9231e4c297847d12c201ca791aa80153bee07f72939bc65920260ec50b3d38
+DIST python-api-core-2.8.2.gh.tar.gz 164586 BLAKE2B bd62b20d1be52f0a2227d1663ee37ce31d991e0773ed793a3999b70c74e03a28ac188cc331027def0055a5b80e93378d9ec5baa389c65e7d2f183b37233be5ac SHA512 5844339cee71103650c446f002dcb13a632086d96dec1ed04a0ad5e4d3a61cc2a8e048da3e6445a50a0c009b0d25729f02865d28484bfee2a3427c829537e350
 EBUILD google-api-core-2.7.3.ebuild 2033 BLAKE2B 07991fdd69d5ccf49b352fc93851341f765c33fb8f75ee8b4d1b370ddbfa34279c7fd9974b25a2f2e7eef68f3027c6b082e1cf0ccfe4938c17d39b51e4ed60dc SHA512 8e6be9622052c0b63c0ba7aaca18659245410fd45888596c137b57692ab916a4050ea9ba154954f97d378ef7100a14c1730d8cf171549d1c834198380ddf51cc
 EBUILD google-api-core-2.8.1.ebuild 2118 BLAKE2B 2b8508a51da3bed4950e4e3c9066acbb1a8e3404415beb4108ac0cf8f72eb43ab367340093fdc377b83236a306a339e4d4cef26286da2fae8a44f60446179073 SHA512 7aee5143b8943ee5895244e40b68ba4fa31401eaa1909aeb79887c1ea338f678d292400a516c8f6981404b041766580b01813b0a837bd47640c7b2d7c7663637
+EBUILD google-api-core-2.8.2.ebuild 2118 BLAKE2B 2b8508a51da3bed4950e4e3c9066acbb1a8e3404415beb4108ac0cf8f72eb43ab367340093fdc377b83236a306a339e4d4cef26286da2fae8a44f60446179073 SHA512 7aee5143b8943ee5895244e40b68ba4fa31401eaa1909aeb79887c1ea338f678d292400a516c8f6981404b041766580b01813b0a837bd47640c7b2d7c7663637
 MISC metadata.xml 453 BLAKE2B b53e834b3c423d8bdceaa2568f38173fc203f92f2340edd42899e4d4a93602118dbdb2283d492e34189155c336ec659d96f907f257b34cbe5557be331169a4f5 SHA512 d26c893b82fa946cab27669148b3dc2dea8b985636209ae49294cb14a7055f6c4a3884b38bce6e4923a54e9872af7e540b33a992eb727caae96e071a8ffe3237
diff --git a/dev-python/google-api-core/google-api-core-2.8.2.ebuild b/dev-python/google-api-core/google-api-core-2.8.2.ebuild
new file mode 100644
index 000000000000..2ddf9d7fb8e4
--- /dev/null
+++ b/dev-python/google-api-core/google-api-core-2.8.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+MY_P=python-api-core-${PV}
+DESCRIPTION="Core Library for Google Client Libraries"
+HOMEPAGE="
+	https://github.com/googleapis/python-api-core/
+	https://pypi.org/project/google-api-core/
+	https://googleapis.dev/python/google-api-core/latest/index.html
+"
+SRC_URI="
+	https://github.com/googleapis/python-api-core/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/googleapis-common-protos-1.56.2[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.25.0[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-python-3.15.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+	<dev-python/requests-3[${PYTHON_USEDEP}]
+	!dev-python/namespace-google
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/proto-plus[${PYTHON_USEDEP}]
+		dev-python/rsa[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# failing due to missing grpcio-status
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_unary_errors
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_raised
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_read
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_aiter
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_write
+	tests/unit/test_grpc_helpers.py::test_wrap_unary_errors
+	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_invocation
+	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_iterator_initialization
+	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_during_iteration
+)
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+src_test() {
+	rm -r google || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	distutils_write_namespace google
+	epytest -p no:aiohttp -p no:trio tests
+}
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 55a6388d70c3..f9a76aedc050 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -2,8 +2,10 @@ DIST google-api-python-client-2.47.0.gh.tar.gz 30118538 BLAKE2B 601a02ffdb76b921
 DIST google-api-python-client-2.48.0.gh.tar.gz 30483162 BLAKE2B fa6371d2cb5b27184eb0e16ea0ef9875af2dfd83b2d34dd84272c2942589f712b35451b9150f38722501edfe5a4b8a506b3f52fedffbb48af31c20dc36a59cfb SHA512 0789aca32b01304095702d908c8ff31d2b4ddd771ed8cf3b3f99f15091fd1eea782000c58646c7760811a40252e5f1982876278f4cdd23e3f8cf672682693605
 DIST google-api-python-client-2.49.0.gh.tar.gz 30499625 BLAKE2B 7c0591b5567c1e9e5840430d490041d0ffea4beca8ec1e56eda0c5c8c6f4ff1e5f9126c4158e370e6c4011a6499e1d41203f83c9e4747dd830606406cef65e23 SHA512 ae53cc4cf18949f75aef9ca39fc2a964242fd556c1c19bb3aa8cd48b94a23deef9788b1c1877923a5ae4af990dff0f6138fb2157d2577fda80f8a86f1f642709
 DIST google-api-python-client-2.50.0.gh.tar.gz 30751763 BLAKE2B 4fa967932d13fa03640970ba2b6b1756864d88e4953deb5c9cf89a4556bd2cb3f1083f2e141b89a08936a40ddea64e45d65b5d9afe4024edf94a56c5ccb32798 SHA512 8dcdb85f2f37d4c668924abba46f0012ad453dc0775b373dc9fc510020479b1dc8a22cd85980ab97bcd4e7bdff19c78d829b1d758e9105a71c3ac7aa0cb19946
+DIST google-api-python-client-2.51.0.gh.tar.gz 31181726 BLAKE2B 465cbc3beb870a543bb54b69342d1a4e75026fa3c83846a3641e048b922cfa14ccb56593a0e8feadf4bf30568425347b14f5f1dd081d5d74fa1112bb0d57caa3 SHA512 ea9e9424aa36e077f10922dba9d6bf43f376d5e059c5d0fc7a31ef919232eb7778a891104fe3a7328e841381d5cd2cd76cdfb1fb80458c979f83a935f8b1df5a
 EBUILD google-api-python-client-2.47.0.ebuild 1442 BLAKE2B f386901776c1845ec0815ba4254b5e6cdbeec0c7dab8a3928bb60a6259ef1140bd4e3ece4287fc3ea0e1833a69cb8432fa973447f83846e60b6a6b2038bfbb20 SHA512 828e71b82de37f6d50f980e897c0cf5a46df036dcfa005906aed6772455c8f5059c1fa6bcf0b2340fb9307df08df2789e6421e26b5c0ff28774844c3a36c828c
 EBUILD google-api-python-client-2.48.0.ebuild 1444 BLAKE2B 4bd33fb2b9ec7d091d0b8e5aadbc24c5c786d4adf497087e749364f74f54536db99cd9efc6ade89b333e60ac09220badf45e721fca040227a53f151ee197b131 SHA512 4a3be7d069bf83dba8a7911ce9ed5761e1fe2c78dacb94a921aea897a0ba201b5c58983de5a487f841f498501b7e2ea7a5bdefad29a518fd75e546ff3c10925e
 EBUILD google-api-python-client-2.49.0.ebuild 1444 BLAKE2B 4bd33fb2b9ec7d091d0b8e5aadbc24c5c786d4adf497087e749364f74f54536db99cd9efc6ade89b333e60ac09220badf45e721fca040227a53f151ee197b131 SHA512 4a3be7d069bf83dba8a7911ce9ed5761e1fe2c78dacb94a921aea897a0ba201b5c58983de5a487f841f498501b7e2ea7a5bdefad29a518fd75e546ff3c10925e
 EBUILD google-api-python-client-2.50.0.ebuild 1444 BLAKE2B 4bd33fb2b9ec7d091d0b8e5aadbc24c5c786d4adf497087e749364f74f54536db99cd9efc6ade89b333e60ac09220badf45e721fca040227a53f151ee197b131 SHA512 4a3be7d069bf83dba8a7911ce9ed5761e1fe2c78dacb94a921aea897a0ba201b5c58983de5a487f841f498501b7e2ea7a5bdefad29a518fd75e546ff3c10925e
+EBUILD google-api-python-client-2.51.0.ebuild 1444 BLAKE2B 4bd33fb2b9ec7d091d0b8e5aadbc24c5c786d4adf497087e749364f74f54536db99cd9efc6ade89b333e60ac09220badf45e721fca040227a53f151ee197b131 SHA512 4a3be7d069bf83dba8a7911ce9ed5761e1fe2c78dacb94a921aea897a0ba201b5c58983de5a487f841f498501b7e2ea7a5bdefad29a518fd75e546ff3c10925e
 MISC metadata.xml 538 BLAKE2B bf0b8ab3a89ce9ab1d2159f4c0ebfe3f2646aced20bd2006485510c12d22e83cc130fac979f699ae6431a610c8d2acf86c04b39bc262abaf167c20571a860810 SHA512 30d004d944055660165954f8475e57ba45cef56423c80a324118836d78e5376261409955155a40c9bd988f230f3e2fc44c6aeb6fae3028c78c55a382ccd83bff
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.51.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.51.0.ebuild
new file mode 100644
index 000000000000..7e8aaa05d6d4
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-2.51.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Google API Client for Python"
+HOMEPAGE="
+	https://github.com/googleapis/google-api-python-client/
+	https://pypi.org/project/google-api-python-client/
+"
+SRC_URI="
+	https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
+	<dev-python/httplib2-1[${PYTHON_USEDEP}]
+	>=dev-python/google-api-core-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/oauth2client[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# require Internet access (and credentials)
+		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
+		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
+	)
+
+	epytest tests
+}
diff --git a/dev-python/google-apitools/Manifest b/dev-python/google-apitools/Manifest
index cbbeee317163..426d868b0469 100644
--- a/dev-python/google-apitools/Manifest
+++ b/dev-python/google-apitools/Manifest
@@ -1,6 +1,4 @@
 AUX google-apitools-0.5.30-py37.patch 5938 BLAKE2B efc0962d612017903092b7ed37561a09eb78f8b2c189d7c8bf902fd11b711676a230fed57f2671ac0d0c9fdddfbe66ac911d84ce1cfab64ed6b3a865d3ba1aaa SHA512 0cbeaf85568a23224c32647c1e3f6ce3a173093df1d40e36a8f2dd9155f19b3211fc926c054add955934104a069787d7cac03aa86efad526556f3255cdff98f0
 DIST google-apitools-0.5.32.gh.tar.gz 365913 BLAKE2B e43b21e6ce8491c89955bd6c194a1f4076988be2f67280c1bfb8184e1b83a01c307077080d182877d1306814bc38aa0541d9d417cfb93afdd766ddb3c83e0ef5 SHA512 5996d80cb08fd7de3b2df5fbdbe56c885af5d85276a44f174762ac71407227e454d338007035ba2b3deef09384e7bd389f121ea5e19e5e302a054f1033c19b6f
-DIST google-apitools-0.5.32.tar.gz 365913 BLAKE2B e43b21e6ce8491c89955bd6c194a1f4076988be2f67280c1bfb8184e1b83a01c307077080d182877d1306814bc38aa0541d9d417cfb93afdd766ddb3c83e0ef5 SHA512 5996d80cb08fd7de3b2df5fbdbe56c885af5d85276a44f174762ac71407227e454d338007035ba2b3deef09384e7bd389f121ea5e19e5e302a054f1033c19b6f
 EBUILD google-apitools-0.5.32-r1.ebuild 930 BLAKE2B d5199fd4e5ec9631b7a53aa7644a9f8edf878034b6f0a2fc7e1b681bfc2cb959e4919f34a1e5b5aced1701ff72e7c0f8ac193b00a70130faea5244c0f69c6c45 SHA512 611349b90d95f4c65f00bcde28d0a03ef0db7d4b10a4545de5840023ec3ae204923be4f180c5446f3f54413321831fe805cc7c7a5995f7ed1506db2e205bfeb8
-EBUILD google-apitools-0.5.32.ebuild 903 BLAKE2B d0d67653d43f23a6d13098817c395fe27ea324f94e96069530abc98ee049e2fea78947bda75cd0ea04ca3d54f1abe8a8a3e5282859bc63a4818235b4da250bf1 SHA512 51dd15571ef5a6c4b2d6c4a03b23cfff683c59fb9bf8ca3c3931ebc4197e6a7856c07c1ed8620c0f3db257db946e8e3aab8695e3108958909cd279e9ebeefdb8
 MISC metadata.xml 374 BLAKE2B 7c5958972937c0faee293cb016f911f7b9514a0849251bdff06946061e5dfcc308c4016e4dc82ec84162127cdb69c6fb41136b19cac13b6c38c4e12a27728bd5 SHA512 df98a533627f967ecc240dcd839d9ef74445b07eafe15e1931481fd5b6a1521553f5b377c324cd1d8bf87db3d996b9cd5ddba362bc91450923a92b90c5be6fa8
diff --git a/dev-python/google-apitools/google-apitools-0.5.32.ebuild b/dev-python/google-apitools/google-apitools-0.5.32.ebuild
deleted file mode 100644
index 10bf2fec7dc6..000000000000
--- a/dev-python/google-apitools/google-apitools-0.5.32.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
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-COMMIT_HASH="7975c0cdbae1b9fc106553ce46e4a59cf0bea1e1"
-DESCRIPTION="Python library to manipulate Google APIs"
-HOMEPAGE="https://github.com/google/apitools"
-SRC_URI="
-	https://github.com/google/apitools/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-S="${WORKDIR}/${P#google-}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-RDEPEND="
-	>=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.14[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-1.5.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
-	>=dev-python/python-gflags-3.1.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( >=dev-python/mock-1.0.1[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/google-apitools-0.5.30-py37.patch"
-)
-
-distutils_enable_tests nose
diff --git a/dev-python/google-auth-oauthlib/Manifest b/dev-python/google-auth-oauthlib/Manifest
index 94e033d9e3f5..bef787fdaf11 100644
--- a/dev-python/google-auth-oauthlib/Manifest
+++ b/dev-python/google-auth-oauthlib/Manifest
@@ -1,5 +1,3 @@
-DIST google-auth-library-python-oauthlib-0.5.1.gh.tar.gz 53101 BLAKE2B 2edaad7dbe42834d440bb30bcf836e01a575616160af045844da6c853f93a3a7a1c80367bbe58d47dbbdaf9e5b061abf780d9edd48f311e30d79025c934c3764 SHA512 628da0161739c9f0ba5963db6f21da71fde01ff81340d9242adcc74468c92c290693cfa4d98affed79556299621e74083992b54346c14940c1e88c5a5c683408
 DIST google-auth-library-python-oauthlib-0.5.2.gh.tar.gz 53842 BLAKE2B 7adcd9f339ec9a5528308fcc0fee1cbbe96440e1bfe5c7cc9c94808668e22801b612d291a2419333888194c3224838ac40f9d0656381825bd660067470f58910 SHA512 eaf296a0e0504e8249637a8db7531c10b120f28abeeab3e1fe8f366b4279c396509188e83f8a0ec56be85063430ceb691d6d926cee33d4f166bbcc4425e538db
-EBUILD google-auth-oauthlib-0.5.1.ebuild 870 BLAKE2B 15490d4b6ea29d35ec776127502df685e10d4faef6f739349880ae046ede83aef28208c44b6090985e42aab170b077fd3ee9d9bfe81d2a312b05380951975bbf SHA512 dc7093ce0450448b8afefc9af564297ea3e538621512dd338181a2ec5d25071cdec073114dd6cc16f5ee71c5e77f4f38ceec57e3d8ccc36ae916703270025d1c
 EBUILD google-auth-oauthlib-0.5.2.ebuild 876 BLAKE2B 97153977e671f5a8e24315290ce154c41bf478add7b9103141df177381631adfb7a4e7001888a8362ee09f11213c1d461b480436d649d59f9f089ff95c1a25db SHA512 eb04ca36f3939bf0f76b0118ba8c629e39b9bec056c5afd322a2d73b3d655d9af6c2786db17b16f0f7010e0e9f150c14f11cc56671b43e3f876e4477f8ed48b9
 MISC metadata.xml 410 BLAKE2B 23af42a2aa614f119e10cf5d57c3c37abb69ad8d9b1e16445fb92c9f00bdd78f6b1a6a51dff4ebb98bbb03e0002e73eb68cffcf857372dd94848187637c60219 SHA512 c19dd3af098644d5068ec677be51615885bb1267ba9bfb867609725e2a824a74934e2fe25909ea7406c91ca405d44e4c7191a14d3d1bc7b3a60c29445456d3d1
diff --git a/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.5.1.ebuild b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.5.1.ebuild
deleted file mode 100644
index 4a1afbdaab4a..000000000000
--- a/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.5.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-MY_P=google-auth-library-python-oauthlib-${PV}
-DESCRIPTION="Google Authentication Library"
-HOMEPAGE="
-	https://pypi.org/project/google-auth-oauthlib/
-	https://github.com/googleapis/google-auth-library-python-oauthlib"
-SRC_URI="
-	https://github.com/googleapis/google-auth-library-python-oauthlib/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/click-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-oauthlib-0.7.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index 7fdbef956652..6dc73f1d863a 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,5 +1,7 @@
 DIST google-auth-2.6.6.tar.gz 189789 BLAKE2B 8adf725ac8678a07c6c35f641950c5da0f269e8556074b5832a08267cbb64237dda817c576b15fbb315fd0a018e30bca1fa1f5a0d1f85aaae4ab2bd58538b191 SHA512 bac6345bf142a8dc6acde0bec43a8fd78f76277740114a0557af88748a5ec2f509757e6099f570ed037b2265717f339fe319254a826793d0b16f1a7d227a6b09
 DIST google-auth-2.7.0.tar.gz 195638 BLAKE2B 487047f75c3fabde929a451d009ebfcb89ef816cad07cd6fda7b436c69f6eedee6dad64780df743ea133b66aab72f75f0185263fd542eb1475d642d7a6e2e2b9 SHA512 ba506619b1392dcd85b71f9ea68dd3acadcb93c4017030d2d812d383c971e6917ed074e64b9a554db9879d61b229a1d35a041c487a517113652934a6849122e5
+DIST google-auth-2.8.0.tar.gz 199717 BLAKE2B 9814b2967336622ef043721a21a4d4334ed59cd743e75a41e67fdb87aec00094a30d89c49b73144bfb9b2e8e88e4bb7141081df7ea1abf317aa9f516c9657e9f SHA512 01096dfdf4ff59b95e32f8734771046ac11e12cadb72f2f4b9274c15c097aa951da3675660009ff23455c7814c4d7797e22b4b294c5d62c2dea5dd655855aec4
 EBUILD google-auth-2.6.6-r1.ebuild 1525 BLAKE2B 0559fae14e6b27d48b0a8cf5babe40d71283d26581e6bc1c2efb0e9c20b7757ba820fbed34dd73b32198cbde9f2b3a620b9d27156ef9847a875908ce663a3e63 SHA512 e9ade71009eea68d39214942b376aff7aa4c1660e29cc2bbc535f7e0f40fdbe0ec30140dd4a21dd503531577ee6c183ec78fcf433f4898f819c620be02dceda1
 EBUILD google-auth-2.7.0.ebuild 1527 BLAKE2B 6a9c5ae6fe4de702e737e491d692c91e0b44ba3961a2f965489614220fd641cf0416ced1ee0bfd910730268c14406d27e12a224499004a9d2a41f258726c33b7 SHA512 e64349d2b54a4be4fc33d37faec791ac61459ae7cc4143758bc47b3d593f8c440ea4114dea463318f2706d1c597c6c248a81117908ab5b6f5304e0ea63ae521d
+EBUILD google-auth-2.8.0.ebuild 1527 BLAKE2B 6a9c5ae6fe4de702e737e491d692c91e0b44ba3961a2f965489614220fd641cf0416ced1ee0bfd910730268c14406d27e12a224499004a9d2a41f258726c33b7 SHA512 e64349d2b54a4be4fc33d37faec791ac61459ae7cc4143758bc47b3d593f8c440ea4114dea463318f2706d1c597c6c248a81117908ab5b6f5304e0ea63ae521d
 MISC metadata.xml 521 BLAKE2B 784282f6a173e7746a408556d77e1277f65a41eae545b6b26054c1e506642e683c1c7d91798f3b7b690bc4f9d2f642a51c1395593177eebf1770d2a0c0ba589e SHA512 c2624ebca3dc42961e61531db4724b2b354a722f71cd7f2c194680fee50125d2251f4b94cc7e31b008a2792e74b0f55f407a1230d3f59572df9cf32ee49d2fb7
diff --git a/dev-python/google-auth/google-auth-2.8.0.ebuild b/dev-python/google-auth/google-auth-2.8.0.ebuild
new file mode 100644
index 000000000000..de5188c8fdb8
--- /dev/null
+++ b/dev-python/google-auth/google-auth-2.8.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Google Authentication Library"
+HOMEPAGE="
+	https://github.com/googleapis/google-auth-library-python/
+	https://pypi.org/project/google-auth/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	<dev-python/cachetools-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	!dev-python/namespace-google
+"
+BDEPEND="
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/grpcio[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/pyu2f[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/urllib3[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# these are compatibility tests with oauth2client
+	# disable them to unblock removal of that package
+	tests/test__oauth2client.py
+)
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/googleapis-common-protos/Manifest b/dev-python/googleapis-common-protos/Manifest
index 814e713fde5e..b15460102851 100644
--- a/dev-python/googleapis-common-protos/Manifest
+++ b/dev-python/googleapis-common-protos/Manifest
@@ -1,7 +1,3 @@
-DIST googleapis-common-protos-1.56.0.tar.gz 132706 BLAKE2B a0adf6527c24aaa30922800a80ef4af8abf3d83c4639c227a859c92e02d248f44b408f98820387a51b310dedf005872cb0fa7824bd27ac6309f31f85810edd40 SHA512 ef6ed067457aad3b46d81bacbb66abe3b36b0640290e0047ef7c6d612dfd8bf865dad47c77275f0d5a1e03cd4e5dca32d08f44c7a7bfe7b264ee59e5c5bb9a27
-DIST googleapis-common-protos-1.56.1.tar.gz 109702 BLAKE2B ac54a63164a64a125a7dece77a8a9219d922860d6dce9a1057b4dd2f015e2efc6719c224473cee358280028f016fd171e05c8ec6377cdcb216318230ea42df02 SHA512 155698770a790df0ed92144cc0b79373ccdab2bff7109633df5f4f66e75f4f1c312f2ec7248c173f4750416619c65cf6bb7cfc33abfe7530c5d5d7fe2b3cec2c
 DIST googleapis-common-protos-1.56.2.tar.gz 109718 BLAKE2B 6aeb43927f5c2b0332dbc478d47b06d49490b666158b35b5e58ccd3290939d903865f60ff11f396f9f329bb64382aa636d87ebd06cefcb66d465a0551843178f SHA512 814dddc95fa5bde437c124ff8b66c281f98cae6c0143d473b9194a1367ccaf7915c21450f79f372be5fdb3c4fb41c9d717e57244f2dbd1e819b927b8d86e8d2f
-EBUILD googleapis-common-protos-1.56.0-r2.ebuild 712 BLAKE2B 6d7d17cb834cbddbbf677521ff88884d86bc8789f8c81c7b6bc2238060e5c8fcee5bc621ff31b711567ceff2bfa62c7e3a9dafb5c2d492c8737f61266b05677f SHA512 540f88de455fe5f0838f35e553df801bc7d2bab50b68502c07bbbb6bd94c505ace076f7e49207d65c24953054a69a0e98febff6bc9ee5ddc231407727eeb5467
-EBUILD googleapis-common-protos-1.56.1.ebuild 774 BLAKE2B e1ce3fc66ab43088dca7e5e3ac43d3f43712ba7a87e6167c7478d049ad18aaf945f8a532d39d004a66b44e741b69999c2ba0d88b35c068cf25480ea0814ad256 SHA512 e8d4e6d0af3a416ac7f4465ee1c3e5cbc91b5a62bb8776babff92a8a2b2e4a0c1cf7af50f71e119d2706fea8ea307583f9882cf778fff6ed1927cb27ac0a09c7
-EBUILD googleapis-common-protos-1.56.2.ebuild 823 BLAKE2B eb1a446f4779f4677c8b493b970ba178cb023d351013a8690c63a2e66eefe606146e8420616e4683ad3aacb4c788d7716288d90f0dede7909b8a516795d3aee6 SHA512 29aaf95b88310c3cad592abaf27473cec869ad7dc085264178cb6882c461346ea7b79599fd71860d1f4ea5ae85997c2ce440a379c89a23f678dc1680cd7fe0ad
+EBUILD googleapis-common-protos-1.56.2.ebuild 821 BLAKE2B 3692f07bb33fe1831f444290716690ce77bd7e9a0bacb745e5c2c9ed64c19bb190cce3e803d11d78e4b8959b1f6bc17eff83723c6ccae9af4b05dc1e2f07c7f8 SHA512 651a2b8fe712bcb4e48576dcabdfffde7343391f05cab80717f6b61c9b166aff107943cba085f7863c0ff5a249db676dfb230d8e857879c49e570dac444a1323
 MISC metadata.xml 537 BLAKE2B 7b81f41f34a3c0fa53340ad298440f67727eb1830009899ffa10835485f66e727844735a88bed94b8a0bba14fa01a78d8a04f5ca3edf48a72781c7e1a797459e SHA512 6013da3540915e13a0cc60336bbefada12fbf71c04d4f40634f24015ada732d0d8b86600401bdadb2c7df2ea84f7097669f4efe6cf176ccca5efe46e9a3869d9
diff --git a/dev-python/googleapis-common-protos/googleapis-common-protos-1.56.0-r2.ebuild b/dev-python/googleapis-common-protos/googleapis-common-protos-1.56.0-r2.ebuild
deleted file mode 100644
index e2cd62f960b1..000000000000
--- a/dev-python/googleapis-common-protos/googleapis-common-protos-1.56.0-r2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="python classes generated from the common protos in the googleapis repository"
-HOMEPAGE="https://pypi.org/project/googleapis-common-protos/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/protobuf-python-3.12.0[${PYTHON_USEDEP}]
-	!dev-python/namespace-google
-"
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-# no tests as this is all generated code
diff --git a/dev-python/googleapis-common-protos/googleapis-common-protos-1.56.1.ebuild b/dev-python/googleapis-common-protos/googleapis-common-protos-1.56.1.ebuild
deleted file mode 100644
index c665d33bd82a..000000000000
--- a/dev-python/googleapis-common-protos/googleapis-common-protos-1.56.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python classes generated from the common protos in the googleapis repository"
-HOMEPAGE="
-	https://github.com/googleapis/python-api-common-protos/
-	https://pypi.org/project/googleapis-common-protos/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/protobuf-python-3.15.0[${PYTHON_USEDEP}]
-	!dev-python/namespace-google
-"
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-# no tests as this is all generated code
diff --git a/dev-python/googleapis-common-protos/googleapis-common-protos-1.56.2.ebuild b/dev-python/googleapis-common-protos/googleapis-common-protos-1.56.2.ebuild
index 00d26d4c7744..c2d6a64bc69a 100644
--- a/dev-python/googleapis-common-protos/googleapis-common-protos-1.56.2.ebuild
+++ b/dev-python/googleapis-common-protos/googleapis-common-protos-1.56.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	<dev-python/protobuf-python-4[${PYTHON_USEDEP}]
diff --git a/dev-python/greenlet/Manifest b/dev-python/greenlet/Manifest
index dc0dc5680e14..eafa41ea259f 100644
--- a/dev-python/greenlet/Manifest
+++ b/dev-python/greenlet/Manifest
@@ -1,4 +1,3 @@
 DIST greenlet-1.1.2.tar.gz 91224 BLAKE2B 1430f96acfba3c184b9ac0f51acde7c48aa5d2e648a155cadf16399c878f527a4bafcb547d2b28835095ba2fd21c33096ee6fb51ce5feda0a8c5915be521b32a SHA512 e7bcc1bfffc80fcaee735ee69f6f53e8f68bd4d3ab8ad6ed813684ffad72340a347e4810f18cc32d9c3948b5c995aefc3a53ce4ae60324093dae12042d33183b
-EBUILD greenlet-1.1.2-r1.ebuild 748 BLAKE2B 5f679e92fd56c2cfbb068e3b641f9930dfc2b5fc2feda5a93442d36fd91fcc7a407a2bc640c8da4a273e34369b61e783dfb21fae569bdff13b3750f98791cb96 SHA512 527a9091bdcf118663b179e6ecbca30bf6ff2cfa90f63ff7a87ad6829fe5ccb614cfa9a2380eb996d7bf6290c6b84e3026e91725a3b573936db0dbcb9e3c78e6
-EBUILD greenlet-1.1.2.ebuild 622 BLAKE2B 700de911f44dcd2dd9eafb6b31841cf2bf529fa47737aacb24af4295b44ef6f5929f267fe4b71ade161a58f5ade977bd51d02ca5d17d9f2c8470e8eb7dd77346 SHA512 c92e6891472c4fd09c30f9aa8411e011fd31e4fcc22505bf434122d5aff9bf3a43183dd8ff46f9f1fad064ed9ea18607f6179ba8b9b10144fb366e7f1e022c09
+EBUILD greenlet-1.1.2-r1.ebuild 747 BLAKE2B b4178234b49813a346e72c12e5ce3e3964a6cfd4cb3b32b8adfb1d649d4666d28e2b7709a4cd02e1bac44780e0115ca7097581e2e967e340ab900b95a51311de SHA512 998ef9dfb0bbe6d1dd022960282ff09ac0dc9b8e28512faf1495fdafa14d97a132d324e8bed7d3c15be7179da367012de5fddfddb1102e2e4050d38da1ffc009
 MISC metadata.xml 322 BLAKE2B 57f3f966edd48a761d9ff80514dcd8e2439eb83fd79c1df2dd6610b9c03366a70be02134b6fa3e2d06ceeaafc1e5ed594efbcbcaea015043ff7bfdf54bd52e53 SHA512 2e119f8948096d416c6aa1db1203a37820a353dfe704f596243f805b5a6892498bb82a59b1fe59a51a1086d1b24c79a90de265bd06170e3b1bbd836bdee1915d
diff --git a/dev-python/greenlet/greenlet-1.1.2-r1.ebuild b/dev-python/greenlet/greenlet-1.1.2-r1.ebuild
index 884e58fe5d93..588dfd23e08c 100644
--- a/dev-python/greenlet/greenlet-1.1.2-r1.ebuild
+++ b/dev-python/greenlet/greenlet-1.1.2-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 -hppa -ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 -hppa -ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 distutils_enable_sphinx docs
 distutils_enable_tests unittest
diff --git a/dev-python/greenlet/greenlet-1.1.2.ebuild b/dev-python/greenlet/greenlet-1.1.2.ebuild
deleted file mode 100644
index 038e44263611..000000000000
--- a/dev-python/greenlet/greenlet-1.1.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Note: greenlet is built-in in pypy
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Lightweight in-process concurrent programming"
-HOMEPAGE="https://pypi.org/project/greenlet/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 -hppa -ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-distutils_enable_sphinx docs
-distutils_enable_tests unittest
-
-python_test() {
-	eunittest greenlet.tests
-}
diff --git a/dev-python/happybase/Manifest b/dev-python/happybase/Manifest
index a911458d2986..8f70ae973a23 100644
--- a/dev-python/happybase/Manifest
+++ b/dev-python/happybase/Manifest
@@ -1,3 +1,3 @@
-DIST happybase-0.9_p20210701.tar.gz 106551 BLAKE2B 66e39d8db10b8b7adbab5b77462560d50a2a494e1cd9b0411abd1c928cb4b630e42ca0cc6740c35cc9a3b65dab8e637df6ae6d4105665fa21fa7668324c82ec5 SHA512 b55028e6fe8b1087e835b01d373af6357ecc495e82badda6bd1641d1d7ef79d5ec72d3336ca7112b5b6886d28b4a6296336c96b83ce58740ea5802c4f11ab12e
-EBUILD happybase-0.9_p20210701.ebuild 841 BLAKE2B 83d7a461a15de5ed4767aa8a3590d57b9c9ec4a5ee9994c1eda73bda894be40c1c73459c1d35c3bdb3eef7e26b1af32f6e35d529cef15924ba0e6ceff74e506b SHA512 c0818a121b10f5451e159be568aae79c234b3d2bff9e9a84f10217ebe479b0a8853c8623cf3769c8c82fbbdb87f9159bd050330b0b14486001c18cda74d21237
+DIST happybase-1.2.0.gh.tar.gz 43753 BLAKE2B 17c7762ca6268bbcfd1c379463a1f370aab354a526db2606e133b19c6b225e30561a079e22bee9f0232d74006c534d4c38d00ea1d651c93d94577dad9f60b0fe SHA512 0a93e390b854bdb047df8528aa6c19b3e0444c3d317feee4e2e0b8025792ece252422674d7b1feeb601b53966fec10e52593f2ad5119ec7f5e06128ad38ac2f6
+EBUILD happybase-1.2.0.ebuild 727 BLAKE2B b99a09249f99b58e063dff1767ac3b89176346c33bbf9b7975dea23ea85aa0a8c18f5a50025ca85ae0fafe40655bd16009fd0447208d4731c69b9168d6b85dd3 SHA512 2d5440e518bc384abbb2f0324e4b392242943c50de9fa2478d19271d8af43590c7b427b0ae84c15505be91eeae0857aa4d0d9cae3351805cfd3d81fe867bf63f
 MISC metadata.xml 388 BLAKE2B 85dc7775215998419a74d9d0d7976cd8ae78c93f3ab69c9b7415b001a460ebc15080867be993a0913bd2452b44532d16a3f95ce375ef187c31ef8d548a868a1c SHA512 79e52204645084a783a5dd9c391774ce5f24b6adbfa78588755228f3fcef82d50f0f7b975a1ded10f62cf5f927678794d6216cec49a12b32468eb1d19783ed71
diff --git a/dev-python/happybase/happybase-0.9_p20210701.ebuild b/dev-python/happybase/happybase-1.2.0.ebuild
similarity index 65%
rename from dev-python/happybase/happybase-0.9_p20210701.ebuild
rename to dev-python/happybase/happybase-1.2.0.ebuild
index 0490d7a3842f..cbe7c8b68a9d 100644
--- a/dev-python/happybase/happybase-0.9_p20210701.ebuild
+++ b/dev-python/happybase/happybase-1.2.0.ebuild
@@ -1,17 +1,18 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 COMMIT_HASH="f5b6d104140c2be93e4175c0c844aaf094eb43da"
 
 DESCRIPTION="A developer-friendly Python library to interact with Apache HBase"
 HOMEPAGE="https://github.com/python-happybase/happybase https://happybase.readthedocs.io/"
-SRC_URI="https://github.com/python-happybase/happybase/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${COMMIT_HASH}"
+SRC_URI="
+	https://github.com/python-happybase/happybase/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
+"
 
 LICENSE="MIT Apache-2.0"
 SLOT="0"
@@ -26,8 +27,3 @@ RDEPEND="
 RESTRICT="test"
 
 distutils_enable_tests pytest
-
-python_prepare_all() {
-	rm pytest.ini || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/hatch-vcs/Manifest b/dev-python/hatch-vcs/Manifest
index a13ac87a1d9e..1496d5fc8e28 100644
--- a/dev-python/hatch-vcs/Manifest
+++ b/dev-python/hatch-vcs/Manifest
@@ -1,3 +1,3 @@
 DIST hatch-vcs-0.2.0.gh.tar.gz 8192 BLAKE2B 69f24de91b947e695336ca30cf3f265edcfaf10fa49df93fa0f70e45d1179e70d1ef5584fc99f88f66ca3c4fd1866a681db81253280ce3f9221d19f04443a085 SHA512 1c3627240ef5b659b9d87a69c84dd71cac4c83758f5be676e808377400383e996209cf6eabb1222f5330c0a97f0d261ced1eb9dc40e1d5c2bb2fc708659360eb
-EBUILD hatch-vcs-0.2.0.ebuild 650 BLAKE2B 23c08816784f159fbc36ad41f5cf6f6d1670894933b33c004c247fcee2c2e07a5b5fad3373de090cda1180fcf67499c2fb2996df98edaec8c6027bc278b0162f SHA512 0046674a88ad2c73ec0b406bd2211477fd4458ef0d5cdce6e14ffd649087562876ed73b4cc909ad363aa6c77d77450e28f2aac4e3dcd9d523486f03714d071a0
+EBUILD hatch-vcs-0.2.0.ebuild 648 BLAKE2B 8a06510af770b9cda86ef58ae1480729056074e7eb480d17f2a3802c37fec856c4379fde1f5bc5210f291598eba647cff5ec8cfbc4561caabd3251d7f9da2344 SHA512 605ec70b08916df10ee24b6360af59b0400d97dc8f78b9dcb419367eb4889ce03565d964996431a73b5e6842d58d2f8864ede7e7bbb3f9adfd2685839d9c8e4c
 MISC metadata.xml 345 BLAKE2B 9483d276fbf90793ada8e95e4131830e756ebd65b29ef730aedabb12b46a33a3237c4f9ba99ca660006506f9bdb3a0a6c1642786ac763d2b85df029e3d0df56e SHA512 79d44066c15d5159331473aa2770cca340e05ac6565ba567229ad77f59c5421aad2146c44517c45210dd739bfdab8fab227cc5ab40979c04abb3c65c846d5f63
diff --git a/dev-python/hatch-vcs/hatch-vcs-0.2.0.ebuild b/dev-python/hatch-vcs/hatch-vcs-0.2.0.ebuild
index 61847d24b4f9..07b53a07af44 100644
--- a/dev-python/hatch-vcs/hatch-vcs-0.2.0.ebuild
+++ b/dev-python/hatch-vcs/hatch-vcs-0.2.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/setuptools_scm-6.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/hatchling/Manifest b/dev-python/hatchling/Manifest
index 5a3621e84f24..9f26ab80a2ed 100644
--- a/dev-python/hatchling/Manifest
+++ b/dev-python/hatchling/Manifest
@@ -1,15 +1,3 @@
-DIST hatch-hatchling-v0.24.0.tar.gz 212154 BLAKE2B fc0fcdd20eb1a1040298a4c959911d291ca454cf82404b0a7a67a9d192e3af0b8ee5a50d169e803bd5602775cf3f9336fd56d83c6fa85aa8d9f805269205ed29 SHA512 f4a1764f129c6e3098d0b0c744dca4f0b499c43d53dcebffc7aa26e28e3f599a9370e0f1f8ee9b9130042f066e1c857e155ffbdcf86d2c18e32ff5bc9219c51e
-DIST hatch-hatchling-v0.25.0.tar.gz 216944 BLAKE2B 298f284bc05bbba6c463d4c22ddbbd1438a3a068de2a14300343803f706f2bc3a69be83bdbb1876f4f2474e7cb1ac4e98226108ad290c5097bbc1135367b7183 SHA512 1cfc8ea27e46e316efeeee321e17770995e495f0b6a722b89d9632af7902e3a7ee7c5a729b8ca27e490a94b7ddcda9b4e03dd7274b305f928b0e31a469a1643f
-DIST hatch-hatchling-v1.0.0.tar.gz 216365 BLAKE2B cb6b648d103c7e9848b1a15cd62aaf3ab39c458f83f6c56cf039a136b39ae6c59ba487c36860582f98fb1ede6b3c2dab148b023499b5e4a30de9d063379118c3 SHA512 e16b0c53705fe090713f40d661e4ac9a4d0c2ae22f9193fcbaa1eb4ba146a36642b5e188574ad00b6ddd06c60537db0eba18fe9f2676cc988effc9d74e0dffc4
-DIST hatch-hatchling-v1.1.0.tar.gz 216865 BLAKE2B 82d168d518b84c26033d81002b22eb347a2b0c2abb26b79ef4aacaa3804924348e090c4d87b728e80a30bfacf7d8634be6c6f35d3cfcb95fd9e1ff50d35d4595 SHA512 062773f8f1d472602ba589022ec56a7d3dc4068ae66ec5e773912a793524649f73effe7b61c76f5a1cf6b264d2499d8d8660efcc0189f9bbbf60b4b948740dc5
-DIST hatch-hatchling-v1.2.0.tar.gz 216988 BLAKE2B b8f0fd0286075bb58e3ae875232c35cc5307582930ce03e8564c818d95f96be13f8bfbda950fe14257ab639b87a58fdd9f13fd5f024b70b5d16d12242a7ddeb4 SHA512 08bbaf8a9315d8e5a69ff09bf3121d9fdc7559e214c25203b61248e8c09b283076e3235261194cabc135f1eb0d6fa3ad1a9c1c9e02de45bcb7d9f3515b4246f6
-DIST hatch-hatchling-v1.3.0.tar.gz 219864 BLAKE2B 146c839cb41f32f2afadbb17816ec9171755b62bacaf59dd96e33d1105d8fe104a98baf7ff54f3bd296e4c0dcceb72dd42d54c7676946f41fd49bbfa6ba505de SHA512 03caa35a05332f55ac235a87d9549c201a564896cb409625efdfd25fee8a0c110a753bafcc93da1c602752bb965b599e81e8106d24a26503abb01a8f90457aed
 DIST hatch-hatchling-v1.3.1.gh.tar.gz 220023 BLAKE2B db336126d8c5235eab57ca53e2f8832b9590513f40215ff4b51d1b60c43b0d971b472dc4434cfcf77406143a4ed3172a2fcd95d4c7d11a6f39ccd937f9eff9e6 SHA512 21fa8bd4ffe0bec5ae9f8b9716ce3b7ece45c6a62bc74f0cd49f759baaa5b21343bcc9f2a8e505f0b724b7d73a4c1f84c863a29e064e95f4aa1a288098adc8d3
-EBUILD hatchling-0.24.0.ebuild 1971 BLAKE2B d9de142ac0738a43130fd4bf3369abb748cf96f3ccf180930d7b25dfcb48373324e74ee54f9a7abbb1e86ca72a9c5cfa4f1952e5dc2097d61593249ec9a501e9 SHA512 cfcd86c3438f7548307af87a574f8a4a5d5fb15fdf7efea9858f41b67bef0a62e21933830081f47d2edec5e8fced438a6a6981d1b0b540d446eab867163fbee4
-EBUILD hatchling-0.25.0.ebuild 1979 BLAKE2B cb1868e7c03e2f7dae9adf13758531514ad972875d6d4f4398d73cac3c480678632fcd5235a87f887cf9010621d1711acf0d1b69234bdc1f49a221d5a307d464 SHA512 0205bd136cb835d2b9a67b505954bcd3e53f906b46b3c08a8414ba99b83a3101e2282eb73cc10c204e0f877bf41ac853fc6e03a2bcd5df62ab4bbc0fc3f5af1b
-EBUILD hatchling-1.0.0.ebuild 1985 BLAKE2B 9b85fb9249f872894cd2acab287349d06f63708b3636731c8ec9886f922ba1a3f3389437324ce56dcc8ef51993a2bbd121067feff465e7dc89def26c8005b3f2 SHA512 a84a057e01132129902da4b9ef22b6a88ec8f80c154cb2bdc2d28be9562cf0a14adf6202b58580053f417581d382db4867bb440a4e018ab643b99edca99cfe09
-EBUILD hatchling-1.1.0.ebuild 1985 BLAKE2B 9b85fb9249f872894cd2acab287349d06f63708b3636731c8ec9886f922ba1a3f3389437324ce56dcc8ef51993a2bbd121067feff465e7dc89def26c8005b3f2 SHA512 a84a057e01132129902da4b9ef22b6a88ec8f80c154cb2bdc2d28be9562cf0a14adf6202b58580053f417581d382db4867bb440a4e018ab643b99edca99cfe09
-EBUILD hatchling-1.2.0.ebuild 1985 BLAKE2B 9b85fb9249f872894cd2acab287349d06f63708b3636731c8ec9886f922ba1a3f3389437324ce56dcc8ef51993a2bbd121067feff465e7dc89def26c8005b3f2 SHA512 a84a057e01132129902da4b9ef22b6a88ec8f80c154cb2bdc2d28be9562cf0a14adf6202b58580053f417581d382db4867bb440a4e018ab643b99edca99cfe09
-EBUILD hatchling-1.3.0.ebuild 1985 BLAKE2B 9b85fb9249f872894cd2acab287349d06f63708b3636731c8ec9886f922ba1a3f3389437324ce56dcc8ef51993a2bbd121067feff465e7dc89def26c8005b3f2 SHA512 a84a057e01132129902da4b9ef22b6a88ec8f80c154cb2bdc2d28be9562cf0a14adf6202b58580053f417581d382db4867bb440a4e018ab643b99edca99cfe09
-EBUILD hatchling-1.3.1.ebuild 1988 BLAKE2B 7e6587bd516b6bf64cdf96c07a3c58c277755b51ac02ce13c12608bc78d9ce75bc4e49cbcee4fb6144f7bdbe76aaadfb4289b28cf5064328d1ad0d4a2f84e9b7 SHA512 1cd12a200fe2a227d42879f8ace9bf6f2f230aee02559ccb6d03de8bcb8b935d78a593cd41615ef8c8a712d9b170c6a3db15341d3e588a861577b65401be3845
-MISC metadata.xml 341 BLAKE2B f128c71f719361922549d50b2eb2fda23a0f35a6ffc8fdb143aff127490cff3c6d14a9b1e3dd1ef1a31d0154f37e402add3ab3c71492bed39b3b9b1e5fbc4e93 SHA512 0de9401effe9611102d8fc9ae2293bdcbb4f1ac9bf204187760dc1c8b92dcf10aa0a1be53adcda42fcc6ed4eb4f196c16eba1f075ea1dd806e5936d0de331535
+EBUILD hatchling-1.3.1.ebuild 1980 BLAKE2B 0c537198ec4cead26561b0781f68f6062ba8845cc56e68ba482ebead4618ab86cb5418234524939c1fb69b09a44993fdf2bf222e75f254b0139c66669ca38d59 SHA512 6036e99f5bc40b79197476c7e3201b6b003fa36269d63b36a1f40db9f912dc1467b037a891292d586b36cc0c79a8999ce3bf7f3dc82cecbff0cb7d4d149be316
+MISC metadata.xml 365 BLAKE2B 5a40a6cf6df042e6e8387830babd0171c9d8bc5d490fe2175b83d1588d827e826b49044ef29de48553515996b742fc475bb9699dcfa8ec05229162b22e0ed317 SHA512 f11bb25bc12c2bb0b0a0a4691115b9a2af525d9e44b33e0d6db98c7fcef0b49b5989fb7574ee8b27bc88f1dd2543bfdd492a6614de172e2c4edabbee8bf6161e
diff --git a/dev-python/hatchling/hatchling-0.24.0.ebuild b/dev-python/hatchling/hatchling-0.24.0.ebuild
deleted file mode 100644
index 356d092af1cb..000000000000
--- a/dev-python/hatchling/hatchling-0.24.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-TAG=${P/-/-v}
-MY_P=hatch-${TAG}
-DESCRIPTION="Modern, extensible Python build backend"
-HOMEPAGE="
-	https://pypi.org/project/hatchling/
-	https://github.com/pypa/hatch/
-"
-SRC_URI="
-	https://github.com/pypa/hatch/archive/${TAG}.tar.gz
-		-> ${MY_P}.tar.gz
-"
-S=${WORKDIR}/${MY_P}/backend
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/editables-0.2[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
-	>=dev-python/pathspec-0.9[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/tomli-1.2.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/atomicwrites[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-			dev-python/httpx[${PYTHON_USEDEP}]
-			dev-python/platformdirs[${PYTHON_USEDEP}]
-			dev-python/rich[${PYTHON_USEDEP}]
-			dev-python/tomli-w[${PYTHON_USEDEP}]
-			dev-python/virtualenv[${PYTHON_USEDEP}]
-		' pypy3 python3_{8..10}  # TODO: 3.11 when deps are ported
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	if ! has "${EPYTHON}" pypy3 python3.{8..10}; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return
-	fi
-
-	local -x EPYTEST_DESELECT=(
-		# these run pip to install stuff
-		tests/backend/dep/test_core.py::test_dependency_found
-		tests/backend/dep/test_core.py::test_extra_met
-		tests/backend/dep/test_core.py::test_extra_no_dependencies
-		tests/backend/dep/test_core.py::test_extra_unmet
-		tests/backend/dep/test_core.py::test_unknown_extra
-		tests/backend/dep/test_core.py::test_version_unmet
-	)
-
-	# top-level "tests" directory contains tests both for hatch
-	# and hatchling
-	cd "${WORKDIR}/${MY_P}" || die
-	local -x PYTHONPATH="src:${PYTHONPATH}"
-	epytest tests/backend
-}
diff --git a/dev-python/hatchling/hatchling-0.25.0.ebuild b/dev-python/hatchling/hatchling-0.25.0.ebuild
deleted file mode 100644
index c768e17f0e8e..000000000000
--- a/dev-python/hatchling/hatchling-0.25.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-TAG=${P/-/-v}
-MY_P=hatch-${TAG}
-DESCRIPTION="Modern, extensible Python build backend"
-HOMEPAGE="
-	https://pypi.org/project/hatchling/
-	https://github.com/pypa/hatch/
-"
-SRC_URI="
-	https://github.com/pypa/hatch/archive/${TAG}.tar.gz
-		-> ${MY_P}.tar.gz
-"
-S=${WORKDIR}/${MY_P}/backend
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/editables-0.2[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
-	>=dev-python/pathspec-0.9[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/tomli-1.2.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/atomicwrites[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-			dev-python/httpx[${PYTHON_USEDEP}]
-			dev-python/platformdirs[${PYTHON_USEDEP}]
-			dev-python/rich[${PYTHON_USEDEP}]
-			dev-python/tomli-w[${PYTHON_USEDEP}]
-			dev-python/virtualenv[${PYTHON_USEDEP}]
-		' pypy3 python3_{8..10}  # TODO: 3.11 when deps are ported
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	if ! has "${EPYTHON}" pypy3 python3.{8..10}; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return
-	fi
-
-	local -x EPYTEST_DESELECT=(
-		# these run pip to install stuff
-		tests/backend/dep/test_core.py::test_dependency_found
-		tests/backend/dep/test_core.py::test_extra_met
-		tests/backend/dep/test_core.py::test_extra_no_dependencies
-		tests/backend/dep/test_core.py::test_extra_unmet
-		tests/backend/dep/test_core.py::test_unknown_extra
-		tests/backend/dep/test_core.py::test_version_unmet
-	)
-
-	# top-level "tests" directory contains tests both for hatch
-	# and hatchling
-	cd "${WORKDIR}/${MY_P}" || die
-	local -x PYTHONPATH="src:${PYTHONPATH}"
-	epytest tests/backend
-}
diff --git a/dev-python/hatchling/hatchling-1.0.0.ebuild b/dev-python/hatchling/hatchling-1.0.0.ebuild
deleted file mode 100644
index 2f99efcc7213..000000000000
--- a/dev-python/hatchling/hatchling-1.0.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( pypy3 python3_{8..11} )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-
-inherit distutils-r1
-
-TAG=${P/-/-v}
-MY_P=hatch-${TAG}
-DESCRIPTION="Modern, extensible Python build backend"
-HOMEPAGE="
-	https://pypi.org/project/hatchling/
-	https://github.com/pypa/hatch/
-"
-SRC_URI="
-	https://github.com/pypa/hatch/archive/${TAG}.tar.gz
-		-> ${MY_P}.tar.gz
-"
-S=${WORKDIR}/${MY_P}/backend
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/editables-0.2[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
-	>=dev-python/pathspec-0.9[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/tomli-1.2.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/atomicwrites[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-			dev-python/httpx[${PYTHON_USEDEP}]
-			dev-python/platformdirs[${PYTHON_USEDEP}]
-			dev-python/rich[${PYTHON_USEDEP}]
-			dev-python/tomli-w[${PYTHON_USEDEP}]
-			dev-python/virtualenv[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return
-	fi
-
-	local -x EPYTEST_DESELECT=(
-		# these run pip to install stuff
-		tests/backend/dep/test_core.py::test_dependency_found
-		tests/backend/dep/test_core.py::test_extra_met
-		tests/backend/dep/test_core.py::test_extra_no_dependencies
-		tests/backend/dep/test_core.py::test_extra_unmet
-		tests/backend/dep/test_core.py::test_unknown_extra
-		tests/backend/dep/test_core.py::test_version_unmet
-	)
-
-	# top-level "tests" directory contains tests both for hatch
-	# and hatchling
-	cd "${WORKDIR}/${MY_P}" || die
-	local -x PYTHONPATH="src:${PYTHONPATH}"
-	epytest tests/backend
-}
diff --git a/dev-python/hatchling/hatchling-1.1.0.ebuild b/dev-python/hatchling/hatchling-1.1.0.ebuild
deleted file mode 100644
index 2f99efcc7213..000000000000
--- a/dev-python/hatchling/hatchling-1.1.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( pypy3 python3_{8..11} )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-
-inherit distutils-r1
-
-TAG=${P/-/-v}
-MY_P=hatch-${TAG}
-DESCRIPTION="Modern, extensible Python build backend"
-HOMEPAGE="
-	https://pypi.org/project/hatchling/
-	https://github.com/pypa/hatch/
-"
-SRC_URI="
-	https://github.com/pypa/hatch/archive/${TAG}.tar.gz
-		-> ${MY_P}.tar.gz
-"
-S=${WORKDIR}/${MY_P}/backend
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/editables-0.2[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
-	>=dev-python/pathspec-0.9[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/tomli-1.2.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/atomicwrites[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-			dev-python/httpx[${PYTHON_USEDEP}]
-			dev-python/platformdirs[${PYTHON_USEDEP}]
-			dev-python/rich[${PYTHON_USEDEP}]
-			dev-python/tomli-w[${PYTHON_USEDEP}]
-			dev-python/virtualenv[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return
-	fi
-
-	local -x EPYTEST_DESELECT=(
-		# these run pip to install stuff
-		tests/backend/dep/test_core.py::test_dependency_found
-		tests/backend/dep/test_core.py::test_extra_met
-		tests/backend/dep/test_core.py::test_extra_no_dependencies
-		tests/backend/dep/test_core.py::test_extra_unmet
-		tests/backend/dep/test_core.py::test_unknown_extra
-		tests/backend/dep/test_core.py::test_version_unmet
-	)
-
-	# top-level "tests" directory contains tests both for hatch
-	# and hatchling
-	cd "${WORKDIR}/${MY_P}" || die
-	local -x PYTHONPATH="src:${PYTHONPATH}"
-	epytest tests/backend
-}
diff --git a/dev-python/hatchling/hatchling-1.2.0.ebuild b/dev-python/hatchling/hatchling-1.2.0.ebuild
deleted file mode 100644
index 2f99efcc7213..000000000000
--- a/dev-python/hatchling/hatchling-1.2.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( pypy3 python3_{8..11} )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-
-inherit distutils-r1
-
-TAG=${P/-/-v}
-MY_P=hatch-${TAG}
-DESCRIPTION="Modern, extensible Python build backend"
-HOMEPAGE="
-	https://pypi.org/project/hatchling/
-	https://github.com/pypa/hatch/
-"
-SRC_URI="
-	https://github.com/pypa/hatch/archive/${TAG}.tar.gz
-		-> ${MY_P}.tar.gz
-"
-S=${WORKDIR}/${MY_P}/backend
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/editables-0.2[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
-	>=dev-python/pathspec-0.9[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/tomli-1.2.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/atomicwrites[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-			dev-python/httpx[${PYTHON_USEDEP}]
-			dev-python/platformdirs[${PYTHON_USEDEP}]
-			dev-python/rich[${PYTHON_USEDEP}]
-			dev-python/tomli-w[${PYTHON_USEDEP}]
-			dev-python/virtualenv[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return
-	fi
-
-	local -x EPYTEST_DESELECT=(
-		# these run pip to install stuff
-		tests/backend/dep/test_core.py::test_dependency_found
-		tests/backend/dep/test_core.py::test_extra_met
-		tests/backend/dep/test_core.py::test_extra_no_dependencies
-		tests/backend/dep/test_core.py::test_extra_unmet
-		tests/backend/dep/test_core.py::test_unknown_extra
-		tests/backend/dep/test_core.py::test_version_unmet
-	)
-
-	# top-level "tests" directory contains tests both for hatch
-	# and hatchling
-	cd "${WORKDIR}/${MY_P}" || die
-	local -x PYTHONPATH="src:${PYTHONPATH}"
-	epytest tests/backend
-}
diff --git a/dev-python/hatchling/hatchling-1.3.0.ebuild b/dev-python/hatchling/hatchling-1.3.0.ebuild
deleted file mode 100644
index 2f99efcc7213..000000000000
--- a/dev-python/hatchling/hatchling-1.3.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( pypy3 python3_{8..11} )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-
-inherit distutils-r1
-
-TAG=${P/-/-v}
-MY_P=hatch-${TAG}
-DESCRIPTION="Modern, extensible Python build backend"
-HOMEPAGE="
-	https://pypi.org/project/hatchling/
-	https://github.com/pypa/hatch/
-"
-SRC_URI="
-	https://github.com/pypa/hatch/archive/${TAG}.tar.gz
-		-> ${MY_P}.tar.gz
-"
-S=${WORKDIR}/${MY_P}/backend
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/editables-0.2[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
-	>=dev-python/pathspec-0.9[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/tomli-1.2.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/atomicwrites[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-			dev-python/httpx[${PYTHON_USEDEP}]
-			dev-python/platformdirs[${PYTHON_USEDEP}]
-			dev-python/rich[${PYTHON_USEDEP}]
-			dev-python/tomli-w[${PYTHON_USEDEP}]
-			dev-python/virtualenv[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return
-	fi
-
-	local -x EPYTEST_DESELECT=(
-		# these run pip to install stuff
-		tests/backend/dep/test_core.py::test_dependency_found
-		tests/backend/dep/test_core.py::test_extra_met
-		tests/backend/dep/test_core.py::test_extra_no_dependencies
-		tests/backend/dep/test_core.py::test_extra_unmet
-		tests/backend/dep/test_core.py::test_unknown_extra
-		tests/backend/dep/test_core.py::test_version_unmet
-	)
-
-	# top-level "tests" directory contains tests both for hatch
-	# and hatchling
-	cd "${WORKDIR}/${MY_P}" || die
-	local -x PYTHONPATH="src:${PYTHONPATH}"
-	epytest tests/backend
-}
diff --git a/dev-python/hatchling/hatchling-1.3.1.ebuild b/dev-python/hatchling/hatchling-1.3.1.ebuild
index 868dd0172a97..992dbe41ac5d 100644
--- a/dev-python/hatchling/hatchling-1.3.1.ebuild
+++ b/dev-python/hatchling/hatchling-1.3.1.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}/backend
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/editables-0.2[${PYTHON_USEDEP}]
diff --git a/dev-python/hatchling/metadata.xml b/dev-python/hatchling/metadata.xml
index 585828baa4a2..89b4fe162ebf 100644
--- a/dev-python/hatchling/metadata.xml
+++ b/dev-python/hatchling/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">pypa/hatch</remote-id>
 		<remote-id type="pypi">hatchling</remote-id>
diff --git a/dev-python/httmock/Manifest b/dev-python/httmock/Manifest
index 628df3461249..9a3df5257451 100644
--- a/dev-python/httmock/Manifest
+++ b/dev-python/httmock/Manifest
@@ -1,5 +1,3 @@
 DIST httmock-1.4.0.gh.tar.gz 6439 BLAKE2B 68136f0dd3f1adb7f431893ade8037ce98de3870c5da094ec8a4dfde3eba07667989b71b957673e969548d7d5115455d02af2bcbb1eeb59dc0891e2ffac2c1ff SHA512 49dec760da7dc57a3fb0392c121ddbf9a430fa64c2a6f923ca62da2e697805a61941cde5cf35fc8af30de199227edd72d7f1985745ebd427b1f5d74807e3862c
-DIST httmock-1.4.0.tar.gz 6439 BLAKE2B 68136f0dd3f1adb7f431893ade8037ce98de3870c5da094ec8a4dfde3eba07667989b71b957673e969548d7d5115455d02af2bcbb1eeb59dc0891e2ffac2c1ff SHA512 49dec760da7dc57a3fb0392c121ddbf9a430fa64c2a6f923ca62da2e697805a61941cde5cf35fc8af30de199227edd72d7f1985745ebd427b1f5d74807e3862c
 EBUILD httmock-1.4.0-r1.ebuild 517 BLAKE2B 78a76170179622752cd51ae9ea974461dace49e511b80febc7cd06898a23df298e2c9006fba3a70153c0064bbf080b2da120ce0ab247334bf021240771ca8af0 SHA512 9b4e777ccb1ae9e99fb1f220380ad87cbc68d0195bd0d12031175da72a49fecc26d3cea84bb8bd6257f032be52e02d3b548cdc9efcc6df43b22948afdf1006b4
-EBUILD httmock-1.4.0.ebuild 482 BLAKE2B 84e1658b9c4003dbb1c61b638165843cec3bfe498198f8402d171f0d89a151245cd5ec24440953c0a9497034b96cd1b05b57a01eb28d7498507e4fd42fc588a0 SHA512 04279ca3b9a30f7ba4a2897acab52604bd88acc58a0310cb5dce4b2a869a44653517efc5463509180f3cfa18772cea181137dc739d7e59d2ec4b662dcdd627ce
 MISC metadata.xml 316 BLAKE2B 54b5450ed0b2b031f3d55b46ae2184375bfbb8e889bda2454851d0396e0ec52ea88cf434f379fb0d7bfaec73a360fab5b9b2d0ab11be4b33f21f862a59514486 SHA512 1fa20a0e53b24ba87583ad07016d7e62510a3bfd4169a79a61aa1ca5eb5f2e3f175b3a00b061ec7da8f1f2b3d42ea9d1f6b82e06691d32c5e3b9783d4fb58a34
diff --git a/dev-python/httmock/httmock-1.4.0.ebuild b/dev-python/httmock/httmock-1.4.0.ebuild
deleted file mode 100644
index 526cd9c48a3a..000000000000
--- a/dev-python/httmock/httmock-1.4.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A mocking library for requests"
-HOMEPAGE="https://github.com/patrys/httmock"
-SRC_URI="https://github.com/patrys/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-python/requests-1.0.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/httpretty/Manifest b/dev-python/httpretty/Manifest
index 2a643f79bb48..a0214f59c515 100644
--- a/dev-python/httpretty/Manifest
+++ b/dev-python/httpretty/Manifest
@@ -1,5 +1,4 @@
 AUX httpretty-1.1.4-pytest.patch 4970 BLAKE2B 396fd081c958616978b0f0fa476a0b6b1f3e530aee5bddc969fcd0b9471e094dfb7c2114940f86dea6e50222f4224321cf7ed449999c61eb7006c9d1cff3e7e6 SHA512 f9064a67d852a026a7398fc1593499d4d3c7e44d00d01d1ecb68d813b1114578858a2b2d11f56f44ce7284b618143098c590fef442c118f532b29503f135ab55
 DIST httpretty-1.1.4.tar.gz 442389 BLAKE2B 020a9fd2b5dc9790b53009caac37a3cf5a0e47102b9be05f4df255880f5daf5e7689714e0c0a8f223155d191c471cb5ff4f9b0d0d34b07bd5f377311ed56ba25 SHA512 4daceea4f30ce181e871167d304bd7af9d504364f55d42f8025770f2efe7e833d018aed681c8733d653d4de90db3433e999c56bccd4675f81e66d1cc4023e418
-EBUILD httpretty-1.1.4-r1.ebuild 2115 BLAKE2B 912373a1df1cdf17669b4fef99dd259070e92936878e393634d1fe300a30326b3c5aaa852045e128934bdb754f191b9764b2f88290426dd2966e9b018411c116 SHA512 2b3777b2f07984db7c0802e7670bacf0c01f93fd2ec353b50c2e660c3f04d41ba7a815a43985b07f744afa21edbef0b08215351e51f6a4fd58cc4867514a1ba2
-EBUILD httpretty-1.1.4.ebuild 1169 BLAKE2B 24e27504292721d4a1e35b3c0f22789b2b201017ec81c5b43b659bcafed8a37f25037297715c702bfdb7dc71fe80315e0fb407229934251850eab2724c7271f8 SHA512 75887d111ec82c4ac978efaf3c0ba1f07c0d6ad7b1ed1bee209ea8016e67f975d2fe543eb2ad0b64e9931b59843d643a83c403859bddf342ee0c2ceb6b9254e9
+EBUILD httpretty-1.1.4-r1.ebuild 2108 BLAKE2B 539bf5ed92f4e182f13891346b51610b645b3595607a6511da6cd3755cf7722206b9c2eadea79c219bd7da2b6922282d4d75d08bd4f0fb6a309168da6060b5b2 SHA512 88633454d2c27e50b43226ab59e092cce50a8cd9bc395739b904d92f228ee446a4ebe610b893ae3325e0ee8c1877cf5398760aef0ee47e76ab6cc57c106a3d3c
 MISC metadata.xml 616 BLAKE2B 65eeaf117de44f4d836a207f29728912c57ea62ca6102334ab183beb5e48e4f9fe683b3356f39a8456e3981e7c9470f312d516f47a2b14b6c08befdbd777a778 SHA512 2ba0ba780ad8dba7c193d0c10eb4b993f93c8ca0e4c99d22a70d3bf86588e9b9df20f560a91edbaa72a95beead383386dfc96ae16299ef03936257d4e03a4b77
diff --git a/dev-python/httpretty/httpretty-1.1.4-r1.ebuild b/dev-python/httpretty/httpretty-1.1.4-r1.ebuild
index 387d58782461..95b5b255ea26 100644
--- a/dev-python/httpretty/httpretty-1.1.4-r1.ebuild
+++ b/dev-python/httpretty/httpretty-1.1.4-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	dev-python/urllib3[${PYTHON_USEDEP}]
diff --git a/dev-python/httpretty/httpretty-1.1.4.ebuild b/dev-python/httpretty/httpretty-1.1.4.ebuild
deleted file mode 100644
index ebb43b2a8e5d..000000000000
--- a/dev-python/httpretty/httpretty-1.1.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="HTTP client mock for Python"
-HOMEPAGE="https://github.com/gabrielfalcao/httpretty"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	dev-python/urllib3[${PYTHON_USEDEP}]"
-# eventlet is used only to test compat, and it doesn't support py3.10
-# redis skipped as it requires a redis server running
-BDEPEND="
-	test? (
-		>=dev-python/boto3-1.17.72[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		>=dev-python/httpx-0.18.1[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		dev-python/sure[${PYTHON_USEDEP}]
-		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
-)"
-
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# remove useless deps
-	sed -i -e '/rednose/d' setup.cfg || die
-	# tests requiring network access
-	rm tests/functional/test_passthrough.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 21f2565ad98e..fc2864f6bb95 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,9 +1,11 @@
 DIST hypothesis-hypothesis-python-6.46.11.gh.tar.gz 9312248 BLAKE2B 78b5ca5bd38bd62d2fe50ab929df075e253c059aed329d6b52051fb01449f8de84ae340ba42a4af94ef592411139a45d34aad232fe4bb2d8412165730bbeca01 SHA512 6fdd54f28d275eb65a4f6e6919437d503eba6254c25e22298c34ac67e6de03cd99a5178b1a475b1da7f7afeed8406e89c20b4818436143f442222d26f0d94796
 DIST hypothesis-hypothesis-python-6.47.1.gh.tar.gz 9314265 BLAKE2B c2ad0120ab2cbd565f73d472f0a5a87e4b51ff9cf7c08d75dbc54223ad9fe60ed475577ca7dced64ab02d4cc1ee5d30525677c4acfe720af8251f804e72a3b00 SHA512 1aea9f949242d3a273584cd92e1829654d6ce385efcd631b412374f1f9252d3b759b8e216aaa9a49e26e0c3b12673348eac79d0189881f6a811f11daf14b0873
 DIST hypothesis-hypothesis-python-6.47.2.gh.tar.gz 9314053 BLAKE2B df607e7d81a280d916cc3946c71f6b2a6c7004263069e83d2647222730d11276b6c246fedbb07c5a4f3c526df38d6ea5c7999bdb416f0c86b0877d0231418c73 SHA512 b58835fac221353ea9beff227dda81f7776e2b50f6a765e536c83bea129d5c5a862551423d9df5abbc0cf294b358c6c537c62add69b3d5a1f38b22e179d2f83c
+DIST hypothesis-hypothesis-python-6.47.3.gh.tar.gz 9314739 BLAKE2B 282b012e020fc6494b628ba629c576f604db831c219878ab92539fbd1d980f3363e490ef35f888b68902661dd82e682393641d13a882c1177d8570ec232b217a SHA512 c7231ff06ae5846f718e76c48ed4bb8a1fc0f9aff80c7ddd1ff0ead219eb93dcc7f9d5c5e591390661e81a33bcac79773ea620cfe3f246210114635f0c089144
 DIST hypothesis-python-6.46.9.tar.gz 9311955 BLAKE2B f8cf7e216650401ea8a9b427311d10bc65a21b79eb231864c4ff429baea4600f8d84b05e4b94120551ebe17f1b4b99a65e76157efe9d0a133ad68c22b1c46452 SHA512 e4fed5210ba11977958d4d14f9fb32427b812ea7903f391bbf977ade7ae268770e846b0cd2193585f519a02681e4fabfead23eea5bcededaccc0e7a9857e98cf
 EBUILD hypothesis-6.46.11.ebuild 2013 BLAKE2B 942c16f7b0978033b8fcf199b3a57091deb236729cce7c7ed5178e0857ec96089788af2ac5f4ad500b1eac5b269c3d4e9f4aec65ed569b473dacd18b2d02b4b5 SHA512 cf708baf47e35232f06f322e81e1292a4b48640a81a27521d1adec845b76515670397f1059d3a922634569831e254b3a54cc975905aae6653dfe4e12b8bb244c
 EBUILD hypothesis-6.46.9.ebuild 1942 BLAKE2B ce72baf06bedc78ce59e88b096996d01ea2eb5a3260d4b83797d0f26e1b667953b3fc4851d640137936d3b57d925d0e5e134d6ab2f4ca04cf116e232b0e515bf SHA512 0d922094e0ab799714de0378b55efb39e7e3af54f94ace4b3ef391730bff5d9823ff5477adec0ec6d4eb85969fcbfdf7e8dd86e5b9afec2f1781b22ecf728c71
 EBUILD hypothesis-6.47.1.ebuild 2013 BLAKE2B 942c16f7b0978033b8fcf199b3a57091deb236729cce7c7ed5178e0857ec96089788af2ac5f4ad500b1eac5b269c3d4e9f4aec65ed569b473dacd18b2d02b4b5 SHA512 cf708baf47e35232f06f322e81e1292a4b48640a81a27521d1adec845b76515670397f1059d3a922634569831e254b3a54cc975905aae6653dfe4e12b8bb244c
-EBUILD hypothesis-6.47.2.ebuild 2027 BLAKE2B e46cccdbdd4530e39247e69b31ce9bb5f53fa155900faa811fc6ee18fea4ad3301847063f5b90fdb82fae1f78f782281d56d07163cef5bd246622a904fbbc515 SHA512 8247541b112d46532f7a92e900fbc1f91f83e816df6aed3c5fd8910fe26740ed74828ce72fe363423fbdcd1b386cf13e3485e51482c276935f5260afe1608413
+EBUILD hypothesis-6.47.2.ebuild 2057 BLAKE2B 7def57b017aa81010a65b6fc7fc59db242d8277d72e1d0154caf10c1919a91463b8f899133c03d7ad0af21d45b274951d71ad378829eae3ab09a1298caa018ec SHA512 124270b45b0890964bcc4976b9d1e6ea2244e64bd8b7bd836cf9ab89fa85b2349fcbd0645b1de7cd5124d95bfc9a3b52bb01ec04da4d0d7099194a30277b0dcf
+EBUILD hypothesis-6.47.3.ebuild 2057 BLAKE2B 7def57b017aa81010a65b6fc7fc59db242d8277d72e1d0154caf10c1919a91463b8f899133c03d7ad0af21d45b274951d71ad378829eae3ab09a1298caa018ec SHA512 124270b45b0890964bcc4976b9d1e6ea2244e64bd8b7bd836cf9ab89fa85b2349fcbd0645b1de7cd5124d95bfc9a3b52bb01ec04da4d0d7099194a30277b0dcf
 MISC metadata.xml 756 BLAKE2B 26e40ab96ddcbd5751023e3c0cc9aa86e96d73ba02bca750ad15eb4301beb0318d3d694c54c2c2a2cb50937731af727411e8afb67e1a21e58e0ff611eeea9149 SHA512 cd48d35c5fe41aa9efcfea9eb7b2d78a4646658b5aab7533ca6492d4700032099fd34ca2dc45a6198c27351650c9e901c8b7c4d53ade2b56695d5e26ca371238
diff --git a/dev-python/hypothesis/hypothesis-6.47.2.ebuild b/dev-python/hypothesis/hypothesis-6.47.2.ebuild
index 4a6ec603042b..fc4586d5a3f4 100644
--- a/dev-python/hypothesis/hypothesis-6.47.2.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.47.2.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}/${MY_P}/hypothesis-python"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
 IUSE="cli"
 
 RDEPEND="
diff --git a/dev-python/hypothesis/hypothesis-6.47.3.ebuild b/dev-python/hypothesis/hypothesis-6.47.3.ebuild
new file mode 100644
index 000000000000..fc4586d5a3f4
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.47.3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( "${CLI_COMPAT[@]}" python3_11 pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# subtests are broken by warnings from random plugins
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
+
+	epytest tests/cover tests/pytest tests/quality -n "$(makeopts_jobs)"
+}
+
+python_install() {
+	distutils-r1_python_install
+	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/ifaddr/Manifest b/dev-python/ifaddr/Manifest
index c3f0018e451f..f7f531a71f00 100644
--- a/dev-python/ifaddr/Manifest
+++ b/dev-python/ifaddr/Manifest
@@ -1,3 +1,5 @@
 DIST ifaddr-0.1.7.tar.gz 9281 BLAKE2B 3f7d29b69462cbf592899f1b4035685d1e9bb4535b104e6e59b41fd51c4c2681d2502ad190dae633891aec90818bb330c1f8ea403be22d154d9e7de8a5a80dab SHA512 9a428dd6bb022c8f483b77df9e9301f96e9ba64207eda8b3956a7ca5993bfe97f222c451149851135d379db1a819c75d0834566f3b6501456b2f237b0645e300
+DIST ifaddr-0.2.0.tar.gz 10485 BLAKE2B d59f34e75c4d27c365f7b169bdf62d9ac3f413275b86ae52677b08909e2811349ab0a6d2c613fc303d74b71c787b5e97e0741174c5a11b88a8f8400e123d1fdc SHA512 02597c0fda81addebbc52893d2f1f5a5f1e99820360202652c433b4869f751901c0931a9fcf8cf0b1b4f1a95c438f238e5b1cfc84511785e7a2a42d5f81bb0d6
 EBUILD ifaddr-0.1.7.ebuild 450 BLAKE2B 5310efcbc89eb17e5b59c71deada0ebd38cf94f6790d08469c7edb6ef0c95d4915c81af82daa21f287bcf95f3797fe4cb974b3eed86722fc4e3dc44a87941028 SHA512 d8a641eda90453b2710e8c59435283091da7aea7590099d0170f1753f92648c084262685fd0bf43fe96ea58eafc2980676f61a6157569b730b021e8f5979482f
+EBUILD ifaddr-0.2.0.ebuild 522 BLAKE2B e7f606c7caeb8d99740bb45c9c42931999657071cb77b9cfb97cf2f14775aa49694497928f433e495cf43e0510b4e268484e96a3d16474c9354c100e690ea9fa SHA512 a90fd82110068d67d766c5f0d8e7aa0189660e682b4e24f0c5e394586c40dc2707f5de28537a19b254bb4d81c54c770b477da2bdb62b7653aef47b6cec719dc5
 MISC metadata.xml 452 BLAKE2B 25e4267ab823386fc377c24137e740035935b9eb3d31aa2d47361cc60476b9f9c6a3489d4c189042a52221bd91b2b7ab5da15f827c4d05bc25eeda57154a85a9 SHA512 0a5f347281f5f6dc1009ef84825e60eb3cb61192cb18a0f42c616e878c94bbbbef120d1d0342e110a6b478cb34b1b1182b1b2274ec892ce0f7b007e56e29305e
diff --git a/dev-python/ifaddr/ifaddr-0.2.0.ebuild b/dev-python/ifaddr/ifaddr-0.2.0.ebuild
new file mode 100644
index 000000000000..05222a04124e
--- /dev/null
+++ b/dev-python/ifaddr/ifaddr-0.2.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Enumerate IP addresses on the local network adapters"
+HOMEPAGE="
+	https://github.com/pydron/ifaddr/
+	https://pypi.org/project/ifaddr/
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests pytest
diff --git a/dev-python/imageio/Manifest b/dev-python/imageio/Manifest
index 13191122845c..be1b4353f922 100644
--- a/dev-python/imageio/Manifest
+++ b/dev-python/imageio/Manifest
@@ -1,5 +1,3 @@
-DIST imageio-2.19.2.gh.tar.gz 388434 BLAKE2B 4f0ec3f2586cbce7c15ff0551b8b5389d9236333eecda0870880c6dbe93bb2de464e57af7bc20c0f63aec6d53040a5140195d09c4c8a3c50c391a42b7847cf49 SHA512 6711a3be92f840d821f6539636072654d000932a6a7688384ae6bc007af5de41c8f90ed9a29e6401fd13219f50082ba5b75a1b383f1ac9242d568f95859de9c4
 DIST imageio-2.19.3.gh.tar.gz 388949 BLAKE2B bf7f7b2cc036d6bc808cedeefe624dfe43b232518f78974fffe9c664f23c8e89da73e5b777ee6049aa0ec363400fe8d9df1388a91a4b0a01089609d7ce12eaf3 SHA512 5ad9f332ea723facd5d9295e463b12d2cc17dfef8a7349ce194a8d32fcc5d07a29550834c66dc6e5837f8440347387b46624243fa267750f986042910ff6cb90
-EBUILD imageio-2.19.2.ebuild 1210 BLAKE2B 2a8b74196d15dfd56fc549f5a90bbaf46c335d0c8d471b025a47780e46b42285b87b6041b57dfe7266bfc13cc00191361d07780eb1f9b519bff57a5adc3eb517 SHA512 e9346ba2129ad538ac3bc59ddaec6069afcbacaf1bc0cae5d26997e670a111ad8892e8bcda84b58010882d9810896410d6b2577b2a5ff9ffb070b9dd13961e56
 EBUILD imageio-2.19.3.ebuild 1210 BLAKE2B 2a8b74196d15dfd56fc549f5a90bbaf46c335d0c8d471b025a47780e46b42285b87b6041b57dfe7266bfc13cc00191361d07780eb1f9b519bff57a5adc3eb517 SHA512 e9346ba2129ad538ac3bc59ddaec6069afcbacaf1bc0cae5d26997e670a111ad8892e8bcda84b58010882d9810896410d6b2577b2a5ff9ffb070b9dd13961e56
 MISC metadata.xml 959 BLAKE2B 284b4b8fdf53cc63b6d46d1afd03abf322f8a91ad5feac3828c30198a9e0baa1514f34b91385dbc00830b306e4f78eac5d2bf4be8e377fe98cfb7e5c8db896be SHA512 0a72e91831dec56af50fa96fc6ed74b19fdc15e68255d19fb09c542eea85cfcdaa5a382608add10a63d3e421783225829d20d9b31c26883f7640b6214f2c20e3
diff --git a/dev-python/imageio/imageio-2.19.2.ebuild b/dev-python/imageio/imageio-2.19.2.ebuild
deleted file mode 100644
index 6770d9759db9..000000000000
--- a/dev-python/imageio/imageio-2.19.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for reading and writing image data"
-HOMEPAGE="
-	https://imageio.readthedocs.io/en/stable/
-	https://github.com/imageio/imageio/
-	https://pypi.org/project/imageio/
-"
-SRC_URI="
-	https://github.com/imageio/imageio/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# over 50% of tests rely on Internet
-PROPERTIES="test_network"
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-python/numpy-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/pillow-8.3.2[${PYTHON_USEDEP}]
-	media-libs/freeimage
-"
-# requests for fsspec[github]
-BDEPEND="
-	test? (
-		dev-python/fsspec[${PYTHON_USEDEP}]
-		dev-python/imageio-ffmpeg[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/tifffile[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Fails because of system installed freeimage
-	tests/test_core.py::test_findlib2
-	# Tries to download ffmpeg binary ?!
-	tests/test_ffmpeg.py::test_get_exe_installed
-)
diff --git a/dev-python/imagesize/Manifest b/dev-python/imagesize/Manifest
index 2615cfc3fe65..364f290b4f97 100644
--- a/dev-python/imagesize/Manifest
+++ b/dev-python/imagesize/Manifest
@@ -1,4 +1,3 @@
 DIST imagesize-1.3.0.tar.gz 1279535 BLAKE2B 926b90ad493b790db41941467dd2dd0385f86064fc1ce9547670a52f925965effc9b8b7f61057158a4452cac2223b65dbfaecc34a19ddaf52067a9057560b56a SHA512 3686e513f03cc16f5237ca206cd1bf131eea968015ee4906f620ab1c8932ed24d19881807225a02fa319d0465da4b01851ec0bd0a47146ef914053185bc0c755
-EBUILD imagesize-1.3.0-r1.ebuild 663 BLAKE2B 6392853cb333c98fe82900716c5a6e4642369175487ffd069e13ddc2b25ac231868afc49b9f3f80058a34ab7f89a928a51b9cb863235eeb02ed311ce9b4df21c SHA512 b53dd6c0dbcefffacbe3f40e327bbc05c5c603a12a4ce66e59195b09b14dd59b8c43296f147d19e999c648d6e13af818c5bd8a51cdb3820b923b70db8c96d930
-EBUILD imagesize-1.3.0.ebuild 623 BLAKE2B fb93785fcd27454fa01eb806637bcc4132aa7ea9bef53431814b8fab1428e110b80833a98621d1a8606e00d90b8d5e47a67f301bc528a1327db6abc641b7c69b SHA512 ff3bf033f2eac1eee8a35e7678f8222052391b003740ba2adb31897e4a150940d20bf0f97f361c087559ae294a6055d23c8176001c7cf13d7e929b0b2e289647
+EBUILD imagesize-1.3.0-r1.ebuild 655 BLAKE2B b9c7efdb5914b9ffaee8e02beee8df951ed967e5fa61dc2e6c0eba5d664a9e71a4e74b08b12b66679ece88572c04c9157e181338c6995101b13cd440a0805fb0 SHA512 a6df1d582c405958e4209d577a62296f85dd90c8c9e3d289c144b59362e82aa4df3d2c4d27548cebf4715a6763e8a161bfde9ccf6fdf889272504ce94785b792
 MISC metadata.xml 484 BLAKE2B 9edce43c0b06aab59a3094cbe36b90393bf5d0a0eeba9bcdea7ea7298e7d42c2cbfa19ce8bb544022e01124743d877646709b90329796d77e916283398aef3ac SHA512 85d73b13ce95d9647d1afcdee5979fe2802a04cea213468c7d7714b976e191dd59715a93fa522dcd2646d33fd27a43911146c28dc477d9d34cd56cf42cc3ebb6
diff --git a/dev-python/imagesize/imagesize-1.3.0-r1.ebuild b/dev-python/imagesize/imagesize-1.3.0-r1.ebuild
index 3cd8cdd4bed4..62cddd30227a 100644
--- a/dev-python/imagesize/imagesize-1.3.0-r1.ebuild
+++ b/dev-python/imagesize/imagesize-1.3.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/imagesize/imagesize-1.3.0.ebuild b/dev-python/imagesize/imagesize-1.3.0.ebuild
deleted file mode 100644
index a4ddc0d2c5a9..000000000000
--- a/dev-python/imagesize/imagesize-1.3.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Pure Python module for getting image size from png/jpeg/jpeg2000/gif files"
-HOMEPAGE="https://github.com/shibukawa/imagesize_py"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# requires Internet
-	test/test_get_filelike.py::test_get_filelike
-)
diff --git a/dev-python/importlib_resources/Manifest b/dev-python/importlib_resources/Manifest
index a3971eb699eb..47d383f31c5f 100644
--- a/dev-python/importlib_resources/Manifest
+++ b/dev-python/importlib_resources/Manifest
@@ -1,3 +1,5 @@
 DIST importlib_resources-5.7.1.tar.gz 31272 BLAKE2B 3e30117ae4f18a9f2151b5435428f3853664ce291d2d4ce9490d1a3043ca5ce2e80cf04d7dcef71ebdaba8bbad17ee61bb47303637a8bee73a2263853b65293b SHA512 8fd89dfcea4112d26418bcfa522de36c2136a50d07470ac8de18f62bb7bb964a459534554802b1455996ae65796018bea806a592746c1d2717f1313608cf4918
+DIST importlib_resources-5.8.0.tar.gz 31461 BLAKE2B ce6668520297cd7e06b944146277065cd1a0f5ae3f9e3bce24005f0f4a1181a41fa7f91f6b9ee9c0ef4caf7ca65c8efff748957c5c1a45c56778b30568970b36 SHA512 5c20a46a1832c7aaddfaa561a3986ea02dae59b94c06861757b6e5912f36624d564c65e184612af6e5930927a3172dc132ceb9846b0585de851d019c68cc8955
 EBUILD importlib_resources-5.7.1.ebuild 1192 BLAKE2B 416bfa64edc6b33cb3ba55247586e7009f73ebbe7d9b4a7ab9eb75d6d106d39d750951f4ef25d3ed24b92b0b7590bece96aea554a71e20009da18e42b5fa9aa8 SHA512 9e754a10fb2290f88be8b338caa7ce7935abb88b66c16955fc1057e7aca4a430ae00be0bc5ce269052d100e2f70a452e771f9ba26df9fd69526f989b58f43939
+EBUILD importlib_resources-5.8.0.ebuild 1252 BLAKE2B ad1610867a1fb86f021b08133560a2d974b9660cb0d97bee9378f22e59f844ba7d316791475dc35ee8b17377a7c4aa0f87a42f962e67845c1dd817345df3cec3 SHA512 8d567073f2c04d60bc742f581572a71faf1ad7952b952a2f9f4cc7383eb6cca64f5c951be100c4e21561e2799d5ee8823a819dcdcbdbc485def7e5f13747a62b
 MISC metadata.xml 945 BLAKE2B 130dc56a13a8416168baf91e804e1fdef0d65978641c3fca5eb663b8accb5b1adc066bc4033751f03a9c729e27d0448925a7b623431922056fb7d282db052734 SHA512 ccb23df48a89f69133469722fb37acf516127b207b946cdea240cf82e2ba5422ee4e2166d1a9419031408a7624a52256e322fe7e478a9a7b8214ab4bc5c9b92b
diff --git a/dev-python/importlib_resources/importlib_resources-5.8.0.ebuild b/dev-python/importlib_resources/importlib_resources-5.8.0.ebuild
new file mode 100644
index 000000000000..a35c250af9c3
--- /dev/null
+++ b/dev-python/importlib_resources/importlib_resources-5.8.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+DISTUTILS_USE_PEP517=flit
+# This is a backport of Python 3.9's importlib.resources
+PYTHON_COMPAT=( pypy3 python3_8 )
+
+inherit distutils-r1
+
+DESCRIPTION="Read resources from Python packages"
+HOMEPAGE="
+	https://github.com/python/importlib_resources/
+	https://pypi.org/project/importlib-resources/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/zipp-3.7.0-r1[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+
+distutils_enable_tests unittest
+
+src_configure() {
+	grep -q 'build-backend = "setuptools' pyproject.toml ||
+		die "Upstream changed build-backend, recheck"
+	# write a custom pyproject.toml to ease setuptools bootstrap
+	cat > pyproject.toml <<-EOF || die
+		[build-system]
+		requires = ["flit_core >=3.2,<4"]
+		build-backend = "flit_core.buildapi"
+
+		[project]
+		name = "importlib_resources"
+		version = "${PV}"
+		description = "Read resources from Python packages"
+	EOF
+}
diff --git a/dev-python/inflection/Manifest b/dev-python/inflection/Manifest
index bad21ee9a61a..f5ab035ca5e2 100644
--- a/dev-python/inflection/Manifest
+++ b/dev-python/inflection/Manifest
@@ -1,4 +1,3 @@
 DIST inflection-0.5.1.tar.gz 15091 BLAKE2B f3db09d1010ce22b67dcd519f59f25f240f463872932fd6218209768b4c5e064776ef5300a8d7f9a6b9cb94392b05b46963f00b94c6de29fb325947df7b243cf SHA512 82f70e2b81fb166260191a464383f6674e3b21504a35ee605ac6ce4bb163c8f3bbe6d06379575178d7196701459506dd541f32e48f24b32f42d5cfb717158d50
 EBUILD inflection-0.5.1-r1.ebuild 475 BLAKE2B 65efd1136a2b66d20ccadfebeae83885146dbe2a832ab603a4d4c3cf5c946bbed3607fb4519ddeb87b1a548208abb5af79189a7480abdf4753448e7c27ba672e SHA512 21d21938e3e7e875a995724d79adbd3aac23054b10d63056b0ec8c10391268e0b02ffa6492303dba6e1e79d4fba06673273b79e517297b4485ce7d9d78806ebe
-EBUILD inflection-0.5.1.ebuild 444 BLAKE2B f9bfd47b4bd41c511219da40627a6121894406bc53db6dcba3c2dce09a2bd8fbc7124e8b079643b6e58031e1277543855fd02ce9ca7c42941a1126ceb45b73ba SHA512 e2834b1384ca9886b0987ec8cd595dcafa799bea37f91e8714644021856a0e7abe70e53dd12e76f06408b10b74227da88b821435acc2e3d896cd66b8469a504e
 MISC metadata.xml 445 BLAKE2B 54ea8efb9148eb2cf2c273976bda73ac7552460920d1ef99f545e2ed096d065bc7cb7ffb44f989bc8429677eacc68de97b9a7f64a6d25fe07f55ba5bda5097a6 SHA512 d32e48ed10db8276a5e9efa040b91869423bfc1ec0ef93d875e726eb4ce23d9ab7ad11deb6aee79cc29a063e4a2af64a8076352d1557cb59464c36496edd411b
diff --git a/dev-python/inflection/inflection-0.5.1.ebuild b/dev-python/inflection/inflection-0.5.1.ebuild
deleted file mode 100644
index e3b7b12e03a9..000000000000
--- a/dev-python/inflection/inflection-0.5.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A port of Ruby on Rails' inflector to Python"
-HOMEPAGE="https://github.com/jpvanhal/inflection"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index ea65a88114bf..8991289553b4 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,5 +1,9 @@
 DIST ipykernel-6.13.0.tar.gz 131331 BLAKE2B 95a662b5ff6062fd8f6712a214b2bdcb227064acec145ebbb2ff7dfc0647ee9c486bbb560502e8ab6c5f74bb44c7715a1ee16f4b8cd2661b7a6e77206be7ab67 SHA512 6025a540d7ae08f637d2cc9a022805df54c11844c93d989be73a3a800fb0985ec56f2ce5d8ee940a5ce51d41b4d1f632131b25c1f5847cb51623c285c4944f39
 DIST ipykernel-6.13.1.tar.gz 134356 BLAKE2B 212449f5e49f05052e36b60abc94ccfd81dcf6c13948d2ba32373ffab59f009ac28c251f6b9a9f5412b3d9a0f1347a2352f2e61b831d5efd8d45663ca43b4fdf SHA512 be0f5cf4eab8cf38f20a96e6e59971988bfc03105525694787d4dbbd092e22efb5b955ef622e0c8bc87fb43f29b0f4dc8affa89b81cd2eb7b4d9c93f7b9c68e5
+DIST ipykernel-6.14.0.tar.gz 134614 BLAKE2B 41c2d9179aae12aad207ff76f1451dd42beb4fa12123146a7ccbde2aaf12b52f374bd8d4e7c88bc26fed6e7a5b06629ce1e91ba87cf61e16d3de1bbd50edfac9 SHA512 cecefaf7221a640c5066b5bf77cb21750ddac78262aba6e0449e42f3db124624f87d88fe44351c6943753ee08d7b9a3780bcbb84dc7338e8e26d15c3ad6b1eea
+DIST ipykernel-6.15.0.tar.gz 134691 BLAKE2B ba3eefde9f1023ccf83c63a35dd99fdfebc0bda0d4f73e6477a098564c0a9fb7c0082413ae31dc8cf423339c3e44887bcf5253355c13630619f44b18d19e9913 SHA512 a6533f094d18d32a02e8de5638fdabb9f647edc9a512e609de3bb1d80f5592acef4e930d879bf79bde7a0ca23945d9eb112d841f2305204fac9f4c672b5315ac
 EBUILD ipykernel-6.13.0.ebuild 2019 BLAKE2B 31d026ca92036bdcdad7a1afd3d0ab6fb4e5fd924608f7196a6102169b2fe1a62f1bc155aeff2cfa9497ec6100ec8ba82d906e4bb1cb86ba16f4976323fd82e1 SHA512 df4d02205e9c0efd5a65a32730e0e2139ab94f713c6590431c303b0bbc3c2ae4a01c48cfb69ae6cb7c9253854cf2131601c35155ca91bd734df7ec7d84a699c7
 EBUILD ipykernel-6.13.1.ebuild 2026 BLAKE2B f5b2222a8d8015dcbac50880e2b47b81de8996cd55129ee5d0bda498893d033cbe9d9a056bed1d1883c4cd9aa768e1539d1c804291c60650e4e15471831412bb SHA512 7cf4f2f3fd005e1393cf80bf4aee5e8942d482616cdb19a2b51ecbe191781fc99f93433530d1c858ab06d039261f2b4656072e2583d98079c97cadc6773c2b33
+EBUILD ipykernel-6.14.0.ebuild 2026 BLAKE2B f5b2222a8d8015dcbac50880e2b47b81de8996cd55129ee5d0bda498893d033cbe9d9a056bed1d1883c4cd9aa768e1539d1c804291c60650e4e15471831412bb SHA512 7cf4f2f3fd005e1393cf80bf4aee5e8942d482616cdb19a2b51ecbe191781fc99f93433530d1c858ab06d039261f2b4656072e2583d98079c97cadc6773c2b33
+EBUILD ipykernel-6.15.0.ebuild 2067 BLAKE2B ed9a3b3a53035fdfa4847f57c5ee5dd4098ec24d967bed912eb4e7b9604f840d6fa901f0f08ae4c4b8faf77e63ff2457ed29fbfc1de527156c078e58b3f49dfb SHA512 945e1122d13b7b94b541d07252ba037d321379c1232f0c464fe31a775d0570249d46054a5a3a15970ae1db4e21fde7cc7543549058ee46ae106df00eefd4e76d
 MISC metadata.xml 527 BLAKE2B 4a24cb9d5b801bf94c71c47d0c90b04bc249fb41a794c7b688a5762f08545d1fcfe9e4976aa4f583ecb456458b5f6dfc394349633959444584c0abad0da4be42 SHA512 ed9f0ef12ec5de67a646783243555f1737604a84c78c57b9f7c65137cec8cbc396991411501927f92bd393daad2238c27363ecc9c115031450231c2a4fb2cbb9
diff --git a/dev-python/ipykernel/ipykernel-6.14.0.ebuild b/dev-python/ipykernel/ipykernel-6.14.0.ebuild
new file mode 100644
index 000000000000..06e969aa4a9d
--- /dev/null
+++ b/dev-python/ipykernel/ipykernel-6.14.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython Kernel for Jupyter"
+HOMEPAGE="https://github.com/ipython/ipykernel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/debugpy-1.0[${PYTHON_USEDEP}]
+	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-6.1.12[${PYTHON_USEDEP}]
+	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
+	>=dev-python/matplotlib-inline-0.1[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/nest_asyncio[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+"
+# RDEPEND seems specifically needed in BDEPEND, at least jupyter
+# bug #816486
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/ipyparallel[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# TODO
+	ipykernel/inprocess/tests/test_kernel.py::InProcessKernelTestCase::test_pylab
+	ipykernel/tests/test_debugger.py::test_attach_debug
+	ipykernel/tests/test_debugger.py::test_breakpoint_in_cell_with_leading_empty_lines
+	ipykernel/tests/test_debugger.py::test_rich_inspect_at_breakpoint
+	ipykernel/tests/test_debugger.py::test_rich_inspect_not_at_breakpoint
+	ipykernel/tests/test_debugger.py::test_set_breakpoints
+	ipykernel/tests/test_debugger.py::test_stop_on_breakpoint
+)
+
+src_prepare() {
+	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	# Use python3 in kernel.json configuration, bug #784764
+	sed -i -e '/python3.[0-9]\+/s//python3/' \
+		"${BUILD_DIR}/install${EPREFIX}/usr/share/jupyter/kernels/python3/kernel.json" || die
+}
diff --git a/dev-python/ipykernel/ipykernel-6.15.0.ebuild b/dev-python/ipykernel/ipykernel-6.15.0.ebuild
new file mode 100644
index 000000000000..5526cde6276c
--- /dev/null
+++ b/dev-python/ipykernel/ipykernel-6.15.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython Kernel for Jupyter"
+HOMEPAGE="https://github.com/ipython/ipykernel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/debugpy-1.0[${PYTHON_USEDEP}]
+	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-6.1.12[${PYTHON_USEDEP}]
+	>=dev-python/matplotlib-inline-0.1[${PYTHON_USEDEP}]
+	dev-python/nest_asyncio[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.1.0[${PYTHON_USEDEP}]
+	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
+"
+# RDEPEND seems specifically needed in BDEPEND, at least jupyter
+# bug #816486
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/ipyparallel[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# TODO
+	ipykernel/inprocess/tests/test_kernel.py::InProcessKernelTestCase::test_pylab
+	ipykernel/tests/test_debugger.py::test_attach_debug
+	ipykernel/tests/test_debugger.py::test_breakpoint_in_cell_with_leading_empty_lines
+	ipykernel/tests/test_debugger.py::test_rich_inspect_at_breakpoint
+	ipykernel/tests/test_debugger.py::test_rich_inspect_not_at_breakpoint
+	ipykernel/tests/test_debugger.py::test_set_breakpoints
+	ipykernel/tests/test_debugger.py::test_stop_on_breakpoint
+)
+
+src_prepare() {
+	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	# Use python3 in kernel.json configuration, bug #784764
+	sed -i -e '/python3.[0-9]\+/s//python3/' \
+		"${BUILD_DIR}/install${EPREFIX}/usr/share/jupyter/kernels/python3/kernel.json" || die
+}
diff --git a/dev-python/ipyparallel/Manifest b/dev-python/ipyparallel/Manifest
index 905b862091ae..39ec7ea13bbd 100644
--- a/dev-python/ipyparallel/Manifest
+++ b/dev-python/ipyparallel/Manifest
@@ -11,5 +11,5 @@ EBUILD ipyparallel-8.1.0-r1.ebuild 2947 BLAKE2B 07bf5ed3bbe999930722dadfb936cc24
 EBUILD ipyparallel-8.1.0.ebuild 2921 BLAKE2B 43a62f3289899d1eed402d15a6393a8be916cebfd459e30ca98d7a37015dad7e8de44a0b309de2a18af8a9f20e08c343a740294406890c742ce8228d937bca3e SHA512 3bb9008ce9355d4282b196b67d8fe0fa5aa70850bd7b1e2ab6bc256893ab8947617e0fdfb784d772d1cb4a2b2c86b1b63c184f940393107f93be383228f7fbdb
 EBUILD ipyparallel-8.2.0.ebuild 3032 BLAKE2B ec5ec16a1c5f0d8d430fcc3f8832775e2d08651717454f8866d0b9ed7156a9c53ae804eb148d084afe1f10045b037828023a051f3da92fe98f9e3a3e8b5d0810 SHA512 a5ebf9bb1b97ddfa2f0b5006bd685b7291f1e50025a103541b89c298b6756f9295ad7bfda7f06e9ebad4bbd70b6a01cd4984b9f3de15528e053557ade50ca717
 EBUILD ipyparallel-8.2.1.ebuild 3027 BLAKE2B 94de8d77abcfd534fa4406e442aeffe46e4c819cc1b220322a2f2d9afd47938c0bd9a162145a2670bc780b51626cc69f30d55e55ca9b9a8669a9f55576b55e2b SHA512 85f0a6fc5e9062b970f01ec01094df0b5d72989b1e22c58e3d5019b6952aeb1925ecd8b2b9b37efe586379a35adbf08ca28cbd7e671200bf323b634ddcfb473e
-EBUILD ipyparallel-8.3.0.ebuild 2651 BLAKE2B 8c29e3fa944cd8c0b533edb275b6137e68ef8531a16ee999e65e29ee50dcc67608783255ae83b5d4081c326f7492e5f79af9d28806b76a75281cff99ddb4636b SHA512 566a7c06a8dd5b225d95075e10d00d5a12ca628e3c9438595aaa539a222a5d8ba32ad6393bb93005f72e25b112d118e6e06d14d92d1a2f837204a32140254be4
+EBUILD ipyparallel-8.3.0.ebuild 2650 BLAKE2B ef30721c3ba50a96f99069a9c602fa1f2d0eb650516d210b97ffd20fe446746b0e52104560cadfe4e1d5415e783ac94cfd5a189e0db195f46a690bc076b7ca91 SHA512 ec0d80d6d4b72bc7a307a5d4c7adb53ad0b62544d9b6d25afa9dafdcc14cedebec1c4af5b652082f60a46c52daeea8c02cdc4cc46944318afebba2547ca6bc03
 MISC metadata.xml 531 BLAKE2B 92dd755dd3036f653f24eda893979487b8d5bbf3c369f3f10c3fc2e69ad6aef03cb6eca295bcb8c6f89f0838780c20132bfd2a33bb38b56b227e97258447c2e0 SHA512 fcd131d18b012d1511468777dd72e07ed28a514419923911082229c0256b9003d9afe2048b6c339cb5c94307026b52bc4e9b6781d45660178d18385d71af8f21
diff --git a/dev-python/ipyparallel/ipyparallel-8.3.0.ebuild b/dev-python/ipyparallel/ipyparallel-8.3.0.ebuild
index 32d94ac90340..0b986b8cdac3 100644
--- a/dev-python/ipyparallel/ipyparallel-8.3.0.ebuild
+++ b/dev-python/ipyparallel/ipyparallel-8.3.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/entrypoints[${PYTHON_USEDEP}]
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 9d6c5fd6c7a5..4210779151b7 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,8 +1,6 @@
 AUX 2.1.0-substitute-files.patch 1017 BLAKE2B 70577eb950a18345804a2a4b750bd233dc6a0b6bbdb524dfc66e0f4a7c69b0eeb2d35efb9d1845d567a11d1afa7881068b4757e42b9baf24dc01ba3026608a38 SHA512 fc4c9e12267ac5f04a2e16ad27334a093638538b8149ff380099fcbeb674a276ab9eb624a508010e37f82c05d5f7ab527a80e386b3e7b61c123ecb8effd9d542
-DIST ipython-8.2.0.tar.gz 5400583 BLAKE2B 6af50e671823005b035a8463e65463b06dacb3bf4d43c4d3bd9720d1747ebda8abe3d73a49f59ae0e6e2651035db20bcfa1e82dbb0a73e40b4e2507e63118921 SHA512 0bf93527bcafe5dfbfe034b901dff2f002e0fc732159073f0371263e23784f45eb6c9e3f7f2cb9567e93ea4ee313773f836157afe9d23256e71bc4b2fcac15af
 DIST ipython-8.3.0.tar.gz 5314400 BLAKE2B 8f06dcaf32cea70ba9f19fb218d4ea6ca3e42651da065521133b1c7163f80324244f59b3c4d85039f1aa5ed363acad0dae11615ae4927d6c9a24197cc9640349 SHA512 95a3d50a5cffe9d4ed3f072c7fa8920c96beccdb15a7437836daa5f38f1ba228b4ebc4c3313d4c5016b77ed7d6f3787af727487ea379c9dc3b3de90eafa4d1c3
 DIST ipython-8.4.0.tar.gz 5314601 BLAKE2B 4a5804ad115b45568ddbc0b8fcd181ae0088690ae2d7dda8580588d1e1caa087582a279449142e0144568815270b3a9476893525c0e90320f9ec580a06126d1d SHA512 975915ee64ce6f3fc9bcda383c784759dd8b19151428b10ef92020097718c6e2a9804a00fe02bd541b845eca146c63a672f25ad4f00ec5302b3c61ae0c6935ce
-EBUILD ipython-8.2.0.ebuild 4699 BLAKE2B f4932fc1c512efefc2adeb9a7cd3f6e717ec7d15496dc9d3f0420a40f3d1a96d440e2c95ef72a767119bf5fbdaa97d3838d9d050f46a88bf08e4297a527910fa SHA512 3026d6f2181420b4ad3498eec3cf050a4888c61d0973859fece13a9300622b1e69495bda3506ba1db68ffcf2d429415910ae73d74a4783ed1d81eac3b4295ef2
-EBUILD ipython-8.3.0-r1.ebuild 4694 BLAKE2B f8cee8bdb64907ce73bfa279259af1e23178bc43d1f806eac62b879dcb7a92b4016bc1969d8165789ce12fdb71ccf301f7a86acdffcd5a9182d4a4086c780417 SHA512 6a92f18ef9db7c3dcac46ebf6f298e384de2e6d5a2880e6c89f58a80ed0cdfe4e2bd1fbf867770a4297dec45fbc0d00599f7712319493af5d5d8f869ace6010c
+EBUILD ipython-8.3.0-r1.ebuild 4686 BLAKE2B 84112b5bba8125ff42312c46fa63f479970ea910623e96deb9c14cc946c2329ee69127e462f6dc8e99fbcc472ae44c50f5ef30a70e291fead15506a25ba695b7 SHA512 644837453f1d96c2d6dcac69d1908ff20cc10b7a6d960467b51f8bb571f0fb9c621a9766466e42ea471f8d368e122c1398aaccbb13563fdcd1e20f3a152b5dc0
 EBUILD ipython-8.4.0.ebuild 5030 BLAKE2B 2dcb2ee47d0415822903a004872b53c8dcbcfb212f2855b03dd687a2f24b296a12a1571ea64c5fbbeb5e67c44b4c228341f63e98ae72dc3519c9263687159882 SHA512 d9fb1383eadeb995c96a6a42c658ca91f7e1423dfc760110874c5ceca90ef6060ecdbc0fa062d0e0da0e6437be309b16433dc0c6c8ea5a6e82388f3541b1876c
 MISC metadata.xml 2883 BLAKE2B f61d1c66cdc9a956f3fdc9fcbc93fbc2051e9d0872beb9229e87a8fdabbce656efee9702e66bf30bec68009702f42e4036202e02208a428a8ed87b448f625536 SHA512 617f19e859544079d2680e9796e3ff0b7af41577776847d4c4dccfffc460dfc887631169289e5271120f375bea7c7836395abb9bf8a7628b3b55a7c1beefda9b
diff --git a/dev-python/ipython/ipython-8.2.0.ebuild b/dev-python/ipython/ipython-8.2.0.ebuild
deleted file mode 100644
index 91060ec26912..000000000000
--- a/dev-python/ipython/ipython-8.2.0.ebuild
+++ /dev/null
@@ -1,164 +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='readline,sqlite,threads(+)'
-
-inherit distutils-r1 optfeature virtualx
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="https://ipython.org/ https://github.com/ipython/ipython/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/backcall[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	>=dev-python/jedi-0.16[${PYTHON_USEDEP}]
-	dev-python/matplotlib-inline[${PYTHON_USEDEP}]
-	>=dev-python/pexpect-4.3[${PYTHON_USEDEP}]
-	dev-python/pickleshare[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-2[${PYTHON_USEDEP}]
-	<dev-python/prompt_toolkit-3.1[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/stack_data[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.0[${PYTHON_USEDEP}]
-	matplotlib? (
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-	)
-"
-
-BDEPEND="
-	test? (
-		app-text/dvipng[truetype]
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
-		dev-python/nbformat[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.19[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-RDEPEND+="
-	nbconvert? (
-		dev-python/nbconvert[${PYTHON_USEDEP}]
-	)
-"
-PDEPEND="
-	notebook? (
-		dev-python/notebook[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-		dev-python/widgetsnbextension[${PYTHON_USEDEP}]
-	)
-	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
-	smp? (
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
-
-python_prepare_all() {
-	# Remove out of date insource files
-	#rm IPython/extensions/cythonmagic.py || die
-	#rm IPython/extensions/rmagic.py || die
-
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-	fi
-
-	# Rename the test directory to reduce sys.path pollution
-	# https://github.com/ipython/ipython/issues/12892
-	mv IPython/extensions/{,ipython_}tests || die
-
-	# remove pyproject.toml that specifies incorrect backend; since
-	# the package actually requires the legacy backend, force it implicitly
-	rm pyproject.toml || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html_noapi
-		HTML_DOCS=( docs/build/html/. )
-	fi
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local -x IPYTHON_TESTING_TIMEOUT_SCALE=20
-	local EPYTEST_DESELECT=(
-		# Internet
-		IPython/core/display.py::IPython.core.display.Image.__init__
-		# TODO: looks to be a regression due to a newer dep
-		IPython/core/tests/test_oinspect.py::test_class_signature
-		IPython/core/tests/test_oinspect.py::test_render_signature_long
-	)
-	[[ ${EPYTHON} == python3.10 ]] && EPYTEST_DESELECT+=(
-		# TODO
-		IPython/core/tests/test_completer.py::TestCompleter::test_all_completions_dups
-		IPython/core/tests/test_completer.py::TestCompleter::test_deduplicate_completions
-	)
-	epytest || die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Create ipythonX.Y symlinks.
-	# TODO:
-	# 1. do we want them for pypy? No.  pypy has no numpy
-	# 2. handle it in the eclass instead (use _python_ln_rel).
-	# With pypy not an option the dosym becomes unconditional
-	dosym ../lib/python-exec/${EPYTHON}/ipython \
-		/usr/bin/ipython${EPYTHON#python}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-pkg_postinst() {
-	optfeature "code formatting" dev-python/black
-	optfeature "sympyprinting" dev-python/sympy
-	optfeature "cythonmagic" dev-python/cython
-	optfeature "%lprun magic command" dev-python/line_profiler
-	optfeature "%mprun magic command" dev-python/memory_profiler
-
-	if use nbconvert; then
-		if ! has_version app-text/pandoc ; then
-			einfo "Node.js will be used to convert notebooks to other formats"
-			einfo "like HTML. Support for that is still experimental. If you"
-			einfo "encounter any problems, please use app-text/pandoc instead."
-		fi
-	fi
-}
diff --git a/dev-python/ipython/ipython-8.3.0-r1.ebuild b/dev-python/ipython/ipython-8.3.0-r1.ebuild
index 3a38a26f8d7a..7d34496fedfa 100644
--- a/dev-python/ipython/ipython-8.3.0-r1.ebuild
+++ b/dev-python/ipython/ipython-8.3.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jaraco-collections/Manifest b/dev-python/jaraco-collections/Manifest
index 3d7d6fbe2777..08743f55ff49 100644
--- a/dev-python/jaraco-collections/Manifest
+++ b/dev-python/jaraco-collections/Manifest
@@ -1,4 +1,3 @@
 DIST jaraco.collections-3.5.1.tar.gz 15053 BLAKE2B afba813636464b6776f244eab31a0cd86418410f313e171cff1c8ac64e5d902f4a6c2f88d87c61d55292baa338aee45866d3a459c5b5b73fd4e751278b869316 SHA512 2918be537296ca81e5f78a3966a47451dc9dc2d233d997c3f01461c489b44051c497dab55496f85883ac1b91a28850a9d77ff154a3f5e074da1ed07f3259c246
-EBUILD jaraco-collections-3.5.1-r1.ebuild 835 BLAKE2B 1e89ea527e5990cd4d6cad442afd8ba567a673f1bae7f2ea2f172030d51f2ffd05a2fc6e6357c90ea41261d1c891d142144a6d5dba11d065c015b5d2716d2c01 SHA512 7b2cd8eaeca4ad9c0a029d6ef55f1ebd512fb471095329da9e3d9b48ce57004ff563cd7a8c609193c4f1224564e4c143831a1e59f878aa063dadc48fdf2a0c3d
-EBUILD jaraco-collections-3.5.1.ebuild 798 BLAKE2B d86e97424bb56793f282c4368021386f23bfd340fd9d210ea75cdf53f558a6ebb6a06ca430f079024e721c8cc01f0688f98f11f99ef4edf94e4cf18c8dc2b45a SHA512 3138c7679b01023275dbe4ecd0467902d0779450656cab07fe88ebc5768b9553d8dfa07752df83594adc0358faecf380b7101776c9f51aff0b5b58a289ca0f1a
+EBUILD jaraco-collections-3.5.1-r1.ebuild 830 BLAKE2B ed63ed5db17077393886ff83d189fd99293486799371ae4bb22a2f9c0b5697b4c8c1fb2ac3a3bf2137299f703492b268487712ef460ea3b3da1a069dbb8e54f2 SHA512 16e92d64d3b62c250fe557aaa3961026be6c8c19e72e372cb02fe7f542976a94a05d653ea5eef01d51dd15e4523388c5aee96c6de3f87da27671312dbe541529
 MISC metadata.xml 684 BLAKE2B 2da0cbb4ee979b83d045c4c402ff420db27d1a4176c7009bf56027b9b3a7df9395e67f881dce945849870955998e65dcd13c4e77926a8e2e7d1084b475a71ddc SHA512 30743b4d3616dc141a9ce814262304d21ac20475fa70414679dd5f028dcf83021c4cf9b39b3817957f5feb623076f94df1e7a951b0ab6cf57cf635b7eaf3ef8e
diff --git a/dev-python/jaraco-collections/jaraco-collections-3.5.1-r1.ebuild b/dev-python/jaraco-collections/jaraco-collections-3.5.1-r1.ebuild
index 2d4ec2a0c605..3962c5c51519 100644
--- a/dev-python/jaraco-collections/jaraco-collections-3.5.1-r1.ebuild
+++ b/dev-python/jaraco-collections/jaraco-collections-3.5.1-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/jaraco-classes[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-collections/jaraco-collections-3.5.1.ebuild b/dev-python/jaraco-collections/jaraco-collections-3.5.1.ebuild
deleted file mode 100644
index d7d76c693654..000000000000
--- a/dev-python/jaraco-collections/jaraco-collections-3.5.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Models and classes to supplement the stdlib collections module"
-HOMEPAGE="https://github.com/jaraco/jaraco.collections"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 ~riscv x86"
-
-RDEPEND="
-	dev-python/jaraco-classes[${PYTHON_USEDEP}]
-	dev-python/jaraco-text[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs \
-	'>=dev-python/jaraco-packaging-3.2' \
-	'>=dev-python/rst-linker-1.9'
-distutils_enable_tests pytest
diff --git a/dev-python/jaraco-stream/Manifest b/dev-python/jaraco-stream/Manifest
index 8fed60de6aa9..2eacaba97487 100644
--- a/dev-python/jaraco-stream/Manifest
+++ b/dev-python/jaraco-stream/Manifest
@@ -1,4 +1,4 @@
 DIST jaraco.stream-3.0.3.tar.gz 8877 BLAKE2B 85289efe8e04e93cbceb0053f5025cad3d073deeb113806e25ca06fb88a9b082de6805305de85d1f17b77f61d2d0f4683b2b21f670102b03112b8f7a3fdafd91 SHA512 fe50c21b26e734c9c2d0b7cf8a1c8cc8bab80417adf073a4ae213ba4067aa33e2f6c8886aac996971d2f98aacd295d9999aa3ac7dba24dd952cc27d15bef22e2
-EBUILD jaraco-stream-3.0.3-r1.ebuild 715 BLAKE2B f754b129483d705aeb79d01b5217c8e340467f14e9c2af1a40a6ac6039ad4b0527e543a91b267b626ddfaebaf39b9da3c681192bcdba23aa2574942dcec02aa2 SHA512 550584672c32c04af17f22660247e02c039012bf273444a89cef6023b4aa6af7a2d841881de16cd233e66fd984c9bdb95f55f0f3e12ea56a519bc4c2607b33ed
+EBUILD jaraco-stream-3.0.3-r1.ebuild 713 BLAKE2B 0d4dc91e0023b2cfbb11bc6951df8304a46013bbb9ad789bddf66ae661d0328d90da6a04d39d659d4b1f7324b7aa488f9e504714da5cab06fa972e42f6e1c703 SHA512 593cb5f3fff022d69f2494ee476b1172a34e5192f4a4e3dcc16176e0cd4abd4ea57e7450b042ac6c13cea50019025017277b9761c04c32d41e2cff61e4333471
 EBUILD jaraco-stream-3.0.3.ebuild 681 BLAKE2B 92d752b0dd0eb84ce2f8f7583c460bf1ecf512f097c87d86a4edf3928dc3fc7161566956b8ca17cbaaafb10803e8e648f10eee537b23ffaea315b4fb1eedfedf SHA512 5efeede7df83b6a8490d84ad52ed2a17bd26873c4f662b488a8e5db6bf61cfe3a754d2c6b695900a42f41747b34012e8d275ba000d21f1f46f90eb0c54db59ec
 MISC metadata.xml 728 BLAKE2B ecdead614a239a87e72e8d4c15e722c51b15f40b84085c00722285ed4b843872bbd4d15296f43080a59a7438450772799d440dc7b4560fff8c3057213f7d6fc3 SHA512 680f40bf2134a7aa0a91424aeb2cbc0de3ecaf1a388da0f8c4a98ece63e8258d26dba276b89bfd73a2901e473da26d429904acb206a2fba2e67595c6c0ab946a
diff --git a/dev-python/jaraco-stream/jaraco-stream-3.0.3-r1.ebuild b/dev-python/jaraco-stream/jaraco-stream-3.0.3-r1.ebuild
index d7762df11ae4..9cbc7b4c46e2 100644
--- a/dev-python/jaraco-stream/jaraco-stream-3.0.3-r1.ebuild
+++ b/dev-python/jaraco-stream/jaraco-stream-3.0.3-r1.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 BDEPEND="
 	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-test/Manifest b/dev-python/jaraco-test/Manifest
index 52e7f253db70..202973253181 100644
--- a/dev-python/jaraco-test/Manifest
+++ b/dev-python/jaraco-test/Manifest
@@ -1,3 +1,3 @@
 DIST jaraco.test-5.1.0.tar.gz 6700 BLAKE2B 69ac08ab7e1c8aeff45d25483f2bb2648ad57a5977dbff8aab844f114a15f054b782ad5b424d9baa805ab80fc7483362dc97320965ef0abe86573b1e7f40b97b SHA512 d1d93eab85068fcba94530df50da9221b7f574e58b2c4ed519c8c4dec7231aa982d588e29137418226f23e0f94bd98f47c0859cf14d7a58c1683ac8ccc24d900
-EBUILD jaraco-test-5.1.0.ebuild 736 BLAKE2B 75bd3738bb53adfca81c2765a290884d1f03bcce1fe6fc75c9697ecad245a0cd7eba88a2b0edae42044b97908e6959780908abc7c41a88527788e9ff6d91371e SHA512 bdd0eea11afa7a2bd4df2375e3a590343f4e5e99a4404c30c7675420667e2daff26f78848fda955a7af0187eb930b6fbea2d2f9e1b8da40ad954f8403af7f43e
+EBUILD jaraco-test-5.1.0.ebuild 758 BLAKE2B 2c570885d3a1d085d127856c4fa21ff4997122516424b8f4d90ff484c39bc6ffffe3d7a71e38ece40d191c2c2c0f4f702e9046f16e27703792e2de90fed39f62 SHA512 e91394642e18bae7dd654321b3e95da2b54bc9a068d260d5c5adcb744783b56e2cacf66995168d254da920aeef696abbd546ad75502e8efb384152d8fba21cfd
 MISC metadata.xml 397 BLAKE2B 24c07f0efc966e9d4445968ba639a5476a24a0885051e4eab17075ea9b7b6369fe9ed919ccdc0b51a1e667c8d327428caac2196c2a3e087d8b36176e7b4b2c81 SHA512 4fce74bc524dc018611c219b86b87b7643fe5d133309a00dd5ade217895165f85cfbe26b686c79fc4dd8b1e016b07c83c25afa1c015fc240ffa0ac75e4c17159
diff --git a/dev-python/jaraco-test/jaraco-test-5.1.0.ebuild b/dev-python/jaraco-test/jaraco-test-5.1.0.ebuild
index a8d490201e4d..17f5cf9d9c60 100644
--- a/dev-python/jaraco-test/jaraco-test-5.1.0.ebuild
+++ b/dev-python/jaraco-test/jaraco-test-5.1.0.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 
 RDEPEND="
 	dev-python/jaraco-collections[${PYTHON_USEDEP}]
diff --git a/dev-python/jc/Manifest b/dev-python/jc/Manifest
index fea872c43992..044d7a820461 100644
--- a/dev-python/jc/Manifest
+++ b/dev-python/jc/Manifest
@@ -1,5 +1,3 @@
-DIST jc-1.19.0.tar.gz 10264610 BLAKE2B 4f05464196e4e60b3e4a423b7c05a0bfd35128caf3f04b9c846c96bf9cb6e594ac0d46c678e1dca7080212c06d2c679acdffcc0b954b6577925ff5ff80d8f044 SHA512 668fc71d6a4b0d7ba9aac591c2328536df4f61dd9267ecdc6c311efde8dbcc3f244d6236fabd593ca1907fc25eb2a7fc53215756989160167d382e7068e2cf79
-DIST jc-1.20.0.gh.tar.gz 10338183 BLAKE2B d19fec89ae96f3a9fc2a30715521dcd0ce5b9ee27ec7df85970dede61958e2ce580a53a34da78571de8d4287b531733746ebf5cc687e709085fbdf254d6c4c8a SHA512 f7aafcf531ad6dfd6cfb870803df4e1f6780483429fb3ddb52a3c57dd8f6fb62f1f776bfa97f15f813a8e97e01061c334f6bb4268d077195e013c423b7d9dd50
-EBUILD jc-1.19.0.ebuild 671 BLAKE2B 11272a70d7bc2841c92bd16fefcfebd7ee7ac67180269b4f9f424920f07e7445d281d1260f52b26e7360e924ea676679b23e3c956f47a6dac66eddca8e2949a2 SHA512 0144a422a4e87c37cf8b5a1961043e31013a300b5e70612300ea17d0a1a237cbf71066bd204623f787ea90f52e5916b92c4259f647b7097f7a0fa52cdc0ed9dd
-EBUILD jc-1.20.0.ebuild 674 BLAKE2B 82e1aa85f296576cc2b2b72a63fe85bb4fa3f5d8f3bd3a0e038ed48f4e638f66385bac7aae4aa7e7288255b2d85d55a7e2f23cc87df8f58d47dc079df17f2a7b SHA512 4c95ec5cd1507d09540aca0d170e778c967d72dcca66ecbe54709415d86d6a3a2e7c1487f9704b84b9a5f7bb5cebbb0a858168833fbcf04e6cf5b81412448768
+DIST jc-1.20.1.gh.tar.gz 10342360 BLAKE2B fe7eb94e53a78e6d2c1f13403ac529e4e0c0251a9e5f8270e88a94c7d086b7b1eca5cf8bd51ab6b514923ac2de95b7365b8ee29eeae5a1bb861e911f70be81d8 SHA512 d066b30089fce8bb7aff6db0b278f258a91bbef73bc49abb0b086b1cce5253a0ba07efa9e3680ee6ee333ea4a2b6afcfe4028eee58d0ec16411f7c257a54a9b5
+EBUILD jc-1.20.1.ebuild 674 BLAKE2B 4cb873aab7d621f36a62bb1d4a25be0d981dbc3c80cfddf795a47a0ddda6e962091f8aa46166cbf88b32d5372879cd9f8329036d27fa99bbbedceba47f4877de SHA512 6bf52b03223276c5b94ddfbc3a28822246bcfdaf9c75840570f36cb63b45a05b01995e09a4ff3cd22f9f5d10b8660b31e115e70e2826c5d7bf2614566d4aa7ba
 MISC metadata.xml 492 BLAKE2B 100e7421c33b90fb9180a3412206cdc2355b26dcacf988f1157a725ca8ee6eff44288ec12f8274360f086272ad3bd06e9df6a93288edeb9102551c65256a47f4 SHA512 cb0abbd0c1b02b1fd4c74034e1f41a53ed0b7f297dcfad4e9f6b2a4960e16790b5d879f407ab18f73c81684d3a0436327949bd628a1d1d146958f01e34206688
diff --git a/dev-python/jc/jc-1.19.0.ebuild b/dev-python/jc/jc-1.19.0.ebuild
deleted file mode 100644
index 989dcb9e4a0b..000000000000
--- a/dev-python/jc/jc-1.19.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Converts the output of popular command-line tools and file-types to JSON"
-HOMEPAGE="
-	https://github.com/kellyjonbrazil/jc/
-	https://pypi.org/project/jc/
-"
-SRC_URI="
-	https://github.com/kellyjonbrazil/jc/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
-
-RDEPEND="
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/jc/jc-1.20.0.ebuild b/dev-python/jc/jc-1.20.1.ebuild
similarity index 94%
rename from dev-python/jc/jc-1.20.0.ebuild
rename to dev-python/jc/jc-1.20.1.ebuild
index 062958c85649..7b7bbfc30991 100644
--- a/dev-python/jc/jc-1.20.0.ebuild
+++ b/dev-python/jc/jc-1.20.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jdcal/Manifest b/dev-python/jdcal/Manifest
index 82fc42c749eb..37b79a88844b 100644
--- a/dev-python/jdcal/Manifest
+++ b/dev-python/jdcal/Manifest
@@ -1,4 +1,3 @@
 DIST jdcal-1.4.1.tar.gz 7479 BLAKE2B a53954b12c5f1fed81fe6241b5097a7def4074ae83d6e31a528ac0fa87a3d90b504e2fe1a80b44cf19663e1402695460f9e3acb54a2333181f21e7cef47f737d SHA512 5e14f470f35764c0d76fcf0ee13f9ea0879e645b589a48636207b7848f3df0437343898595c8cf19b8e4fe8a172d4e82aa06e56284ed263154c93de217e24e39
-EBUILD jdcal-1.4.1-r1.ebuild 487 BLAKE2B 8d1ce7f76de787ce80752adf40f435148dece61aff23a9000c1c2935310f4583aac6c4523b8ef5fbaeb7ac64ef1b7adbb5279b5f983bf7939b5632c1bf28e680 SHA512 1242edced7fe2fc15b04c24806558e4459141a49df7cab3476cf5cd3c2fef681b02c83b9ab5686a782e413958e2c188117630cf40f4b9044d5bda6ae058dbb30
-EBUILD jdcal-1.4.1.ebuild 453 BLAKE2B ecd394ed310acf8448a8701e9756eddf9ed78413e5ba215aeafc90814c11dfda0955239ccd1f462732eafc0465b1225fc0ee41f89a2a5e990f168dde5223f691 SHA512 cc67027304f0eba46bc28f7d4a32e39bdc023dd5e0bc3fdd093d99f83ec7a45e8075b65bc5537a08f5ce4194dcfc5725f655497c9c9b0c6837c309fadbe2e352
+EBUILD jdcal-1.4.1-r1.ebuild 485 BLAKE2B a512549ac4d42b8083dfd80c7de6bea659c68c8ba146a94b8103aab4f041cc642336ee324bcd7bc49c58ea5772538c5c914a4118daeaa01af7847af25b06b6ee SHA512 9799b306ed0b4385b87c1e9da25ecdd05346c3742e9e9f4a1857af216720c191f7278c3c979d4eaf1eafe60f524da26f04d7f3a36807753deb748752b3585ca3
 MISC metadata.xml 395 BLAKE2B 10f34373c8b55215959ff4361a6ac0ddc4b92dbfd47ab4249f87b25d12cdf46dfdf9e581064a26ca78e5c51f503c1541f9ba17e18d2bb5d2f3696b37e0f53091 SHA512 d769283844d2dda47d732dd3b9d2b2a72b372581b75cd5348fc62952b258e1571b982c9bdb8b47db861054f7a0b566cb7df644a0b69fafe5568776769f5bd9b0
diff --git a/dev-python/jdcal/jdcal-1.4.1-r1.ebuild b/dev-python/jdcal/jdcal-1.4.1-r1.ebuild
index 503bbcdfafce..838d795a91c3 100644
--- a/dev-python/jdcal/jdcal-1.4.1-r1.ebuild
+++ b/dev-python/jdcal/jdcal-1.4.1-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/phn/jdcal"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 
 distutils_enable_tests pytest
diff --git a/dev-python/jdcal/jdcal-1.4.1.ebuild b/dev-python/jdcal/jdcal-1.4.1.ebuild
deleted file mode 100644
index 85a8ab2e8613..000000000000
--- a/dev-python/jdcal/jdcal-1.4.1.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
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Julian dates from proleptic Gregorian and Julian calendars"
-HOMEPAGE="https://github.com/phn/jdcal"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-
-distutils_enable_tests pytest
diff --git a/dev-python/jikanpy/Manifest b/dev-python/jikanpy/Manifest
index fd1030d5215a..171c59c015ca 100644
--- a/dev-python/jikanpy/Manifest
+++ b/dev-python/jikanpy/Manifest
@@ -1,5 +1,3 @@
 DIST jikanpy-4.3.2.gh.tar.gz 726102 BLAKE2B 754a174a5c67852701e94d817ab84462cbd1aff9f18737cdf5c7a1e20c91ca325d7c34dfd9467ff337d24fd7d3896880137f0695afeff5a436b0d40a96d4c89d SHA512 48dcf154f5b438b9381eb7d37a5a603d77793c2e2a7f17b4315e3f44a735c83bec076ee44969002a5ad2cbdd6b5cf83287b961f5d96603ddbd6c534db78ee3a1
-DIST jikanpy-4.3.2.tar.gz 726102 BLAKE2B 754a174a5c67852701e94d817ab84462cbd1aff9f18737cdf5c7a1e20c91ca325d7c34dfd9467ff337d24fd7d3896880137f0695afeff5a436b0d40a96d4c89d SHA512 48dcf154f5b438b9381eb7d37a5a603d77793c2e2a7f17b4315e3f44a735c83bec076ee44969002a5ad2cbdd6b5cf83287b961f5d96603ddbd6c534db78ee3a1
 EBUILD jikanpy-4.3.2-r1.ebuild 799 BLAKE2B ee54c4622ce2746655396fd1675ed97537e88a08b5f9dfe8147eba0bd7a33f0ea8719543de9b146ed7b6a6111aa30c474cfaae1278e09ea892e88df8e0781383 SHA512 ce762f56fe50da3290ad0d9eece12dc4e6cf6b052760e0e2d46bd1d6fbf5674741bf1b74f2dc31921937d7a3a7d1378bdb690d8a93dfcc710185ef83dcc01e29
-EBUILD jikanpy-4.3.2.ebuild 707 BLAKE2B 8a042fb83bc39291e59a636594f020c0b4eef40496c89fb24020633bea3c8632168e48a39943abf8973f8cc595eeda1f41c7e48fb944ea7593d85c1fa7b1a27f SHA512 e3283c6ecfe2040f2c46348995d28130930134f1e862e2fb12ac5f9df5def92678658a9f20b4e0aa556338598ae6d57211a6e861ebeb86d01065083403cd0b87
 MISC metadata.xml 506 BLAKE2B 7c1fccc2fd123f9acab51228679c37af16d73681ba87a95faf44841ea1db83914fe77891d8d2843d59702998bcdf191067c65e6896eaf965449b362a7dee4443 SHA512 3e8f0c36635591e3947e5f8ab5f85c7dd89a00cf3aa58c5e4913ecf017bd60971b6b7fbdc158f0aee104025de2e7751db2feffe3695c7f2c7be5b0557e89f878
diff --git a/dev-python/jikanpy/jikanpy-4.3.2.ebuild b/dev-python/jikanpy/jikanpy-4.3.2.ebuild
deleted file mode 100644
index 7183986671a8..000000000000
--- a/dev-python/jikanpy/jikanpy-4.3.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper for jikan.moe API"
-HOMEPAGE="https://pypi.org/project/jikanpy/"
-SRC_URI="https://github.com/abhinavk99/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/aiohttp[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/simplejson[${PYTHON_USEDEP}]
-"
-BDEPEND="test? (
-	dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	dev-python/vcrpy[${PYTHON_USEDEP}]
-)"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/alabaster
diff --git a/dev-python/jinja2_pluralize/Manifest b/dev-python/jinja2_pluralize/Manifest
index 3f6ab93764bf..dff37a4060a5 100644
--- a/dev-python/jinja2_pluralize/Manifest
+++ b/dev-python/jinja2_pluralize/Manifest
@@ -1,4 +1,3 @@
 DIST jinja2_pluralize-0.3.0.tar.gz 12638 BLAKE2B bb7399d287cf0d1bfed5398c0ad7e6994dfe1d8e942d82190570d0b40d8bec4939d497cb2d9d4415c913f3f3f9c11b017035941755219effa8d92a6ef188dac9 SHA512 8830c01ff82befa353302cadc305147a950038fdf3808632f22dfce9a564a6ba7967781f579a2d94fecb1b5bb01f80d2a53ff082332b94c6e6e3f5f4106e7313
 EBUILD jinja2_pluralize-0.3.0-r1.ebuild 570 BLAKE2B 5ba18a6e44917c176824a9fb2019915ebf1c624d52dacf36666a234cabd4ab60e436476e6e23a12965ba06a84620636dcecb25d9f25ed7d90638e506ed2e79b4 SHA512 a4748b9ea9d16af05142c9683b935cf44c1b9088cdb340419f3ee5694300b2be822af9018de6a9dedd6d37a042d3051744963d429e1aecca5524548769fd7fdd
-EBUILD jinja2_pluralize-0.3.0.ebuild 490 BLAKE2B b363767a4de1b861b646c83ef9fca770547012234e2e7b54b389a7d5f6d45b238237f527c0c95107fb0609ee64b76b92826d94a06fc2b32ec986bfb249387c2c SHA512 01f749b9887df207360edfa512488e96416614cb64cf07ce1057d8b93c9d4ef147c6ef348e4f68e786d6bfdb8be9a2a267f1b654de6cef72769265b8c3bfd234
 MISC metadata.xml 495 BLAKE2B 92432500add47e3e65573cf3d6ce69f97ed5765c16190fb102d77829e34cec938c8e587b39fcc95dee157fa8b8048eae0708147ad79431eb9bc3aa0214b926c0 SHA512 7bd616c66dcd43150b63203ff1b069b216eb721222103df46ddb459ecf521c342820c4dde2d386d2b0621d4c17e64c7c0b8edb9509b87cc032010ced34752252
diff --git a/dev-python/jinja2_pluralize/jinja2_pluralize-0.3.0.ebuild b/dev-python/jinja2_pluralize/jinja2_pluralize-0.3.0.ebuild
deleted file mode 100644
index 00bbd09ea45e..000000000000
--- a/dev-python/jinja2_pluralize/jinja2_pluralize-0.3.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Jinja2 pluralize filters"
-HOMEPAGE="https://github.com/audreyr/jinja2_pluralize"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/inflect[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/js2py/Manifest b/dev-python/js2py/Manifest
index 42756773ed5d..b1d17badc323 100644
--- a/dev-python/js2py/Manifest
+++ b/dev-python/js2py/Manifest
@@ -1,3 +1,5 @@
 DIST Js2Py-0.71.tar.gz 1969618 BLAKE2B 293a830f4188e66927b23900e8c376bf1a4bfdfa8726e33aa5aa75dcdf735cde89ce463741c142fc7e487ae89c7c11421e459d2fdd09ba88edfe953e4e087e42 SHA512 75bae61619d4766117f3c163d36427f3019825ecb08b745aee7c3b6f2d33a4ea8507ca180b63c0a8e575a5f9491eb64d6963acbb912edc7b934a676b38814597
+DIST Js2Py-0.71_p20210918.tar.gz 1970784 BLAKE2B 4ea446b306e858c2acb192a699b4c098cca1a334fd97246d3149186795a013fa1ff9cf45ecc5cd9bed241b13b3eb003ebf272f5af4ed24a608564fd4709e4ff1 SHA512 810363e4b0716e324e6deb5f373968c9c57e7ecf120710c064601ad46ca2f24bc8da52f779f861296dd506de06d664be86b3c0d72bcb811892fe4e6c22ad7a6d
 EBUILD js2py-0.71.ebuild 1157 BLAKE2B 516469da33f8585b37dc0103bbdd0e106d97f04a0e3eb23ce1aebf7ff84886143eedd9877075880e62e9b6939246d47722d8e7c6d15f41800760182b671f98a8 SHA512 b298e699f7117c93e73fac3154eafa35794511f720ed125ba31f051e8908ccd8f404952ee3018973af30031fcc735b7091aae693add03da91a34e3a84b41d376
+EBUILD js2py-0.71_p20210918.ebuild 1130 BLAKE2B fc81ce12cf14c0e7a638ed468e1e72e63cb7a86d6e604b67ed9573339236a4ea7d4aa83e71ecf939ede70334a4f44ac1f2cba2df1d407a0de6b54730f7150805 SHA512 ead3fc7fee3a183353dce2954c49a97bec9ce355e2828159b4b139a6cd6d81c1d8774d40e9384d304843f2fe4c93a4e13338cee808023f03edc5254e6163df0d
 MISC metadata.xml 385 BLAKE2B 145afe58273b407d1ba1f3859de0d79a3bdd4307575d043a8b574a8bac26c2d577efec841c6c3a9424ca7970dac33517df48c0f287c18bf4e1cc5faa5125ba6e SHA512 7e48c836578bcbb4abf0d99f0f2b870ab15158f05d5c402e2d84c9f9de7d2c994127eba26897e406b6c7d77c962867d39a37bf7ce78ca09d39b78d64f9d8d68d
diff --git a/dev-python/js2py/js2py-0.71_p20210918.ebuild b/dev-python/js2py/js2py-0.71_p20210918.ebuild
new file mode 100644
index 000000000000..7f94a9dd666c
--- /dev/null
+++ b/dev-python/js2py/js2py-0.71_p20210918.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=b16d7ce90ac9c03358010c1599c3e87698c9993f
+MY_PN=Js2Py
+MY_P=${MY_PN}-${PV}
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="JavaScript to Python Translator & JavaScript interpreter in Python"
+HOMEPAGE=" http://piter.io/projects/js2py/
+	https://github.com/PiotrDabkowski/Js2Py/
+	https://pypi.org/project/Js2Py/"
+SRC_URI="https://github.com/PiotrDabkowski/${MY_PN}/archive/${H}.tar.gz
+			-> ${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_PN}-${H}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/pyjsparser-2.5.1[${PYTHON_USEDEP}]
+	>=dev-python/tzlocal-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	pushd ./tests >/dev/null || die
+
+	# Tests require "node_failed.txt" file where the logs are kept
+	if [[ -f ./node_failed.txt ]] ; then
+		rm ./node_failed.txt || die
+	fi
+
+	touch ./node_failed.txt || die
+	"${EPYTHON}" ./run.py || die "tests failed with ${EPYTHON}"
+
+	popd >/dev/null || die
+}
diff --git a/dev-python/jsonmerge/Manifest b/dev-python/jsonmerge/Manifest
index dcfeb5104faa..a3e4155a579c 100644
--- a/dev-python/jsonmerge/Manifest
+++ b/dev-python/jsonmerge/Manifest
@@ -1,4 +1,3 @@
 DIST jsonmerge-1.8.0.tar.gz 26978 BLAKE2B e6aec87f6beee5eddc5d3a89afd15c45d8e8f58aafa98b6556805c1f86a4c8d65d1562230ec06181351480b1aaa881aeb5ef22bd8d39d5b7d5d109ce8b76747f SHA512 a19a37e0e56d647aec095b6a67f04573e0ffd988964a24f5722ae90ab03edf65628d03f0dc9242830cb606052a73821f0f1c790d01830bfafcfdb11698967da3
 EBUILD jsonmerge-1.8.0-r1.ebuild 515 BLAKE2B 8064cd6ac06f5da9698129f939bb8521e070d911ce1176c80b2aba2d7720ee20b33f4525c78aaa0be8c593d8a6858cfcec395149beac466821f331c3c6dc3423 SHA512 ab45da0bfa4cb3df1e668f2fe9508c4254ae4344c117b0c30bf902ee0479aa9f0dbdcbbd182dd51557d0c5c9cb4ffa0339808f644bf0ef1cbb78aaf7854e5c40
-EBUILD jsonmerge-1.8.0.ebuild 483 BLAKE2B 85a780ce7263ef37eeaac972701ee5e256acdac30ebc23047112664659ecef75b8dec70d8185ab842d93632a6173e37eb73869f30d6ab3763d4858831830e68d SHA512 8a74e746f502e13ca3de0496bdbd7500d4bc8e004bfb9be84c17032178b1fb63e079d28e2bdcabeefe89dcffbd96c05719102d838c70b132edffcbb66b8e9410
 MISC metadata.xml 474 BLAKE2B 327d36cf4218fec42a42872bfea7ce268423df751aef57dba5ec92eb80a5e72a66462f5161df26ca7d58193db8f0c79406b98d572968cacf15ee8052b6fbc3d4 SHA512 a1f9f14e6804a1b74f278e1e72659e1e32c8e60c31c42db186d1e51f9979c16697b1714b7ed6e6fb7a591d68e0408cf3071d4dd29b9a938071c42d7f32dfa09e
diff --git a/dev-python/jsonmerge/jsonmerge-1.8.0.ebuild b/dev-python/jsonmerge/jsonmerge-1.8.0.ebuild
deleted file mode 100644
index 77669b0333dd..000000000000
--- a/dev-python/jsonmerge/jsonmerge-1.8.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Merge a series of JSON documents"
-HOMEPAGE="https://github.com/avian2/jsonmerge/ https://pypi.org/project/jsonmerge/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/jsonschema[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
diff --git a/dev-python/jsonpickle/Manifest b/dev-python/jsonpickle/Manifest
index b48299a2974b..d034a02c570f 100644
--- a/dev-python/jsonpickle/Manifest
+++ b/dev-python/jsonpickle/Manifest
@@ -1,5 +1,3 @@
-DIST jsonpickle-2.1.0.tar.gz 186799 BLAKE2B a9e82a046fc77e1a4d5e7b1f13fc34f07e0e42e34922258bb0bd5aa4557bfec2b5fc06e450a0391522ae27380306111001204eb4f5429c2ad1f908fc4dec40a0 SHA512 46e8bcc2e24616da43b87bf8371ec9b39de1e8e33380684c05b7d7c6695f17bcc21150848c3306d235f89c5d74c69b6fda79e93fc823665d72cc88d9d89d8484
 DIST jsonpickle-2.2.0.tar.gz 189866 BLAKE2B d8fcd0e8b71947b734c59240d9fa4f0b35b9b0ac2e2940a9baf05c160771db0eae5f011b61e3b1c0bc746a740ac2e137a392931e270fea3acf4884578133283e SHA512 b6cb35316e32f38875cbfa3784a3930f669d4ea730ead6117242070590647987383e9f933c193b8c246c40dba87ad56600a65db89c45c18a790b3c1f9232b245
-EBUILD jsonpickle-2.1.0.ebuild 1548 BLAKE2B 0eb883cc66012426460d9f0817a6bb55e0d770f927ee06303b13be7331c37dbb3d94227210a03c0e1dbf3837a4e6e8bd11a03c64664573389954cc9d18cac1f6 SHA512 a81b01d27fbe4f9ed94d06b874fffcf3c21682575eb2f2e65d2c85c6218a75ecd2c60819239be1628f50af3ecdd9683608aff7926b5d2df634217e8c1062e51f
 EBUILD jsonpickle-2.2.0.ebuild 1578 BLAKE2B 39d842372cdf7bd6a86b57f8b0cee9744732f3d4ddf3bae0b29211564976418369b4b3a8bea718e3c06ee172eebc1a1a4bac6eb54f046606f0f77c3fdac84366 SHA512 2cc3d983f8a524ea61a3044b2d14135b745f9405e3e5c02cc1f42df369ed1d74938818041f654300a23ddcc6b9ea187d1e3c65158f34e6527de6353464e53875
 MISC metadata.xml 412 BLAKE2B a7e746abd8b45415ecdbccbde1b65ba9f1fa9fe7ce353411681c2a3de046878e990aad20849ee561a56ad3208bd5071d7b5e5b3c767fd71b7c44d2e8412d349b SHA512 dc52df78fdfe9024e695aae3d2bf22bed7162e1f2a528a288056b68022ebbc400b0a3a2f3e9c2155ee57e66d77a4f7a3f6f67188fb13ee15f200212ac6809a31
diff --git a/dev-python/jsonpickle/jsonpickle-2.1.0.ebuild b/dev-python/jsonpickle/jsonpickle-2.1.0.ebuild
deleted file mode 100644
index 12e12c24f3b8..000000000000
--- a/dev-python/jsonpickle/jsonpickle-2.1.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python library for serializing any arbitrary object graph into JSON"
-HOMEPAGE="https://github.com/jsonpickle/jsonpickle/ https://pypi.org/project/jsonpickle/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-		dev-python/sqlalchemy[${PYTHON_USEDEP}]
-		dev-python/ujson[${PYTHON_USEDEP}]
-		dev-python/feedparser[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs \
-	dev-python/jaraco-packaging \
-	dev-python/rst-linker
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -i -e 's:--flake8 --black --cov::' pytest.ini || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# unpackaged bson dependency
-		tests/bson_test.py
-		# broken when gmpy is installed
-		# https://github.com/jsonpickle/jsonpickle/issues/328
-		# https://github.com/jsonpickle/jsonpickle/issues/316
-		tests/ecdsa_test.py
-	)
-	epytest
-}
-
-pkg_postinst() {
-	# Unpackaged optional backends: yajl, demjson
-	optfeature "encoding numpy-based data" dev-python/numpy
-	optfeature "encoding pandas objects" dev-python/pandas
-	optfeature "fast JSON backend" dev-python/simplejson
-}
diff --git a/dev-python/jsonxs/Manifest b/dev-python/jsonxs/Manifest
index a7343c575882..62f13bbd8ba3 100644
--- a/dev-python/jsonxs/Manifest
+++ b/dev-python/jsonxs/Manifest
@@ -1,4 +1,3 @@
 DIST jsonxs-0.6.tar.gz 4071 BLAKE2B b19e6049be686abfcd0ce4dfd70b15c7367addf80ade80d3cdc3b3521885d15d92a3c5f71e80bb34de5a51fe8effdce3f6caa05ea5f7b60fc2ada536d98d34e4 SHA512 6dd5cb58b3f5ed00166bae175ef8daa4a4c18970c44afcc197bcc502433b164d5e3a6dfbd2f21f944a9339c257aac8af7bf1df8b3f1c2b12cf17777fc99e2272
 EBUILD jsonxs-0.6-r1.ebuild 501 BLAKE2B 0e798a7f44c207a9c97568c17e1f537375a3f31537656d4791cdab6052372318e4dd899ba6540e89b407606b587ffbbe6baf72ec66e8b3829a0ce244f2c5e694 SHA512 97c285d2127fb54fc93d1318d36cf3dac3afdb1b8f2385220c84581938f457bd13183a3fffc084621fdb40bf6b79ad8fa88f462ad0f4504f9b7315ed17a03f1b
-EBUILD jsonxs-0.6.ebuild 469 BLAKE2B 1389a7f6d6c3076d331b5bda76d9d65eacf035a70e4aae9e17c9421db7e42735ac9f97a082cb3ecac771270e096767ba8f50d48be0e4b60e5e27b02a60931374 SHA512 fd983ed33f5a61a4fcd25502f36e6876afdfdba18335bc470f0f650fe782f9e8a99dffbd05b54acb73a689d366c5814d34a2dedcfb6d824e638b154408549172
 MISC metadata.xml 389 BLAKE2B f320a1866050de0e3054e271e545a6aa0052d6fa1c6918c6150efe3a28b8979d731508ca3833e953258e90fe3a77b4e42f99716aa32a34f690efd7234b1fdbfb SHA512 0940b81296f260a18c7ad4e0d655bb3b1e100ec0241389868cb21d8c57c3eee40e966e266fcbaba3ee5f2dff00970df2f8c9afbf2ec949e5259c399ab8bbf496
diff --git a/dev-python/jsonxs/jsonxs-0.6.ebuild b/dev-python/jsonxs/jsonxs-0.6.ebuild
deleted file mode 100644
index df1168c837b6..000000000000
--- a/dev-python/jsonxs/jsonxs-0.6.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Get/set values in JSON and Python datastructures"
-HOMEPAGE="https://github.com/fboender/jsonxs"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-python_test() {
-	"${EPYTHON}" jsonxs/jsonxs.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/jupyter_server/Manifest b/dev-python/jupyter_server/Manifest
index 4fce6fa47551..5e237522efb1 100644
--- a/dev-python/jupyter_server/Manifest
+++ b/dev-python/jupyter_server/Manifest
@@ -1,5 +1,5 @@
 DIST jupyter_server-1.17.0.tar.gz 445648 BLAKE2B d7e19804b6b4cccb72c0a24febe8702829c2a32768e916a9da09ee9f55a08e360cf2a81c3c4bc535ff342c916155bc0b7933a9b5b49645db2b5f9a58ec02ab3a SHA512 d99d4036698d6f8d5e1258de214e3cbc6239b978314af4af7e722789c950edb1f261b98e666cffb46efdfe97a23c001784cfd29d7bf75c02dae53c2c07476b7f
 DIST jupyter_server-1.17.1.tar.gz 449682 BLAKE2B ca7a8b57c50a552c20e3c2a6a1318357df87027770bb0f37ee5c6c8db1a99116429ace7f7a28fca9f62728ba8469ce9875dc6f3a4cdf0a447ea8df616dff936f SHA512 bf37188a796e590340589414361e04c8e0f5f81d0e03cf55ad12ef7b59f35708996664da27727824424dadc038b44259a66e55f99c2da4270e727eae615f4e26
-EBUILD jupyter_server-1.17.0.ebuild 2279 BLAKE2B 7bbdc6ce49ca03d50f35c241c02eea676ef8bbe880156e0fa9abe5951829973fe03acf9443c7f87d1063e9b73b7e98a71777794e1843ded355ebf3f43aaea517 SHA512 523de966baef3ca32bee8d9ff7a2f5a2f2c1e2e63d6ab930fd975460238c4e762a26c3c9638727fa484eea4667e864fcf9429ad2214002c044f24d58ff85bc2e
+EBUILD jupyter_server-1.17.0.ebuild 2278 BLAKE2B eaeeac1afbee14c94ea5449af306a73c1b66f2e6d2fef2da8715063ca56763699d6a2a5a0870bac069c9a297fdeb79ab425973c1d2a494b7d8c3ab695f3461e2 SHA512 2fab27241cb236e6ee15e26b94010eedf3c27388216f928d21a80656523ff99a5bbab3cce75f2943be15b2b696ef0ed4b74e7415b4fe2368ef59e8f6d391d6dc
 EBUILD jupyter_server-1.17.1.ebuild 2284 BLAKE2B bc12a7e86bcc8c5cb2e3da9ce7a4446b4fefb396f6f269bbd58bf7b7c860baf9076d2de92f30165c6dcd5b63735269f6b6f5122a2242d77529ae596de82241cb SHA512 c4f9b09bb07f2ce436144a48fb6aace74a922f0eb50310facc328efc399d4d385227779e8c0a039103043bc6d6f86a33e0e14b97157c5a7ffa80866c71a37cac
 MISC metadata.xml 544 BLAKE2B ec5a0aea1d2ad6ce0e59972d2ef4ce62c03877d464dfdc34bcb94a7d01304c63761c6bc30ed973bba1f4100e25f70541bed4eea858deb44f359d0e373ae1ade0 SHA512 ffe7deb7349ce99890b902a225b73913185bfa860237dea8c1a508a6a5e84bbb74ca7a5c43253c9986f97fb3fd1e9f2bb63ca60f73953fcc851359df8adb5fbd
diff --git a/dev-python/jupyter_server/jupyter_server-1.17.0.ebuild b/dev-python/jupyter_server/jupyter_server-1.17.0.ebuild
index 36d03f478766..e42e420e2751 100644
--- a/dev-python/jupyter_server/jupyter_server-1.17.0.ebuild
+++ b/dev-python/jupyter_server/jupyter_server-1.17.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc ~x86"
 
 RDEPEND="
 	>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyterlab/Manifest b/dev-python/jupyterlab/Manifest
index 74d8bf8afee2..b1cdf65e62d5 100644
--- a/dev-python/jupyterlab/Manifest
+++ b/dev-python/jupyterlab/Manifest
@@ -1,5 +1,3 @@
-DIST jupyterlab-3.3.4.tar.gz 17147292 BLAKE2B 0ae9895a96deaa81f5da9f6ddc74c9127c579722a8275df82e10a0da849552369d34259877acbf6c1ae5de4519fbce96c8923437db913d44cc8b8db4ff5433ea SHA512 d5002e86c4d84664271e735069db2bdaa8ab3a567861433793ca388a601e6f582bf884680992e0c2238f3bc2880a05c3a1ffd4e95aa0f7df91c4bed58f7692b6
 DIST jupyterlab-3.4.3.tar.gz 17074198 BLAKE2B 08a0aa4ddaeb6b48a742ef78e1b8cefb95fbf89ec077a1f3687c4498b7c4dbdd50e1773194c4f3c2e21d36a2010dcbcf2be0141df9383b2d05159bcb7f99ab9c SHA512 27c8d6b6636e14ea9a500764ea97b6ef16a1580728077264b662cc23b0e34ac0fd9eebe1eb5a79a64b18a2d93acc996553a6152fa135e2688b5eae21d184da57
-EBUILD jupyterlab-3.3.4.ebuild 1142 BLAKE2B c08e2f6811653a47237867783aa3db70af167751fd631e913daa3ae37e45483f50ff65188c06214a60a86919f3f388fcd6a0dbb2a7814d03f2f0d5169063278c SHA512 54e5738694d60fd5897b2764d01bbc96d46a27f7f569cdee2504226ea54bd4a6d3b70d8b3a737daf32eef271a719a527d25268bf4cad7f210199461e137fc087
 EBUILD jupyterlab-3.4.3.ebuild 2451 BLAKE2B ad9d7ec075273150ae2d72faa47e15b450554ea63f89b83557e738106f4be406601d94376f8bf3ab0a420c58a5637068a98dbfa7ac9220e252cfd99092e61542 SHA512 6f37117b68a7d48eaef436aa63efba4e876c32fb70900a6929e2dfee0a9cd5265ae3cf31bd70c17d514e18d30ff066b4055725715ccd2251e267b297b6f74594
 MISC metadata.xml 412 BLAKE2B f0b40e19f8ba9dc116f0e4a882cabab6376f22d1eaeb3eac58ecff465ee2aff3564ddbf55e4ffb8971807a39945109a164037a954419671a274d3ac558b102ea SHA512 b6149a03585ca04bc3bf6f3ea6055e8e1fcb620a771359d150df7c22ee16bf09f57c8037df2161021fac0c194be0ac5ec79a31f0511d785e0c5b1ca96d817e42
diff --git a/dev-python/jupyterlab/jupyterlab-3.3.4.ebuild b/dev-python/jupyterlab/jupyterlab-3.3.4.ebuild
deleted file mode 100644
index 6c225e088e5c..000000000000
--- a/dev-python/jupyterlab/jupyterlab-3.3.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_PEP517=jupyter
-inherit distutils-r1
-
-DESCRIPTION="JupyterLab computational environment"
-HOMEPAGE="https://jupyter.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD MIT GPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# TODO: package openapi et al
-RESTRICT="test"
-
-BDEPEND="dev-python/jupyter_packaging[${PYTHON_USEDEP}]"
-
-RDEPEND="
-	dev-python/ipython[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	>=dev-python/jupyterlab_server-2.10[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_server-1.4[${PYTHON_USEDEP}]
-	>=dev-python/nbclassic-0.2[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
-	net-libs/nodejs
-"
-
-distutils_enable_tests pytest
-# TODO: package sphinx_copybutton
-#distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme dev-python/myst_parser
-
-python_install_all() {
-	distutils-r1_python_install_all
-	mv "${ED}/usr/etc" "${ED}/etc" || die
-}
diff --git a/dev-python/jupyterlab_server/Manifest b/dev-python/jupyterlab_server/Manifest
index 4ad9b0a577ba..683f7ff03b8b 100644
--- a/dev-python/jupyterlab_server/Manifest
+++ b/dev-python/jupyterlab_server/Manifest
@@ -1,5 +1,3 @@
-DIST jupyterlab_server-2.13.0.tar.gz 63896 BLAKE2B 4dd1f643cc68c9676ebab347a6ea01a58176a35d45262174e66c2e5b49881b21aa24692996d0622b96d0453793d04164f6eba710c2d7a31420ce12e52ac2c7fd SHA512 b7243c77765c811bce8ba82a612c034da22aa8ac7bc889a5d246a7db283bca29bf555f4ca849b8615c28d3d4cab57fbf08b0a15e08e045e9032792805cee59f8
 DIST jupyterlab_server-2.14.0.tar.gz 62704 BLAKE2B 93277a6880a9395622e6c0ec1da9522c5e30e7a8144c8629de89f45845964008f0a435ec84289efe56043c8ebb998ea65df1d09f3da72096f255fcafa29fab53 SHA512 21ecf749879663378d865bd06161fb3e331f3675038917e405df0cb77d4a4cec55340a35d6511676fa4d91ecaedcd1e7f8aec3a13ad3a39298d10911ab215cc6
-EBUILD jupyterlab_server-2.13.0.ebuild 1155 BLAKE2B be0de110beecf885c6a1befe1482caad910d8570df7ba507fa3d48e184a9f14dee9d0c287ab5495c632db01120cbc10bdc4e9acf04addda5ee111e28a1de8b5e SHA512 7d703c5ec45fc06c5f35e3c1ce9aba8bef9686121c2f7de7163f0881d67e29aabc5013c4cac75a86133bc0f5ffdeb147cf180f57729c470731c8767d4a92731c
 EBUILD jupyterlab_server-2.14.0.ebuild 1639 BLAKE2B 0d0e407d1cc7a23dc4695b1c02e26ee44245852312925557c26f982e158950cc874e8b71146b0099a1c174c176f609aa07a4c60701dc67a795b7c48b9f42f7c8 SHA512 3177bebf38b63510accbcad54965e0fb9ebb3cbaaa18c611d49c7b8fbca3ed44fd94d5412faf9d3eefd86a036b965a3e5976e26cc5ac83c5ba4b64e1cd84a422
 MISC metadata.xml 426 BLAKE2B 98083ff6255b6c5b4ebe7eb67f4e9716f52397646df275cce4cae2f78b0fbb5dda8d6240e1546b4bac6f13ef3f3f1e6f176b2062e066070d595e5cd93c02708e SHA512 9755e74547fb74a4720c9b755449d913dbfd949bad920ecd3903df91182236ad46712c358b3db8180ddf478a6cc6c2a57c6d1a939a9911ffc7ccb39672f5868e
diff --git a/dev-python/jupyterlab_server/jupyterlab_server-2.13.0.ebuild b/dev-python/jupyterlab_server/jupyterlab_server-2.13.0.ebuild
deleted file mode 100644
index 17950b25e18c..000000000000
--- a/dev-python/jupyterlab_server/jupyterlab_server-2.13.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Server components for JupyterLab and JupyterLab like applications"
-HOMEPAGE="https://jupyter.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# TODO: package openapi et al
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/Babel[${PYTHON_USEDEP}]
-	>=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
-	dev-python/json5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0.1[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_server-1.8[${PYTHON_USEDEP}]
-	<dev-python/jupyter_server-2[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-# TODO: package autodoc_traits
-#distutils_enable_sphinx docs/source dev-python/pydata-sphinx-theme dev-python/myst_parser
-
-python_prepare_all() {
-	# Do not depend on pytest-cov
-	sed -i -e '/addopts/d' pyproject.toml || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/k5test/Manifest b/dev-python/k5test/Manifest
index 001e22abed67..741d9de34986 100644
--- a/dev-python/k5test/Manifest
+++ b/dev-python/k5test/Manifest
@@ -1,4 +1,3 @@
 DIST k5test-0.10.1.tar.gz 13664 BLAKE2B 4be24a8c9b154f5ec7b83b6743d0f756cb813bdfe4496c6f8ed873a2fc5a725c17b34f7b243d106d7a985aa53351f9bdc354fabba6a8c5fa3d25927513441cb4 SHA512 eaf451f0a932fdb8758f23e17ec52b2c1617074f186dddfba1d9c6844291fb2f4b003e05f4a0e02ce1bae37ee4251ea8295d2ebc8d9002c83d3179000fa4785e
-EBUILD k5test-0.10.1-r1.ebuild 482 BLAKE2B 1dc100ea455e0b2338a963525ff25cf706334db072f4e24289463af2bd0e64e204468b307999ea3915fad865d3682dc6f70ebbe93953807e6a5f1f3f57fab74d SHA512 426463045773ce93d9ff1e7e659978b45486e728bff4d4d17fb094dfe147d35e3edc592c6d0dbcb195236824e28c707c2fe3fd127c320165e3448b42af9d00f5
-EBUILD k5test-0.10.1.ebuild 442 BLAKE2B 40e2b62ff561d427ac51b06c65e71996d3f70cb593fb394274c7c49c98aa1050a14f2ad51f0725558974b70d3efb5d2e9c4a459e3175e34fc44bd120ba495c53 SHA512 0dedd33a5e8156c69caf51ba82f9cdb8cbca70df1547172e67c9c87119d40ed48538e39d562287c734ad7eb4f47346414ae752a01772867c4e66d23f985e0898
+EBUILD k5test-0.10.1-r1.ebuild 479 BLAKE2B 01ae8e651203cf165a4dc7f7a163ce5036a00aaf0d2638533feb7b9353d8c0ff7ca10c86770f2315d21d56a7d8cf41a8ed5ed9b5bbcd6df093a2aeac8d15317c SHA512 de3422fb304b01735cc2d26bd1d6fa44e29e20f1b6475809881abaa17fc6aa56697caf47377efdfe2ef7d2dcba0fbe75c85e93a146e3296414fe66a6811de0e4
 MISC metadata.xml 393 BLAKE2B dc1fec37db82ae2baa97fe324533b9105879142442ac6072b20721dc5233981d726fa56dbefaa0d51b85917ba64110395c2f7c57a9d8e88cb8ecb5bd9d116996 SHA512 b8dd2d38e1d2d95d9fac8a77be33973457a64afc771f3122f161db721b2b1ed71a9e569e498bd85494e498dba340e9a7d3137ea1c239d9ba8d8c19332ebfb1be
diff --git a/dev-python/k5test/k5test-0.10.1-r1.ebuild b/dev-python/k5test/k5test-0.10.1-r1.ebuild
index a255e1aed725..cd681b4fed98 100644
--- a/dev-python/k5test/k5test-0.10.1-r1.ebuild
+++ b/dev-python/k5test/k5test-0.10.1-r1.ebuild
@@ -13,4 +13,4 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
diff --git a/dev-python/k5test/k5test-0.10.1.ebuild b/dev-python/k5test/k5test-0.10.1.ebuild
deleted file mode 100644
index ac58bbff8dda..000000000000
--- a/dev-python/k5test/k5test-0.10.1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Library for testing Python applications in Kerberos 5 environments"
-HOMEPAGE="https://pypi.org/project/k5test/ https://github.com/pythongssapi/k5test"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
diff --git a/dev-python/kaitaistruct/Manifest b/dev-python/kaitaistruct/Manifest
index 6457fd3a6345..e84b8a3fe07f 100644
--- a/dev-python/kaitaistruct/Manifest
+++ b/dev-python/kaitaistruct/Manifest
@@ -1,4 +1,3 @@
 DIST kaitaistruct-0.9.tar.gz 5497 BLAKE2B c3f4dae4269b8bf5102a120aa8792ab710607efd854d01e1239e0269fe696d38183f82a4d93838756d5283cbaa36bd137ddc8b0ea6c91bc474eb89dfba4a76e5 SHA512 4654f18d72f31745f27eed035899231e69f9539a8e8322055b0dd99ad701dbd4d484357d0bc42f5a1953abc6947a90fc5ec9da80aeb862077c175c1295549682
-EBUILD kaitaistruct-0.9-r1.ebuild 391 BLAKE2B aaf2abb67ddf5d4ad5c9a51cb1b04ccaf569860920f056f46fed951cf07f51b2f0428a23d739d85d4b588d537e6aec66f2d07fcebaa59db5b4dfcc51185a0aab SHA512 eaa94f0599779d8619e122c660769f5330424d34cc64ab1ba7c3cc0ec37084946c32db3738ecf5a1bde5486c0502b262ab4c80d4f823009c04b79ebb8c07a5e6
-EBUILD kaitaistruct-0.9.ebuild 352 BLAKE2B 42d08cf0eef556fd31dadb85c12b19bd8cb3d4bb9da2f7274921577acf3561d0dfbf367ba11d223edd7ed3e8f48a31f2efa54a305718412110558b9529708264 SHA512 fff86ab09eb4a6a96a94d3a27e75eda7c61cc49c90391acae40020a3f82e8e2ce2c3aa2190b916a19ae656366333143ec7e98832ec7748ee47e35f5b86f0066c
+EBUILD kaitaistruct-0.9-r1.ebuild 390 BLAKE2B f8b622eb667227fd3ffbba734c9f29480f920ddf10e00753e2bcc1fe0afa7b3a02ed9d35bd6ce9f1a4ae390489f8b79922883560d63dd16a186b7a81b27d2e72 SHA512 67267819325d8ebcf457a40e2974a01fbc122596cb484d7556f24daf47739f72ea9aea0c0cf2d1fa270158be9c809d3c4cac20febb8643148c20a2ff0b4702c5
 MISC metadata.xml 666 BLAKE2B 181ab1c55ef3e407cecb2e140d0a33955f2499a91daf0fbc8856b7faa28a142ab706f05d9eae9ed1043d7d7b148b435f98a4afb635df234559f2996e8f3f75bd SHA512 e29651517b39fc0be833c92edbe1e83d5591c1cbdc0a40019353b82a154c303dd08f87e1d36436ad4ff9c67cda95aec6c6ecaad62bc18d61c949054960d2d764
diff --git a/dev-python/kaitaistruct/kaitaistruct-0.9-r1.ebuild b/dev-python/kaitaistruct/kaitaistruct-0.9-r1.ebuild
index 8445e527c743..6595a568b926 100644
--- a/dev-python/kaitaistruct/kaitaistruct-0.9-r1.ebuild
+++ b/dev-python/kaitaistruct/kaitaistruct-0.9-r1.ebuild
@@ -13,4 +13,4 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv ~x86"
diff --git a/dev-python/kaitaistruct/kaitaistruct-0.9.ebuild b/dev-python/kaitaistruct/kaitaistruct-0.9.ebuild
deleted file mode 100644
index 9a4b488a8388..000000000000
--- a/dev-python/kaitaistruct/kaitaistruct-0.9.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
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Kaitai Struct runtime for Python"
-HOMEPAGE="https://kaitai.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
diff --git a/dev-python/keep/Manifest b/dev-python/keep/Manifest
index 9e1e04cd0008..fe8e03875627 100644
--- a/dev-python/keep/Manifest
+++ b/dev-python/keep/Manifest
@@ -1,4 +1,3 @@
 DIST keep-2.10.1.tar.gz 13044 BLAKE2B 178207ccad7f0feec2d9a57f0e5345e0ef9853bedd3f8efc8afac5f81c35e74ee6d3dab66b75ceeac4a3d76f2297ec645bae61f2f1e78218e910a2537984f4cd SHA512 d4144bd7f6f623b1c9c9468f5596818f47cba8a9bc80e75ebaf75f147823a01da53ef84c76b9f24240a8d0fbdb770c5cdf108c276ecdcd882ac9db0c1608480f
-EBUILD keep-2.10.1-r1.ebuild 614 BLAKE2B 353669c9cca62a9bdff23bc68c2da0e7a9b7ca7c70509bd2946fbf103f2448acea9c54ff632237263c78d447bc0720798558e6723e6c2aab7ffe62b54209b17a SHA512 70b5eb09a9d5ca5acda1b33805c390e53ec31dbf513acfcae072a48f7ebf1b1ba20fd3ce4b2884bd95956f4addc352315cf46b8157b48a997d94c1989ef5eb83
-EBUILD keep-2.10.1.ebuild 624 BLAKE2B 71b63bb00343bdadd30fe67a72e0ba24cb1a98a6aa45a16d86a3050883aff14c8c1c4299276bbc3ee41fdfc8e64f141949be93662fd4b82822d8d7298e7746ad SHA512 2c3561ecb11bca2eda34c78bf2ca927df661db333e9dd28147e2f3b6649688d520059eb8d5d54e2efe9308b38ec5b33446be0e2985b53adc2baf5b9c441dc987
+EBUILD keep-2.10.1-r1.ebuild 612 BLAKE2B d70ad0cdf4e87dcab0619f1a8c3dbf835c3ddb92b2ef26b872d4f4b8c556b2ab6e902da36c96dbc1f51b75ec1819e83567df82e2658cbdfa90d41ff81a68b6c3 SHA512 bd68403cc8c62c88863ed3f310aabaa62dcdb9dc25a1c76429cf8c4c79c7a70b026b89542d405b2e191c3b019b1583d98c405c217b9ad1f2462ee3550f12168d
 MISC metadata.xml 400 BLAKE2B 62327dcf8653077772b2af0a0c3ca33cb4e3ddc06f53803a01a257611ea828ca8536bd2e6b6ed6f0d86010580f590ced0931d09e8cf9aa9a79aff8def238cd43 SHA512 87ed56a0bfb1fc56de91e0b59a1dd0b8ec08b90d5b2746a27195d3a100856bde29dbda8594eb3fb301a64c58f3a9edb0d4a739c96e30e8ac19aebd6b1c8fed2d
diff --git a/dev-python/keep/keep-2.10.1-r1.ebuild b/dev-python/keep/keep-2.10.1-r1.ebuild
index 9087a295ee8e..7f84ecd0cf58 100644
--- a/dev-python/keep/keep-2.10.1-r1.ebuild
+++ b/dev-python/keep/keep-2.10.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/click[${PYTHON_USEDEP}]
diff --git a/dev-python/keep/keep-2.10.1.ebuild b/dev-python/keep/keep-2.10.1.ebuild
deleted file mode 100644
index b6873ec74c68..000000000000
--- a/dev-python/keep/keep-2.10.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
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="Personal shell command keeper and snippets manager"
-HOMEPAGE="https://pypi.org/project/keep/ https://github.com/orkohunter/keep"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/PyGithub[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/terminaltables[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/kiwisolver/Manifest b/dev-python/kiwisolver/Manifest
index 1700bb879d59..dd336db08485 100644
--- a/dev-python/kiwisolver/Manifest
+++ b/dev-python/kiwisolver/Manifest
@@ -1,4 +1,6 @@
 AUX kiwisolver-1.4.2-python311.patch 1274 BLAKE2B 65032d0d5b583e34fa1157d3f519e545aa2639396595c3d36e859fb65cc2bbe3376e9036deec8ae46098771b47ac54b3ac1ec47e864f0b995f84755a883c8640 SHA512 2fadb442179eeab480046b04f03948220d45f85869b275a835535bc2ebe2c784af0c018ed258e8d0e37d4626e8ba82a7e3d2e42d48c54706826c884a831f1c52
 DIST kiwi-1.4.2.tar.gz 91150 BLAKE2B 8441d52267b3b436d9f05baabbd3beafc51d2f257fc982f1cf90b6296ccdbc24511de6b55b6201eb1df37ec9487282cc40142e9083cf4c1e925976a098927e1a SHA512 e7726ac7985bea1020fd3a26bf54b941acfffffb1f47b462c74f9829c5a89e7abd0732b5a11685b20d6a17ac9625178c68ea71052e852f91491a308d07111b01
+DIST kiwi-1.4.3.gh.tar.gz 91238 BLAKE2B bdd6164eb428e6769ae7de2a8e689a3944e13e81aef9a839d9f68459deb7e7c0840b0eb59e70932e5c1d835444c515c8cb66fa47f40d8fc6244de47852be57d6 SHA512 04205555da46e772f2d25a481c4d966dc7bab8a541434a7c183e1b4f41ccd6e06aec564f2a95dae649585d337c1bf818a7cf24727460ad14669a3b3d74c74274
 EBUILD kiwisolver-1.4.2.ebuild 881 BLAKE2B 423841939eefc59e54b1a16dfa6328e2d937fc38aa7c3c151b411b43ea1f2d5475789ce8fb6c294493f3d392aa9a584faba2200d50338f529313492bcd3e6c05 SHA512 592957cbf1aa1304d511b3048a03e4173b3a3149f158efed094408fb90124cc0d83a62f03392fb1c086bab2ce18fced5b24403763d32199aa17e0ddff48a57a0
+EBUILD kiwisolver-1.4.3.ebuild 836 BLAKE2B 2678a31c1f5872704f19caa4094b4eebbf2af8ba83b5272d9146bebac358d20d909ab31bd6bdf0bb4fc6e6a47ed402ac4f769db0f4df968c2fd044ae5a8390ff SHA512 1bb08dd5c11820ea5674b270842a665074334d0439bb10ac17971ec055644e9a41934576ef1cabd14d591c44adeaa79baa61403ab2feb87d129bcc083fe81fcb
 MISC metadata.xml 366 BLAKE2B d724248e9950219de4990e67822a16781e1a28f41d863fde04b3e1212b982a86819636a621b6e23089b76042ebbb23e0944a88ef9ab4c4abe62103f12197e5c2 SHA512 526fe3a81426edfc4c050631133799d948d1becb016319e954491090b9f3f6d410958db7027b5c2e2386b40c783f8c984b2588cda56e3ac58f3d2b1a5a8af0f0
diff --git a/dev-python/kiwisolver/kiwisolver-1.4.3.ebuild b/dev-python/kiwisolver/kiwisolver-1.4.3.ebuild
new file mode 100644
index 000000000000..e95cba1dacff
--- /dev/null
+++ b/dev-python/kiwisolver/kiwisolver-1.4.3.ebuild
@@ -0,0 +1,37 @@
+# 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
+
+MY_P=kiwi-${PV}
+DESCRIPTION="An efficient C++ implementation of the Cassowary constraint solving algorithm"
+HOMEPAGE="https://github.com/nucleic/kiwi/"
+SRC_URI="
+	https://github.com/nucleic/kiwi/archive/${PV}.tar.gz -> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Clear-BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+COMMON_DEPEND="
+	>=dev-python/cppy-1.2.0[${PYTHON_USEDEP}]
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+"
+BDEPEND="
+	${COMMON_DEPEND}
+	>=dev-python/setuptools_scm-3.4.3[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/lazy-object-proxy/Manifest b/dev-python/lazy-object-proxy/Manifest
index 29e70f65b7d8..5fde09b1b30b 100644
--- a/dev-python/lazy-object-proxy/Manifest
+++ b/dev-python/lazy-object-proxy/Manifest
@@ -1,4 +1,4 @@
 DIST lazy-object-proxy-1.7.1.tar.gz 41995 BLAKE2B f3945b3ddc8335be184542e23eb823effe83262a80f048e92441d60bee2ace2f0c9b09fc00a7d356e91a66676361979bc10555dc24ac65e2fdbdfa9ba0cf9e02 SHA512 cf80f2e43795cef09c0a6dde32276d54f5d66a2cf017d3e815868ec9925d989f7256bbf3e416c4445d13e0c9241733029d9a99f2556258f59c2c5267b3c35391
-EBUILD lazy-object-proxy-1.7.1-r1.ebuild 925 BLAKE2B afd74fed39a6863d34d687d525a8039dcbae8b011a04535c60e1b0d45576497ddbc3987dbac5a8a27e975d8f94e499263c965d142579947c51b6c4e3978ba69a SHA512 b1230a8fd890d9ac1d29d05276ee4b8a622acb9b483330dfb3638776ec6733fdcea71f00ef98116810b12c23ce429350d65f249dd23e9307b3414a589ce56ce3
+EBUILD lazy-object-proxy-1.7.1-r1.ebuild 919 BLAKE2B 70d002637db8f86642bd17c22c69b5b2e5b231e8227d4cc461e00838851aed72379a1ea995db99daadd9ecabf2fc9085bab5fc25fe95bc22daa433140fd1f9b1 SHA512 d61d4f5222ac3ed9de187e131f9c868b637966048c661651d2b674873aa795ec13287fadee6c86254f5ee6251b2b2bdc2d6b541b61298e9386ab9903a00984bc
 EBUILD lazy-object-proxy-1.7.1.ebuild 885 BLAKE2B 6ee6c08c880a9c46249615bf15933e497293355f6705d5d62134e213218643fc2d8e16e28995f0a25b867e190cfea6eb15d1f3a4b407745e109736282d948248 SHA512 6948df4c6218533cb90ad5f47d738c39c0d8033a3ac301c357aa8e3a3d278b60c8ca9dc79d8963af8680fb345403076273162059460ac838610eaee42087caf9
 MISC metadata.xml 540 BLAKE2B daf53065c3af28ec7316bab786a7ebfa6890de83bd6434d39052797a1d08d9e7e05fc437fd9994bc437ba0d38dc6ab1cb2e073c2c053fdf55817302800e97b19 SHA512 e66e27df4757f7d13912934551b7fb346d734789f1b0b17e5c875dd5261babf65188bd31966f502be19e953fd9bfd87a64d49ce8e1849b2122a30905d3639e9d
diff --git a/dev-python/lazy-object-proxy/lazy-object-proxy-1.7.1-r1.ebuild b/dev-python/lazy-object-proxy/lazy-object-proxy-1.7.1-r1.ebuild
index 04f81a6d98b8..7702ffb10b01 100644
--- a/dev-python/lazy-object-proxy/lazy-object-proxy-1.7.1-r1.ebuild
+++ b/dev-python/lazy-object-proxy/lazy-object-proxy-1.7.1-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/manuel/Manifest b/dev-python/manuel/Manifest
index 00b26afe73d3..833bc685c9a3 100644
--- a/dev-python/manuel/Manifest
+++ b/dev-python/manuel/Manifest
@@ -1,6 +1,3 @@
-DIST manuel-1.10.1.tar.gz 42142 BLAKE2B 91d23d804b3f5a2c6f696a8c7a8701f09ae6e881ac9a1c76004be301ab77f58596d0bdae4b11f484e495ea581d66d55d5bed05f5b36d81951d35923c8bfc163d SHA512 39376852e2ecb8a19b2f565464e53f475577edf68e89b3d267f94374a444714ed38ef63da638a02dcec2df851869d57c0d256dca4b436b37ff36b6b3a822710b
 DIST manuel-1.11.2.tar.gz 51846 BLAKE2B 0650c9db757a7e8bd0ba12dcdfda8ff071107d460fab7d24715796e477960ebe41375a10cd83a1c7881c76e6fa1e7cdd5cda383be75adffeea7e1cd6d763df13 SHA512 bbfd3ca58ccb0fb40ecbf54a5be0e73989e93ec026b8c686a7ef4e746c650ffed6f2fc5f119fe58e7c13a4a13cacb8c568384a69b1068413ab6bd6f01664a72f
-EBUILD manuel-1.10.1-r1.ebuild 752 BLAKE2B 44a49f6ec888b5fe8ed11a5c566310f2fd3336e92453cf4422958a2e17b929221ede214bca9bbc7b931bd7a7fcc730c4e31abc21f1dda1faf91b317f0a016ec3 SHA512 3e47afbe1e22476e9119fa2e045c76630976feea3e4217922460602ed55ff42d645a7602c355ee520721eb73db45880d0eb02132abf3b704455f861b0c8d42ac
-EBUILD manuel-1.10.1.ebuild 638 BLAKE2B 29b86c1aad17cbf13d4fb4bfa0a165a40c1dd52e681ade2ee7b86be7370f42f9e37c20cb06f524d769ad364ed8b4d02c4b66591952e8f586cddddbe752a2a162 SHA512 484a9c1f6d9ea0b38b8e9402919531625457091a4bd134cd7dbbcf09cf9c22a96a193c6b89f3e743df8b62739ee63d138c4ab422538105bdff2b5cc04eb10bea
-EBUILD manuel-1.11.2.ebuild 755 BLAKE2B bf05a9b5ee5ff19f5ff2c525ca1fa34fcdecd79856d63e3113475c57cb67148d7e440285c1a785e94b6551dc3a380a7363c956b41d3550b590ce82f195c77ea8 SHA512 7dc0738a7aff3bb93915056235e74e6eebfb2055518665cd7a04642a80b344464561559b144ba3d9bb0e8a8a1289c20f330e86dab36bd66d21c10fab1c7d13dd
+EBUILD manuel-1.11.2.ebuild 752 BLAKE2B 44a49f6ec888b5fe8ed11a5c566310f2fd3336e92453cf4422958a2e17b929221ede214bca9bbc7b931bd7a7fcc730c4e31abc21f1dda1faf91b317f0a016ec3 SHA512 3e47afbe1e22476e9119fa2e045c76630976feea3e4217922460602ed55ff42d645a7602c355ee520721eb73db45880d0eb02132abf3b704455f861b0c8d42ac
 MISC metadata.xml 391 BLAKE2B 6b95f9d29d8df2b9f0cfd85012a7d751f443c3bc67f6254c376f8cd3c1c66e2972bc165edc8db6b5ef2851edf3e870cc2ca76d3f6f3c06daeb247ee349407f45 SHA512 ace493867fc08487876a55331b619a62b01e269d7b5307b2ae9e016d75ee9058f2e1354bd2e3243ef1b0cfff30cc3f8f661675e03c1ac07fb805f443b31c64ad
diff --git a/dev-python/manuel/manuel-1.10.1-r1.ebuild b/dev-python/manuel/manuel-1.10.1-r1.ebuild
deleted file mode 100644
index 174420a9eaf2..000000000000
--- a/dev-python/manuel/manuel-1.10.1-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Lets you mix and match traditional doctests with custom test syntax"
-HOMEPAGE="
-	https://github.com/benji-york/manuel/
-	https://pypi.org/project/manuel/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/zope-testing[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests setup.py
-
-src_prepare() {
-	# unused rdep
-	sed -i -e "/'setuptools'/d" setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/manuel/manuel-1.10.1.ebuild b/dev-python/manuel/manuel-1.10.1.ebuild
deleted file mode 100644
index 75e78a5b5b82..000000000000
--- a/dev-python/manuel/manuel-1.10.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Lets you mix and match traditional doctests with custom test syntax"
-HOMEPAGE="https://github.com/benji-york/manuel/ https://pypi.org/project/manuel/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-BDEPEND="test? ( dev-python/zope-testing[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/manuel/manuel-1.11.2.ebuild b/dev-python/manuel/manuel-1.11.2.ebuild
index 300f45e5df0c..174420a9eaf2 100644
--- a/dev-python/manuel/manuel-1.11.2.ebuild
+++ b/dev-python/manuel/manuel-1.11.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/markdown/Manifest b/dev-python/markdown/Manifest
index 68018af95063..8c286e74f8a4 100644
--- a/dev-python/markdown/Manifest
+++ b/dev-python/markdown/Manifest
@@ -1,5 +1,3 @@
-DIST Markdown-3.3.6.tar.gz 323584 BLAKE2B 5d21a6e8c52bd7dcc61c68ddf3f07527d234e15f711beed34ecbd424c7a5a650aba5f5ade7d793095b769c02d66c9c2e4ecc9e398730fbdc6e6aa920fbd0a243 SHA512 7c425470781becae981980a35ef6c609e0c2c76689ba81344607e94d362ae437ac33070c52d2818e90172dc09294185b9ca4eb5f0a50171b55dfac09d634ccb2
 DIST Markdown-3.3.7.tar.gz 324130 BLAKE2B 4ecf804b81181a9895e15d2f54881544648939f2bb772b036aa84dc8bf57b7976c6ebdf8549041b39a303bd7c68c16df3c126463a8da19b3c92f99b420e9ffb9 SHA512 39b9f45939be9e842e90470307c3aeec88d1389439b0c7a0c5b39f6e203b51d3a52ce431c4d5c278f399552c4218fc1a619b0efc56883de50a9f300f42120f4e
-EBUILD markdown-3.3.6.ebuild 983 BLAKE2B ed3f9d4a6f21beca66359ee8c858358b3626e34a5b51693ab62c323c1407305490722fcbf3a7d64f523307a5ba505a11806461d470829c5e96eba798e2a1f66f SHA512 0dee4ad70f6a67575fdea0135d8ffb509721953d6aaaaacb262250eaf504cde96f1900fe6d964bd83c924855af3f456c8b3831e1f2a6cc01197d0f8228acb4c5
-EBUILD markdown-3.3.7.ebuild 1018 BLAKE2B 38156b02909532b8381876db20145da4ddba4d5fca35b3f5cfc3034bd4c4a718392d5b687a94b82f9c1c857bb51c04c6076e9ac1bb6fc4436ee7a8f3967c0439 SHA512 32797574d86172fc0efdf8c41de90c3e011b73376de0a682fe72b5359d6a16a8d8a1ac2fef2b5d109140317a06067ef713a7faa4764e0ba934470b92dfead01c
+EBUILD markdown-3.3.7.ebuild 1010 BLAKE2B 04abb0f2d38eedacf1af71cf3d508e3ef0bc08d4505c86c677fc6a40d0a56c7abd3c0c568b277142af767b63ea91807403bd96dbd37b60cda9aae32b2392a0c7 SHA512 ddc5fc1148d82715ae083992d8d3f15ad514b9ff1515660bda5725d8594c42baf6543d1b76c5e6126601fc4cd0b7251ed8719e28a77d814cdefdc4c098c411fe
 MISC metadata.xml 400 BLAKE2B 325197e9e700565d94ac477c4acefb1ccad5fea759bcb9bb980122f2a8fd0b7509fbf54768948b28a180392154d26d9a9068b996661a35ec79bb03998ae538f5 SHA512 68bb4ebfe231af6e30c3f8a9fafdab8f1b90fb67d942605d0366bfe504de0ae482da8c4e45279cf7bfae857ed9ccb0729a36f6ea1b18bd459e0dc3e1e3a9f6bf
diff --git a/dev-python/markdown/markdown-3.3.6.ebuild b/dev-python/markdown/markdown-3.3.6.ebuild
deleted file mode 100644
index 4f161f58b702..000000000000
--- a/dev-python/markdown/markdown-3.3.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of the markdown markup language"
-HOMEPAGE="
-	https://python-markdown.github.io/
-	https://pypi.org/project/Markdown/
-	https://github.com/Python-Markdown/markdown"
-SRC_URI="mirror://pypi/M/${PN^}/${P^}.tar.gz"
-S="${WORKDIR}/${P^}"
-
-LICENSE="BSD"
-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"
-IUSE="doc"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' python3_{8,9} pypy3)"
-BDEPEND="
-	test? (
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/pytidylib[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	use doc && dodoc -r docs/
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/markdown/markdown-3.3.7.ebuild b/dev-python/markdown/markdown-3.3.7.ebuild
index 80d3ecb64f9a..ab927ec51b5c 100644
--- a/dev-python/markdown/markdown-3.3.7.ebuild
+++ b/dev-python/markdown/markdown-3.3.7.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P^}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/marshmallow/Manifest b/dev-python/marshmallow/Manifest
index bc9cb91948f9..f4dd6d9fc6ee 100644
--- a/dev-python/marshmallow/Manifest
+++ b/dev-python/marshmallow/Manifest
@@ -1,5 +1,3 @@
-DIST marshmallow-3.15.0.tar.gz 179483 BLAKE2B 5cd660f4b1bf3ffb775e06659adce2f0da8bf46bd5376eb4407793925de60fce48ac633baced399314d9cef1faaf00f2643e56404cdc2c44e51b5b0c42ab533d SHA512 9d688466b9dfce7cd3307538aadb68c8297d3ee026a7a61953d361a9e52acafd00da81f48ab26771dba74bf8024117d53292763ab98cb78e2bbd7b5604bee4f1
 DIST marshmallow-3.16.0.tar.gz 180106 BLAKE2B c3d9b9c1645e7df103940b8e637f3de027f23e5da4a6ebd25412fef9d2d61483ec934af5c37f781121928a7b2f98b44793a8671173a5c548936ce0bbd0d2290d SHA512 5d3c7babff9117261afb902090bffcdba4eee2984d13862f4974fc043c6e56420707a6d3aba4a6046d947ef9414386c24895fc9a2538e36e505692e76d70f409
-EBUILD marshmallow-3.15.0.ebuild 680 BLAKE2B 91ca8eda12e9cd00c5624a134139922f09b1533aae29e7d7c9a5863d8e113aa689e4b4fc802ae53dc10aee72644cc6ab8a9525c59c2a6416a6e376bffb060764 SHA512 6a81faca248de16f1723c11df27e3cc6d66fa39dc960341cfe6d1e384b00c40e657f5e6a44f3295b38dff20d82bf35e5d6641b332e0efda841162840a019bb93
 EBUILD marshmallow-3.16.0.ebuild 687 BLAKE2B da59e69f7fe2a95e6d582589da2c1b1cc2791761e0f08a78312a2aff1cf34ff8a3ca5e64235bec0a780e6adede7137a34690a2c36c8cde0740cec6aa19366dd5 SHA512 63fc50025e89c1f9e455e094dd08556b35149cca8f61d6bed612f4a52a4c50fd638871741d15a13352eab250a30182ff3d9896f210d9709133896a176dbcbdac
 MISC metadata.xml 462 BLAKE2B 8092c0a0e4a28fdedd16131788e41c7133a7d114b6603c859a7b75a3e2c1519e51450c6ecd8b8bb42b16feee2b187d61a3241c4af6a4decebe85cd011944271d SHA512 bc243259fe7e0cf4892a8e9d5bc9792cdf9166400e6c5a2bb00dda58a1a4eae672c9b5c9723ba662f583bf47b994134943d6879141472e9ca4395d8700649997
diff --git a/dev-python/marshmallow/marshmallow-3.15.0.ebuild b/dev-python/marshmallow/marshmallow-3.15.0.ebuild
deleted file mode 100644
index f26c074cbd82..000000000000
--- a/dev-python/marshmallow/marshmallow-3.15.0.ebuild
+++ /dev/null
@@ -1,30 +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 library for converting to and from native Python datatypes"
-HOMEPAGE="https://github.com/marshmallow-code/marshmallow/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/metakernel/Manifest b/dev-python/metakernel/Manifest
index d8d3904530e1..134d46265390 100644
--- a/dev-python/metakernel/Manifest
+++ b/dev-python/metakernel/Manifest
@@ -1,6 +1,4 @@
 AUX metakernel-0.25.0-disable-brittle-tests.patch 762 BLAKE2B 440f29b4566beac51b5428e691c0fc6dfb13c2b3912486956589f414c44ad07ecb7ad23b5ef4b5e160bee15205c7b68b327c3bf612b81cda2a73fd51968ba83a SHA512 475829494bd4cc20b994f69428228a2d12a3a1b004e72be50ac5e2d746e37f9ae6203fe776e63a96e4d673bfdba814ca1ae1dc609392a4e346648a5b1471d314
-DIST metakernel-0.28.2.tar.gz 197302 BLAKE2B 86d4464a8d796273aa831665fa7ecfcf7ed180fdb7d40448d9f3c84b96aa0baf36d8dd5771f702520b44786a1f3b031531430fb3c4687fbf498851817bfeb33e SHA512 5e41dbf5b3bc1121e2d2ba4a60cf3e2bd52c6c19f0965442115e241b1a261f441b01b29e5771539a9ef53a4fd421c58e8ac45296112e58c3a71e93a1e918cb17
 DIST metakernel-0.29.0.tar.gz 197295 BLAKE2B 486c57b3d0c4c41aa73c129cceccebbf818a4932beb35f5114723e43e37f496d04df50d3cfd09b7d4c254f5dea02d1c7b43f9f6e9c9e7af8e946fd79179a892b SHA512 0748663e79776680f9c52cbc4b0ee76f33ece0a489740068d60455c5003ff27e3fbe8f8c1f0f51ffe9448dbf32109e7d15e8d851198e1947d638fe91dfb4e39c
-EBUILD metakernel-0.28.2-r1.ebuild 822 BLAKE2B 5b91da4a69f58d03550f50344ae03002dac2e22bbd72fb19ef9083dba64de012bd02caf3ebc9642725df329fc4e2a01f3279015ab83fceae23f479c90c060ed3 SHA512 5ddcce76f6ca3b82fd561653bd15574d452184642bb1410ac62198956ec536d092f7272301f6a83409b9d84250ac570e248a6398d761c3f2de00e0291a2c5fff
 EBUILD metakernel-0.29.0.ebuild 863 BLAKE2B be8491354e3632d786060813de5f3a8ee0ee34cdc529ccbf57f6736c2195b8999a1dbdfbb03fe0da430145c6200f15cb13bfb1eaac5a5d9a5d20446acec3aee4 SHA512 04ac387af15e33b725ee7d9017d9b3eb79a8f7b6d687ba3c5806b7b1a7e4d96f73f10f23e348ff314f04eba71c4501b9a0ea56e4e1a03e5149d4b0edb6adb894
 MISC metadata.xml 635 BLAKE2B 3f108898788d2cd20d5638feaed2cb9ecc32db4350f8ee5996c7d3724b304fae040cc4c9ec20d9c7fde8041bad1ff1ab79106adbd17fe57722daa7f191eb2dbf SHA512 d84bd755109e0d4b45a2e8dec6b7ed2a5ac9dbcbe9fc8453c599969c06dc3d4e7a9001382e37d1e7c2d0fec940cf636b29ebd7e6a2ea7aa2f1420d20a4194e1e
diff --git a/dev-python/metakernel/metakernel-0.28.2-r1.ebuild b/dev-python/metakernel/metakernel-0.28.2-r1.ebuild
deleted file mode 100644
index f15f9a247ea6..000000000000
--- a/dev-python/metakernel/metakernel-0.28.2-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Metakernel for Jupyter"
-HOMEPAGE="https://github.com/Calysto/metakernel"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	>=dev-python/pexpect-4.2[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-PATCHES=( "${FILESDIR}"/${PN}-0.25.0-disable-brittle-tests.patch )
-
-python_prepare_all() {
-	# cannot import name 'MetaKernelPython' from 'metakernel_python' (unknown location)
-	rm generate_help.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/mkautodoc/Manifest b/dev-python/mkautodoc/Manifest
index 6173dde4b40d..096207dd8e12 100644
--- a/dev-python/mkautodoc/Manifest
+++ b/dev-python/mkautodoc/Manifest
@@ -1,4 +1,3 @@
 DIST mkautodoc-0.1.0.tar.gz 5654 BLAKE2B c0ae754e800ea25e9cccc621b4fd5c8d1561c57808b301ac5a3036ca18fda1adc432006e13b777a83dcc2cd6960a34745e17dfbcbbda24098902198d4fc9d743 SHA512 7ccb0a03016e2984d88d78eca2a8ee01e2153ff574c912358640c158b2084e3c365ace0fdb89cb74bb1950c68775d9d3cb11201cbf3c6d136dc7886a3294dc89
 EBUILD mkautodoc-0.1.0-r1.ebuild 711 BLAKE2B 63a80be760fa044836598ce7f8302cd1b0df3c9e2e6e61095083df33a30de0f8c2e65f0688599b03820a4634da0aad2ef1e27741982ad6e7006f323c4e60cde0 SHA512 85e5b11be1c5dfadc160261040cd7a741869566e8108c41b342ed5cae6ce68ebafbf8c65ad58eb4e7ff792629fbcc0cf638f850f8aa4a22cbe778cd3b34f4fe7
-EBUILD mkautodoc-0.1.0.ebuild 605 BLAKE2B cfc9f5ab3c8c01e45fecadd39b05adeb8868d61a42ce83068bc771800b0be17a7583be42f41e0238f2484cb6a329dca587b19bb7f569966b76b5abf8223b84a0 SHA512 6a44b800e8718310d30c0330b722aed3a3e82f1ecaaf07dda0a7d1b7231560c6939945d80d8f25bad2031927fa5f9017f3ca6b36febd84c3dcd7da4bbfb66854
 MISC metadata.xml 517 BLAKE2B 982eb0e73c28e8565ebcd08f9822e5d35258e8cb1f44b57a3218b928c6d9873b1d5ae8890d4688ca4775806aa140c3be3ba52c9af8afe87f7ba2e89ae09c1e97 SHA512 640db2d746a27484dcdbd4d84951dd207a0ec6ce9047346432fddc1b08ad98f19077d320c603a85297161c8202dd1c5328486280c343987976a3108667978a51
diff --git a/dev-python/mkautodoc/mkautodoc-0.1.0.ebuild b/dev-python/mkautodoc/mkautodoc-0.1.0.ebuild
deleted file mode 100644
index 228c3dfefd11..000000000000
--- a/dev-python/mkautodoc/mkautodoc-0.1.0.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
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Auto documentation for MkDocs"
-HOMEPAGE="
-	https://github.com/tomchristie/mkautodoc/
-	https://pypi.org/project/mkautodoc/
-"
-SRC_URI="https://github.com/tomchristie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/markdown[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
-	PYTHONPATH="${WORKDIR}/${P}/tests/mocklib:${WORKDIR}/${P}"
-	epytest
-}
diff --git a/dev-python/munkres/Manifest b/dev-python/munkres/Manifest
index b78806b2b07e..ff0b7f9f21f3 100644
--- a/dev-python/munkres/Manifest
+++ b/dev-python/munkres/Manifest
@@ -1,4 +1,3 @@
 DIST munkres-1.1.4.tar.gz 13777 BLAKE2B d783ac7a4fd55826ef3ddddd2ba82cf0499727e605a2414491af7dd9080193c53f1e48ed17dba9a462578bc958d3d9e2e1e413408143b4cfd0305f9cb3b6c517 SHA512 24ae7d04f4a6fe52f7bb9dc79bbee3e33425b85813382e2634e106a5d26d2d728ba8d34fab9390b7c3d651bc0e95214dcf9c94ac436636cd5b487a054b5a2c54
 EBUILD munkres-1.1.4-r1.ebuild 561 BLAKE2B 8eece822518f684a7c246f86f333a79f10e100ef4399b20cb3727a0eb8487cfb20e2fcab8e83590e110a845ac325ec2a285e615df59fb3911db542b6b29c7ff7 SHA512 a769a2a1100d9a128b21d240c1e83aaeb954bdbcd3fd0858adf76f28b11c8f2ca90d34c90fef2195f3b7075f47ec72ad3f38e09605908a3d2a6f9c8d0a2453f7
-EBUILD munkres-1.1.4.ebuild 529 BLAKE2B 3b5502867f9c43f3e9d5d5d3182623266ab59755af6d53fba3716d271bb60238b43fe807faf86185fa7ebe92e837be59de2944378fca7f44fa41104f28804814 SHA512 10fa2274a450f4d14dadd939463600098e9389d826bcc2ed8d679b16ed15acf7a333cc7eb67c5fc9862a663a01b814428492ef0572c83732e8b74bd496b94194
 MISC metadata.xml 772 BLAKE2B 476197b5218d2e1b000c16be048dd1ef56b605a93978468b0fc95500032102497777021803c5b6db546ee433aa4b5d1f02f232384a0e4665cea4d2a5b0cf1230 SHA512 5b433e5ab0c97c69680da925ed03362fdbb40ab74c5d8cb851f5b4c3b66f50f9de066657024b230d4d0d8274c6dd1035502b375581ae595c2032f3537035a8a1
diff --git a/dev-python/munkres/munkres-1.1.4.ebuild b/dev-python/munkres/munkres-1.1.4.ebuild
deleted file mode 100644
index 60083d981c89..000000000000
--- a/dev-python/munkres/munkres-1.1.4.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Module implementing munkres algorithm for the Assignment Problem"
-HOMEPAGE="https://pypi.org/project/munkres/ https://github.com/bmc/munkres"
-SRC_URI="https://github.com/bmc/munkres/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-release-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/nbdime/Manifest b/dev-python/nbdime/Manifest
index 58f80d7d6ad9..cf76418b91b3 100644
--- a/dev-python/nbdime/Manifest
+++ b/dev-python/nbdime/Manifest
@@ -1,4 +1,3 @@
 DIST nbdime-3.1.1.tar.gz 7723671 BLAKE2B 2a8f0e7281e1830d6ab15bcc25c1be69e37b575e4ecde1f61f5d697be8cf556c7e3bfdf11375f47808aa812bebbbaf4bfacaa121c17fefb9cc8a80ba9ca08d1c SHA512 268c2c3f8c45dd4a55a632d55a817ee4a4283c5411b73915bb514a9b546ebcdebd7481e93a1e7ba66c30bcdc70932ba7af83de454d3d0ab9d2cfa24bc19c8d9f
 EBUILD nbdime-3.1.1-r1.ebuild 2499 BLAKE2B 9ebb9d97322c53790c3c9fa4b4937a9aa63e1c7db80e418068d590ca0667b2cf049962bf0306001a3e02bee4623cae4b98b4c782c974ea8a66ef76689aff1779 SHA512 5b7160b79311b47727ededfee63b4bcb31fc6a62372f7acbe7e2af4061755db7677bb56ee75eee09456bd5715041aff7a6b9dff04b6fd2f00a8cf90a18fe5830
-EBUILD nbdime-3.1.1.ebuild 2508 BLAKE2B 41aacea8bdbdbe4304f9cc9fcb52fe354087901f36771c431e73b8cd870b4d1ce9505ba00b5550a1741583d5105d23d3cb300c3f04b1190643ce4e5204752617 SHA512 ab48eccca7e1a364b4ae9640ada07252952f8ebe8f28c2c5d256a9c918f13c2631b90e0d0838e59daa115bfaed7aab50a9d2a0b359a84c0a210353da36038ad2
 MISC metadata.xml 514 BLAKE2B c3062055cb710079162f879e3a7ca9cc1009946eba2e3d09f5cdfeb9f3bccbc12a9c6fe86d84f80d88b07eb17d03b55f8d1c6770b97c7a760015e4466e6fa531 SHA512 069589261da9b38841c363712255d55e2203c55af94ce62c3640a90139b6d260d2f1ba6475b9c0264b8c4530207cdb17983ebb2f67565fef9fce891603c1d3a3
diff --git a/dev-python/nbdime/nbdime-3.1.1.ebuild b/dev-python/nbdime/nbdime-3.1.1.ebuild
deleted file mode 100644
index aff1fcbbdd00..000000000000
--- a/dev-python/nbdime/nbdime-3.1.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Diff and merge of Jupyter Notebooks"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="webtools"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/GitPython[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/jupyter_server[${PYTHON_USEDEP}]
-	dev-python/jupyter_server_mathjax[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
-	webtools? ( net-libs/nodejs[npm] )"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/notebook[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/tabulate[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs/source \
-		dev-python/recommonmark \
-		dev-python/sphinx_rtd_theme
-distutils_enable_tests --install pytest
-
-python_prepare_all() {
-	# yield tests were removed in pytest 4.0
-	sed -i -e 's/test_offline_mathjax/_&/' \
-		-e 's/test_api_merge/_&/' \
-		-e 's/test_fetch_merge/_&/' \
-		-e 's/test_api_diff/_&/' \
-		-e 's/test_fetch_diff/_&/' \
-		nbdime/tests/test_web.py || die
-	sed -i -e 's/test_git_difftool/_&/' \
-		nbdime/tests/test_server_extension.py || die
-	# reason: [NOTRUN] flaws in deep diffing of lists, not identifying almost equal sublists
-	sed -i -e 's/test_deep_merge_lists_delete_no_conflict__currently_expected_failures/_&/' \
-		nbdime/tests/test_merge.py || die
-	sed -i -e 's/test_diff_to_json_patch/_&/' \
-		nbdime/tests/test_diff_json_conversion.py || die
-	sed -i -e 's/test_build_diffs_unsorted/_&/' \
-		nbdime/tests/test_decision_tools.py || die
-	sed -i -e 's/test_merge_multiline_cell_source_conflict/_&/' \
-		-e 's/test_merge_interleave_cell_add_remove/_&/' \
-		-e 's/test_merge_conflicts_get_diff_indices_shifted/_&/' \
-		-e 's/test_merge_inserts_within_deleted_range/_&/' \
-		nbdime/tests/test_merge_notebooks.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	use webtools || DISTUTILS_ARGS=( --skip-npm )
-}
-
-src_test() {
-	# user.email and user.name are not configured in the sandbox
-	git config --global user.email "larry@gentoo.org" || die
-	git config --global user.name "Larry the Cow" || die
-	python_foreach_impl python_test
-}
diff --git a/dev-python/neovim-remote/Manifest b/dev-python/neovim-remote/Manifest
index 67669eefbb4b..ef96ad95e063 100644
--- a/dev-python/neovim-remote/Manifest
+++ b/dev-python/neovim-remote/Manifest
@@ -1,6 +1,4 @@
-DIST neovim-remote-2.5.0.gh.tar.gz 439382 BLAKE2B b37317362b13dcb796d6a6ca0bd16b99b48154d9615af162d3da3898b080bbd87ae4624c37240498d73b92522a32a732cfc75ce8f69e172c97dd837b0965748e SHA512 872ad20f947a5ac99a1a91b925e1daa59e0c4ed6b7dbe9fede806dae2c3f1f5bc8bd660ba58513c41e402d39e2ad15d5f499d57e13782af7d10d8390a2737ea3
 DIST neovim-remote-2.5.1.gh.tar.gz 439548 BLAKE2B b57ddc0b8b432b65864bb560412684e6967db08ed09e1e7fe7294ba24d0d0aeb377f0f6fa38f4b0de44d5ea6bcc796ca2b8a491dda26eab870deab37f3608c59 SHA512 2d3c921485b18a9538f82b3a057834bdec5d8568a84528afaf52d73a69b60cf1eb6dee33f50a10d961fc0985c7a7d262a4edfc9f26f3ffd5d945472855fe3121
-EBUILD neovim-remote-2.5.0.ebuild 762 BLAKE2B 3de34d8b5b790a5e705b4e14b7d905dc3a030aa188c0a6dc3d2ee92288bc7c8782eee36e12ba83a9010173a0829244b86e3ec6cb58810b673aaa736cd60fa271 SHA512 0b28877d745f8bcaaf41716c488448ffadb260b7e9e8f8e2a99274dbe073479cd8f267f2219601475ba04a77d3b92636b2012712a4a6632429f97342f1502764
 EBUILD neovim-remote-2.5.1.ebuild 762 BLAKE2B 3de34d8b5b790a5e705b4e14b7d905dc3a030aa188c0a6dc3d2ee92288bc7c8782eee36e12ba83a9010173a0829244b86e3ec6cb58810b673aaa736cd60fa271 SHA512 0b28877d745f8bcaaf41716c488448ffadb260b7e9e8f8e2a99274dbe073479cd8f267f2219601475ba04a77d3b92636b2012712a4a6632429f97342f1502764
 EBUILD neovim-remote-9999.ebuild 762 BLAKE2B 3de34d8b5b790a5e705b4e14b7d905dc3a030aa188c0a6dc3d2ee92288bc7c8782eee36e12ba83a9010173a0829244b86e3ec6cb58810b673aaa736cd60fa271 SHA512 0b28877d745f8bcaaf41716c488448ffadb260b7e9e8f8e2a99274dbe073479cd8f267f2219601475ba04a77d3b92636b2012712a4a6632429f97342f1502764
 MISC metadata.xml 569 BLAKE2B 65fd5db847539e9169fe09bdd4dc33b79504004bd8b76f01a896cf791032a507698b4d799381826aa613fb64f9dc6224d6ce7af4be258c673477f60a64f466d5 SHA512 0d33ba138f652df7f84e4196e514af5a8d64be9acc6f809f0cc7c18585e10abfa981f1c6dffcc7602626c35913a6f194e99f2cb57217bcedd64e444dae0414cb
diff --git a/dev-python/neovim-remote/neovim-remote-2.5.0.ebuild b/dev-python/neovim-remote/neovim-remote-2.5.0.ebuild
deleted file mode 100644
index a7036334d63e..000000000000
--- a/dev-python/neovim-remote/neovim-remote-2.5.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mhinz/${PN}.git"
-else
-	SRC_URI="
-		https://github.com/mhinz/${PN}/archive/v${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-DESCRIPTION="A tool that helps control neovim processes"
-HOMEPAGE="
-	https://github.com/mhinz/neovim-remote/
-	https://pypi.org/project/neovim-remote/
-"
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	dev-python/pynvim[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		app-editors/neovim
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest
index 001fc76edcba..b86b2367114c 100644
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@@ -1,9 +1,11 @@
 DIST networkx-2.8.1.tar.gz 1945388 BLAKE2B 5c7ee6826f952d6f834d88ab0ba82d11d8a171611f43750d8d64ca6adf428fb64e8c37ca9c03654941c6d67eb8b68710e4e923f008c99d724ad47d42c31dc75d SHA512 a85b6be14aabb4f4d5317f65fca1d681d93bb6defdb81c4fe59b06e9632816adaa322ae7e8f2277a78290f0ac6260438b503c79d4cbb39fcd37562e8325d89d3
 DIST networkx-2.8.2.tar.gz 1945873 BLAKE2B 212f42d8da35bb7c29b6feae626bb21036807e26996ff663dbb22b54908448715cbf6509553e2379a208b4537f03c92a3183a74a8074f4d2edae9b97084e5a8b SHA512 5b1ca05a009f78d693f8dfedaa51650d7834e4870d1a08fd8ea27f1293cbaccd9b4a2fb5d146df491e8dfcda1ca538786b257fb9b1250a383c59ea2b54188f55
 DIST networkx-2.8.3.tar.gz 1947042 BLAKE2B a9d098023df1db6c94d531eba8797348d81b7cd52e22bbd421109be2e604b599de3a9a30c847682b53ce395ecc0522351db5f2f21b194be5ebd05c42d751a43c SHA512 1bcf606868f7041c1f412c0d853779c99f74be675b11b32727d502b78f8a672872291addfc7c8cba6bc7f464c2306a412862063e141853ab91999d2c54315214
+DIST networkx-2.8.4.tar.gz 1951336 BLAKE2B f45708eb8a642ee2561caf6b82b8947cc0ed8a90e22ff3424c54db728f6ab91bbaf78c62da113d02325c8f56418690386143c74f2098c670fe102c4e5ec78b9d SHA512 3f874e08a55d924905506fabdba1540745f7a1a99745531b49442206b6cac9b911674441d2241bc2c3e8c173635d53f2e5677fe76936630236ffb3fa021b2f9a
 DIST networkx-2.8.tar.gz 1937426 BLAKE2B 5a094177ed480c6f7cbdacb6795fc4f2e0aec53ed89a33e19d78f47830d46238f35b7cd76098f6e00397f7cbdf305256910b7930cbb2c775ed4c2b18d9bd596f SHA512 72cd6637faa4228f6c802cf36935b5460fdf9b6cf191c3b375810bfc3732823e3286bdc1e6cbf7e6a7ffde83d0cf3bca157ae27ff98c537d43fdb4b8ef45ef4b
 EBUILD networkx-2.8.1.ebuild 1503 BLAKE2B 396ccb77f74668d862190b5c731b3bcdf401fce822d2790d33612f0f58912b08a64b1774a464d7f6a6a0805f57717a4cad41890d431107d1afd9fda1ae7790f8 SHA512 3c3f40b5c28ebedb88d3d42073df17362d2904eb8c1d3f7914899ef5719156f5c6d3dc9b7341c0ea63efb16a88d056e061e10e51751e99ebff1634d7b17bdc83
 EBUILD networkx-2.8.2.ebuild 1689 BLAKE2B df9e7e219d679b2aa22bd32b19c739aad52dab50c98e3fc30544af104254292e8c06697ca6f4ed8c1f2cd849bbb31dc1bae4cd1d68e6a7a5851ae681ca17f41b SHA512 df24ab92224ddcf268535e0c966c8f5febbb53ae661e6239b287e0c3046eea26f78f8cb1eb763db2c2815562257f09e75b388e576c91f630f6045ab3dd5acf29
 EBUILD networkx-2.8.3.ebuild 2008 BLAKE2B fd4d69762205882f3fb2bcaf6eb6228ea35debbf9ffcba0c1ed4ddff0f1d63c88ff70cbbf3b0b6d6b8164d539ce474f81a00b80526a338b6a56582c55cd24cb9 SHA512 0dd3d93457396af4d11721ab33a883a972909b865b87de821baf6b5e0bdadc926ff1ab5de5d58071f0e98e59e6ee77134038cdf0f12e5caa30a524a234449669
+EBUILD networkx-2.8.4.ebuild 1707 BLAKE2B e465232ad11921ebe043d19d27ab8fbaf452279873a6ea90c6743ea6ef444f5c74883f3ef90e401ee213dfa84e4739a7d08dadebede757be5e9660da3b35686f SHA512 845ef10696e1c16a758273ea97595fb11c50c0e6939b9b4520ca18760e343bb3711a22c3e057973196aa2fa540d2f27003122358b535479ccd53304a41a04666
 EBUILD networkx-2.8.ebuild 1376 BLAKE2B 13d08bc22d59a9fea07dc7bb14480057aade434b8d524a7dda61abf43c1d3bb593c67f1e392dd0a50dc296a33d040a314d6d48455a114a6fdebd08ba1ffcac81 SHA512 9f60e67f901a1bc3bb3382a96bad746e7b16f813acb030caadea2c3016bbc0fce3c6f5a5296ff24e0cb3663bc0fb85ea2072d401fde6ed52f1ca833239ce7000
 MISC metadata.xml 1088 BLAKE2B 407d24ca890c5b2a7c49e5eab7f79477f66cb140ed286a7d0c65be075714c671c0185b067f7ced6e9a1cdc17361cfbeb406c306dafb915590abf6b5b1263a4a4 SHA512 2a790d427d6c4391d409f767359a256ee5b8082246811c82949b898e0a2a9f23e7c40bb045ff5eaf17f3cee04d7d24adcdf1ff0ae416ebd7b2572cfdcf04064f
diff --git a/dev-python/networkx/networkx-2.8.4.ebuild b/dev-python/networkx/networkx-2.8.4.ebuild
new file mode 100644
index 000000000000..504ab461ddb9
--- /dev/null
+++ b/dev-python/networkx/networkx-2.8.4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_FULLY_TESTED=( python3_{8..10} )
+# networkx skips tests w/ missing deps and the available ones all pass w/ py3.11
+PYTHON_COMPAT=( "${PYTHON_FULLY_TESTED[@]}" python3_11 )
+inherit distutils-r1 optfeature virtualx
+
+DESCRIPTION="Python tools to manipulate graphs and complex networks"
+HOMEPAGE="
+	https://networkx.org/
+	https://github.com/networkx/networkx/
+	https://pypi.org/project/networkx/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+BDEPEND="
+	test? (
+		>=dev-python/lxml-4.5[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/numpy-1.19[${PYTHON_USEDEP}]
+			>=dev-python/scipy-1.6.2[${PYTHON_USEDEP}]
+		' "${PYTHON_FULLY_TESTED[@]}")
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	# virtx implies nonfatal
+	nonfatal epytest -p no:django || die
+}
+
+src_install() {
+	distutils-r1_src_install
+	# those examples use various assets and pre-compressed files
+	docompress -x /usr/share/doc/${PF}/examples
+}
+
+pkg_postinst() {
+	optfeature "recommended dependencies" "dev-python/matplotlib dev-python/numpy dev-python/pandas dev-python/scipy"
+	optfeature "graph drawing and graph layout algorithms" "dev-python/pygraphviz dev-python/pydot"
+	optfeature "YAML format reading and writing" "dev-python/pyyaml"
+	optfeature "shapefile format reading and writing" "dev-python/gdal"
+	optfeature "GraphML XML format" "dev-python/lxml"
+}
diff --git a/dev-python/nuitka/Manifest b/dev-python/nuitka/Manifest
index d19998808e22..62437f5c83ce 100644
--- a/dev-python/nuitka/Manifest
+++ b/dev-python/nuitka/Manifest
@@ -1,13 +1,3 @@
-DIST Nuitka-0.7.7.tar.gz 3785340 BLAKE2B e856bcb3ecf69ecaa447ea73219f544bfceae8ee3a480fbd13b0a763efb8c8ec3c856a6142cff6a91273a88fc0aec15a6bb6c28fab1d9ca0c4dfeca229c11b68 SHA512 124e2d405b1104d0ba42a69b20a5c6168bb0643a13a4de789279401e09c30091853a8e464d9c4877a01f93a5a63934617cf52678994d0ae179560cd21d5b196e
-DIST Nuitka-0.8.1.tar.gz 3831036 BLAKE2B 3215344e0d46da8bee8a9c3246d2a6a8be86882a446f4e6d84ad924db821c051cd7d428f3e5372af69049e36ffc4a5b0e812f2ae3ea311b2759fbe42f87e2d6d SHA512 69c84d962ec03fb8dbd086c50076f656a99563985cc1750fcb0aebfde50ed68e6982ce2b0f2c3ce84151e9ea2d0cd679370a52c1f1dd0b8f943fc5f5938f9e15
-DIST Nuitka-0.8.2.tar.gz 3828013 BLAKE2B b5f3b59ea641714a9e437b29dc4b8db6b9f9c09d9b326b5eccc8e302bc5d205e561069c353c337ebd0d81434338244ae27caffb0e246ace0e809ebed0ae28e45 SHA512 7156745a83c9fd18a9564883e8ed7972002b19026d790b864a1383e8a131eb2adf271f403190909e2586ea3a7eb2d28bc3e469770fbae0d392617b26b3e63d25
-DIST Nuitka-0.8.3.tar.gz 3826774 BLAKE2B addc91ea87dfc2bc8cef5fe4f1285935c9f09cf8e3d88900fce004c4c5e83a0c3052c8848e61f2160ea12136860849c907d80930e0589a6ab5195c586102817a SHA512 0f0b648eaff3e7d8d2af5f554a7b2e7970aa01036e5299ee2b72e85529d70750bf54f78dc8fa5cd7dcfa77e15b578cefa2586b71401fb8b20331db418afdef24
 DIST Nuitka-0.8.4.tar.gz 3828278 BLAKE2B dbd6abb945f66ab6a5a359b8370fd3d5d36fbdc2c232b5002356f59ffbfa531180b96467b67a2edbb7a779c75ebe58789e9ae0ff806b5649eea4a5b7d9c0934c SHA512 683918e60f2f65d22911f894c2e4fedeafd9d0ef0cacd48bb66422fa2077f225c7c861186b83b9c0fd50eb965b956a1b26342249b3db2af599250c16fe84a152
-DIST Nuitka-0.8.tar.gz 3829530 BLAKE2B 051be63639e491fb26e7ef36b7e034715d0dd0e39417b59c30b0c5628e78d6c655978a2198d7192b431f176a24060fa899fb9c17ff6dc02fedb64865ad37af5a SHA512 f4eef21a32b68d52363ede1f68afa0247bf61a142fc86763f28805ca3a611195bb87bd1229a31a4d0ce47bbae7f70cc18580ebab528772f0908f122d8341bc6c
-EBUILD nuitka-0.7.7.ebuild 1140 BLAKE2B 0f839fb78068157dccbf22121b2ecceb056e1462a5f7c8ce7c7d28116e390ec618b02f42f8f67dbaf3b345f04d519b0214bbdbdfe03b8c0e7594366a7a6911ea SHA512 ecbf3874813e37fd078cd5900a53b28e4686ab913b00867a0817ebeb7ea21f2c9d9fa712993ae7fc8eb26d9e31d375bff729135b432693700ce4e31fe42e631f
-EBUILD nuitka-0.8.1.ebuild 1140 BLAKE2B 0f839fb78068157dccbf22121b2ecceb056e1462a5f7c8ce7c7d28116e390ec618b02f42f8f67dbaf3b345f04d519b0214bbdbdfe03b8c0e7594366a7a6911ea SHA512 ecbf3874813e37fd078cd5900a53b28e4686ab913b00867a0817ebeb7ea21f2c9d9fa712993ae7fc8eb26d9e31d375bff729135b432693700ce4e31fe42e631f
-EBUILD nuitka-0.8.2.ebuild 1140 BLAKE2B 0f839fb78068157dccbf22121b2ecceb056e1462a5f7c8ce7c7d28116e390ec618b02f42f8f67dbaf3b345f04d519b0214bbdbdfe03b8c0e7594366a7a6911ea SHA512 ecbf3874813e37fd078cd5900a53b28e4686ab913b00867a0817ebeb7ea21f2c9d9fa712993ae7fc8eb26d9e31d375bff729135b432693700ce4e31fe42e631f
-EBUILD nuitka-0.8.3.ebuild 1140 BLAKE2B 0f839fb78068157dccbf22121b2ecceb056e1462a5f7c8ce7c7d28116e390ec618b02f42f8f67dbaf3b345f04d519b0214bbdbdfe03b8c0e7594366a7a6911ea SHA512 ecbf3874813e37fd078cd5900a53b28e4686ab913b00867a0817ebeb7ea21f2c9d9fa712993ae7fc8eb26d9e31d375bff729135b432693700ce4e31fe42e631f
 EBUILD nuitka-0.8.4.ebuild 1140 BLAKE2B 0f839fb78068157dccbf22121b2ecceb056e1462a5f7c8ce7c7d28116e390ec618b02f42f8f67dbaf3b345f04d519b0214bbdbdfe03b8c0e7594366a7a6911ea SHA512 ecbf3874813e37fd078cd5900a53b28e4686ab913b00867a0817ebeb7ea21f2c9d9fa712993ae7fc8eb26d9e31d375bff729135b432693700ce4e31fe42e631f
-EBUILD nuitka-0.8.ebuild 1140 BLAKE2B 0f839fb78068157dccbf22121b2ecceb056e1462a5f7c8ce7c7d28116e390ec618b02f42f8f67dbaf3b345f04d519b0214bbdbdfe03b8c0e7594366a7a6911ea SHA512 ecbf3874813e37fd078cd5900a53b28e4686ab913b00867a0817ebeb7ea21f2c9d9fa712993ae7fc8eb26d9e31d375bff729135b432693700ce4e31fe42e631f
 MISC metadata.xml 943 BLAKE2B d7ab883773e7480dcfb4b79932a3874e2274669169a24a54aa622a2a0ac079e0296da4bd196d166cb11fcff785985da0b10d0fae351032914ccf312c9bb9833c SHA512 625d8760b8e849c6e014856f584cb42f50bb5ebb1fa648cb704a5a1baf175e7d2ce9f43f6f724d11c81a68e364b6ac1c38459540b58f2ccd6a675902af5b1cc9
diff --git a/dev-python/nuitka/nuitka-0.7.7.ebuild b/dev-python/nuitka/nuitka-0.7.7.ebuild
deleted file mode 100644
index 5b987e13729d..000000000000
--- a/dev-python/nuitka/nuitka-0.7.7.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 flag-o-matic optfeature
-
-DESCRIPTION="Python to native compiler"
-HOMEPAGE="https://www.nuitka.net"
-SRC_URI="https://nuitka.net/releases/${P^}.tar.gz"
-S="${WORKDIR}/${P^}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~loong ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-util/scons[${PYTHON_USEDEP}]"
-BDEPEND="
-	${RDEPEND}
-	test? ( dev-util/ccache )
-"
-
-DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
-
-distutils-r1_src_prepare() {
-	# remove vendored version of SCons that is Python2 only
-	# this should be removed when upstream removes support for Python2
-	rm -vR "${PN}/build/inline_copy/lib/scons-2.3.2/SCons" || die
-	eapply_user
-}
-
-python_install() {
-	distutils-r1_python_install
-	doman doc/nuitka3.1 doc/nuitka3-run.1
-}
-
-python_test() {
-	append-ldflags -Wl,--no-warn-search-mismatch
-	./tests/basics/run_all.py search || die
-}
-
-pkg_postinst() {
-	optfeature "support for stand-alone executables" app-admin/chrpath
-}
diff --git a/dev-python/nuitka/nuitka-0.8.1.ebuild b/dev-python/nuitka/nuitka-0.8.1.ebuild
deleted file mode 100644
index 5b987e13729d..000000000000
--- a/dev-python/nuitka/nuitka-0.8.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 flag-o-matic optfeature
-
-DESCRIPTION="Python to native compiler"
-HOMEPAGE="https://www.nuitka.net"
-SRC_URI="https://nuitka.net/releases/${P^}.tar.gz"
-S="${WORKDIR}/${P^}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~loong ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-util/scons[${PYTHON_USEDEP}]"
-BDEPEND="
-	${RDEPEND}
-	test? ( dev-util/ccache )
-"
-
-DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
-
-distutils-r1_src_prepare() {
-	# remove vendored version of SCons that is Python2 only
-	# this should be removed when upstream removes support for Python2
-	rm -vR "${PN}/build/inline_copy/lib/scons-2.3.2/SCons" || die
-	eapply_user
-}
-
-python_install() {
-	distutils-r1_python_install
-	doman doc/nuitka3.1 doc/nuitka3-run.1
-}
-
-python_test() {
-	append-ldflags -Wl,--no-warn-search-mismatch
-	./tests/basics/run_all.py search || die
-}
-
-pkg_postinst() {
-	optfeature "support for stand-alone executables" app-admin/chrpath
-}
diff --git a/dev-python/nuitka/nuitka-0.8.2.ebuild b/dev-python/nuitka/nuitka-0.8.2.ebuild
deleted file mode 100644
index 5b987e13729d..000000000000
--- a/dev-python/nuitka/nuitka-0.8.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 flag-o-matic optfeature
-
-DESCRIPTION="Python to native compiler"
-HOMEPAGE="https://www.nuitka.net"
-SRC_URI="https://nuitka.net/releases/${P^}.tar.gz"
-S="${WORKDIR}/${P^}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~loong ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-util/scons[${PYTHON_USEDEP}]"
-BDEPEND="
-	${RDEPEND}
-	test? ( dev-util/ccache )
-"
-
-DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
-
-distutils-r1_src_prepare() {
-	# remove vendored version of SCons that is Python2 only
-	# this should be removed when upstream removes support for Python2
-	rm -vR "${PN}/build/inline_copy/lib/scons-2.3.2/SCons" || die
-	eapply_user
-}
-
-python_install() {
-	distutils-r1_python_install
-	doman doc/nuitka3.1 doc/nuitka3-run.1
-}
-
-python_test() {
-	append-ldflags -Wl,--no-warn-search-mismatch
-	./tests/basics/run_all.py search || die
-}
-
-pkg_postinst() {
-	optfeature "support for stand-alone executables" app-admin/chrpath
-}
diff --git a/dev-python/nuitka/nuitka-0.8.3.ebuild b/dev-python/nuitka/nuitka-0.8.3.ebuild
deleted file mode 100644
index 5b987e13729d..000000000000
--- a/dev-python/nuitka/nuitka-0.8.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 flag-o-matic optfeature
-
-DESCRIPTION="Python to native compiler"
-HOMEPAGE="https://www.nuitka.net"
-SRC_URI="https://nuitka.net/releases/${P^}.tar.gz"
-S="${WORKDIR}/${P^}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~loong ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-util/scons[${PYTHON_USEDEP}]"
-BDEPEND="
-	${RDEPEND}
-	test? ( dev-util/ccache )
-"
-
-DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
-
-distutils-r1_src_prepare() {
-	# remove vendored version of SCons that is Python2 only
-	# this should be removed when upstream removes support for Python2
-	rm -vR "${PN}/build/inline_copy/lib/scons-2.3.2/SCons" || die
-	eapply_user
-}
-
-python_install() {
-	distutils-r1_python_install
-	doman doc/nuitka3.1 doc/nuitka3-run.1
-}
-
-python_test() {
-	append-ldflags -Wl,--no-warn-search-mismatch
-	./tests/basics/run_all.py search || die
-}
-
-pkg_postinst() {
-	optfeature "support for stand-alone executables" app-admin/chrpath
-}
diff --git a/dev-python/nuitka/nuitka-0.8.ebuild b/dev-python/nuitka/nuitka-0.8.ebuild
deleted file mode 100644
index 5b987e13729d..000000000000
--- a/dev-python/nuitka/nuitka-0.8.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 flag-o-matic optfeature
-
-DESCRIPTION="Python to native compiler"
-HOMEPAGE="https://www.nuitka.net"
-SRC_URI="https://nuitka.net/releases/${P^}.tar.gz"
-S="${WORKDIR}/${P^}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~loong ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-util/scons[${PYTHON_USEDEP}]"
-BDEPEND="
-	${RDEPEND}
-	test? ( dev-util/ccache )
-"
-
-DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
-
-distutils-r1_src_prepare() {
-	# remove vendored version of SCons that is Python2 only
-	# this should be removed when upstream removes support for Python2
-	rm -vR "${PN}/build/inline_copy/lib/scons-2.3.2/SCons" || die
-	eapply_user
-}
-
-python_install() {
-	distutils-r1_python_install
-	doman doc/nuitka3.1 doc/nuitka3-run.1
-}
-
-python_test() {
-	append-ldflags -Wl,--no-warn-search-mismatch
-	./tests/basics/run_all.py search || die
-}
-
-pkg_postinst() {
-	optfeature "support for stand-alone executables" app-admin/chrpath
-}
diff --git a/dev-python/outcome/Manifest b/dev-python/outcome/Manifest
index b1dbe213d298..6135105a1d92 100644
--- a/dev-python/outcome/Manifest
+++ b/dev-python/outcome/Manifest
@@ -1,3 +1,5 @@
 DIST outcome-1.1.0.tar.gz 18675 BLAKE2B eef22274bb4d1ddd19fa223167b6c8ce96f015ac0b3b0609aed3717deb306087457ab068fd2466d492fcc5859d561e6d3172ad14611a937ec59a75b604565953 SHA512 65de1c0a38b8cbb041a9fc3a79518eeacea54ec87341846ae80a9a2075369f72a397f5aa747ae179eaac8f341a7e07cc1641555fbb809cc7924b2171f7f3d90e
+DIST outcome-1.2.0.gh.tar.gz 18147 BLAKE2B 19e99c8beb1c537a15040211e2fb2f30e425dbb6c81225f2b44720d52e26d8065f434949cd22f97d3a44b64d404077118842a7c85d38f1b7b01ec60d26ddaa39 SHA512 ac8f8738b000e50ace5fbf2c373c9d28f05e88fe40a11602dbb08c48d369f28651ca6c1269ce9ba4ebf1aa9701525e966c061f75313d8650e739934e3ad15003
 EBUILD outcome-1.1.0-r1.ebuild 842 BLAKE2B 72f21ae60bdf2feb37e01b26bc62456edfd7d921351b02020e2cafb54e413241b2c5eae011702af4ad4e95eaa1e1e4934ca4013f97ecd5502a47309d1e2cc424 SHA512 256f4eb85822405032b324d8f42d3a53ee2d458aae30320041b6a8d03904bc329010f6b5ccb5e2df831f61e1aa3563079342b2b97c24cd25b5b495c3aba592d6
+EBUILD outcome-1.2.0.ebuild 853 BLAKE2B 37608eb786e11bbb451d5e94a4842cb3ad5b0e060bcb939637764a7a663324ddbf84f23037c5b155e95dce96519a3f2d2a80b0784ba607e1f36a0be9d41594b1 SHA512 f433cb157241a5f4f52f9f2e9b0e0643098aa90a08da9e0f5a6b5d04776a4076d2e53eae7c65715b7989f27f0909b4e15925ddd5acfac6d4a4cbdb8092cb2e03
 MISC metadata.xml 413 BLAKE2B 375ed97b3bcb2ba5392f09962f6376e5ec8ecb842a70eb8c94647968f2f59e326ddacba74f0e65b7bb5733a05779d464b38d589f3a3dd364ba510bec2825eb5c SHA512 b9b9b94031580858aae25d0733688ce39f5026b4c1a59415370ed50dc27b63654927c36536d4c4cdf6389e68db0b397ddaa7e0aeb786713fdffca4bddaa217d2
diff --git a/dev-python/outcome/outcome-1.2.0.ebuild b/dev-python/outcome/outcome-1.2.0.ebuild
new file mode 100644
index 000000000000..8df9f4999311
--- /dev/null
+++ b/dev-python/outcome/outcome-1.2.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Capture the outcome of Python function calls"
+HOMEPAGE="
+	https://github.com/python-trio/outcome/
+	https://pypi.org/project/outcome/
+"
+SRC_URI="
+	https://github.com/python-trio/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="|| ( Apache-2.0 MIT )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/async_generator[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/source dev-python/sphinxcontrib-trio
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index d00348caf320..a957b3f82de7 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -3,4 +3,4 @@ AUX paramiko-2.11.0-pytest-relaxed.patch 3354 BLAKE2B 19326d3dbf4c3870dcdaeff0d9
 AUX paramiko-2.4.2-disable-server.patch 1596 BLAKE2B 7e2ef1e216f34086c06d985556dde82eccfc08b835a9b336f1e54e81ddf32567872daec9dadc728bfaab8e3c4728439d704d51f9b1df5e04a64b5064f6d79bf5 SHA512 5e2f9285ffa3ece551ce929c6d50691761da6269e906355bbf79b0664a764083f7d55a9e347e2ed236a4c9a7f934d489315b68ebea984694ee9d1714416d34fd
 DIST paramiko-2.11.0.tar.gz 350793 BLAKE2B 86358e08407f8a820a9b33a60e771ac3adb8f3e003ccbc4704ba69a52bd427f38a9c49a20e6a07220d07c25dbcc35a472b2091fa9f7bc1447bab0d7a1ce16b35 SHA512 59e439bd54d83938f91d6c9888f2278bafa4ca48582939580bdabc6207dbe6dc856f6006ad26b7ec91b9d39e92ca70dc6270c6b5d4f77a5e1fa0ec8bd084d4b5
 EBUILD paramiko-2.11.0.ebuild 1367 BLAKE2B 09833fc4293b0065c9339798e84e27ba3b97b25fe0eff3a2485d811c776f5c39f51eff34aac21bf3bfa3c6d8939a2bded9889c903476f5b91ed55d4e66e29164 SHA512 ca5481ab2b72f6af4464d6fb3acb478331b899817af54c5eeee369fb47cbef68e508374d1875fe04caf75a17747751cc8075c84eabb55074bbac2289b2034ddf
-MISC metadata.xml 1332 BLAKE2B 2254eb59425633af43d092c6cc5ff99de6da52918692f6c23c31627587c956fa4b2cd2117ad899a423d93bb1d321581891f3380301a6b44a498978aa9a710094 SHA512 dcbd15823763fd67164a4d77995a7aa16486cbbd747276991cc805a9e6fa28752c273d373a85b3f52eab10f809cf9af60a3afc1ed7bf1ac3121eebeb071e3e23
+MISC metadata.xml 1218 BLAKE2B 9173c01a0d0b5a37d3fb79568d9a4bd3dd6eb03d33ef7a03442761a106991f033f71d68ffb1cd3902519060a627ef7f80f998e7499fd8f2a97ced9330a7c7311 SHA512 d53cbc8f43218893f7cf8bd0d2b05dff76ce1a0a17b54e9ad8e43d12b4f6b64f3d3874ac848b0d46c3460b3c57b2197c78b4c9ee41a88e29ef224d76b376cb26
diff --git a/dev-python/paramiko/metadata.xml b/dev-python/paramiko/metadata.xml
index 7c7d0ca7ee68..05fe0aaee56e 100644
--- a/dev-python/paramiko/metadata.xml
+++ b/dev-python/paramiko/metadata.xml
@@ -5,10 +5,6 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
-  <maintainer type="person">
-    <email>alicef@gentoo.org</email>
-    <name>Alice Ferrazzi</name>
-  </maintainer>
   <longdescription>
 This is a library for making SSH2 connections (client or server).
 Emphasis is on using SSH2 as an alternative to SSL for making secure
diff --git a/dev-python/patatt/Manifest b/dev-python/patatt/Manifest
index 0467a3208d1a..e4c9a7b85716 100644
--- a/dev-python/patatt/Manifest
+++ b/dev-python/patatt/Manifest
@@ -1,4 +1,3 @@
 DIST patatt-0.4.9.tar.gz 34316 BLAKE2B fd731f4e8932da610f31e5176e4b9bcfe8433366b61691fc545d55fdd89675ddd17a695408391528fd213e755e1d421d21551ccbc4aa96ffccc9b62213c17aed SHA512 d4280dd944cc774fa34228a50aa1573a27df2da5cb3a22dba2c3cefe4797ae902810904da776dbd89ad343b3886b6a0015996082307f83577e6a46ac533ba0d8
 EBUILD patatt-0.4.9-r1.ebuild 485 BLAKE2B 799542609df23163c047bd28ac77d49d67d2315c8034ef19be4e1084e0499697ea57169e1bb6673a160eeee4f5695fb8fd37e7bbd1a30bdb3e19d16c778496ff SHA512 ad4b4d1b9fcbdd9aed5daea0e67775e23ee135c46e0e7ff40fa7687bdaebbe0f60a73aa23267c0b6e3b298cdeb6ee5cdf79c732227dae85797adecf213f96367
-EBUILD patatt-0.4.9.ebuild 495 BLAKE2B 10a5c5ffa0aeee63f1466697a8214850988ec5d375ead2ac407e5e0650fa7888a0db1565e3fdb1e98a00bf20b8261317e47b13b4a83e615649ae11cf0b1ae3a5 SHA512 7bc679e77e209aaee39814e917dced024c50eca770f267755707b213c0850c6dd7603e7808886596cf929af4b8ce8c81c0f8c1742705b5bb7a15904b4f69c967
 MISC metadata.xml 320 BLAKE2B 3fd31b71da563854a59f507b7ccba9d226adeb03aa805b24041d2de01d348ed708076965869d098851ba70a59cf3b09ebb8852360797b8138a1fe84c2f0e3d56 SHA512 b00b0d84ca5f7f2d676ae5fc9668b7a5c69a164d089a4d52da803df4329ae70634e2299ef1946f40ab42df8ce3c865c0ea45545e69f543621057bcebc939c4c7
diff --git a/dev-python/patatt/patatt-0.4.9.ebuild b/dev-python/patatt/patatt-0.4.9.ebuild
deleted file mode 100644
index 13bc17c3a9b9..000000000000
--- a/dev-python/patatt/patatt-0.4.9.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A simple library to add cryptographic attestation to patches sent via email"
-HOMEPAGE="https://pypi.org/project/patatt/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/pynacl[${PYTHON_USEDEP}]"
diff --git a/dev-python/pdm-pep517/Manifest b/dev-python/pdm-pep517/Manifest
index 8d13ba0a0e7b..d9b6e0c4e0d0 100644
--- a/dev-python/pdm-pep517/Manifest
+++ b/dev-python/pdm-pep517/Manifest
@@ -1,7 +1,3 @@
-DIST pdm-pep517-0.12.4.gh.tar.gz 304353 BLAKE2B ca2b18af38423f7430a40e5cced207bd4bec8d101204902c89f335c5d08131e95fe17c5af7a3ef0e654c9e2106145ef5242c9015924a2711c90dbb0d2f48128e SHA512 2007a84909147cd48e9ea6114119a63855ddf48e220f8c896d516b6bddd5a7bd62046f090d739a5069b9e06700f0318e57bd1a4b3c7531508b41540357639c5e
-DIST pdm-pep517-0.12.5.gh.tar.gz 304900 BLAKE2B 0e2b6b126226be4b462a254baedfd689d21250e4cdaf80bc8372a1742c795fc4fc0f4f0c891b5d2546320957223d2be65cd9881ab8a190fc1e928b42ec450990 SHA512 00ab751c69a575c4a51afd39e47265b1a593666649d7b70177c8ce6047c1761b00e3fb2338654a7bbd48063d1f32d03fd59aa3c5e8c82393e23eb797f706c574
 DIST pdm-pep517-0.12.7.gh.tar.gz 304959 BLAKE2B 0571a77803b999f88f38da843c5fcf126eeb538c6812c3e245be2fc14d6cd19929559985efba2d245bbf0efb00e412b2133fca6bbe9e63317e6b7311867e0072 SHA512 45da8ab31071a57062fac5b89abe7d912d787d647eda1b45fe3941c43687fe0fe5c8d11e539290035375e17eef808489000513e3128708fcefd851e792757b8f
-EBUILD pdm-pep517-0.12.4.ebuild 1284 BLAKE2B de8507d9fb7a4202ba5f5322679d07fa5ec9aeff63be7a82fc2812d747f25e2714c85633d72f9f29045a8cda1ac99eb3d98b734d9d15419ea2ea98b7e8e0af35 SHA512 000f54f4f4460432478f558536758face9e999aa42061c13a5f1e1011eb3b4ed10ba2e3fb280855235764cc9e7fc977403986934fbd2030cc09d3bd0d4259e47
-EBUILD pdm-pep517-0.12.5.ebuild 1284 BLAKE2B 5780dda53ba7991febf9fa1e7b21d61cf9efbddd7e063feb1c8c0d6d2c1f10da45f0b196c2f8cdb7231614f1c5be32b9e7658060a36f8d60e095456fc40980f6 SHA512 a719bc1f4099c93aa45a64028c9afeb27bd58ead0449ca1292dfca2c923198ed453d2f91f055f4bbe7cdcbefdc8390605056287cdc7fca9687ece465c675dc6d
 EBUILD pdm-pep517-0.12.7.ebuild 1284 BLAKE2B 5780dda53ba7991febf9fa1e7b21d61cf9efbddd7e063feb1c8c0d6d2c1f10da45f0b196c2f8cdb7231614f1c5be32b9e7658060a36f8d60e095456fc40980f6 SHA512 a719bc1f4099c93aa45a64028c9afeb27bd58ead0449ca1292dfca2c923198ed453d2f91f055f4bbe7cdcbefdc8390605056287cdc7fca9687ece465c675dc6d
 MISC metadata.xml 400 BLAKE2B 0882adff4040585d2881a8712b035a5204909639f80f637526b793fd9e31e9d6cda6119cc069d8ff2e768b9d5807eab16bc27bfd35beb5a613722afead2d8b0c SHA512 484e17561642cf1d26d61a1d95554614b9e77b1ee985cba61ad35dad9c9470d0f64e99385200b8eb7e2cdd5e1427cf7835d6e39c10dece1fb90dd6e81cd15d91
diff --git a/dev-python/pdm-pep517/pdm-pep517-0.12.4.ebuild b/dev-python/pdm-pep517/pdm-pep517-0.12.4.ebuild
deleted file mode 100644
index c95abf912f72..000000000000
--- a/dev-python/pdm-pep517/pdm-pep517-0.12.4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A PEP 517 backend for PDM that supports PEP 621 metadata"
-HOMEPAGE="
-	https://pypi.org/project/pdm-pep517/
-	https://github.com/pdm-project/pdm-pep517/
-"
-SRC_URI="
-	https://github.com/pdm-project/pdm-pep517/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/cerberus-1.3.4[${PYTHON_USEDEP}]
-	dev-python/license-expression[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.0[${PYTHON_USEDEP}]
-	>=dev-python/tomli-2[${PYTHON_USEDEP}]
-	dev-python/tomli-w[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-vcs/git
-	)
-"
-# setuptools are used to build C extensions
-RDEPEND+="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	rm -r pdm/pep517/_vendor || die
-	find -name '*.py' -exec sed \
-		-e 's:from pdm\.pep517\._vendor\.:from :' \
-		-e 's:from pdm\.pep517\._vendor ::' \
-		-i {} + || die
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	git config --global user.email "test@example.com" || die
-	git config --global user.name "Test User" || die
-	distutils-r1_src_test
-}
diff --git a/dev-python/pdm-pep517/pdm-pep517-0.12.5.ebuild b/dev-python/pdm-pep517/pdm-pep517-0.12.5.ebuild
deleted file mode 100644
index ce38d4f05e82..000000000000
--- a/dev-python/pdm-pep517/pdm-pep517-0.12.5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A PEP 517 backend for PDM that supports PEP 621 metadata"
-HOMEPAGE="
-	https://pypi.org/project/pdm-pep517/
-	https://github.com/pdm-project/pdm-pep517/
-"
-SRC_URI="
-	https://github.com/pdm-project/pdm-pep517/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/cerberus-1.3.4[${PYTHON_USEDEP}]
-	dev-python/license-expression[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.0[${PYTHON_USEDEP}]
-	>=dev-python/tomli-2[${PYTHON_USEDEP}]
-	dev-python/tomli-w[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-vcs/git
-	)
-"
-# setuptools are used to build C extensions
-RDEPEND+="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	rm -r pdm/pep517/_vendor || die
-	find -name '*.py' -exec sed \
-		-e 's:from pdm\.pep517\._vendor\.:from :' \
-		-e 's:from pdm\.pep517\._vendor ::' \
-		-i {} + || die
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	git config --global user.email "test@example.com" || die
-	git config --global user.name "Test User" || die
-	distutils-r1_src_test
-}
diff --git a/dev-python/pefile/Manifest b/dev-python/pefile/Manifest
index 90195ed91992..e9fe47e646bd 100644
--- a/dev-python/pefile/Manifest
+++ b/dev-python/pefile/Manifest
@@ -1,6 +1,4 @@
-DIST pefile-2021.9.3.tar.gz 72179 BLAKE2B a1b5390936e6c307b1d7d30f317ae77b432b17300941bfe71c4c8ed9dfecf95d623ce98eb762378ee1ff7ae938e4105e4dbcb2f6b8fe32c502b725c43b3a1154 SHA512 1960a6301823387c76e61dff73250686a32dabe009ff0410691ab9be4e57fd5f7ceca2b78302c935b74465a1e0b8faac659045c8a2be07b21dcf1baf510b1b33
 DIST pefile-2022.5.30.tar.gz 72899 BLAKE2B 11752fe849c91749c5272ee9157513db0690fa47a51e274d24093f47c21096e877b364e1dba9cf08d9369abb7e9133743fe98d524079559b9aa9159ece76af74 SHA512 b584472387f7f0161449d2dc0035867da8983eb2c89b488952f38a3e836d23241d46f49a1c9cde13dde4253ef3f212971df48747ea2fec6b91c4db2b7618956d
-EBUILD pefile-2021.9.3.ebuild 856 BLAKE2B f8204fde291e54d945b1302c7a7c17a89a8b7a991124c7475aece43b64b3963cda90efbd0944b672bf7876474e1b282bf138d431445843b5ecbf195484ff3358 SHA512 27492df698e28b6be1845423210e3f87fec8bd7d097baf448cb3018c7fa89f437f817e6b51134b33cd68023c0c3fc1f168a16dd910e4ce8c21ccc2c0ec9120b7
 EBUILD pefile-2022.5.30.ebuild 856 BLAKE2B f8204fde291e54d945b1302c7a7c17a89a8b7a991124c7475aece43b64b3963cda90efbd0944b672bf7876474e1b282bf138d431445843b5ecbf195484ff3358 SHA512 27492df698e28b6be1845423210e3f87fec8bd7d097baf448cb3018c7fa89f437f817e6b51134b33cd68023c0c3fc1f168a16dd910e4ce8c21ccc2c0ec9120b7
 EBUILD pefile-9999.ebuild 856 BLAKE2B f8204fde291e54d945b1302c7a7c17a89a8b7a991124c7475aece43b64b3963cda90efbd0944b672bf7876474e1b282bf138d431445843b5ecbf195484ff3358 SHA512 27492df698e28b6be1845423210e3f87fec8bd7d097baf448cb3018c7fa89f437f817e6b51134b33cd68023c0c3fc1f168a16dd910e4ce8c21ccc2c0ec9120b7
 MISC metadata.xml 766 BLAKE2B 8cd0206bb0cc7de9a76159851092c27b5e7c6d8294a136de2dd74e51da9062f6daa67c2421c173b6125758a9f350b84b03e2a85fa2029beb50032aa034f08c3a SHA512 7c3e9d6d89108b17a722c805353a9c457ccb5a5233bfca7145f82a37ab0337405c84a1e806d9fba77dbee779dd06cb18f7272399277d377aa84dcafc470156bf
diff --git a/dev-python/pefile/pefile-2021.9.3.ebuild b/dev-python/pefile/pefile-2021.9.3.ebuild
deleted file mode 100644
index e80b72dea457..000000000000
--- a/dev-python/pefile/pefile-2021.9.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Module to read and work with Portable Executable (PE) files"
-HOMEPAGE="https://github.com/erocarrera/pefile"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/erocarrera/pefile.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/erocarrera/pefile/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/future[${PYTHON_USEDEP}]"
-
-# Unfortunately there is nothing we can test here. Upstream doesn't ship a test
-# suite inside the release files. The test fixtures in the source repo is
-# encrypted so that only their CI pipeline is able to run the tests.
diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 63691f58a68d..dba2a457862f 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,7 +1,3 @@
-DIST pipenv-2022.4.8.tar.gz 11822017 BLAKE2B b647bf5dbbdb6a38ace41bc58c3178199c0c7cada826f18d0f58c6f3cd60290fa714ca434d19cf468cf316d51ac0895460cb007d677b53462a7efc86f3d3bb2e SHA512 8c0ed65b9431b785f86bc4fa0a0a55d96228ed2f9483805536fa3056853dbfabeac02578f694e9a3f2e00be579183d10dcbb957fb834d475e1621de6a05ebd2e
-DIST pipenv-2022.5.2.tar.gz 12254831 BLAKE2B 36bbf7621be18a639a3460b46cb9522e611939c060fb215406b180d0e0ae8a6582e9cb98560b09b2c95f690dbd8cfd2d10eb7709955cf5f8bf52775dfae1f445 SHA512 0c0fcaf14046cb0d75cb9c260408683b53d6a5e5f2c20c4f73cc20c21af054ac2f18d3c616bfebf18dd6ad02731dadcc0efa85f861643c5ce7dc16d61e9d1983
 DIST pipenv-2022.6.7.gh.tar.gz 12253349 BLAKE2B d1efa1a6e38727c5b5d26c6ec6ad6dfb904ff1e8aed93416ac5bb470d87db0a8583fec8552bc53ee0277e4e7abf7d0a1068a9a3c5dfa2260dfcd0890748df4ae SHA512 2b9c42bd88d8643d07f2eb375040b5b26a88980f5f6e4ee8e99bcbbc17ab268f6dbfa582d1974d2cbfd18691dd06d8b9e3b6c25cec17d64fa3e5541529fe05fc
-EBUILD pipenv-2022.4.8.ebuild 3170 BLAKE2B 8bfd4a89f8dc663d3afcc05c476b991024c988c9c323656c8ea3fe2837c7a3509559997f3b79a98649c15f8f821129940d305a03af86fb4f0367a71d7385a63b SHA512 7cfe956c7d25f9328a9e12cf711c64ccaa2c61b4155a30a40644c1b10e09e05c4f7a4d0174080899bb6b457631eff7f358cc9f7358937420f0a964a2509a8a4b
-EBUILD pipenv-2022.5.2-r1.ebuild 3131 BLAKE2B 23212143a451c04e2bdbcb72898e2256035be2f4d5e509ce82052b0bdccef840b4e68df0d40e85584df3012635224b2f41e1d1658c9031becbfb10fb6efcbd98 SHA512 07720b26066d59b375bfd0afe1f4650bf1cbc4c0b15fb25aa5039e16086aaa5de64fa0ba8d5fb0603140c713dfa5b5d678dc20f87aa4d6501fc66b6d4bbbf0d5
 EBUILD pipenv-2022.6.7.ebuild 3134 BLAKE2B 4b7570e3a59c1a976b3b08d37c6be065f7ecfbb61d77b57e74edffb1dc5252375844b7407176955b2c334b4eeaa597372fd152fa212c137a0bd25cb0e50f20d1 SHA512 e5eb85e289f9519f7380f027adf97c0881c34fdd7b38e68cee18cd964590e4ce2d8cda9c87f0e14feeab7b12e51e753c006f1cc50baa20bdd079f1c1a589e7b4
 MISC metadata.xml 643 BLAKE2B ff3557d9ae32b553c85455436683e2ca94bc16c6ec7c6d2ceb1113a69dc841b9ac2f0e4b96eec4c6c84ca899ad6a99b0747d7bf3f9289110a8bbdfb80f2cb2eb SHA512 7a611950572c2d700fb1680e0aa307069d80d992528144da781eca9f1fee729defa6f8b28382ddd8f66e58c5f68de9a17815989a4a39473bbf830a7be42ea282
diff --git a/dev-python/pipenv/pipenv-2022.4.8.ebuild b/dev-python/pipenv/pipenv-2022.4.8.ebuild
deleted file mode 100644
index c361313a4def..000000000000
--- a/dev-python/pipenv/pipenv-2022.4.8.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing
-
-MY_PV=${PV/_beta/b}
-DESCRIPTION="Python Development Workflow for Humans"
-HOMEPAGE="https://github.com/pypa/pipenv https://pypi.org/project/pipenv/"
-SRC_URI="https://github.com/pypa/pipenv/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/cached-property[${PYTHON_USEDEP}]
-	>=dev-python/cerberus-1.3.2[${PYTHON_USEDEP}]
-	dev-python/click[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
-	>=dev-python/idna-3.2[${PYTHON_USEDEP}]
-	dev-python/iso8601[${PYTHON_USEDEP}]
-	>=dev-python/pexpect-4.8.0[${PYTHON_USEDEP}]
-	dev-python/pip[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-20.0.35[${PYTHON_USEDEP}]
-	dev-python/virtualenv-clone[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.26.0[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	>=dev-python/tomli-1.2.2[${PYTHON_USEDEP}]
-	<dev-python/tomli-2[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.26.7[${PYTHON_USEDEP}]
-	>=dev-python/wheel-0.36.0[${PYTHON_USEDEP}]
-	>=dev-python/zipp-3.6.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-# IMPORTANT: The following sed command patches the vendor direcotry
-# in the pipenv source. Attempts to simply bump the version of the
-# package without checking that it works is likely to fail
-# The vendored packages should eventually all be removed
-# see: https://bugs.gentoo.org/717666
-src_prepare() {
-	local pkgName
-	local jobs=$(makeopts_jobs)
-	local packages=( attr cerberus cached_property click colorama idna iso8601 pexpect dateutil requests toml tomli urllib3 zipp )
-	for pkgName in ${packages[@]}; do
-		find ./ -type f -print0 | \
-			xargs --max-procs="${jobs}" --null \
-			sed --in-place \
-				-e "s/from pipenv.vendor import ${pkgName}/import ${pkgName}/g" \
-				-e "s/from pipenv.vendor.${pkgName}\(.*\) import \(\w*\)/from ${pkgName}\1 import \2/g"\
-				-e "s/import pipenv.vendor.${pkgName} as ${pkgName}/import ${pkgName}/g" \
-				-e "s/from .vendor import ${pkgName}/import ${pkgName}/g" || die "Failed to sed for ${pkgName}"
-	done
-
-	distutils-r1_src_prepare
-
-	# remove vendored versions
-	for pkgName in ${packages[@]}; do
-		find  ./pipenv/vendor -regextype posix-extended -regex ".*${pkgName}$" -prune -exec rm -rvf {} + || die
-		# package names can be foo-bar, their module will be however foo_bar
-		find  ./pipenv/vendor -regextype posix-extended -regex ".*${pkgName/_/-}" -prune -exec rm -rvf {} + || die
-	done
-
-	find  ./pipenv/vendor -regextype posix-extended -regex '.*cached[_-]property.*' -prune -exec rm -rvf {} + || die
-
-	# not actually used by pipenv, but included in pipenv
-	rm -vR "${S}/${PN}/vendor/wheel/" || die
-}
-
-python_test() {
-	epytest -m "not cli and not needs_internet" tests/unit/
-}
diff --git a/dev-python/pipenv/pipenv-2022.5.2-r1.ebuild b/dev-python/pipenv/pipenv-2022.5.2-r1.ebuild
deleted file mode 100644
index 481bc6f5ebc2..000000000000
--- a/dev-python/pipenv/pipenv-2022.5.2-r1.ebuild
+++ /dev/null
@@ -1,89 +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 multiprocessing
-
-MY_PV=${PV/_beta/b}
-DESCRIPTION="Python Development Workflow for Humans"
-HOMEPAGE="https://github.com/pypa/pipenv https://pypi.org/project/pipenv/"
-SRC_URI="https://github.com/pypa/pipenv/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/cached-property[${PYTHON_USEDEP}]
-	>=dev-python/cerberus-1.3.2[${PYTHON_USEDEP}]
-	dev-python/click[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
-	>=dev-python/idna-3.2[${PYTHON_USEDEP}]
-	dev-python/iso8601[${PYTHON_USEDEP}]
-	>=dev-python/pexpect-4.8.0[${PYTHON_USEDEP}]
-	dev-python/pip[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-20.0.35[${PYTHON_USEDEP}]
-	dev-python/virtualenv-clone[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.26.0[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.26.7[${PYTHON_USEDEP}]
-	>=dev-python/wheel-0.36.0[${PYTHON_USEDEP}]
-	>=dev-python/zipp-3.6.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-# IMPORTANT: The following sed command patches the vendor direcotry
-# in the pipenv source. Attempts to simply bump the version of the
-# package without checking that it works is likely to fail
-# The vendored packages should eventually all be removed
-# see: https://bugs.gentoo.org/717666
-src_prepare() {
-	local pkgName
-	local jobs=$(makeopts_jobs)
-	local packages=( attr cerberus cached_property click colorama idna iso8601 pexpect dateutil requests toml tomli urllib3 zipp )
-	for pkgName in ${packages[@]}; do
-		find ./ -type f -print0 | \
-			xargs --max-procs="${jobs}" --null \
-			sed --in-place \
-				-e "s/from pipenv.vendor import ${pkgName}/import ${pkgName}/g" \
-				-e "s/from pipenv.vendor.${pkgName}\(.*\) import \(\w*\)/from ${pkgName}\1 import \2/g"\
-				-e "s/import pipenv.vendor.${pkgName} as ${pkgName}/import ${pkgName}/g" \
-				-e "s/from .vendor import ${pkgName}/import ${pkgName}/g" || die "Failed to sed for ${pkgName}"
-	done
-
-	distutils-r1_src_prepare
-
-	# remove vendored versions
-	for pkgName in ${packages[@]}; do
-		find  ./pipenv/vendor -regextype posix-extended -regex ".*${pkgName}$" -prune -exec rm -rvf {} + || die
-		# package names can be foo-bar, their module will be however foo_bar
-		find  ./pipenv/vendor -regextype posix-extended -regex ".*${pkgName/_/-}" -prune -exec rm -rvf {} + || die
-	done
-
-	find  ./pipenv/vendor -regextype posix-extended -regex '.*cached[_-]property.*' -prune -exec rm -rvf {} + || die
-
-	# not actually used by pipenv, but included in pipenv
-	rm -vR "${S}/${PN}/vendor/wheel/" || die
-}
-
-python_test() {
-	epytest -m "not cli and not needs_internet" tests/unit/
-}
diff --git a/dev-python/pivy/Manifest b/dev-python/pivy/Manifest
index 8dd38187a6ee..70beb1594f3d 100644
--- a/dev-python/pivy/Manifest
+++ b/dev-python/pivy/Manifest
@@ -1,8 +1,6 @@
 AUX pivy-0.6.6-0001-fix-CMakeLists.txt-for-distutils_cmake.patch 703 BLAKE2B b2a183cd4a5d20a1ede7427a1c895766c63f694c38e559e4c7d12a1b8a0a88cfd596b26e31ca35489dc637110dae13f89c671fe52c9555624694ef494f8fcd2d SHA512 7ecc957ac8209aee41c010768d9953fc4820a3e6929dd45be16732385f6e1edd12febc2e05786090835eb35235bb976e1122df2b7da6d0d68c6ae3bdbf9dd9c0
 AUX pivy-0.6.6-0002-Gentoo-specific-clear-swig-deprecation-warning.patch 940 BLAKE2B d7e25c5690a7ea665d923753bcb0811ec9e9702f5085f6a368f1ffbeb84f7b17e8ee6dc02a5374bc5dd45c195cc068bf825b284a97a69be762e9348e7645067e SHA512 75ea0c401cf35b97c119c5a652b91911151ed878136860a90aa53730632dfb89dcd69fb66149145ae59005a93c89e89d1153c8cc23d4d978f9a68fd9ef65c7e2
 AUX pivy-0.6.7-find-qmake.patch 1009 BLAKE2B 18789a4592683bfffdd9094f5465d4e33eaa6b75d70843aa882838f09c517aafe5d576bf8587bb191b39403802ecaf683346e4c0c87cc4c28b404f46744dd8aa SHA512 650a2e023cd821609b9b601b2c5fdb7cdd05375a8931b989ded5aa6a3f4d517a789df2151ef6d4947b6d8b9875c0bab83cb48fd02161a8961efc1125c656de25
-DIST pivy-0.6.6.tar.gz 6618471 BLAKE2B 5bcf2479bf26628e3dfe59c1440901368442de2f32a5680ef1af10d49239d8c73b79809495d7227937fd7784af1e1ded27f93f0255793e713add0c1cc35b8e5d SHA512 e260c6abd0aede7621d5fed66eeceb98a32634af84370ef713d70d583ec017cded4be682fd7e70e5faa19988a5e032a9d2f2308b8ae6dd9495d76e884de1d80c
 DIST pivy-0.6.7.tar.gz 6618410 BLAKE2B 22ebe63a75fa624b772cb3d3ff6f03336258f6c8b638613413c19fcea072f83f73396bc91d35f0e06bc27ec57471ae67965ee492e62a7e73919f7827de645175 SHA512 606eac3527b5906ad6884c25775b5625bfd2a1b1c78f75017b05e662d622c75d30e70fd5785ec2145902f5a02d99098b52cc776aee12fab02f0319762ee104b0
-EBUILD pivy-0.6.6-r1.ebuild 978 BLAKE2B 0a8c8a54756eee2d06fddba0a4b1f06e35367f990391574bc68f72a8a4e7df24a80ccce426603421346c2ba2bd202f19695f648adaf095d3600202760d5883fb SHA512 7fde8ab0057aba362c92c25f61e75934c4d7717dfa9e1d0a5aac2ec36caf70ebfbaf1b16cab9eb0d61d23aace87884c7a3364cd410ce755f376734810ea5d804
-EBUILD pivy-0.6.7.ebuild 1357 BLAKE2B be5050914370016388278748227ed8ec403775a34c2c9c89de72ef339e082d0daa871b3f8c06b5b992905a2ce113f74916ba57c259e2c1740eb8738e6b1c97ee SHA512 4381c0993e758216aa78e3fa375da99fcdcc625efb492cf5228ec00e74a92156699bf0f61134f1bd12401fe6bf79c4ab66f4e10f283483edd282d2d1b9906fc1
+EBUILD pivy-0.6.7.ebuild 1355 BLAKE2B 7140623a4f62a47af8f66db3f8bfaadaf63b94c3adf2d50cd4a6d732ad98b8f5c08eaac0c1f63b8a9d8c2f3da2b620273cc80096445dc2793badd54e3fa21f75 SHA512 b5a2b69ef3d7563b17340267b7baa1858913f2599d94c2428dcab5d2e14caff31afcd974cdb38c80cc77efc37800c9faf34c4c94321dbd9a488dedd82e8da22d
 MISC metadata.xml 619 BLAKE2B 56498bc9920e301de3dacb10db1c2bee59120b8cd3d15508c3549868700574641916e1d3d6f2a734f87eaa91290fd3b1b7ff1373297ca61cea11e33fbd0fed9f SHA512 fd7b9a70a84749a1eab30c3e4ea56bd15d43266e23298a5be1cf3bbee85c38e34bf062ea2555af724766daa7ed755cf586d8c66dfa2286dbcce9c23535661e66
diff --git a/dev-python/pivy/pivy-0.6.6-r1.ebuild b/dev-python/pivy/pivy-0.6.6-r1.ebuild
deleted file mode 100644
index 50ca56ff2739..000000000000
--- a/dev-python/pivy/pivy-0.6.6-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Coin3D bindings for Python"
-HOMEPAGE="https://github.com/coin3d/pivy"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	PIVY_REPO_URI="https://github.com/coin3d/pivy.git"
-else
-	SRC_URI="https://github.com/coin3d/pivy/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="ISC"
-SLOT="0"
-IUSE="+quarter soqt"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( quarter soqt )
-"
-
-RDEPEND="
-	>=media-libs/coin-4.0.0
-	quarter? ( media-libs/quarter )
-	soqt? ( >=media-libs/SoQt-1.6.0 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/swig
-	dev-util/cmake
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-0001-fix-CMakeLists.txt-for-distutils_cmake.patch
-	"${FILESDIR}"/${P}-0002-Gentoo-specific-clear-swig-deprecation-warning.patch
-)
-
-DOCS=( AUTHORS HACKING NEWS README.md THANKS )
diff --git a/dev-python/pivy/pivy-0.6.7.ebuild b/dev-python/pivy/pivy-0.6.7.ebuild
index 6c17df4c10c7..3ea7eff6d17b 100644
--- a/dev-python/pivy/pivy-0.6.7.ebuild
+++ b/dev-python/pivy/pivy-0.6.7.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]]; then
 	PIVY_REPO_URI="https://github.com/coin3d/pivy.git"
 else
 	SRC_URI="https://github.com/coin3d/pivy/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="ISC"
diff --git a/dev-python/platformdirs/Manifest b/dev-python/platformdirs/Manifest
index 26577dcc1176..d921ec3d741c 100644
--- a/dev-python/platformdirs/Manifest
+++ b/dev-python/platformdirs/Manifest
@@ -1,5 +1,3 @@
-DIST platformdirs-2.5.1.gh.tar.gz 20103 BLAKE2B 78df153feabd397e6ab0d3c5edfe899f2e2685e7b287bd17c36346bc109d90ba783b5164605bda448322811312299ce65d49b85537ebd1629448c1d82f4718e5 SHA512 c0f3e79fbb41cda1f543fcb6d3a4ea0c96872d195197aa720864c1ed0efa095e633202878da9b19abfb2aded08f5c736f431b1c615ee0f21cbf1775e87b12356
 DIST platformdirs-2.5.2.gh.tar.gz 20335 BLAKE2B 5d11e39d3e7482646e90d57642f0a956633408de5ec9f3cc1954e451ebb3bc3234a453c1e62997bcc74a32082f5d044a1e68ef6d7e75e27876495ad6ffb3c8f5 SHA512 7162050adff66124601359f0c1f73e671444d286e9f00c2694647df233c25e1eae673baf829e3e74e2a54d15a1633d0202dba986d4ed8a2864fc47859af0fd4e
-EBUILD platformdirs-2.5.1.ebuild 840 BLAKE2B 81a21969946909c6877282ca60c5b2eb13f2ea825e02d067a2a7c832728b711501e0d0422f2b0b8e54729691db4b0019e8671b39e7508fd36b1bd5a8db8f9a28 SHA512 4efa36ef9620651ead63b9b0252b4ec3253d6756b40ce4810d7e4f941faa302a93d4c73434bb64a577afa864065a11965159110eac39da4acc31b5a5b97ac132
-EBUILD platformdirs-2.5.2.ebuild 826 BLAKE2B dc0842d77c4d26c2ecffbf756f191fd80e85ec7ea450d4efc648c760f62e55f248e5ff3630276d556668a10120fd2a3c617c9b4539339b4c83cb4d29c56e47f1 SHA512 6e8138d028d4f126b1227a362ec8c780c9b586efe3b5c8da89dfd5969d5bf4627bebe6701ee200a5ae9677059bd1e1dd50e67be56be024abc5ec6d2cc34c43a2
+EBUILD platformdirs-2.5.2.ebuild 824 BLAKE2B 707f36f3b4f32713a600b55f760b8bc017285742749536e14029f79c7a6923a887ba453376b1bbd22d274c98e10d39070731803da36463a7849879a691aadfc6 SHA512 47f989d76004af0ad8f44844908b4fb56846cde0eb5bfd23e269f3034128af5e1ea9ade2a089f712c57272f345a3d0f50419fbffcdc07a038c694a4d1c57aa83
 MISC metadata.xml 383 BLAKE2B b8c8c1593d154e7a38ca4bc450c14ca21f2411ea1d71f67e9631c1def0acace43ebb6e67adc0c4a1f5f14aadfbce44d0d815fc3696410bef66c826fd5fb00a45 SHA512 f4ba6722e1cf661b3febe10bb15755a9cbc30226a08bdcabfa3d80be87b42d662d6a1edb3412ad79e8f36836a6dd4fd91a83dae29725ec47041056dc1f1f9b75
diff --git a/dev-python/platformdirs/platformdirs-2.5.1.ebuild b/dev-python/platformdirs/platformdirs-2.5.1.ebuild
deleted file mode 100644
index 6d6e9e3bb7e1..000000000000
--- a/dev-python/platformdirs/platformdirs-2.5.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A small Python module for determining appropriate platform-specific dirs"
-HOMEPAGE="
-	https://pypi.org/project/platformdirs/
-	https://github.com/platformdirs/platformdirs/"
-SRC_URI="
-	https://github.com/platformdirs/platformdirs/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/appdirs[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/platformdirs/platformdirs-2.5.2.ebuild b/dev-python/platformdirs/platformdirs-2.5.2.ebuild
index e97b96e859e2..2361230d32d8 100644
--- a/dev-python/platformdirs/platformdirs-2.5.2.ebuild
+++ b/dev-python/platformdirs/platformdirs-2.5.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	dev-python/hatch-vcs[${PYTHON_USEDEP}]
diff --git a/dev-python/plotly/Manifest b/dev-python/plotly/Manifest
index 209f7b57a357..3711e919f1a1 100644
--- a/dev-python/plotly/Manifest
+++ b/dev-python/plotly/Manifest
@@ -1,10 +1,6 @@
 AUX plotly-5.8.0-fix-versioneer-import.patch 541 BLAKE2B 51ff6cbab8d9124243445f758aa4b976b7c26e1d3ce633e943bff133b81c0a7587feeb9d5e98a63f319c6afed8dc06e06fafe765ffd51fec245215c849fb4955 SHA512 db4743e538dddfe66e4c9c766698844af4d09c68188afefe92b6419adfe7cc0b1e9c1266d702d590b0b8dfc14bffbc8f08262ead0bff4dae3b5c71fa1259a4b9
 DIST plotly-5.2.2.tar.gz 7293292 BLAKE2B baef3accf8f5a3085908fcea558f8003687e18a1f97471c620c378c10d23d4222ef87dc47d64f45199b594414890db5b8ca5e3d7867c871d926c2ae441128c4a SHA512 4d6d79f7cc2063e73e7c17ff90a7d13324497ea8034d8ce62d79ec62b0530a59b2eaec8913fb05efb804cf5be8387b6f96d1710f41b9993233b5a13cf64dd310
-DIST plotly-5.7.0.tar.gz 8609793 BLAKE2B 12318f837c248c54fd3a8723bc772e8348186942565ba5a4c095f348dc338cc098318889900500ec333d7ec352801926ec91d312f2ccd98a89f804159223057f SHA512 01675470ef5218f06b4e9e485f23155a8e8550748fdf86afdb2a2969f838464b70d4452811427ab6bed2846093e8cfba7e891f7d0ea3a621e1fbffe22182d933
-DIST plotly-5.8.0.tar.gz 7573157 BLAKE2B 522d0d22d29d5ee204a9ecccbfe7862acee8b8605ab3dfce46a7b771020c24aff39b74aa3244c8384d61bb7e61ca5d2a610d061b0c208bf6cf9fe91543bbfc3f SHA512 2c17c97e897959a9826c19495c30cc7dd21de80e777c13927c1f47c3aa08f64f53ad715d156e78aabaf99fa2a8f85c90d63b08a227c5301710b5c561ee89429c
 DIST plotly-5.8.2.tar.gz 7574127 BLAKE2B 1a9d05009148a65b2f4206165a3e02ea7e130663e9658af64bddc0df6f1b720ca29e1cf30150634403b4bdda96156899f0e2e2d12b81cfd04a4bc9812057a79d SHA512 f262cbe20fa51861a319911e04446d4aa564b878dc1aa8e750a5d03af9747ec439fda941ab63d20ecb5374417174a2bd1c4f5549af5ba0f57f135d10ae0877a0
 EBUILD plotly-5.2.2.ebuild 795 BLAKE2B e609d220f61b73ca3c11255e0fc28cf9c3a2ed316be1f39044cab25679683300d6281e80ce2f5ead3be391b3c537be7531c9148ec1a1bb069a04ba621ba1784d SHA512 a1bac18949480f19c68891497effdfe60cc3ca474ca24ce27134f2a1da5cd894426fca9b00ad8d6d24138da141fafefd09a40723b1314197068422cd988574cb
-EBUILD plotly-5.7.0.ebuild 1595 BLAKE2B 3acd8461e2c34c67636e13bed9bf5d39d7be205ffea561aba2281960ed113fea3fe0814904457ff966cabceb40d5a4d8808014cee069bdb8177b1471e939189d SHA512 f724cd1973e94956edfa46b8e100911d2eec0851c0b68758a4cb3f16ed4f47614c35ab65c7c752d6d081d565078893ca5b68e7fb08a08f487817f326a0de4022
-EBUILD plotly-5.8.0.ebuild 1620 BLAKE2B 10a9f7acdeadd0d3bb0ba7054a8622d840bacc81251755e35d261a423601a749e78ba9a63019ae6ceb59d72b3010c056062a41155cc32a34979f00f8fdfcb0fd SHA512 699945bebab92a8d267bf14e8b1f69587ea707484251d45b938a1f909743fdd339f1c6bc5e6d41b30bafb77ae2c8e24f293d817ce746751b15fdd77f0bcc636a
 EBUILD plotly-5.8.2.ebuild 1620 BLAKE2B 10a9f7acdeadd0d3bb0ba7054a8622d840bacc81251755e35d261a423601a749e78ba9a63019ae6ceb59d72b3010c056062a41155cc32a34979f00f8fdfcb0fd SHA512 699945bebab92a8d267bf14e8b1f69587ea707484251d45b938a1f909743fdd339f1c6bc5e6d41b30bafb77ae2c8e24f293d817ce746751b15fdd77f0bcc636a
 MISC metadata.xml 627 BLAKE2B 453adb04f4caba9790fe5223635245c8bca7ca5c6dc1930f09537045580b88b5fa1649e47158b13be6cc5cb09b4479a47690e37ef13208b47a95f82d14793a91 SHA512 a5183e9d217d1312e8d383ccb4ade66b92575492b6c8ed8987e3af18e9e456836b62b2d572ce62f9e01aae47b4a2bcbd12f79b4bb6acabfe69c2b63b20315bd3
diff --git a/dev-python/plotly/plotly-5.7.0.ebuild b/dev-python/plotly/plotly-5.7.0.ebuild
deleted file mode 100644
index 5bd40591e1d8..000000000000
--- a/dev-python/plotly/plotly-5.7.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Browser-based graphing library for Python"
-HOMEPAGE="https://plotly.com/python/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# TODO: package plotly-orca and kaleido
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-python/tenacity-6.2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.15.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/backports-tempfile[${PYTHON_USEDEP}]
-		' 3.8)
-		dev-python/inflect[${PYTHON_USEDEP}]
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/jupyter[${PYTHON_USEDEP}]
-		dev-python/jupyterlab[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-		dev-python/statsmodels[${PYTHON_USEDEP}]
-		dev-python/xarray[${PYTHON_USEDEP}]
-		sci-libs/pyshp[${PYTHON_USEDEP}]
-		sci-libs/scikit-image[${PYTHON_USEDEP}]
-		sci-libs/shapely[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	mkdir -p "${ED}"/etc/ || die
-	mv "${ED}"/usr/etc/jupyter "${ED}"/etc/ || die
-	rmdir "${ED}"/usr/etc || die
-}
diff --git a/dev-python/plotly/plotly-5.8.0.ebuild b/dev-python/plotly/plotly-5.8.0.ebuild
deleted file mode 100644
index 727c95cffca9..000000000000
--- a/dev-python/plotly/plotly-5.8.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Browser-based graphing library for Python"
-HOMEPAGE="https://plotly.com/python/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# TODO: package plotly-orca and kaleido
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-python/tenacity-6.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/backports-tempfile[${PYTHON_USEDEP}]
-		' 3.8)
-		dev-python/inflect[${PYTHON_USEDEP}]
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/jupyter[${PYTHON_USEDEP}]
-		dev-python/jupyterlab[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-		dev-python/statsmodels[${PYTHON_USEDEP}]
-		dev-python/xarray[${PYTHON_USEDEP}]
-		sci-libs/pyshp[${PYTHON_USEDEP}]
-		sci-libs/scikit-image[${PYTHON_USEDEP}]
-		sci-libs/shapely[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.8.0-fix-versioneer-import.patch
-)
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	mkdir -p "${ED}"/etc/ || die
-	mv "${ED}"/usr/etc/jupyter "${ED}"/etc/ || die
-	rmdir "${ED}"/usr/etc || die
-}
diff --git a/dev-python/proto-plus/Manifest b/dev-python/proto-plus/Manifest
index bc6dd23b3ffa..0945209bf92b 100644
--- a/dev-python/proto-plus/Manifest
+++ b/dev-python/proto-plus/Manifest
@@ -1,11 +1,9 @@
-DIST proto-plus-1.20.0.gh.tar.gz 65648 BLAKE2B 19cfcfde913896de83d17c36bacd7799a9f28ea20c4681266b2194c6521aef116f6a594df8be8912bdf55558d84a0ab09d283ec444ba114592ebb7017db257fe SHA512 1e399bc0ac686f33242c1d15c15255ec1815e94eaf87de03e5145cc6ed249048c3b8af081b70964cb7b6baf8286f6be2f461c3638331a2269a5b2d89976ffa6a
-DIST proto-plus-1.20.1.gh.tar.gz 66180 BLAKE2B ee0299c8e9c9882ce417f6f885df18cd833dfbad80e0e92ca4e589eea794b0b00577d4c01fa69790f97f31d8bdfd20f07f4c7601bdf6ee28a7427f0e56714eb4 SHA512 12d9f76230d592c68083421bbb40c4b57741545c238227a743c275820a4d7ae53ea45d7ae5e73495b14736a95aa96250e243220f8b9bb5c988c12a2f84f654d6
 DIST proto-plus-1.20.3.gh.tar.gz 66941 BLAKE2B 359d95d37b8a4dad282cb9b33909982ffedca25cd3907583d689996d6e516143c0e4eb2b9bb06bc50e12fabe197f0622a3488cf21136decefe676980b20c7a9e SHA512 411089eb76508a5ca94d6b4228dd4bc1f8d01d4f5209bb2ab0e6e240d8061761c9c76cd03b3a4da7771b45a30df3b0ca4c17f7fca3ed6e710a9724ab7bc0f60d
 DIST proto-plus-1.20.4.gh.tar.gz 67455 BLAKE2B 6121d8bd87127139b6b6c16055941cb320fb2a106ae5a95f77a949ffffaa99db474282255a88994d3194866c404633d953d8a136e55ddbd2163d8da08bbde8cc SHA512 f71aa0e956f63bb8dab205e2788185efd31bcd733299fedd4f24d407b3c1b3bfedc24e349769644025c6dbc8775e7743ee96be4dac2edc8b6406101a5da604df
 DIST proto-plus-1.20.5.gh.tar.gz 67573 BLAKE2B d764c8afb4608c38b050c256930a7ea37ee8d5393518e3146a66d11d4fee1cf3b35142426442d014483bd1ac5b815b6445b0f2c2c04f404136aeb6031a944e54 SHA512 bf612f23af3cf30cceaf8ee2027a721cc37dbe7e17d0ce643c31361397409171f92e92a6b53163e747931c3b0da66edca638ae4014c096bc0e3a8f1bc5dc8e80
-EBUILD proto-plus-1.20.0.ebuild 1022 BLAKE2B 8da6815a92a64d5a90058920490521511ad51946550f6a876febaa010a87635a3bc7c284269469a7335f3c2de476e0d1234a8815ecc82d50837eeff56a853baf SHA512 33cab9bd304ea4349e48d045989b6ccb238589383d495a184abbce4e6534382eb7a39143d8ef875a3283ebf9619f10ed28e0ebe8b52d13b94931e01b00dff315
-EBUILD proto-plus-1.20.1.ebuild 834 BLAKE2B 3fdcd159b52f5536561a97585d5a28ddb85e4b018982b0fe6e334d8625ecc2755a7acaee2e2d707fe1ea1f563ce4f6572ca7000359cc48e3ec899a55e27e1ef1 SHA512 c6d1bf3af3bfe55ec0f636d98e249198a375c69c01132443378af8b147c49bf68fd8823067c19875a97f1614245ea5348e79520f89f796744deb5335d7d5acac
+DIST proto-plus-1.20.6.gh.tar.gz 67697 BLAKE2B 88fbf1086bc9430360316c89baaf6216d3f395792fbc2bf1336c22aeb4f912dedd5a4af73c5a10cf6536cdc4cf285c89d1d0a86afd4ee21c7e40b26d34631240 SHA512 5da41a8ddabb34a4083b622d60e59532cd7cb97e4fd243b796aded06ee0f6d9ba5ac847434aa8141b90cb3481d45fbc703de2f905ff4f4676a5d86d77a01c44c
 EBUILD proto-plus-1.20.3.ebuild 845 BLAKE2B 8214d5ada51ec352bbdd8bc095cbc9950c7da65cfc465bda2617d3d57af848ab21b0280c1693afb827ffa239a05de38df98e67c20158baae8326180fdbe9b051 SHA512 628b2274032b69f4af43d369a45e1486b45746467e5ddb5b082b5de3a355fe7706846db0c8e10aaba0266f0dfba9e71085be763f544db3ec1d69fdd0b109c798
 EBUILD proto-plus-1.20.4.ebuild 852 BLAKE2B 33b2f3a1f1deee0b9433e90e7af4fa76ec4ca7e0b1817e01c49cff15038e6544a5324fc0b5a275211a4ccda6de1b3f7217fa21b3ded41d7587d6942941fad46b SHA512 4cf197cb67780bdb806ca1b0ac909b2fdb9b0345c108a362c703a96ec4631ee66ecaf3e19e196e6480bbafa27caed43b81daaf865cdbb446618206feb98b4e49
 EBUILD proto-plus-1.20.5.ebuild 919 BLAKE2B ea3da15d4bd11229cb324f0e935a71a92f4fec61f1aa208a4b0344c5554b0c2d45f061299beaeb7fe3ee49bbba130a4faabfed720d14d1671f50c239e30557ba SHA512 b87fd57235d1e179062e7402664b3b7ca3660adbfc05f7e8736e4f6337a815b67e7d57a5674f2bafa1d64d315ac6e57b1c6d761011a83c17677ca68b27d492b7
+EBUILD proto-plus-1.20.6.ebuild 919 BLAKE2B 9d2e638037ab6e048257fb15d6e654d9c1dd4661e3875e1a2354582539311ad01baca958a454072a6c51e003a6bbf5a1bbf27e05b1cf2db78b7d3de9100aebfa SHA512 c306d37b44976b9fd4041c58458cf9cfb0d8c6af06ba456681221c291a4af6b80c9e47ff47203e9659638c7ee422299a82e353aac22d3c90c3e2128687d93ebe
 MISC metadata.xml 447 BLAKE2B d440be836b8a2823ab3beb7f76cbe7ff3f027ec512dff3f7d920eefea3f18329e1aa910ca16e006b1424cbd780f3fad80b8ccdc632c08ade651afd815369e9d0 SHA512 d64b8d2eeac9916ec2faab3b038082155e46e8c379ce06d7f554de763318539fa9040d15f90a3a95f337937c90f4b4042f51b1ea1cd11727e5fd971a0af5280c
diff --git a/dev-python/proto-plus/proto-plus-1.20.0.ebuild b/dev-python/proto-plus/proto-plus-1.20.0.ebuild
deleted file mode 100644
index 228d58940454..000000000000
--- a/dev-python/proto-plus/proto-plus-1.20.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Beautiful, Pythonic protocol buffers"
-HOMEPAGE="https://pypi.org/project/proto-plus/ https://github.com/googleapis/proto-plus-python"
-SRC_URI="
-	https://github.com/googleapis/proto-plus-python/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${PN}-python-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/google-api-core[${PYTHON_USEDEP}]
-		dev-python/grpcio[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
-
-src_prepare() {
-	# https://github.com/pytest-dev/pytest/issues/9637#issuecomment-1031997415
-	sed -i -e '/staticmethod/d' tests/test_datetime_helpers.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/proto-plus/proto-plus-1.20.1.ebuild b/dev-python/proto-plus/proto-plus-1.20.6.ebuild
similarity index 64%
rename from dev-python/proto-plus/proto-plus-1.20.1.ebuild
rename to dev-python/proto-plus/proto-plus-1.20.6.ebuild
index dc2848b431d0..6be65f5713cd 100644
--- a/dev-python/proto-plus/proto-plus-1.20.1.ebuild
+++ b/dev-python/proto-plus/proto-plus-1.20.6.ebuild
@@ -4,12 +4,15 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
 DESCRIPTION="Beautiful, Pythonic protocol buffers"
-HOMEPAGE="https://pypi.org/project/proto-plus/ https://github.com/googleapis/proto-plus-python"
+HOMEPAGE="
+	https://github.com/googleapis/proto-plus-python/
+	https://pypi.org/project/proto-plus/
+"
 SRC_URI="
 	https://github.com/googleapis/proto-plus-python/archive/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz
@@ -18,14 +21,15 @@ S="${WORKDIR}/${PN}-python-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 RDEPEND="
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	<dev-python/protobuf-python-5[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-python-3.19.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
-		dev-python/google-api-core[${PYTHON_USEDEP}]
+		>=dev-python/google-api-core-1.31.5[${PYTHON_USEDEP}]
 		dev-python/grpcio[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index 01b9fad5eebb..662e3fa7f10e 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -1,7 +1,9 @@
 DIST psycopg-3.0.14.gh.tar.gz 381063 BLAKE2B cc63bda476bd7f5b53698349d893f42e300395cb604ef458d75aa40d0c7f7ac3f89e734534a2df0710fedd6ae63ec1426174c0e78d57680fb63156a2e2aad60f SHA512 3abbe947bddbb1ccc47ce9a5d18351311ca4729e3f25a6dfc5238aac821e69223078beccc30366e375026eee04645fa336b4ad579a91c8ff9d5f852b8c5584be
+DIST psycopg-3.0.15.gh.tar.gz 384815 BLAKE2B feed19f8482767de12a549530b8fbef5cd374636f1b1e84b2746f23379760bf3b75fbbaed64b8d45d120b84a1e56b4ce6fe26bf29fb13e6fd20eb39e4aebad9a SHA512 65c0e081821ca580f56495073ca69fa38e98888ff3531dc55faacec647cfeafcc74767c53a7d3edbeea1e5bbc557ba08fbc089be8b6bc73963cbb459b029e313
 DIST psycopg2-2.8.6.tar.gz 383797 BLAKE2B da0e3f1e143c51c940ba1f51d3e457b492d880ab71267dacd4747444bc767711ccd6c2f54d9e10ce5ad8fae0c3206fb4b6199f267e9bbaf12eb654227f59c2b0 SHA512 1e1d5d8755c6d1a153d84210bf29902afafe853659d709e13abc6bc5772def13779d2394690af1c544384c9c607edc0fe5cf2763244fb346febf9a9e0032b45f
 DIST psycopg2-2.9.3.tar.gz 380611 BLAKE2B 78099da7378dcfa8b7f28aae4d533a7e890cdb7ae4c0cc718a9411e630fd07b56f074760fc29de8fe08fe727328cca39414a5f297fb92ed2f7471a24e633d18d SHA512 048184d1d162a371fc0fba711448a6fa8a6aac193421f4484c7f7b91c39065d5b632fa34fc15a901eca055d597302b1f9e38330b248ed0e4653dcdc544b0d660
 EBUILD psycopg-2.8.6-r1.ebuild 1313 BLAKE2B dbdf3b3a72aa22bdc1d55c9a6b8f67e706a9d13d9e43c0c09bae8a735eb999b19f262d104aaa9196c6189ed5ecebcafbce49f6499e9632d7f56b4d73c48453f3 SHA512 db57102c60158abf196eef91391c3a37a02a92fc6ffb79c57aaeaafa1b771938a1a3b1d048fe6130e9fab326b9a7d46de605090fdca09025baae051bcbd8f7cd
 EBUILD psycopg-2.9.3.ebuild 1306 BLAKE2B 166f519f6e4694fb2725e0f4e736a9ab907dc398c4fadee579da96e37f29faf6f6fe735e56dc9156eefa74302bc516915499d827b3762655863bda1162716e19 SHA512 ecb1f931618b74393cace6f850b35c7512fe5902bdf97eadf0cc1f54e60797c863fe558cda3117ca8a5cd025bd6a761545d6fc1d837aed8ec095c48e98cd7c1b
 EBUILD psycopg-3.0.14.ebuild 1660 BLAKE2B 00bfd0e20311e4dc373068065aafde93b951998ee7fd40484ee07644278c14a0c31f4b961cca0cadf1da4b9afa8976ea80c1f9ad60755d9a7d59481b07b14f0b SHA512 e2c2b675e0835821f1919cf8b531d42a965823d35ea1d3913b08eb325bbeb73f5d1ac5855db76406619430f74aad6dc17ab226dd21655eedeb4ecbb1856446f0
+EBUILD psycopg-3.0.15.ebuild 1660 BLAKE2B 7bbcbccf9ecc67e17b02e84d21fb8078020f5d7a2b57200b7cb723ef1911826eacea952eb12febd312ee6cbc593c492e6568dffb747cacb28b3f05c1e8e8952b SHA512 c5f48fc3efab2f8e59fa7b309b71f80ecc651208a969116c303fd11c82981a092e20d4d0d7c2804bd7ca129ea5015d7ead5131e1efc895ba2797d30ea7193290
 MISC metadata.xml 369 BLAKE2B 042788638a82318248d4e4ea1e12bf1631af6ffc435fc0110e13849dad600854e8b57f5ba3397c4d4e5d103e165b342f8aba869e72e9b63efc500382d3423414 SHA512 5b216575e8cae847f71a09ed6b676a73fccf2070f3bea3b35f1bfbde95fb0154b2fbb356948e112cc9f2298fc9868ac3994a139e72939f80d59c084ec58d80bf
diff --git a/dev-python/psycopg/psycopg-3.0.15.ebuild b/dev-python/psycopg/psycopg-3.0.15.ebuild
new file mode 100644
index 000000000000..1b13ee04516b
--- /dev/null
+++ b/dev-python/psycopg/psycopg-3.0.15.ebuild
@@ -0,0 +1,73 @@
+# 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="PostgreSQL database adapter for Python"
+HOMEPAGE="
+	https://www.psycopg.org/psycopg3/
+	https://github.com/psycopg/psycopg/
+	https://pypi.org/project/psycopg/
+"
+SRC_URI="
+	https://github.com/psycopg/psycopg/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S=${WORKDIR}/${P}/psycopg
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+
+DEPEND="
+	>=dev-db/postgresql-8.1:*
+"
+RDEPEND="
+	${DEPEND}
+	$(python_gen_cond_dep '
+		>=dev-python/backports-zoneinfo-0.2.0[${PYTHON_USEDEP}]
+	' 3.8)
+	$(python_gen_cond_dep '
+		>=dev-python/typing-extensions-3.10[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+BDEPEND="
+	test? (
+		>=dev-db/postgresql-8.1[server]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# tests for the psycopg_pool package
+	tests/pool
+	# some broken mypy magic
+	tests/test_module.py::test_version
+	tests/test_module.py::test_version_c
+	tests/test_typing.py
+	# TODO, relying on undefined ordering in Python?
+	tests/test_dns_srv.py::test_srv
+)
+
+src_test() {
+	# tests are lurking in top-level directory
+	cd .. || die
+
+	initdb -D "${T}"/pgsql || die
+	# TODO: random port
+	pg_ctl -w -D "${T}"/pgsql start \
+		-o "-h '' -k '${T}'" || die
+	createdb -h "${T}" test || die
+
+	local -x PSYCOPG_TEST_DSN="host=${T} dbname=test"
+	distutils-r1_src_test
+
+	pg_ctl -w -D "${T}"/pgsql stop || die
+}
diff --git a/dev-python/pyacoustid/Manifest b/dev-python/pyacoustid/Manifest
index 14f202632dbd..85aa76f9e555 100644
--- a/dev-python/pyacoustid/Manifest
+++ b/dev-python/pyacoustid/Manifest
@@ -1,5 +1,3 @@
-DIST pyacoustid-1.2.0.tar.gz 15770 BLAKE2B 9a5d62a8b8450393aec103d3755ed9e1fa999b6d4b25d1180d12e96020bb8bcf44b32f7de2e7de2ab0902ca9e65b352bc09edca173ce738019f4ca3330489875 SHA512 45827841df97b0f3a5d090edb076456fb822dfb35f3efbe55cc2877801b6c706f22a38f216d4ce7e4217d7da650e2116cfd987ea87000c828b06221fb8b06312
 DIST pyacoustid-1.2.2.tar.gz 15869 BLAKE2B 01f327dd640819dd799f48b32e859fe39dccda3fd62714bf324c8219cf7053b36f1399793523634e9d4f3c6405bed5050abb34bdf53c72ff0ee22708fb57225a SHA512 5bcb3f017c3013eb8fc9e335540a1f5e6a52fc2fefa53d5ef246ba16e4ff615dd1d1cf08b5c80b1a38b149e0fa7dc0b15e4890dcc3f5478ef874b4ec22cf0813
-EBUILD pyacoustid-1.2.0.ebuild 693 BLAKE2B cde0fb7d648f3616525b072a99109ebf5a055ef6d73c65a9eeb87139b13169700d7c4bc8301dafefc40c57941dcdd75bd80da0f7532b0402e04d3c46fcaa0391 SHA512 32f69fe18b0d7daf746770278b7f2132195968d55a1750ffdbb00b2f2786d4f191ff1e24880d098b48b28c8612ef3b7353b31556bb195ab8f012c7538f59cd8a
 EBUILD pyacoustid-1.2.2.ebuild 725 BLAKE2B 8d824294a40352de4e48bdaf7a89574943afe0a14b97370643d62fb4dcbc9209c6dcd3be9734e7a2c490ccba8d686f4e6b7d88e5dcc3515c47ba2bb78f061545 SHA512 e50db12e828ed5d8f78facfca65eae2bb2c58263ad8ae77895a68cca80b210a3278bfd1120edfcb7160a4fd861030790ce889b5c645183553554202376f5791a
 MISC metadata.xml 714 BLAKE2B bc0db30cff6644da34b7944bec3d60b47f394ac854d547fcbbf3ee4d2719edc4cb781a42b3ab266fb7dfb5762679daaa0e382fd0fa8c2cffdd35af4cc55633be SHA512 6b6063bfe7d64d8a053c0e5c1609d8011e8aeeb265a895db88154e246761027ec2ba5fd582fb08b64e5ee09b3a238030415613df9267620936a718b76d6d1692
diff --git a/dev-python/pyacoustid/pyacoustid-1.2.0.ebuild b/dev-python/pyacoustid/pyacoustid-1.2.0.ebuild
deleted file mode 100644
index 7b23ee07bc58..000000000000
--- a/dev-python/pyacoustid/pyacoustid-1.2.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for Chromaprint and the AcoustID web service"
-HOMEPAGE="https://pypi.org/project/pyacoustid/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-RDEPEND="
-	dev-python/audioread[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	media-libs/chromaprint
-"
-
-src_install() {
-	distutils-r1_src_install
-
-	if use examples ; then
-		docinto examples
-		dodoc aidmatch.py fpcalc.py
-		docompress -x /usr/share/doc/${PF}/examples/
-	fi
-}
diff --git a/dev-python/pybind11/Manifest b/dev-python/pybind11/Manifest
index a7c93729b453..eca3382d9a22 100644
--- a/dev-python/pybind11/Manifest
+++ b/dev-python/pybind11/Manifest
@@ -1,4 +1,4 @@
 DIST pybind11-2.9.2.tar.gz 709521 BLAKE2B 76ae9c72faad805885eabbe4dadf1092fe814f04f2a8d834da035c7389dcc996c09a63149911aa7a5c0b70d2da9f7c32e94aaf1c941f13345e0aef40a5748dfc SHA512 c6c18e5f59873adb3692640ade26472abd257607e7bb9fd48cfd1949878811e83d6ac6eb8c8dd926622d52ca4f13e5e6a58e0abaaaa1fa814ee831ea2b515272
-EBUILD pybind11-2.9.2-r1.ebuild 1236 BLAKE2B b50b3ee74916b265b09cc597b67f5d006eeee6c875150bd547a441e6cd5379161f73f7599d38b390cb0dc3328f804f53dbfe58cf0daadd4a6428ac1c877cd1c5 SHA512 fa69a8185233719b089971a9326bb387d8d00ac53d52915e8cbf91f5d654415e4f459cda46327128fef083b241495717d8a0b518dd5bd6b073376bc3f037d13f
+EBUILD pybind11-2.9.2-r1.ebuild 1231 BLAKE2B 6dab9ae644be4ac65c64f50d4b2dae0b7109a7fdc85656dd58399300c3e38d520dd8f786a1e4d2567cae561fe3c47a04dcde4b48378e7679aa22073359b0dbad SHA512 3f040474cd7af08445d3a80facc807930c34614538981c3d80935c5ec6251c9c5ecb9164013df44bbad1ae0f0c4e2faadd106e3f6634e3b83e4469f8d3f738e4
 EBUILD pybind11-2.9.2.ebuild 1116 BLAKE2B 8b5755a4cc0a8ef2026ecc06ce6224e5044aad8111e3b5c05e9af20ef0da3fc17ac188daabbb0d5b095c154c4270f2a4d4202fcf9e99124c090c9f2a34ce7c62 SHA512 27ffc7ceaf1a9251c4616bb96e50eedea22ec7b514350cd295aa0598015d90b1e378a63fd8ad4ba24303db951f924d3a9149c5797c4bcca602cb68472034150b
 MISC metadata.xml 420 BLAKE2B 8a3480ac275b7e2893d696bf4fd0d70f41ea941fab9e24b19d8561c0efeee81024ba6fea0ab26333346f3c176d1a87b35229e31ecefc74de2e7614600a64013e SHA512 8140e933878a75968420deab189bab1decd030b5209baada2857a7659dc32980bbc46678c6612ef56e4b4f6b598579bb8227e6c7fd00fbde63a40eb13bccf86c
diff --git a/dev-python/pybind11/pybind11-2.9.2-r1.ebuild b/dev-python/pybind11/pybind11-2.9.2-r1.ebuild
index 669e930dee0a..7065df82b8e2 100644
--- a/dev-python/pybind11/pybind11-2.9.2-r1.ebuild
+++ b/dev-python/pybind11/pybind11-2.9.2-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-cpp/eigen:3
diff --git a/dev-python/pybtex-docutils/Manifest b/dev-python/pybtex-docutils/Manifest
index 807fc83af8fb..f1816414ab72 100644
--- a/dev-python/pybtex-docutils/Manifest
+++ b/dev-python/pybtex-docutils/Manifest
@@ -1,5 +1,3 @@
-DIST pybtex-docutils-1.0.1.tar.gz 14234 BLAKE2B 3c3946309ad19acb19703c0ecd7fce048808580df27ba39ce7acadbc0db154bee1f1e31d448015a8ebbbe034812e2f76fbed6f47a687c035750fc2908ca940c2 SHA512 8f84a822287e78a09b935a0f358b48e8a02be21303907fdce352515a844fe22dadb44646ca1abc44c8a8e7523c4f7074f3673fd6d565b178c862589cf58e9a48
 DIST pybtex-docutils-1.0.2.tar.gz 18450 BLAKE2B 84521d36994e3ca5bfdcebd308e6aaeb17f7202d024799612d34dbf58b1b1e58d42b898a4c792815a472b0a7008e28558fd722f39462cd3b1ee24b921f746a4d SHA512 1190fcbdfb89b858a1164dd2c99a5da7afb76a23f5b314963babd894e7578d75e80f2552319c6621e9c7738018fd1b8f4a3772057ed65466f2d9fc3e15c57e2b
-EBUILD pybtex-docutils-1.0.1.ebuild 529 BLAKE2B bfd0ba94eba7f8aa8c5350d86b84f0040b7d712457a511f04db2a251b67724e4a3315d7284931d35802aecef385f57f63d10ff8d630a65144fffc07cff2eb18f SHA512 2c8ffae6a01aed35ce4a65c94798ba8bfc2f7e93f929b59ec5caa97863d804002b21fd4443c734e4e8eca714e51912873a304faea8996bca4efad91d2892abd7
 EBUILD pybtex-docutils-1.0.2.ebuild 564 BLAKE2B d140a6ce6462d65739d33dc68c9df41475b49246de6ccc7af7386525f6fd1f5ca9f45e8541ded3c2b4210dac84c269f77a6d5dce8c76ae0b7d172ba9e03d114d SHA512 b3cd3fadc664979c836808765312825d331e038f10e5e34f8b34ce301a96a96add10aebdb936e7ef56d03d50826ef88d3831918d8768a04b095d621911b70759
 MISC metadata.xml 529 BLAKE2B af193891d1d709d75fa2f89fa828ff5c946ebdff0b405ce06582e1222a7c3b32ec47ece3dbc96337ca11e6c3d510710954c256da58d7a171bdfcedce3e3c28da SHA512 990fa90122af363d3ed1af301c37ac1c5b3ece06e8712982cbc514d8ec7826a1ac174488b174cdd617bb820c0db269ebf515fdedf636181940af759ecb190916
diff --git a/dev-python/pybtex-docutils/pybtex-docutils-1.0.1.ebuild b/dev-python/pybtex-docutils/pybtex-docutils-1.0.1.ebuild
deleted file mode 100644
index fe39420d9382..000000000000
--- a/dev-python/pybtex-docutils/pybtex-docutils-1.0.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-inherit distutils-r1
-
-DESCRIPTION="A docutils backend for pybtex"
-HOMEPAGE="https://github.com/mcmtroffaes/pybtex-docutils"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/pybtex[${PYTHON_USEDEP}]
-
-"
-
-distutils_enable_tests --install pytest
-distutils_enable_sphinx doc
diff --git a/dev-python/pycuda/Manifest b/dev-python/pycuda/Manifest
index b1c07ebbe4c5..65ebd4a54b39 100644
--- a/dev-python/pycuda/Manifest
+++ b/dev-python/pycuda/Manifest
@@ -1,5 +1,3 @@
-DIST pycuda-2019.1.2.tar.gz 1584807 BLAKE2B 3250430ad626b28242ff44ab9576cf1f5ecf77530e789470dfebab324de95a735c0f56e67134891bace44b1f9b7a25133ffcb74c652c6568c5afedce26907fdb SHA512 22829daa5923342eec400a24342b1d738226073bb676476e4af97629d9311426b5d2465e60811696e55401568b90e152ac96d877c6262c416099a609862db742
 DIST pycuda-2021.1.tar.gz 1682423 BLAKE2B 0ebd7554a5f92cd0d39ce7b5f64218f0b0dcfa1f3e63d3180306a149ad0581150630813eee7fbc17e32bb35ea711a46b84332705d6ffece7b11e7e928ef07aad SHA512 1df09f59e254f7e39b630ff41d22237ab0c81c0e6e7b7611c57eb98ade8531356b9cb3e381e6fa7e8495a46c465458febaf8ad56ceb8d570b5b25defb6dd55a9
-EBUILD pycuda-2019.1.2.ebuild 2218 BLAKE2B 060c482016d93534327e5e45fdc0560be24339490b642c2837a93194787e9f032710b090d92f421085ef95e04d37f4d0313c91590a4eafeac0385bb6ebf0bec8 SHA512 56cf00ec1761d1b8b2a6ba72cfc1ea43f1a64d4537dc56701c28758584e7e7516b924ec31be6862aad3e69117fb7f7505db7e6a408ab0b48bc1093b415fb8046
 EBUILD pycuda-2021.1.ebuild 2353 BLAKE2B cf5e625a9bede76f3df86394ec8a71095301cd916669bf19e6d0bfe895f6ed2c8051b2235404cf9032c302dbeb937315b2eec19dc4fae8498459e3038ef5cae2 SHA512 3bf6a3688da755a4fc53ac200dfceaddb120c568d1db70626b0baca0d1b305211ea2eb51b4169be2f25d9a061234ac33a37299ea38ca2dff4c9de8dd5a59f880
 MISC metadata.xml 333 BLAKE2B fcbf9c2b3c4fe1261c4576c8b95ce0ec1e8182e8377205927acfdb803668d70653e1572d50be0c9d1c2400b81a7db9003db3aba9e85cc6892f5f1f048a546a9c SHA512 b05c6924e1a322ebba353240ddc5392f4c8b5172c291f259c0d149e644fded7f48056f3950651d73782fd4b0c88b5bcf33aec772e9f61bdd41b6d4cfad1568d5
diff --git a/dev-python/pycuda/pycuda-2019.1.2.ebuild b/dev-python/pycuda/pycuda-2019.1.2.ebuild
deleted file mode 100644
index a2d14a91432d..000000000000
--- a/dev-python/pycuda/pycuda-2019.1.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit cuda distutils-r1
-
-DESCRIPTION="Python wrapper for NVIDIA CUDA"
-HOMEPAGE="https://mathema.tician.de/software/pycuda/ https://pypi.org/project/pycuda/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="examples opengl test"
-
-RDEPEND="
-	dev-libs/boost:=[python,${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/pytools-2013[${PYTHON_USEDEP}]
-	dev-util/nvidia-cuda-toolkit
-	x11-drivers/nvidia-drivers
-	opengl? ( virtual/opengl )"
-DEPEND="${RDEPEND}"
-
-# We need write acccess /dev/nvidia0 and /dev/nvidiactl and the portage
-# user is (usually) not in the video group
-RESTRICT="userpriv !test? ( test )"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	cuda_sanitize
-	sed -e "s:'--preprocess':\'--preprocess\', \'--compiler-bindir=$(cuda_gccdir)\':g" \
-		-e "s:\"--cubin\":\'--cubin\', \'--compiler-bindir=$(cuda_gccdir)\':g" \
-		-e "s:/usr/include/pycuda:${S}/src/cuda:g" \
-		-i pycuda/compiler.py || die
-
-	touch siteconf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_configure() {
-	mkdir -p "${BUILD_DIR}" || die
-	cd "${BUILD_DIR}" || die
-	"${EPYTHON}" "${S}"/configure.py \
-		--boost-inc-dir="${EPREFIX}"/usr/include \
-		--boost-lib-dir="${EPREFIX}"/usr/$(get_libdir) \
-		--boost-python-libname=boost_${EPYTHON/./}.so \
-		--boost-thread-libname=boost_thread \
-		--cuda-root="${EPREFIX}"/opt/cuda \
-		--cudadrv-lib-dir="${EPREFIX}"/usr/$(get_libdir) \
-		--cudart-lib-dir="${EPREFIX}"/opt/cuda/$(get_libdir) \
-		--cuda-inc-dir="${EPREFIX}"/opt/cuda/include \
-		--no-use-shipped-boost \
-		$(usex opengl --cuda-enable-gl "") || die
-}
-
-src_test() {
-	# we need write access to this to run the tests
-	addwrite /dev/nvidia0
-	addwrite /dev/nvidiactl
-	addwrite /dev/nvidia-uvm
-	addwrite /dev/nvidia-uvm-tools
-
-	distutils-r1_src_test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/pycurl/Manifest b/dev-python/pycurl/Manifest
index 09597adedc54..ec60928f49c1 100644
--- a/dev-python/pycurl/Manifest
+++ b/dev-python/pycurl/Manifest
@@ -1,7 +1,7 @@
 AUX 7.44-fix-tests.patch 1679 BLAKE2B ca0126a6dc12203ba8409c70ffa5142288bc94fd07ccc4404ee6f19a8515a46cc4e257dd26a12266aa3263e359e9167daa3ef36bde9867d2a4346ce38fcaac1b SHA512 743fbc3335daccb4e1d21b4c0e659d87582120b21d1cacecf0725fed9fe1eb6251761fdb50814c04e79ac3b13408335b34072e94bc704d3c333b96eaa9d52f76
 DIST pycurl-7.44.1.tar.gz 227562 BLAKE2B 7dcbde563140f28382768b89b95422f873d5396a1f050dfcd3686d87b0ca2c3f3871281ed87b1dfbe7e4268728c2ec3ba7a76e7d7ef57754af5c185bf2a6fbe8 SHA512 e251db332791de07364695b5fd59b3a290486eabbde8be9914b5edeefa8702b4dd9ab678739ad765f76ededeb7192444fefe2a076d3977f454259dfd06731059
 DIST pycurl-7.45.1.tar.gz 233879 BLAKE2B 8a6fe72f00cfd172b4f5e257f4526c4115047aa911d7fb3802d3bf105ac70dc866b27fa4878aae9f92229a5dd5108a2b5e1c9acfe93e1a94dac60d9405c5d5e6 SHA512 05639d484aac6d6688677589e391975158c5ef778456a47df575ad13fb8bd0db67ff8f5a39bdd99d82a67926aca421c01e687eec9d4fd87f32822b492b429635
-EBUILD pycurl-7.44.1-r1.ebuild 2606 BLAKE2B bc677f62ef43f7d11821d04de969228de756157ba0a71ff90fb8b3aba365afa76d11b8ef77c0f2c1e4ded872dd14043db6f95b02ab5164600c33b1b6f72cd592 SHA512 51f87fc8f98ef21fc15cfd5bc1276e978f469c7fd88c6f1aa4d5fdd3cebfa2e7dcf4dc474ebb2a77a778d5325e1389ce3a8d692394f8a9fc6858bb3877eb9107
+EBUILD pycurl-7.44.1-r1.ebuild 2600 BLAKE2B fcc99408299686d8036af73605ccdde86fd6b5a8c7a0443c9865c5b4825e5319aa22992ff858f6775bc080094a9f5d7155ca89455ade786c7cd9c3166a859610 SHA512 09cfa400f1853e5a3dbd1607400bf5adf8c87f54fc2892d1759877b75aad9e257ea171d60d5ecb9a7fd69ad93aedae3364a25bbccbc94a718aa4c3c09d5a9a9f
 EBUILD pycurl-7.44.1.ebuild 2567 BLAKE2B 466bf05ee32f22414003634b550e0fc137b7b12a48771a99ece9382835ce55500c36c6ae9726fc3b8a326f6e14ed82e6be18d40f516b26a8aa15bc23572ca5d6 SHA512 5da6e47330010c905f5c71b6f2af3eed23cf811272fc6d2556c39e1e4f97d788828ce47728f1c4fb68e116f4dc1b4f262e31a4be7c0f760312a7306621ade7ab
 EBUILD pycurl-7.45.1.ebuild 2576 BLAKE2B 0ebfbc982170ac686f98b095fb0339ffb1a3e64bb83d7be26c8f6c81ab64a748058278b4f874e2f87dc4e7c94054620e6ef3dc6ae7795c0401abfb30f9befbad SHA512 f8a27a8b42a3f481c82b631aa645dc180b32d0ef1845712689404cf9be2070148a28a8ab38ff394b1c920c8d789852125b9d338dd4d8c0d0599941755f67d024
 MISC metadata.xml 1100 BLAKE2B dfc7fe054c7cc34c61bf58fef0378df304a539c28cbc0dff4ffff65ccc8892c38aaf1e275885fc54d2854d9acc6b382947038041f815b5941859be7cfe75523f SHA512 f1de0dccd625ae0b02ff9a55cbc1bbf7944faa24dba28ffd711c728001f180afa598a255132aea860ad616637325cdc653577af531b1a954a3994e8902c774aa
diff --git a/dev-python/pycurl/pycurl-7.44.1-r1.ebuild b/dev-python/pycurl/pycurl-7.44.1-r1.ebuild
index 0d8b5912af3a..95ccf08e9bf8 100644
--- a/dev-python/pycurl/pycurl-7.44.1-r1.ebuild
+++ b/dev-python/pycurl/pycurl-7.44.1-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pydantic/Manifest b/dev-python/pydantic/Manifest
index 63bb6d3b8d4d..793e39c11d66 100644
--- a/dev-python/pydantic/Manifest
+++ b/dev-python/pydantic/Manifest
@@ -2,5 +2,5 @@ DIST pydantic-1.9.0.tar.gz 299758 BLAKE2B f6c2b89e598fc94db74b8165c449c752f11166
 DIST pydantic-1.9.1.tar.gz 306846 BLAKE2B c22e892f403b6ca5eff7f888c68f9df5c198fa03c8dab833edc556b3b1a4819fc28c9818a649bf5d9c4bb745b0bde826e164eda7760cd26f88e278c86776ad84 SHA512 19d2a50ef054b76cc7e8756759f3d67a14a58614dd6ff1b4f60e73354b0028e08743aa3bb5944da7ae357ab279134d3685c454d6affa6524b267c7cd9a40375e
 EBUILD pydantic-1.9.0-r2.ebuild 1781 BLAKE2B 1abc19250b73f7675214ed0f10aa8fae0f3b8f57302167e1af93c2830d05b3c080a62f1d7d37088aecb47765688b7f314017d3f0348d127422a7856a92a130b5 SHA512 2bde02fb92797d94a67ee7cc247e0cf862a7910847d9e94043b8377476db6e2ad9d528f5fbb95ee97d17b70f05573c50780965c1440f2bd84ab5dec628fcb53c
 EBUILD pydantic-1.9.0-r4.ebuild 2046 BLAKE2B e97b3adbb7c234d580b1c2476843a01f9eca49a7fef9b38ad0c9b71c3212438ddf0eb22d07cde79495c78997ccff231cc0be2c2ed1c16b6b87db5bcb81b67337 SHA512 f6a8b7672c8e55938003d20aa1baf37430d2d023ac5990b8631c4c9a3448a4785efe0ef534c8e8a44524f90b77116aeb48bdfebebf4034e7fa5b2b3cae573d9c
-EBUILD pydantic-1.9.1.ebuild 2103 BLAKE2B 6cc23f9d95eb4eda7c1bbc115cc00171eb3d8d6dd955aaed127c6b1423fd7aa714f053b6a924aa2ef83657281dc37e997451ce915aa1911160bba9c5da0841ee SHA512 656f6a54dd0f1dd206828da34a5b85ce5a2fc33f1f24693b1a1622dd359d16ace681688fdc71115333683e0f98e3ac9ef07f0533502e67d89d4889f2f4409266
+EBUILD pydantic-1.9.1.ebuild 2100 BLAKE2B 67660ff4fd1bdbd4c6d24bd5ceaebf87459491873f4fdc9c9e2147225d6dfd9c50275fc2ef99e48453e9d934da234892f7b32f0e9841f2eebf471bf38e727e40 SHA512 47341d28f610efa584fff57982e717c999c0245a7953d00a4e89edfc4ddfd66e5c8a372f57dbade727dfb23b3d8b7359034a9d17a10a6f607ea7e8045a4832e2
 MISC metadata.xml 492 BLAKE2B e21bc5a40669b2b321ba310df9dd4c6ff424e77d9d961b3aebc1f62b579444c7f505c19dae02590de999cfd8168ac522034275583fb4835e97e8db9b153fefda SHA512 bfb9c7a069a79735543dc12101af7cca16acc5fd93cae01515dc35a106c16a419c0e0e3a97a6bc8426c3db776417f7d29231022cb6ac27020f97e5dcfe0d0cbb
diff --git a/dev-python/pydantic/pydantic-1.9.1.ebuild b/dev-python/pydantic/pydantic-1.9.1.ebuild
index 14a7532e125d..a8d4252b6f35 100644
--- a/dev-python/pydantic/pydantic-1.9.1.ebuild
+++ b/dev-python/pydantic/pydantic-1.9.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/typing-extensions[${PYTHON_USEDEP}]
diff --git a/dev-python/pydevd/Manifest b/dev-python/pydevd/Manifest
index 4191e7e75c24..decd7cd71ad2 100644
--- a/dev-python/pydevd/Manifest
+++ b/dev-python/pydevd/Manifest
@@ -1,4 +1,4 @@
 DIST pydev_debugger_2_8_0.tar.gz 4171117 BLAKE2B 4f0ea0eeb228cb66f71e2046438396ff5ce59b42e620a067bc515ff504fa2da151e05f8ea6cf2d1aaa0768122431ccb45708a88c0616fb2859e96671b172e822 SHA512 b0189f1824b52f8ad35d1d1cfba0bd734806541ae2ff4f410c110763201630d296d10c2b7eaac8c656dfb3ff0f3c31bfdf2de28323778000cc7821e123a877d3
-EBUILD pydevd-2.8.0-r1.ebuild 2537 BLAKE2B d9aad25f7bb3a6de461b3c7b8f868b00354477f3137cc866a753b9e185bbbfbabe7c3c95038647c492ce6030ebf4e34c92aba70462c813a745689181b7176abc SHA512 d4cd470e1ebffc649f3869dfa9a7e289c090166af83c484823ba6a23ba8fc36e8a6a49bba2f6cc823ed35fa658bd3a507fa8db493fca816dd000cc93a8ab063d
+EBUILD pydevd-2.8.0-r1.ebuild 2530 BLAKE2B 93678cf0ef2c0cfe1bad4831317297f6168201a7e50fa95bce8aae7415ca14ae101786e6d58277987dcb1d8e47be1b4feff0cea3a6d7c79784ade0f8a74b3736 SHA512 905c542665ea951b77698f23f3ef1e350ca356d5f1d445e6245c7e4d90aa0a321d055e2c2c48cf49a160a93cd7ecbc4ccd323e15aa6265cefdc52c3bd0fb65b7
 EBUILD pydevd-2.8.0.ebuild 2551 BLAKE2B 4a39d39b1f4602398356e52dac958851cad3abd627b76c53f9c167f96c037c2b89c0d1d6c441f5af3bbfa2605ee2b629726158c7488c06cf98d1989205a1552d SHA512 3f6823845c558447f863a0029cd077c2118817894059383e758f0165379528d1585b756a95b823881cc00681784cc42169b19c31e4a6db4dd3391fdd7a68b9c3
 MISC metadata.xml 384 BLAKE2B 37a4caa01a28f98ec8d141129c08754e6ba4dee5910a81c26f3eafcd7ac832962e91d3e39783e4859ac7e5ae5754837c89e496c4c2c205d12626359adf7dddae SHA512 5cf80b2e0eaf21e900c83341e9bef5c74a36d3c0a7354e3b6a832184cc60c42eeef6a22236e4fd9d484dc8834e5d4f98facd2578c223da2cc187dd76f91db764
diff --git a/dev-python/pydevd/pydevd-2.8.0-r1.ebuild b/dev-python/pydevd/pydevd-2.8.0-r1.ebuild
index 92d937058dbe..e6ded90c5c8f 100644
--- a/dev-python/pydevd/pydevd-2.8.0-r1.ebuild
+++ b/dev-python/pydevd/pydevd-2.8.0-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/PyDev.Debugger-${MY_P}"
 
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 # After removing and recompiling the prebuilt lib the tests fail?
 # For some reason the test suite is executing a slightly different gdb command
diff --git a/dev-python/pydotplus/Manifest b/dev-python/pydotplus/Manifest
index 9991fad411b8..db18a50c7b46 100644
--- a/dev-python/pydotplus/Manifest
+++ b/dev-python/pydotplus/Manifest
@@ -1,5 +1,4 @@
 AUX pydotplus-2.0.2-tests.patch 907 BLAKE2B 387823545ea3b1372b6584a4b2daca756eb21d81487e3749309c155e37b21171e8e624d54caecc0b356a1456446a4e3b8340b5fc233301bc270fb3056571a601 SHA512 21dd557a0a94d6ad0e4932e01a97a450d76c0f7bcceab870b0ba60a2b96c711ab139fc682ca2a20da4c68b49fe37577763639bb77b9fbe28c7fa1281f2e5bb4b
 DIST pydotplus-2.0.2.tar.gz 278677 BLAKE2B 879271ba7e2104134a71caef7676082420770dcdb34aeabfe76232ad8f9774d3e90a9f7ca5fb407a7a4e8e0c4e5e01824bd0d5936fe77554cc661839fcc0dc7b SHA512 6f06a1f284401123a4514f9e9a4974dee8dc8d01e6b7c40a797fb70eed22b99fe774272f8b106b5632a33f524b356349fe1ff9633101ff61ef2fc3fe69d641ac
 EBUILD pydotplus-2.0.2-r1.ebuild 620 BLAKE2B a2317b42a99c4e91c6516964afdeec903d6ff93e35d1685d78540ab17611ffee676dba6c906fafe46d530c00c3da45283d5408ce5877032f288fa044d722e6fb SHA512 9407534321537713f067439258e5ed8559c289eca1fb6acfcfc4fbda61050f1538a355012e1328425ca88f086b501438a8e6ceb14b7faa9fad5a2fe2f56e031a
-EBUILD pydotplus-2.0.2.ebuild 586 BLAKE2B 3062f42c4fb51ae8c5f4c1e9c5693e518e89a322af632cc11bbca2ff012ea0c0d854aecd510a7ab7924888ae5b92ab3166b87f35b8cf82f9b573fa28884e7d8e SHA512 1360a195c6cf9725e1c93aa21d1a3c54352e41391288b7dce54195050d543e99a39d439acd6219a077b4566c579560782780b178afe5e0d142034670a270b3da
 MISC metadata.xml 642 BLAKE2B 910a9eae9b71e007107680352ac5f1a6af0d12dd78e496cb2245e9bff0727eea377ea6c82d85584340bee94bb163f2f93fe273ea46583f8c20f4e5b8f1cf7418 SHA512 06a7c06b6e064576de57e5de401bce5fd440431b0f70e385cf08f59eb9dca02a7b5eeb58ba1e99d74c9d950584b68c08c2a2298f47ef70ec9fe85641cdec16a0
diff --git a/dev-python/pydotplus/pydotplus-2.0.2.ebuild b/dev-python/pydotplus/pydotplus-2.0.2.ebuild
deleted file mode 100644
index 93ac855e6227..000000000000
--- a/dev-python/pydotplus/pydotplus-2.0.2.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
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Improved version of the old pydot project"
-HOMEPAGE="https://pydotplus.readthedocs.org/"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	media-gfx/graphviz"
-
-distutils_enable_tests unittest
-
-PATCHES=( "${FILESDIR}"/${P}-tests.patch )
-
-python_test() {
-	cd test || die
-	"${EPYTHON}" pydot_unittest.py || die
-}
diff --git a/dev-python/pydyf/Manifest b/dev-python/pydyf/Manifest
index ec1db0c15157..556c4468d8de 100644
--- a/dev-python/pydyf/Manifest
+++ b/dev-python/pydyf/Manifest
@@ -1,5 +1,3 @@
-DIST pydyf-0.1.2.gh.tar.gz 14272 BLAKE2B 66e3a9ff2297994f61573fd033a43e1af5bf6b27335b87abdb9b42e469d954cb518faed3707a246c4bb59fd93a769970a0be9dede5c6858b5ce90f264ff4d289 SHA512 d3d9ebc5daed3e1d09de788505888120c907427c44afcb80ebe1e807e25ca95e8f3a76aebc30a33e915667827e396621e1af67216a2e88db3e75fe81c1d933f2
 DIST pydyf-0.2.0.gh.tar.gz 14530 BLAKE2B 00c696ea191abe111bf0ef098507f34ebaaaee516dc1afc46a194f3e051171ad1854292f5a3fcf1b559945990647ef8cbb308b3afe0dbc05120f15aa74dc8a63 SHA512 276083d8082c5ccc945144b7d2e3ba29f160d5159aa8d27726079dcc09a44a95d5b0f790874425cb41a00b1c22890b435b756b0bbe14ab43e9ad04a8ae2dad0e
-EBUILD pydyf-0.1.2.ebuild 681 BLAKE2B b4d4cf0189e83502b333ee80d819255b5bcff3c29db9cda7050bc3ca395f2c1f453a9a57962b748e323fe656674b67a77ad09d5e35b3f79fed9ddfa6c0a0528e SHA512 27f34e058ccb48b64974ab898e37a1df85f3cdb1f8e48e47d19597a5023b4d2162eced02a1c239c3c5facf74e7b80bbdc7dc480062e7065fc9f6f8e19ef716a5
 EBUILD pydyf-0.2.0.ebuild 676 BLAKE2B 5b83eb78d993b20906f08808292fffd9dfa714bb6ffb2815c3b77eb50db0e28fc0ddfe41697856d381583a766a9ef38baab2919de7f40f72a3bded477b3453bf SHA512 06113bc776109a81969ed09f425d1302cf6ccc7b19565690e293cbcab0daed9a73e1f98ad8cb06af941e7d5d9ce1d1b80380872f69902027c30e3450c2c1ebd8
 MISC metadata.xml 346 BLAKE2B 1019f43890db1484163da244f781505c1193dc5516cbeb8921540dc298d4cf61903a9a0151e23cc22b7db7fd677f4424c74b5a051b95eb75e38f3546501096b3 SHA512 420175bcf83c3fe2fc1bcebfd88f07e3c56272b999f9693a82b76a703ea5d94d6e144683a67eca871bc6d2723ceb8f70c4d29e354df20d273587a7be6a369904
diff --git a/dev-python/pydyf/pydyf-0.1.2.ebuild b/dev-python/pydyf/pydyf-0.1.2.ebuild
deleted file mode 100644
index 0ecfdfd4412d..000000000000
--- a/dev-python/pydyf/pydyf-0.1.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A low-level PDF generator"
-HOMEPAGE="
-	https://pypi.org/project/pydyf/
-	https://github.com/CourtBouillon/pydyf/"
-SRC_URI="
-	https://github.com/CourtBouillon/pydyf/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	test? (
-		app-text/ghostscript-gpl
-		dev-python/pillow[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/addopts/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pyghmi/Manifest b/dev-python/pyghmi/Manifest
index d9c2c6a9390b..29996758c917 100644
--- a/dev-python/pyghmi/Manifest
+++ b/dev-python/pyghmi/Manifest
@@ -1,9 +1,3 @@
-DIST pyghmi-1.5.42.tar.gz 241338 BLAKE2B f005697a13517f707bc74132d54ebdcc3752409aa147fdc9e99143f1c6a0507e24725e8bc2bc07980e017e6c6fff9868f84bf02fb598a2b580531aba0b66eafc SHA512 ec191a9862a4e6f28a8dbcb54759ad5c3a81ca3f85ecd4c9bbad634a3392296d5aad49d809a099d2719f2235dee2fac962374a4109dee120a4aba521a589afd5
-DIST pyghmi-1.5.43.tar.gz 241608 BLAKE2B edda01665ca4bf5337f8e92aea0fe099597f4c516a3f750ae9747cf80a0710ffc4324c387f826b440f03d30ef68efe93a99122abf9edd03727e32a5e255858f2 SHA512 53f6c4685b395cb3673be8e78c1845c2b0e021d526eb96b3c53a039c7de03e546c7cc6cc1d15003fd1d70ac9d9d2ddadadb62b6b4ee5a95d30c854582bf2785f
-DIST pyghmi-1.5.44.tar.gz 243496 BLAKE2B 9f6a0618c19ff523db33069f63353eb3c262bcce2dae1b8b94ed103997a6a7ec1bb68a43cabbc9dcbbd78182e193ed5d8ef24877e7d6e5f2cc7c53d2a48bc002 SHA512 7c526cdbee3f4ee0fab4001380b860203d5afeaf247709c13815f2de15dd733bbcf275bb0e3667d03bb15cec11711cd50dc8d56a8035bdeb4cb9c75f0f651a9a
-DIST pyghmi-1.5.45.tar.gz 243685 BLAKE2B cb84b9d5a2194a8be852870a967306abff226f065a8811636729f67b13bf5289268ce6e5130362998f047faee7efe3a577473f93acf800b5899de7d84569c10c SHA512 ed670ca2b7e6d21dd91198611a380dddb3a08073562c4e26a90805fb65eac0c410f217e8b3c91be21b0df399a77bb59ed5d87031ff74e89afa969462bfb5aeb7
-EBUILD pyghmi-1.5.42.ebuild 985 BLAKE2B 567b053a6ae5707e6f7c6de607ecaee5a6904a8c705beafeaa82c5614914433df06fa462dcb1cfe0d6173cb4f6c62579f778bc4c2e16f000a8ec76ee3b5e30b9 SHA512 cfebc5ca5b3460ec76b1a62b6d6a4642aadebc1739ea9b763f2556558f39597d613cc4b8f43b4e66ad02cc20e21d1b9a904554ca005d3ee9dd875718b7860794
-EBUILD pyghmi-1.5.43.ebuild 985 BLAKE2B 567b053a6ae5707e6f7c6de607ecaee5a6904a8c705beafeaa82c5614914433df06fa462dcb1cfe0d6173cb4f6c62579f778bc4c2e16f000a8ec76ee3b5e30b9 SHA512 cfebc5ca5b3460ec76b1a62b6d6a4642aadebc1739ea9b763f2556558f39597d613cc4b8f43b4e66ad02cc20e21d1b9a904554ca005d3ee9dd875718b7860794
-EBUILD pyghmi-1.5.44.ebuild 985 BLAKE2B 567b053a6ae5707e6f7c6de607ecaee5a6904a8c705beafeaa82c5614914433df06fa462dcb1cfe0d6173cb4f6c62579f778bc4c2e16f000a8ec76ee3b5e30b9 SHA512 cfebc5ca5b3460ec76b1a62b6d6a4642aadebc1739ea9b763f2556558f39597d613cc4b8f43b4e66ad02cc20e21d1b9a904554ca005d3ee9dd875718b7860794
-EBUILD pyghmi-1.5.45.ebuild 985 BLAKE2B 567b053a6ae5707e6f7c6de607ecaee5a6904a8c705beafeaa82c5614914433df06fa462dcb1cfe0d6173cb4f6c62579f778bc4c2e16f000a8ec76ee3b5e30b9 SHA512 cfebc5ca5b3460ec76b1a62b6d6a4642aadebc1739ea9b763f2556558f39597d613cc4b8f43b4e66ad02cc20e21d1b9a904554ca005d3ee9dd875718b7860794
+DIST pyghmi-1.5.47.tar.gz 243783 BLAKE2B 4611df2616c7681c10664b645969b40f85a41ea2f16c3bcd4123230e90087903e6d7265b0147d93f994a4af32a77750685230d4e977418ba129a3e2093f8065c SHA512 f4122537488ca05035603f15106646e539c5081ee71ba3fc1f37e8175ffe98dbbc59446fa4683816a4211b90bb9f82adea4c5d42e4ce8b2b301c35f862262394
+EBUILD pyghmi-1.5.47.ebuild 985 BLAKE2B 567b053a6ae5707e6f7c6de607ecaee5a6904a8c705beafeaa82c5614914433df06fa462dcb1cfe0d6173cb4f6c62579f778bc4c2e16f000a8ec76ee3b5e30b9 SHA512 cfebc5ca5b3460ec76b1a62b6d6a4642aadebc1739ea9b763f2556558f39597d613cc4b8f43b4e66ad02cc20e21d1b9a904554ca005d3ee9dd875718b7860794
 MISC metadata.xml 439 BLAKE2B 0c7ccbc424041a506c60bb0934e40465b64a9779d4d2b6992ba5d4c8563b114da1470a1b221798773824b92fc7b5d6e7b2f0b0afff7f266ea1fbf450f336c497 SHA512 0c919c41bbef88b080cd5941d767cb3f79e935dfedb6da16353b80da2966d488936768b8ad04c7fc695b3c6376143430115f5533b3492816bf293ab2ccf37fb8
diff --git a/dev-python/pyghmi/pyghmi-1.5.43.ebuild b/dev-python/pyghmi/pyghmi-1.5.43.ebuild
deleted file mode 100644
index 1844c945d4be..000000000000
--- a/dev-python/pyghmi/pyghmi-1.5.43.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A pure python implementation of IPMI protocol"
-HOMEPAGE="
-	https://opendev.org/x/pyghmi/
-	https://pypi.org/project/pyghmi/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
-	dev-python/pbr[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.6.5[${PYTHON_USEDEP}]
-		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/pyghmi/pyghmi-1.5.44.ebuild b/dev-python/pyghmi/pyghmi-1.5.44.ebuild
deleted file mode 100644
index 1844c945d4be..000000000000
--- a/dev-python/pyghmi/pyghmi-1.5.44.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A pure python implementation of IPMI protocol"
-HOMEPAGE="
-	https://opendev.org/x/pyghmi/
-	https://pypi.org/project/pyghmi/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
-	dev-python/pbr[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.6.5[${PYTHON_USEDEP}]
-		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/pyghmi/pyghmi-1.5.45.ebuild b/dev-python/pyghmi/pyghmi-1.5.45.ebuild
deleted file mode 100644
index 1844c945d4be..000000000000
--- a/dev-python/pyghmi/pyghmi-1.5.45.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A pure python implementation of IPMI protocol"
-HOMEPAGE="
-	https://opendev.org/x/pyghmi/
-	https://pypi.org/project/pyghmi/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
-	dev-python/pbr[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.6.5[${PYTHON_USEDEP}]
-		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/pyghmi/pyghmi-1.5.42.ebuild b/dev-python/pyghmi/pyghmi-1.5.47.ebuild
similarity index 100%
rename from dev-python/pyghmi/pyghmi-1.5.42.ebuild
rename to dev-python/pyghmi/pyghmi-1.5.47.ebuild
diff --git a/dev-python/pyglet/Manifest b/dev-python/pyglet/Manifest
index 4fec798efddf..250a21832547 100644
--- a/dev-python/pyglet/Manifest
+++ b/dev-python/pyglet/Manifest
@@ -1,7 +1,3 @@
-DIST pyglet-1.5.23.tar.gz 6532823 BLAKE2B 0f69766ff424385c623c0b5bbca74741f4a55008365a90617a8f688954cbd58e898f733b893ef5dc2e1a25f9aab400e1d6f17bb932353f1f4f339e73f79406d5 SHA512 ed088ee37521d8594cb7fd017f86c3ce0f8e8794bc628c5404cbe2d33fb56db0fa306e83e89be7d132be68be73619fdd30d4410cd04a3bcb2f5f012443fb8ed8
-DIST pyglet-1.5.24.tar.gz 6533762 BLAKE2B 6ac19bc8e5eb55b068cacd1828adb09bb2f42f0231e795770cb110ad70961c7618dacb47bed043d26ca237b2fbdb6e7a319180208f9401e82e18beb73da62638 SHA512 d7dcc5ce8f718184e3cc8c398033975ca95c67802153e9470075e93c8ab587fd81f2c9f5a851e0719fd32d42576706da4a6f9b3053a597d56bdd8ad0047c735f
 DIST pyglet-1.5.26.tar.gz 6534434 BLAKE2B a4366390f4ed92ed9e6c2d362fd8a009adf0e8a21ca00e1b9fead3cba99d192bb007413eca36892433f3bc4e2bf3258c550b2827262fc70e87b20566d46acb15 SHA512 819b2bbf71c9c632c1cefbb31e2a7186905c1475a1e978cd75dd6c019e5a53e6af79bceb57c68b61a3bb5692e04091c89c67b9168bb76ee19009c1ab719b8530
-EBUILD pyglet-1.5.23.ebuild 1373 BLAKE2B b670720c2d7f0320b44b17057f5fba60557298d0548cc0929c42b3a2a1f1d651ed933989d598630863089b305af1a70b7a6dd20f395471429fad0313a30cce27 SHA512 a1ddc286f99319e90daf93aa8cc55388ce688d77213979858024ae8081eb52ac653437e35a2614b5918fcbe93f519c28dc2863613369c0e1a4209bfdf1f8dba1
-EBUILD pyglet-1.5.24.ebuild 1576 BLAKE2B beccf79aab4c26612f65ea8563044e6effe82244791fc341a327855b0e1c43f17ae3f6a5311d248d77573d1c7264ee0c6f90e66941b738942cd9d4097634c58f SHA512 7c8a053815bd46f0a037f2db3f73b124405e36f4b3451506805a9f67afac77977f154f0e889b987af0201ea7d1946a0805615a7b9a0b4682f129b7d101531177
-EBUILD pyglet-1.5.26.ebuild 1576 BLAKE2B beccf79aab4c26612f65ea8563044e6effe82244791fc341a327855b0e1c43f17ae3f6a5311d248d77573d1c7264ee0c6f90e66941b738942cd9d4097634c58f SHA512 7c8a053815bd46f0a037f2db3f73b124405e36f4b3451506805a9f67afac77977f154f0e889b987af0201ea7d1946a0805615a7b9a0b4682f129b7d101531177
+EBUILD pyglet-1.5.26.ebuild 1574 BLAKE2B a701c65476ff75e74611efe43d8401929e10ab4d73aee621664ed0c1772cc153d02799578a08f9f07fab8fde8033abca3b367ad705f71956c7242f9eb441e8ad SHA512 9c6cfd4b55ffb1f876dfa3b268f27a812b263ca92a428aec34885a9288c1aaee9a8cab15c073536da01fb54fa8db8710469c6bddbe543c4e54376b930055a610
 MISC metadata.xml 1092 BLAKE2B 51abba6b5545fb47d277edaca91fda755e885f08a9407f5cd3d468c8b0b86991b57d8d151e27d59755ea884ae894ed0e5c32d357b0d81e66eb9054ca6fc92055 SHA512 7e47cc4c39ebf827bf46423251df994a65c2af8ada9420b36810e36f245bbd810796bc8b02cbce182ff071bbd9dae0c9e5d9f5cb201349cd49fa311b3891dc2f
diff --git a/dev-python/pyglet/pyglet-1.5.23.ebuild b/dev-python/pyglet/pyglet-1.5.23.ebuild
deleted file mode 100644
index 32ae3d197173..000000000000
--- a/dev-python/pyglet/pyglet-1.5.23.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1 virtualx xdg-utils
-
-DESCRIPTION="Cross-platform windowing and multimedia library for Python"
-HOMEPAGE="http://pyglet.org/"
-SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
-IUSE="examples image +sound"
-
-BDEPEND="
-	test? (
-		dev-python/pillow[${PYTHON_USEDEP}]
-		media-libs/fontconfig
-	)
-"
-RDEPEND="
-	virtual/glu
-	virtual/opengl
-	image? ( || (
-		dev-python/pillow[${PYTHON_USEDEP}]
-		x11-libs/gtk+:2
-	) )
-	sound? ( || (
-		media-libs/openal
-		media-sound/pulseaudio
-	) )
-"
-#	ffmpeg? ( media-libs/avbin-bin )
-
-DOCS=( DESIGN NOTICE README.md RELEASE_NOTES )
-
-distutils_enable_tests pytest
-
-python_test() {
-	xdg_environment_reset
-
-	# Deselect openal test, can't open device in sandbox
-	local EPYTEST_DESELECT=(
-		tests/unit/media/test_listener.py::test_openal_listener
-	)
-
-	# Specify path to avoid running interactive tests
-	# We could add in integration tests, but they're slow
-	virtx epytest tests/unit
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyglet/pyglet-1.5.24.ebuild b/dev-python/pyglet/pyglet-1.5.24.ebuild
deleted file mode 100644
index 09e50811bc5c..000000000000
--- a/dev-python/pyglet/pyglet-1.5.24.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 virtualx xdg-utils
-
-DESCRIPTION="Cross-platform windowing and multimedia library for Python"
-HOMEPAGE="
-	https://pyglet.org/
-	https://github.com/pyglet/pyglet/
-	https://pypi.org/project/pyglet/
-"
-SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples image +sound"
-
-BDEPEND="
-	test? (
-		dev-python/pillow[${PYTHON_USEDEP}]
-		media-libs/fontconfig
-	)
-"
-RDEPEND="
-	virtual/glu
-	virtual/opengl
-	image? ( || (
-		dev-python/pillow[${PYTHON_USEDEP}]
-		x11-libs/gtk+:2
-	) )
-	sound? ( || (
-		media-libs/openal
-		media-sound/pulseaudio
-	) )
-"
-#	ffmpeg? ( media-libs/avbin-bin )
-
-DOCS=( DESIGN NOTICE README.md RELEASE_NOTES )
-
-distutils_enable_tests pytest
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	xdg_environment_reset
-
-	local EPYTEST_DESELECT=(
-		# lacking device/server permissions
-		tests/unit/media/test_listener.py::test_openal_listener
-		tests/unit/media/test_listener.py::test_pulse_listener
-	)
-
-	# Specify path to avoid running interactive tests
-	# We could add in integration tests, but they're slow
-	nonfatal epytest tests/unit || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyglet/pyglet-1.5.26.ebuild b/dev-python/pyglet/pyglet-1.5.26.ebuild
index 09e50811bc5c..cc992542d9ff 100644
--- a/dev-python/pyglet/pyglet-1.5.26.ebuild
+++ b/dev-python/pyglet/pyglet-1.5.26.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="examples image +sound"
 
 BDEPEND="
diff --git a/dev-python/pykka/Manifest b/dev-python/pykka/Manifest
index e4ed69ea698a..7bed484b7fff 100644
--- a/dev-python/pykka/Manifest
+++ b/dev-python/pykka/Manifest
@@ -1,5 +1,3 @@
-DIST pykka-3.0.2.gh.tar.gz 44440 BLAKE2B 8649e4b5134d902a459cd7f43ced59fb88bf6e9f7435aaf89a3c68fd349b941eea8154703107611a027c39b9eaca374d39497dd4f0dea72a1edfc4df99153539 SHA512 0e10366739839d792ac8866b2dc5f7a2d352b04f896ffa1c1922b215e8907f6fb9300ec955d5ed5f8c19d0714720b7f20569177cd1a9f2c98fbd27e42a9bd3f5
 DIST pykka-3.1.1.gh.tar.gz 44312 BLAKE2B cb50f01e27ca7b6aec10b61fb41d59e1d4fec29b65595afbab1e931137ef35efe8860bab0ce3b7a6a30a44aa215deb237a4e13abc541c537dab062b7d14acf0d SHA512 0cb5ca7924f77d9d0ba8b2f288e2a635f7ce70ae49bd5f5ddf574f37f76252b575cb95898ab244d27b96090345bcbbe82bad1c97f5cca73fb8fffa707e553e55
-EBUILD pykka-3.0.2.ebuild 578 BLAKE2B 0121c6c643470a953c255bd4ef29b3e32965aa0ee3f8367433b83e8e0407048e5752e20cd92eede3ab642a887a00fa7fc3fd0c7d026c374407e0f625bca9a5c2 SHA512 7310b5513d859cfdc3885f3a0b74dcea3ce5e522961915c24b226f70110475ccc3e7c5630161d154f527b938b1c430762f5c702da7584624cd53d45aaaa05fb0
 EBUILD pykka-3.1.1.ebuild 598 BLAKE2B d37ed434e7febcf4a1641d28f7c8fa5af3da020c94ee673a41aa5fcc1af6d6075382894eed724eda10e46b5308da9ee90f35094b5f7597e20a5ee297d5817006 SHA512 d8a30acd89c7db48e9a7aea28bf460f5c6b696d656965f64ce65c8f9b9ed67f84dd0ae74c09fdf4ba0d18839cbd4be50e69f7fe83a77abc58e4bdc738763cb12
 MISC metadata.xml 360 BLAKE2B 6a3cd04142f75ec9e5c91d91e2d267e618e9824ea8b9b6be452c77b22c7d2f29d41068848f32c4e03e85f90767d4a8c83d2064cd9e20dda4997194fcc1bb9e81 SHA512 1fef48dd8d3bc9397d4bbbc90a8a1a3db7f39a1e6795e9057d6bfcde6ada8f939b2589235b07824c15ee348c42f1ffb372a10d7a49741d7db57b542ce31c11e9
diff --git a/dev-python/pykka/pykka-3.0.2.ebuild b/dev-python/pykka/pykka-3.0.2.ebuild
deleted file mode 100644
index c2c6981f6e79..000000000000
--- a/dev-python/pykka/pykka-3.0.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python implementation of the actor model"
-HOMEPAGE="
-	https://www.pykka.org/en/latest/
-	https://github.com/jodal/pykka/"
-SRC_URI="
-	https://github.com/jodal/pykka/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index 4d070715e357..d33bed7f8cc4 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,6 +1,8 @@
 AUX pylint-2.4.4-sphinx-theme.patch 468 BLAKE2B 741a362b51d35f574b245b4df81309b1b08be7a38ca7fd5c04d6c9ce39bc830e32531a29103d1261d9fea6eecf5f52fb1d4cf74ab0ec3bda5f6299e4edfecf94 SHA512 7f1896819d4f2766a83ce2600754d7a698ce13388de9127e83b42b76b332ae5eb54eb538b9dd5d81dafe1cd5798e703c1f3fd7fa318a8582aa7c2c0db7cc7a30
 DIST pylint-2.13.9.gh.tar.gz 1123216 BLAKE2B f80e88f565595b16bba650a009bfdd6d55efa65227898d145d4867c116c89c7ab5244c509382f0e9023404b4e46accb742334450ca7342394fb4d0abaccb8d03 SHA512 dcea90b1b1494d928f0b12dd2b50ee1d97a74efce18e0ef54ea02b52209a574977971e12db8f476edcf1bd646ca41c6a77bcf9a425c01af71bd29e54fd6c20b9
 DIST pylint-2.14.1.gh.tar.gz 1270750 BLAKE2B 120cc78c3d76ccb10f88c94b5528f1ed42730b49ac7daea4c1e65cd82fa2aea2c7d77a3a26dcb84201c69afeceb538cddf1ba740af308b586624ee3d40656d49 SHA512 4be985bb78e4b2bd65a195b95fdeb2a95c59c82db2446c9c365b11f0ba57e2a3234a41865071272cb054647a15e7e1a8b48d034ca656a3a44ca509648f258c13
+DIST pylint-2.14.2.gh.tar.gz 1273238 BLAKE2B c242d1686f34c1b7bdefea29a031f43dfa40de8cf33f9ab7c23c7278d2abe0df63de28693717aa68b45eeeb4a7d3b8bf442ab85181826eea2282454ba04381b5 SHA512 977b84164f87cf7cf98f761d4a4977526c7098aeef4eea4cf057d6884ff368bd7ef52e483c1eb623f026343c8c6dcd961dd5301db8dd1ac9ba2ef4edb0c517fe
 EBUILD pylint-2.13.9.ebuild 2272 BLAKE2B 3f4323a6c4c4571c8fbaeec14046cb290cdfbd41af303c44d8b11bd0e3dca19743ebe166c2c1163ceaeb184bf4bbc50a2fe5f66272f2706cccb0ef973defc492 SHA512 8050139759ca4109aa412b61995cdb7c13a7b23dc37cca9be22692498198253f71e178d6496361d6208ef1f824ec61857429e4e60cc8c1d8d553f4cb0968bd7b
 EBUILD pylint-2.14.1.ebuild 2260 BLAKE2B 6ab54d876288e7c8911686f5c9b5edfde88a231767287e9e7682d5a09cb0d1281afec3c0a9fd5cf81b440e975f52f8fa46d54aa17a73622b231ed924fa1a4c15 SHA512 04fa0d3689363653e2fa622479061df9819d03935d948b8fc8f4ef410b26039a47e164eab1aef3e19bd02504b0a6c385d86a41733f65c8d81a8bd088d080dc74
+EBUILD pylint-2.14.2.ebuild 2260 BLAKE2B 09777087ce75264713a36908d5182f09c52776b0f6a7ba2a8fd09b6a8aaba5a648a657e10b040aff68d544a1247e6408a8a650771546c7f1969206e4e264a389 SHA512 f5c1bc119cf5a6c6eb7f843ab01dd4d553a46c3ecfd3dec43315e74c375091c4e0cb01045c61138f5750ca0e6ae06860af6e29664862bb31973a2fce7a8dcff4
 MISC metadata.xml 1100 BLAKE2B 97ec6bd2f6cf487afb93136e9ee58d0d5f8ad37e2ded456ed4f196e73fd37cddead2462d3592b44ca1a6c3722b1f194905238299f0c066945d1e22bdb18acc9b SHA512 0418d987879446fd76fe9b7fc4ee8b1c3c0d9bbab1d1fc3eb66eada0bc52f6b6480cf9852dc3a18b1915d2093642b9c87f24207e89b34d3e48c29a282a3ba979
diff --git a/dev-python/pylint/pylint-2.14.2.ebuild b/dev-python/pylint/pylint-2.14.2.ebuild
new file mode 100644
index 000000000000..9001edad3fc2
--- /dev/null
+++ b/dev-python/pylint/pylint-2.14.2.ebuild
@@ -0,0 +1,80 @@
+# 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/setup.cfg#L43 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/tomli-1.1.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)
+"
+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/pymetar/Manifest b/dev-python/pymetar/Manifest
index a332b819023a..473a7ec2a075 100644
--- a/dev-python/pymetar/Manifest
+++ b/dev-python/pymetar/Manifest
@@ -1,4 +1,3 @@
 DIST pymetar-1.4.tar.gz 3162928 BLAKE2B b92686204e84070722b3351ce04c1e65e3b47c7802767fbdb95027bcaea566518e61ac4c3e02dd0345c6672a87e2d50239a679dd7db426f7fa183023357763d3 SHA512 d5c5d382c68ffacefe07d63239f3b56984bf2becef922c945b0014a210ddf9ce1f96f99028e0ec9e649f70f6262925a836dbeb83309407aa2c4ddb4769db3dbd
 EBUILD pymetar-1.4-r1.ebuild 566 BLAKE2B d1de4abc0b299422f4b31add1eef9531c9be8207abdde6fe9b6797b1b820699e4e70ab6f7c7d52e194d36ddc4c14ca935b83d3085e79f8de39744919d4cdfcd2 SHA512 4ec737ebe9a39c30ebd18010e75ab278fe571f28c948843c0679061d2f4a083e2696f8e311558ebf2e55d6d2f6acadfc0f6c660003547e8bb472e2c18cbb5af8
-EBUILD pymetar-1.4.ebuild 584 BLAKE2B 33ff4940decdb60e07aac80e53a72821e1220d5d8124c1052078776fe14d416e01ae3596a7efdc279d9fd2fbbea7c299bf1f3ea008253a3000c0869e7e056bd6 SHA512 2818639d2bd71c7a8702f6b31ec3c27f4f0bd8380f20d2c4ca8bb182394cd64a79e3e557c145ee0d52c7bdb4a5c709188d2d3d0642e84b5a9095e5bdc4c71607
 MISC metadata.xml 1092 BLAKE2B 33e3f517b7f3451e463f2ac4a3bfbf0e6491e4e8990695dfb6dd9c0e9bdd823582822ba5142c2c4e67d7e6fc9a6162cea5b6e22cd62103fa16ccaf146e99763c SHA512 4a658b23fcbe07fb83a67d87c2a99254aa7a5957a53737e6af615aa8bfbc0db2a680d5f8f1cf81ce1c3c93875002fc50cbfa557978570c7ce99026258d9f7603
diff --git a/dev-python/pymetar/pymetar-1.4.ebuild b/dev-python/pymetar/pymetar-1.4.ebuild
deleted file mode 100644
index 51894f79ee8d..000000000000
--- a/dev-python/pymetar/pymetar-1.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Downloads and decodes to the weather report for a given station ID"
-HOMEPAGE="https://www.schwarzvogel.de/software/pymetar/"
-SRC_URI="https://www.schwarzvogel.de/pkgs/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_install() {
-	dodoc "${S}/README.md"
-	dodoc "${S}/THANKS"
-	doman "${S}/pymetar.1"
-	python_foreach_impl distutils-r1_python_install
-}
diff --git a/dev-python/pynacl/Manifest b/dev-python/pynacl/Manifest
index c825cca265eb..2e9b510d7949 100644
--- a/dev-python/pynacl/Manifest
+++ b/dev-python/pynacl/Manifest
@@ -1,4 +1,4 @@
 DIST pynacl-1.5.0.gh.tar.gz 20350195 BLAKE2B 56ca4f47867cce6e22fdacb0558b5f901aae318b47bacfe5f4ad02d8923e1c86d0a2dd186ec29c820a786ab844d928479fca2d1472a8345b82be6bcbc67c3328 SHA512 905d3a7ce7f758b31a5d34471d5a0202fd2ba3d904a7ec59a158bcd1ea572fc87e29fc144c733d151cbaa48788c939808bc51d00acc973fe6d190eefdd3bfd59
-EBUILD pynacl-1.5.0-r1.ebuild 933 BLAKE2B d1589f2f3b93b71077548c8f2673964716173892029cb6f1ec8e605728d9af9157a7c30f05a7e725189ea03a99e6f65dfdd3d77dcaa271f272186471396e7c6e SHA512 a11bbc479fee2623b875b51d69d1603f7af45473a41397d586804b7d5885d6efd8a4bcf283f885e662c13ea038a8782bd80333ba80613255b80c10dbc309bcca
+EBUILD pynacl-1.5.0-r1.ebuild 927 BLAKE2B db7da6a27a0b6dc7ab2fb2da20e5a5d4368b81cf3073e5dfc33e7c4a14c95de9c23662993e838e13d3b1623077e2abfbf820f3ad4c80062743434485c7b89773 SHA512 03fa2ca6726c98f925fcb062b4ba6dd3ed1800885385696cb884c89ba6b1b2564632dc625d8e87b0f3e80fc3ef9dbb34f5992fa8bd88e9f2c4f82eb323b2a145
 EBUILD pynacl-1.5.0.ebuild 880 BLAKE2B b3190da3bbf421eec0f084182b333b147b245a52a6727620d6ee9d848949f05b3a9a096ddb66690739a65858ae33d4da285c5cdfecd51ddaf764adda2751a04f SHA512 8fa3fc857cc7e589686352327f199dc1a5310be33723b059b51034ef6c8a1358a6898169a4e419a0bd947bf8296e79a12f33fcee1b16bfc603a9192955373c95
 MISC metadata.xml 674 BLAKE2B 676d246f5dac0a5f34c272e29b742a3a454e0ccef4a1ccecbacdfb652070c81bc145ee3d100f9c5e5ac025c183e80d937a4d9d8c6e0b5f26ac2c8225962681f0 SHA512 b5afb7450c64aace06974d98ce3cb172e2e4d7b343a0bcdf1b34505d3d9e180b774f359de1762a1b15127d23e5808289258e2333ab73f5cde04513015409c1a2
diff --git a/dev-python/pynacl/pynacl-1.5.0-r1.ebuild b/dev-python/pynacl/pynacl-1.5.0-r1.ebuild
index 529106b0a00e..96c389145fbd 100644
--- a/dev-python/pynacl/pynacl-1.5.0-r1.ebuild
+++ b/dev-python/pynacl/pynacl-1.5.0-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/pyotp/Manifest b/dev-python/pyotp/Manifest
index 0dbdc2685840..b6435b8f5250 100644
--- a/dev-python/pyotp/Manifest
+++ b/dev-python/pyotp/Manifest
@@ -1,4 +1,3 @@
 DIST pyotp-2.6.0.tar.gz 15687 BLAKE2B 9e1b97c5fd5a3d9b335c173d44922a0427f9f49f4fb27579ee528d1e6f4776b33db31a1664a9bd6295bbec331458e17ac380c1fcd9860bc200577051f2af2e7e SHA512 8d650c6840dd243c4dcb522745ae80b462c1819bcafef226923d13be6a2b096cf5f2146829fd553d5e096d82b67725706d69d0cbb15a5d6586ea234201671bcd
 EBUILD pyotp-2.6.0-r1.ebuild 498 BLAKE2B a92ee36c0ac76c38474112f47997f483fa5002e23557c95d30bb7a9aaa47d61df6dfde7e20626aa305cf7d40195abbf30c45179d3539260c53c5c2d4ab87804c SHA512 113c6d95e962461f8f3ef9e901aefadc6bfbf3e8befb1ce5dca18f3eeb9a7dc8cf99b6d89af667129d66000f235ae4a66b162165248e9ed0a9450779246a287a
-EBUILD pyotp-2.6.0.ebuild 465 BLAKE2B 9be15d15895128f9fbce09941537eac4eed4ca201490a3d7d411907040a1a0a9826f15b664085658492c604b666e2caad90ed52b8c8b5b1adcf09b964fa949b5 SHA512 047a4ba3db3cacb332b1203cb156596f3244d8c504848807e36207f1fb95e663fd76cf7fde7d2dd754184a425a9994bc142edccb318a809c72d835b06143c930
 MISC metadata.xml 385 BLAKE2B 9f2d57ca90c859506181e9960deef6e0bf83854cc35066a18cabfdd1c49ea9019123f1ba3edef1d94c45c826ca0064d9a390a62e758fad87120813ee014dee76 SHA512 0f42bd43b2ef566bfc8b2a7ddb858dae6fe92d5fba0f19d6c0ba6cd38b010b6ba927f87c171327665af0a9bff541381d3b3ffe500988ca15d19da40188e06e77
diff --git a/dev-python/pyotp/pyotp-2.6.0.ebuild b/dev-python/pyotp/pyotp-2.6.0.ebuild
deleted file mode 100644
index 562f0b09e2cd..000000000000
--- a/dev-python/pyotp/pyotp-2.6.0.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
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="PyOTP is a Python library for generating and verifying one-time passwords"
-HOMEPAGE="https://github.com/pyauth/pyotp https://pypi.org/project/pyotp/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests unittest
diff --git a/dev-python/pyprof2calltree/Manifest b/dev-python/pyprof2calltree/Manifest
index 2273a2735b57..fb7fa4fc0597 100644
--- a/dev-python/pyprof2calltree/Manifest
+++ b/dev-python/pyprof2calltree/Manifest
@@ -1,4 +1,3 @@
 DIST pyprof2calltree-1.4.5.tar.gz 8806 BLAKE2B 3a8a838a8b03294504c64dbe1d0caee2606a1ec53005222dfe6c3692bacd0801041ce199fedb9c38e4f6edc91e210116d9c1e034e0aa283cafebb19bf6303fed SHA512 2fcda74ae67dc3a8abb5dc153864ef59f96cc62b1c9359d02be12e83966c17738f5aa4a3d1c6e2ff81614dc963fc4b2faf375bbbb1ad15650a6817e493cdde39
 EBUILD pyprof2calltree-1.4.5-r1.ebuild 522 BLAKE2B c6fafcc988c7aa46422905644d70941d582f5e94a01104ca3e94ffaf09b537b49b6a6afc2e442ad89ad1740b952d6219b80daad2c38d23f344cb91ee59da5ad5 SHA512 c2d9dedf97e5a2b5bdc0db5d2c0f73166d93b34de0a525f8c2be1905f377549951e81e4c79df4de7eea969acbf28abd3c3824d574c21ded24792026d1a77e13a
-EBUILD pyprof2calltree-1.4.5.ebuild 490 BLAKE2B 759af98d2a74f670f1b34a1181aa2a02eea56eff80b58cc4616beb16c35243930925ca409fa4c020240742822858f261cfed5ad1f88ecc81ffb02846f0be5475 SHA512 b3426f0112284cec6d11ecf5c2373a4bd12ae0f52389c669a7ec5dcf3ad5e7ddf6af71c4bef6b67ec8f56aa7f1a1f558aea0786619d452aca6e826a7b4af5ca6
 MISC metadata.xml 406 BLAKE2B 7d3e2257b0a06747c1772ff90ac2375467633f40d7b4064389e64aaf426b07d5ea263098115a96ce035f200d55c9e83049ef7df0812a585ff7dd9a86407db832 SHA512 ff6a0e3b75a157ad85bcd1e75dc277849b67379bb097e4ba0b2373247456cfcbc079d36f7cdde266669bf2db99eb63a471d3ab156e1218628db3b1b51abf43d4
diff --git a/dev-python/pyprof2calltree/pyprof2calltree-1.4.5.ebuild b/dev-python/pyprof2calltree/pyprof2calltree-1.4.5.ebuild
deleted file mode 100644
index a979232643d7..000000000000
--- a/dev-python/pyprof2calltree/pyprof2calltree-1.4.5.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
-
-PYTHON_COMPAT=( python3_{7..10} )
-inherit distutils-r1
-
-DESCRIPTION="convert python profile data to kcachegrind calltree form"
-HOMEPAGE="https://pypi.org/project/pyprof2calltree/"
-# pypi tarball lacks tests
-SRC_URI="https://github.com/pwaller/pyprof2calltree/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index 69dd3c0311dc..4f4d5dfa20ed 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -1,6 +1,4 @@
-DIST pypy3.9-gentoo-patches-7.3.9.tar.xz 1564 BLAKE2B fe0875ef002842a78fb31589f6d0b255c3dea10f2bd014231ae9b17641f65f810ac84fe7961de1a4614249b0166f2127c3aa37947f7d1d4c85860a31b89110f1 SHA512 a1dc3ee36e908e29b2bbbb100a97b7910bd4325c5dc55c0455cdca450d6b272d1463708b383e0607e9499b1932da4442f97d2da57e47ed3a4ff8fd3c78a54732
 DIST pypy3.9-gentoo-patches-7.3.9_p1.tar.xz 3952 BLAKE2B 20ff145749d24f15214c0c78f3fdc5e1cdbfc307972ad9dbc03f1b9704b25ea962434aee0d58a882912374b45f726eb449f0abafd663bddf14867807951b0a7f SHA512 3ce7a126fb7c52754d3b65e3df0786c80a98522ce78ab44fd5f81cd84a41e8b5929df2d8e4f644ed6c2265ca5da397cd7f37d44944cd08f7c8ae1cc8a2fd7e0d
 DIST pypy3.9-v7.3.9-src.tar.bz2 26976726 BLAKE2B bf1ed21c575901abac020120aaff07ab57f1404713211b19cbd1eb4d6ffc675b7933be8c6fffc2b69ab467963d6598534cd5aa90c02feddad596611d2a6b6581 SHA512 83f8a6a2da351c190d2d224242cbc35e35529c7a8e8d842eaf5c945cbce2e172b02a340f32af3d49df8d5288370d794d5bc95fc12dd4a13d817c925abf06198a
-EBUILD pypy3-7.3.9.ebuild 5459 BLAKE2B cecd4e9ef25bfa9c5c26e444d74eaccfe3a6f588c33af1f64ab0419cdf8944a5b6d78134fadcae6ca682edbe48197df765c830f9cc22a80fb2fa3e5a220fb61c SHA512 30c1a6315502c2fa6d219567c4ec827244257a4f4bdde204fbd0374fd0c1320cbf87097db029ef3822173fa2cd999799b7b79b51df3d1447f67140bee26ecc65
-EBUILD pypy3-7.3.9_p1.ebuild 5461 BLAKE2B 4086916df9196af0dfbc8cf9e2ca0bd4cd6d4d7b927d4d157abae2ff7f7460492d3c30ba4525d1140e4eee8f7f87067bcf6981a0982936cc3f60cd49f332e2fd SHA512 3a24f51744b66a511152a0c52c4d5bb4a41330e452b6d6d67abe87e74a6ffdc8eeb989b8657226c41bd18cdb600eca7ab924cd16839c0e0e6ac49db6a2e8ba9d
+EBUILD pypy3-7.3.9_p1.ebuild 5459 BLAKE2B cecd4e9ef25bfa9c5c26e444d74eaccfe3a6f588c33af1f64ab0419cdf8944a5b6d78134fadcae6ca682edbe48197df765c830f9cc22a80fb2fa3e5a220fb61c SHA512 30c1a6315502c2fa6d219567c4ec827244257a4f4bdde204fbd0374fd0c1320cbf87097db029ef3822173fa2cd999799b7b79b51df3d1447f67140bee26ecc65
 MISC metadata.xml 241 BLAKE2B 4f18c355c71824c25df283b2d463a5abbf2295446e74b960e868dd78d4910ac066725450478087567a6e66b7a8948d99e053f13a7e58dbf2b89fdaf5c2f3436c SHA512 c46e70ffd66754ad84c64806f2bbff25ba9a688f035176a4565afc95351ce10fffba64bbde89965501460b05978c7e59b3d84db6a8cb6efff4055d4b7a5ab5d8
diff --git a/dev-python/pypy3/pypy3-7.3.9.ebuild b/dev-python/pypy3/pypy3-7.3.9.ebuild
deleted file mode 100644
index 37f7cfcc4425..000000000000
--- a/dev-python/pypy3/pypy3-7.3.9.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python2_7 )
-inherit pax-utils python-any-r1 toolchain-funcs
-
-PYPY_PV=${PV%_p*}
-MY_P=pypy3.9-v${PYPY_PV/_rc/rc}
-PATCHSET="pypy3.9-gentoo-patches-${PV/_rc/rc}"
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python (3.9) language"
-HOMEPAGE="https://www.pypy.org/"
-SRC_URI="
-	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-# also check pypy/interpreter/pycode.py -> pypy_incremental_magic
-SLOT="0/pypy39-pp73"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm +jit ncurses sqlite test tk"
-# many tests are failing upstream
-# see https://buildbot.pypy.org/summary?branch=py3.9
-RESTRICT="test"
-
-RDEPEND="
-	|| (
-		>=dev-python/pypy3-exe-${PYPY_PV}:3.9-${PYPY_PV}[bzip2?,ncurses?]
-		>=dev-python/pypy3-exe-bin-${PYPY_PV}:3.9-${PYPY_PV}
-	)
-	dev-lang/python-exec[python_targets_pypy3(-)]
-	dev-libs/openssl:0=
-	gdbm? ( sys-libs/gdbm:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!<dev-python/pypy3-bin-7.3.0:0
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		${PYTHON_DEPS}
-		!!dev-python/pytest-forked
-	)
-"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-	default
-
-	eapply_user
-}
-
-src_configure() {
-	tc-export CC
-}
-
-src_compile() {
-	mkdir bin || die
-	# switch to the layout expected for cffi module builds
-	mkdir include/pypy3.9 || die
-	# copy over to make sys.prefix happy
-	cp -p "${BROOT}"/usr/bin/pypy3.9-c-${PYPY_PV} pypy3.9-c || die
-	cp -p "${BROOT}"/usr/include/pypy3.9/${PYPY_PV}/* include/pypy3.9/ || die
-	# (not installed by pypy-exe)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/pypy3.9/ || die
-	mv pypy/module/cpyext/parse/*.h include/pypy3.9/ || die
-	pax-mark m pypy3.9-c
-
-	# verify the subslot
-	local soabi=$(
-		./pypy3.9-c - <<-EOF
-			import sysconfig
-			print(sysconfig.get_config_var("SOABI"))
-		EOF
-	)
-	[[ ${soabi} == ${SLOT#*/} ]] || die "update subslot to ${soabi}"
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy3.9-c - <<-EOF || die "Generation of Grammar and PatternGrammar pickles failed"
-		import lib2to3.pygram
-		import lib2to3.patcomp
-		lib2to3.patcomp.PatternCompiler()
-	EOF
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-	# (NB: we build CFFI modules first to avoid error log when importing
-	# build_cffi_imports).
-	cffi_targets=( pypy_util blake2/_blake2 sha3/_sha3 ssl
-		audioop syslog pwdgrp resource lzma posixshmem )
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy3.9-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Verify that CFFI module list is up-to-date
-	local expected_cksum=63d4659f
-	local local_cksum=$(
-		../pypy3.9-c - <<-EOF
-			import binascii
-			import json
-			from pypy_tools.build_cffi_imports import cffi_build_scripts as x
-			print("%08x" % (binascii.crc32(json.dumps(x).encode()),))
-		EOF
-	)
-	if [[ ${local_cksum} != ${expected_cksum} ]]; then
-		die "Please verify cffi_targets and update checksum to ${local_cksum}"
-	fi
-
-	# Cleanup temporary objects
-	find -name "*_cffi.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-	local -x COLUMNS=80
-
-	# Test runner requires Python 2 too. However, it spawns PyPy3
-	# internally so that we end up testing the correct interpreter.
-	# (--deselect for failing doctests)
-	"${EPYTHON}" ./pypy/test_all.py --pypy=./pypy3.9-c -vv lib-python || die
-}
-
-src_install() {
-	einfo "Installing PyPy ..."
-	dodir /usr/bin
-	dosym pypy3.9-c-${PYPY_PV} /usr/bin/pypy3.9
-	dosym pypy3.9 /usr/bin/pypy3
-	insinto /usr/lib/pypy3.9
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r lib-python/3/. lib_pypy/.
-	insinto /usr/include
-	doins -r include/pypy3.9
-
-	# replace copied headers with symlinks
-	for x in "${BROOT}"/usr/include/pypy3.9/${PYPY_PV}/*; do
-		dosym "${PYPY_PV}/${x##*/}" "/usr/include/pypy3.9/${x##*/}"
-	done
-
-	dodoc README.rst
-
-	local dest=/usr/lib/pypy3.9
-	if ! use gdbm; then
-		rm -r "${ED}${dest}"/_gdbm* || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED}${dest}"/sqlite3 \
-			"${ED}${dest}"/_sqlite3* \
-			"${ED}${dest}"/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}${dest}"/{idlelib,tkinter} \
-			"${ED}${dest}"/_tkinter \
-			"${ED}${dest}"/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	local -x EPYTHON=pypy3
-	local -x PYTHON=${ED}/usr/bin/pypy3.9-c-${PYPY_PV}
-	# temporarily copy to build tree to facilitate module builds
-	cp -p "${BROOT}/usr/bin/pypy3.9-c-${PYPY_PV}" "${PYTHON}" || die
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_moduleinto "${dest}"/site-packages
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-	python_optimize "${ED}${dest}"
-
-	# remove to avoid collisions
-	rm "${PYTHON}" || die
-}
diff --git a/dev-python/pypy3/pypy3-7.3.9_p1.ebuild b/dev-python/pypy3/pypy3-7.3.9_p1.ebuild
index 536c3974f232..37f7cfcc4425 100644
--- a/dev-python/pypy3/pypy3-7.3.9_p1.ebuild
+++ b/dev-python/pypy3/pypy3-7.3.9_p1.ebuild
@@ -22,7 +22,7 @@ LICENSE="MIT"
 # pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
 # also check pypy/interpreter/pycode.py -> pypy_incremental_magic
 SLOT="0/pypy39-pp73"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 gdbm +jit ncurses sqlite test tk"
 # many tests are failing upstream
 # see https://buildbot.pypy.org/summary?branch=py3.9
diff --git a/dev-python/pyquery/Manifest b/dev-python/pyquery/Manifest
index c4953fa98a1e..c81139d7e2f9 100644
--- a/dev-python/pyquery/Manifest
+++ b/dev-python/pyquery/Manifest
@@ -1,6 +1,5 @@
 AUX pyquery-1.4.1-network-tests.patch 613 BLAKE2B d9e9f2e11c2183f6759a90e35d60a96a3522790743da1d3ec21ad8006e40d98753fb90c14c14c705ab781b08143c52ecf04722d25928f3abe44ebabb59d04342 SHA512 e6ba986a24bf1adf9e1d6c5f4d59fc28a5a613062aa691f84d760c82beeb77d9198a655795e2701dec05184c4fef377cb4bb6f5cc75f49d2ecf798770cb8f86a
 AUX pyquery-1.4.1-tests-pypy.patch 715 BLAKE2B 9f0ef9cf79cddbd90fb6cac1d6297c98f495f5e258b78f4dbac92c4ce3b26e302614a424bad25b9cab2f6a08f8c8e07525d57a6c1ccfd1c4e51893768704edfa SHA512 ba78b8db4c934598de0aeb37ba76e3eda96b123ebd6a85f458dcd8e8a8d13a37935989dcdb9a282748b188267137f85fe6ad3dfa2c0670f77e76ccae47c819ca
 DIST pyquery-1.4.3.tar.gz 47448 BLAKE2B 32451dfc8f8160207b4be12006ceba3098b8cb344bfa3e80ccf75f8cfca9542614ae78b9bfec773139cbbf12434201f92f8b4738e7d9e6241b3addfeb1bc8dda SHA512 cb61326e38f78763ca15de09e3a56dad776b3d4831b54eabf295db0f9af8bf04599642c73f5db3e3172b86d7b66ba2ef626c8cba2dfb458af6ac432d15ea7cba
-EBUILD pyquery-1.4.3-r1.ebuild 1070 BLAKE2B 0993544d5744fd2985e1bb0dff95f6c7ce2c431d8b15e5a1272f90dc09c67ad2a2de963ad1f8e6603e0277ec1ee344bbb52eb66c2816a4d4601bf36392856b55 SHA512 cfd4ac180cfaedd1f6cdcf490fb84f1ed46db117817efe910fcb4b9f74f184d7a3361a6dbce9308269d1b71818d044627d65921c9ed90796dd54bc2a122eaa0b
-EBUILD pyquery-1.4.3.ebuild 1135 BLAKE2B 7cc7d0b4c04403934b99ef4412f865a6fca9e5477db49f96571954528df5c993454aabbe9a756633fbeb3ab521ab3902f0a8d134f99c431ee711828ddaf1961b SHA512 0a89f46b4063998dea4e0d2f71c0c48eca4ece797c4ee5acb31ae06b8de61e570b4335032afcb81fefcc515124692140d32387014a2bb4a82d674d3cd81627c7
+EBUILD pyquery-1.4.3-r1.ebuild 1062 BLAKE2B 2926dee0ed1ddf8804702e2768150eb5118f38d9dcbaedca1cdc821b3db5ac6d7cf97ef6945a92b2fba7fc49a28c3a60e7e827587af6c3316a6a5ea548762de4 SHA512 fcae523a7ced35db8c70d89bd8ee707806288eb156324844541726e327f1ac46c9958c233c80994b022fb9dc855832df3a4b4b4b172c633a815e5ad01bdc8047
 MISC metadata.xml 401 BLAKE2B 0b74798cdf7529c934996c257374138a47c2d0e9a2b1b6b14511bf913f092d41c09291ecd9bf878b9aff3bf6e0956b0fbf9a59f721e236090aaa5a81db913c80 SHA512 f056c0982c8e233a79b23e9cdcbfcf6b6221e7cbceed7f5966fead5b9f8b7add936754de95650b2b0b8a5c2f5d9d76642ac861baba7379185acc886f01ee92a0
diff --git a/dev-python/pyquery/pyquery-1.4.3-r1.ebuild b/dev-python/pyquery/pyquery-1.4.3-r1.ebuild
index 7c03a518653c..cb8521e93776 100644
--- a/dev-python/pyquery/pyquery-1.4.3-r1.ebuild
+++ b/dev-python/pyquery/pyquery-1.4.3-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/lxml-2.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pyquery/pyquery-1.4.3.ebuild b/dev-python/pyquery/pyquery-1.4.3.ebuild
deleted file mode 100644
index c3709e9b3aa2..000000000000
--- a/dev-python/pyquery/pyquery-1.4.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="A jQuery-like library for python"
-HOMEPAGE="https://github.com/gawel/pyquery"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/lxml-2.1[${PYTHON_USEDEP}]
-	>dev-python/cssselect-0.7.9[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.1.9[${PYTHON_USEDEP}]"
-DEPEND="
-	test? (
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/webtest[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}/pyquery-1.4.1-network-tests.patch"
-	"${FILESDIR}/pyquery-1.4.1-tests-pypy.patch"
-)
-
-distutils_enable_tests nose
-
-python_test() {
-	# The suite, it appears, requires this hard setting of PYTHONPATH!
-	PYTHONPATH=. nosetests -v || die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "Support for BeautifulSoup3 as a parser backend" dev-python/beautifulsoup4
-}
diff --git a/dev-python/pyroute2/Manifest b/dev-python/pyroute2/Manifest
index fd916744b0c4..50c30604565d 100644
--- a/dev-python/pyroute2/Manifest
+++ b/dev-python/pyroute2/Manifest
@@ -1,4 +1,7 @@
 AUX pyroute2-0.5.12-readme-filename.patch 332 BLAKE2B 37df4e22ef010582c9675a081d25493715b0a4cfd93c14320cfb58af576b189a282cf5ee774d821e24e9de1342e6af56c5508882b44fef1e63ac3111f70830de SHA512 9fe059bb14e7ecd98a9cfb749cc8dbaf68e52e3d1d0e66eb8a7a15a4b6f0161d4618a9b64fc20de4c15b4e5f750df82c648fd5169918c2f0dabfb9d3fac09a5d
+AUX pyroute2-0.5.19-exclude-tests.patch 323 BLAKE2B 21d429d3762fbd07566afaeefffa4682b35f5b0d5591d0525421973a225b10173a692c21bd46cf7d443d2ddda03289d9616ec0d299feb26aa712d57886daf678 SHA512 beaa77a3cc4e3987c50a797d6decdcf626a90dbbd34219738c3f6af8bd875282272f6fd6d6f59178e2a481e8e4274e3e5d6210a2b0b3c76a90cf94261a39f911
 DIST pyroute2-0.5.14.tar.gz 436853 BLAKE2B 9febcd6563d89b5ffd71342d8d83a3251494f978ad4449532b568cf0929c9f3d8d8d36e1a0b0f6733013e12f6322aea46d991a22f5c3fa93e47dfa08376ddd13 SHA512 9601cf8133b703c55770b6292cca1e907a029689aaeb350b6eee40406b56de5563ee0ba37b4814540c365a5974be78a024dcb27bc7ee00eac74676f4013cf277
+DIST pyroute2-0.5.19.gh.tar.gz 457432 BLAKE2B ffb2717c60badb1453eeb15f5b83f1494e851ee011fcdebd3a5d249ecc4bea7064069a1af2fe2d34aefe9812c8b6808b8a14cbe518383c165b0b008d10505c5c SHA512 19b0acbff17415acad20a214e0622ca9a3fc51b92e603ab15663ea7e8da290fc0b2033aeca1c20200307e34173802f89998151f77d5bcfc5f87eb8b42ba591ce
 EBUILD pyroute2-0.5.14.ebuild 848 BLAKE2B 1a575140957e1275b3590a1ca0c8799fd691edc5ab9d0e53298420011223c4929cb7f0687b12aa2a6b7059b2971a10977bb9ad03a6f13a5acda283f14702ca39 SHA512 f94cc4b0d7a50bb3fa045950cc8a1ef71a422c64d24af01fa750fb0905d1ebff3a56d0be822a2cb43899de38d5f52eda2dad59cb210d03f5da7da1a0d6bb37bc
-MISC metadata.xml 513 BLAKE2B 18f41c6f7f743d99f819a0241807fffd380747e586e1426704b40f2b789fd681f43890b2fb3c8cea94f0c80d45d0d43edd722a39007afbc9ac94eeba7858a5c0 SHA512 476f039d7d4bded895eb4d30c5fa07fe66b61b612dcbd533d6a5ada96a267336914b3ce9ade638f8f19438f9d0700e47ff95eb8c0ae710fd597609d7e3d01f69
+EBUILD pyroute2-0.5.19.ebuild 566 BLAKE2B 133f408834ca25c36ea849fdb311e4566ae1f1d21840287cbac5163ee5b3100bbae792e357fe5991f57d06e93c97e2c1fcfc1171dc95e4c49b2e342675ed78de SHA512 2345e5786347b186efc482656be3c4736e32db609686b58b981db4cd276dc52205a13dd075d3389978dfc79f568f564f94cd515353d8a037b3ed6a64ba3148d5
+MISC metadata.xml 547 BLAKE2B 1d256c8d9bb8cc039853ff12c15d7c2747822ff95e3ae7f3e7c1600498c7b886a341a03327992e3a7933592eba0094eec6fba519b0d9f2b2f0ece57eb515ea4a SHA512 e845b3e319e9d60b1dcbf9ab66681b886b0c517a5a72288aaf9ccb97d5018dc3b01b8d921b8a9fcd3538cec96e9a7e1c452a704c8c422ef6e6fa6069a7ae56ef
diff --git a/dev-python/pyroute2/files/pyroute2-0.5.19-exclude-tests.patch b/dev-python/pyroute2/files/pyroute2-0.5.19-exclude-tests.patch
new file mode 100644
index 000000000000..723c638349b7
--- /dev/null
+++ b/dev-python/pyroute2/files/pyroute2-0.5.19-exclude-tests.patch
@@ -0,0 +1,13 @@
+Index: pyroute2-0.5.19/setup.cfg
+===================================================================
+--- pyroute2-0.5.19.orig/setup.cfg
++++ pyroute2-0.5.19/setup.cfg
+@@ -35,5 +35,8 @@ packages_dir =
+     =pyroute2
+ packages = find:
+ 
++[options.packages.find]
++exclude = tests
++
+ [options.extras_require]
+ ss2 = psutil~=5.0
diff --git a/dev-python/pyroute2/metadata.xml b/dev-python/pyroute2/metadata.xml
index e7a8be4ba92c..2ddf3cfd395c 100644
--- a/dev-python/pyroute2/metadata.xml
+++ b/dev-python/pyroute2/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>prometheanfire@gentoo.org</email>
-		<name>Matthew Thode</name>
+	<maintainer type="person" proxied="yes">
+		<email>henning@hennsch.de</email>
+		<name>Henning Schild</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>openstack@gentoo.org</email>
-		<name>Openstack</name>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
diff --git a/dev-python/pyroute2/pyroute2-0.5.19.ebuild b/dev-python/pyroute2/pyroute2-0.5.19.ebuild
new file mode 100644
index 000000000000..6a607f41ac0e
--- /dev/null
+++ b/dev-python/pyroute2/pyroute2-0.5.19.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8,9,10} pypy3 )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="A pure Python netlink and Linux network configuration library"
+HOMEPAGE="https://github.com/svinota/pyroute2"
+SRC_URI="
+	https://github.com/svinota/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+PATCHES=(
+	"${FILESDIR}/${P}-exclude-tests.patch"
+)
+
+# tests need root access
+RESTRICT="test"
diff --git a/dev-python/pyrsistent/Manifest b/dev-python/pyrsistent/Manifest
index 8901f0b4a740..e6b209dda49d 100644
--- a/dev-python/pyrsistent/Manifest
+++ b/dev-python/pyrsistent/Manifest
@@ -1,4 +1,4 @@
 DIST pyrsistent-0.18.1.tar.gz 100522 BLAKE2B 75632d254993666076a68d81b8b5a7aced8601146fed5cd63f1d56c5e0578650a197aca7630855de32a8447eab972203aa7d83009398f96e6f374c0a4b2cc1ba SHA512 353ad6e9165e1afdde37730a9289cf8dde28491abb688d702a8c8f5279e24f5ce387a5d00ac4a077322299f9c1a535781bcacdcd1cb914ddb317b3ca9641778b
-EBUILD pyrsistent-0.18.1-r1.ebuild 655 BLAKE2B ec9c211bbeaf3b0a898750f3d6e78568b23eeb1abc7d941a45801ec106fdbacf2e5030074f1cc40130df4ff2442fc34ddf72728927c06d0e975fb52109032123 SHA512 b8ddfed674c5819d7947e6814dccbe5c99f3ace6b6000f10222ba48d2ff4860e5c73849d1da44d17263e9f69f98496a71486d4f1a9ad10680df128ac57f76368
+EBUILD pyrsistent-0.18.1-r1.ebuild 654 BLAKE2B 1afd1f0da0a6156c642100ed99a593f9472f62ac15367633f5c2593e703cb0fe18ddab5494ddb89736182810815af26a1e2951b3fca351ce44e9f39e4cc0cb1a SHA512 e20b36b8d07d8cb44b19492a09d8e2993d3aa33fa4d023a69112ca5b27afd0280422ed0149be150e4310a5f35710948ecadd4d1061903dd616dd8db2d61e0b9f
 EBUILD pyrsistent-0.18.1.ebuild 616 BLAKE2B a2d43fe6363553ffd48d861f11e5ab2ca42a094efe57d28c34262c42fbed433d0931fdb9b2df14a2b55b21593e949ec0d1ec4a07522b4768c5665adf7fae2e87 SHA512 a06c47df02d6a6581210798634c667425d52384057a03f142128ab1283b4d937d851fb89ed84aee23389df0d780b59277cd2e6fb83df04379943af6cb46096ca
 MISC metadata.xml 522 BLAKE2B fbf571fd4d833fea0dc9942620655c45bb91b07ca02e2e0fccb23980de26303b9e9c3963453cae3775f7db33dfd485a4a55782a1b1b2b635af0d62e331596b99 SHA512 fe358befc92e29769bc2f84a516da1a26026e4ab84e812326da72ee02b18c79c3d6acdfb71cb6027d2d0f1e559cc00cf39406e335fb8f38d4479353a7dbb4ff2
diff --git a/dev-python/pyrsistent/pyrsistent-0.18.1-r1.ebuild b/dev-python/pyrsistent/pyrsistent-0.18.1-r1.ebuild
index fd06eae4075d..aafeea2012af 100644
--- a/dev-python/pyrsistent/pyrsistent-0.18.1-r1.ebuild
+++ b/dev-python/pyrsistent/pyrsistent-0.18.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/pysimdjson/Manifest b/dev-python/pysimdjson/Manifest
index 5e315a7ca620..6c1fb3b6aa5f 100644
--- a/dev-python/pysimdjson/Manifest
+++ b/dev-python/pysimdjson/Manifest
@@ -1,5 +1,3 @@
-DIST pysimdjson-4.0.3.gh.tar.gz 3783913 BLAKE2B 74c186e87540c4806ec311e7a6ca05bf28b2a2060ba078919c68d92812a1bc34efd9f0deb30b85dba134af9ce99dbfa2b8fa33c1b14926915e284f262a7ac4f1 SHA512 eb2cd8b96eed8985674fbcfeafc21b58c9985c46c7f46b72ee78fbf91ef659acd5139fa56c251bae22418007b3da6ff7e5cdd2d28b2ba22cf19771f2f74880e3
 DIST pysimdjson-5.0.1.gh.tar.gz 3827732 BLAKE2B e42d3fd2ef857ab7c22a5afa6abc3313ff1ea0aabc8a6e8213df3eaef65eb3df501bbcdba2d0de501fdec310aba00c110a30814d548255401fa0b51ca7ee03d4 SHA512 4ace2feca976afdf113b92dd263918f88f7be32156ab6f3b6fe4b798d83bb7c66029bdd7e63fb1bb3bf6568e85b14ad227934114fa7e0da0961888cdfdca8943
-EBUILD pysimdjson-4.0.3-r1.ebuild 1020 BLAKE2B 842a50ae0f703d6897efa4e04b90358cab64bf2a13f7badc551018edfec651c1506df74d615ab0702aa47bb59c011d80d611c4b3a5d22ff11a06cbe28a031d08 SHA512 c907bac4da86d2912f05a07a2cbdc047934015187d2fa3ec3d0e5132cb25fcfeedca7d27e348de9b04ef6939fa3c30ce72e9fb42f79b186c2a5d1b7c2be43c9e
 EBUILD pysimdjson-5.0.1.ebuild 1023 BLAKE2B 9650e4c0badaad29593dd959a6910e0d117468b664be910acca5f1346cbeb134c51eb1516280f2970d4292b57ee0fad9abff1d13d0ff86ef4e6d077f708d0d9a SHA512 512fb2427e871a8e6ed1d62dc8330d31355248b6a084b375415690f6b9b32688b1cd729a3c6a7ed06a924b85d36137a06b015a01f1e4517410d79b297968878e
 MISC metadata.xml 424 BLAKE2B 2ce7103dd2d65113aaac5d7acbb50e6fd92726f640c3917339bb1bcdf6124b6c3f1d926c73ce0beba130aa20ede87252a2fe9e0fe4d89bb7c4c9501b4931afd8 SHA512 ba65f9b7d1340d102a782321859be6b03aebd755eb4c8bb604a0e71ad25056f2029a77c92fcf623130f8accd6137f1722e99db3d0b91d9d00d2331cdea5a9bc7
diff --git a/dev-python/pysimdjson/pysimdjson-4.0.3-r1.ebuild b/dev-python/pysimdjson/pysimdjson-4.0.3-r1.ebuild
deleted file mode 100644
index 590eebf4746c..000000000000
--- a/dev-python/pysimdjson/pysimdjson-4.0.3-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for simdjson"
-HOMEPAGE="
-	https://github.com/TkTech/pysimdjson/
-	https://pypi.org/project/pysimdjson/
-"
-SRC_URI="
-	https://github.com/TkTech/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	<dev-libs/simdjson-1.1:=
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# benchmarks aren't run
-	sed -i -e 's:pytest-benchmark:: ; /license_file/ d' setup.cfg || die
-	# force regen
-	rm simdjson/csimdjson.cpp || die
-	# unbundle
-	> simdjson/simdjson.cpp || die
-	echo "#include_next <simdjson.h>" > simdjson/simdjson.h || die
-
-	distutils-r1_src_prepare
-
-	export BUILD_WITH_CYTHON=1
-}
-
-python_compile() {
-	distutils-r1_python_compile --libraries simdjson
-}
diff --git a/dev-python/pysvg/Manifest b/dev-python/pysvg/Manifest
index c5726c5ac1ac..579a485a6221 100644
--- a/dev-python/pysvg/Manifest
+++ b/dev-python/pysvg/Manifest
@@ -1,4 +1,3 @@
 DIST pysvg-py3-0.2.2.post3.tar.gz 23436 BLAKE2B a1f0ff710b73dd2e82811d322aa6365583febe8c9e7d690221690d285f94b3d0ae3f74e47b0e0ef236e389f0621ce5ad61ba00329a306c30a81cab0e77ee29db SHA512 3b0e30401ff9481df3fa5fde5b1e338bbabb86cdb846a11c08e8138563268311e20a4ce5317e5a31c337f2b8c5a3debb7abf8e0188e798e455378a363b31c95d
 EBUILD pysvg-0.2.2_p3-r1.ebuild 490 BLAKE2B 585e7aa81fabe4fc03d63c4329f96cb8977cb78bf5a22c161a272a2f608dcbb42cade23b283f9c0385151aa19d69824ea4ef5f3261b95339ebada0227307f005 SHA512 d9c8113673dbaba2134a308230b0e6977eb899f6c47221d9919b0b6863db27c82e3b1943f27f4e6d9e6e2594b0919f6ab3fbf6cef200010370f1502414b6dcca
-EBUILD pysvg-0.2.2_p3.ebuild 458 BLAKE2B 1a31f6e205148674835dd862e056f1fd7830ad7f4c52beb9822b287fb1a98008c5202ff2e04df8da8d165d744d2c4cb52eae984772eeeea65399a7585ec65d46 SHA512 696f9a4054fe745ccf7517df244d5adfb4e224055e896f68b772c5a9e78b2f48631ca05d55385ed405723c6cd37cad9ed3ab1e82ef917a36dcd1b75363346d84
 MISC metadata.xml 371 BLAKE2B a60cb7953f5e191711ef79f1d5d8dcfc74c96d7157f9a9642aabd9bdd878e5043977b088b326a63c1475235d4d8025aa6ce4569e93e9edc0883d65305a903a8b SHA512 04f38b12464fd9ed2135cfd232cd1320beb62ad7c3ed8cc6ada8904445e99d1e92faecc66513e491f520ff91ff8c4362c6ad947bbc9ef958fe8fdfe3ddb7a052
diff --git a/dev-python/pysvg/pysvg-0.2.2_p3.ebuild b/dev-python/pysvg/pysvg-0.2.2_p3.ebuild
deleted file mode 100644
index a258f0188e58..000000000000
--- a/dev-python/pysvg/pysvg-0.2.2_p3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-MY_PN="${PN}-py3"
-MY_PV="${PV/_p/.post}"
-
-DESCRIPTION="Python SVG document creation library"
-HOMEPAGE="https://github.com/alorence/pysvg-py3"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${MY_PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
diff --git a/dev-python/pytest-codeblocks/Manifest b/dev-python/pytest-codeblocks/Manifest
index 8cea3d31bf35..5abcd92b5766 100644
--- a/dev-python/pytest-codeblocks/Manifest
+++ b/dev-python/pytest-codeblocks/Manifest
@@ -1,7 +1,3 @@
-DIST pytest-codeblocks-0.15.0.tar.gz 8559 BLAKE2B 0f8cf91d333e233e480353ab55283f9d97af17e5265f7a9e6db5c7cd98aaf6075b33a44e850aad21de5112fcc233fe7f65e23710f6b1804a85fd6269d042c406 SHA512 57d14aefc0cd49aa1b8fc54dfaec47965d4b1c867cad78ba9e8fd53da85898b7eac303ac402abe10b2d63d7621979bb8bad91f66f1e264568d56f4ff70488021
-DIST pytest-codeblocks-0.16.0.gh.tar.gz 8781 BLAKE2B f6146c78cc8b2bca88533e6a1f18a1abf7af6dc028dc07c37878656b29eb3dc5a838b64791587d9b2888fab00f5ccb2f3c392b7f8d80fbfe7576450e126b1cb3 SHA512 e841ed11c8cd8e73b888bdee3ceda82193e0ed0441d623c586c69c45412039656a09e9f872f187c72d4e245ac8ee99b4a099ed9ae1a13f88f564bc0b9fae69f6
 DIST pytest-codeblocks-0.16.1.gh.tar.gz 8900 BLAKE2B 1e884f445975c4c685e763560a8bb5516bd7213b09a8c967948347e455816766dccfd0984fb5746949f90afdf00e0fe21a52f41be65933532d8763ed6ea716a1 SHA512 4c3d91488550373832c8dd45b39873ae3810b423147b3b9524afc8e205605324092b4462b62acf2e34e70b5456795834cae511d9c9a06e08288a46cdb38b1778
-EBUILD pytest-codeblocks-0.15.0.ebuild 622 BLAKE2B f4a663ba0aa058fc5055c6375c38b0b6119ccc548f77e879f112ec4e9d9038583a20cae05d0a1937bf895683d0a5cd7f87c82cee96dca23aac02da213d3c1920 SHA512 e67fe0d1587ee28df2ad262aa9bb76fb26ea5d5459eed1ab168047db9a8bb566c9fd252ccb8a1d9e06a57371ab80e26f3940f0ffa503d3887b50b91fa25de1fa
-EBUILD pytest-codeblocks-0.16.0.ebuild 631 BLAKE2B a5f5b25dea468439059c08cbc196fe85f4760ba157a277e7fbf2af2986efd38b164045dcd75b500dd400e5810dea22c7c8db8954fc1faa26f1e0d8512b08e308 SHA512 ee742c49b05152fcfa1910f5e8d26278c1acd55e5f8fb29cfa1647a4f67d4cf2ebb9a19116b4abf9e20caf0007f8a937204b93535fa42811fdfba8d5bef7ba18
 EBUILD pytest-codeblocks-0.16.1.ebuild 631 BLAKE2B a5f5b25dea468439059c08cbc196fe85f4760ba157a277e7fbf2af2986efd38b164045dcd75b500dd400e5810dea22c7c8db8954fc1faa26f1e0d8512b08e308 SHA512 ee742c49b05152fcfa1910f5e8d26278c1acd55e5f8fb29cfa1647a4f67d4cf2ebb9a19116b4abf9e20caf0007f8a937204b93535fa42811fdfba8d5bef7ba18
 MISC metadata.xml 529 BLAKE2B 471620ffc4ca164b51a629d0cf744e30333ed6a3620cda03b0a5a424a5a135c1a651277463c33d52104cab6fad79c04f35e81ec72ded1b9240c166f654580102 SHA512 bd0df9564b3ee21e5746130a07220755f8c7e51bbc85320c3847161454e9bbd34383531e58413e183c4e199f466db559a88495ed6d5a4fa160e95e818eb00f5b
diff --git a/dev-python/pytest-codeblocks/pytest-codeblocks-0.15.0.ebuild b/dev-python/pytest-codeblocks/pytest-codeblocks-0.15.0.ebuild
deleted file mode 100644
index 6661d806043c..000000000000
--- a/dev-python/pytest-codeblocks/pytest-codeblocks-0.15.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Extract code blocks from markdown"
-HOMEPAGE="
-	https://github.com/nschloe/pytest-codeblocks/
-	https://pypi.org/project/pytest_codeblocks/
-"
-SRC_URI="
-	https://github.com/nschloe/pytest-codeblocks/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	>=dev-python/pytest-7.0.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -p pytester
-}
diff --git a/dev-python/pytest-codeblocks/pytest-codeblocks-0.16.0.ebuild b/dev-python/pytest-codeblocks/pytest-codeblocks-0.16.0.ebuild
deleted file mode 100644
index eee40482f02e..000000000000
--- a/dev-python/pytest-codeblocks/pytest-codeblocks-0.16.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Extract code blocks from markdown"
-HOMEPAGE="
-	https://github.com/nschloe/pytest-codeblocks/
-	https://pypi.org/project/pytest_codeblocks/
-"
-SRC_URI="
-	https://github.com/nschloe/pytest-codeblocks/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/pytest-7.0.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -p pytester
-}
diff --git a/dev-python/pytest-describe/Manifest b/dev-python/pytest-describe/Manifest
index b3c2969b8250..95ffcee9222e 100644
--- a/dev-python/pytest-describe/Manifest
+++ b/dev-python/pytest-describe/Manifest
@@ -1,4 +1,3 @@
 DIST pytest-describe-2.0.1.tar.gz 9793 BLAKE2B e7816cbc68e1ed1e2686ce3437cd0f59a52191d5413dbc9e0d6f9530a57728ad0917d86680b91228aa55ce689bc16c4da83595f87d82f9be9c4ce222c46fefea SHA512 c74362d5f1b0f3ff6d35d9049e82b7dc54be6755f1daa13366c47dee1ab9f1b1085d8c9719952d75c3c6c58b76a2c5f6b0162c78e53da71fe09bd91ed27f6bf2
-EBUILD pytest-describe-2.0.1-r1.ebuild 733 BLAKE2B 310b2f0bfc84698d89bbab87f4d03303df04b5a3b277b0078071e47584bd2b2d6c0551c75e598b2e6d6e56f5ec817a1997cdcd90b7a0c7d96fde958e41c436fc SHA512 2af6f8ec6da3d6e31dc9deb03fdd5899aca292d9cf498b5180395bde302ad7ef346e307084bbe8613c8a1521fe554cc3990362da62e5686c9e6fb3f59a70007f
-EBUILD pytest-describe-2.0.1.ebuild 699 BLAKE2B 0ee5652721e0ee463559d96594d4da3564b1779ffd3957f16b07d8757f3a4d33386b2f2e53973369972840e5a5177728ec43779fcb69ffd85b2dadc302b9051f SHA512 6657e80c6d7081473f5071c79c831fc9c4d3452849c94a8eaf15da7f843f1604cea82df3a14fa2425711615082833b6e46e59e6f240690e766ae2c61c32c75b2
+EBUILD pytest-describe-2.0.1-r1.ebuild 731 BLAKE2B ca6c10e3e8c951c1db2707ed239714282f7b7d08423795fedb8d935a141fb867af44b09a40e271e8ddaef8afb49e19cc6e2b7f1c6b5b992ddf75d7c07de846f0 SHA512 c5b9d09b8ae885782da1e02f5b3353183dd23b3eb70e0149f10a33f8929c3204a4e7895edaad3b3ebeab49e0d2edc6709b6c1686d9980e75a341019ddcdba42d
 MISC metadata.xml 409 BLAKE2B 00d21d44dc08a1a7166d85d5be7ce30b7af5d36e3e28bdcebb5f4495f9a5508bb7bc7f534aae9c242b0708a5e7c8bda4e693a2b05efac94e4283b1c8172ac5d0 SHA512 60e89b39de96adf0c7b80aa46b67544bce41c95eb2076e6f546f04ae46cf7d69709f89b9475c8e5b821b52afa9b3c344f2f5d7789fb2ceeba49facadc5d4c56b
diff --git a/dev-python/pytest-describe/pytest-describe-2.0.1-r1.ebuild b/dev-python/pytest-describe/pytest-describe-2.0.1-r1.ebuild
index 183240063ee5..36550c410a31 100644
--- a/dev-python/pytest-describe/pytest-describe-2.0.1-r1.ebuild
+++ b/dev-python/pytest-describe/pytest-describe-2.0.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND=">=dev-python/pytest-2.6.0[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pytest-describe/pytest-describe-2.0.1.ebuild b/dev-python/pytest-describe/pytest-describe-2.0.1.ebuild
deleted file mode 100644
index 1d2df2e46f29..000000000000
--- a/dev-python/pytest-describe/pytest-describe-2.0.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=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Describe-style plugin for pytest"
-HOMEPAGE="https://github.com/pytest-dev/pytest-describe/
-	https://pypi.org/project/pytest-describe/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND=">=dev-python/pytest-2.6.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# We need to disable some plugins because tests don't like unexpected
-	# output
-	PYTEST_ADDOPTS="-p no:flaky -p no:capturelog" epytest
-}
diff --git a/dev-python/pytest-env/Manifest b/dev-python/pytest-env/Manifest
index 0677ba99635c..5c6c694abd73 100644
--- a/dev-python/pytest-env/Manifest
+++ b/dev-python/pytest-env/Manifest
@@ -1,4 +1,3 @@
 DIST pytest-env-0.6.2.tar.gz 1693 BLAKE2B b303b8b2b486cd5f6c6273fefe709e3986183a56b6758b05f8bde973c561ebba9646538d38783749305740d8bd637966966a109fcd600cd6f6ee059449ffb328 SHA512 0b3bb21fc881023c102b584593c6e28840400ce8190810f33f9a421df4141e17dcfad2943c4159aaab82376b7b47b07b45f97c9cb232a7d17c4d35b55966596d
-EBUILD pytest-env-0.6.2-r1.ebuild 494 BLAKE2B 3bc6c9bc1fb59c547354dcc40291277f585c1b0acadcb47b44ceffaa11d134219ea234e8db0e8a09071e51e511dd16040f0b4952927a3026e628c45c99aa8edd SHA512 cbc1b51531f2a9c98f1715316f7f3696710c62474eb28f1101d97140bc13a786a60082d056dbaadc983a6b16cf86c4e61f16e22b7efac26431d2f42c75f34b9e
-EBUILD pytest-env-0.6.2.ebuild 460 BLAKE2B 397cfd7a213ff8361f8eef070e9e2e0484db00fe6cdf08b1ce05a2b1a366f625e6bb2377d4c3cc11c8a4256689f8a2f6e65c9fa2662da99b6a3b3ce3dccc63c6 SHA512 6af2e469b3a70c14ce44c279fbae3425cce4ed799eabccd8af9296eb9ab64906a6a51c4dba97b83c28a56849eaa986daaa5bad72ae5b1b6e55b24251a45843ee
-MISC metadata.xml 383 BLAKE2B fb5665ab9789604b0f0ffcc657c7cb41fe9b6167908bde0c439b861c6f6fa2ee09791da768434c2c4f18ca5a8f44cf34e0bd191ffbac72c1ca0e9090a08b3a13 SHA512 ff80433ea4b414f19c221a53c8c8a346bb01ad5a38ed56508ca6cc487059936e16ce0601ccc66ccfa5875d062b76f5a0b2e26b1320fa55e234c972b7d5bcf575
+EBUILD pytest-env-0.6.2-r1.ebuild 492 BLAKE2B 83b45fa4c8799fe025a6c1fdddee4ce7f695f03fc35e8e8677c9380ab7a56cd4c924aeef79e6d5c5197da8944ce650218b5681996bbe9ea3d274ed615169365d SHA512 4e80b35540a58eb1149a56c4c99f78d3e2eb2d0234b152a0aaf8c9b5feb66e66d8387e3f69a98c205ab2b5567fe9e9e36907c2d2f31e969746b0a0ba72e5f47e
+MISC metadata.xml 407 BLAKE2B 7353d52edf97f5667e7f3119b1896cc04ce6bb5f3e88eaca88091c7c24dc8a077b50c1b03bca5975c82cf70bf19af6e9a94a59043694980796ca8714850aa0dd SHA512 f0d9b4f02428c70f3d55f70d44f02dc198a363cbf7f00f7469af8cfdd729ef7467f115f98d84f038f6c65b58bbcbcaef5fb79b9992494b3ed598b64a94d9dc71
diff --git a/dev-python/pytest-env/metadata.xml b/dev-python/pytest-env/metadata.xml
index a795a9d361ad..ccf6121fada8 100644
--- a/dev-python/pytest-env/metadata.xml
+++ b/dev-python/pytest-env/metadata.xml
@@ -5,6 +5,7 @@
 		<email>marecki@gentoo.org</email>
 		<name>Marek Szuba</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">MobileDynasty/pytest-env</remote-id>
 		<remote-id type="pypi">pytest-env</remote-id>
diff --git a/dev-python/pytest-env/pytest-env-0.6.2-r1.ebuild b/dev-python/pytest-env/pytest-env-0.6.2-r1.ebuild
index e96a43a4a4d6..cf52e35eb739 100644
--- a/dev-python/pytest-env/pytest-env-0.6.2-r1.ebuild
+++ b/dev-python/pytest-env/pytest-env-0.6.2-r1.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86"
 
 RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-env/pytest-env-0.6.2.ebuild b/dev-python/pytest-env/pytest-env-0.6.2.ebuild
deleted file mode 100644
index 7b7d947f3bf6..000000000000
--- a/dev-python/pytest-env/pytest-env-0.6.2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="py.test plugin that allows you to add environment variables"
-HOMEPAGE="https://github.com/MobileDynasty/pytest-env"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86"
-
-RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-faulthandler/Manifest b/dev-python/pytest-faulthandler/Manifest
index fed42382c505..e0c1724fa0ee 100644
--- a/dev-python/pytest-faulthandler/Manifest
+++ b/dev-python/pytest-faulthandler/Manifest
@@ -1,4 +1,3 @@
 DIST pytest-faulthandler-2.0.1.tar.gz 3629 BLAKE2B f66b6989673b179b3ad3f583b9e7b9615b08e1e062f06969f37bd8a9a57e58bd0207544b0c11aa4a9d03f4db40a125bbbe1924160b2bdcb2c0c589de07281570 SHA512 184b4228693db0f15fdcf250f09c3ee9ef4767e744af9000ec46876f0c68e17434a6d1e25c7d59f610b2baa659d7af5a784cbf0e5e29b105f48d50d00cb1a7ca
-EBUILD pytest-faulthandler-2.0.1-r1.ebuild 544 BLAKE2B 2406c8f821e0edc5875e2aaa9564cdd1d0862300d223f8564c91bbedd426dd901f9d2a6614e443b14ccb78e7931c2705630deef6bc80a5fc09e4b7dc44f2a38a SHA512 d80a7bcc199aae27be6d0eacdb7ecae889e8681fd4670e394213aeff5380b2fbd6328f5e225384e472efa91f003a44fa09b8e4c4d18999379767a24f1955e70d
-EBUILD pytest-faulthandler-2.0.1.ebuild 506 BLAKE2B eed00faa56622564548d3178eb720da2320ef757b713cba5cc8a632a2e6b0ac478e3317f7deb7296e48f62208b0edd3a3938c4e61fd2dcaea9e932851dd02be8 SHA512 cce9affe6d7ca9f217ca2e07b014aa10602f3b7e81978f3eb737b620495f795ac2b44b0016be470c3f7bf050726ecd9e33d8df0159c67b028afc3c9183550bd5
+EBUILD pytest-faulthandler-2.0.1-r1.ebuild 542 BLAKE2B b68b3b23d078e08724b388aea65e853b6a86951985337f414fa1124d1646894b1f487ad308a12aabc463618a1a13ead27cd07ae4e7436357b7788f84eb6eff79 SHA512 6a178a39c0f507d9374363e9fcd221251dc0d20cac3861a41e45d9308124349f0ce5e10fca3552c562780a5b961da9e321134364c6bd8148e7e454d6d4d7ce83
 MISC metadata.xml 365 BLAKE2B 69e090b51eb1caafae5a0870c88286d9fca98456fa0c750e18d9bcd2a73d0ec6b5d0e7f9f5f53c33f09f07ba577bff3d4b07029220508df05633a03c9976d402 SHA512 a64ffcfedd62e8b6beae15d5d5e0ef5069fe64ce086e8abcc241d7dfd2cb7b2352402ade66d5b2864c328d822355d999f0eb62c7c174cd0111259c87b101a922
diff --git a/dev-python/pytest-faulthandler/pytest-faulthandler-2.0.1-r1.ebuild b/dev-python/pytest-faulthandler/pytest-faulthandler-2.0.1-r1.ebuild
index a910ce2a0c8d..c79a0fbd6927 100644
--- a/dev-python/pytest-faulthandler/pytest-faulthandler-2.0.1-r1.ebuild
+++ b/dev-python/pytest-faulthandler/pytest-faulthandler-2.0.1-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/pytest-5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-faulthandler/pytest-faulthandler-2.0.1.ebuild b/dev-python/pytest-faulthandler/pytest-faulthandler-2.0.1.ebuild
deleted file mode 100644
index 37aa6fc04bbe..000000000000
--- a/dev-python/pytest-faulthandler/pytest-faulthandler-2.0.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pytest plugin that activates the fault handler module for tests"
-HOMEPAGE="https://github.com/pytest-dev/pytest-faulthandler"
-SRC_URI="https://github.com/pytest-dev/pytest-faulthandler/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>=dev-python/pytest-5.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/pytest-plus/Manifest b/dev-python/pytest-plus/Manifest
index 4d3f53dd5a15..37608626e313 100644
--- a/dev-python/pytest-plus/Manifest
+++ b/dev-python/pytest-plus/Manifest
@@ -1,4 +1,3 @@
 DIST pytest-plus-0.2.tar.gz 8210 BLAKE2B b8a28e72cfb4e10daa021528de9b5df2e9eb0bc4e911557c7c14a0825284787e94992132c0b74881867a41b55a67785c60b9b87a1594ad33fb57ebac8de391a6 SHA512 e16a03433cb6eb30b6881bec99482bc65cb7d1fa3d0db855befe666c0645d4b5ec02debde9dec4322ed0a0b77d3ac3f1cabda0cf98f375ffd68dc29fb55f5139
 EBUILD pytest-plus-0.2-r1.ebuild 660 BLAKE2B 5173858f8d85857d44519d05f56daa147456df76b540a831883111366a2c827445240453823529c4e7eaa6ca50d4206bd5857d2422413b257e1b7536f865f626 SHA512 b04dafe2c78aee3d91d051d24ee6a29debaed70b48b91247279e10a400c926112691b2abbe274f33a6b6d0a0dd9deae84a1b134e1ed330f154e7d317b1834102
-EBUILD pytest-plus-0.2.ebuild 622 BLAKE2B ce7062baf929233ad5c8e1c89efe7fa85ace4740b4fbb5e55a8a0eee397b0970e18e613ad1ccd8160e149ebf025779ac5baa6e3aa332fdc254eacee485c6326d SHA512 0ca7038df407ce27686687b054d4404639870ee278a5efa355ce7cd56f7f85dbea5b4f00cca5c5d63db717f9d31809b396d9887f5e465a4e481fa03a08407127
 MISC metadata.xml 406 BLAKE2B ae1b1a2c28f45b4dd7f752125161396de88cf2ed3881f37f72dc7938cd2ea6485c995d0409c6fbaebeb7b1d4cf59736496549702d7a9d825a2ee5eb1e6a65fdf SHA512 33668115e05810055fa79f5d74c5d3b6eca5bb53e0108a257cb57bb496ebd0292c1dd3f5b33feee58c20c2c381a926c870f9576355171a91106c21fea41d6ab3
diff --git a/dev-python/pytest-plus/pytest-plus-0.2.ebuild b/dev-python/pytest-plus/pytest-plus-0.2.ebuild
deleted file mode 100644
index 0e691d690afb..000000000000
--- a/dev-python/pytest-plus/pytest-plus-0.2.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
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="PyTest Plus Plugin - extends pytest functionality"
-HOMEPAGE="https://github.com/pytest-dev/pytest-plus"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-RDEPEND="dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-shell-utilities/Manifest b/dev-python/pytest-shell-utilities/Manifest
index 0855b6b0efe2..78be39522a89 100644
--- a/dev-python/pytest-shell-utilities/Manifest
+++ b/dev-python/pytest-shell-utilities/Manifest
@@ -1,15 +1,3 @@
-DIST pytest-shell-utilities-1.0.5.tar.gz 89489 BLAKE2B 9cd7f95c9c1691e19c320378d1c2a4e147cb6fdc35ec6f3c80dc288e70416fce67b60ac86427f1ad322b2c17de3cd762e483d63076fa291b4b7d22d7a29c9e45 SHA512 395107af9eaa13ef39d01858e1674b6dedddc2cf93b9aba61316fd8d847031e1b535cc3bf4f2899dbc7828609b7d45b500aad29bb47668be6e0453ac099e99e4
-DIST pytest-shell-utilities-1.1.0.tar.gz 90873 BLAKE2B e787733fe641eae1884470b9410f017ef718b2f51cff09f7de592efc88a7f39bdc442e56ade2c547476a9ec7200b027a9ca2aed168afe162c8d4d06c6aaf6c61 SHA512 965c85d73f2be082253892d36b90fa60db0e8548272e34a3531c98c537e86b4e2cff477c017762bf9e275d97504b779e7d741e982cc03b114e30cee9c4904d95
-DIST pytest-shell-utilities-1.2.0.tar.gz 89881 BLAKE2B 8332f4f6b9b232cc8d17e94eef569ea7f17e14c4a97b060f84fd860de79bb5db2ebad5c239e889d2405e8be3db0d54b94a7071661eaf7065860049bcbc1e60a2 SHA512 efca390e2e3c78f82cf7888d511a1eb0e06e940259cfba146c40eeb54d5394f010497730837192c58e3b8c4cd350de54781f7ead7d3513d738eb34f81cc4d5ba
-DIST pytest-shell-utilities-1.2.1.tar.gz 89975 BLAKE2B 91d0731a2613beef6de98bf7eb61e773659a7047f44558e2ad5cb7c8071761d13f606d04ffb0ac3c6f926f539455cb2a0c2418e398d43d208a028c68bd268576 SHA512 73232844b482f973ad79f2578b434339f34c24cbb36f75ae66217fcd9d06a663d54a6bfcdf390d86d21e6d3b7386fd2f4ce9d6a4b1ce55592be62dbc89f2251f
-DIST pytest-shell-utilities-1.3.0.tar.gz 91500 BLAKE2B 88757447378afb334190c6f13406f6a57085bc574728be8965f22b9b17fd92985c044aa9491980d163631eceec634911ea9c67ff85bb9a91ee998e2dab245878 SHA512 1136f4e33c1efb995f7145066af8c71952999975e95c2311ba86ad44c9b18f6f6f5c09acb8211f30cde0f479b3afe92555c125a8f27631f9dd289e4a05bbe761
-DIST pytest-shell-utilities-1.4.0.gh.tar.gz 91577 BLAKE2B 33973d3c465918eb71f76497e9c96d3f3f03acfa83e7a116cdef46c67fcf1ba9d1e4b14f50c56c5a20c1bd85e16101f9a98ef93d19099cd97077b336a0aa4954 SHA512 75d8a25d6d607db9697900f36f326d1b86b948da6c83c7840c52a63964ed8cfcf1c54d343f607bcb2b5db3b471e7b59e3aea21d6f4943339f1f2e0388f22b29b
 DIST pytest-shell-utilities-1.5.0.gh.tar.gz 92287 BLAKE2B 015f78838eaff93438cbd7cd395926ac8f61653f6d27275ca87b379e5f27d60165157880e41e603823c17e639dcff91ac4f5fda1e904ad505bb9db0a577b800c SHA512 00cb5fa6979e09c90ba82928a135f644dd4056fd004f6bee8d216ca63e2cf4549f944930bf16e7a124f26a79c1b696d18ecf210bee3273343b9a90f9126f340e
-EBUILD pytest-shell-utilities-1.0.5.ebuild 1307 BLAKE2B 08fcdd6d7166344c3ce8371b97f4ecdf784b971b927d073d0f3b30f80880664345f0028691017ec54513471aae70c3a1d242cf783e655eefccaaaf8038d65a87 SHA512 94386a1e4cf9dd2fa906191fbc636a53a0311ea76e76a0a2482d1bb2850ff49f7b98d94ba491d5d31f35f1d374445fb7fee0d0500247d1359b4c1a0130a6ebb2
-EBUILD pytest-shell-utilities-1.1.0.ebuild 1033 BLAKE2B a7b1a0e7f4c37fb6c6311fa9b21d11f7ad90478557bd70b98c60dfd9142a6cf06a3fd9f929697a5ccc14761b17062570634b887aea8d62b3ca77892dc2d40b5c SHA512 69fbb5850aaefa3bad4739b7e3159f834bfcf88635388b0d0ae08d65062345cb2429352318f44432a087a128612afac3a3ca6d94d3ac982c1f95311a4a99b623
-EBUILD pytest-shell-utilities-1.2.0.ebuild 1034 BLAKE2B 6ab4ef08db8eb81bc65e57e91b3d4ce60ff4f977888ab6d26857424119bfa7e512f3372a20d85abdd09739e4b29b00d8879f4a2f4c6f3f1f83ddefd6e3df138b SHA512 a5d42634b41da2933f2ba145889be0b300a7e70aed8ed9c0cfd47ddc76ba0dcf40ddc4bf58d602ea4270b282e3ff4da2e1a417d6982485e55a66e7459d45138d
-EBUILD pytest-shell-utilities-1.2.1.ebuild 1034 BLAKE2B 6ab4ef08db8eb81bc65e57e91b3d4ce60ff4f977888ab6d26857424119bfa7e512f3372a20d85abdd09739e4b29b00d8879f4a2f4c6f3f1f83ddefd6e3df138b SHA512 a5d42634b41da2933f2ba145889be0b300a7e70aed8ed9c0cfd47ddc76ba0dcf40ddc4bf58d602ea4270b282e3ff4da2e1a417d6982485e55a66e7459d45138d
-EBUILD pytest-shell-utilities-1.3.0.ebuild 1034 BLAKE2B 6ab4ef08db8eb81bc65e57e91b3d4ce60ff4f977888ab6d26857424119bfa7e512f3372a20d85abdd09739e4b29b00d8879f4a2f4c6f3f1f83ddefd6e3df138b SHA512 a5d42634b41da2933f2ba145889be0b300a7e70aed8ed9c0cfd47ddc76ba0dcf40ddc4bf58d602ea4270b282e3ff4da2e1a417d6982485e55a66e7459d45138d
-EBUILD pytest-shell-utilities-1.4.0.ebuild 1061 BLAKE2B 6f97d065c5018425d5156d75f01f81f17218b23386f1e037c07ad6f2eded1c077cbbd4ec6c9835e39a5935bb5128ecb03e7924077d016bfd662dd7467dd8805e SHA512 c20745d8f005e5162f66e0aec5e20266dc7958ac713d167eda9cdff54ef009d559ec5ed7c95e4887e3a1857798472dd658395516b7341cf5ae37aeac46c36662
-EBUILD pytest-shell-utilities-1.5.0.ebuild 1061 BLAKE2B 6f97d065c5018425d5156d75f01f81f17218b23386f1e037c07ad6f2eded1c077cbbd4ec6c9835e39a5935bb5128ecb03e7924077d016bfd662dd7467dd8805e SHA512 c20745d8f005e5162f66e0aec5e20266dc7958ac713d167eda9cdff54ef009d559ec5ed7c95e4887e3a1857798472dd658395516b7341cf5ae37aeac46c36662
+EBUILD pytest-shell-utilities-1.5.0.ebuild 1059 BLAKE2B f952a1730a3315233009193fb9a1d480bf5067a0d6b1a65facd6e2abb936486a8f4e756d828e7c90543a2ef6481e039e960f32d8c545f0ddf83e69d8c152e77a SHA512 3839b6e62221d30f0386d2b70c87d61c1f21865b0236195e653230b11ba47f97624376d7b64f0b8b2ae5c6ade347a7f71015e9e11a3bd9d417d0a62e4ee0bd05
 MISC metadata.xml 436 BLAKE2B 8cb927224ae6ac36a59818b60f8b4ef4a8d1cc4ca284934f50fbcc957ac25a417307c533d6d3728f38e98977ace3cdb106b9b62abe10a9b843a42ecdb30c97e4 SHA512 505a9f97a74581b9c7f59862186db14ab2f543cadbd05424e32541f31ff0c88295b4ed0b6dfbfa53dec1208d16275fcf99cc72c6a51c95e7f07e5392804a09cd
diff --git a/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.0.5.ebuild b/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.0.5.ebuild
deleted file mode 100644
index e28b54adeec0..000000000000
--- a/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.0.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="pytest plugin: fixtures and code to help with running shell commands on tests"
-HOMEPAGE="
-	https://pypi.org/project/pytest-shell-utilities/
-	https://github.com/saltstack/pytest-shell-utilities
-"
-SRC_URI="https://github.com/saltstack/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-	dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
-	dev-python/pytest-skip-markers[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/wheel[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-subtests[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e "s/use_scm_version=True/version='${PV}'/" -i setup.py || die
-	sed -e "/setuptools_scm/ d" -i setup.cfg || die
-	sed -e "s/tool.setuptools_scm/tool.disabled/" -i pyproject.toml || die
-
-	printf '__version__ = "${PV}"\n' > src/pytestshellutils/version.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.1.0.ebuild b/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.1.0.ebuild
deleted file mode 100644
index 91044405002d..000000000000
--- a/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.1.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="pytest plugin: fixtures and code to help with running shell commands on tests"
-HOMEPAGE="
-	https://pypi.org/project/pytest-shell-utilities/
-	https://github.com/saltstack/pytest-shell-utilities
-"
-SRC_URI="
-	https://github.com/saltstack/${PN}/archive/${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-	dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
-	dev-python/pytest-skip-markers[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-subtests[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.2.0.ebuild b/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.2.0.ebuild
deleted file mode 100644
index b4d91a1e5427..000000000000
--- a/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.2.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="pytest plugin: fixtures and code to help with running shell commands on tests"
-HOMEPAGE="
-	https://pypi.org/project/pytest-shell-utilities/
-	https://github.com/saltstack/pytest-shell-utilities/
-"
-SRC_URI="
-	https://github.com/saltstack/${PN}/archive/${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-	dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
-	dev-python/pytest-skip-markers[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-subtests[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.2.1.ebuild b/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.2.1.ebuild
deleted file mode 100644
index b4d91a1e5427..000000000000
--- a/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.2.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="pytest plugin: fixtures and code to help with running shell commands on tests"
-HOMEPAGE="
-	https://pypi.org/project/pytest-shell-utilities/
-	https://github.com/saltstack/pytest-shell-utilities/
-"
-SRC_URI="
-	https://github.com/saltstack/${PN}/archive/${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-	dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
-	dev-python/pytest-skip-markers[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-subtests[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.3.0.ebuild b/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.3.0.ebuild
deleted file mode 100644
index b4d91a1e5427..000000000000
--- a/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.3.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="pytest plugin: fixtures and code to help with running shell commands on tests"
-HOMEPAGE="
-	https://pypi.org/project/pytest-shell-utilities/
-	https://github.com/saltstack/pytest-shell-utilities/
-"
-SRC_URI="
-	https://github.com/saltstack/${PN}/archive/${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-	dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
-	dev-python/pytest-skip-markers[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-subtests[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.4.0.ebuild b/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.4.0.ebuild
deleted file mode 100644
index a8e84f1cb8c6..000000000000
--- a/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.4.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="pytest plugin: fixtures and code to help with running shell commands on tests"
-HOMEPAGE="
-	https://pypi.org/project/pytest-shell-utilities/
-	https://github.com/saltstack/pytest-shell-utilities/
-"
-SRC_URI="
-	https://github.com/saltstack/pytest-shell-utilities/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-	dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
-	dev-python/pytest-skip-markers[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-subtests[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.5.0.ebuild b/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.5.0.ebuild
index a8e84f1cb8c6..8baa0cbc0b49 100644
--- a/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.5.0.ebuild
+++ b/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.5.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-subtesthack/Manifest b/dev-python/pytest-subtesthack/Manifest
index 06384751eb7e..948650b02604 100644
--- a/dev-python/pytest-subtesthack/Manifest
+++ b/dev-python/pytest-subtesthack/Manifest
@@ -1,4 +1,3 @@
 DIST pytest-subtesthack-0.1.2.tar.gz 2669 BLAKE2B f1f5a052f9418732de4a97ff438d280d177860439e667e29ff0d0503740e009c88046b5ba859884e5fa9e958ea1be7388d7fc6838c19e44075ab0ef757ee41c7 SHA512 ddb7b0c27f912bec31e58ddc54930e229755df8980d146c861f7f1c766ae742b4f1552117d89638bdbd443f22890262320a56565954ebc6deeae6184f459a5a8
-EBUILD pytest-subtesthack-0.1.2-r1.ebuild 657 BLAKE2B c8eb0c587d8d56c4e2cbb066ce5cdf291f2769b0fe9201827b83ea11ddcb4f0e9607859973609fc2acd2921199d2e55219a72956d47ad09bc41e0b0a77862d4b SHA512 c36410db2a8c7f9fd091df49558df4434ee3bcc7e290e9309465866d9e5426378082ef36ff414b1bbcb17e32bcaf30c9f9d5be53b537ffee22b650d4cb0ba792
 EBUILD pytest-subtesthack-0.1.2-r2.ebuild 709 BLAKE2B b27b30aea55a82a39625b76122c2f4bf0e7c46d6e37e7215b0eb6137332ea6de878f7903f1244780d7847c5c74cf4cc4f81e464daceb5e87f033b752c33d416b SHA512 a8020181f8584450567a34d05136607b916b578b339c8244302ebe46f43d588832a2597a3ab06783283453480724eff5102a7e6c8a2b580b8f34275461c780cb
 MISC metadata.xml 414 BLAKE2B 75bea5f93518f1e9b08ed1ad9f772c670bcf565f28b4a67c511fe919513741257fc5917f180ef31ed3e6d43b7986e8e1357ec456f9ddae4603baee1801dd6cc7 SHA512 5b4440d54b4ceb803ba5d9e4ea97fa38b777dbd1af02275f59011f727d9cb166427e8ed63b164b1891f6313349d49d31f4d7762e679439945a6ed4c24add6f46
diff --git a/dev-python/pytest-subtesthack/pytest-subtesthack-0.1.2-r1.ebuild b/dev-python/pytest-subtesthack/pytest-subtesthack-0.1.2-r1.ebuild
deleted file mode 100644
index 40ab8552ca9e..000000000000
--- a/dev-python/pytest-subtesthack/pytest-subtesthack-0.1.2-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A hack for test fixtures, needed for hypothesis inside py.test"
-HOMEPAGE="https://github.com/untitaker/pytest-subtesthack/"
-# pypi tarball misses tests
-SRC_URI="https://github.com/untitaker/pytest-subtesthack/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
-DEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests --install pytest
diff --git a/dev-python/python-bugzilla/Manifest b/dev-python/python-bugzilla/Manifest
index 1e466783f871..532041590dd9 100644
--- a/dev-python/python-bugzilla/Manifest
+++ b/dev-python/python-bugzilla/Manifest
@@ -1,4 +1,3 @@
 DIST python-bugzilla-3.2.0.tar.gz 114279 BLAKE2B 4d2d7bfaab08dfeb4334462334f23f952b43255e656b0e39eff29bfc206529062c86c79b8c83110fbc5c3970bba40663318b65e208c1b10fb04ab6fb474eeb95 SHA512 215945a0ffd637be5567839303a738a0eef74427838bf0074a5f0ab6022306f47fc0dd5c43a3513b627fb458711f38046321ee9c2c3d43b61ffc577d6dd12375
-EBUILD python-bugzilla-3.2.0-r1.ebuild 757 BLAKE2B 16bc24210701c39d7a9e88d1f55c67477f4a561bbad7cab8431178614722e6bcf21c243a657409e73f3e6c9fa5ccf8b00f04ed98532bf4d19fb0584b2b4c554d SHA512 171fa1ed8ab0c440d957ce8be8f2f984bc3f8e8fcbdb0cd32affeccbab64da73fef2303f0465d809ce3adb2b019531d3ed8a1c7d694769ea1266bdb1e09c57ee
-EBUILD python-bugzilla-3.2.0.ebuild 668 BLAKE2B d06595c1b9a885fb73e7f7a884beb20b05110f601a8581270128169f87437cfec587a95623e529cc8a42606ea237c64551b2b2271f5741093fc6e8dc7059fb8c SHA512 6f68cf94e384c4b10bd94a437c988e230a3c66a81dc603fc3e318ec9b1f986118fb90a32e3ad1f3e73c6f9877a229efa4584d47f4ed4a8942d2acba976b83be5
+EBUILD python-bugzilla-3.2.0-r1.ebuild 750 BLAKE2B bf334727b8cea37208f2245dba5c8935e0989d78dd6ec3f2955cc7c08246c4bbc463b4121a7a7e7e5330265ccbb606132f2754b392ed166498c58f99a9fcec7f SHA512 539c5c5bac312d4c278a9b6525499caf4c32ffdc366d3af008561e12c29093114a1d8807dcb38e16d6b01ec4d6cb4964a46da81d5a72bafb30bc2e54067ca631
 MISC metadata.xml 662 BLAKE2B ef0a5692d9d4f3ca0f474eb012ef97cccba5fa9c8737ac85852d9bb3214160d69fc95eca8239de8d08bf6ea04b5004097ce6b192c2276bc574f441766042c7b3 SHA512 e4ce0016e9ab606c8233759992ea2daa8b20df9b60f129c0b3e210536f0697b46469828de321fa7a09e56889747da67cb38242b739aed227d4a60657207e7f8b
diff --git a/dev-python/python-bugzilla/python-bugzilla-3.2.0-r1.ebuild b/dev-python/python-bugzilla/python-bugzilla-3.2.0-r1.ebuild
index 3f3902f6aba3..a54bcff15482 100644
--- a/dev-python/python-bugzilla/python-bugzilla-3.2.0-r1.ebuild
+++ b/dev-python/python-bugzilla/python-bugzilla-3.2.0-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="
 "
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86"
 LICENSE="GPL-2+"
 SLOT="0"
 
diff --git a/dev-python/python-bugzilla/python-bugzilla-3.2.0.ebuild b/dev-python/python-bugzilla/python-bugzilla-3.2.0.ebuild
deleted file mode 100644
index 462b475163cb..000000000000
--- a/dev-python/python-bugzilla/python-bugzilla-3.2.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A python module for interacting with Bugzilla over XMLRPC"
-HOMEPAGE="https://github.com/python-bugzilla/python-bugzilla"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86"
-LICENSE="GPL-2+"
-SLOT="0"
-
-RDEPEND="
-	|| (
-		dev-python/python-magic[${PYTHON_USEDEP}]
-		sys-apps/file[python,${PYTHON_USEDEP}]
-	)
-	dev-python/requests[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/python-cstruct/Manifest b/dev-python/python-cstruct/Manifest
index c51682a3cd47..b0b45fb374d1 100644
--- a/dev-python/python-cstruct/Manifest
+++ b/dev-python/python-cstruct/Manifest
@@ -1,4 +1,3 @@
 DIST python-cstruct-2.1.tar.gz 17298 BLAKE2B 9acc10f0d386c4413634945fc94b3e44210617c408ee18cf6533f70e7d64c609d463e9beceeea7c79b125e0bf0ab67a720d9ff98f45b4e7ce1f51d9280b55733 SHA512 c56c87d291c4aa2afcfdbcbbc19c03ec634b6fb0dcde9d516ef2a9079be2fea52a053c47cd20dfc0fe6537ac90939364da659d8eb4763069a9990681207d432c
 EBUILD python-cstruct-2.1-r1.ebuild 511 BLAKE2B 57d9a0555155fffff38d8f290191b7b61225f1697fd22e35670c4618960a8143707c0c473e9d3cbbbd4bff6b5c2ea23b2cbf7704685f01fcdbfef96ef270171d SHA512 ea33dcd6371bb90efa9fd376b3746cd544555d005d30f6203170e0c075c2b31046c3613222714d42c641e20081903042d474a76b51092eacb38c533e883d0072
-EBUILD python-cstruct-2.1.ebuild 479 BLAKE2B 29cecfe02f3aff90a7d9cf8ce888fda2b28edaed9a81463d7b15fc0b16c35d1aedd1da6cd88054353691e4d101e4034832c4f3f776ae4dc696b7e4da0ac0cb1f SHA512 1928a9f672f070c5093651b2cfdb0804ceffd70689a637b5154d6009ad2df4030773bada4c420a610ef7247713e0a95c24bb9b40c00d66eab40670c04ef62577
 MISC metadata.xml 454 BLAKE2B 5138bc275b0b9e18cab52fb309283c6b6dab8be5dcc3c86dd6526f350b216c68bc94dd2aabc7a33a4879c23165924563396c6d5991f5c702a12e184067d25cdb SHA512 bb259a25444029d8ea63577f0576ab283282298d27987e276bf4eb6d4ef00853ed019ad199830e9bb4e738f9a151feb55d53e76917508f1033c2b3ecd246276f
diff --git a/dev-python/python-cstruct/python-cstruct-2.1.ebuild b/dev-python/python-cstruct/python-cstruct-2.1.ebuild
deleted file mode 100644
index ccdcbbfbf89e..000000000000
--- a/dev-python/python-cstruct/python-cstruct-2.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="C-style structs for Python"
-HOMEPAGE="https://github.com/andreax79/python-cstruct https://pypi.org/project/cstruct/"
-SRC_URI="https://github.com/andreax79/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DOCS=( README.md )
-
-distutils_enable_tests pytest
diff --git a/dev-python/python-debian/Manifest b/dev-python/python-debian/Manifest
index 309ff423b81c..4fd7d1e93c59 100644
--- a/dev-python/python-debian/Manifest
+++ b/dev-python/python-debian/Manifest
@@ -1,3 +1,5 @@
 DIST python-debian_0.1.43.tar.xz 175832 BLAKE2B 2b43da25392c844a3c8fa8e159695ef4c871c6620be88d286abde31b9285e3f005e3c20997617d24014fe94a1a3c446c8721f8d92c35018ac308da8703788bcd SHA512 510dd37ef65be2ee0f9c4c4c15010b94fc7c05c621de2cb25fee4f6e741f51dff2e4cdc333313bac8269bfa621533217b3f72ecbd8b0b6368aa52c54e5237bb6
+DIST python-debian_0.1.44.tar.xz 179372 BLAKE2B 39d19c46e956231cda7c1fdb3ca89f8ef579d61e6bff06b35114184b2596516b3a01f756ff8e34e9a0dab669658cce7b8fdbfa39ed770df376acf6c4c6fb1401 SHA512 34c627cf32647f196a4b41a8913fd9aaefcfd6c96d21cc8f9798723ac11dac371574f62af9e549437188f2f492cb80445e33f35c72b6fa8212223029371a7b33
 EBUILD python-debian-0.1.43.ebuild 910 BLAKE2B d9cfcaed8155908f5f5368ffa0b024672055467921c8244e81480da9708262e4379ae8cd6abc5b1e5013a114e0fc33b64897c81fec2672d0f45402941730b33a SHA512 5d9e19affafacb78b99ec9d1a4d2b1e575b649c8191d0afe1371758f0ab1e0ca1d58d2087c9bd513ac0becb58dbdac394315076706df9efb7ab70d25013bf808
+EBUILD python-debian-0.1.44.ebuild 966 BLAKE2B 603a89e178cdde7e72085b616803c263c7b4874fb6abbf71fb306d81feed10d6fa3010476e7fd177d69764bdf0a7332cf08ce8e45bac37820048bcc2fdfef654 SHA512 3550de40d71c5c7aef4db108121109cd3e79deb0b7e17c3ee446484ceac6256ed31271f58be72422022a7fe90d250151b9041d527b5ccfeb4a81e2695787f452
 MISC metadata.xml 448 BLAKE2B bccb39bdfb24e81bc05028fc92033468f5256be096cb409b4413f69444d59d3d9a3469047337a7fec79ac707ddf4d269b44b20c725f7fc4935bd10335e1f9374 SHA512 8e3fb6ca4bf305e23a51ff56cf84648aad1e96d36aa7a4fb138f7136ea77a6a76a8985557ecb1c9da962479c8c9e36c253655d6e6602c1833f2a2230b44540aa
diff --git a/dev-python/python-debian/python-debian-0.1.44.ebuild b/dev-python/python-debian/python-debian-0.1.44.ebuild
new file mode 100644
index 000000000000..3c07375c1483
--- /dev/null
+++ b/dev-python/python-debian/python-debian-0.1.44.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2011-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python modules to work with Debian-related data formats"
+HOMEPAGE="
+	https://salsa.debian.org/python-debian-team/python-debian/
+	https://pypi.org/project/python-debian/
+"
+SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		app-arch/dpkg
+	)
+"
+
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	# See debian/rules.
+	sed -e "s/__CHANGELOG_VERSION__/${PV}/" lib/debian/_version.py.in \
+		> lib/debian/_version.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# See debian/rules.
+	"${EPYTHON}" lib/debian/doc-debtags > README.debtags || die
+}
+
+python_test() {
+	eunittest lib
+}
diff --git a/dev-python/python-gammu/Manifest b/dev-python/python-gammu/Manifest
index 8d999e0cdf03..78f10ab67f04 100644
--- a/dev-python/python-gammu/Manifest
+++ b/dev-python/python-gammu/Manifest
@@ -1,5 +1,3 @@
-DIST python-gammu-2.11.tar.gz 135567 BLAKE2B 133172cfd0715ff6b5bd47b93e5d93d52af3e608459ba1158bf008da9b5f24f6d155c04334dea7ff2cacdea678f00d986838a139290d5f8ac874bb9702fcd5e6 SHA512 cdf3a54fc538fecdbe3dae63f0534094ce94a289998f9b670a0b3e12a3c571eb46ee86eae67a7a8d2428698850046d5c75569753bf77551cd395d315e6f9b70d
 DIST python-gammu-3.2.4.tar.gz 144136 BLAKE2B ef06b78568e9b88da95d09029191a2de0c4e26cb6b222326bffd0134a9c7eb743bab20201347d3be8a81db43f6005ec2a0550e1976a59de9ee9202c733ae41e0 SHA512 9d76b402c50018cc52476376952edebb6b0934aa374ea2a2177f5497d0949fcc77644aa2a35c7402b3f2179962d903409b7b1949c5e85a0e5130058d34f89664
-EBUILD python-gammu-2.11.ebuild 790 BLAKE2B 033f3a46bd211f278be1422cf5721dc50904707e7cdefb7053d29c19cea95ea4b8d1e20bc49cd056b482d38fcffb442bf9b51659d2697c181d09744902869cc5 SHA512 f3285cf9a82efdfd964df9920ee29171bbf1adfd0cab72438365718ce7486e48bd1160160046d2021e19436c3e829882371e016c98b826b3126aa3fccf1dfaae
 EBUILD python-gammu-3.2.4.ebuild 827 BLAKE2B 4987ea19d8fc2cebd7fc1a4f7945a8e8fc542df85e715b18474b5658df5944e683d9ed014fb19c0aff3391f7968f385d52bc4957089928d9d68d7dca138db663 SHA512 7c49203312e78afb98e696f648d7fdbf701c6969b9a252f01d813b8fe8c6abdfc9c62c6d2ab21d08543f1503ff72cfb6e5304859a649cbae721e9ac1031fa22f
 MISC metadata.xml 299 BLAKE2B f8e1c54ab09e004a0f87f87a793af8d1dc6b97dfc1fbd07183407e9f6501b5c0aada63828495d5645d37a97c4e8ef3ec44e5c5771c4721e5a6d5c00008c586ad SHA512 6308e513011c0966d9c535f5ca153e38caa4bf843143fa3aad57e36e94d50f7e97232e62b8611045158d8e1f0741f70247e9ee799e6227f5497d1133c6dc1832
diff --git a/dev-python/python-gammu/python-gammu-2.11.ebuild b/dev-python/python-gammu/python-gammu-2.11.ebuild
deleted file mode 100644
index 74f61aa9ae4f..000000000000
--- a/dev-python/python-gammu/python-gammu-2.11.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for Gammu"
-HOMEPAGE="https://wammu.eu/python-gammu/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=app-mobilephone/gammu-1.34.0"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		$(python_gen_impl_dep sqlite)
-		app-mobilephone/gammu[dbi]
-	)"
-
-DOCS=( AUTHORS NEWS.rst README.rst )
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		dodoc -r examples
-	fi
-}
diff --git a/dev-python/python-ldap/Manifest b/dev-python/python-ldap/Manifest
index 7f5775ae4eec..7b37660c7c63 100644
--- a/dev-python/python-ldap/Manifest
+++ b/dev-python/python-ldap/Manifest
@@ -3,6 +3,6 @@ DIST python-ldap-3.4.0.tar.gz 376169 BLAKE2B f514ddb6267fd8c21a1c4595669921a1256
 DIST python-ldap-3.4.0_p20220420.tar.gz 377780 BLAKE2B 433178138587dc09bfe1e6a8e894c001baf6e07c76266ca9d7c56b279f9e9ca5a642528a5869a837a9ee5576a2cf17afdeea313b4a8bc930926397738d6a5daf SHA512 0dfe8ff4737a630a08c7cd4d94f30c78fd1e0558ffc0609439d95ef064b72aef9d4ec4cdc0d40aaf1fc46396bdc0cbbdf0bf3cf6bb5e94bf8a9e3083b9ba1bf4
 EBUILD python-ldap-3.4.0-r1.ebuild 2377 BLAKE2B b0f9672998198c1202cf4c8bc904d2bb65689598a5757bf2dd25e380ee81c65a4b7885347fcb8bb802e9a4f88a60d2316c29fd580bd80bca4bf73e22efbcd7a6 SHA512 a5b2f8b402f54477933f38c70cfb38abfcbc725eef95ce678ec6f2c6a3de84113cac5b1634232d439aa71b5f71fdc972245544d0f7c4bc08e138497aaef34c2c
 EBUILD python-ldap-3.4.0.ebuild 2033 BLAKE2B 56f792253b2b02f694f0ed917a80b07e6d83df03da2b5f80da04a5a376a3af618889c02a32b319c67c5be0107dcd66a52d2fcea11ceab8bd351f321f0c66ca6c SHA512 5d0bbeeb940ce633aa11215c56c1648c66041bcda37c4ca996031185f92f1266659b961d18da8f546a7c347a1a11f4a97b77a11cc0f4b5a966e23593c44f9a82
-EBUILD python-ldap-3.4.0_p20220420.ebuild 2343 BLAKE2B 85eb6abdfdb2526cd7982503d6139c8f4dd833fe0f13abbf5b2503ce07338799565bb21204854ec024dfb7ec5d1117166e056da117eb7f100995f88b3a7369a6 SHA512 e96fd227c05d85c9de809f8688e9b04ee32e5df5574c844febb6f7e71984a3a99945da8f02c21dda39bd88dd11ba8f60d4dc0034752f99e08186634bed13154c
+EBUILD python-ldap-3.4.0_p20220420.ebuild 2340 BLAKE2B 696664a88336ca721f3fcd4c7c4c294791140e3f279f6eea5d55babf3d25b2d7fe49ae5d14e7f6cb96101ce9d6888ccf41ec531ea14b6685a63828f68ae5c85f SHA512 a1e9fd57953f8540c6196fd36cec98dcc24be41c8660e81ec2c7916ced001a5a85d2e645f76fdbdae5637498b3dcebfb84d9320d7c4400cd72d1be2b68cd2319
 EBUILD python-ldap-9999.ebuild 2000 BLAKE2B 1340f010714318a6a8e90ffa228a3c0799909ee1f70af5ec5cbd73449d6982a18df35353a3d356d559a89c43be1c44f097698236a6118ad66fac5630a75d57c8 SHA512 c58a4c82d5e18bb29b62024a826b063f0f47ee3f9e4a798251175b4115a31f5a5803962ec597c12d8855faba83c259f559083a6499524f41197d2ecfd0d3a9fb
 MISC metadata.xml 449 BLAKE2B 14ffa18ca09eb663d3ef4ff5bd0ebc8511fa408a4e96c93885ba2beaccdf3bb82a9733a01149e088c8b66d6cb938f94fc3940c0c0cca5685599191e772443cb6 SHA512 2f5c014e55f838b84abf6ba630b000620a01e2fca6d1f1bd1b30db309f820df50c2ef7feddc17c69ee0188c3cbc91a388933b4bccfc8d2ea0cb18c6dae85cda6
diff --git a/dev-python/python-ldap/python-ldap-3.4.0_p20220420.ebuild b/dev-python/python-ldap/python-ldap-3.4.0_p20220420.ebuild
index 488fa3e27563..2046409d2aeb 100644
--- a/dev-python/python-ldap/python-ldap-3.4.0_p20220420.ebuild
+++ b/dev-python/python-ldap/python-ldap-3.4.0_p20220420.ebuild
@@ -24,7 +24,7 @@ else
 	SRC_URI="https://github.com/python-ldap/python-ldap/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}"/${PN}-${MY_COMMIT}
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc x86 ~x86-solaris"
 fi
 
 LICENSE="MIT PSF-2"
diff --git a/dev-python/python-utils/Manifest b/dev-python/python-utils/Manifest
index c8155babb6e1..924e4079a816 100644
--- a/dev-python/python-utils/Manifest
+++ b/dev-python/python-utils/Manifest
@@ -9,5 +9,5 @@ EBUILD python-utils-3.2.2.ebuild 763 BLAKE2B f5b8c60a98b1c46721314c73971bf8cb793
 EBUILD python-utils-3.2.3.ebuild 763 BLAKE2B f5b8c60a98b1c46721314c73971bf8cb793c96304aa12ba9be47751146456f6f7664fad0261f5fd4f6a9b2b3f83831b5204658a287d643b95496c326e83d916f SHA512 119f736a64b9643b058c18bf6e2a159e8310e7968d75599c9b7b0e3cafaccfde922ea260423994d6085b97f6310101cbd38009c2819613b429c1db505c291bcf
 EBUILD python-utils-3.3.0.ebuild 763 BLAKE2B f5b8c60a98b1c46721314c73971bf8cb793c96304aa12ba9be47751146456f6f7664fad0261f5fd4f6a9b2b3f83831b5204658a287d643b95496c326e83d916f SHA512 119f736a64b9643b058c18bf6e2a159e8310e7968d75599c9b7b0e3cafaccfde922ea260423994d6085b97f6310101cbd38009c2819613b429c1db505c291bcf
 EBUILD python-utils-3.3.1.ebuild 763 BLAKE2B f5b8c60a98b1c46721314c73971bf8cb793c96304aa12ba9be47751146456f6f7664fad0261f5fd4f6a9b2b3f83831b5204658a287d643b95496c326e83d916f SHA512 119f736a64b9643b058c18bf6e2a159e8310e7968d75599c9b7b0e3cafaccfde922ea260423994d6085b97f6310101cbd38009c2819613b429c1db505c291bcf
-EBUILD python-utils-3.3.3.ebuild 763 BLAKE2B f5b8c60a98b1c46721314c73971bf8cb793c96304aa12ba9be47751146456f6f7664fad0261f5fd4f6a9b2b3f83831b5204658a287d643b95496c326e83d916f SHA512 119f736a64b9643b058c18bf6e2a159e8310e7968d75599c9b7b0e3cafaccfde922ea260423994d6085b97f6310101cbd38009c2819613b429c1db505c291bcf
+EBUILD python-utils-3.3.3.ebuild 762 BLAKE2B 514736bc1166f789c5fa133adeffe37ebcb2eef44066d2932edfab1abca349c9454708722c0ba3fba167b657750cb189ab4997ddb3a27244200d76085da571f0 SHA512 3d3cb67467d01032b072314a34c838abad8ed817e37cbb76cdc2fe363679e4c27fb2aa90b9dd0c8115f9153d7e33c78f7370828732ad6838457e9f402a61de4a
 MISC metadata.xml 340 BLAKE2B dc9b0299a4b93a0e53cc8e8e5ab494a8bf04ea54da4c2f9a658ca485925f86b5a765299c6680ecbff1e29a4e94a88dcac1891e440c788ada76b2123e352ac6f2 SHA512 68222ff7625c88a73f918e1864b67a2a44ef128023668b2a8706e873b4a8703928f1961baa0b304fe8fa075261edcd183bae02a2416813b283aa57c16bf6e200
diff --git a/dev-python/python-utils/python-utils-3.3.3.ebuild b/dev-python/python-utils/python-utils-3.3.3.ebuild
index ce049eb48c18..d3823b0f667f 100644
--- a/dev-python/python-utils/python-utils-3.3.3.ebuild
+++ b/dev-python/python-utils/python-utils-3.3.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/pytimeparse/Manifest b/dev-python/pytimeparse/Manifest
index d132b61a2e5a..719f1d9e31d8 100644
--- a/dev-python/pytimeparse/Manifest
+++ b/dev-python/pytimeparse/Manifest
@@ -1,4 +1,3 @@
 DIST pytimeparse-1.1.8.tar.gz 9403 BLAKE2B 671a96f0f7d517e6cd137b8ec7bda17976993a683ece5e06f857cb07063cd4d7fdd08a98f838dbf35251a8403b68f7dc538e5450db3abe644e8c7c4f6c76b645 SHA512 9eb4530d779b940d66412920eefa4f4d3c43719aa3e4104da4f337c05421bcbb6ad4cb2d6459ddfac770fc9f19960a9d8ce578e67f2513499a7bee8efe9541ec
 EBUILD pytimeparse-1.1.8-r1.ebuild 498 BLAKE2B 9aeada4248de898b4ae3774ecb747ae3b05e4e70f5542484d0d1d87882bb14538fece59161bcc4ce0156242e80110009ce5f009f129097e10ac3a7ea89b44a56 SHA512 120ba958202bb5f8af01e2860b55b2234e69d4c76853b02e646c544bef27ee63823850e286cbdf6a5bf06c04b5fc4236b53d595f97e7d0050987f17c5fddbca0
-EBUILD pytimeparse-1.1.8.ebuild 653 BLAKE2B c0a653a8eff39bc3490601ea744d0023aa2ed66c5908725f49677b5552c8897072d53f716b30bf24c34d5bf7f8f83fd364809c361f0ed80708a6c2c80dfe2d81 SHA512 3d5a6399d3734baf680b5b5f5afb7359b51b85ecbc4e078d36ff9f6fd1ca04c161f6d88b7a15d2f61a08d38f799893c1fb7b6031c77152d7da48eb8f64419897
 MISC metadata.xml 501 BLAKE2B 9ad6298b97c2882d63f95eebd4e055745b736b15b28c9268096b08e8a1376169614795b2b5138ae03fdb22c75be6c30776bc8b998955b88aaf1b3ab2ee60d44c SHA512 2a01bcf9ca0e6a9b285f5aff31e05e8b31c00487ddb09036c69d86fcdd3c28ce89f89a309d9510436a0b27bf922778f46914b215918ed9e1ab9b31887d1e08b2
diff --git a/dev-python/pytimeparse/pytimeparse-1.1.8.ebuild b/dev-python/pytimeparse/pytimeparse-1.1.8.ebuild
deleted file mode 100644
index 536667deb9cd..000000000000
--- a/dev-python/pytimeparse/pytimeparse-1.1.8.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A small Python module to parse various kinds of time expressions"
-HOMEPAGE="https://github.com/wroberts/pytimeparse https://pypi.org/project/pytimeparse/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-python_test() {
-	local unittest_args=(
-		--verbose
-		--locals
-		pytimeparse.tests.testtimeparse
-	)
-
-	"${PYTHON}" -m unittest "${unittest_args[@]}" || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pyx/Manifest b/dev-python/pyx/Manifest
index 278ef7d72447..83a858368a88 100644
--- a/dev-python/pyx/Manifest
+++ b/dev-python/pyx/Manifest
@@ -1,7 +1,5 @@
 AUX pyx-0.14.1-unicode-latex.patch 600 BLAKE2B d7e2b4804731372b8b149b8e50ed6163297e60548c479aad8d796df4630f87e3df7e28379c6e88158e135f1b2e1eddcc712828efdd3fdcae501681bdf5e602f0 SHA512 f2a6af35aeddcd10d936a9ced93f708606bccb9f249bb45c6cf86111744f7efad9c08e9ce9e41d63b04345069e973e2ae69df5a2b004535bb0fac09dbee3dc90
 DIST W3C_SVG_11_TestSuite.tar.gz 14651624 BLAKE2B 680059d8b20775725cebb3aed4444acbc3222fde880ba93ee5186c99fc12afa8df2c790bdacbcd6e5ff4ab00e697d8317a9a6ae3039b8b2f02cf7774a18ca533 SHA512 e28e3996284c3f3e423e2b6957cddea71980bcb781d4180894e08f37a7ecce9c6021917329d6d433dcba792cbabb15c7cd503076e616ba5189193a5c554374ca
-DIST pyx-0.15.gh.tar.gz 875286 BLAKE2B 49d36e1c0df3ee47a895279d7f296194324cf1582bb7db0259bcd01c9b17c4d0903c25fef10c7a22635fac62dc6378ffbece200eac99f75bb3ce81d48a71a0d1 SHA512 a7debff01f8055455855f4cac5a08d00c22d20d7918bd7341d2af83844223ae8bb23bbbe92149403656e18ffb8861e8568dfdcb59cc01c55ec60e63b62a8825a
 DIST pyx-0.15_p1.tar.bz2 746171 BLAKE2B 5b2325c7bb279e4f6425f0ba7f3808b7e540c7455738c617efdf1ad9d383a466d1b67b90e20e0bdbfa7d2fc56f1c80a4ae2badc5ef78f63ec410370d516f4ab3 SHA512 97809a38029011735d2cdea8f7e8326890d748d4159f44379f89c396b7ea4d2a026ca3370bb069974b07215da91a47b9334d8dd1f7db954c2dd272122bde8ff0
-EBUILD pyx-0.15.ebuild 2101 BLAKE2B 96ae821b8ed0b2decdd83d8e161acfd1042eede9ae5b2a6942ce97d4429df932c41614afe454d7f4b12ce21201e5a49d2954e570c846345036b0680bbbf62cd2 SHA512 f83c165ad41c470659b3d60de980cb626d5dee57428e64602ee6c06c55716c4a00082a195b19161e8094023d27022c5a63b93ff34e298a484661a27775ba5532
 EBUILD pyx-0.15_p1.ebuild 2116 BLAKE2B 7ca45986128d0f817b8f14529fa702dbced71aafb92dc3e72123ebb6951dc5de8db55c53381a23984847da82ca949e2ca6e27b079dea53881bd871e9ecb8bbb1 SHA512 40d5e3d0a5199fa254eb90796b8debf4ec0818b52fbb741b68afd4c70ddfb797466ed982bfa1e7472e5bb4a1bb467eac81821482390b81d3fbd7e6666996682d
-MISC metadata.xml 698 BLAKE2B 4932dd660d490e02e5129236ade8f54e6b62da7a785cde853a7d85b6b8686da100a3d1ea6f515fb87cdde040a2affbfb0a8034038c7e4b0a9b384576afc134b4 SHA512 002d4f9eec26d792ff59fe4772344c573dbd2615d9dd09ab3fb6109948a9ae33858db8bb6b2b79970bd5a19326f6bddc1e3969d656f684c7cddb7fb581c54ecd
+MISC metadata.xml 805 BLAKE2B f8d20858aeafdb2ccaee5dfc3875e1ca206b2e38c566b71db723754ccde1c00b9db1e8b1da758214692e2c87f152ae1df94ecef99fb8b4ff97444b6ae9551e79 SHA512 44f7bf6e5ec2e9314fdd7171971c7debd79349732ce6c3aeff6e4b6d05e253a83c52c19fd4a41ac6ae59189cc95946abf90154bdfa9ddb92faa587cb897e943f
diff --git a/dev-python/pyx/metadata.xml b/dev-python/pyx/metadata.xml
index 142b34083be4..59b5a28379eb 100644
--- a/dev-python/pyx/metadata.xml
+++ b/dev-python/pyx/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>grozin@gentoo.org</email>
+		<name>Andrey Grozin</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/pyx/pyx-0.15.ebuild b/dev-python/pyx/pyx-0.15.ebuild
deleted file mode 100644
index c5277d7a5fda..000000000000
--- a/dev-python/pyx/pyx-0.15.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python package for the generation of encapsulated PostScript figures"
-HOMEPAGE="
-	https://github.com/pyx-project/pyx
-	https://pyx-project.org/
-	https://pypi.org/project/PyX/"
-SRC_URI="https://github.com/pyx-project/pyx/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-	test? ( https://www.w3.org/Graphics/SVG/Test/20110816/archives/W3C_SVG_11_TestSuite.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pillow[${PYTHON_USEDEP}]
-	virtual/tex-base
-	dev-texlive/texlive-basic"
-
-BDEPEND="${RDEPEND}
-	doc? (
-		virtual/latex-base
-		$(python_gen_any_dep '
-			dev-python/sphinx[latex,${PYTHON_USEDEP}]
-			dev-python/sphinx_selective_exclude[${PYTHON_USEDEP}]
-		')
-	)
-	test? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_selective_exclude[${PYTHON_USEDEP}]
-		dev-python/testfixtures[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=( "${FILESDIR}"/pyx-0.14.1-unicode-latex.patch )
-
-python_check_deps() {
-	use doc || return 0
-	has_version "dev-python/sphinx[latex,${PYTHON_USEDEP}]" &&
-	has_version "dev-python/sphinx_selective_exclude[${PYTHON_USEDEP}]"
-}
-
-src_unpack() {
-	unpack "${P}.gh.tar.gz"
-
-	if use test; then
-		mkdir "${S}"/test/svg/suite || die
-		cd "${S}"/test/svg/suite || die
-		unpack W3C_SVG_11_TestSuite.tar.gz
-	fi
-}
-
-src_prepare() {
-	sed -i \
-		-e 's/^build_t1code=.*/build_t1code=1/' \
-		-e 's/^build_pykpathsea=.*/build_pykpathsea=1/' \
-		setup.cfg || die "setup.cfg fix failed"
-	# stop test suite from downloading files
-	sed -i \
-		-e '/suite:/,$d' test/svg/Makefile || die
-	distutils-r1_src_prepare
-}
-
-python_compile_all() {
-	if use doc; then
-		local -x VARTEXFONTS="${T}"/fonts
-		emake -C "${S}"/manual latexpdf
-		emake -C "${S}"/faq latexpdf
-	fi
-}
-
-python_test() {
-	emake -C test
-}
-
-python_install_all() {
-	use doc && dodoc manual/_build/latex/manual.pdf faq/_build/latex/pyxfaq.pdf
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyyaml/Manifest b/dev-python/pyyaml/Manifest
index accf1afc7b39..1f58db6d599f 100644
--- a/dev-python/pyyaml/Manifest
+++ b/dev-python/pyyaml/Manifest
@@ -1,4 +1,4 @@
 DIST pyyaml-6.0.gh.tar.gz 119855 BLAKE2B 286678ac81f2e6c252d285d2f98dab98894787e3aa164a29a697986f56200c7b71b0a768edf6d50e61065efcd054078673270872162a4975409928d7dd67aacc SHA512 cbcacc3560a035e2082867e93a9733f8660ea4c7f60573d07642f33a5453dcdc88d67299c3bcb97c27b843202a45d40de7444eb5e815bd4955129c9fc8ae04ad
-EBUILD pyyaml-6.0-r1.ebuild 1008 BLAKE2B 546e5619ed048e0549b7cc1922707734b87edbb5cfc3134671f66d9dcec5fe4de042a74da2a671b71aadfa2b0324778df6f2a2352787d649c02f4b821ae4d49a SHA512 8bce5f7971310577505a77ba1ac468f744408dc1fcf53744a0cb13d0d169ce76fb0d409d1b2d5e93b383e225da4d6185cd5aa3ffbf123074f57faa0b7d57d82a
+EBUILD pyyaml-6.0-r1.ebuild 1007 BLAKE2B 52c760da8c7269dadea2411cc60c7e84f3e75276ea83e30a9cc010faa45759d1e42b39c79207fcd6e1c07b7e47596e7441a06b8e0bda445e4a428cec542b761a SHA512 d55e90c0efe9a2e7e9ab56a144edb766118448db351eb963f4fc4b94ec593741e140446d891931c282924951eb59d98bac4ef59a1d9441c725a86c6adfd089b5
 EBUILD pyyaml-6.0.ebuild 1323 BLAKE2B 073f228376d18a696d7503b661b6b088a39ef5d3511505ae6f18bdbdb122b72dbddee3c4a265d80a9750ac941b1941c2f7edf6b70cf6308e376a5851ec5acfb8 SHA512 950e2cd60852e0f3ef9bb9bc11dd2f63b815b5a26c8a5feed4b2a11080a91c1ec82c3b6436a04cc59ad0970fbbfaa04e6e880bed21035371b7c29b242c9835b0
 MISC metadata.xml 426 BLAKE2B 6216e38c3e79e811aced6c777b49779953abf4f1b0a1185947f6a6fdc851fdf4cc973092024a6cb2d76bf06863feb49742c7a6892a8761b48a5e74902757a610 SHA512 f549b70fcf1588625fcc2bc33ad0c41faa267ad5bb84d564f5502dee1ad2340a663d1a2b92cf9fdeed827a5f7cebdbe76d59166e89de6d03e7933141029c051d
diff --git a/dev-python/pyyaml/pyyaml-6.0-r1.ebuild b/dev-python/pyyaml/pyyaml-6.0-r1.ebuild
index 32cfe92ffdf3..1eb22a09d118 100644
--- a/dev-python/pyyaml/pyyaml-6.0-r1.ebuild
+++ b/dev-python/pyyaml/pyyaml-6.0-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="examples"
 
 DEPEND="
diff --git a/dev-python/qstylizer/Manifest b/dev-python/qstylizer/Manifest
index ffc7ac4bf029..90952e489911 100644
--- a/dev-python/qstylizer/Manifest
+++ b/dev-python/qstylizer/Manifest
@@ -1,4 +1,3 @@
 DIST qstylizer-0.2.1.tar.gz 20687 BLAKE2B ad158ac0f88c4a0a7c6d9fe9adc611f69cb946c28be8c414dbb40532901b53faee281e7c0a798c9f680d8e5cd8a04179b16df796041133a8dd65d117964e9905 SHA512 c5e4a4194b4282a6d2782c0636ed74e9885409570466765c6e2aee0a176175bb688854244828c56ffbd00e76d297a33de211dedae8d984021c816522ea2b6085
 EBUILD qstylizer-0.2.1-r1.ebuild 1569 BLAKE2B a142ea81c24235a68602ea7711ba47078fc1749fa7cb42c8562681c140f09cfd83ee74d93543f346c6ac6c438fa34d2e738fad0ffcd062a25cefc06e57905e50 SHA512 a0a382c0292119c8c684db0151a4615ac2a52ff213bcd8859e8be8ad19455959786d3efc11353dcbe039aebf43072932c05a34dd80823c2b85418dd109f48b51
-EBUILD qstylizer-0.2.1.ebuild 1538 BLAKE2B 28e0c24e1d3423098180b33d83eadb428ba79bf20a65563cd1e1fbc670c95a955d4dba45c0ccad31fe74283ce39de98d558bb79e443c38634b7b8a45437e8490 SHA512 5b81b311255aa5aedfe2c42d4d945a7481fab161aceb63ee7fa7a1164b9073cd47fd1d6e7b0c6b24d33bced9952cf01ed7e25878d3557660e2a2f881a0a35521
 MISC metadata.xml 355 BLAKE2B bbd0a92b969f24330e934a3fb9db82c99d4e0f4daeb6a4fadaa5cefa0caa2d4eab393f2743664ea7bf685df3deed81ffd3e4eb8f12089d395c4c6b231bec9d58 SHA512 504b904577a9f891df117d1ca79a0041463cef7fcadb8c2dbfcf2f88abf2c26bc08a976dff5d8e51a563d6a6070b354fa2c1918051aeccf3ea5a359a3ea04694
diff --git a/dev-python/qstylizer/qstylizer-0.2.1.ebuild b/dev-python/qstylizer/qstylizer-0.2.1.ebuild
deleted file mode 100644
index 3790a3be9a2d..000000000000
--- a/dev-python/qstylizer/qstylizer-0.2.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Stylesheet Generator for PyQt5/PySide2"
-HOMEPAGE="https://github.com/blambright/qstylizer"
-SRC_URI="https://github.com/blambright/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/tinycss2-0.5[${PYTHON_USEDEP}]
-	<dev-python/tinycss2-2[${PYTHON_USEDEP}]
-	>=dev-python/inflection-0.3.0[${PYTHON_USEDEP}]
-	<dev-python/inflection-1[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	dev-vcs/git
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc dev-python/sphinx_rtd_theme dev-python/sphinxcontrib-autoprogram
-
-python_prepare_all() {
-	# Exception: Versioning for this project requires either an sdist tarball, or access to an
-	# upstream git repository. It's also possible that there is a mismatch between the package
-	# name in setup.cfg and the argument given to pbr.version.VersionInfo. Project name qstylizer
-	# was given, but was not able to be found.
-	#
-	# There are no tarballs on PyPI, so we do this as a workaround
-	git init -q || die
-	git config user.email "larry@gentoo.org" || die
-	git config user.name "Larry the Cow" || die
-	git add . || die
-	git commit -m "init" || die
-	git tag -a "${PV}" -m "${PV}" || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/qtawesome/Manifest b/dev-python/qtawesome/Manifest
index d317459eface..be97ad71614a 100644
--- a/dev-python/qtawesome/Manifest
+++ b/dev-python/qtawesome/Manifest
@@ -1,4 +1,3 @@
 DIST QtAwesome-1.1.1.tar.gz 2277767 BLAKE2B ca8668e0b6633087b7e09ffcec19809c8b7e12af2caa0beac896940cdbf3a113206f6952916fbe81c53899a56f8222e613df9c028f59907a2553174551ef9fcf SHA512 3cf04b822464c14f52f23499e64515f50f743aba40a8d22224d22315342cef760da476dc9b2ae42e901ac8ef8440e105a6bf6175efc6749250e0fbbbc255e08f
-EBUILD qtawesome-1.1.1-r1.ebuild 941 BLAKE2B f307cab2d0e2ae5f79263b242609919e111b025f946949def6f1a046c7f22978c18b09adb933b8e71d91860cadc95b85acb14e207a6ffb8ec11a2669539cc243 SHA512 51fcfc457e0f0454a0f622fdff54a1d0a1975ddf3bcbc40d8d06e868834d49f5109d549ebaa28dfc87ec705a005ac160f26ee05023ae5e1bbe888b56b0928d37
-EBUILD qtawesome-1.1.1.ebuild 909 BLAKE2B 105869aff89c0077d84819e8f94f3d2bedaa04a7535255973f01bdc16c9818cf93c258ae14a140249ce36aa9dc0a8ca3633a6c9bbf7dc6600ac0ff918e7a8fc1 SHA512 573dd289ce834583979749da129a151c243fcae00fc74f81923c3143f471705b17a9a239f915948bbb2a94caa5b6ce3d1a3b8808c02c8584506df98830231106
+EBUILD qtawesome-1.1.1-r1.ebuild 939 BLAKE2B cdb36334f7aabfbc699b2a35e58af8ca0675b6523515312c3f355570b14cf0d21380b3f4e2f726415d179fd892ddc95dd40751f0bc238d7b3c886d1b80a352e1 SHA512 04227f83f62819d26ce53a4529ea4ed68bb3559d9dae4eac4522845eccdd8cd49e38f3a5b1fe90136abae6976382cb1fca852865ba5f0dddc185c8a55031ddfd
 MISC metadata.xml 810 BLAKE2B 7d9237109b80816eea90f955a2a7f4f989589b4b16aef6151017a68dc4808b5b13e524d0356f88ff57f05c40be268729f016ae3f9bd059eda6d06ba75ee03ef5 SHA512 9b15bd5c9e0486fc64d49c6a7a1ef2fafc4c7e9e25ac57ca5811e435cc49c24421ca695c7dbaaee7b317c4a90fd5e9f929c3f79d7e57ce8cac85c6267e103dab
diff --git a/dev-python/qtawesome/qtawesome-1.1.1-r1.ebuild b/dev-python/qtawesome/qtawesome-1.1.1-r1.ebuild
index 5a6e97292084..9f975f17e6d9 100644
--- a/dev-python/qtawesome/qtawesome-1.1.1-r1.ebuild
+++ b/dev-python/qtawesome/qtawesome-1.1.1-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	media-fonts/fontawesome
diff --git a/dev-python/qtawesome/qtawesome-1.1.1.ebuild b/dev-python/qtawesome/qtawesome-1.1.1.ebuild
deleted file mode 100644
index c114fb76356a..000000000000
--- a/dev-python/qtawesome/qtawesome-1.1.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-inherit distutils-r1 virtualx
-
-MY_PN="QtAwesome"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Enables iconic fonts such as Font Awesome in PyQt"
-HOMEPAGE="https://github.com/spyder-ide/qtawesome/ https://pypi.org/project/QtAwesome/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	media-fonts/fontawesome
-	dev-python/QtPy[pyqt5(+),gui,${PYTHON_USEDEP}]
-"
-
-DEPEND="test? ( dev-python/pytest-qt[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs/source
-
-src_test() {
-	virtx python_foreach_impl python_test
-}
-
-python_test() {
-	# Tests fail with pyside2, so depend on QtPy[pyqt5] and explicitly run
-	# the tests with pyqt5
-	PYTEST_QT_API="pyqt5" epytest
-}
diff --git a/dev-python/qtconsole/Manifest b/dev-python/qtconsole/Manifest
index 474743e3a946..bb2079aeca94 100644
--- a/dev-python/qtconsole/Manifest
+++ b/dev-python/qtconsole/Manifest
@@ -1,7 +1,5 @@
-DIST qtconsole-5.2.2.tar.gz 429610 BLAKE2B 1a9f163dfa8a2d38829b2db5a5589b80605b82f144d95e51e3668f296b8e839fd3045c813505926a4c8690e438e79d82c0307c33416152d28899b2f0324aec1e SHA512 43727a08a0b828421bb051063055b3306a2111bedfd148aea6bccc04e103bbffb798c35440bfdb82ffa6bf17a2b0ce9e1ad2d0b3df9aaea294a23dcf582dfd57
 DIST qtconsole-5.3.0.tar.gz 430258 BLAKE2B 883c95124d911b17a1cebedc357f207e042a9679a09eb63bace09f7f39eac4b1f3a24ccd372760e3142494208119dc4131939cd82e8cab364dacecca184c8545 SHA512 6fcfaa7ad842f3f45d4e2286ce816a0b4c71e3c3fb07b86589934efcc637e2cd6f5712fa8a10c375b8e86d1e1e6ce32de9f2be2fc0decd554b51c658e106b120
 DIST qtconsole-5.3.1.tar.gz 430680 BLAKE2B 4655d9aa78a95200fb3f4d2016749d4f1c75865d259da8583818259d05301469b9851b85a2716336084f022f546e97ae003483284f0305793da80a5de7635ac2 SHA512 bebf9c97ebe2a030feebd34f9dbc83294af5eb64946b252c5b5e6391e2760ff95efa7f0be89ec59c424de5fefb3f876ead897d17b679fc87896fe440ba936554
-EBUILD qtconsole-5.2.2.ebuild 1398 BLAKE2B 14777fb565b0fe92a0969759480454137145650bc9c1c977a97dc745f20f5b519318374d7ccba0012cf81088ac8270be4605e6720d4dca1583953a6e9964e71b SHA512 e554d7506288ec0359771d6467da6d0cc41f9d726a510b07cb119cecb9a8fbc2e50a41d1eaad588de4e5e58ee92d47bf38a67fba9b952bc4bfaf4e2e15d46d48
-EBUILD qtconsole-5.3.0.ebuild 1469 BLAKE2B 78717d4b5b034d72af1e4e11b6fb6c5950858727450153ad9f855d81985f63cef04563c51c566d84344aa0fa0d60023f0a0551903fb2367f6f80c23fe0e6b8c7 SHA512 d0eafe8c8ddd8275faf7e67017871020c2f3d9444108a1c8a168f90b69a4317965ef791f639ef075d079572e9616111be9d44a847a98446730a8d0ee5f1cb229
+EBUILD qtconsole-5.3.0.ebuild 1466 BLAKE2B 2d5cbec971ad1cbc72b6f3eef5d9bd09beee421eea135f4eb558fa8f6b8484535344130f823b936b89b01d22885be7f5b13589d18cd2139aedd5f7792b066870 SHA512 851169f4445ebc84c347772c2959ec478cddedb87cab71e51fbc7e53b6ae674832bec97dd0b2b83d03c5d08da9a5563b80b46bf70c7aa8362ac5cde0d4cfc197
 EBUILD qtconsole-5.3.1.ebuild 1596 BLAKE2B 69ca074939f73968844e15e996ebee3dce514f72a6b24e473f03dc4588a96633400616b9d5adb63381b64bbdd4ef35342ea7114b03540e1d7ad4135075c7de57 SHA512 04f3dab235e5e9344cee88abf5298e15bf5253fdfed14ec1ba9d440a3c81c3fe58329a007de44ad27dc71451f158410156a57536152f74351ffaeaac490ee658
 MISC metadata.xml 690 BLAKE2B f2ddc6515f66ac4549e99bd6f152c16431875508bf12b6319e0e6a2b1596d86abc50b87ee424d3876eb55e92d1a506ade6567cbad535b4b2b54fad924a1891a7 SHA512 28bb7360ac7775d9c72c4d0f34d4c9a35c63905c4e870722236cc6c66e98f6c0eb165c8d7a9ce28948b25808a053dd1bb667d1f4783ca95319bb216310dc9f60
diff --git a/dev-python/qtconsole/qtconsole-5.2.2.ebuild b/dev-python/qtconsole/qtconsole-5.2.2.ebuild
deleted file mode 100644
index b09cc2e315f9..000000000000
--- a/dev-python/qtconsole/qtconsole-5.2.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-inherit distutils-r1
-
-DESCRIPTION="Qt-based console for Jupyter with support for rich media output"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND="
-	>=dev-python/ipykernel-4.1[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-4.1.1[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17.1[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	dev-python/QtPy[${PYTHON_USEDEP},gui,printsupport,svg]
-"
-# The test suite tests both against pyqt5 *and* pyside2
-BDEPEND="
-	test? (
-		dev-python/QtPy[pyqt5,pyside2,${PYTHON_USEDEP},svg,testlib]
-	)
-"
-# required by the tests that are removed:
-#		dev-python/flaky[${PYTHON_USEDEP}]
-#		dev-python/pytest-qt[${PYTHON_USEDEP}]
-
-PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-python_test() {
-	# TODO: these tests require virtx; however, running under virtx
-	# causes pytest to segv on exit (even though tests pass)
-	epytest --ignore qtconsole/tests/test_00_console_widget.py
-}
diff --git a/dev-python/qtconsole/qtconsole-5.3.0.ebuild b/dev-python/qtconsole/qtconsole-5.3.0.ebuild
index e0d4c909ce7a..8b8c53bf23be 100644
--- a/dev-python/qtconsole/qtconsole-5.3.0.ebuild
+++ b/dev-python/qtconsole/qtconsole-5.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 RDEPEND="
 	>=dev-python/ipykernel-4.1[${PYTHON_USEDEP}]
diff --git a/dev-python/ratelimit/Manifest b/dev-python/ratelimit/Manifest
index 4bae087253ba..fc678dccd17a 100644
--- a/dev-python/ratelimit/Manifest
+++ b/dev-python/ratelimit/Manifest
@@ -1,4 +1,3 @@
 DIST ratelimit-2.2.1.gh.tar.gz 12366 BLAKE2B 7c810bd111202ef6cd86a789627367665457eb2fd88f13d91b18c934210b72f8f4b0ca1ae0e26b502234c4bf3e74d1c6608260d51a022f9f733d10eb061de023 SHA512 a9a2347e9f9e152e5b1ffcf346cf750c5c52471aa2216b485d989edfc55686077990676a35e0125277313ad50a656a14ab72b7aac61b661e2fc4ec74611b5990
 EBUILD ratelimit-2.2.1-r1.ebuild 574 BLAKE2B e2cf708c7a9c77c5829a9b23e3c75d3709acfacef51bc1754d27bb9378d99c0ab7645d238034662027087ca9367ed4e3b276c0c80d81161925a8405320a20426 SHA512 99f3d0837c05510cb4a6af565721d9c0ba8d5ecbe705f4853f238d100346b5258d9e40c8d8c5fa4bcf1d3f8679a40f5f42afbb395680352deb45f280c08234f5
-EBUILD ratelimit-2.2.1.ebuild 542 BLAKE2B d42a37cf7c65da5d617000a6d8c06bf6f5bad43c896612c897e1f08a5ccdbd97c99960c047ed16796a11590b86864cb32799d9a798f9241a0c35bc8bcdc4b452 SHA512 6b120be4ba600e3e664baedc5de186cb32442ad36ba893996ea11847f4c1e3f5abe0c74597188840cd5e9ce883bcedb54080095cb0b1f67ef9254dd13053df05
 MISC metadata.xml 820 BLAKE2B 9e052ae412570ce5ca7ed5a001faec65df8dcb5d43aaea653457b19f285143f192be11fa3e0fa463ffb82f3db720bbc01438c695503e1529497aa3a864f0ee66 SHA512 8d4d294bf2a966244112f55d4519d2876de7d3500254f2b5c4c700e2d6a16cdc7caa6c1f9643f9622118e1d5703038d9bb2d1c42f319c8be5c729b88ee900dea
diff --git a/dev-python/ratelimit/ratelimit-2.2.1.ebuild b/dev-python/ratelimit/ratelimit-2.2.1.ebuild
deleted file mode 100644
index e94fd565e17c..000000000000
--- a/dev-python/ratelimit/ratelimit-2.2.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="An API rate limit decorator for Python"
-HOMEPAGE="https://github.com/tomasbasham/ratelimit"
-SRC_URI="
-	https://github.com/tomasbasham/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# remove --cov args injection
-	rm pytest.ini || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/re-assert/Manifest b/dev-python/re-assert/Manifest
index ae79e21ae01c..5f81a1b2ab64 100644
--- a/dev-python/re-assert/Manifest
+++ b/dev-python/re-assert/Manifest
@@ -1,4 +1,3 @@
 DIST re-assert-1.1.0.gh.tar.gz 5010 BLAKE2B fc65f43b3525d02d877d51f0a1556b6b205dd1126fc205b775f5c0b6c34ee7c3e8d224fc3f46a80e8df4a366674be90221e891e19e12072c87ff82451ca8676c SHA512 fc14267cc68a12ff7350982f0bf54c77107809c9f0379ab3aa73fa1b7cf5ccabb130fcd35ab75bdf183e69c802a041deac707e1f0bab1c3815d4146b4e320c07
-EBUILD re-assert-1.1.0-r1.ebuild 658 BLAKE2B 8dda1e8d7bab59fd7af1de38f791cb61f8ac6478847ee02f6d0410a7240f9dabccc40ee09a8d21b6b8cc15207517a8dce5e597529f6ee29e967e02d35f7845cb SHA512 ad255352882b6f2899fd48d8f314f3c1b390e22f7ed772b077442f359b28925b48846d2ef8069af42c184822039e33a6a756aceba7c724e5c64e931657032b2f
-EBUILD re-assert-1.1.0.ebuild 572 BLAKE2B 114316530def4015d6252051453669b59b724b6c7fb752ebc0fe1f6e20fe7e40c7c2f97c70f4b4918996bf5f63b34c633b35369d5d73baacf70a6bae1238eaf4 SHA512 af5ed428087ef1fed19eaeefd54d49a3e6422f527ba3dfa281bc6a615dfe85ce0c7f9d8158ca48caed997c8e8dcab937eac2f9f365a8cd942ff36d107015e1ca
+EBUILD re-assert-1.1.0-r1.ebuild 650 BLAKE2B 38276ca45bb45547be1d5dd6d157d907b9f33438b704641507fb324471ab33952c58b01def083ac838b32b8961d259c7d3af8501910e48f8e54c5dcb84a76987 SHA512 f16845687aaa622f92ffc725b621a54de392ea66a8c323eda21eb7672bf11653b4ab0a47670c39d3b4138a4b05da7b024ff71748c729e2f961f9566de5bc22f4
 MISC metadata.xml 395 BLAKE2B dba34f6404c171596f781768e266b2e3ae21b2572db8695c6d17ffac5cfd91ea63ade4dac01b4961a5b691090ad6940d11cc82b629e6abc71e7b393c70e1f572 SHA512 f6c637f1fd777a2382954939e57c07aba53287f9a148ff19c6444ef249d87ac0e1d003b8ec2c2bbf396f756169dac2205bf597f16f5334a4f94e0032a08fe299
diff --git a/dev-python/re-assert/re-assert-1.1.0-r1.ebuild b/dev-python/re-assert/re-assert-1.1.0-r1.ebuild
index 2773b3610e4b..4826d5328163 100644
--- a/dev-python/re-assert/re-assert-1.1.0-r1.ebuild
+++ b/dev-python/re-assert/re-assert-1.1.0-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/regex[${PYTHON_USEDEP}]
diff --git a/dev-python/re-assert/re-assert-1.1.0.ebuild b/dev-python/re-assert/re-assert-1.1.0.ebuild
deleted file mode 100644
index 63d0e6096c9f..000000000000
--- a/dev-python/re-assert/re-assert-1.1.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Show where your regex match assertion failed"
-HOMEPAGE="https://github.com/asottile/re-assert"
-SRC_URI="
-	https://github.com/asottile/re-assert/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="dev-python/regex[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/reflink/Manifest b/dev-python/reflink/Manifest
index 2ff467dbf07f..6e86df614987 100644
--- a/dev-python/reflink/Manifest
+++ b/dev-python/reflink/Manifest
@@ -1,4 +1,3 @@
 DIST reflink-0.2.1.tar.gz 14638 BLAKE2B a6449ebb27619ead9ff8452df6c48f3617e5f06eb347fbbe14ab00b9a43c01de8e101466288ac6fb73602165d4d4e9315f941c2f28dffe245ed2c39a10a61cf1 SHA512 5995ed787bda93cb46d99a603110768087420edd72c01d5f3f7f08a3f8f63b4629b900a3c173dd7f3119a892ac19ab1a9c3000ddd83810b22a52dfb5fb892a28
-EBUILD reflink-0.2.1-r1.ebuild 1140 BLAKE2B fd4712eab114ac219d612e9661cd45bfb0d56506a5c9d9b4f7baefab81a1b70c7dc9b24149bc54d7fc656fc8ae545ace107fc6b6ca41911e5963b5849e0e59a5 SHA512 1bb1880ee2b2031669ffa5baa9b9724372e26db7865be3dd4a63ec10635d3369ab517552ad9a1ec141fbd28d7418525a83ac095e202b683e38c8a77bdd4aa2b0
 EBUILD reflink-0.2.1-r2.ebuild 1172 BLAKE2B bd7c4a9b21364da013984057cb32e05f513f8a001b78efa40f0af02c74a0b38fadd1e0bae5a5a03deb002dc255ccc9bdfc567af6c30e2f4656ba58a04d8c081a SHA512 9b47e4abe02e104e9a87c1df1055dba91cbf4b98ad533b57bbf3d4fbdc76ee3d9ea296db46c0b779375433752b3265764e517587361cfa8894ae57b46d87cdc2
 MISC metadata.xml 494 BLAKE2B c3470939e469632cba9f41a54ebaeb727f54059f99d610e62dd82207ee08eabb36279d2ae7270b8be32de60da0e3fb301b3181693b26c5d9fc7f69b03122deee SHA512 8034be071497c8239e2e48fbd7993a1ab3d1875fd925a3d47bbe797f289949f95135f84a732f1edbd829009c266bbbfe9fc9d7ac43f22fad9c2d11ef18118d93
diff --git a/dev-python/reflink/reflink-0.2.1-r1.ebuild b/dev-python/reflink/reflink-0.2.1-r1.ebuild
deleted file mode 100644
index 6319755c9b2d..000000000000
--- a/dev-python/reflink/reflink-0.2.1-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_IN_SOURCE_BUILD=1
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper around the reflink system calls"
-HOMEPAGE="https://gitlab.com/rubdos/pyreflink"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-RDEPEND="virtual/python-cffi[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="${RDEPEND}
-	test? ( sys-fs/btrfs-progs )
-"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e 's|'\''pytest-runner'\'',\?||' -i setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local notestmsg="Tests need FEATURES='-usersandbox -userpriv -sandbox'"
-	if [[ ${EUID} != 0 ]]; then
-		ewarn "${notestmsg}"
-	elif
-		has sandbox ${FEATURES}; then
-			ewarn "${notestmsg}"
-	else
-		pushd "${BUILD_DIR}"/lib >/dev/null || die
-		# module import will fail with any other directory structure
-		cp -rv "${S}"/tests ./ || die
-		pytest -vv || die "Tests fail with ${EPYTHON}"
-		popd >/dev/null || die
-	fi
-}
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index 9be2f931989b..953fc46ed53f 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -1,6 +1,5 @@
 DIST requests-2.27.1.tar.gz 106758 BLAKE2B a7fed53998fa61b3d03abd254a0cee76450c5b60d76f80aa6b91f32dca1dae5d2c51987b3d3f2138d72c50790e35c36cb03eb5974554ac4eb1a902eff79b5bdd SHA512 e51916abea8125254c5ee72c97e84a73e6981cab09961486873387522d2ce041ee3fe8fa2ff0b9bbe6707eefdc05145e9adcf127bcd999dea127acdfabd5312f
 DIST requests-2.28.0.tar.gz 109748 BLAKE2B 1df85b90ab1f6c551e46593dc8640aa0629505c9b395ca2100c6af04435e1360503b215d9796c34fb09122ffd616e1a01ca3574ac4543b4857c76a3dd86f13fe SHA512 111cfd2d0b0267111ccad0a97b33c5e9565812e6e6728b7d5bdbe06c32fae9e637b220bda605d799409e57dc6aaf3bcc66a4a4605cdbccb439367dc492fb836f
-EBUILD requests-2.27.1-r1.ebuild 1844 BLAKE2B 263c0a23df7e7656bc212931175e45a636d8cacca3e8ca19fe8ea20651ab144779e988d617ffe377e5dec45645c0086dd358d3127deaeb7a70f9e647303d9fe1 SHA512 e9880833101a330a7fbf5907e9f1fd0ae1f5d5e9431aedab6403768d0a9cdc6b683790126e3b428d67640439115341d0302fd675da8aea01f2b508df03e855f0
-EBUILD requests-2.27.1.ebuild 1731 BLAKE2B f2d6a0de3efa99d0dc5cbba9a57c4f4496a080340846a6423fb2528bf24b4eb14f4aafca22b81b49e466747e3fc203885e3c4920818cd148bddf7900250215fa SHA512 c0f589714e1488f2c89906e0e28f1d1e50de8d7024c4ba069a1aec603757bd44860c2231c8e89361f5f15cc7860904e245f1988693358b0c48d24eae49c5581d
+EBUILD requests-2.27.1-r1.ebuild 1836 BLAKE2B c60f74ef2314557ea7ea9be79ac3c01ea9c8f3effe435d0106c98a1bb40c0c7365ff8ad90757f083fb646d7c598387162f61becb87dd25fe6dc73c45a6b87743 SHA512 cae0e12d044ba719329040c383062c13ba45777181e25aeb07bba8e690e43e9ec6546e204e838bd9ee8ba6f57d9104a4820c4469a70e89615a759dcbb4dcc12c
 EBUILD requests-2.28.0.ebuild 1844 BLAKE2B 263c0a23df7e7656bc212931175e45a636d8cacca3e8ca19fe8ea20651ab144779e988d617ffe377e5dec45645c0086dd358d3127deaeb7a70f9e647303d9fe1 SHA512 e9880833101a330a7fbf5907e9f1fd0ae1f5d5e9431aedab6403768d0a9cdc6b683790126e3b428d67640439115341d0302fd675da8aea01f2b508df03e855f0
 MISC metadata.xml 770 BLAKE2B a085a3bdbcc34c2297ad7d5a0e811c553aa77f12bba1ee8164cf63af2cd86adcef7b6080c984ea73a417ec690252540a0fc6072ee97b068b70f0f695696fc65c SHA512 de5c6a99ae18955f25895a93911570d41cb458eaaa9dc8b6edd09021c6dff3dda7bc2611d090b933837f83b8a7035769bb275bb844e1ac91b89a088dde3c7222
diff --git a/dev-python/requests/requests-2.27.1-r1.ebuild b/dev-python/requests/requests-2.27.1-r1.ebuild
index 4d6d1335f33e..64d160cf6d34 100644
--- a/dev-python/requests/requests-2.27.1-r1.ebuild
+++ b/dev-python/requests/requests-2.27.1-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="socks5"
 
 RDEPEND="
diff --git a/dev-python/requests/requests-2.27.1.ebuild b/dev-python/requests/requests-2.27.1.ebuild
deleted file mode 100644
index 02c31e127a85..000000000000
--- a/dev-python/requests/requests-2.27.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library for human beings"
-HOMEPAGE="https://requests.readthedocs.io/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="socks5"
-
-RDEPEND="
-	>=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
-	dev-python/charset_normalizer[${PYTHON_USEDEP}]
-	<dev-python/idna-4[${PYTHON_USEDEP}]
-	<dev-python/urllib3-1.27[${PYTHON_USEDEP}]
-	socks5? ( >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] )
-"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
-		!alpha? ( !hppa? ( !ia64? (
-			dev-python/trustme[${PYTHON_USEDEP}]
-		) ) )
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Internet (doctests)
-		requests/__init__.py::requests
-		requests/api.py::requests.api.request
-		requests/models.py::requests.models.PreparedRequest
-		requests/sessions.py::requests.sessions.Session
-		# require IPv4 interface in 10.* range
-		tests/test_requests.py::TestTimeout::test_connect_timeout
-		tests/test_requests.py::TestTimeout::test_total_timeout_connect
-		# TODO: openssl?
-		tests/test_requests.py::TestRequests::test_pyopenssl_redirect
-	)
-
-	if ! has_version "dev-python/trustme[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			tests/test_requests.py::TestRequests::test_https_warnings
-		)
-	fi
-
-	epytest
-}
diff --git a/dev-python/rfc3986/Manifest b/dev-python/rfc3986/Manifest
index 853a1b1034bd..e3d4c88b2304 100644
--- a/dev-python/rfc3986/Manifest
+++ b/dev-python/rfc3986/Manifest
@@ -1,4 +1,3 @@
 DIST rfc3986-2.0.0.tar.gz 49026 BLAKE2B 41e1ab9d1ad878336dc93fa0924c6cc90930d5fd3ba0bbb238be402512d3227cacfa555828c5d698810bee74b3b77f045abb7fcb5c854a4f49922f4cbe05004f SHA512 5c8370cb1e21811eaab91269b9a30972b8fbcbe1fa1d806fd3ceabe0e1937de856d757146137fee470fbdbcc7e948b236f72a42306da41a6d03807e7333983df
-EBUILD rfc3986-2.0.0-r1.ebuild 779 BLAKE2B 40ab85cc2f2f9e70f55aaf049f0ea602f88057c5ab543a7a75b95556a2aaf712e8d769c9fcc84df77478baf4f335df2259b03bc463ac011e8297691702462e7c SHA512 5db2029bf42cb5b54a4df604d865a0a7bdd919f922ac2d1f0d7b4cd80b244d99424ebcd92a04a3c3f3f73eb9824313a8ab673df86dcd543ac424f1743283fcb1
-EBUILD rfc3986-2.0.0.ebuild 691 BLAKE2B d0ddeaaf5538f4681080e0dbbf7cb6547207c084b87c1cb368118cc1ae722c92d5f10a8660a37c2bbf30c69cb8fc177c2c90b40976281e9b06523668c626abab SHA512 b40cfd7710d7fe82e6f532c5670568cc84d283e497c00552a9e5e560e99658c0bb11e4bf5896c662fd81f8a97e578ec294b948575eb83a9f7c97a557c9e03ca4
+EBUILD rfc3986-2.0.0-r1.ebuild 771 BLAKE2B 609aa3dbe61111e6d71039d0c7f8f87cdd528ce8cd513501989c145fc99dd75ac022d1326ca09f7c0101840f91ec14154e77e0ee7435d1ea8d10595cb26a61a3 SHA512 6026452680d55d108d1dc4edce0ea3ac7b8bae60253ee1df8e11eca3bb1d4595fc2a0040c2a4ea0c03d0f193c9818fc0734a99cefcf23d7360c6b0ab4b9a771a
 MISC metadata.xml 741 BLAKE2B e493181d32969459e23997ab0d48e5c1fd42f2bbe61ed04a5107697a61090d109b6133618c5ef153c92b88eccad0eb93c02073f1ffa9e763aa8518a85de8a19a SHA512 34ef9d54aa2dd6cca1f4d3abcc45d3147c0fdca559a9d30b28ef86e6e9d908ef0fb82384f10abb535fab1a0aed2b81f78b517cce73e5b947501ec9be331af13f
diff --git a/dev-python/rfc3986/rfc3986-2.0.0-r1.ebuild b/dev-python/rfc3986/rfc3986-2.0.0-r1.ebuild
index 9400537d6f19..c07905483d49 100644
--- a/dev-python/rfc3986/rfc3986-2.0.0-r1.ebuild
+++ b/dev-python/rfc3986/rfc3986-2.0.0-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="idna"
 
 RDEPEND="
diff --git a/dev-python/rfc3986/rfc3986-2.0.0.ebuild b/dev-python/rfc3986/rfc3986-2.0.0.ebuild
deleted file mode 100644
index 40aa4a295eff..000000000000
--- a/dev-python/rfc3986/rfc3986-2.0.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Validating URI References per RFC 3986"
-HOMEPAGE="https://tools.ietf.org/html/rfc3986
-	https://github.com/python-hyper/rfc3986
-	https://rfc3986.rtfd.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="idna"
-
-RDEPEND="
-	idna? ( dev-python/idna[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? ( dev-python/idna[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/rsa/Manifest b/dev-python/rsa/Manifest
index e6cba193de3c..34a7162b1bfe 100644
--- a/dev-python/rsa/Manifest
+++ b/dev-python/rsa/Manifest
@@ -1,4 +1,3 @@
 DIST python-rsa-version-4.8.gh.tar.gz 73634 BLAKE2B 55f25b6747f4f0bad12cbbb75c6e6fdbe6f913265866f11430644b46f9d3a2f615e6ed460d04cc732cfe29f0a4e47b14f2581f29d523b3018272ef976a6a04aa SHA512 d65e5d3c902508f4ea7424099471cd68568b052b9647a87ceb155ecc444ba6a8bd0ebef6fe1bf38720a19193cd494a8b64f744cca5812d1a3bec28f3fa3a9a3d
-EBUILD rsa-4.8-r1.ebuild 773 BLAKE2B 96ed9f5be7997a61068e9270282eca76c8fe380b5e5fd94fb0521a040837f6c8ff84df43c1b06f454d639b59e3171923e662721c6057d0b2a16ea8ac20a9fd29 SHA512 43c3628fe182bf519cd9b9b58d3d15390a403a13514ed0dc6229523c5463c9bf779621b01fb0d7424922ac1b22bb7001a4b991bcd07e038d9a58ad734d53a3f1
-EBUILD rsa-4.8.ebuild 732 BLAKE2B 43704af28ef6839d3ed1f649e66963c58fb31b93bfe42393e487545d842c01ed818a6a90e36aa02c74cf11a899b0c3a3325d74b65b3f90bdef32be9e3870cb21 SHA512 40b5c0e772aa9fafe43c86162588ad143222beee4d95044c230f7526c8c8a1e4492e588d988430959d9e7a67b5de8659b5fb7f48966d06e89972b130d4599bad
+EBUILD rsa-4.8-r1.ebuild 767 BLAKE2B 5181c8381bfba94610bd72f4ddfebcbd593cafcc98f60f3d57f6efff757b7e51935e8501f41da60d6f2b4521a2cbbe60707e9f0fd6721ed22cb2eacce94890a3 SHA512 89fc7151041c3524914bc56b69cf18a5706c3d60f17326b3ca62d3eb4923cec942a236d64ade37a79a3395a7cc4c5fe6ed46c7a1d73fa7ab698d911ca8e7edf3
 MISC metadata.xml 407 BLAKE2B 11c7f12e753a502ea5b508e0ca88f824819c3a2dbfbaec31532fbbe9bfdbda5c75ad853b14945a3f5baa4b1eb01a0c9526d3957eed0a573bd63ac792b93bc5da SHA512 df4960d9d61726ae45490adc1d682780539bf7f053a6db9af97e453261f1866a3e8ccb956c5c769b115e90ef3c336654a85114eac1b1256dab95fed7bdb88961
diff --git a/dev-python/rsa/rsa-4.8-r1.ebuild b/dev-python/rsa/rsa-4.8-r1.ebuild
index a75385ddf3e9..fffb3c5c50ad 100644
--- a/dev-python/rsa/rsa-4.8-r1.ebuild
+++ b/dev-python/rsa/rsa-4.8-r1.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	>=dev-python/pyasn1-0.1.3[${PYTHON_USEDEP}]
diff --git a/dev-python/rsa/rsa-4.8.ebuild b/dev-python/rsa/rsa-4.8.ebuild
deleted file mode 100644
index da0282e26d71..000000000000
--- a/dev-python/rsa/rsa-4.8.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
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-MY_P=python-rsa-version-${PV}
-DESCRIPTION="Pure-Python RSA implementation"
-HOMEPAGE="
-	https://stuvel.eu/rsa/
-	https://pypi.org/project/rsa/"
-SRC_URI="
-	https://github.com/sybrenstuvel/python-rsa/archive/version-${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	>=dev-python/pyasn1-0.1.3[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	rm tests/test_mypy.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/sarge/Manifest b/dev-python/sarge/Manifest
index b30489f2aa15..5f0d7063d7bf 100644
--- a/dev-python/sarge/Manifest
+++ b/dev-python/sarge/Manifest
@@ -1,5 +1,3 @@
-DIST sarge-0.1.7.gh.tar.gz 57029 BLAKE2B 4cba823073b6699d9a3152b55de63b8ea9ba7cafa0f50556d6c2115a863fd3cae44a9d8fc9e6bf14727aa312c90f69dd03ebcb73508c5a2cdb0d1f6ff190435f SHA512 f2017fdab137e1aebfcd60a125ea7ff057158c6bf6a277d3084db73ed62a07cfd3464deba883284980c9f6ea3f56810effb551e8e8523ab750a086895ad0297a
 DIST sarge-0.1.7.post1.gh.tar.gz 57121 BLAKE2B 4e7f9cf21e2492303fb7ae24d8f5da22fc6db4d04449e5e6063825d2c2163333456fed35af53b5107a80996ca4e036c8913c1d50ffd1d0386e4f3d3f0e46dbda SHA512 29e783287d9e2325e6183d3d56fb2247e3ec98e728dbb69c8391694b2456c1d9ce91a4a172d8ba66593d0553d016fca34b5253d7a4d4f02c1f2d6a3a19574097
-EBUILD sarge-0.1.7-r1.ebuild 632 BLAKE2B 6a7212838a09fee479dd1e6220a86dd197e6432ace5bc1e3dc9daff8da158c7542c2f3760dedf96e2304cd15f3914bb1c67cf04196d7e65c75cda9857e95cc02 SHA512 6a1aa4d6763dbab82cd939bbe382a81f590ae43f435b5550d97551c8f399b737ca74ce20fb71cda3e06072fd31537fd9e4ced2abfcd3269051a4a7a616810c07
 EBUILD sarge-0.1.7_p1.ebuild 684 BLAKE2B 0748f93dac0b89ef6d99f12b4b61af2f024b429791c19f00520767acf3d1a03c2de9dafe46d87b7a49b43d7ab3677bd5dfcac815f479621ebf5b3bba18c64e71 SHA512 00f9e22e65e210b48f751107bdc9b18731b6ce3051d04b07894dd11a472c462bdf43e284d3cff54137f539223b0f7f2688ccc65b094202273dfa69ff3b7f8d94
 MISC metadata.xml 470 BLAKE2B 157ea921141b74ec467c00c1b671146c2fe11efd7156146188eb5126739c789a6dffe1d2954c2c40d144258bc2e09be62e56b184504fddcc55e5fb5686fd835a SHA512 b211a65f489e20031ded07eb5908a04ab26fa9d5ba3a5c0d7cc4f134ee9233fb7519c60c9ad60c42ad444021de3fa32303d951a16cc3a6c41256761f15cfcba5
diff --git a/dev-python/sarge/sarge-0.1.7-r1.ebuild b/dev-python/sarge/sarge-0.1.7-r1.ebuild
deleted file mode 100644
index 57cad45bee8e..000000000000
--- a/dev-python/sarge/sarge-0.1.7-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="wrapper for subprocess which provides command pipeline functionality"
-HOMEPAGE="
-	https://docs.red-dove.com/sarge/
-	https://pypi.org/project/sarge/
-	https://github.com/vsajip/sarge/
-"
-SRC_URI="
-	https://github.com/vsajip/sarge/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-python_test() {
-	"${EPYTHON}" test_sarge.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 11e98ac5e9a3..d4531bec057f 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,6 +1,9 @@
+AUX setuptools-62.4.0-py-compile.patch 3704 BLAKE2B 9a5e70d2556b059be0ef060abd1db71298cd0e9aa1e2795d92cea5cdbaf0c82f4433e1a0c3095f4bc41bc72a457b63142253fe46c712afa1d7855a5d43607bca SHA512 48d7c065e2d8c29ce6e498effe6d79f9caa0f37d7cf6cadd0ed02c48d196a4d8a10a73cfa26744d6f74b48c63cd28a4074b161a6aae18c6169f6d8fffb044b1e
 DIST python-gentoo-patches-3.10.4.tar.xz 8592 BLAKE2B 67fba3e1fedb17430e5cd93da995b4acaf714db512031b5a2f775a25f793f007941561663cfa413d645ccddc2e22d65d250a40fa166cafda8805488d877ff57d SHA512 3ed2b8ff8f1eb8febe7dcd4b5d13d6d54468be1d525f8f1118977d3bbc78f690a597b09383939d023b03380a306e4bff1693382e29ff562312d803305b1709b2
 DIST setuptools-62.3.3.tar.gz 2586270 BLAKE2B 764f90a5b2585f05b6ae0ad23568a08069bb4ca776c969635dfaceb6b3f64dc6d56291c3e9f0a4540f0416eab9122f5d7d6ad193a5f604949b5827f3cfc2d1a9 SHA512 a7ca81b3f7adedb15a4ff3607654d1a4615de1b30a22aa5cbe4b0a8077db8bdd9348167cbb6deb97e1076d320c2a2a4b0d30acda389905d6503786902eeb66af
 DIST setuptools-62.3.4.tar.gz 2590435 BLAKE2B 089bb185b65107d54b3a17b423caa28b0505566f8e19efaf34ac347e074492278699295b5e8856756312182a78d524ae5098e86783c5c6e089bdbe2de1d1f60d SHA512 edd9595971ee3cca2d1280e695401d8e4aa38796af89f24132d81b897004147ff4f4fc8daebf6fef0606512cc71e09487a2cb416deeecd851a82abed30f57887
+DIST setuptools-62.4.0.tar.gz 2592908 BLAKE2B 5221c32545d451fe9e80f6c78296044fc805e995578f32d2a8809483c00ea84f918a3bb5e1d1a6d184533282d96a68fab8b4d303d839255a640952d1c575f53a SHA512 552bb6c93793a438d8d319b1ef51932e7e15fab965b9fc81a4f15015e02f3e7318b9df9890c3fb59fac1ec443c17cd5cbd17b7227a6a82deb355230673ae9ec5
 EBUILD setuptools-62.3.3.ebuild 4803 BLAKE2B 1b1c45e86f35f7993451244ceb1d89406867cb270100b56d5b61035d760c9a5ddd32126b8b32586b9cbcd7368bfacf770980a029cf9b516de05c6154c0f0d990 SHA512 b8e9c91c91418ac017f9c032c360bd430b9d43e23a50c7c317579b211c9d2f6ea805af3d3384a4a72766913d2e4ce3fd87d775291b9a91b195526060646147b2
 EBUILD setuptools-62.3.4.ebuild 4811 BLAKE2B 690ec6aab3b8fb8b1ece7e0c55a8e7eb92e6ab17270c260aef1c62abd63984bb1231678114a26fcee71c892153a91ed2b1ecf7364e1f0b7d4c550b81deab7c89 SHA512 6e9f1f18746abb4d6c1204eb9e104827d1e49964e296739527a1c64d9009c07f9bb93f9220917dcbb053f8dc74e3974a9fd77917eb3dd98eb887ec103813a379
+EBUILD setuptools-62.4.0.ebuild 4563 BLAKE2B ba1208f6c321c2905b96ecfd7cdc068ef87b5ac43db018c0790149aab910d902c39c35a65459c365a6a04fad7066a000adf0f450d01310b088f05ed2e721a27b SHA512 348b957cbf4f2b97372a2ec74d59b8e0e78bdd605b2c3275aa563f1e6e232b779f2ee569594b6a97776fadfcd251cd1b797ac10db03cc513bba0f2574ad61179
 MISC metadata.xml 469 BLAKE2B 4a26769b09a3785586b22db850b7fc5c4818f31c3ace9cc94476d35df05e50edf6721f3c95ec615c3b2efe071ef284a54ea2d53566316ba653f7830bb48f80bf SHA512 dd682c4ad2e59a97094ebdabe4d1063e2319ed05e1fe9d8c2fafe069badb3b4cf8bb6d9f50e09d2128e2a081c1c69827407ac8aed644ebf70eb4ca1bc9a57319
diff --git a/dev-python/setuptools/files/setuptools-62.4.0-py-compile.patch b/dev-python/setuptools/files/setuptools-62.4.0-py-compile.patch
new file mode 100644
index 000000000000..09d630b363a2
--- /dev/null
+++ b/dev-python/setuptools/files/setuptools-62.4.0-py-compile.patch
@@ -0,0 +1,86 @@
+From 8911d627245f4389488c5d65cce6d1258f4cce7b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 14 Jun 2022 05:58:20 +0200
+Subject: [PATCH] make -OO enable both opt-1 and opt-2
+
+---
+ setuptools/_distutils/command/build_py.py    | 10 ++++------
+ setuptools/_distutils/command/install_lib.py | 14 ++++++--------
+ 2 files changed, 10 insertions(+), 14 deletions(-)
+
+diff --git a/setuptools/_distutils/command/build_py.py b/setuptools/_distutils/command/build_py.py
+index 1b22004e..88565bce 100644
+--- a/setuptools/_distutils/command/build_py.py
++++ b/setuptools/_distutils/command/build_py.py
+@@ -325,11 +325,9 @@ class build_py(Command):
+                     outputs.append(
+                         importlib.util.cache_from_source(filename, optimization='')
+                     )
+-                if self.optimize > 0:
++                for opt in range(1, self.optimize + 1):
+                     outputs.append(
+-                        importlib.util.cache_from_source(
+-                            filename, optimization=self.optimize
+-                        )
++                        importlib.util.cache_from_source(filename, optimization=opt)
+                     )
+ 
+         outputs += [
+@@ -403,10 +401,10 @@ class build_py(Command):
+             byte_compile(
+                 files, optimize=0, force=self.force, prefix=prefix, dry_run=self.dry_run
+             )
+-        if self.optimize > 0:
++        for opt in range(1, self.optimize + 1):
+             byte_compile(
+                 files,
+-                optimize=self.optimize,
++                optimize=opt,
+                 force=self.force,
+                 prefix=prefix,
+                 dry_run=self.dry_run,
+diff --git a/setuptools/_distutils/command/install_lib.py b/setuptools/_distutils/command/install_lib.py
+index ad3089c8..7f906a29 100644
+--- a/setuptools/_distutils/command/install_lib.py
++++ b/setuptools/_distutils/command/install_lib.py
+@@ -25,8 +25,8 @@ class install_lib(Command):
+     #   2) compile .pyc only (--compile --no-optimize; default)
+     #   3) compile .pyc and "opt-1" .pyc (--compile --optimize)
+     #   4) compile "opt-1" .pyc only (--no-compile --optimize)
+-    #   5) compile .pyc and "opt-2" .pyc (--compile --optimize-more)
+-    #   6) compile "opt-2" .pyc only (--no-compile --optimize-more)
++    #   5) compile .pyc, "opt-1" and "opt-2" .pyc (--compile --optimize-more)
++    #   6) compile "opt-1" and "opt-2" .pyc (--no-compile --optimize-more)
+     #
+     # The UI for this is two options, 'compile' and 'optimize'.
+     # 'compile' is strictly boolean, and only decides whether to
+@@ -142,10 +142,10 @@ class install_lib(Command):
+                 prefix=install_root,
+                 dry_run=self.dry_run,
+             )
+-        if self.optimize > 0:
++        for opt in range(1, self.optimize + 1):
+             byte_compile(
+                 files,
+-                optimize=self.optimize,
++                optimize=opt,
+                 force=self.force,
+                 prefix=install_root,
+                 verbose=self.verbose,
+@@ -182,11 +182,9 @@ class install_lib(Command):
+                 bytecode_files.append(
+                     importlib.util.cache_from_source(py_file, optimization='')
+                 )
+-            if self.optimize > 0:
++            for opt in range(1, self.optimize + 1):
+                 bytecode_files.append(
+-                    importlib.util.cache_from_source(
+-                        py_file, optimization=self.optimize
+-                    )
++                    importlib.util.cache_from_source(py_file, optimization=opt)
+                 )
+ 
+         return bytecode_files
+-- 
+2.35.1
+
diff --git a/dev-python/setuptools/setuptools-62.4.0.ebuild b/dev-python/setuptools/setuptools-62.4.0.ebuild
new file mode 100644
index 000000000000..ac38773bebad
--- /dev/null
+++ b/dev-python/setuptools/setuptools-62.4.0.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_TESTED=( python3_{8..11} pypy3 )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="
+	https://github.com/pypa/setuptools/
+	https://pypi.org/project/setuptools/
+"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/appdirs-1.4.4-r2[${PYTHON_USEDEP}]
+	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/nspektr-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
+	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-4.11.1[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_resources-5.4.0-r3[${PYTHON_USEDEP}]
+	' 3.8)
+"
+BDEPEND="
+	${RDEPEND}
+	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/build[${PYTHON_USEDEP}]
+			>=dev-python/ini2toml-0.9[${PYTHON_USEDEP}]
+			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/pip[${PYTHON_USEDEP}]
+			dev-python/pip-run[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+			>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+		' "${PYTHON_TESTED[@]}")
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+DOCS=( {CHANGES,README}.rst )
+
+src_prepare() {
+	local PATCHES=(
+		# TODO: remove this when we're 100% PEP517 mode
+		"${FILESDIR}"/setuptools-62.4.0-py-compile.patch
+	)
+
+	# remove bundled dependencies, setuptools will switch to system deps
+	# automatically
+	rm -r */_vendor || die
+
+	# remove the ugly */extern hack that breaks on unvendored deps
+	rm -r */extern || die
+	find -name '*.py' -exec sed \
+		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
+		-i {} + || die
+
+	distutils-r1_src_prepare
+
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
+
+	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
+		return
+	fi
+
+	local EPYTEST_DESELECT=(
+		# network
+		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
+		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
+		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
+		setuptools/tests/test_distutils_adoption.py
+		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
+		setuptools/tests/test_virtualenv.py::test_clean_env_install
+		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
+		'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
+		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
+		# unhappy with pytest-xdist?
+		setuptools/tests/test_easy_install.py::TestUserInstallTest::test_local_index
+		# TODO
+		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
+		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
+		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
+		setuptools/tests/test_extern.py::test_distribution_picklable
+		setuptools/tests/test_test.py::test_tests_are_run_once
+		# expects bundled deps in virtualenv
+		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
+		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
+		setuptools/tests/test_editable_install.py::test_editable_with_pyproject
+	)
+
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" epytest -n "$(makeopts_jobs)" setuptools
+}
diff --git a/dev-python/setuptools_scm_git_archive/Manifest b/dev-python/setuptools_scm_git_archive/Manifest
index 2b01f212207b..830765580c82 100644
--- a/dev-python/setuptools_scm_git_archive/Manifest
+++ b/dev-python/setuptools_scm_git_archive/Manifest
@@ -1,4 +1,3 @@
 DIST setuptools_scm_git_archive-1.1.tar.gz 2584 BLAKE2B 7c7569a92300be966b5447b1ab6c30a982c837efdb7a125173f6014420d78cf28e0d8cb0f04c4349ce364219e1567bcbc2e13bd85cb7627d3bdbae9c7974385b SHA512 73783d60d33782fb18012e64685db6333a2dda1be41ce75e0cd74a81585d8ebb7c85f23371056a42974c93b2d4a0633338945cf2a2219b0ee2a21f063dad8809
-EBUILD setuptools_scm_git_archive-1.1-r4.ebuild 752 BLAKE2B b9c51b6a4a1719805522a0979a852264cf39475f2ffefa32d027e06008c7149b4e42251cf4b7187da8b1f065624908fa3f4967a1664b925910fdd27456915ae9 SHA512 8167f7388f31098b79204a3b978c2aa3fe01c3bc5b6e6867bd265afccb53690fc3e3e8a8c40bea9dcb1bccf789bee2d6fcc74a71ab1212180466ca79e176f7f9
-EBUILD setuptools_scm_git_archive-1.1-r5.ebuild 814 BLAKE2B 223ece166a4013fd3d12382ac3bf603f06b49dedd2527d5603b659753767a8f1284f7bd4b7f455a13b3f3f8f50273c0c9feed425b305d3bc3853646bda70d2a5 SHA512 df475915b927e28f7084f840a2ee9c036749e2306baa484e6f3630d84d02176359b428886ee3c476a217bf10be9a1a6a6c147c1bb8f8c6a60500b4e2651ff8cc
+EBUILD setuptools_scm_git_archive-1.1-r5.ebuild 806 BLAKE2B e040d7f8afc473ef5f5620962631b9bf03708acfae082bda46ab7182f9ad1b809ce3ed46fa4665587802e875b19c07efac1d81a52084e91649672d7c6992228e SHA512 427a2f6b275f42ba4fb59e93eaeffe9a8e644884fb363f3ef29b44c21b700cb76e246f2ecfc91dad567a35e756d08dba5494c265931a1697f605f64af21e2751
 MISC metadata.xml 357 BLAKE2B 3cdd316f50c6f2cab1dc88b7f1d00081c2021a12a4076efaf5c1188dbc650a594bf714d6653f62a1f58e7f816b4defd7774abe0cf6d3c4dbf77f7f90a064eae0 SHA512 475bdaf52720f484b4614d313ae74e6cffc68779460463d9409e683c997f12f9ef416dea6050e3adcc0c137f0ceb7f889ce440f808c697d34a8fd7776fd6cb60
diff --git a/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1-r4.ebuild b/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1-r4.ebuild
deleted file mode 100644
index e43c2a27e214..000000000000
--- a/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1-r4.ebuild
+++ /dev/null
@@ -1,32 +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} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="A setuptools_scm plugin for git archives"
-HOMEPAGE="https://github.com/Changaco/setuptools_scm_git_archive"
-SRC_URI="https://github.com/Changaco/setuptools_scm_git_archive/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	epytest tests.py
-}
diff --git a/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1-r5.ebuild b/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1-r5.ebuild
index 0361fadda93f..4324185e7ee2 100644
--- a/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1-r5.ebuild
+++ b/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1-r5.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/sh/Manifest b/dev-python/sh/Manifest
index 880c5746b49f..e11bf78c4808 100644
--- a/dev-python/sh/Manifest
+++ b/dev-python/sh/Manifest
@@ -1,6 +1,5 @@
 AUX sh-1.12.14-skip-unreliable-test.patch 317 BLAKE2B 3c45673daeec13cbdf851dd97061df85c41783a1b5d760d9d45386b8b4e3f88e25e3f98cbdbce44796e5803614d5474444e554d305089d098fab2cb07075cf71 SHA512 6adc7fd1e2a9f52804272bba1d83eddd6db82b4b67569fc75d169794a19c505d51fd53c949eaabdeb775119a5e3929902c2bbf3883ed299b2de0e4faad597835
 AUX sh-1.14.0-skip-unreliable-test.patch 237 BLAKE2B 55b600d9426f127704cb698bb4df90b103b0ee08d29165f4d45e3fa56f1c0e20d3ab63b404cfa8d2bc372549a77474a2396903081c606516837ff295990eb47d SHA512 632f195df6a85cd65890d093400f4fed099c2344fe4e7f9d46f3decd817405ea587a18b271da3449088cc23519b5f16b30a2030a81d3bfcee30d4d55c591d5fe
 DIST sh-1.14.2.tar.gz 63779 BLAKE2B adc9004334a53f3704e22c318df6b4f60fd9ca2d31f5a9601f84abfaf0fe2ded06938b165e10b1a977ed38fcad7d0fa08799f2f552fc2c6b9b4c2a6476477115 SHA512 b7917504ae85606e1986b681274077777ad3011639bfe933d4133c3ed16f930842e03b572caa396ca4d58f41fd5594bef776cc16c4b0fbd1242e57c6aad19e62
-EBUILD sh-1.14.2-r1.ebuild 712 BLAKE2B cf0bd7e100c12adbae1e3d940af14a140612123a17299e5d23709a62beac6484e3029cce9749acf488ce8658da22f8d021f45916692e10f820ff24a28cc5bc0e SHA512 936a181092d44012c4e7c63a97a373fbc5475776f03fc4e92290297b8ec7961c044303ba21acd1b2793cfce3a08efbb88faaa7f3e24888d21a023bd007800e0f
-EBUILD sh-1.14.2.ebuild 638 BLAKE2B 9c1fc4ae2b43ca4b7d55106f940a09e26e59c673713fb0b8f03e2ff5ce8340fdc5f30367fb62a29d61d2ba430eed08d2d9aa05fd249a77cad246b9fc29b0d346 SHA512 bd9721fe1b73f89425ee7e36226c10ad5cae2c8454351c27a07effc797f1447ef216b1b86cb89ecaa63249a4829115c5038680762c5d0264df95321bef76d033
+EBUILD sh-1.14.2-r1.ebuild 704 BLAKE2B 0f3c0a04c8ca495d757c3bf3c76dcd970b81a541046be3dcfeea8b0e603f06d1c81f4b915ee4ff305815c75100fcde4a99f6eb16a45bf168871b1bb6747a285c SHA512 a46e1a22e2bdef6cc621e6b63e2597b5b442e261c84160155e25f1153d844ff9804962c00b2df6cdd1b6d4ad94e9b5bb45c32287dc3a17504aeb7c37b5184df2
 MISC metadata.xml 802 BLAKE2B 4eb5ab2ef69633f88a1f16f226eb78a161632232ca2d127acd89e1271ab7b31d551aa9759ee5f327cd94f06a6b11e9463d6a6fe1432d4be84489afa009ce7f6e SHA512 b3b21507c5eb85f9289499ee87a2db852b254b2cd1e9feef61cb731a9cd035f0c6c8e3f7bcb4a1267fe97faa34655674354ba696ca26cc18247e7fd150f60816
diff --git a/dev-python/sh/sh-1.14.2-r1.ebuild b/dev-python/sh/sh-1.14.2-r1.ebuild
index 233a8137076b..3e3501afdcd1 100644
--- a/dev-python/sh/sh-1.14.2-r1.ebuild
+++ b/dev-python/sh/sh-1.14.2-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 PATCHES=(
 	"${FILESDIR}/sh-1.12.14-skip-unreliable-test.patch"
diff --git a/dev-python/sh/sh-1.14.2.ebuild b/dev-python/sh/sh-1.14.2.ebuild
deleted file mode 100644
index 0d89eb85d313..000000000000
--- a/dev-python/sh/sh-1.14.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python subprocess interface"
-HOMEPAGE="https://github.com/amoffat/sh"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-PATCHES=(
-	"${FILESDIR}/sh-1.12.14-skip-unreliable-test.patch"
-	"${FILESDIR}/sh-1.14.0-skip-unreliable-test.patch"
-)
-
-python_test() {
-	"${EPYTHON}" test.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/shiboken2/Manifest b/dev-python/shiboken2/Manifest
index a85a40437aaf..dd3e6b9fd5ff 100644
--- a/dev-python/shiboken2/Manifest
+++ b/dev-python/shiboken2/Manifest
@@ -1,4 +1,4 @@
 AUX shiboken2-5.15.2-python310.patch 4408 BLAKE2B cd1a5c3f8c473a6667f8c942c248285babb468339283a8cc97064bd119194b72bcdb47c758044774a415cec08562b7875fd7298dea50e23d7fc3830e8291a8c1 SHA512 10245617f1aea656d3ba2e8736d51fd119e4d01c4fff129f557203bd1d5eb40ca10b40eaf55a8bd98b56f8e2e7503028818e333fee8ec86cb7b050e48a5e0387
 DIST pyside-setup-opensource-src-5.15.2.tar.xz 3472624 BLAKE2B 099abeaf25059a88f299f90b18cf79aa45acd86580c0873767b09f76268d6746cc3576743a19493a605de59b520471ddee6bba0e5340801ef44a21f2a9d41507 SHA512 5043c1c9db4ba0133baaabb4d4943182e9741b1007bedd992394758707a37bba0688dc6413ea46620e7c2fb09daa3c74e6a7bb2c302b9d08e5f3bb7575d02b62
-EBUILD shiboken2-5.15.2-r1.ebuild 6510 BLAKE2B 5f402eb4fe6a2b4b620a1a3f715081cd0da78472ba1bde69a888fa1cdc37a00d3ca9feb661b0aa595f828094ee9a99a4fba4b3f85fdb4b479a6151a119a655c1 SHA512 141aff3720c7a8704f0e1b0a92ff87d3356b921b6f3535bce2d21be16758cd1745369e10568cb2339192e1d3d89a010f23648b4fa66b0fe738bd8591737a45c9
+EBUILD shiboken2-5.15.2-r1.ebuild 6512 BLAKE2B 436c049eb7d11b460ca333e42316680f965095eaec200c375b7659e2c40e6b198417ef7a2a6cbd434e3512db6ff7aef935ad5a8e2bc55f58a5179043df3c21ad SHA512 0994ccbc010a7bada8edc7ee59071c3c73cab79ba02febff582098ac3ba0f754e991a04aff6c101a0c204f99887325328aaaec87ded1a96ab6ee1e0a0dac2fc3
 MISC metadata.xml 576 BLAKE2B 567c84dbf819c5944e5b35146e3dff7b1581aa0275a732e8f2cb6df4b32001e2020eca2469ee422bd6fdd53b34c1453db4ecbdec6e85fe5ee3e4eea4a2283336 SHA512 f1c5964cb99b61c1913b7c031b994b71948e7b26f18d4119b7b3a536bbf7e659cecf539ec54992e157170159186ede2af3b31dfa03fbc1170bc7e12c25814a31
diff --git a/dev-python/shiboken2/shiboken2-5.15.2-r1.ebuild b/dev-python/shiboken2/shiboken2-5.15.2-r1.ebuild
index a8732bcfc06c..594d5f6bf09f 100644
--- a/dev-python/shiboken2/shiboken2-5.15.2-r1.ebuild
+++ b/dev-python/shiboken2/shiboken2-5.15.2-r1.ebuild
@@ -77,7 +77,7 @@ src_prepare() {
 	# Shiboken2 assumes Vulkan headers live under either "$VULKAN_SDK/include"
 	# or "$VK_SDK_PATH/include" rather than "${EPREFIX}/usr/include/vulkan".
 	if use vulkan; then
-		sed -i -e 's~\bdetectVulkan(&headerPaths);~headerPaths.append(HeaderPath{QByteArrayLiteral("'${EPREFIX}'/usr/include/vulkan"), HeaderType::System});~' \
+		sed -i -e "s~\bdetectVulkan(&headerPaths);~headerPaths.append(HeaderPath{QByteArrayLiteral(\"${EPREFIX}/usr/include/vulkan\"), HeaderType::System});~" \
 			ApiExtractor/clangparser/compilersupport.cpp || die
 	fi
 
@@ -96,7 +96,7 @@ src_prepare() {
 	# PySide2 does *NOT* care whether the end user has done so or not, as
 	# PySide2 unconditionally requires Clang in either case. See also:
 	#     https://bugs.gentoo.org/619490
-	sed -i -e 's~(findClangBuiltInIncludesDir())~(QStringLiteral("'${EPREFIX}'/usr/lib/clang/'$(CPP=clang clang-fullversion)'/include"))~' \
+	sed -i -e 's~(findClangBuiltInIncludesDir())~(QStringLiteral("'"${EPREFIX}"'/usr/lib/clang/'$(CPP=clang clang-fullversion)'/include"))~' \
 		ApiExtractor/clangparser/compilersupport.cpp || die
 
 	cmake_src_prepare
diff --git a/dev-python/simplejson/Manifest b/dev-python/simplejson/Manifest
index de4a4b6ee6bd..7d47abb37eae 100644
--- a/dev-python/simplejson/Manifest
+++ b/dev-python/simplejson/Manifest
@@ -2,5 +2,5 @@ DIST simplejson-3.17.5.tar.gz 83182 BLAKE2B 8fbaa83c81a7478b3c62c6625e717874f6dd
 DIST simplejson-3.17.6.tar.gz 83134 BLAKE2B 5aa9275673a0c8feab2a86f1bc85864791a847a7eda77ea6f3e4f8d8677ff88d2277ff659285d183d2d439c58e78b25846badb3a2fddbc959d40eb23273dfa2b SHA512 4a25032fcc78025d82db571716deef8769f036a330560f92e14563687db4a42dbe60866b8afb57baf24104ef94fcbe938cdbddfc169542664957eef2d00d04e3
 EBUILD simplejson-3.17.5-r1.ebuild 681 BLAKE2B 404388de6ac84f52a17a4d7d450c4f128e86aceda17b764894a260c84e9b1b58012f1659d95852dd75a35ac8ad9d669b05837d962c42ab80297bfe1f8838717e SHA512 73cd38632b70dfcd52e2f78733e58e3a1b63d140a3b8a7d94d5c839d16cab3527aa1225b1b7bd9ab16d46954e70d0200a55a97052d12d822bafa093d9cf8ad76
 EBUILD simplejson-3.17.5.ebuild 635 BLAKE2B 5e35845393c3bdf0e3220c86ac68bd3177286cab6f8a4afcef4ea132252bd4bb9b7664daab3d2615f815212d3248551d5a34818033c8d83fed596f0d06ff515e SHA512 b53626aca1805d05ffa5ef8140c878950b1dcd4039628fb96abe7d7e6b6e09e774c84356d5229e2506df6cb2b633b22c628c5b2c1bacae290376d1ee7562e049
-EBUILD simplejson-3.17.6.ebuild 675 BLAKE2B bab0c7a3ef06b98bb841dcb65d2f26d4e80f6ef0f3c852d48f61c3b8b5597c45510ac5ea1f044fd32d36a1efd50dbf24f4a508e8c0e23fb696d7cc6484981b26 SHA512 b61038d29ae7fa2f952775f896bab82c7986b047b6c1f589327b7cbb794b04f78b00ce20d9c9207ceba3d29d765eb61562d3a3cb35b3fd3906fdf444a4793483
+EBUILD simplejson-3.17.6.ebuild 674 BLAKE2B 34c637776c81a42bd39763a690a2a9849f2414a18a8343b9efe392b3ec8ec1637412cfe64f47ad7fb004f11c8fd504aa10cc138a17b57bee333a6a43c1cc3616 SHA512 bf3cf6b78cc52a13738f53f9f57e4f58ee9419dd8d5453a4372e6ed38da7bb412305d611f1f2bc5e6ec221a901a790b74e9dc3bbe9c559eb0dffe5b9aee4bcf0
 MISC metadata.xml 375 BLAKE2B 2c3a0f98ee3f6c9ba41edf3e8e4d6536ac518a59234e6c602d46cbfcb8a5c760c71997b3c169dd2c0b3f9c5dcbea1cb36967e4d050933bd5e31d6f609a835e83 SHA512 6ad418641e64295566aa5418b9bead66e7ea84e0ca7aa454bfedf613cde7ed4d1cd17dff962963c3dda62ad9050e6348f9f53da21ba25b53cdeba2d91b8c551d
diff --git a/dev-python/simplejson/simplejson-3.17.6.ebuild b/dev-python/simplejson/simplejson-3.17.6.ebuild
index 98a74716e6d2..99bc2d4eaaa0 100644
--- a/dev-python/simplejson/simplejson-3.17.6.ebuild
+++ b/dev-python/simplejson/simplejson-3.17.6.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( MIT AFL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 DOCS=( README.rst CHANGES.txt )
 
diff --git a/dev-python/snapshottest/Manifest b/dev-python/snapshottest/Manifest
index 9585edb0b4bb..d244eb3ff6ba 100644
--- a/dev-python/snapshottest/Manifest
+++ b/dev-python/snapshottest/Manifest
@@ -1,7 +1,5 @@
 AUX snapshottest-0.5.1-remove-fastdiff.patch 1978 BLAKE2B 49bbd2118bd8defc3134b1863614a6da7f45f8702c9b65db35329a74b270a511ef6c87952eafefa5e64080c136e21fe7abbfb1e304ff1744983bfa6fcbcc27ee SHA512 804223af644f67a7ad22996572bdb35c88d3c87bfd67ef821b4ebcfb581281f305f9d96edfda9d8a20d5cd1d07397899dc10b629f7d02b91c2b8804e02fd1ac0
 AUX snapshottest-0.6.0-remove-fastdiff.patch 1979 BLAKE2B 1645f9fe0d7a5ba9523f81c50f31c54d854d56d3137a8b6611594bb825ccc0c183c763dbf641b1517e45b4ae39979efc86d5fffaa6adc111ee937a8c2f4143b5 SHA512 da43e9d1eb27f66512e5c3f02a0693756ea1e6889c6a9c3871c2f53a80a6ab4cdd7a705cfbe523231b8496a5eca3587c71e57babeec89c653307923c045413df
-DIST snapshottest-0.5.1.tar.gz 19312 BLAKE2B a8acfb09de9e58c7a929f71d10f3cc68d7eec31a9fa1ea0fe74ae8a574ceec315f7eab2f9e7cd326c34d981b5ede4c398b5f1352bd59c23be219eeb9a2c0e861 SHA512 1541c327c4238c816b55cf797f6104ad54ff62a2332517b3bf9a455bbee0abd49f6983a54dc7510d1e1c659d88e5f7d6c6aa396c0ece19e19957ea8cff42c673
 DIST snapshottest-0.6.0.gh.tar.gz 19887 BLAKE2B d85b3025731dbe80c04388f8adf755f48f428df5f15496ad7e47d436ccfba0f8955833f576b12a38a3565a56deb49a425b67f9040bce69a7711be05558f0ef4e SHA512 7477668c0a61b4c282deb3eb9105cf06e8f644c931e2860a9a60dc2f8ed6de1eaf1ab100a816de200a39db8b488bda6ad33472265eecca707360dcbc9d8fafee
-EBUILD snapshottest-0.5.1.ebuild 1116 BLAKE2B 4105aa10a0b6fe8229eefed46bd4ac456041a53064552c442ed7618833aa0cda7808edef055bd868c33ba9a801710e65df8ccf1d292d7a082f768a56f216d476 SHA512 da6567fae19195269dc8b78cdda647cffbe1266a24e1f9eec3d900d08902f882aa272c71d2e600ffb38f7b48d605f0a1c6d111c5fdd539519e368d89af052fc0
 EBUILD snapshottest-0.6.0.ebuild 919 BLAKE2B 3bfc9b3e7e856099e7c7cd69e0851233138c90223bc3746dd12d8389f9bcad75b3ea361ef08eabd84fb498de8fa0c3b5245fe90f878db76b263c421504e64b28 SHA512 e4665614b1e5bba39429e3f147a89d1247622ffc9125b97ca994167085c921ffadc66c55bbb39c8243144d3e7f4e6c26dc637cc15a0620c854c90786f3096bb2
 MISC metadata.xml 380 BLAKE2B af864f451c424be42fda967811c0754d246ff7399a14d7344c967e695dd33ed060f9db19823f7f7c3a78f90f45b2817b843dff1832cae24a5c6c3bb6b183c63e SHA512 a755150b8fd1cfae3e016e97cceb9d9e32e58750a7fd01665087fa82ebba1124b38566bf6869898338319532956869a472c50dce9f4ad53f6329e4691197d7b5
diff --git a/dev-python/snapshottest/snapshottest-0.5.1.ebuild b/dev-python/snapshottest/snapshottest-0.5.1.ebuild
deleted file mode 100644
index c49cc1e8330a..000000000000
--- a/dev-python/snapshottest/snapshottest-0.5.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-inherit distutils-r1
-
-# no tests on pypi, no tags on github
-COMMIT_HASH="4ac2b4fb09e9e7728bebb11967c164a914775d1d"
-
-DESCRIPTION="Snapshot Testing utils for Python"
-HOMEPAGE="https://pypi.org/project/snapshottest/
-	https://github.com/syrusakbary/snapshottest"
-SRC_URI="
-	https://github.com/syrusakbary/${PN}/archive/${COMMIT_HASH}.tar.gz
-		-> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${COMMIT_HASH}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/termcolor[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/snapshottest-0.5.1-remove-fastdiff.patch"
-)
-
-python_prepare_all() {
-	sed -e "s:'pytest-runner'(,|)::" -i setup.py || die
-	sed -r -e 's:--cov[[:space:]]*[[:graph:]]+::g' -i setup.cfg || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing
-	epytest tests examples/pytest
-	"${EPYTHON}" examples/unittest/test_demo.py || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/sniffio/Manifest b/dev-python/sniffio/Manifest
index 19439625fc10..f8c04285b88a 100644
--- a/dev-python/sniffio/Manifest
+++ b/dev-python/sniffio/Manifest
@@ -1,4 +1,3 @@
 DIST sniffio-1.2.0.gh.tar.gz 17335 BLAKE2B 0d67baa18702ac38932680bdc741c87ee0a31342cc752c1463a7f90720ea0ebf6d62ef682a042c58e8fe96456e1461638e0f02c6f60da5f5e0d07464be27a4a3 SHA512 8e1dd2bb6fc22ee5824adfffe688ff0621b8c1ef5daea594dedce13d5e04a498e05816bb32e9bbed206a653a330ff710df57c888ddcff00a6254eafddc538273
-EBUILD sniffio-1.2.0-r1.ebuild 725 BLAKE2B 5810bca0425dfc10750410b5edfb83dd1662ab84d8c81243e27ef50f126cb1e6e306829f260c1a0a2b39d93819b29b520d93ca4034e27a86aedc1c82e2df451f SHA512 1de1f6bc2a458f8af554db071885bc4761e0c0364148ede457d5e41bd25b7aa39cf8b850c4937dcb3b22a0c2f50b6b0fc6da51eaa08d6e6299a16a88347581b9
-EBUILD sniffio-1.2.0.ebuild 682 BLAKE2B bbfedd35293cce5894785fce6344d1678d4cdb4d5cc6ea6629c65e9ac2b6097a586bb5379e3349ef9bab4313b890a46a0bca775ef118f4fd42debf9a295bbde6 SHA512 781dd2d67b5b76be7371aeaab7f14baceda93612d9e9f211fc01628debb7e9064e628f793ad5002470a5cbf31cdfc54d0dc4145db1bfacf10bef4f77af77a497
+EBUILD sniffio-1.2.0-r1.ebuild 717 BLAKE2B 5b410a278421abfd0126c04071d2d62249686dd1fff1a1503b45e834f4d1af879bdfc97066e2193d5a130553738687281d65b9a6d1f3c4d3f7d10db849b64155 SHA512 f2c6fefe904047f3f69474bbc0dd3af48653d899235cbd7c760c5c5de8ef7e919536c15f63e2658609f6db6b79100826d92a6c660c322aa3defc982dc775369c
 MISC metadata.xml 394 BLAKE2B 46df2a6c1c3259a1ba932cb74918ee0f7651e942cdb2eaa76d063269417079459745fa80416cab8088b8f41699b3b509a4586ab828692698a6a04588ece79bbc SHA512 a1aebdbc40dab66e913aaa7dd848066197d8d53a3e5c4890953cf6e5ffd1df5f5acae5ed022b10fc9c6e9a51becd05ff31ac19d0013ad7786b6d038705696b73
diff --git a/dev-python/sniffio/sniffio-1.2.0-r1.ebuild b/dev-python/sniffio/sniffio-1.2.0-r1.ebuild
index d22e05c4e1b3..dbc7302ff47a 100644
--- a/dev-python/sniffio/sniffio-1.2.0-r1.ebuild
+++ b/dev-python/sniffio/sniffio-1.2.0-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/sniffio/sniffio-1.2.0.ebuild b/dev-python/sniffio/sniffio-1.2.0.ebuild
deleted file mode 100644
index bcf388f307ea..000000000000
--- a/dev-python/sniffio/sniffio-1.2.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Sniff out which async library your code is running under"
-HOMEPAGE="
-	https://github.com/python-trio/sniffio/
-	https://pypi.org/project/sniffio/"
-SRC_URI="
-	https://github.com/python-trio/sniffio/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="|| ( Apache-2.0 MIT )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# curio is not packaged
-	sniffio/_tests/test_sniffio.py::test_curio
-)
diff --git a/dev-python/snowballstemmer/Manifest b/dev-python/snowballstemmer/Manifest
index 22dc730a242d..75d4e1724738 100644
--- a/dev-python/snowballstemmer/Manifest
+++ b/dev-python/snowballstemmer/Manifest
@@ -1,4 +1,3 @@
 DIST snowballstemmer-2.2.0.tar.gz 86699 BLAKE2B b106fac1587143c9e88f54cc982c573b227f9e2d0125d36391a95050b41e9c97e47c7c8dff890ebfcf4bdf7c97559908d3bd380c6659b0d1fef4bed111fbae4b SHA512 f1dee83e06fc79ffb250892fe62c75e3393b9af07fbf7cde413e6391870aa74934302771239dea5c9bc89806684f95059b00c9ffbcf7340375c9dd8f1216cd37
-EBUILD snowballstemmer-2.2.0-r1.ebuild 602 BLAKE2B 8f3389f547bacdcb1ff56ff102c0cc14ff057f0e084a1ba64223a7554b81a06fdc605bfd99e0cd11d7ef4c63944f2a7d5b105bb1aae3e647b515f55bae0f922f SHA512 a0657209c1c4f841328d4ac543c3a04c20a9a0eb1644cbac7ab3a0b35e362e50ab378b438f36e842ed33df284eb52114d2634dca501fdbe472a894a5c12c4d78
-EBUILD snowballstemmer-2.2.0.ebuild 562 BLAKE2B a8c7923be7c6e8684352ad0a7faf8d87759207ff2626052e872aeafb45c271900b44ce83668043d1e6100b5c410d87acb1176e527665fa011324a295ed580c0b SHA512 ddbb6c8eb89468057baaa578d38ce4ee67c97e170edaa7a61dfed6d09250ead2f1b78bc036c89029430b37d7e808f2a65453fdaa815cbaa56a39561977801b70
+EBUILD snowballstemmer-2.2.0-r1.ebuild 594 BLAKE2B 1f26a44c99c3bbae34deabf41469356f73b5546fc1fe54e2c286adbcce74c3e78f0d1ec4154468879e3500a3a1cfe8ff963a34cba73b0d291568be6050fdad75 SHA512 6638b267797a424b36d3b46d3a17e3595cda431b5d0d6da05d5c97f61c30a02eb2140b0b14002cbe65e49c8655c8a06894beb1f6ed7e2ca952acf7915c51df00
 MISC metadata.xml 404 BLAKE2B f30ff685b65c1bdfd69ad19bdefc080232e7e71310d036fcb55c587c0c9b2ec03775c7c3bea26574191398e78ffffcdab54f81bc57505aaf28ca9fb883613a67 SHA512 dfbc65c53a18187f6f19ae370abeb7c813b0f4449402641fd0eb2be378d0a6711bccedad128f8eb4eeb9d76c2fd643d9d89dd5e4fc93b2d7f8d321c54241afe3
diff --git a/dev-python/snowballstemmer/snowballstemmer-2.2.0-r1.ebuild b/dev-python/snowballstemmer/snowballstemmer-2.2.0-r1.ebuild
index 6ba7f654c759..ae0c6fae73db 100644
--- a/dev-python/snowballstemmer/snowballstemmer-2.2.0-r1.ebuild
+++ b/dev-python/snowballstemmer/snowballstemmer-2.2.0-r1.ebuild
@@ -15,4 +15,4 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~x64-solaris"
diff --git a/dev-python/snowballstemmer/snowballstemmer-2.2.0.ebuild b/dev-python/snowballstemmer/snowballstemmer-2.2.0.ebuild
deleted file mode 100644
index 536b3e65aca9..000000000000
--- a/dev-python/snowballstemmer/snowballstemmer-2.2.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Stemmer algorithms generated from Snowball algorithms"
-HOMEPAGE="https://snowballstem.org/
-	https://github.com/snowballstem/snowball
-	https://pypi.org/project/snowballstemmer/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~x64-solaris"
diff --git a/dev-python/stack_data/Manifest b/dev-python/stack_data/Manifest
index 2b7f4e2af18c..7862c46ec886 100644
--- a/dev-python/stack_data/Manifest
+++ b/dev-python/stack_data/Manifest
@@ -1,3 +1,5 @@
 DIST stack_data-0.2.0.tar.gz 36618 BLAKE2B af79e5c46d03967a8ea6a992a0672a5bd3676a8b088be412782b8c6be6f58a14de1c6e6ff0cd4ae764a65c539a83aa4d7491bb7fe81761452d430d30f70d20fb SHA512 7d6a1a0ffdc667b3ac428b378f1c4f14c5ded99ec244e3cb558bb39ba0c319e9e1657188cb686c8eb788e1af2be6c0b51beae825b73f2685d7b0bc1341ebe5d9
+DIST stack_data-0.3.0.tar.gz 41061 BLAKE2B 9202ddb2e6e8c8c9e050e085cfe6e1bdbf26124eb85c19516558336d46876aba5ede1b6a87cf17e09c2b44629063a8f5e1f558fdaf64db2db029978a5860cd99 SHA512 648b6fd0dbf43ee974c15de85aa530034c6c67a3a7c297c1ea3f1ddd59bf13d331f8db9f8ddf54f69e59385ed2c0c2a24b48c5a93330df62082c333610d8a6bb
 EBUILD stack_data-0.2.0.ebuild 824 BLAKE2B 14592d59e199555514f8057c5d04a7ce663d05d25c763233ca680becad59f602a2e66831980270d79827bd86047810319a5d8b4cb29e1891053446556709fdf9 SHA512 2ec55cfcf15b6e26a3b7c7d002b14ce5b19c7945eb3b9e909afa1638b74c9b6a0c509ecc73aed22b3b7cd1eefd55a522c807fb92789d6bf6b417158044da1971
+EBUILD stack_data-0.3.0.ebuild 833 BLAKE2B eed18bbd3e49a5073e55b067a6da1501ac772d1926138e6d23f811ca4e6a432da534caca90e2a9214ad55abc7f210b3d8b385e39a27458ed9e1efdf7aae27911 SHA512 0a5c559e764428f8e4f85e31b15ed725c96d77df9de632e069e51e076f0d9063262522b67a86a0614f5609c863a8141a356c284445f6f03028ac025a6d1dadac
 MISC metadata.xml 375 BLAKE2B af41ba2f7058da9de0e1f8be741c3de7581d895246c1c941f0dc27ed2e708ac2cb64b5a6fcaea82ff79e7a8bd4e0b424500a373957019d9e62f53babeadc166b SHA512 be539ff023fbcdf96761cf06429efc4cc2d0d2ee38b3bdaadbd73665798c123591b9543ab4fd3ccca9c80820c71b010f8fd34646d2001a940df0a61fc4e0639b
diff --git a/dev-python/stack_data/stack_data-0.3.0.ebuild b/dev-python/stack_data/stack_data-0.3.0.ebuild
new file mode 100644
index 000000000000..354f429fa75b
--- /dev/null
+++ b/dev-python/stack_data/stack_data-0.3.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Extract data from Python tracebacks for informative displays"
+HOMEPAGE="https://github.com/alexmojaki/stack_data"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/asttokens[${PYTHON_USEDEP}]
+	dev-python/executing[${PYTHON_USEDEP}]
+	dev-python/pure_eval[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/cython[${PYTHON_USEDEP}]
+		dev-python/typeguard[${PYTHON_USEDEP}]
+		dev-python/littleutils[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/stapler/Manifest b/dev-python/stapler/Manifest
index 3a6e37ee15ed..be3d448e5b9d 100644
--- a/dev-python/stapler/Manifest
+++ b/dev-python/stapler/Manifest
@@ -1,5 +1,3 @@
-DIST stapler-1.0.0_p20200531.tar.gz 42840 BLAKE2B bfa909e25dfd65101321e153f5129d28bbb360845d6a3622c53ec3921610b9987a8e5c85c4428ee1cd196c0ee42b5a2eefdca7c4a75be223867fad4d830b148a SHA512 7c5f76240f1dff67eae3eb25d29087c7bbff3aace65030d10836f60769798d653b30acb6cc89355ba1eb590dbfc3236cb4ae95c02db6e779ad474781a17bdbc8
 DIST stapler-1.0.0_p20220330.tar.gz 43659 BLAKE2B 10c24868d51086b37dd2d517aa84e3c3fc0b6becc7a29ebf496646bdd65494eb0c43488f725241d7bd7b3083ce5703538db3e05de9976a2e5029731fc2e645d2 SHA512 acd2dfec0dfab46b2cf6b440cba6c0db5399be2ba2194ca12530c311c6c5a8028614164af45b850061e7d22cbec33458ceff7757f1b104c722228dc2d02cae0a
-EBUILD stapler-1.0.0_p20200531-r2.ebuild 633 BLAKE2B 24fe1e6ec4a145892567a42e63d4ea3a58675820f2c085757f0577cdb2abef146c63827f2fcd8bb5b7ded2131bf88fc47f0d3216b0f90e699325a5eb1dfd25ad SHA512 aee1c8001f135303c3a428f1234da7a15e320891622787388c5931bec2a02a311287c864f2bf49b102f72905d85d03d698c3ac8239c088789391b75673edd1cb
 EBUILD stapler-1.0.0_p20220330.ebuild 621 BLAKE2B 01c30866aa79b870e016fe51210ce805909313f8f0e73e7b97a5e79bc8d085096510cc0a901bf7263026d8b00b22dbb8cf06f4dfd7b514b0d15d89e6b4688540 SHA512 a1aacef1793416e6dbac3c411fa2afce1f55421164a7fcfb9320fe0a79868297b9fc04b397f50d8ce9da393ee5e3ef09aa829ded010893f5733fca17b1bea417
 MISC metadata.xml 398 BLAKE2B 3c566702150e77dd0ba58f667336f57c0347422496edeb4fdd53e0f131cb966d15781a5d5b5e13211b2385e410a1d12c064c3ffe66056395b6eeeccdcca1cc72 SHA512 802c118d28a07f7fba6558aaa8f60aef0ebf137395af566e273ba1d218712d1835c74f82c5160f12d120d8776cbaf4fe7d09827a84c1a5e234fef307e0835a18
diff --git a/dev-python/stapler/stapler-1.0.0_p20200531-r2.ebuild b/dev-python/stapler/stapler-1.0.0_p20200531-r2.ebuild
deleted file mode 100644
index 2ded93bb400a..000000000000
--- a/dev-python/stapler/stapler-1.0.0_p20200531-r2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-
-inherit distutils-r1
-
-COMMIT="1cabc85521e2badfc1e0d690086e286e701c2d9e"
-
-DESCRIPTION="Suite of tools for PDF files manipulation written in Python"
-HOMEPAGE="https://github.com/hellerbarde/stapler"
-SRC_URI="https://github.com/hellerbarde/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/PyPDF2[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/starlette/Manifest b/dev-python/starlette/Manifest
index d2988963f0c5..cdab6f891d7d 100644
--- a/dev-python/starlette/Manifest
+++ b/dev-python/starlette/Manifest
@@ -1,11 +1,5 @@
 DIST starlette-0.18.0.gh.tar.gz 408097 BLAKE2B ddc85690d9eb962a8d82544a1667d17316025330c8fda0c79dc21422399bcff01ccf5baf85eda7941f40aac5845d18fdcefaa23ba8ba442d30f0b9e194f7287c SHA512 521d39c1eec818250da3f2dc24cd2fb08393b76e6314a9bd5f3e520bdfa4652ae4ace5876b7e7f3a7ddc5540160e1086997a40b86a1b1bfd694c6aa1abde9106
-DIST starlette-0.20.0.gh.tar.gz 414497 BLAKE2B 47c6ef632a600bd18075c8ea65811ed18e08c285ed01cb34e5f74c00b2349430703ac041beacb35b91d941501001d2b93b79b777b403f5b6bef4682f6c13b02a SHA512 f28aff53732ec5950b2432ea644667d408e80cb4b51a177652a9bfe6731c6fa1208cba644fcaa84405bf51ef00f500a277c86e48f5446e2014369c1d1edda357
-DIST starlette-0.20.1.gh.tar.gz 416665 BLAKE2B 1b02f220dd6a8ebfdba405e3b9907030f006ec7ede43022fcef7911f5ac103da0eba16e7175e31e14529e64c711eac87b00c98534fbb18e784217ccca45f0c12 SHA512 4b10cf402bb3b3f96ec0bbb8e5fbd1e2abac4cbcf25a099bafad88fe02653d45e602e683f712251bb6dc230bc0d0754b2c960be2361239dc62e7e96b8b20ce6b
-DIST starlette-0.20.2.gh.tar.gz 417198 BLAKE2B 17ddd8fe5cd91e022fbe4f092a8bb731503294898dcddb2ac577a4f106f0e9db8901aaef01f6e07be082ba19636bdda799753e1f3a21d12e31454b29b5136fec SHA512 fb30c475779c4cf21cc43dc7e0aff58700c6356b692bc662edf93004054539ce80a97cb36e14636e33fa969b291f160cbf148b5aed749da197c13d4fec4eacda
 DIST starlette-0.20.3.gh.tar.gz 417054 BLAKE2B 5564026142cb45075aa3ea3fabbc3e0eb39d4e2d776c6577d79b9c28522befaa92869e5f4211bc77235f6d25102f8d90e3811c972b74bb295abd0d186e29ceef SHA512 fa7f8de299ee452a52bf43ff6c39851fc7985775e1938b38cb564d5cb19705a84fbb173229a090295bca3be87b71214fdf7c80e3db0f870cf018510e1bd06b1b
 EBUILD starlette-0.18.0.ebuild 1156 BLAKE2B 2c31219a2ec2d15ff2c2771e321aa36371d61f79eefb3bee6243bd22bbc27da479329cc36beaf4d4b231f7854808682c4885169660a5890b1aef7cd95175832e SHA512 f23e3ea3bbb5bb198c517195dee9bf6210b0dc714d5e86ffdb0831d15fd29b8be8a9be0b2700ac189bb37e1b2a61503893398f85f1026df71829c044a12a92e0
-EBUILD starlette-0.20.0.ebuild 1422 BLAKE2B b69ac68faf2c8a1df9c5c544cfc00258e639c193f5ec2a3211593e9ad22eacaed5fbb9bdd45057bea573257953fe92718dd934f8a0e7ec031155c2bbb161163d SHA512 ec6e970c536574dc59e46fb7cccf7a974514f0e2bb503a2daefb69a2604c9b9bcf798c525e834d8162e8a5b68a6527bb1fc45c4b9838138b45df1082edbcb77a
-EBUILD starlette-0.20.1.ebuild 1422 BLAKE2B e9ff6263f72feaf2bf66271d683b079c7dcee52214496ad024e4e99e41a9b7f5fcba743deec75a79139660ce19c0dd957c11e9917441e514be1bd23238d42d71 SHA512 8595dcda16195a945b80eb31b7a9b1761d60e0d1dfcf64fff43f7f872725c91e7eeba552093dc40bf83e49f59bacef74500e83c65b8a644e6ec927c9c9d126a8
-EBUILD starlette-0.20.2.ebuild 1422 BLAKE2B e9ff6263f72feaf2bf66271d683b079c7dcee52214496ad024e4e99e41a9b7f5fcba743deec75a79139660ce19c0dd957c11e9917441e514be1bd23238d42d71 SHA512 8595dcda16195a945b80eb31b7a9b1761d60e0d1dfcf64fff43f7f872725c91e7eeba552093dc40bf83e49f59bacef74500e83c65b8a644e6ec927c9c9d126a8
 EBUILD starlette-0.20.3.ebuild 1422 BLAKE2B e9ff6263f72feaf2bf66271d683b079c7dcee52214496ad024e4e99e41a9b7f5fcba743deec75a79139660ce19c0dd957c11e9917441e514be1bd23238d42d71 SHA512 8595dcda16195a945b80eb31b7a9b1761d60e0d1dfcf64fff43f7f872725c91e7eeba552093dc40bf83e49f59bacef74500e83c65b8a644e6ec927c9c9d126a8
 MISC metadata.xml 324 BLAKE2B cbdb5983f2620f296eed8d81541e6ffbb084fdbcb698e52a6d86a64122834184e71ac423c21fa81d395be5505cb497be9172cd28d8fc633b6d31b844c480f741 SHA512 02c4d176ccc9c1b12e94f25c0de9792b6dc087a5d897bff8a46b2053951afad28b5c40f181ece8209acb3a8db1ec9e21a29af06b55f66efbc0d8f325d6958123
diff --git a/dev-python/starlette/starlette-0.20.0.ebuild b/dev-python/starlette/starlette-0.20.0.ebuild
deleted file mode 100644
index 2d29021cef28..000000000000
--- a/dev-python/starlette/starlette-0.20.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="The little ASGI framework that shines"
-HOMEPAGE="
-	https://www.starlette.io/
-	https://github.com/encode/starlette/
-	https://pypi.org/project/starlette/
-"
-SRC_URI="
-	https://github.com/encode/starlette/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	<dev-python/anyio-5[${PYTHON_USEDEP}]
-	>=dev-python/anyio-3.4.0[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-# brotli needed for consistent test output
-BDEPEND="
-	test? (
-		|| (
-			dev-python/brotlicffi[${PYTHON_USEDEP}]
-			app-arch/brotli[python,${PYTHON_USEDEP}]
-		)
-		dev-python/trio[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_IGNORE=(
-	# Unpackaged 'databases' dependency
-	tests/test_database.py
-
-	# Unpackaged 'multipart' dependency
-	tests/test_formparsers.py
-)
-
-EPYTEST_DESELECT=(
-	# Unpackaged 'multipart' dependency
-	tests/test_requests.py::test_request_form_urlencoded
-)
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# fix accept-encoding, as new support was added with newer versions
-	sed -e '/accept-encoding/s/",/, br&/' -i tests/test_{websockets,requests}.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/starlette/starlette-0.20.1.ebuild b/dev-python/starlette/starlette-0.20.1.ebuild
deleted file mode 100644
index 2a2de474dce5..000000000000
--- a/dev-python/starlette/starlette-0.20.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="The little ASGI framework that shines"
-HOMEPAGE="
-	https://www.starlette.io/
-	https://github.com/encode/starlette/
-	https://pypi.org/project/starlette/
-"
-SRC_URI="
-	https://github.com/encode/starlette/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	<dev-python/anyio-5[${PYTHON_USEDEP}]
-	>=dev-python/anyio-3.4.0[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-# brotli needed for consistent test output
-BDEPEND="
-	test? (
-		|| (
-			dev-python/brotlicffi[${PYTHON_USEDEP}]
-			app-arch/brotli[python,${PYTHON_USEDEP}]
-		)
-		dev-python/trio[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_IGNORE=(
-	# Unpackaged 'databases' dependency
-	tests/test_database.py
-
-	# Unpackaged 'multipart' dependency
-	tests/test_formparsers.py
-)
-
-EPYTEST_DESELECT=(
-	# Unpackaged 'multipart' dependency
-	tests/test_requests.py::test_request_form_urlencoded
-)
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# fix accept-encoding, as new support was added with newer versions
-	sed -e '/accept-encoding/s/",/, br&/' -i tests/test_{websockets,requests}.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/starlette/starlette-0.20.2.ebuild b/dev-python/starlette/starlette-0.20.2.ebuild
deleted file mode 100644
index 2a2de474dce5..000000000000
--- a/dev-python/starlette/starlette-0.20.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="The little ASGI framework that shines"
-HOMEPAGE="
-	https://www.starlette.io/
-	https://github.com/encode/starlette/
-	https://pypi.org/project/starlette/
-"
-SRC_URI="
-	https://github.com/encode/starlette/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	<dev-python/anyio-5[${PYTHON_USEDEP}]
-	>=dev-python/anyio-3.4.0[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-# brotli needed for consistent test output
-BDEPEND="
-	test? (
-		|| (
-			dev-python/brotlicffi[${PYTHON_USEDEP}]
-			app-arch/brotli[python,${PYTHON_USEDEP}]
-		)
-		dev-python/trio[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_IGNORE=(
-	# Unpackaged 'databases' dependency
-	tests/test_database.py
-
-	# Unpackaged 'multipart' dependency
-	tests/test_formparsers.py
-)
-
-EPYTEST_DESELECT=(
-	# Unpackaged 'multipart' dependency
-	tests/test_requests.py::test_request_form_urlencoded
-)
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# fix accept-encoding, as new support was added with newer versions
-	sed -e '/accept-encoding/s/",/, br&/' -i tests/test_{websockets,requests}.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/sure/Manifest b/dev-python/sure/Manifest
index de0170914c6f..3613f233de4f 100644
--- a/dev-python/sure/Manifest
+++ b/dev-python/sure/Manifest
@@ -1,4 +1,3 @@
 DIST sure-2.0.0.tar.gz 46747 BLAKE2B 631923bf2fc0a972e276fbfd1918abbafec28e662669993b40ff8ca72944952d092ac662728f98a286fc9b5c8e3765d10a4d6ef1f17b17655802b971b97410af SHA512 8286846374c2bfc773444e90bf4f9c0b0d66d0229afa53af63025bfec690bf8bcc959f86c238ca5244c6a29099e955691771b0eb954af479bde2f17e51f6f1de
-EBUILD sure-2.0.0-r1.ebuild 780 BLAKE2B 4b5627d027c1d48fcfe7a74260cda089678a4bc4d60cd4d017aa8bde47de180cc74a4061fbc7fb7ebf0aa53c1e7819984343d655e9b26c4dd84f05c2e615d2f6 SHA512 2444a14e8036bc4a63bc4a7122dc6eb997ee38c9fab130d814676ecef5293bcf9f192b4a6d2db144ed1b21bd78d0508a6e9ba6649a446003d75a1e3abd82c0fb
-EBUILD sure-2.0.0.ebuild 837 BLAKE2B 2a7e4fc22802a46281ac702ea3f2a11ca8593f37149d23428a34ae384a855dc69e4a6513cdbb9a58ebd2089d39d458d4344b016c0203d8d59b6fbd6f0054c6b7 SHA512 207318358e92724eca2cf9905b27ac531b511db0a07d5117961a31be12945755161f25e644eedb8fc4c31c06d60f5790ea420d34367100e8b5ee96345419be65
+EBUILD sure-2.0.0-r1.ebuild 773 BLAKE2B 06ca39dafc75f7c94b42d52257538c3d60b6892a74486bddfe6b2f158092054c5976d9d310844c66d2451d869ad1d362ee2a2f03c4032d4ac9221da59f95a2ca SHA512 6cd4de4b91c697aa7c4206ea55a97e388087766a65c6d1739c0dac350689f0a30e0e6c4d3226986ee521703299de57889499e64c991ca686a9f27accbc31b0e6
 MISC metadata.xml 583 BLAKE2B 3a551f125c9df8f77a05b69cf54b30d94bace7869decb608b3685e06a7cb9f1462d4e674d06d59d84100e06ee95cce30a68c4777632bb0691397f1e6faaa26ef SHA512 57b87cbde1f34395fbd42bc8f7712aaf193aded2248815cb6919cb51387227f1cab46dd0d1595be9a55bdd131ac554e401366c3740c3d01782b8329a6f8e6588
diff --git a/dev-python/sure/sure-2.0.0-r1.ebuild b/dev-python/sure/sure-2.0.0-r1.ebuild
index 98479e6c8f3b..6fdca046fed5 100644
--- a/dev-python/sure/sure-2.0.0-r1.ebuild
+++ b/dev-python/sure/sure-2.0.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	dev-python/mock[${PYTHON_USEDEP}]
diff --git a/dev-python/sure/sure-2.0.0.ebuild b/dev-python/sure/sure-2.0.0.ebuild
deleted file mode 100644
index 974c93d4926c..000000000000
--- a/dev-python/sure/sure-2.0.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="idiomatic assertion toolkit with human-friendly failure messages"
-HOMEPAGE="https://github.com/gabrielfalcao/sure"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	dev-python/mock[${PYTHON_USEDEP}]
-	>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests nose
-
-src_prepare() {
-	# remove unnecessary dep
-	sed -i -e '/rednose/d' setup.cfg || die
-	# broken test with python 3.10, but when manually run, passes
-	sed -e 's/test_context_is_not_optional/_&/' -i tests/test_old_api.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/svglib/Manifest b/dev-python/svglib/Manifest
index cbbd7c069d28..33e8ce97f9e5 100644
--- a/dev-python/svglib/Manifest
+++ b/dev-python/svglib/Manifest
@@ -1,5 +1,3 @@
-DIST svglib-1.2.1.gh.tar.gz 1261918 BLAKE2B d2c35dfbd45f3c509674e0aa49d015ddc554d1e9d2ccf584a5ada019d9af5e7ee2ccf8c983c30e9107cb83468db6521153fa8340f0dab3b4b1ae5a839628e186 SHA512 361dec376eec6ed9bc52e2217a28e09bcfaab8e302c4ee574a320a8f84963852cfc10d3f6890d379f624a5855122f869eb9698fab89d76018af7bbf70aa587bd
 DIST svglib-1.3.0.gh.tar.gz 1264820 BLAKE2B f53bda781479ddc5d4b04fd122b5141620db81756308973cb283957615711e62623baa74b69af954936be24970a4e4a6f026667c4069d62bf1705a839ecc52f3 SHA512 457fb69ba1c298079888f200502c7099cf5ee674857ff8682948011bf8e1544715e6196544212f5c0ddef1202d04f3f05d01edb4351e673ceae16a85ca0d66e5
-EBUILD svglib-1.2.1.ebuild 876 BLAKE2B 2c678fdbaffb396cc5628d50b71927dffa09adbb2f47b78c42c60a9ac3284d5c59c63bef1447cf9abf7e4d905c1b2cea558b7c5954d92c552e585412b00a3176 SHA512 d30499a623fbd7b12a70793b34050ecc5a04be5555cd37b11b246e6bdc059d08c7ce63f7264146ceee35233d7fa9495b8c3f43b9964be64062f94e6ed112bda9
 EBUILD svglib-1.3.0.ebuild 854 BLAKE2B 8b980d7056d29a7174e92605d345cda90495febc4a9e55f3bd326f3ff44cd444bdfdd43da3904b445b3945c12ce36cc117767ce25c7401e8e7d170f33075b6a0 SHA512 4701a88800bd479183b9b84152d5ca82dbb687e76434df028a38133753296819cbe78c642af81a9040645cfad25cb27f7b2109b8f1610626c58bc6095ef16a49
 MISC metadata.xml 389 BLAKE2B a63a478393f24f78e31793e4ec841749fb600c0d4ae0b71dfb0f63dbd23fdeab7cb531f4e287d97c1b5f65decd8668cabe42eee6f1fac92f40f203a8cc500a70 SHA512 71a266a3fe1432a966fa52a691f1472f269a04e413c52abc7c7264f9acc233abe6ca86c44f35051fb960a7805c62e2ae12ec6e9799e25b2e89f401c6972c15f6
diff --git a/dev-python/svglib/svglib-1.2.1.ebuild b/dev-python/svglib/svglib-1.2.1.ebuild
deleted file mode 100644
index b14fdc7c368f..000000000000
--- a/dev-python/svglib/svglib-1.2.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Pure-Python library for reading and converting SVG"
-HOMEPAGE="https://pypi.org/project/svglib/ https://github.com/deeplook/svglib"
-SRC_URI="
-	https://github.com/deeplook/svglib/archive/v.${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S=${WORKDIR}/${PN}-v.${PV}
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/cssselect2[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/reportlab[${PYTHON_USEDEP}]
-	dev-python/tinycss2[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Needs network access
-	tests/test_samples.py::TestWikipediaFlags::test_convert_pdf
-	tests/test_samples.py::TestW3CSVG::test_convert_pdf_png
-)
diff --git a/dev-python/svgwrite/Manifest b/dev-python/svgwrite/Manifest
index d7fde537f8a0..a39e5b34aeb3 100644
--- a/dev-python/svgwrite/Manifest
+++ b/dev-python/svgwrite/Manifest
@@ -1,6 +1,3 @@
-DIST svgwrite-1.4.1.tar.gz 251446 BLAKE2B 21ca55911f6ac1be949c1a714bb61ac58b4b1c04397b1e9076a626080a8420c18a63afb5989c48c7ba6cb843f73bccebd9bd00ae0b032894096135c0ad366cd8 SHA512 74015ed4a72cd781a577ab8c2f38a30a1f6561ca0379e62ecaac8136f40998c926597d97a0c1006fdab69ac4a23ce1841bda296881ede511f3f1b4a2e8dea06f
 DIST svgwrite-1.4.2.gh.tar.gz 251587 BLAKE2B d375b45fb1ae4c06c4511975777cb5fc25d5bd949853e99c8213b60857992deaf1355d397b7a3377a288892863c6305d1a96892cd2230d9fcaab2bcdc849c7a3 SHA512 bf853da84f24f8d63d045797519d6c02a0e33cbcb549ae2ff09464c35eb85399920a5ffd01e2cd25ebb58b6daf851d6840b7ec927d3573fde02b6ad4e5812ad7
-EBUILD svgwrite-1.4.1-r1.ebuild 652 BLAKE2B ccc1e70e89ecce780b545519b485ca51f91293b8749c8c0cab937c94fe5bea26e8028aeecca6ec322b88ca84a7a9fa16b596ac58a521d2e5b12e076bf4893c7b SHA512 54a2dfc1dab28d2202d01594d1af5138384788572fc34936597304b2d097f8cd36a87f9a3477933ad5f72c786c6b204cc7f87d61076fb0b639fe1d577b0d7c58
-EBUILD svgwrite-1.4.1.ebuild 572 BLAKE2B 5ab2a54c34e83de9b89799b3617ff99072a05e5ab196045291b1f16122eec847c36d783ffd1fc7cd1006657230f29c55e36f89acf65079e62266f21fbf88a6cf SHA512 49856f2fb7f0ce5eddabc80e74dc6a8fa25042062da52f2eabeb9e7ebeb766dea21096586a838031e848cf077a07f457ff5221f3910983110aea2de5e0248049
 EBUILD svgwrite-1.4.2.ebuild 655 BLAKE2B 9140d01e8f8c323f630055e94338c03230052d7e9f12a491a5fe40cc5bdda89af5c07e44f81b288e73c34fc636beec9f48f6e14b77b531970be7e5b4f5198083 SHA512 bf0d7fcbcdc867bca267da4f28f1bab0b4be3225327041b0c1aae120765f2cf3a2c9af593293908445a88c530af97298562677bae3f7926250a71d87016df7f2
 MISC metadata.xml 336 BLAKE2B 7a98647cc502e0dfb0b956344c4987632a27b20c855b787c6cc3bcb204e2cc1b33b51e3d752fe65ca39feee2660c921de36f5a4e6986933ccdd54d2331709c6f SHA512 a82063fce426a8818e0ec7b902e97fcf37a0f10ab81743074fb610a90af612954dbaa091370abbce489b5e4dcde3b97f35086aa2b64b0700c02085b12463ce08
diff --git a/dev-python/svgwrite/svgwrite-1.4.1-r1.ebuild b/dev-python/svgwrite/svgwrite-1.4.1-r1.ebuild
deleted file mode 100644
index 6964d80211b1..000000000000
--- a/dev-python/svgwrite/svgwrite-1.4.1-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Package to write SVG files"
-HOMEPAGE="
-	https://github.com/mozman/svgwrite/
-	https://pypi.org/project/svgwrite/
-"
-SRC_URI="
-	https://github.com/mozman/svgwrite/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# fetches from the Internet
-	sed -i -e 's:test_embed_google_web_font:_&:' \
-		tests/test_style.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/svgwrite/svgwrite-1.4.1.ebuild b/dev-python/svgwrite/svgwrite-1.4.1.ebuild
deleted file mode 100644
index cc4dd367e2ac..000000000000
--- a/dev-python/svgwrite/svgwrite-1.4.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
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Package to write SVG files"
-HOMEPAGE="https://github.com/mozman/svgwrite"
-SRC_URI="https://github.com/mozman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# fetches from the Internet
-	sed -i -e 's:test_embed_google_web_font:_&:' \
-		tests/test_style.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/tappy/Manifest b/dev-python/tappy/Manifest
index 5be313362a26..082c7514b2fd 100644
--- a/dev-python/tappy/Manifest
+++ b/dev-python/tappy/Manifest
@@ -1,4 +1,3 @@
 DIST tap.py-3.1.tar.gz 133208 BLAKE2B a41e4d6e06cfc4283ea8e1df1895569a35d7041721760a16a626d99e60bde0f4b45dc517408b67c893d1eafc3aebe9e7fab4eb158d1e13a0b99a85602beaf440 SHA512 4a3b5c5fb54ee1343cfee9bc154e812066d745c020a2c3391761c3e407b7b8428412c799df4963a385e4563ffe3b31e16055cb76ab5940ab6156e57dcf4a4d3a
-EBUILD tappy-3.1-r1.ebuild 898 BLAKE2B c6e5a0a33d068bfa2abf81f3ba4939f373afb1f6a0a5c673d9dcd27ec2e1adb536ab281da7b6f3f0efd439849cdb983150b60403d43c8093099c1974f281379c SHA512 710b4f89c0b9fb1d5fc0ff8051a5e5b681a819b6760ae41ddcd944b29b7bc17bbed61c61453998a47c185e7569874941f9b3c7439606a9d00f47e243f3eb5fcb
-EBUILD tappy-3.1.ebuild 858 BLAKE2B 5c2c7a596611fdbbf0ab38865b331e78aee7469871d80a607cf08d05874f46d85ea1743725cefc8faee1d28151121842f57acb34eb387d5b55f68e0bb8123cfa SHA512 c625625d2430c7c7a264643198e0e3a2fa32f199554cc0fc9a9d7869a2500dc02650073255276fb2cbe01a9e08d26f790858dfbc14fe4b9861cf1b8170975908
+EBUILD tappy-3.1-r1.ebuild 890 BLAKE2B 08b3749672daef50d84df4ad38a6aad0acfeddfa49504a57f1760efd4e0a46d700b11f1459570a35f970bc8ff615c70b109f81b770a060ec14d0e31f885a2488 SHA512 6a2bc64fc78040add984b6f848f97d259b05cdc3856aac9ad7b018e9a98479849cbb10479cdc98b4c7f09e51e9851b603c93f09aad55cfb2fc040cf14a1f3739
 MISC metadata.xml 368 BLAKE2B 86f05d0c5e93193bdb928c3346c4e9dea9b3fba04afaf4c7417ea2292897248e6f21bce6e05e5183f5e763b19c929dc94e3b4f349d5e56817b58cd030d980adc SHA512 77e683438ccfb0c1866394b4118bbc09ce90144b8635ef9352ef4fcefb24840f2d1df0cfa86ef9032183bd49130fa5d7e1e87c9146cd520045061d730b47b6af
diff --git a/dev-python/tappy/tappy-3.1-r1.ebuild b/dev-python/tappy/tappy-3.1-r1.ebuild
index 9c56610d3352..d8f60d87e9c3 100644
--- a/dev-python/tappy/tappy-3.1-r1.ebuild
+++ b/dev-python/tappy/tappy-3.1-r1.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/${MY_PN}-${PV}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	dev-python/Babel[${PYTHON_USEDEP}]
diff --git a/dev-python/tappy/tappy-3.1.ebuild b/dev-python/tappy/tappy-3.1.ebuild
deleted file mode 100644
index 4e5fca1a66f5..000000000000
--- a/dev-python/tappy/tappy-3.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1 optfeature
-
-MY_PN=tap.py
-DESCRIPTION="Test Anything Protocol (TAP) tools"
-HOMEPAGE="https://github.com/python-tap/tappy https://pypi.org/project/tap.py/"
-SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S=${WORKDIR}/${MY_PN}-${PV}
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	dev-python/Babel[${PYTHON_USEDEP}]
-	test? (
-		dev-python/more-itertools[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx docs
-
-pkg_postinst() {
-	optfeature "YAML blocks associated with test results" \
-		"dev-python/more-itertools dev-python/pyyaml"
-}
diff --git a/dev-python/tekore/Manifest b/dev-python/tekore/Manifest
index 33c3a98d6a64..976281342f1b 100644
--- a/dev-python/tekore/Manifest
+++ b/dev-python/tekore/Manifest
@@ -1,5 +1,3 @@
-DIST tekore-4.3.0.tar.gz 261287 BLAKE2B 1ac6f828e20d2aa4e591a7b53f6178d1c9f8b760d2daa1f7705d7a45bef5a4973b65fffc1f7571b1bce270efc9c4e8c6d9dd258173cdda94b06e92a4c14352a2 SHA512 bb0aafdda47d5ac4baefc3c057b8ae91d3a243d913f332f69d7dc00f716e6403daaf8d8382e9b25d2810fd65e139f6d427b9749746c8ac61d67b02dc24620969
 DIST tekore-4.4.0.gh.tar.gz 261768 BLAKE2B b0da919bd0feb32fa5770eb02cd817142d80f63e29602695b7cc6e9099203e502e61aab816ec3586595ab06f7f493243b13dd98cdb9e89913854e7cfcefcfd61 SHA512 86ef782971f1ea9d9f49e9683b27a8d9f70511e89a7fa7c8cffd01ba716782b1d91adcde2e24a52e42ec5b5b936005545ea1e15b067d1f109d2ecd2cebbd930d
-EBUILD tekore-4.3.0.ebuild 921 BLAKE2B 472bb17fc33863cc3c9dc7213eb3024d73ddf8862248569d1b55f530ebd60ebecb80138e831c377d39d7b0d7945ede1d452edb97ce7cea1090223fb48a03b2ad SHA512 3611ceb2a049f6248c7c50a2c6aa1e31bbab18d4276a0ae5cf2caa3f2c5942c1a443afe29d23b62b2a9112dbe1703bd2f29edbbcc63b4f2e0e41e5a44f6bcee6
 EBUILD tekore-4.4.0.ebuild 966 BLAKE2B 7ef834293663507e03df1e0d169d6d38877f9b0440844a8ae376e6314b9ccf69c3c7647a7a779c0975434e1f5fc9516b897299e9064752eca44eb7cbd0e65446 SHA512 4545bfdbedeb1c8cae1739a0ea21f6f0d37ed25797267cf0f8f4521a3d4dcc0e09eba6b463d4371cff9fa31456ef49171296d227b97c1b161b58add4964718a2
 MISC metadata.xml 513 BLAKE2B c6af854b6f684809ccdf1fbf573013580f9d56ab644913d3a095734867f654ec42b4d694e4197418a20e5fa7291737e14c3189bfad9e5cbe0aa9182db2197af6 SHA512 4d7fa6932a8d832226a080294177e08f7891e39fbd5f379f269268b1c21a8e28129c91f7f2c3b32e56de49c0a2d0a3365a5f57dd7445dd3ce09eae01b21409d9
diff --git a/dev-python/tekore/tekore-4.3.0.ebuild b/dev-python/tekore/tekore-4.3.0.ebuild
deleted file mode 100644
index 9af5c3e33ce6..000000000000
--- a/dev-python/tekore/tekore-4.3.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Spotify Web API client"
-HOMEPAGE="
-	https://tekore.readthedocs.io
-	https://github.com/felix-hilden/tekore
-"
-SRC_URI="https://github.com/felix-hilden/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64"
-SLOT="0"
-
-RDEPEND="
-	<dev-python/httpx-0.23[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/pytest-asyncio-0.17[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( readme.rst )
-
-distutils_enable_tests pytest
-# TODO: package sphinx_codeautolink
-# distutils_enable_sphinx docs/src \
-# 	dev-python/sphinx_rtd_theme \
-# 	dev-python/sphinx-tabs \
-# 	dev-python/sphinx-autodoc-typehints
-
-EPYTEST_DESELECT=(
-	# Internet
-	tests/auth/expiring.py::TestCredentialsOnline::test_bad_arguments_raises_error
-)
diff --git a/dev-python/tempora/Manifest b/dev-python/tempora/Manifest
index e90c96e801b7..3378d04270da 100644
--- a/dev-python/tempora/Manifest
+++ b/dev-python/tempora/Manifest
@@ -1,5 +1,3 @@
-DIST tempora-5.0.0.tar.gz 18532 BLAKE2B f3d59b7d7d2974564b0c7cf25d5bf8716610aa09dd134e37289648e71c4dd6989bfecfafd258da01875de0560cef31fcb8ee0ec85e16d642ff56d10915da6132 SHA512 e95fff8c460329c8369f8f819a95341ec4e1641d2ecc88251c9681ac5e9678eded0f320aa1bff98a980fc552cb214ea3f40c249ea25b54d8fbe34849fffff7b6
 DIST tempora-5.0.1.tar.gz 18456 BLAKE2B b21d60dc8fa5ff9701bbdf66cc9f657c9e4bc779a4a564ea788b201034f818a688c53bcd94f315ef4650b62cce1866fad4a196e2ab724e89670bbc36e9ea15ac SHA512 941b1a231bfae6cf2321325ada785806578643dc9ae215116393623f780de7a409f918c215aae353013bd89c6866ab870ac61470af09f281af0953ce6e20ea3b
-EBUILD tempora-5.0.0.ebuild 908 BLAKE2B f0bc43404b495b39bb57ad95ebf959e1930eff0964f84301d3cfb5df066fea49f9d0f90dfc5025c01db7cc62b74bd6338d357d517e96a7bf3b7e37d3e857dcab SHA512 e329461bf7bdace0d80d9de84a4db1188c14f384ffbfdd3eb0e62229058ec3573fe529aea06286a755cca2508f5a2fd0833ec4bb366ed5e212ad0b372db74cae
-EBUILD tempora-5.0.1.ebuild 847 BLAKE2B 44183584e0285af7212dc87a106abf9d34fb53b0b4a5a23a7402f9a4426e624d7546729d51c2f59e33b623fd21a54255b1546511c647909778a8f4e7707b6dc8 SHA512 92a8fb91a13504545ae3edd848acff3419ef28a57bb5d32ef9bf54530da1986fe36f8e0caf4c0084a1b025632f1757ab057c3625265bcd22c067a0faedb46d53
+EBUILD tempora-5.0.1.ebuild 839 BLAKE2B 7dad3842bad0320e8ef27b0379184c379f5b04ed3132c74b8de567d0d238edfae732d67bc0f9544eb878770dc60369cbbc679d7e2329c271e5e7e6ccd13b5657 SHA512 42507151bc2b9241c5fb02abd141160e0cd2969f81b1a9365e2a7f1ca9894a1256c69ae33e1996b820df16321ffde96c023ab84120566ac510111b6e4793ea76
 MISC metadata.xml 640 BLAKE2B 322432e820c99b65ad749062afc4536889b21fc7d1dd4fd2dd4d4caec382a90d98db38be3ead24136f8a3049b2d68120be72799361a30a6f788facdbdb4706e7 SHA512 4123ddc1643539c3152c6200860ff19f69164aa22c2f040617e9933d2b75737e8e96b9b617341156a8bbcfee579d40e1f17edf56a2759a06646987dce676c238
diff --git a/dev-python/tempora/tempora-5.0.0.ebuild b/dev-python/tempora/tempora-5.0.0.ebuild
deleted file mode 100644
index 90c64ac01635..000000000000
--- a/dev-python/tempora/tempora-5.0.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Objects and routines pertaining to date and time"
-HOMEPAGE="https://github.com/jaraco/tempora"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pytest-freezegun[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	">=dev-python/jaraco-packaging-3.2" \
-	">=dev-python/rst-linker-1.9"
diff --git a/dev-python/tempora/tempora-5.0.1.ebuild b/dev-python/tempora/tempora-5.0.1.ebuild
index b2065f72fa5d..9a7003570d5a 100644
--- a/dev-python/tempora/tempora-5.0.1.ebuild
+++ b/dev-python/tempora/tempora-5.0.1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
diff --git a/dev-python/terminado/Manifest b/dev-python/terminado/Manifest
index f2245c94ae77..a3f9407e355a 100644
--- a/dev-python/terminado/Manifest
+++ b/dev-python/terminado/Manifest
@@ -1,5 +1,3 @@
-DIST terminado-0.13.3.tar.gz 17060 BLAKE2B b91358209f190a831c45b73b06616d6101cda0ffe2768dea2e60e679e631d523335eebde46f721efc304bfdc3b6da329081219f1eb07bd1b306cd53b13465eed SHA512 8dfbf917f4700b1ad8d18a16439d66c0d98e6b115591cc453041d3132c349037fcdab281668519d2af2fa314830fc9d2366030fd69917385e7df23ec87b46a8f
 DIST terminado-0.15.0.tar.gz 29599 BLAKE2B b287e5c28fccbf9116d727e11e0a9d3d89f45a16374c7ee950b30427c8f52064dbb59c36fdb7b4d1457a3526e51254708ee13ef3505303c6052da050460046d1 SHA512 9aa00b7e6d442a7358f007be9d45c6a5326243e64d51a2e9fda863ab5ac8f12b72b1684aed91da376e2c45347635fe64a66da5ff2792b2b15d538080fa6f832b
-EBUILD terminado-0.13.3.ebuild 854 BLAKE2B 075f233ef1482f6abaaa6d1a335a740b2dba48a0e9766ed38473b71eb4420ba70adeabeee93a3ff40eac3ea766e3f7cc4d1278cffce600c199b134692a6776e0 SHA512 de2f711067fc2a9106f9e262029378ff5f5705eb192d30e53d071cf7050c2ecb716bc3c4f610e45ca3e71464468eecf3de8e74a5e340b9f6c1f3006e4c3a126d
-EBUILD terminado-0.15.0.ebuild 839 BLAKE2B 0d60252373866b14cd0d85755be308c796f75f4b00a75549d577dd46e9f7464d933927748c5e5a50fadcb1e6b2e4ed89479db0dbdc90e726cf086de3ab52a046 SHA512 62bc1498cdbfa9f68a44e3aec0577f5c4664267bd13b27f1899de1a7c404c0089d98a1d969ce5fd2c63f69df10171dbf419ad50408cd3941d468e09884716c0a
+EBUILD terminado-0.15.0.ebuild 831 BLAKE2B 71c146d720b86b1a9f0a9125d9e2eb60f33609c3fafc1b385666726e4882b262c7793e83a5f15b7331aacff4a775b127997cf395d9f33bc33e95da357bb643c6 SHA512 e0dfd35003be521b181a1eee3bc12b1c43a0ba39b779448fe7862da32bd4a1d71fcba128706ed6f0a6b0ce31b930dae2f7d1c8ec534903bc5ebf109b06fbbcfd
 MISC metadata.xml 407 BLAKE2B 11da32addf98212561629b99650880eca0a6c057414d8a97f535f40b046c6587d326e3193eab264f439caf38e5d6d8f3f5d1a5891746262494ced39effb2651f SHA512 6c993bf16c0413aea33e06efef79dc6189d3b62b71574fffb2bdce7ddb27b4b12f1d5c0d2a3a80a51ae8894c60efb83a9966cabd53662d358f3f1ec52d27590b
diff --git a/dev-python/terminado/terminado-0.13.3.ebuild b/dev-python/terminado/terminado-0.13.3.ebuild
deleted file mode 100644
index 2e8f8cb8388f..000000000000
--- a/dev-python/terminado/terminado-0.13.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Terminals served to term.js using Tornado websockets"
-HOMEPAGE="https://pypi.org/project/terminado/ https://github.com/jupyter/terminado"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	www-servers/tornado[${PYTHON_USEDEP}]"
-RDEPEND="${BDEPEND}
-	dev-python/ptyprocess[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-src_test() {
-	# workaround new readline defaults
-	echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
-	local -x INPUTRC="${T}"/inputrc
-	distutils-r1_src_test
-}
diff --git a/dev-python/terminado/terminado-0.15.0.ebuild b/dev-python/terminado/terminado-0.15.0.ebuild
index a72ed5e974de..5c0f71ce8180 100644
--- a/dev-python/terminado/terminado-0.15.0.ebuild
+++ b/dev-python/terminado/terminado-0.15.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/ptyprocess[${PYTHON_USEDEP}]
diff --git a/dev-python/texttable/Manifest b/dev-python/texttable/Manifest
index 2a00a2eaadbd..82827b165cc6 100644
--- a/dev-python/texttable/Manifest
+++ b/dev-python/texttable/Manifest
@@ -1,4 +1,3 @@
 DIST texttable-1.6.4.tar.gz 11611 BLAKE2B a97a9beefc9547fe7487af5b6411effd7391e303a13161d7e1c9304a1b580cf47bb10c8649dfea5c6f8ba05bc6c3fd7595662e8b74b282696d9ee3a110746212 SHA512 300b02f5b682f1c09a3eb5abfd4ee9c724354505a3f9e8f68207fd7d244402f234437807d68b6b526c3d4ade9e527e66c921bcd47a5e86d680698d559da3fe1a
-EBUILD texttable-1.6.4-r1.ebuild 694 BLAKE2B fe423e2858af9788edc47301975534429c6679f2a062685484a4fd341f24849de9c196fb5eaf025c6b34f16f808341e86af57cdc584a7c076ffe660621a6c28c SHA512 bc025f28f3282805f9d1a8200a37a6b381fff56611b91ce2cc176b81c92d35d742b371e72fb9dc559cff0dad618802bc3c7d1bf426d011593b2a6c59eebae4b5
-EBUILD texttable-1.6.4.ebuild 659 BLAKE2B 3c62d947889229f01c5bdb5eff363221f9f63facdde893ba9cf57885dfbbd3a0ba88a702cd32a56ff75cd98f25df6d209554d2ce1220b6a3f6960500c955d474 SHA512 857dc931ae7432e85715bf31f71a711f585fa9a0aa9daca8dfc826ddb5b7806d006b1cdc6c74045cc1336dc83607fe61d97fb0165deaad6bcd6a2aa31289e1c8
+EBUILD texttable-1.6.4-r1.ebuild 691 BLAKE2B 87a2345c50c2067a8a22973aa0aa7e3ef7311825b629b8f3ec221aea5049862c33fdc6e0b10fce32e5c43e951bb071e3d0e43b13fe7df99eccb1a52498becbff SHA512 6cdd88c38326a5c7890e641752d7a94874e07cdd5447660268ee5e30a1ed90a3fc73d3842d369d4858b6f4632cff9b9e214144e098fa5dc412f28dc40fc5b85e
 MISC metadata.xml 416 BLAKE2B 5b62e938b6e8769183d1dfc146896dd74166fd18b04c774de1a0f839803fb7f118298ef10524f8bd64d998beaf3c442381cc5575bbae3d0954ebaa51def0b97f SHA512 679d6e3d889b245f143ae2684e97ff97e79be06f0bdf23df9382798ae9b5ad09995ac9c1d020eff057b50040ef8e90d1c3ef3f9ebb62de91490a3d6bb6a7ee95
diff --git a/dev-python/texttable/texttable-1.6.4-r1.ebuild b/dev-python/texttable/texttable-1.6.4-r1.ebuild
index cdbc4ef55175..5639bd1f80f4 100644
--- a/dev-python/texttable/texttable-1.6.4-r1.ebuild
+++ b/dev-python/texttable/texttable-1.6.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/foutaise/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="dev-python/wcwidth[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/texttable/texttable-1.6.4.ebuild b/dev-python/texttable/texttable-1.6.4.ebuild
deleted file mode 100644
index ec0eced974cc..000000000000
--- a/dev-python/texttable/texttable-1.6.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
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Module for creating simple ASCII tables"
-HOMEPAGE="https://github.com/foutaise/texttable https://pypi.org/project/texttable/"
-SRC_URI="https://github.com/foutaise/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND="dev-python/wcwidth[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
-	pytest -vv tests.py || die
-}
-
-pkg_postinst() {
-	optfeature "better wrapping of CJK text" dev-python/cjkwrap
-}
diff --git a/dev-python/thriftpy2/Manifest b/dev-python/thriftpy2/Manifest
index c84e60522a9b..921740daccd9 100644
--- a/dev-python/thriftpy2/Manifest
+++ b/dev-python/thriftpy2/Manifest
@@ -1,3 +1,3 @@
-DIST thriftpy2-0.4.14.tar.gz 127552 BLAKE2B 4061642fb14b60ba53e0c4e6342ead25f781ee923b718a6c557235fcbfe4219b4d8944894afe9783062e7950b689b909af6be5cefe3b634a476ec582adfefbed SHA512 0b248c4999b0a97287d8db3e5b79ac687bc7e25a5478ef125b479e0baf9be9d0aa5f9eaadf0612c228133295743ba913bfe69e7fe59a8d5f854a682da9d31c50
-EBUILD thriftpy2-0.4.14.ebuild 880 BLAKE2B 8b711aa1c10aeedc3e4998f9fb50a3ebbbefa96513b4f7283b75854b961566e51e291847541accf91fd9aff58b0640a7fcff656968c44af8f73191a111fe5e22 SHA512 cb62288b5b9ca13d4bf0739effe56e5dab8c1a727b3a4955ae081e8a0a3e4d6430e6dad8872bb2ab1044e5393287cee345d0e52d17005149da8bc24e857291ff
+DIST thriftpy2-0.4.14.gh.tar.gz 127552 BLAKE2B 4061642fb14b60ba53e0c4e6342ead25f781ee923b718a6c557235fcbfe4219b4d8944894afe9783062e7950b689b909af6be5cefe3b634a476ec582adfefbed SHA512 0b248c4999b0a97287d8db3e5b79ac687bc7e25a5478ef125b479e0baf9be9d0aa5f9eaadf0612c228133295743ba913bfe69e7fe59a8d5f854a682da9d31c50
+EBUILD thriftpy2-0.4.14-r1.ebuild 939 BLAKE2B c4c817d423130a110a4a4b69d18f068f6757b0b443bf9e851486473d2323ed9af9f752cf684e2e32f2caf5ab95b584e18dd8d0795002f4e59d9d47f68d7b94a2 SHA512 36cfc0e63170e2b6308733d0674e16390cc31c2b11b7b68d258cd06e1e6b470a63fcb0326e8dfb006889741ac20b1041d4528155b4d5633cd881e7fd214a5493
 MISC metadata.xml 380 BLAKE2B 570746c7985eab098e590e49d267c406ce02cbf612dda6bf2a60439aee62cbf6eefebac14af29bf5fa52c8b5fd4846b2872beb7034364abb722f706978b55987 SHA512 d20d8641eea699cfa6d1930b8c5a9a8edfe76b5ef837551c52105d2fe8d70d481862c5d5cdbe389971588b3bdf62e9fb7e1cec2e89d635650cbabed7f7f53070
diff --git a/dev-python/thriftpy2/thriftpy2-0.4.14.ebuild b/dev-python/thriftpy2/thriftpy2-0.4.14-r1.ebuild
similarity index 79%
rename from dev-python/thriftpy2/thriftpy2-0.4.14.ebuild
rename to dev-python/thriftpy2/thriftpy2-0.4.14-r1.ebuild
index 16727441076a..d71392dd16a7 100644
--- a/dev-python/thriftpy2/thriftpy2-0.4.14.ebuild
+++ b/dev-python/thriftpy2/thriftpy2-0.4.14-r1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Pure python approach of Apache Thrift"
 HOMEPAGE="https://github.com/Thriftpy/thriftpy2"
-SRC_URI="https://github.com/Thriftpy/thriftpy2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/Thriftpy/thriftpy2/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
@@ -27,7 +27,8 @@ BDEPEND="
 distutils_enable_tests --install pytest
 
 python_prepare_all() {
-	rm tests/test_tornado.py || die
+	# tests that need network access
+	rm tests/test_{tornado,rpc,sslsocket}.py || die
 	distutils-r1_python_prepare_all
 }
 
diff --git a/dev-python/tinycss/Manifest b/dev-python/tinycss/Manifest
index a3453c896f80..b37ecfcd987f 100644
--- a/dev-python/tinycss/Manifest
+++ b/dev-python/tinycss/Manifest
@@ -1,4 +1,3 @@
 DIST tinycss-0.4.tar.gz 87759 BLAKE2B 9b7691f5d5fcfb5580a9f2a0f1f50caea3dba74853917e5e46ca93cab6f35f2f8c4f5babf01d25661d05ef1b26ccc35914750917fb92b394b0ca6530a19f3514 SHA512 13a50332cddc28026fd7ecc007e14085976284e69de6ea93d1013502fd9791694092c010947b13dcd23f3a2df65f277f62410abd90d03eac16fa5af913673b0a
-EBUILD tinycss-0.4-r1.ebuild 754 BLAKE2B 59c12545c2caf1db82435e6630c62407c1e78a995fd1ce2cdd6592684e81c233d319f4467ebb413f033c7fcbb8b9fa6d72929ceb4b72cfb9c829059597d4849a SHA512 01ff20053d197df346cff706def3097b1916c41cb9aefe5f633ded1050b21228224c37f77c6637617fff84ae3eed187f50e5f135639efdadf27f4f10a5ff5fe1
-EBUILD tinycss-0.4.ebuild 720 BLAKE2B 778aff15644d2f751d19ef8d1d388c7e9884a7b45c640f5489885cdbbc545d047ac136a2f0f37e393a09f177765c05c3215f859d3bac99b4a51d7c9f0cfc44e7 SHA512 6a75c8c1f161754830219bd68016d98948d2be03e632ac3fd15a3c7733ab3be1f6fa0ed0af8fc7660a82001e88b864c647fb4b7503708442a1fd4685b0b1d8df
-MISC metadata.xml 406 BLAKE2B e6294e550db6947012bb590235a54e6f2ea8aa29a2ab2a8f925b2290751034a4942c363ce98525cb8e611e351f0038f4c9dde87009f74a72df6f14a88a60c05c SHA512 5998bc429a9e919fbd2a2a793485e07a3ebec6bacb716df0d7c013164def4b7363168a874777d019909feb61de3faa71858a71d4da5e7cc972ce8e665e206381
+EBUILD tinycss-0.4-r1.ebuild 787 BLAKE2B 51c67b3ec9506bf7b9aaddc07e258b7a4a15bc577ba3720729947b8c4567c88a583621a8545b05baa53257f14a4b69930124cf056d303018733ff2f72d8721ff SHA512 2637707e7e610903da8473d7be19d8d0e6041a303f37949b422ea248a2877295418ff9ad4f4267d709fba7b493331c363b8121a8ca2deb2eeb71f8db444dfed1
+MISC metadata.xml 401 BLAKE2B 8e7a198b4bc6c7fd387b1f18e2c76ce8bc2c2f6bfdfc15f1ed6e673caf86010cc66c98dbf9dbc7437e37cba5349954e97a12c065a07776e75728c5064d68caaa SHA512 72f1b22602d53dd54fdab707778add59c221e1451062fdcbc1a76a08c43d9db9254a36e8fa91a87045d533864517947790a015ecfcf6f07f9e370ebcd0457fa5
diff --git a/dev-python/tinycss/metadata.xml b/dev-python/tinycss/metadata.xml
index 06d019ec10f4..73f2cab917ec 100644
--- a/dev-python/tinycss/metadata.xml
+++ b/dev-python/tinycss/metadata.xml
@@ -7,7 +7,7 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">tinycss</remote-id>
-    <remote-id type="github">SimonSapin/tinycss</remote-id>
+    <remote-id type="github">Kozea/tinycss</remote-id>
   </upstream>
   <stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/tinycss/tinycss-0.4-r1.ebuild b/dev-python/tinycss/tinycss-0.4-r1.ebuild
index 2758379e06eb..fe3fda3233c8 100644
--- a/dev-python/tinycss/tinycss-0.4-r1.ebuild
+++ b/dev-python/tinycss/tinycss-0.4-r1.ebuild
@@ -9,15 +9,20 @@ PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="A complete yet simple CSS parser for Python"
-HOMEPAGE="https://github.com/SimonSapin/tinycss/
-	https://tinycss.readthedocs.io/en/latest/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="
+	https://github.com/Kozea/tinycss/
+	https://pypi.org/project/tinycss/
+	https://tinycss.readthedocs.io/en/latest/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
-RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/lxml[${PYTHON_USEDEP}]
+"
 
 DOCS=( CHANGES README.rst )
 
diff --git a/dev-python/tinycss/tinycss-0.4.ebuild b/dev-python/tinycss/tinycss-0.4.ebuild
deleted file mode 100644
index 0a904322af03..000000000000
--- a/dev-python/tinycss/tinycss-0.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A complete yet simple CSS parser for Python"
-HOMEPAGE="https://github.com/SimonSapin/tinycss/
-	https://tinycss.readthedocs.io/en/latest/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
-
-DOCS=( CHANGES README.rst )
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs
-
-python_prepare_all() {
-	rm setup.cfg || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	export TINYCSS_SKIP_SPEEDUPS_TESTS=1
-	epytest ${PN}/tests/test_*.py
-}
diff --git a/dev-python/tlsh/Manifest b/dev-python/tlsh/Manifest
index 37b3cea42943..39394eaead01 100644
--- a/dev-python/tlsh/Manifest
+++ b/dev-python/tlsh/Manifest
@@ -1,4 +1,4 @@
 AUX tlsh-4.8.2-setup-sources.patch 1029 BLAKE2B 6b1a252693940df0856361aa38553a6a684566c4ab80ac4e01b7151a611b5d27bd9065c5560e958931108399b9b860405ab4119615f8f6ab6f8d05e8ce2f4c89 SHA512 04fce865f3a7e73a9a6814596255f86eb1d24086372479ed993b7faa362973808d2d45f4d81506c1bf87bfc534caa410a0c8758250ccb3fa4337c0952610be5e
 DIST tlsh-4.8.2.tar.gz 3345458 BLAKE2B 27d5eece16bb36225b9ae8b3d3a9d055a0f214fffae08a58c39211c3d918dd842497315a62237b291ee1055dfadad78826bbd24f7b9d88f510e9a31f74654039 SHA512 5355c7734f5356a3a7a31ccc078254835871fc0369f1889a34131a0f810735201c68f674eb18e975b6a03a32e5c284899ca9ffdc1f583e42192188c172d2aad0
-EBUILD tlsh-4.8.2.ebuild 779 BLAKE2B d7e467789ce9324ec819aa9f05032b61ac23fac6957e03cc604fc395112398f1416071039fa98293c01d0c9d1305afc0ff637fcfba40404ffea809fd39c4d961 SHA512 c5dee11a485441516ba45f24c74d89f3ae90490db2f4a23f2e69b1ad5b08f92c40f2df0203c81cce687f8ee05c24e9d4ae0139358bcc5f951bad40074de7c7e6
+EBUILD tlsh-4.8.2.ebuild 784 BLAKE2B 790e48411b207a07a865ddfd234ca0997d618d7cb73921727e2d0d702d125f078b226ebae6132b1792121aab6f2fcd7bf97b7368c58e2eaefc50c6e1b8b9ca26 SHA512 84780929c34b98c784a346f0d570e182ef31adc6f79d7b606aa70b23648debbc2eee3e7ba787ed53c598aa0a0fafd36831e4293839fbc05b9e6f3a18a0355745
 MISC metadata.xml 520 BLAKE2B 97d64e94859345f4537e1a95dac94190cf54cf608cc851a8cdf24f5f4b71c0821c778d24f99fb076ed08247a085270d4c36aaa66583916c0a420733b7b8543be SHA512 95dc94ca2c08d71246453ccee139901e675ec84b2c4af224b90057270f4bf5494ffb761e2d3b4dff25cfcac47185d4f7d2f4b3080182f8c9526b746e99519211
diff --git a/dev-python/tlsh/tlsh-4.8.2.ebuild b/dev-python/tlsh/tlsh-4.8.2.ebuild
index 5e91077abfe0..750ce1919ead 100644
--- a/dev-python/tlsh/tlsh-4.8.2.ebuild
+++ b/dev-python/tlsh/tlsh-4.8.2.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${P}/py_ext
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~x86"
 
 DEPEND="dev-libs/tlsh"
 RDEPEND="${DEPEND}"
diff --git a/dev-python/toolz/Manifest b/dev-python/toolz/Manifest
index da5b8cd891b5..2378f5020a7a 100644
--- a/dev-python/toolz/Manifest
+++ b/dev-python/toolz/Manifest
@@ -1,4 +1,3 @@
 DIST toolz-0.11.2.tar.gz 65928 BLAKE2B 3a2baddae437272e8f3efb665b63df127b3ec6bc2a68f3381651a1a3a3b45e4de6e575a328306fac95e9261228ee91193effd4aeca8d115f1608cb2561d50f13 SHA512 67e8aaea3f9fb8811027f19aa9cf56ab980e4f9cea43978ed9515662c78a7bea12314054b2c26da483b055382d4b080125c011fc43bc48b0965a6ff8415f7168
-EBUILD toolz-0.11.2-r1.ebuild 575 BLAKE2B 0d9e3074baa03425a2c68a04e9d99daaa5fb1fb77c948a36583fdb6b08504c63624b3b840837c2fc155abf4ffcc51c6e7e9e3f0abf4d86e89757765190075985 SHA512 f91436f3ade9598d698190bff63917618d46a5cb1aebfe426e6623f2013db6c6e1ee8e57adf1981c64bb777818c1868883f96357395790b60c3d09c6ed620a96
-EBUILD toolz-0.11.2.ebuild 537 BLAKE2B fea45c072b52b5518af6b57699a5785b6907501a15d9e1c6e134db1fd87d35ce2448acee7c443eb91f2bde493811cfba5c136e86d30ad153f05455315548cd7b SHA512 74b612e47928f964258e03b4acfe7157638a06c3a32d88fbeaec8cf206e4be3e7bf05731feb837a6c26ae8ac32c010e872f312860ad28ac708b493e20b0ea0d0
+EBUILD toolz-0.11.2-r1.ebuild 569 BLAKE2B 42632d16de4c9417f045a21688a5a9f815505abf33c2fe8e15a64158df5bfb083c8477c552eef4382682e3dcf27dd2da6cd5bda2c8e8fda73b96261f44d1e520 SHA512 b8e0701a6286997bc3cbc38f44716acf8f18c2bad8508f8da53b814f3f263b6495e9b8217be98e672f7255c1bbff16126c99b776ddfe923519fe3be8c66e9fa3
 MISC metadata.xml 333 BLAKE2B eb9425478d9c8d007d609994b4cb8eb6b6a71dc4ba5f6c25252575a9eb43a8415457e4d51051a65bf1d5a4cfd638a1467258849da0314d5ec54ee3c7e4a7b331 SHA512 9e29b105592f2c423ac284af853060343d60f491f9e468a44859ba2fe491db835fb3fe18ffe74b3135b56b015234c37e824ca6953e56db1cb5c811409f730bc5
diff --git a/dev-python/toolz/toolz-0.11.2-r1.ebuild b/dev-python/toolz/toolz-0.11.2-r1.ebuild
index 0a4c3931ffdc..dfbba8bad86a 100644
--- a/dev-python/toolz/toolz-0.11.2-r1.ebuild
+++ b/dev-python/toolz/toolz-0.11.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	dev-python/versioneer[${PYTHON_USEDEP}]"
diff --git a/dev-python/toolz/toolz-0.11.2.ebuild b/dev-python/toolz/toolz-0.11.2.ebuild
deleted file mode 100644
index fe5b9691cdad..000000000000
--- a/dev-python/toolz/toolz-0.11.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="List processing tools and functional utilities"
-HOMEPAGE="https://pypi.org/project/toolz/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	dev-python/versioneer[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/toposort/Manifest b/dev-python/toposort/Manifest
index f6887e21c7a7..e254dc9166d9 100644
--- a/dev-python/toposort/Manifest
+++ b/dev-python/toposort/Manifest
@@ -1,4 +1,3 @@
 DIST toposort-1.7.tar.gz 10671 BLAKE2B 89da22e803c334cec77d5ac8ad6a9ab8013f7516555c2822bd6d511edf28230c85c2eaeabad3dc4a24a58ae3ce3850d407ad957d0e28491574557140a286843a SHA512 a585d1c103b2162fa3f37f6b0ef60a8709f08d9543d7fab619af3718bf9f752a293e50061d370fd08872b2d8a8db504cb9d9c1cce5446885b46fe8e833813833
 EBUILD toposort-1.7-r1.ebuild 508 BLAKE2B f68c0a9713b45f374f4582aef04c1bc60705738a83bf653f052614b611c04aa4d1ddac45086e29281b62823f0afd080dfee17e68998798c9cb256991e5052cbe SHA512 5ad562f9231d4441fc85c3fbc67f80de4d76d6c3ceea02df72ab5d1544f3efa3fdd1ea8b2c417d78769bc6acf890a7a644fb134039564f60d20df509a76d8261
-EBUILD toposort-1.7.ebuild 521 BLAKE2B 4d6875baf0dc19305bab782173d709fb144efc181bacc452bb6ae45ae78513ba088e75e05a2854bce4089b0a16851b6c342a5edbbd96e30a7857294d708d18af SHA512 b0e5dd3058eaf010a22d2337ad1c9a9fc3169e1410e5e207e0511864524e3b07ea08387d8ed666f338be4eb6650b59275785f52b78ffe2bc594941fc7c8fbc71
 MISC metadata.xml 552 BLAKE2B db94a324a1d469b39cab84355fed6b2f2b76e3e74deb7704d7c2628bfcb280a1e45f3f148de790fe955a238992cdf21c371eded3dadae8499fb7b481e05960a6 SHA512 3e717a075efacf2f6c6e80d8d857f3efb30ddffa856f06fe83581673951f14d662e52e69a868f91daaa3b84f639a97c909eddbd984b8f2a66b0120aa377a001d
diff --git a/dev-python/toposort/toposort-1.7.ebuild b/dev-python/toposort/toposort-1.7.ebuild
deleted file mode 100644
index 3002de7baf9a..000000000000
--- a/dev-python/toposort/toposort-1.7.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Implements a topological sort algorithm"
-HOMEPAGE="https://gitlab.com/ericvsmith/toposort"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-python_test() {
-	"${EPYTHON}" test/test_toposort.py || die
-}
diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index c47d49338341..84afa5206b08 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -1,4 +1,6 @@
 AUX translate-toolkit-3.3.0-no-install-docs.patch 652 BLAKE2B 202cfd408059115cfdb5933320b5a560eeee37e2c045cedcdd80cf808ab1e1a5569a964e9eab8114a2ab27e2c470285b254406c754b5289f7cff2f22afcebb6c SHA512 d98e2d7519ca630d41407d01f20543a84c3f408628832d4e79a5a52437d204f872aaef8eca80687565e6981dddb59480a313217eddf8a4084d8b6d71c3d2c0da
 DIST translate-3.6.2.gh.tar.gz 1152569 BLAKE2B 44c9a5878a177b53d34e48d8b642f293ed475c90de8a530f53462384420b8afaaf107cb62c0cdd45e6d0633f53cd8eedb73dd0dcd81d6f876dc5389ba4230c94 SHA512 fb1fc2f6abb766814269d7051f571cbfb25ecd6b7267e2080e5ab0bb41338ace430a8bb01084abe176e2fd0a934cdf6492bf79f5e27c1f8ce99b021175efcec9
+DIST translate-3.7.0.gh.tar.gz 1152162 BLAKE2B 75d3b0a7f2a840766f983d6e1484aab16de2aa2bab74d0753910be9ad0d1c76ebfa553188318920a7d5a6f1ce6b72e755147eb45c501cdeb79246472c0329449 SHA512 18159f85d94768c32fe5a44f3d3e586038b281a0f3e386621bd57a5be64a9ae21a4272c05de8a2ea2a2467c98935205a8ef49a714dc9aabf9ed21de4f533fb93
 EBUILD translate-toolkit-3.6.2.ebuild 2558 BLAKE2B 05380bb89b9fa0965dc5e07b531322b67964fba289bb3f259b99289dac530d88dddce1fb73edcc42c5a3c02356b40e972fde3870999114931a229745eaf7c6ec SHA512 68d840c4a2364bf3252e589cc93f912a39cb6509648e93045cbb08f43d088d8b10c04d597cbd708e58d0bc19ca44001b84020128f510b088c16fbe2b53207816
+EBUILD translate-toolkit-3.7.0.ebuild 2421 BLAKE2B b5c818ed8fdef983bf87d3103c58e4bb6bbb12a555213d40c40feef74402588db68fdf14caa958aea3f0a8d64ba39af06c46239afd61652c17f409f74a2a2fe2 SHA512 ab76f4b06f9b1e73b2cd83e85e5d82b50b5427327b999735abcd8537d15a2ddf30a43b626d345731e5fb038334acbf69c84c60f3991c2674a91ec23250cd8350
 MISC metadata.xml 756 BLAKE2B 06f64f258d362954f99f7e9eee241eb3dddc6b00b9069df2ad977d28b5cf06f9c8ee2246ee5958600b5ac86297968d7aaced6b6420dca4ed507c441c58c61ca9 SHA512 80374c40513ca450f97e3930929c1450e7438ea15830e60937952a6fccfd999675f2ca2056c5aa4e287ba256c6ec08a09d8f7adb8b2c5af8ca0cd595f34acd85
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.7.0.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.7.0.ebuild
new file mode 100644
index 000000000000..6de2eaa80e92
--- /dev/null
+++ b/dev-python/translate-toolkit/translate-toolkit-3.7.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+MY_P=translate-${PV}
+DESCRIPTION="Toolkit to convert between many translation formats"
+HOMEPAGE="
+	https://github.com/translate/translate/
+	https://pypi.org/project/translate-toolkit/
+"
+SRC_URI="
+	https://github.com/translate/translate/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+html +ical +ini +subtitles +yaml"
+
+RDEPEND="
+	!dev-python/pydiff
+	app-text/iso-codes
+	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
+	dev-python/cheroot[${PYTHON_USEDEP}]
+	>=dev-python/lxml-4.3.1[${PYTHON_USEDEP}]
+	>=dev-python/pycountry-19.8.18[${PYTHON_USEDEP}]
+	>=dev-python/python-levenshtein-0.12.0[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-3[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	sys-devel/gettext
+	html? ( dev-python/utidylib[${PYTHON_USEDEP}] )
+	ical? ( dev-python/vobject[${PYTHON_USEDEP}] )
+	ini? ( >=dev-python/iniparse-0.5[${PYTHON_USEDEP}] )
+	subtitles? ( media-video/gaupol[${PYTHON_USEDEP}] )
+	yaml? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	test? ( dev-python/phply[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx-bootstrap-theme
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Fails with network-sandbox (and even with it off but w/ softer fail)
+		'tests/xliff_conformance/test_xliff_conformance.py::test_open_office_to_xliff'
+		'tests/xliff_conformance/test_xliff_conformance.py::test_po_to_xliff'
+	)
+	local EPYTEST_IGNORE=(
+		# unpackaged fluent.*
+		translate/storage/test_fluent.py
+	)
+
+	if ! use ini; then
+		EPYTEST_IGNORE+=(
+			translate/convert/test_ini2po.py
+			translate/convert/test_po2ini.py
+		)
+	fi
+
+	if ! use subtitles; then
+		EPYTEST_IGNORE+=(
+			translate/storage/test_subtitles.py
+		)
+	fi
+
+	# translate/storage/test_mo.py needs 'pocompile'
+	distutils_install_for_testing
+	epytest
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if ! use html; then
+		rm "${ED}"/usr/bin/{html2po,po2html} || die
+	fi
+	if ! use ical; then
+		rm "${ED}"/usr/bin/{ical2po,po2ical} || die
+	fi
+	if ! use ini; then
+		rm "${ED}"/usr/bin/{ini2po,po2ini} || die
+	fi
+	if ! use subtitles; then
+		rm "${ED}"/usr/bin/{sub2po,po2sub} || die
+	fi
+
+	python_optimize
+}
diff --git a/dev-python/trustme/Manifest b/dev-python/trustme/Manifest
index 6516d169ba6e..f9ca9db8e509 100644
--- a/dev-python/trustme/Manifest
+++ b/dev-python/trustme/Manifest
@@ -1,4 +1,3 @@
 DIST trustme-0.9.0.tar.gz 30081 BLAKE2B 5623fba91f07027032f48ee355b5c4f853518bc6a5c1e93b4ea387ff25838302efa42476db8eb64e364980805aa1c3be97f827260efc31ffb536c53fe30ba988 SHA512 f0d983a4c52374f178c0bf96f758fdb5f132e7f7c4bac187c84fbc8dc82dc36d6c801c340bf8871e872178f7b2ac66d6159b5462d073beec9a13a086f64b58b7
-EBUILD trustme-0.9.0-r1.ebuild 1060 BLAKE2B 9a114235d4af3e5376d84716e8bd5f0ce6544671c203c070e029bfad79f80356365b66d6e10d3ad79818b63c5ecd7c2f50e050ca4359d798340387ca53648c75 SHA512 353e2f9ef0e776391660be9218dbff990a4bd9f2b22171a168d4168338850f8d04d6754002674c0ff4dadda58a67ee231766a763dbe8e2f76796ab8f9a3862af
-EBUILD trustme-0.9.0.ebuild 823 BLAKE2B 0c85647803c6a412d050ab4d511fb1a35fe59e0a5e8e2e62a75537b2d8cf471c39cbd3556584d74ecd235b3d2322ba51f9f81ade6ad6cd83e9aa480a24811a85 SHA512 5437b70a988507ab7d8be7ca9d91c644b318981f0cf330fc31d00e64ff0e8a77bbdb868ab701063e461fb4862ea2cbf8513e44f4268801d38e7428c7aa4ca03c
+EBUILD trustme-0.9.0-r1.ebuild 1052 BLAKE2B ad9bc3f5db5f37ab46b634d01dd8c93936bc33d7ddd22f3bd2364d1a10a44145a3bab6e8441441c0bd1705838e016ebba2cd234d1bb7a6d5bc8fb5a64eb40e63 SHA512 99778298c35e854e4d7533989ecec7bf1ec9098026fbaa9c5dc0e9f9df755032cdf0757475304560dd91243f6341e9899941a7c0e897b93ca39836486488169d
 MISC metadata.xml 444 BLAKE2B a8db99f28b98a6f6c9afa9479e4b568632aa76959c2dcb24b038e72b756d23dd15ed5b0aa408168dc65bcd3733a0ef58ea6b3a1e67a1c93f9d969f43e7d5301e SHA512 32a0d2b8e347a863394c94e23ff25c50ccece6bed2eede6ec0d8a05ee321948e3a79f5b7821ee2fba7276b6259cc55dfbf5b117ce74d87ae32bb655e95674cf9
diff --git a/dev-python/trustme/trustme-0.9.0-r1.ebuild b/dev-python/trustme/trustme-0.9.0-r1.ebuild
index c6eeb075eca5..1f3c50321641 100644
--- a/dev-python/trustme/trustme-0.9.0-r1.ebuild
+++ b/dev-python/trustme/trustme-0.9.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/trustme/trustme-0.9.0.ebuild b/dev-python/trustme/trustme-0.9.0.ebuild
deleted file mode 100644
index 62cfaeaa9269..000000000000
--- a/dev-python/trustme/trustme-0.9.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="#1 quality TLS certs while you wait, for the discerning tester"
-HOMEPAGE="https://github.com/python-trio/trustme"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 MIT )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/tubes/Manifest b/dev-python/tubes/Manifest
index 6e5a9277e003..2cfd84807a67 100644
--- a/dev-python/tubes/Manifest
+++ b/dev-python/tubes/Manifest
@@ -1,6 +1,3 @@
-AUX remove-unnecessary-dep.patch 555 BLAKE2B 9e5df1bd6bf31d7081361ca67fcc3a439d2544a6d8bd8371c3f8b040d97579c192624d6599a6ddd4e4fd73e577dd3d29ebb5c6506d02e4b33d9b95ae74c98030 SHA512 d71688663468110b1e7eef0b536e7c4545894992f46963186c98c50ad5a4e305a536eff743ff9b6d17b8aad748ed3154aca200eeed82b53eb29063a37893c073
-DIST tubes-0.2.0.tar.gz 64284 BLAKE2B fb8e196a2e68998e5e63c7c5e001d4b8baffb049bb4bedc8f8eb44117ab6a699e54a0dc96071cea8eec7db7a49316a01f6c259d2e456443a1014d9d4fc25d007 SHA512 6039a3059b61f8a0c84d4e10bb47d9f2bb95505b0353cb0f1eefb6942f0ad0d88c9b02ff0d48ed0300d615d3e3203c5e884990cd6d006c2f1dbd18b88fcb2e9e
 DIST tubes-0.2.1.gh.tar.gz 66899 BLAKE2B 21127cf21336b6bbd2acf794bb503a987f7fae63defc7de04d554c7f55f617a23daae105ef756fdf5e8e1b208907388745c6485179f9010339de717853ea8b08 SHA512 6f4666f1591c96d0d7f0514f511ad700f6c3976fcf561f0d967f26aead089e682540b74f85b26a68ff6877d5d7775654c9f6959d8a41c25804375ca837ac1815
-EBUILD tubes-0.2.0-r1.ebuild 619 BLAKE2B 84a64ac84310e3f7cb9e4258ae2a640f9a5fed3d657a9291644e8ebcc3db3349650216179b671e6f7e36ad0d20caa29c19c798fbaa3f06affe95f58954d1ab3f SHA512 f2cf22e80dde86c21e65b4fa36c1924a79833d80a175f66c1e1770ed4a7fd33f1ff039a7d7932206a5749db88eb13397cea37ab255648121f0defce60a4897d2
 EBUILD tubes-0.2.1.ebuild 610 BLAKE2B a865eb82ccb9276f4982fe2c25d7322c92fad919012f744e68e41ff6c1c7d4ff4d41952af7ca81e99c9f401d19710402862da2c3f5237acc6b0e4e1a12c4ca88 SHA512 f07a17b73d61eb95543ca55a3df73d5bb2fc1a487b8446984b783f115b51e77897e685c2655b040e367aaf3992764b5364bc7753fd99371aec46044d0d0bd842
 MISC metadata.xml 761 BLAKE2B ef257b921d8ff36da6eb239ee72ae9f85a9ee01b58e54c0028d5b741f964a08a25acd39514615df05af1e1ce0873f579c99d83ab89224dcc3798f22982632c9a SHA512 e1f031965ba85c371d71ae68eb2e7e9926058a153ea1ab2db5bead6a3db9a0edfbbb12a9f229f991b244943fb59729ccb36f7a10bb4d06dee06e47cf58e8b5da
diff --git a/dev-python/tubes/files/remove-unnecessary-dep.patch b/dev-python/tubes/files/remove-unnecessary-dep.patch
deleted file mode 100644
index 678f3c27abd8..000000000000
--- a/dev-python/tubes/files/remove-unnecessary-dep.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 2c05dd8f27c97ebbfea18706ff54d2406448b09a Mon Sep 17 00:00:00 2001
-From: Glyph <glyph@twistedmatrix.com>
-Date: Tue, 3 Mar 2020 01:24:13 -0800
-Subject: [PATCH] remove unnecessary dependency
-
----
- setup.py | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index c647927..e9e3134 100644
---- a/setup.py
-+++ b/setup.py
-@@ -16,7 +16,6 @@ setup(
-     packages=find_packages(exclude=[]),
-     package_dir={'tubes': 'tubes'},
-     install_requires=[
--        "characteristic",
-         "six",
-         "Twisted",
-     ],
---
-libgit2 1.0.1
-
diff --git a/dev-python/tubes/tubes-0.2.0-r1.ebuild b/dev-python/tubes/tubes-0.2.0-r1.ebuild
deleted file mode 100644
index 2263c3fe0e1b..000000000000
--- a/dev-python/tubes/tubes-0.2.0-r1.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
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Flow control and backpressure for event-driven applications"
-HOMEPAGE="https://github.com/twisted/tubes https://pypi.org/project/Tubes/"
-SRC_URI="https://github.com/twisted/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/twisted[${PYTHON_USEDEP}]
-"
-
-PATCHES=( "${FILESDIR}/remove-unnecessary-dep.patch")
-
-distutils_enable_tests pytest
diff --git a/dev-python/ubelt/Manifest b/dev-python/ubelt/Manifest
index 60c899bd1136..ee3164d49fa2 100644
--- a/dev-python/ubelt/Manifest
+++ b/dev-python/ubelt/Manifest
@@ -1,7 +1,3 @@
-DIST ubelt-1.0.1.tar.gz 242552 BLAKE2B da4ceb039b926f942c593563e77b42ebfb39a75bfc2953a6eadf2430bda8ebe25faeb4a00714fc110486715da15515fa316d3705d9853a7eb93320ee694d1127 SHA512 150f1c76b5814441fe0bfd50017f37ede4d463cc4e23f152ac634e7531d83f28560415ad26527cd40a7ebdab546d7edd711a1ba0c728ef63791219bf4866099c
-DIST ubelt-1.1.0.gh.tar.gz 259127 BLAKE2B 064b106d5f03b106828079e024c3845ed55077f6bc4a69be4a7d05aa803b172104f2271626c9ab287b7b225711eb6490b49f0fa69f24729899e62a094069de16 SHA512 5a256f91d70ff218e595b852de11080f31ddd8ba29cc67a4a38f4c85ae69c0bda23c494d117926290901c5e6267b2d5eb2fc440951e0b598cca23cca6bf45c79
 DIST ubelt-1.1.1.gh.tar.gz 263082 BLAKE2B c146cfa7084b1d04d5a16443e5f8bdd4858992c2de1ff68a28c0febc74728da6320f45661cea69f88530a2fb88ca421cfc103f7f9f6ff420cf65152cbd61576d SHA512 d4d77013920563f3b2e5f47365624a4a794d84047eeb2eccaf2888f8d574c38b047393e550399e0d7ea7df373dabd40acce05ac56db4f0099da8f2a39113fc5c
-EBUILD ubelt-1.0.1.ebuild 663 BLAKE2B 179ce7bff10f356c1c1e3c1906756388b70fc1aa61386ad10905102198bda4e3e4815f2202285c99f44ea93b2325fe4326600f8e59d8a393dacd4c0f730741cf SHA512 3d3e9511114beb1011b5ee2206a385e2bb9b3be9c800186d8f54f48bcfb583068e16b45cfe314c4996cafc33e0460c282f1413344674f08053fb9b24fee3dab1
-EBUILD ubelt-1.1.0.ebuild 987 BLAKE2B 5bacc39c95c2071f6cd18981f2b72ebe752be7ae86917f3aae717bfb0e927bc9d2f09d678a3b5762af8a037aeb34dfdcbb6a872513ee6e6fe86f69986d04d7d1 SHA512 4efa99735b58a04c0991bfaddea498f2190e1743dc99c152f1678170e6c5554c7cb6449168fe913d8aec9cda500805afbf3fafa517c242e3f88b45d8362e93ba
 EBUILD ubelt-1.1.1.ebuild 910 BLAKE2B e54c0a82b1b0b881cb42008ec7ed95fe931ec28bf910562fbf8c98f980ada79a2c61f9735e1bc50cbd8d4bbffe5ad2a91a2207c3463e7c8740a271ce3392b668 SHA512 bae44559a7367a187d032c306920c41382ad7f912a8319ae922de94caa5fdac9319a016c8da0f034214d13b61f2b698485d238ed5e7e3c9b050d1a765f976e39
 MISC metadata.xml 423 BLAKE2B 3327e3ecc16b8971759b84617779a2b4d5072a34547815c8314809a911e6d557fdea620c90a255ef7f89cb2c941a46a7e1dcbc62e5e6b46f19255758f42890fc SHA512 967c14f809f73fc1bb48d730406512d3f87531486701ad4be8dfb4e5cd0c1265c082596768d36c4950734c653cec56484fb3e5b79ce13dddde38977f88889124
diff --git a/dev-python/ubelt/ubelt-1.0.1.ebuild b/dev-python/ubelt/ubelt-1.0.1.ebuild
deleted file mode 100644
index 0e9c2987b85a..000000000000
--- a/dev-python/ubelt/ubelt-1.0.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A stdlib like feel, and extra batteries. Hashing, Caching, Timing, Progress"
-HOMEPAGE="https://github.com/Erotemic/ubelt"
-SRC_URI="https://github.com/Erotemic/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="test? ( dev-python/xdoctest[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# relies on passwd home being equal to ${HOME}
-	ubelt/util_path.py::userhome:0
-)
diff --git a/dev-python/ubelt/ubelt-1.1.0.ebuild b/dev-python/ubelt/ubelt-1.1.0.ebuild
deleted file mode 100644
index 1034f123c01b..000000000000
--- a/dev-python/ubelt/ubelt-1.1.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A stdlib like feel, and extra batteries. Hashing, Caching, Timing, Progress"
-HOMEPAGE="
-	https://github.com/Erotemic/ubelt/
-	https://pypi.org/project/ubelt/
-"
-SRC_URI="
-	https://github.com/Erotemic/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	test? (
-		>=dev-python/numpy-1.19.2[${PYTHON_USEDEP}]
-		>=dev-python/pygments-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
-		dev-python/xdoctest[${PYTHON_USEDEP}]
-		>=dev-python/xxhash-1.0.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# relies on passwd home being equal to ${HOME}
-	ubelt/util_path.py::userhome:0
-	# relies on which(1), not worth the dep
-	ubelt/util_platform.py::find_exe:0
-)
diff --git a/dev-python/ukkonen/Manifest b/dev-python/ukkonen/Manifest
index 20be5aef1508..90a88a24984c 100644
--- a/dev-python/ukkonen/Manifest
+++ b/dev-python/ukkonen/Manifest
@@ -1,5 +1,4 @@
 AUX ukkonen-1.0.1-musl-include.patch 427 BLAKE2B 23170cd4a78ddd157d1230c2a072180a472394a06ce7afa702c1ed0bdafccea726405387dc65bd963cb8a6e7ea21cc7179fc4b9d36622f28952ea6c0aa003760 SHA512 4146508c56ecbe4edc3f77a92536098f93152e8cd68a0c710a2af7a6ded357795a5cc015b31cc198f66939e9cf0a258cc9db41a0458209ec0458bd19332b1494
 DIST ukkonen-1.0.1.gh.tar.gz 4547 BLAKE2B e574f21c0e26751e48d16409747b1979ae903c0cd812d52b1715eaa2025cf21c9d24aa3963de61c6ef4126eb4ace8fe974966e768d05c5db8372e0ae96941123 SHA512 23978b8e22454155e7d8a0d2dbb963f4aa5a6be6cdd75a74e8ec5e06fe32a96b6fc14f0f6d03089726bf761ad6d833dc68ea3fb6cad1ad2ee5b259043072875a
-EBUILD ukkonen-1.0.1-r1.ebuild 716 BLAKE2B 3d32f825db6bcc57194caabbf4a6a0faf85161a6bc08295306b72971e5c10f65fd896836d84bb87d82a9e366379c35a0548b2012926535fbcc01c719fa679f85 SHA512 5858872c921a8d76894992ce36d73cee32f317862882a4cd725d9115586b76c167a2294a900cb2d172db18111e191e4fd1fc1e06abaae647a5521e0ba2729210
-EBUILD ukkonen-1.0.1.ebuild 677 BLAKE2B 5e54f75ff39a2843230d107950f9e11416709a1cbc4164a4a4fb278c78d40be4dc3158b01612f2fc625b38e427322686a4f04b518cb36decb2be4515d954004c SHA512 5eedec0bb864ce87bfaa444d61e74bc340dfa0058b664c68172fd58bca7817b0a68123d4f3a9dc7ee9576cdccbcc0b556b5531fd81c838032638abb04cbc32b8
+EBUILD ukkonen-1.0.1-r1.ebuild 714 BLAKE2B 51b09fe710b9e0eaacc6af5723954771788d99eee68d580fb24015c452d950dbe20a2824ae1328412e57aeaa8ee2710a53e6c3061b88fbf0ed175c740e29df2d SHA512 c1409ab1635fd16efbb955bb35c0b495327881b7b29aea26b421e99a128fd80a05acdbe7e24545671695cc7b97d0c6064dd4b646353629b7ae552686856d4d82
 MISC metadata.xml 345 BLAKE2B 316467291e5dee76baeaaed62a17e6c5e6216dc8eec5ffbd0fe7465e8c70cd47a2b1ec0c15f082c4bc17a1794ebfec01ab65d6260b0bb6d7af9830e0233e379b SHA512 891214a8416169a7cffc49b0682d1e2e471da4683a7dd528da6d75045d11d16c18fe4bc9ad0c883fbe4a877878e7a0434af1244353910ccc3aa1c193fc2d7a16
diff --git a/dev-python/ukkonen/ukkonen-1.0.1-r1.ebuild b/dev-python/ukkonen/ukkonen-1.0.1-r1.ebuild
index a7464b53734a..f01ec2986b4c 100644
--- a/dev-python/ukkonen/ukkonen-1.0.1-r1.ebuild
+++ b/dev-python/ukkonen/ukkonen-1.0.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/ukkonen/ukkonen-1.0.1.ebuild b/dev-python/ukkonen/ukkonen-1.0.1.ebuild
deleted file mode 100644
index 1fbfd7a8edd0..000000000000
--- a/dev-python/ukkonen/ukkonen-1.0.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Implementation of bounded Levenshtein distance (Ukkonen)"
-HOMEPAGE="
-	https://pypi.org/project/ukkonen/
-	https://github.com/asottile/ukkonen/"
-SRC_URI="
-	https://github.com/asottile/ukkonen/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~riscv x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/cffi[${PYTHON_USEDEP}]
-	' 'python*')"
-BDEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-musl-include.patch
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/untangle/Manifest b/dev-python/untangle/Manifest
index 395d84a07d01..2a80196193e4 100644
--- a/dev-python/untangle/Manifest
+++ b/dev-python/untangle/Manifest
@@ -1,4 +1,3 @@
 DIST untangle-1.1.1.tar.gz 3089 BLAKE2B d8b8ffe1adb2acbcdcde8e6f67231315b9f318c9e8e1496dfa23b0ac6dd68651e75e2d2e67f6d7d521002ad6b0e9c4cc30c155685b9df60b6b223d137add0632 SHA512 252c3d0ed8d004660adad8f37a179a4d1b2b46e9d7127aee59b596eac3f65684a7a8b5b881bec97ddaf5470aa678df407b903209eaa069a40f53dc2dde9a94b2
-EBUILD untangle-1.1.1-r1.ebuild 473 BLAKE2B 17ad87c53a78e92ea5d773065b51a348d2e02d805063da0135001784f6b22046558d6ceebb1d39b0379652654a826f805e5b694aecb179c75f0cf85e862ff648 SHA512 c083947f6f3e53050040b9bdb36781e505e898f78f98c1e809f66f72a97fe3aab4fd6d66a7263b189e60d9a6d4fb146bd835413fd8c9bc43f0a8f07115c57b64
-EBUILD untangle-1.1.1.ebuild 433 BLAKE2B f9bd5c9c7b3cf9a3f99e33e8f061d29fd5ceb065dfd7a4b1fd886d01146c7f33399d06fa4b3e77882c776855a44fce311114e9ddd3b1f9e08894106a43995110 SHA512 2ee871dad33285537b050d511801df36993f67bc821e300c355a7d1bbea85b21f5d27d4e2924ed6a5c6dc324eed9d3e7dc171a4838433b762af3d997958eb2d0
+EBUILD untangle-1.1.1-r1.ebuild 465 BLAKE2B cbc207a7f31822265c858cdb9d8278ab3a96aef3ad7e373fffc4705cc6c412ee795d006522a9ed3d76ebc63e67e0f2b96cbf70828cbc501cd9c6a98c2b5caabe SHA512 70b45081f1ac73df3d5bff701d0357e2b65e8a154d3ff9e12339b1caab4a9ffa02e50e7d134b6fbd7e8d8318c8eab9ce77c973adc964be193a24092773133ed0
 MISC metadata.xml 405 BLAKE2B cd3f424ecb68f2eb04d98d92282d7b1b486fac1b341d2febbf8f493d7f503b2831a4f1c6f9796d052676388d3a9b283de48893403477f05da6e96cc488ef2b37 SHA512 e7f7e07b58ac27d0b540220b43b0127ce626a3cf4c9a6524587437cac797f292a33a6cf10e56bc2db68b3835df42a7f5051981dc984d2cccbfa6d151f004b13c
diff --git a/dev-python/untangle/untangle-1.1.1-r1.ebuild b/dev-python/untangle/untangle-1.1.1-r1.ebuild
index 2fe1aee88515..0f7f47c3b9cd 100644
--- a/dev-python/untangle/untangle-1.1.1-r1.ebuild
+++ b/dev-python/untangle/untangle-1.1.1-r1.ebuild
@@ -14,4 +14,4 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/dev-python/untangle/untangle-1.1.1.ebuild b/dev-python/untangle/untangle-1.1.1.ebuild
deleted file mode 100644
index d0db794f674e..000000000000
--- a/dev-python/untangle/untangle-1.1.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Convert XML documents into Python objects"
-HOMEPAGE="https://github.com/stchris/untangle"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/dev-python/uritemplate/Manifest b/dev-python/uritemplate/Manifest
index 453bb5169b76..ad45d924a93a 100644
--- a/dev-python/uritemplate/Manifest
+++ b/dev-python/uritemplate/Manifest
@@ -1,5 +1,5 @@
 DIST uritemplate-4.1.0.tar.gz 273924 BLAKE2B b21115c6db8f94c635dda1033b4650dd7d2d54b6f52f51bff31ae8cf89e0b3dbcfc1bd029eadc68f5f94eecbd167eabc652c24be6f0bb807beecb5f254520626 SHA512 e62812a4e9ff315a1b06ba9e88f3dd47aea8353cae4ead9ce7bf59b65c83cd6ae7c973cb29b8ddc25266c264f229df8f2d9e982ab489f2f37a5dbd460b87a5e0
 DIST uritemplate-4.1.1.tar.gz 273898 BLAKE2B 08a9179da7ccdb8b6d1a85ccf34f44f8282e6b5a00ddea541364272816588c238f4f8f960a197a7e8074607bcb8d1b52226740bddf0b92fb3751cb2d4b8fad51 SHA512 7682c7dcd9c8d4428b047e3adbc283b78f755face4d8dd1b0cd11df9583bd0435543640ba79229d436aeecad2b5b29684befdccc84ba71f72769ee130cb6576a
 EBUILD uritemplate-4.1.0.ebuild 513 BLAKE2B ce36068850d1c9eac5e40bf3ae1cbacd84d118e8ec43f997e2278c2e03ec2cc4352f4571bba6be10b26012ded5e389574e3bf61080a4d1661ec797e27364c25f SHA512 bcaee804d03a8a9e6ab86d4673af16f6fc6677f22fe013f4d9f56dcfd88fc148631ce894d594238cf9901d6d54a405ca4774edd1c6683b5ebe404f5558e0490c
-EBUILD uritemplate-4.1.1.ebuild 650 BLAKE2B 39bf9edb1e26f905a82a6889d40fd063498ae97af480d1bbc4db634a1aaedecda76367b1f64e1d398b74b8c79a14c6878142388da732776700b813c4fe397805 SHA512 9ff98cb2da95f29feba381986987409c38fbb08c84a3236a35e8935e569d49880d32ae891ac7002ecf58c25ff024bf493f4aaddf8992e29337ebee201bc2e2e6
+EBUILD uritemplate-4.1.1.ebuild 644 BLAKE2B 3d727893430586da02d2e710b5f9d47f7634d81a94b1a7e24a0db8808385db50c44ed8a3a727c9591841e46611305069c494f13f751215bdb28217681df7f620 SHA512 156dd4112e2a3c597e30083c5a026cf8d0d15476ba80a238ceecbe894b22d2ddfcc35612f2311fecb61ad3c58073b58c4cc37ac5ba3faddb77e599ec9f9df3dc
 MISC metadata.xml 391 BLAKE2B 3d72ae9fdba0af92def6107d3ef88d5ab86c93d6339ce7fbedc4753d2b3c5895759b52149f89aff878b95a233e542c59788ea211b0dfa3cd1b26f5b1e8928d5e SHA512 43c40af393e160f826012162f8d7c3c03171ba07603b8ac9e43d89997c564bdb841185d6ff7d6486a7f84bcecc0901292cf4798f582fc69697077b8f8a256736
diff --git a/dev-python/uritemplate/uritemplate-4.1.1.ebuild b/dev-python/uritemplate/uritemplate-4.1.1.ebuild
index 7dcfb0651d29..3a9f110a4ac4 100644
--- a/dev-python/uritemplate/uritemplate-4.1.1.ebuild
+++ b/dev-python/uritemplate/uritemplate-4.1.1.ebuild
@@ -18,6 +18,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index a008d464d7dd..70eaf2a384b7 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,4 +1,3 @@
 DIST urllib3-1.26.9.tar.gz 295258 BLAKE2B 1c6b51e4243c18c25bcb53158e645ea71fe33e0d09ca029256bcbe05bf178ba600dd8911c71730bdefc3cf9f65cdfd5740f579d17d293f9ac7c5d3cbff478b6f SHA512 ac384291b02516dee781c98182625356ac7bc03972612577de5286e159cf161b541cc610b103e0eec1c9f40503049b41e972a9e0998fcd834efe2f40af0e7394
-EBUILD urllib3-1.26.9-r1.ebuild 2003 BLAKE2B 6e32fcf8cfb0eb0aeaaab4850fa290dd30fb14089678886c0057c8dd5020c414b947b0eb8383dce2d95b7ffc1e371a864d4887262fb137b0c5a751168141d7b9 SHA512 35b3062ab361a0eacdf5bf0e4f232f6f5233b1f0bfc2357c7a04322d1b5f1354ebe4f9d58ac52bdb94bfc662aec7277f9e3683ed612889734fa7e7934e813b3e
-EBUILD urllib3-1.26.9.ebuild 1924 BLAKE2B 056029f71386bf470238cbe71d1944990133f480167458c9c07a416742c1177d04379adccf15eda5e8c337f1d8af45b97beeebf825e497af40668747dbd71502 SHA512 f499f5762b9afec0657ab2ab6f49c8864ab7e8f1fa057a13683c71f4f18e309fb4b90436c0f5fa5995edeff2bab303908c039a9f7ef90557608a96a276dad5bd
+EBUILD urllib3-1.26.9-r1.ebuild 1995 BLAKE2B 195f3894043de74349f8936f6e12ff0c9e6072cb587f2e5bc5079c912f82e30a1bea81bb26be3f5e409cf2b9fa22a494f0abc698f5c84049543965d8cb4224b8 SHA512 e203923950d8907279428ff7a4bfcf23f777232648a236e6b9b9a3d414e91b6abd906e1fd8b95d83468f6ee4c0750335e15056acead350df687b24665b2cfdce
 MISC metadata.xml 531 BLAKE2B 3ddfea4b8817c827437a79abae8cf4e9cda95addb1c6505ef13018587720bba0cf0788041c0b4cc8b25f319e7cb1c94117ae25b3cbb567f24373e8e89bedaa7b SHA512 7e7191f0338c4c47f01bdceb3d2c6ed94de2241e77fb3be6cbf3ecf8a0682730392a9ee5adf24304d9a322acc06bd84f4f90f1dddcb258cb2e9ba0de9952b693
diff --git a/dev-python/urllib3/urllib3-1.26.9-r1.ebuild b/dev-python/urllib3/urllib3-1.26.9-r1.ebuild
index 4bfc51d75d66..6748aa50836e 100644
--- a/dev-python/urllib3/urllib3-1.26.9-r1.ebuild
+++ b/dev-python/urllib3/urllib3-1.26.9-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="brotli test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/urllib3/urllib3-1.26.9.ebuild b/dev-python/urllib3/urllib3-1.26.9.ebuild
deleted file mode 100644
index 11ae4683d2ad..000000000000
--- a/dev-python/urllib3/urllib3-1.26.9.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
-HOMEPAGE="https://github.com/urllib3/urllib3"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="brotli test"
-RESTRICT="!test? ( test )"
-
-# dev-python/{pyopenssl,cryptography,idna,certifi} are optional runtime
-# dependencies. Do not add them to RDEPEND. They should be unnecessary with
-# modern versions of python (>= 3.2).
-RDEPEND="
-	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
-	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
-	brotli? ( dev-python/brotlicffi[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep "
-			${RDEPEND}
-			dev-python/brotlicffi[\${PYTHON_USEDEP}]
-			dev-python/mock[\${PYTHON_USEDEP}]
-			dev-python/pytest[\${PYTHON_USEDEP}]
-			dev-python/pytest-freezegun[\${PYTHON_USEDEP}]
-			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
-			>=www-servers/tornado-4.2.1[\${PYTHON_USEDEP}]
-		" python3_{8..10})
-	)
-"
-
-python_test() {
-	local -x CI=1
-	# FIXME: get tornado ported
-	# please keep in sync with BDEPEND!
-	if ! has "${EPYTHON}" python3.{8..10}; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# TODO?
-		test/contrib/test_pyopenssl.py::TestHTTPS_TLSv1_3::test_verified
-		test/with_dummyserver/test_socketlevel.py::TestSocketClosing::test_timeout_errors_cause_retries
-		test/with_dummyserver/test_proxy_poolmanager.py::TestHTTPProxyManager::test_proxy_verified_warning
-	)
-
-	epytest
-}
diff --git a/dev-python/urwid/Manifest b/dev-python/urwid/Manifest
index c1c2681073b1..640bec88050f 100644
--- a/dev-python/urwid/Manifest
+++ b/dev-python/urwid/Manifest
@@ -1,4 +1,4 @@
 DIST urwid-2.1.2.tar.gz 634621 BLAKE2B ce274820c27708fd0b10f22359923316576b895f6888c9b174b42dedcd551353b6c3ba797c68d61a082ecf23b8f0108a58454bdb44806e33b74d9e6e5bd28537 SHA512 f102bdde5f5d39d4bce455020bbe4f18290589da0750a3b15b1e2bc8acf8a405f02295d7efa3009877801a36bfbfade92ec963086122e9b133db137d816a1ea5
-EBUILD urwid-2.1.2-r1.ebuild 1196 BLAKE2B 6fac75491c7212ecd5f15b0c6341d210bd46bd9cf78b3069945396e96ab7985819216ce21775bfb22cae361767b7b38191326952f703d6fc61d6faa7df6134eb SHA512 c06758554a9910d6839f442566b838355164244f84e6c405b84b3f8d468144db84966cf98519f48f2d2c4c3b6c991faba539906cf912c158cde684add6996971
+EBUILD urwid-2.1.2-r1.ebuild 1193 BLAKE2B aa70dce120a051c053926bd292c97f3f088bb3e7b922c559e7edf375e8c34a25ffe60baeab2da5a9066a8cdbd1c114fe5cc01013a246126a1b124df9fa64dd75 SHA512 bb5f2a91a37f7cd2eede6ce7e64dcc44c3f9a1cd53f976d54e0b4204c986c831c70b7f25e3e9c4f91365e18a3fc1b6b65c0ae4bc789b789f87bac1c549dcd398
 EBUILD urwid-2.1.2.ebuild 1160 BLAKE2B 93edcc0d3f078c320dcadcb1da9112e723debd20e3187efb07686379dc2800e21106f0f1bfc199ec00a227209f3e5913b9e33a7202d50d08469d9fb02d2e93df SHA512 1c374995e430211ec79d4f79addad30e768cb868641fcf8a24a32119b94768930d55a8bb704dd067ce6abf7e8b4b1665248b39b4b0e3c7ef0e75f80eee969c29
 MISC metadata.xml 1194 BLAKE2B 387c1e6ca71806f706b054e11755e885c7bbe11e6be1b639a6160e0b2c51df91feef025f6166a973a38e8ad16fe7627ba6f2b5e293c007da8a1e32e46db1541d SHA512 ee6bb39746fdfe3ebcc83304cb9d7c7cce16f4caca284bd82907fd13672bdcf982f1fbfba22b0877da8de9f6cdadc4045916eff678095320745eab954960ab6f
diff --git a/dev-python/urwid/urwid-2.1.2-r1.ebuild b/dev-python/urwid/urwid-2.1.2-r1.ebuild
index 130be6fc659b..fb444138ecd9 100644
--- a/dev-python/urwid/urwid-2.1.2-r1.ebuild
+++ b/dev-python/urwid/urwid-2.1.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~mips ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 distutils_enable_sphinx docs
diff --git a/dev-python/validators/Manifest b/dev-python/validators/Manifest
index 156093ce86a4..f6a635eeebee 100644
--- a/dev-python/validators/Manifest
+++ b/dev-python/validators/Manifest
@@ -1,5 +1,3 @@
-DIST validators-0.19.0.tar.gz 30548 BLAKE2B 11dbd5636ea47c340175243b91bd56f55a71e833454e1f2781c879a23cfc097b3c2ee6e86ea05e47d4aeb4175dd6ecafeaa98dffc05ea55f44c8dfee23e49f5a SHA512 6d5f1913f2067670258a669a7333319a1a41f556aa8d013fd445aa301fa2dc112a1fc580b542887a60cc17d9811f262030df470d2785a3490c108b07062ddb63
 DIST validators-0.20.0.tar.gz 30665 BLAKE2B 7534c4970ab288cc02794176e0b3368ed2d4035d602d36ecadad84fb4a41407210b22a8ed1230650f4f247ba1552634aa500fea5c2f03f5e13d6e1120e62b15b SHA512 2f3d9caac9246b346e10604758168092ac483fe6e4a0c9470900e49719fbbebfd18e03aca525f8cca33cec224589aee28de3ea9bf5cd4941a49715d4216dba20
-EBUILD validators-0.19.0.ebuild 491 BLAKE2B b6c552e8459c03eef1bd4d4046c9c2fd8e6c39a73cc20834273f6971f12754e313a900b907f6452038b8ea736df6773a036de6473786a07b896198075798c26a SHA512 8f4adb518e14e4a9b44506dbc4b2160717729b38ea54b6740a4714e9efe8ebfb1b1c98342c8f290ca1f73a22b58f477eb00503d02046915df3bbb56486654646
 EBUILD validators-0.20.0.ebuild 533 BLAKE2B e56f9915dfa8a1a7821c8215a9f532671ea2fe9c18d7e0d632cc42564aba9b9b6eefb6af4ba7a61e91a7958ccafc8fff848a92ddd54d15dbd4afd80633f4600a SHA512 d5c29c9b7563cd99ff02bc5b0e2e1c958f5c0fc24a4a3b17e412fe77deecf9a822b2269de184f1d28859ed3c7236ff9e486c4447363a872e0cb17f9e4ef0e714
 MISC metadata.xml 486 BLAKE2B 2b994e57709609f59cffcbfe21c7fdb62788a6188dfddb6e2b2f034f07c312303ba9f3bd19cbfd66b46f2df913da3ee1397f444ccdc40f0b448294c07de1737b SHA512 bca153c237710afd5b407f7aa14c7f6983075fa016beae8ad0494a0ec860f85c6db1f28b24e6edbbf5785b8210dce0edf492cb0521c734b6eedad71b46d8e0ca
diff --git a/dev-python/validators/validators-0.19.0.ebuild b/dev-python/validators/validators-0.19.0.ebuild
deleted file mode 100644
index e3825efc8d65..000000000000
--- a/dev-python/validators/validators-0.19.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Data Validation for Humans"
-HOMEPAGE="https://github.com/kvesteri/validators"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/vdf/Manifest b/dev-python/vdf/Manifest
index fb4f7d97eb1a..5c256fb2a690 100644
--- a/dev-python/vdf/Manifest
+++ b/dev-python/vdf/Manifest
@@ -1,4 +1,3 @@
 DIST vdf-3.4.tar.gz 17082 BLAKE2B f4f65134d5b1b5e52fcbc438b3bfd9000006659d8198e37e377edfda1c6166df0687ce44caf704feffeaa0d23356fffbfce11d467a093e8eb623ccb39a3da9d0 SHA512 a22668039d32cb1ef4660ea187a3a144a32e55e5b02c4c567b850d059a47beac111f9164c67bbe3e7b67d15117efe7b207882465b2353a65b7e0f0c107e88d5c
-EBUILD vdf-3.4-r1.ebuild 509 BLAKE2B c076f1940941dea1e58a313a9c3e5dffb281fec9060c63f744d57faa16256e577c36b5280045f313d4eeeeb3e15a18d5fa3c95b8c6e16691a76367b80ba81d9b SHA512 7bf4a8e5a908a76b79e62d67cd292e949355320ed78134ae20740eefb7ed028b2f3a11714bfc38353bb6e8a9821c8d8a01c171ad74c7c924ab673f6497069f73
-EBUILD vdf-3.4.ebuild 476 BLAKE2B 9c60bccb0716277c6938b2d004b030949d4eab49ed1a855a8c96ab7d75df8dfc3a16fdb01fb275ae620ef0277afd79f1a0930902b4b70470f0c402817bd8da20 SHA512 f9c220fc61de3365b8929bbc9ce8c1a025264d82b8d8fa0eacfc573dce4dfb1dcc5eb03bdb5cb05f0adefd938794dc291e706046b0e47d0a765fbc0cd6f525e1
+EBUILD vdf-3.4-r1.ebuild 508 BLAKE2B 39d355ad4c7e7a539cb318a073cf645e5b2882b4b6cd41bfee66c111ae888cb7871b9b2eff42415dbfb8303434f068a5da7d4ee5e05b99c5ae14b7e19f9c56f4 SHA512 e363694a6eb5be7d592f045a5a0b13cdd62212c04d6328d346bd20be89dce9cfaba8d4823f0fb2239ec718f0ac1072ce68c6d9725c3f4df562cdf120b1100d9a
 MISC metadata.xml 492 BLAKE2B 80437b1fc798d5bced980530bdd88ce168cf568f6be745d0caf7f8e12e05b856f653d7fa3909ec6f3a1860d559584214ce1f9761e0429107650af755c057ed01 SHA512 9182e1920b00061daf94286473a9b755e7a55048ecf06cfcd2d835dd75a958c15c0bfd294ff3a674af794c225468bf829f7171e64275ef44658e13f60d2b4198
diff --git a/dev-python/vdf/vdf-3.4-r1.ebuild b/dev-python/vdf/vdf-3.4-r1.ebuild
index 2eab05005e5d..b4f78940674a 100644
--- a/dev-python/vdf/vdf-3.4-r1.ebuild
+++ b/dev-python/vdf/vdf-3.4-r1.ebuild
@@ -14,6 +14,6 @@ SRC_URI="https://codeload.github.com/ValvePython/${PN}/tar.gz/v${PV} -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/vdf/vdf-3.4.ebuild b/dev-python/vdf/vdf-3.4.ebuild
deleted file mode 100644
index fcd95494598b..000000000000
--- a/dev-python/vdf/vdf-3.4.ebuild
+++ /dev/null
@@ -1,18 +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} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A module for (de)serialization to and from VDF, Valve's key-value text format"
-HOMEPAGE="https://github.com/ValvePython/vdf"
-SRC_URI="https://codeload.github.com/ValvePython/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/vdirsyncer/Manifest b/dev-python/vdirsyncer/Manifest
index e78942c711d1..8c5e35b9cd56 100644
--- a/dev-python/vdirsyncer/Manifest
+++ b/dev-python/vdirsyncer/Manifest
@@ -1,5 +1,4 @@
 AUX vdirsyncer-0.18.0-no-cov.patch 533 BLAKE2B 08f6d9dd09aeeb057bfa17fcd8a590ccef68bb9bed8c84c6682471ba53886bc80011990086c9b51673e272ce15fd9096847dab6bb9a6087670e5b01417cbc981 SHA512 00d4f334e1def6295f2b1aacfc2a7fd33f250a0bee39957288fe83a5179c0461f71273051687b53435b0cdd78a3ece618b1dec5a8e253cec3f3c3733528dba10
 DIST vdirsyncer-0.18.0.tar.gz 115125 BLAKE2B d81bb9b51658d16a3b9ea044846561a1ce2dac3a839d7e0a165f0136069fcd0716525ab2b908be7cafed60846a1aed6fd72aa1d31fc2a38dbe6de8d0e6585226 SHA512 7fb3d0f7d982d8390d278de1a620231e6ead1ec64057c5dbac98dcff491fa3e6b9ed8ba953995458e393aab73b0b9ab8ba14010e06f90a04d8ee2c28c7c7fbfd
-EBUILD vdirsyncer-0.18.0-r3.ebuild 1831 BLAKE2B 3d58f3513db5fafe1dd38bec41d8c82a089a63b2467c78483556ef63cf10775c246ef4c3099e901a7882e9e06b841780b1be3d2f1324bfeed66cdf5c20d3d5c7 SHA512 7f3656dd730003f3b1b609640621aa06dd5b461ba01a8a543a824fcb0af73ca7868040e93e80fac46581535451794b375d6f1fb477983df08921ad0fe6af6409
 EBUILD vdirsyncer-0.18.0-r4.ebuild 1888 BLAKE2B fa68609647879e119364897ef7888ef1a426b060a039f443b5d42873663d1bf31baa255f66b4e09e6b0cab50dc86e9965efee8ed9380eeba7a3dd399ddb3ac7d SHA512 e204d9d7f6f255fde83c3c76c4395a88541c75e5f19ec9a47c077735d72eecf15a3900fb2797fd37fe093f8d8832c6eefde0e86e1e61dc933d397b5ae942d4ee
 MISC metadata.xml 475 BLAKE2B 368524aa96e63a09f0bb25a2d2cfd0a20fd80a7723faa3c076e0a3a10f4fc0e06be1c0521afedbcfd39fc99e2e726627c7ad13622ceefa2fd90d317756386e3e SHA512 5a4150a6e7f0ad92c1b80291e5700f875e619b6b155903189a97ca7f820fff2b656309a27fcd7bae94d5fe6a7cd36cb93633ff0cc0ae7fcaac1399a3f132bb99
diff --git a/dev-python/vdirsyncer/vdirsyncer-0.18.0-r3.ebuild b/dev-python/vdirsyncer/vdirsyncer-0.18.0-r3.ebuild
deleted file mode 100644
index 76beec7d47e5..000000000000
--- a/dev-python/vdirsyncer/vdirsyncer-0.18.0-r3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1 systemd
-
-DESCRIPTION="Synchronize calendars and contacts"
-HOMEPAGE="https://github.com/pimutils/vdirsyncer"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="dev-python/click[${PYTHON_USEDEP}]
-	>=dev-python/click-log-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/click-threading-0.5[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests-toolbelt[${PYTHON_USEDEP}]
-	dev-python/atomicwrites[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/pytest-subtesthack[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.18.0-no-cov.patch"
-)
-
-DOCS=( AUTHORS.rst CHANGELOG.rst CONTRIBUTING.rst README.rst config.example )
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin click-log
-	# https://github.com/pimutils/vdirsyncer/commit/ea640001d0ad6e56369102e02b949c865c48726f
-	sed -i -e '/click-log/s:, <0.4.0::' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# skip tests needing servers running
-	local -x DAV_SERVER=skip
-	local -x REMOTESTORAGE_SERVER=skip
-	# pytest dies hard if the envvars do not have any value...
-	local -x CI=false
-	local -x DETERMINISTIC_TESTS=false
-
-	local deselect=(
-		# test CA is too weak for modern python
-		tests/system/utils/test_main.py::test_request_ssl
-		tests/system/utils/test_main.py::test_request_ssl_fingerprints
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	systemd_douserunit contrib/vdirsyncer.{service,timer}
-}
diff --git a/dev-python/verboselogs/Manifest b/dev-python/verboselogs/Manifest
index 2ae9a31eed16..3f7d319f0574 100644
--- a/dev-python/verboselogs/Manifest
+++ b/dev-python/verboselogs/Manifest
@@ -1,5 +1,4 @@
 AUX verboselogs-1.7-skip-sandbox-violation-test.patch 756 BLAKE2B 3766d28085f4eeb9167fe37f1f1b78dc9c2d1b5e8c401a402b7231bc33e9eaa31dd1a6ae8b0e4052712a173cbb8339361c18b5c4b0d794fcc902650ce6fa19ca SHA512 19f4bd82b49f2b97c7d99154b80e0d63c70211040d73e6cf7ad5d4523f3b15c6cd3df865a8584fd0ee0a255c2463b0057da15ea66f1b28682eeb568120e5d172
 DIST verboselogs-1.7.tar.gz 10338 BLAKE2B a0058a4697d642cc984e68983d499745b644380fd82a45d2aa424cb92b053da2ba5ae225f960427663c49ab78c47ed65c755b43d61c9c978dd881b52ce371ff3 SHA512 13e96ac21e1cb5c68428b348bab63fc4d4ad34eaffe8e1554c05380f9115d2a3ccc6fa2e0a5ca8941e73bfb06537a3e46f29880e7ba3f47da0284279a9740211
 EBUILD verboselogs-1.7-r1.ebuild 717 BLAKE2B f4c68d8b8441aae84bee1763e91dfe26fdf8ecf8ed8fdb241a6d9fd3a7d6844fcd51b1379d9524202cb6a8ae8e73ae71c1294f50c3b670da8207687959a926dc SHA512 5aa6a417374fbd1a25542478f5ee50cb797863c94f717df05e912d5d83fa0e838ff8f7d058f80510f6c45bd6aea5365f9abf1cfbcb67fdf211d403f569ae502d
-EBUILD verboselogs-1.7.ebuild 676 BLAKE2B 419c82833e5bbe2dc7fd14f90a19807424f8bd0459722e0db9c8e42538f5473fd9fddc3b394c33efd064f7c8f8609aa75c4e2b4bf4cb807998e8876046ece292 SHA512 87f0d0c5bae489bf856b052474887ceb167ca27ef7b00d85be89761fe81621eb6efaddbee1e0cb3c5d632f631cb486518dc80e3eac007975c948dc66361b4010
 MISC metadata.xml 379 BLAKE2B 9bb7082fcfc86cafc4e7138060638b305d5245f1d5d685fee68e715fabadc17ed30662285d2cd46905046c60c3f7066944f86fecb57510b03c92f01ff8ce4a35 SHA512 eaf3d7f9f54657064ce8fed91a69dce7b7136bb628673f55e892c4c76ffd51564707b6fba1c2e538080d1348b4c3f0da8b471dc8422e39ec38271a6af7e9c60d
diff --git a/dev-python/verboselogs/verboselogs-1.7.ebuild b/dev-python/verboselogs/verboselogs-1.7.ebuild
deleted file mode 100644
index 4f746ac0c6f4..000000000000
--- a/dev-python/verboselogs/verboselogs-1.7.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
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Verbose logging for Python's logging module"
-HOMEPAGE="https://pypi.org/project/verboselogs/
-	https://github.com/xolox/python-verboselogs/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-
-PATCHES="${FILESDIR}/${P}-skip-sandbox-violation-test.patch"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-python_test() {
-	epytest ${PN}/tests.py
-}
diff --git a/dev-python/versioningit/Manifest b/dev-python/versioningit/Manifest
index 76c734422765..0427be43f5dd 100644
--- a/dev-python/versioningit/Manifest
+++ b/dev-python/versioningit/Manifest
@@ -1,5 +1,3 @@
-DIST versioningit-1.1.1.tar.gz 678420 BLAKE2B 9829214f1f8bcea1733926667bac222c5cf34a03808f96b13389d78453da4613b4b6aeee79d0d756a70aae473496f44d4d191da65f50474d7c8222cae05153ea SHA512 4bcb4253198207d5dbb99358e823cd404f98fd9f265e0801c92a2f220241637cffa8bfc8184a1754b45353423e1bde1a5e5019876acce9536ad658289a638852
 DIST versioningit-2.0.0.tar.gz 735138 BLAKE2B 59247c0a2ec85f828b1b36c7f7ff6981fdd430b242c262f7325586e8ab35410083e0a795e72204c9ad9c0c50bb02c047f8baa01c556f74d69a8ddfc9e911474b SHA512 d700e25f3b58efd87943a950ede66ad8814e3aeea1927bb68b51312a636684b16695c44492f4357595305a5a85a3fc8c411d80a02e9b157162844d731dcab93f
-EBUILD versioningit-1.1.1.ebuild 860 BLAKE2B 2d28fec9e36c84ad0f4878bf529d7887a8b6c66677de14c05b019ad5b5651027989fee7a8373d6960b769902396fa07afc61d4466c6b16ec6de410cf29fc5d64 SHA512 75ca250b977fafb6c0e129f028da3e56279d7af0638df70f16bf5a52a4e3bbf3090f2ea8a139730ca7635de23d0bc0c4405ede54940829b9b59afabcbcc6c85a
 EBUILD versioningit-2.0.0.ebuild 860 BLAKE2B 5b99a6099f118843506107b7738b12588971c23e63a73f9394457b364bbd852cb9af74d69db6226d94ab219cde4549bba8a6e4887b5ff6df9956fbc01e7cd1cc SHA512 fa0ad9816f14251306d7564691737a54e1f29a59be9f420a307737092c774a53eb920d3f0c5380f8c5c6b7381b0fb276be0efecc81201af7fc90f49c08350ef9
 MISC metadata.xml 400 BLAKE2B 96934adb9ade5b51537765da51d530a644f87328688415cfd5b239048adede18db1ec7cbb2a234cc2e28fea368aa9c815176bb22262c9053fdc2c85c6c6e3f56 SHA512 9070b850fff35058a11cc7504bbc5fbef17cc9154df5419a64bae10fd3cb160a043ffd0880fc3c5054bd1d2eb4891bcbf5764c56f2441ab79366336caf91e379
diff --git a/dev-python/versioningit/versioningit-1.1.1.ebuild b/dev-python/versioningit/versioningit-1.1.1.ebuild
deleted file mode 100644
index 72b01f95fcfa..000000000000
--- a/dev-python/versioningit/versioningit-1.1.1.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="versioningit is a setuptools plugin for versioning based on git tags"
-HOMEPAGE="
-	https://pypi.org/project/versioningit/
-	https://github.com/jwodder/versioningit"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/packaging[${PYTHON_USEDEP}]"
-BDEPEND="test? (
-		dev-python/pydantic[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)"
-
-EPYTEST_IGNORE=(
-	# Tries to do wheel/pip installs
-	test/test_end2end.py
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -i \
-		-e '/--cov/d' \
-		-e '/-cov-/d' \
-		tox.ini || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/visitor/Manifest b/dev-python/visitor/Manifest
index 8a44471b15c7..0755a34ff673 100644
--- a/dev-python/visitor/Manifest
+++ b/dev-python/visitor/Manifest
@@ -1,4 +1,3 @@
 DIST visitor-0.1.3.tar.gz 2985 BLAKE2B d645e3524ee5d072320e6feca39faef72b880ec7341053d078778765d9b279bd2ee3f892c0fcd5f21633e7851acd49ac23aef769eaf190147803ce711b717da6 SHA512 414c77df8efcc22df5ee8073e02b8c5c28563954ef9b9a869c4ea3f7f1268a97929c1fe29142ba41e3a5acafea52599f6bf073aacd654643d7d8380cd4f41fbc
-EBUILD visitor-0.1.3-r1.ebuild 500 BLAKE2B ea3729d1ebd0259aeaca491045ab849a5d6f64516c8980b9d6a7141fc951ab085381b5f68fd5f00c171edbf5feecda6a7ecf4e20b42684d112596028590180b4 SHA512 d4f30e3576aca0915bb640eff58921daa4a4cc2ef3fb8a8242c36a7f2a8e470b024ea687edb79ad341c0e332f0c44200df644fabe6f3a9834cb2b55955eb51d9
 EBUILD visitor-0.1.3-r2.ebuild 532 BLAKE2B dd99e8795d6824bc18da42603695f81767e83f0df46a3a151168072d39eb2b6f087427d7375c13fc1dd4b32d3f5207c75670ddcca70196651832bf62dde103fd SHA512 d7becd3376c79c6fcedc1eff4dabdd44b7078997f936835c66e9a98ee56644f9b391f0dce35479b2e917ab02bda290dd8810366105b6dddef55644fe84d9d983
 MISC metadata.xml 426 BLAKE2B 266ee59525ff4a25ede53707d3d208150768837b2cef64b4111840f8a5053ef4e211c29b88849887b32d7571d09bea3b3850ed78af4e89d670056c99a11bec79 SHA512 10c116b75398a39c9a8dcb20edac2e136c0da9b7c8bb0c1bfdab594c9bbd23dfbdbd63e6203848063abcea24d788a5273ecbcf54470d42fc0345e3c308fd510f
diff --git a/dev-python/visitor/visitor-0.1.3-r1.ebuild b/dev-python/visitor/visitor-0.1.3-r1.ebuild
deleted file mode 100644
index 7deb9bd59a3b..000000000000
--- a/dev-python/visitor/visitor-0.1.3-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A tiny pythonic visitor implementation"
-HOMEPAGE="https://github.com/mbr/visitor"
-# PyPI tarballs don't include tests
-# https://github.com/mbr/visitor/pull/2
-SRC_URI="https://github.com/mbr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/vobject/Manifest b/dev-python/vobject/Manifest
index 579d7dc5e95e..0d5a1d267d2f 100644
--- a/dev-python/vobject/Manifest
+++ b/dev-python/vobject/Manifest
@@ -1,4 +1,3 @@
 DIST vobject-0.9.6.1.tar.gz 58556 BLAKE2B 74f9a7dc8058bb792492b1ac44a0310f58c603e677aedda35be0d8e94743e6e1e001a4ae888625f314f706891b7a31db77efa4c268482bbaf44ca37fff236cd6 SHA512 0b299fd4ca105a063f4ac7b03b157c54a3867d6fb798f9072897939b0ba275ba0887bb001c5ed38002a8eb1c10aee710af880413c072140b855af4b62d5aff72
-EBUILD vobject-0.9.6.1-r2.ebuild 758 BLAKE2B db3bb19cd5c8bc8ea6600cbb846385f8dc6532be66fe8e450095d3fe5b314c0dc4f81361fca575be8c222ac2cb07ad419228e009a2a212a6adcddb331ba9dff0 SHA512 0494966e3e8728942c57302dfa2e6b3f21dbda22daff519e59af8e81b6c89b8033f67cffaad2916476070db8a1ad32f20dd731dede81fafb687cf5486c4b02a6
-EBUILD vobject-0.9.6.1-r3.ebuild 666 BLAKE2B d68b7838ebab367b73f0d3e7eb3a16fd285e781b5752b6ea74424cbce81048dea969e1fc559b0026e55bf6e5f8dee0f6b89bb6573bbcba7424edd0ca36648ac2 SHA512 58326de964fe5af3731f9462cefc356a9312740ec92d7c8cb3da650b8ccab69b4722de8509b822b9d0733091104e5d07a8ef2c2e4b83b7694f195f221ff6b448
+EBUILD vobject-0.9.6.1-r3.ebuild 662 BLAKE2B 9c884f114b6d373111262262b370155f550d1e4a563bd493a9e335f21f54953bb46fe1abd3dd5cd8f4e7bbab17b32e45203003afc4ded58f90d88672d3b1d090 SHA512 a3c16a44b38345b2ff138817fdc8c385ff54890366f14b83e6859c0d43dc864bf2cef08835939c20eb9668e2b5153e128438540352762ce1a15729f75541b721
 MISC metadata.xml 392 BLAKE2B af963f0dc85251c0ebdfee0109feae11f147a3cbd847e598eaf48cd82519599d7609c58b10ae8c441df783344d53a253eed09c434b116cd4b26a9fd46d9ecdf0 SHA512 e71184a7032073df710046d0c48af2a5cb01190a9a95d678ca9915f5b8b4885b4c47af7f499b9e11adb11e1df1f195f50b1ef55bd30dc8a5f6c77551b57c668e
diff --git a/dev-python/vobject/vobject-0.9.6.1-r2.ebuild b/dev-python/vobject/vobject-0.9.6.1-r2.ebuild
deleted file mode 100644
index 2ef9c8f66f0f..000000000000
--- a/dev-python/vobject/vobject-0.9.6.1-r2.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
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python package for parsing and generating vCard and vCalendar files"
-HOMEPAGE="https://eventable.github.io/vobject/
-	https://pypi.org/project/vobject/
-	https://github.com/eventable/vobject"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~riscv x86"
-IUSE=""
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=">=dev-python/python-dateutil-2.4.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-DOCS=( ACKNOWLEDGEMENTS.txt README.md )
-
-python_test() {
-	"${EPYTHON}" tests.py || die "Testing failed under ${EPYTHON}"
-}
diff --git a/dev-python/vobject/vobject-0.9.6.1-r3.ebuild b/dev-python/vobject/vobject-0.9.6.1-r3.ebuild
index f70c30d75147..16c3884a49b4 100644
--- a/dev-python/vobject/vobject-0.9.6.1-r3.ebuild
+++ b/dev-python/vobject/vobject-0.9.6.1-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~riscv x86"
 
 RDEPEND=">=dev-python/python-dateutil-2.4.0[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index 3394d634dc37..a280555fa0ae 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -2,6 +2,6 @@ DIST watchdog-2.1.7.gh.tar.gz 100442 BLAKE2B 21247e1790077eb1eb2f1dc2bb8ddebc1b7
 DIST watchdog-2.1.8.gh.tar.gz 101828 BLAKE2B ca14534af888154652951abb7e5f7f1bae1f2e072f113a034638f6384fc9b9044ab99191c6dc0ce38d7ded3dc6629a7aba1e1765f85ec5410706bd669411b929 SHA512 3182cb28701403e799c3850e5cd44acf6dc1aa7e98b1c4bb22b21de98fa4372c74a041e2f3be8d10ae77fe00018e460b98ce2fa5b0779edb84d15f952c407030
 DIST watchdog-2.1.9.gh.tar.gz 102882 BLAKE2B 601c94541846e0d63a39367040ac9b6a24c2920c70638ee3887a51838dd75bf8dfef8afae34c9566047c27502026d944f01c6f6249090f4a233a4892fc1e7c59 SHA512 1005c48b08968db7705acbb8a94a0852c72d8bcf45ac935e7e0b49daa6e422adb081cf431485618b37bcc1b2d3429369af1672b826bf9c1ebfa7aff91a88175a
 EBUILD watchdog-2.1.7.ebuild 899 BLAKE2B 9835e3672e0f3513810e0c7cf1bbcde5554e79005cbed4d7402ccb35b76c5a6d9837d111144ed09e6065147be570e6a1d0de7a8a93349175192ee3e8d2944bdf SHA512 77dd8501c129a6d9a4acddb1c227cded36315517797a74fe6b6a094e8522efcdb9c3486a927284b4c4436cb6ccdaf3e6314843d07a3a92192873b345f793c282
-EBUILD watchdog-2.1.8.ebuild 1102 BLAKE2B eab43a7bffcf96e4098563d94c31c40a4f4615edb162adf53d9b3403ff221794e475920cc8c0ae205ab4a7f13b35832c5d48979bdfb4b6e029d880ddb6faf416 SHA512 c89ac458c878f968b6a3923ba51cf22668c0ecb3c9b3ef14582c3a93bd787802689acf7c15421f8b65d6ecb5f52f26b9780901f3d751dbacdbf1664729f3e104
+EBUILD watchdog-2.1.8.ebuild 1097 BLAKE2B 530f3014f1d2fd77cc0d3eb4d5cf1724339ad6fd4a3b1103da5e67ca2e4501068131d802be89d44931df65bd2bfd2fb7f85df345b0cb556bdd661982a1f457d4 SHA512 59e9efaf897d3dde39a4dd76bb5626a8f5c6de0c4e085505bb5e1c14aaebaf7a4f4d48a14973c840e6466b24f293b5279c72b603ee9634fee16f77c8fc216c6e
 EBUILD watchdog-2.1.9.ebuild 1102 BLAKE2B eab43a7bffcf96e4098563d94c31c40a4f4615edb162adf53d9b3403ff221794e475920cc8c0ae205ab4a7f13b35832c5d48979bdfb4b6e029d880ddb6faf416 SHA512 c89ac458c878f968b6a3923ba51cf22668c0ecb3c9b3ef14582c3a93bd787802689acf7c15421f8b65d6ecb5f52f26b9780901f3d751dbacdbf1664729f3e104
 MISC metadata.xml 463 BLAKE2B d4f4a77cbba45384d34ac533c223e6640f75460ebfa46ae029a57297ab1a8711f8c10bcd0c11926651bd61d5a2ae98e316ebe40c6011de06f8ee46ad5fcab5b2 SHA512 5eaf8c60e47afa3933115e23cec07340d8cb708c9c9568cf943030db2ed7e05771f51369d6d7d8e21ab598dc872af275784939a243a37abb1e3661b41f479721
diff --git a/dev-python/watchdog/watchdog-2.1.8.ebuild b/dev-python/watchdog/watchdog-2.1.8.ebuild
index 0ea71e3c1a55..0e626a061724 100644
--- a/dev-python/watchdog/watchdog-2.1.8.ebuild
+++ b/dev-python/watchdog/watchdog-2.1.8.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86"
 
 RDEPEND="
 	dev-python/pyyaml[${PYTHON_USEDEP}]
diff --git a/dev-python/watchfiles/Manifest b/dev-python/watchfiles/Manifest
index 017928c827b2..a411d49c40fc 100644
--- a/dev-python/watchfiles/Manifest
+++ b/dev-python/watchfiles/Manifest
@@ -1,70 +1,44 @@
 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
-DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
-DIST crossbeam-channel-0.4.4.crate 86868 BLAKE2B 88629c72c0be41bb3a0d7dc92f6908d46cb397223449da5b2c990b7660e09dfd3e3f3fb708d13586f5dbf199d62f781f1f7e0b73d279de0ef810f7bcf25b3f27 SHA512 2933721d6af3126f492f112f3d662fc40fb49139a84c72d33b6c2b0aa94fe964acb302fe726e999be4292a1410d3ee896169a0434dccfbf44d166008719846d3
-DIST crossbeam-channel-0.5.3.crate 88179 BLAKE2B 4fd2b35e36ee9176341e336096d717d649087b8605d81871ba9642a9ad827569e60769cfebe8a96a55e5c79a5180cf42e79c62fb1418d50b0c65f4c711181a66 SHA512 2c1033f514a6c0cffa247031b0aa2d3a8e52bfab9b2a04d9f11c0b5050dc3779fad2325589b52c8d33c7e8d15f74b04ebf802b262b6d8d03b976619525a65bd0
 DIST crossbeam-channel-0.5.4.crate 88237 BLAKE2B ffcab003305b80586a9b61c6309dcf6f4ced483856c4501753cddd23fb0fa9a71b7870b676ccba78119cc29f03974ff4731cef9a92840c0b38ae944f0b3825b5 SHA512 39b17dbaefc15d7faafca4ae6b060665471d384956aca7439fc407ed2632bd458e473efb62b74629b42a5f3d237e13503d2084cac6f6b3f42b9e03aa1fde0982
-DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066f07fb4b55fa2b347370506467a05923254b1c4dca667de59ed91ff91f5496b37f40f13d3e9885a1b4f639f5b6748433 SHA512 e375f24c007bcf660d9e297527ed938f678a55696ca7b555b96fee7e0b94c31db2d3f4355675aa0baeadba68b9755ec92dc3a09a37b5db48e3723b926fd4a8f3
 DIST crossbeam-utils-0.8.8.crate 39681 BLAKE2B 2b3e64bfcaa044a9351c1cc8e9ea53fd68fd0bb9875ae523e0cd309a85ad23b340267bdb742d363b5d99fc065ed74f6cbb3ad1e33dec7d14d99ec458875e7e10 SHA512 ab960afdb82863160a3fa1c21c64b35b3112725bd72fc8e0724175937f4b23d0628253032229501938cd86a8e406a59c06cb44e8bdf34619de781a84ebb46ea0
-DIST filetime-0.2.15.crate 14511 BLAKE2B 6659bfbe4c15c639deae9734ead88b31c118e7335dccead7deef103a795521e42de2903a7fa08cf802049e9df9cecee8d619c3db3d507a7f8f9f5bd706584090 SHA512 34d320a9aa71059d0303c62936aa94b30a873ba4b0b3b78851fe636d132422a662f79596d79edc33e778e07b0a1259693b59d7035ea390aefa4849f1af459f64
 DIST filetime-0.2.16.crate 14502 BLAKE2B c19a6a72ca4f6a34f9de39d9acbae694326a7a8c1a3aed50ca749e09905470a26c5c61986759d9fa83b9740354796d0dd3d3781c1d4c2cf1d8da5cfb630f045f SHA512 4c6277f43b2de6432769353615406af824295742e5604b40c2673acc2010b349fcbba201e7273756857938256f1693a515f3b9145f34405a56cd23af4dd30222
 DIST fsevent-sys-4.1.0.crate 4620 BLAKE2B c203c774d5038d4c4abdd7bb9407a6b5f2b203a609bd92a7fde38afaa71248f4610e89c73eaf982a5d76560f9503081b7b10573046b1a91f09de4b642709417a SHA512 e702686629557b879efaccd37b03a7ec515eeea29d8f8ba46f82b8b68ad157ef9d6b188be031f806d8fd27d4e9d2689cdd6bfa14e4ff77493a7d0be3ef1238a7
 DIST indoc-1.0.4.crate 13122 BLAKE2B f7a352bc2d19f3f2d1479b6add45daf841e02bba563ce9af115118b9bacea6bd39ab2a663bc992b2302de73b52bac1024130aab3dcd79c5b4286c93dd7305928 SHA512 b2d90f074f9a34e330d7d6e6313bd569cd857c791b8ff79191a70f19064fa53ea2ede30bbd16587fb438e69ccce4c3e2fbb127610ba8e470daf076d7373f0213
 DIST inotify-0.9.6.crate 22971 BLAKE2B 7a6cedd29b2503911fb42324fe3b4f4f20abb62a6b4370f8a7f634d9988f1b3053a70d69d6bbd7b850aae2590ded7548b73326a598d31e5b579e19ac3cc781d8 SHA512 39c3db1b6da620df9eaaa41cc20c2f22b9a372e181ed7d8ba0c7ad4e711ba4486bcec7ff86bb4d814d9c53e071cc4e43845567069e45b897c562cb677fc872b2
 DIST inotify-sys-0.1.5.crate 6965 BLAKE2B d70124656ce3e6f5ea3f430e8e7100d0691003161234b40542ca86c407ecaac1785f3eca98e9fd2914dababbc3f47a0855c99c9f19245d1f2cd5312739c802af SHA512 dae749f32c533b0c9f99963d97a77dcbfcacf173ec8fd7a02f275804f9925e867b4dfdf6be52c3c3c3de136d64e6e7d6b30a3bf804a01608cf974b0cc2e346da
-DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
-DIST kqueue-1.0.4.crate 11771 BLAKE2B 3a428dc381fccb406ad4f6cb040a5ffc5371386c1abf552e8edd8e24977584fd028d865998b7c9b04b1a9c38b756fe4ddbdea4590b9ce7f847bbee48b14cb96e SHA512 b836195dedb4eca9022c24b95fd74d4c2fe473ee5c05d10a2c3db3e512c3fa49ff78e23d4853d4214c44ce29a68f1882ea84267bdc0f05400ced6c958db33910
 DIST kqueue-1.0.5.crate 12654 BLAKE2B d3d420a1fb2928af7e67106caa90b37fc09c5fae52e90df252b1f87bb8495a523ff248005670ad751e5cf4fae7a36923c2e9564ff267370699e07c5d5f97d22d SHA512 fb39f411e8cc40c7ac85dc679394d8fa02978da29666c15a8a303be75ff24c4e228d918ad9314313c8ee94c8b51dc4f8611e6e2706bcb76722ce0f406d5599f9
 DIST kqueue-sys-1.0.3.crate 6673 BLAKE2B 79254d667b4cf1fa556f1773db23b00ac431bdea6c8ecf914e3c0837fe4e25a45c9b6fb76259d628e4c76a20f749df3fc285b54ea63ce3b52d21529358e81c3f SHA512 76023295abaa4415c1d7b37c844432ece522b762f78983cdf58106f65ca553ee96193bd8c93f3fd0af029d266d8414f2ba4d1b8835bcdc180acc7defa6269731
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST libc-0.2.120.crate 574677 BLAKE2B e9deaa26d610c1085f12acc6bd9d3c71ad9d7586d1749141066ea47f14df7143f8dad8173020e549fe81aef65a72d7ba189fdd3ee0038f62bde75dce362f4f5d SHA512 42aadea2670f63d6a2c38d4d6949d9071c535395ecf458a694751a7a17f2a4a6495ea1dbdcbcb5340cb62e3a40419419141ca39c4d4dcda8cccbe480aa34a014
 DIST libc-0.2.124.crate 577742 BLAKE2B d39356e89647df6a0468c2fe7ec351955afcddd38064fb64215833c716bc16636001b6d377d21cf31b773c3f392d19ec5c665d450e81ce09a55bfd6a080c82ca SHA512 19fed1eeac7ffbbe36ecb5beb3816b5244d3017b72376e84e532f253e07ee7bc310f6f636aed46174653232fcdb532c2506bc070bef31699db20572df0c45de3
-DIST lock_api-0.4.6.crate 25215 BLAKE2B af1d28010f7c340dc0857afbaf8acd2396228cabca26e52f79526cc4eafb072c2aee8987bdd9ace4ba87c272f6fc816fc6f62a69e4d7e66a5c6e91ae3e824ede SHA512 ba14d341564eba91bb5ec58bb2e0d6c87e70b3694c4609396f0c0f4afc0c6c105a88cb99c303b1e9761b0fc6cae56f79ba6a7663b063454ab1ede4d49274906d
 DIST lock_api-0.4.7.crate 25371 BLAKE2B 9ed08433ffa70af60193dcf307287991a3154f0ef16b485f32a6c83e64962661a6e08ef83a6b217d6cbf5bd964c0638d8ed86b290087677c1fb3218321c4bbf8 SHA512 b1a5227fd131edaa70e017f7ddb43af8b4efa58488007b898ca1dfc818a3a441b732b7adbf1270e72a68ee5d2a99a5d48f33b2bca8e2cf78694953d20d27636d
-DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
 DIST log-0.4.16.crate 37758 BLAKE2B b9a88c3d75232ba57de8c30d97e6ba056bb1ec128c2c154c52cc8fa47e0617902526fbf1cd526152d79db9236b00c51afca1eef7d9ceaa205177993849d55d4f SHA512 b12dfcd8bec2f44864b8174776d3151ddf1fa1d82bc8a54fb155d5af3b2af959aab4899d72835a3c25cf58d6c41cd7f1b16c2accbdc20a0eba7e8be3d1883ee1
-DIST maybe-uninit-2.0.0.crate 11809 BLAKE2B 5e517b8c59f9ae4f1a4f86b48679ea64d62450ec2519c8caaa914479ce9e5b3aff24707e2e37272ba74bb60499afdc602fff17756337b0c50a9184edbd8b8805 SHA512 3006fc009c7c743d9147a4122e677cdeb2546f7bb46963b2f266839614eb906f9d763c161044fd0bf3f7b54124ac0734ac9ae7f7151b1a7a5f45cbc739976434
-DIST mio-0.8.1.crate 88205 BLAKE2B 88bab5a31b35fccd6fe52145e937d533bd16ac0929a4fdaab46583d7ed65bb0dbd1620e3bdaaf6ebdc2230131c5793836372f1092f662ecd7e78c45e178609d3 SHA512 945e0970bdfbc0293248c3a26dfb84aa789737bc6e8101ec711da6006130eae5ea221e9c15b8f680f04a6b43b1ee1f42fe2d02035a8e2ccd94d78a759489d681
 DIST mio-0.8.2.crate 88272 BLAKE2B f704802aeec66cb47a011989709e6c35352b55bc7330dac7631ea144ed71bc86a433ef742207e3e37c47417bcd7ebb505287baebb839294e5833d228a2514c57 SHA512 c82ea0afc0de8acf162188a6131373f3cb3e7f3abb3094dd51fa9094e42a36806954f267840b3fed18c0ac3ee75af0451dfea5509ab65a94dcc93057c7d37393
 DIST miow-0.3.7.crate 24563 BLAKE2B 24375754245e4ac50620a8b6da6b21958914a6af6422a470487841c2524587d596673cc3718a85979ee911f104d71b59b38fbe9db28c1c7e4b702b9373215cb7 SHA512 451073e8913148889493de0373bc0450c8b23e136e151b48b9976292e4e03b7c3f3279ecf49dda5196badfe662a661a998cfa456d2ec340a495d54a4d2382699
-DIST notify-5.0.0-pre.14.crate 54485 BLAKE2B cdc8a9caee303a1f7b6e25eac9febb30ed04f1a4bb0a2335e9a4021bd5f9d08f9cfd03c83ff9e57bad33f8d9db2ead3a8583f9298571ae4d5cd3bbf83b678b72 SHA512 8975d11b6caede53129ec17184ac484d122bb093ab6d7f291f81a3c91164d873b2b8d598eabcc09e7199729bacb080f75bc6f008ad83b83f3cf8173968c7cf1a
 DIST notify-5.0.0-pre.15.crate 57624 BLAKE2B 0f07e7ba2e6b431769e69730dc81c056ab1098a905855d6edb9866e36fb33dcb123c1a464c667d0130322d3810255edf62cf8f3f4e3fc9307782bc050c2913eb SHA512 31c7313c53654ccb76d14826511bd9a687f89cdfe832b0e85adaae22aeba98776fcecabaf321e26fde060357ae52e358b1b48d118e70e562dde98944258d055d
 DIST ntapi-0.3.7.crate 126994 BLAKE2B 320b513d86af462c6e4d3349e4edfd28d73ddc8f09264adc24eebbbb79976642a9d530bf9af4e61e0409e35f4164d49f9ec054dee9694cfbcc76b237d6c84104 SHA512 6f5fc3b3629f028e03e878681a5a426945e471578c5dc78e121560887a9af285fe432f7401b19b7422e65c3b762651afb9a57a2f7605884c851ddf41b741585c
 DIST once_cell-1.10.0.crate 30414 BLAKE2B 4161622dc9dab4748a1b96777da263523f23329808506faea7938160f0d5ca07b5edd31f385b14b88dd2fc34c58063df4d40a34a479573750a369512dc956992 SHA512 f6b5ce5e68923296d2041f83ac037f10ad7b9e94fc607c71332e8ee942a02c29534c2073cecdb132c7e1d91428e9d9687fbf05393ca0abbf7e15db50bb3b74ab
-DIST parking_lot-0.11.2.crate 39869 BLAKE2B 67c555e87b68f5763a7790563fd8d542e126bcb77f91267f3b76c51fd73060a2c32dcb91f9d0db7ea772e555d91576c8d7ff48053a9c35fbd3b749d2459a660c SHA512 526b176363dffa59501c18324bb723a3846ef5b0ff9bf1d890e40ad10e7023284f7c8012eda87520eaa94515ee828d9ef52692a9ed590a55e176383d6d472f9e
 DIST parking_lot-0.12.0.crate 39761 BLAKE2B 227ae508bebea21bd06c7a9c1651879ce3f5cd308019c8733f6b88e75a57b57d19b7bbc5dfed5ef1bff57ec0f116606ab699cfa6017b6e00078e7e4717cd58a6 SHA512 efa1ebe2f3849a9c6ac484c7e1cdd279640539468bd4d4da6c4c97ae34e86fa3a42818ee4839dea512635fbbd836829dbadd81dc05208614c820d1374139673f
-DIST parking_lot_core-0.8.5.crate 32466 BLAKE2B 44d9cb65444ea93fded7e216e3bdbe2256ba1611f5cb6f80d67a01e71d428b81e6c7fc73cb928e2125f34bac0abf4d1da39f622e813dff89b01fed7632308b7e SHA512 c4315df551748d1ae77655e4d9f8c90f911498856e5358009e9e02e410bb8085f006f369188b0753a298371ebd74a5c383d848b65e31b55f3462381308c83a00
 DIST parking_lot_core-0.9.2.crate 32254 BLAKE2B ef53a3e10228569dd38e1c5a8816fadfdf6b02ce01bf8b7099c7e3f1f71b4fb6c4d8ece8e52c9ddfc9a5ece6c273def2d9bf5aad8afd76ebdcea8b1ce08ad7e7 SHA512 0443dcd867d8be6e5d1b6ff0af8e31bde6378789e30865442bb15f48ac955beb847ab5954be4336fa47aadb7478606bd217b745134de50c16486c26e07fb10b5
-DIST proc-macro2-1.0.36.crate 41411 BLAKE2B d7d99aed41080b65680736d92dd027e21c9e9e0b03601915c000f5dea8f2b2d9126b116af32f2fb04b4fa407775f0131423055d0b62fdbfe87fa4ba7ec098beb SHA512 f31b0f2356af2746321c4f808ac9af87d21a5657c103ed6bc1383855e40caf49246cc8ec1edff58eacf193424abfc2163148b7298e527714e65e602f14b2e50a
 DIST proc-macro2-1.0.37.crate 41378 BLAKE2B 330ba71c59bb7a6718fe650fc10a37bc690fb0ba4871c198bded83d13a12cdd7b1334a2e2c8fa7a48104b26625c1b07d65b0ecf91f9c2f13b8e898e80baae286 SHA512 cedb3433c6dfff39b404f8939c67e98303bb89a47e2cfb9659eeda1ca3e3d167800dca482374501632ab6d2283105dbd7560a157b48a351b2d3da059f946be55
-DIST pyo3-0.16.1.crate 350244 BLAKE2B 4d46e905224ce3a148d714d9a93d610dcfcb9b5aa5b8688af16c9d39868f0a2a28fdf030c5686803696cdc92c260ecda544f5ce1f5356cb787d030219c02aeda SHA512 f3d166e2bc613e87758edf7a2a8dae0c2a551c73058e2fbb2459d1b68eca80b8da13d66667271c90d3fad97230dbf5fa2acea0c0c2378c4473608a03b343df5d
 DIST pyo3-0.16.4.crate 362007 BLAKE2B 8a24115b71cc075c76e82170038133d955b5e0f3a5bf73224148bf90f48b8134054edbd567a99f740fbc671597f1586faad2ac2956c965b7d58be5fcfad585b6 SHA512 189eaa8472b0925d69c959e1b365b4c3a5f258329021384d402deb9fd03a3ce5b6637076394512a05eb858d2e53382a6b7c933df68f36a5cdc5326e26ae97968
-DIST pyo3-build-config-0.16.1.crate 23508 BLAKE2B e5b38783e74d3104d2e05ce5122e06b4a3bdc19f6b273d548d5726b6ab67ceb4d96c75bafb970ffb13b17e7a5929846fb657c2c51c9cf6d47caf2b6846d207ba SHA512 1103bf5d668b6c67c036629c9b74ad6ebc0b58f3392db03aa1b0eec200686e23febb93fa543c1b19f2734dad450831286c81dc4472eb194e55fa0ad66fe05cf7
 DIST pyo3-build-config-0.16.4.crate 28562 BLAKE2B 973df4b148acf98cc92145fb732da33a3c1ff5e5e62bea60ca60fbdc54b8135bc5f6cca0b397a9fa949ad74644d41db777fc0fa2197313abd4fb63488f9020c3 SHA512 60044e707e4d15176b02069994950b2a0557801ddee7ec9fbbd839e303b15facef62f2b07f81925c921aefcf341ecfae9bf4ce86d23da931d14698d48529f660
-DIST pyo3-ffi-0.16.1.crate 60233 BLAKE2B 55031bc3cf445b41f701ed6b20d9ca056bea6226995927bb44646545d320885ecaf496cd5b12201a78f3486f69f20cfd014f6623abc27e07d34172535352cc8a SHA512 edeb493c8a5665d99a98bb2f67624240d91317454b7ef89ab585de424bbd291418a9ecad4d95431bc5fb73c68f99e2392d79a31c06645fd478741544bcac9e56
 DIST pyo3-ffi-0.16.4.crate 60544 BLAKE2B aa76de43d9f83a5c5ce08158e7ffb882a84a98d10c9bb19bb62c833dffc296175fbb6a4b0f31daa8ff44a425b299818fb6ae77a725e024be70f08f38c69d4f5e SHA512 d41868fec5e850bf6b1a796a2d1119310ebe1765a750581a8fdcd83fabf92587fa6eb91a32a85f8084cd41a92b7741c2a266928c5658536fde7f76ed20b844c9
-DIST pyo3-macros-0.16.1.crate 8028 BLAKE2B d002f59724c1a73938aef69a3d2ec29c38a2895266225382293a841b9b020ba0957df915d0493066e4c76ee73a76fc2c0bfeea9aa9bd7f585aca76eb857e10d6 SHA512 b102ec88aa82d112fa5f9d43ce375181b35f49de2a3d959f5b163aec11dc020d054a1c91f01abd96b79de1ded7bda14a530d6db874c1eb2c8e3cfb76bdb14c13
 DIST pyo3-macros-0.16.4.crate 8455 BLAKE2B 94cac5c6838ba49aa3842583dd2227685b26e0bdd6e828401ee8ea147a74a17804f8e5c24f3d0df27c6a62b6e5011ee6e5b3f3d558e1abf04056fea2aef584a9 SHA512 5620588a3e3538d00f0b86d5badc1d9929d8f044eb17e6c30cc73e414d68c04d9a90a66ab163a0dc261516fac80443db763f5981f70549ef57a13571a36dcad5
-DIST pyo3-macros-backend-0.16.1.crate 49383 BLAKE2B a59c5dda51eba714842307c5d0f792e706ef2a88ded0dc52023f6a8e455334bdd5ac27e77bbbaa0c9eb88e3bbcb7d701e07aca36bcf16e0f83653f12fff48363 SHA512 36aa72129a60fc9b4b0d189549061a1b3226e805bc6225e6ff5a2e0f794f76758bf2e6dbae911d45fa0e103f09caa804ce35f3ad6c05aff932288a2d58287e04
 DIST pyo3-macros-backend-0.16.4.crate 49218 BLAKE2B 48ced6e30c2b0c936e89483f007771120430e67751d4baba524baf4c575ae6d6177f50b06802a29456f1fc40352999f3736733a4cafbf2113f6f4942e804281a SHA512 216a5b329ef19e45ca2c8a09b3047aa00a0de6aa0d77fc8509e515952f6b82512bae6413d2649ce50b00f29b3371494128b59cedfbc9b81223b706723f640e15
-DIST quote-1.0.15.crate 27281 BLAKE2B 5612633415d30e26e646a968ab7a64ecdc978b02efdbd40dfecf5afa489c21bbc6a9c93ecce2a2b45519db6be3384bb372cfc9f597846e8399f7c2b57e8b34e1 SHA512 76403bfac4e9a018b29ddf8f911135206d4fdc266db38a95cc92f6159a8b436d39d64c4ae6c3fd16ad83117270ed329b6a151d589cab46c75443c57b533dfaeb
 DIST quote-1.0.18.crate 28911 BLAKE2B 623872402cb185a57e2ffb1bfe4105c49c152c33c44c8054af59df7bb193d14416ea2caa7b28b3f9b9ae6985bec7fc7825bc946e2e41915d2744c887a51559b6 SHA512 3fa537aa96a8970104411471b0e4b7b9339583d552c1d9297737a59ef5301af41da105b92aeace87376e1395e379153f6551bfcfe9c740e6945064426f5f6f84
-DIST redox_syscall-0.2.11.crate 24032 BLAKE2B 28d71b8c1419e34c4b0a0a1e0ca1bcc34bdf97614a1e33a5f58f867d743a0430ed19e6f76601702802e366c2801d245a3a88c9bd657bf8aaebdda463aeaeea86 SHA512 dcdc6335a0db6a01a31b61aaf9eb684f264b36868a351094d3e2fb3fe84f0c4269db89ad40b9e0fedfe1ebe2096baa20e7a6232a4de5a3dda3b7876eaaca75fc
 DIST redox_syscall-0.2.13.crate 23759 BLAKE2B b59c3e923b7bddc84285377eca86e649c21ee7dd61924245d43c6554124adf689f9b92841ca64876b34797249698511b322f6e8e639d71e45e1ae9da5f8b7834 SHA512 6551f503ba52c4edc0cb4a418ff212188ddc7be80dcb39eaf3bfb82faa9a76cdf359f604d6b32be6c6a335b54180c9399a0e32670333a5a08351957308486100
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
 DIST smallvec-1.8.0.crate 27992 BLAKE2B d02897eb4d3901805be86cafd5d3dc6768b31c2ee4d0a9d7eb455e2a21be2864ea83589f4ffde102dbbafb66e3c197707af770b5ef184b8e244d992189644b84 SHA512 17687cfa6aaf95a1df063adc3a412a7c41918a0d003eaac90f7d9e859fb8fa1d652eedee17a4cb3aaae9b33a2043f89e796519e3a7a3992b292f04049bf80b0c
-DIST syn-1.0.88.crate 236112 BLAKE2B 7d652d9685cfe275c57154a6f3e2b0ec741e498316a512f73664de67aa85541c3ac135007003d72a912714c7a9040c710a6292fe95fbba70dac7a4b185248e97 SHA512 a342b635859cba36b41bc82c204b76c83a3032c5cceddf3aa11137b21238a4f4ebd75f3bffe39eecb9aab9559b04639891f02d77b38011b268b5ddcc8d9ffa61
 DIST syn-1.0.91.crate 235996 BLAKE2B b7b555b2dbfc837417ed69c358338819500f1e8ba11c2183a4d216efe2c2d7eddd165415516d50ffb5413b97452f186263e13299b01bccd6ad6e405f6d2a3f4f SHA512 28fe28a9d4e9ab3610850c1704be6f384e9fff191b1a5e11f9766bdada81a3e7426cbc776bbd63ea6710320c7416a622506d4a8d607d978af506d381658d4bff
 DIST target-lexicon-0.12.3.crate 22990 BLAKE2B 7ca04aab44917345e51c7212e8f9d24cc0c7b759cba6031313c2a6f5bf4139b34be27e65ad150fd83f14b440a8e4ce125d156634409cbb2ec01cd370b213e738 SHA512 4ba0de71cf27c4ee330c9b61fc0318cfa3e179b57a7b0a79f296e0b33602c664c4ee2a676d09e0e104add2e0b56144cb5ddcc096a16f332f67862ee94b052f86
 DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
 DIST unindent-0.1.8.crate 8326 BLAKE2B 3123c6b540b152d89cc7a9a76ff1315549f973c6a26adc6ca1b40518973fcc95a9f8da94d1c52ee551f2870181a265aac7e4339a3d46ba5280021b49ad842df2 SHA512 7752f4a29306b3c43f768bc400d610d1537457b22cceae8a5ebba31c857e219dc433a10a676d3cf94316a7cd6c7013c8960c825c6f1f9db5a3c2edd0a60591a8
 DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da
 DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f
-DIST watchfiles-0.13.gh.tar.gz 35738 BLAKE2B 60b4bd11cbbdb200a3d4dce35899f0c87650e9cabc4ac95b45003b1b8b2bd9960a1b5794d5366a0761ff310830faad801f82a4523ebf870a187cfde0d3b692ff SHA512 0f98ba01af0fa218f09c3903f92eaaee309297161b31520c05e122336222e46dce1299794deda15fcf1cf598acfa6acb93c7e13c7da89fe6908d7b6fac10a3f1
 DIST watchfiles-0.14.1.gh.tar.gz 38276 BLAKE2B 1007b4822774b6d04ffa4ea61b1e30a4c2da358e6561891599177f4060c606dc4f46f15a8fa40ff22e292440eb67ec33eaf7048db973fc8ea9c90d6f6adb9e14 SHA512 098ca0d3a7e2eafd3706e08753ac7b242bcf1aa68609a89531405ce7c69cb6ba205c5d72d28064acf9963c81e969e8ba753510d27ef525e007e1943bf9d07c1e
-DIST watchfiles-0.14.gh.tar.gz 38208 BLAKE2B d2d9b07e085e7265de6458cb7259852048552a2477e285bbbc7be65aa32b14c0c5df590538f714f7f086beefc365efe435da55ea4c25cf9066d2cfbd530d6ca2 SHA512 46c9b93b2383494fb6ec99cec7132613120fda4366e1ce1749cda10198f81eb0e73fba512bf5ea2ce7d8e43a1216914e89a4a6054cc6d3e4b853c681d12ef76b
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
@@ -75,7 +49,5 @@ DIST windows_i686_gnu-0.34.0.crate 772343 BLAKE2B 7c3fb8d9b375ea82ab3e28da0c462c
 DIST windows_i686_msvc-0.34.0.crate 733497 BLAKE2B fe7588e946d95c1570ea0d90db82dfdb8a050ca331dc3edae6a786c2a10fad88ae99906959334b396c1972d88dc40010dacf655fbf9f5d39a6bd78bacf2025bd SHA512 86771e1fed40e7398d3ce65bee46fcbfeb630e0f77766eeb1da0e5b2c47f94bd728f645a5c799ea8f7ef6653b37903d476b5b3eb763218bf10dd7af6b31c76dd
 DIST windows_x86_64_gnu-0.34.0.crate 744301 BLAKE2B fb0775c40069aa42fcabd01ff09fc7557236e3cd270c771b3648d7f556e9aeb9add7130b117fb107f3562bc199b728d3636779a99c9a1aad96aaf6b99f975f3e SHA512 61f532c2c95edf42f79ced48be9d4a9810dda327f45ff2dbff19a5fb888e3ba206f2b875c5b5571884f27742fb380d5f1e105e6d5fa460a2e529b53625123d86
 DIST windows_x86_64_msvc-0.34.0.crate 669900 BLAKE2B 15a851bb19557ee896ade2db29872754549e4df9cf895a1387d9ddfbf8c599e6e5a2bcb835f450d8218296a99d08fbfb2db469e244b0abdaa13f16bcc38b35a9 SHA512 3bf5308993a259f5d1b3964698550151c5819a0d28a02928c6f7d70443be69131255a896d423f086a298842ba773502de8a8e8bb2ce8adbf7bf848ab40184bec
-EBUILD watchfiles-0.13.ebuild 1989 BLAKE2B 0a7ff1124337675996b928f790a615568984deab09c29f86873dee8ce56a89ce71cfd94e8e4be7906803b9f901be2921910f9c6c5c3e858b5d5e7d265584ff6c SHA512 aea91aeb4f81ca8285eaa9d2bcdc8532eb041f08599311346b5184628b2ee571715333a3ef0068c8f58d057c5476f6ee456e176bad466c185def608aa5b1f6ca
 EBUILD watchfiles-0.14.1.ebuild 2086 BLAKE2B 5b449743d8f995a7e591ea9f30b700ada223fe3a73ed05de88191b94bba20bf3dea50772c05aa39fac38f621adbd1c2670f04e5497df723888c3e3d6278c2812 SHA512 6856d4650a42b8c25c333884ae0f506904c722954af15564617527660890029fc55bf3a43c9595d06e8dbc943556fd5326e8ab564bc65583dabd33cbebc5cef0
-EBUILD watchfiles-0.14.ebuild 2080 BLAKE2B 6dc43ea86438b2778f120455c47873f3471cf80185e86bec7a4e664a329e718cde4117428bbf33beae6a504c604395bb92fb78b935c6ef329ff94d93d2c5c6c8 SHA512 79d34f8ee0e3a7036b6e3805947dd7c1c2bf23c7ef7b5909d7f88541b52366871c5ae2bf76199bd4065c9bd3cdefb920cd83de5dad0dbde487ab12ab9b9fd0e3
 MISC metadata.xml 355 BLAKE2B 95253406e11c30a7a3b5462d3c835010313bed3122f9d16ff73d6959a5c1f4c8922e324c839fcae9f541c7b1d84544cd38718ffcaba039b8c61292eaefa37447 SHA512 e1c11224e0129eb696e4e92a41ec0e35819febee2eb967982e016f7a0d02d95df8465867e0202d8e7ac59cc579f73c79d9ed6b87eebd44b3b64d63a5642ac458
diff --git a/dev-python/watchfiles/watchfiles-0.13.ebuild b/dev-python/watchfiles/watchfiles-0.13.ebuild
deleted file mode 100644
index 47b761fab241..000000000000
--- a/dev-python/watchfiles/watchfiles-0.13.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-CRATES="
-	autocfg-1.1.0
-	bitflags-1.3.2
-	cfg-if-0.1.10
-	cfg-if-1.0.0
-	crossbeam-channel-0.4.4
-	crossbeam-channel-0.5.3
-	crossbeam-utils-0.7.2
-	crossbeam-utils-0.8.8
-	filetime-0.2.15
-	fsevent-sys-4.1.0
-	indoc-1.0.4
-	inotify-0.9.6
-	inotify-sys-0.1.5
-	instant-0.1.12
-	kqueue-1.0.4
-	kqueue-sys-1.0.3
-	lazy_static-1.4.0
-	libc-0.2.120
-	lock_api-0.4.6
-	log-0.4.14
-	maybe-uninit-2.0.0
-	mio-0.8.1
-	miow-0.3.7
-	notify-5.0.0-pre.14
-	ntapi-0.3.7
-	once_cell-1.10.0
-	parking_lot-0.11.2
-	parking_lot_core-0.8.5
-	proc-macro2-1.0.36
-	pyo3-0.16.1
-	pyo3-build-config-0.16.1
-	pyo3-ffi-0.16.1
-	pyo3-macros-0.16.1
-	pyo3-macros-backend-0.16.1
-	quote-1.0.15
-	redox_syscall-0.2.11
-	same-file-1.0.6
-	scopeguard-1.1.0
-	smallvec-1.8.0
-	syn-1.0.88
-	unicode-xid-0.2.2
-	unindent-0.1.8
-	walkdir-2.3.2
-	wasi-0.11.0+wasi-snapshot-preview1
-	winapi-0.3.9
-	winapi-i686-pc-windows-gnu-0.4.0
-	winapi-util-0.1.5
-	winapi-x86_64-pc-windows-gnu-0.4.0
-"
-
-inherit cargo distutils-r1
-
-DESCRIPTION="Simple, modern file watching and code reload in Python"
-HOMEPAGE="
-	https://pypi.org/project/watchfiles/
-	https://github.com/samuelcolvin/watchfiles/
-"
-SRC_URI="
-	https://github.com/samuelcolvin/watchfiles/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	$(cargo_crate_uris ${CRATES})
-"
-
-LICENSE="MIT"
-# crates
-LICENSE+=" Apache-2.0 Apache-2.0-with-LLVM-exceptions Artistic-2 BSD CC0-1.0 ISC MIT Unlicense"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	=dev-python/anyio-3*[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-rust[${PYTHON_USEDEP}]
-	test? (
-		dev-python/dirty-equals[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-# enjoy Rust
-QA_FLAGS_IGNORED=".*/_rust_notify.*"
-
-distutils_enable_tests pytest
-
-python_test() {
-	rm -rf watchfiles || die
-	epytest
-}
diff --git a/dev-python/watchfiles/watchfiles-0.14.ebuild b/dev-python/watchfiles/watchfiles-0.14.ebuild
deleted file mode 100644
index d35ccacc96ad..000000000000
--- a/dev-python/watchfiles/watchfiles-0.14.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-CRATES="
-	autocfg-1.1.0
-	bitflags-1.3.2
-	cfg-if-1.0.0
-	crossbeam-channel-0.5.4
-	crossbeam-utils-0.8.8
-	filetime-0.2.16
-	fsevent-sys-4.1.0
-	indoc-1.0.4
-	inotify-0.9.6
-	inotify-sys-0.1.5
-	kqueue-1.0.5
-	kqueue-sys-1.0.3
-	lazy_static-1.4.0
-	libc-0.2.124
-	lock_api-0.4.7
-	log-0.4.16
-	mio-0.8.2
-	miow-0.3.7
-	notify-5.0.0-pre.14
-	ntapi-0.3.7
-	once_cell-1.10.0
-	parking_lot-0.12.0
-	parking_lot_core-0.9.2
-	proc-macro2-1.0.37
-	pyo3-0.16.4
-	pyo3-build-config-0.16.4
-	pyo3-ffi-0.16.4
-	pyo3-macros-0.16.4
-	pyo3-macros-backend-0.16.4
-	quote-1.0.18
-	redox_syscall-0.2.13
-	same-file-1.0.6
-	scopeguard-1.1.0
-	smallvec-1.8.0
-	syn-1.0.91
-	target-lexicon-0.12.3
-	unicode-xid-0.2.2
-	unindent-0.1.8
-	walkdir-2.3.2
-	wasi-0.11.0+wasi-snapshot-preview1
-	winapi-0.3.9
-	winapi-i686-pc-windows-gnu-0.4.0
-	winapi-util-0.1.5
-	winapi-x86_64-pc-windows-gnu-0.4.0
-	windows-sys-0.34.0
-	windows_aarch64_msvc-0.34.0
-	windows_i686_gnu-0.34.0
-	windows_i686_msvc-0.34.0
-	windows_x86_64_gnu-0.34.0
-	windows_x86_64_msvc-0.34.0
-"
-
-inherit cargo distutils-r1
-
-DESCRIPTION="Simple, modern file watching and code reload in Python"
-HOMEPAGE="
-	https://pypi.org/project/watchfiles/
-	https://github.com/samuelcolvin/watchfiles/
-"
-SRC_URI="
-	https://github.com/samuelcolvin/watchfiles/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	$(cargo_crate_uris ${CRATES})
-"
-
-LICENSE="MIT"
-# crates
-LICENSE+=" Apache-2.0 Apache-2.0-with-LLVM-exceptions Artistic-2 BSD"
-LICENSE+=" CC0-1.0 ISC MIT Unlicense"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	=dev-python/anyio-3*[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-rust[${PYTHON_USEDEP}]
-	test? (
-		dev-python/dirty-equals[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-# enjoy Rust
-QA_FLAGS_IGNORED=".*/_rust_notify.*"
-
-distutils_enable_tests pytest
-
-python_test() {
-	rm -rf watchfiles || die
-	epytest
-}
diff --git a/dev-python/weasyprint/Manifest b/dev-python/weasyprint/Manifest
index d8fba7fae429..ac8a685400ed 100644
--- a/dev-python/weasyprint/Manifest
+++ b/dev-python/weasyprint/Manifest
@@ -1,5 +1,3 @@
-DIST weasyprint-54.3.tar.gz 404544 BLAKE2B 52eabcab05a6806fd137648ab1a9c0cf00865f98c59a7ca43052b98b6eb54c503465285a4ceca86557a5461cd737ce9174fcda0fead08ddcd8cf632e09108bfa SHA512 4b11a2fedb2ae41b0752093a9af26c23122337ade0289e36045c2e666677f2234c43f27f12d22d571365294705458c7b34f8b2656ab3d9337f145d5b0292e92b
 DIST weasyprint-55.0.tar.gz 410970 BLAKE2B ba77f249c3568031eff9b7110864b69113f71ea197d0c7136de01bd40155a437b5e540e87219e6ca49428b98d8ec471dcf9ed1d0224d68a3b320e5fffb568239 SHA512 96cc6de5af86da47aa0b5a84c3f00679690774574f3370ca319afe77f3eb9c9725f3b0a6cbddf589f23f444972bc77b07cce7e27ee2c466484636b3cb30250a3
-EBUILD weasyprint-54.3.ebuild 1069 BLAKE2B 990b3ea546068fbbe204bc328df21f9a63d8ffe031cf692bbf8aea6a6c21ba42f42933e96351a6ed27c0e71288668639854926b2007e889a3bd08321880c3bab SHA512 5df31ae924d16f392e372bca733ebc5b5089960e11d161a192d6a69c18a1f01d6ca9c7b810725cf22dae7817617d3d4229ea399fb1280f200df02b352c1d24e7
 EBUILD weasyprint-55.0.ebuild 1069 BLAKE2B 990b3ea546068fbbe204bc328df21f9a63d8ffe031cf692bbf8aea6a6c21ba42f42933e96351a6ed27c0e71288668639854926b2007e889a3bd08321880c3bab SHA512 5df31ae924d16f392e372bca733ebc5b5089960e11d161a192d6a69c18a1f01d6ca9c7b810725cf22dae7817617d3d4229ea399fb1280f200df02b352c1d24e7
 MISC metadata.xml 382 BLAKE2B 3e5d142b055354e1ea440d9efd4bf92458b1da3f777dd90929ce2041ca6e0969fa6e58aacfb4a5a93ff90805e0d8ec4c9c6253559ca54698f5029639ce35ac8a SHA512 43415064a6f56eaca974031e51d63118d1c65b33e4399302fc72cc2cd6f15e0a47cf411b18d3c5136e866115855deb19b6a9e058a18049151959ce5ee29ececf
diff --git a/dev-python/weasyprint/weasyprint-54.3.ebuild b/dev-python/weasyprint/weasyprint-54.3.ebuild
deleted file mode 100644
index 32e507b45ff5..000000000000
--- a/dev-python/weasyprint/weasyprint-54.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Visual rendering engine for HTML and CSS that can export to PDF"
-HOMEPAGE="https://weasyprint.org https://github.com/Kozea/WeasyPrint"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]
-	>=dev-python/cssselect2-0.1[${PYTHON_USEDEP}]
-	>=dev-python/fonttools-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/html5lib-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pillow-4.0.0[jpeg,jpeg2k,${PYTHON_USEDEP}]
-	>=dev-python/pydyf-0.0.3[${PYTHON_USEDEP}]
-	>=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/tinycss2-1.0.0[${PYTHON_USEDEP}]
-	x11-libs/pango
-"
-
-BDEPEND="
-	test? (
-		<app-text/ghostscript-gpl-9.56
-		media-fonts/ahem
-		media-fonts/dejavu
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/addopts/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/webob/Manifest b/dev-python/webob/Manifest
index eae29b07876e..60896e81c078 100644
--- a/dev-python/webob/Manifest
+++ b/dev-python/webob/Manifest
@@ -1,4 +1,3 @@
 DIST WebOb-1.8.7.tar.gz 278544 BLAKE2B 20d8b00f181f2966b918f106080907746dac33b64e75c31749bd774709ed8aa51024258240b89abddacb041073705410845993f93ecfa4b98a7a0fcb8a14e505 SHA512 ff6a1ce796a59d9c078dc908a0d6307a080230a5c806be2278eebcbb78016bed43067e78e3e4a6d72a5f51184c137e8267ac75cbb92b057db008b51a792ff489
-EBUILD webob-1.8.7-r1.ebuild 830 BLAKE2B fdb08974c7031991b8bfeded038175cf23e2c239844fc71667f50e40d622b8d8cd7d071fc0fef4d3ec12f2da26516446bcb60d4f35096cbdbcc0ece6960cc327 SHA512 604cbe8623af1b93b5eb7f5f1f4bc63bbf4a2277f8134556d09fa8249a64923351a82537c9aa9c714d140ad7d08e1fe1dddbda8d9287f8e42bbff555dc05b1a5
-EBUILD webob-1.8.7.ebuild 720 BLAKE2B fc329fa8774d4f75d47b81246c79fe10624e1f315aec166b23c42632796bbad4dbcd897174a95b156b30b75b84cda7458c251c2a59cf0c05dac77539d9a243ed SHA512 1eed8e67d64191a88630ba41b702e873144c8108dc41172034635abe6a68c80fa2d0d0f8e703b4f8484b2c05b042c54d7444017ce33144b5b13cc2096537242a
+EBUILD webob-1.8.7-r1.ebuild 822 BLAKE2B 9762f1a627a53271ab99372f2718049e92159168dd657e13b081d860cb1de0732fce7f7256beb49702a0c5b620f78749caabaa0f72a0edf427d0637231fdf48d SHA512 9427fdc1585eebd3a3065a5059bd63ade6af2bdc0cac6c75c07409ad0e23d257ea57634afd0e2dc682078e782d79a1ef95afa05ca5a9def43353f8ae278c0e0d
 MISC metadata.xml 445 BLAKE2B cdb3eff689afc9b236ff09ab4035cf30dbb1a22e26ece748bcb3fd4022b6cdfbf20e04213951f79b2259b2794104025dd7aca3f3348fe95bb032bb51c3f3f80a SHA512 6cfd7bbddb887bd8c64b34087ada4c9f099adeb765dbf935761b1dabb2fb4d2134e67062110399400e45070a8330ea63ff61a0af6b2c11d261f7cc0e894f5f7a
diff --git a/dev-python/webob/webob-1.8.7-r1.ebuild b/dev-python/webob/webob-1.8.7-r1.ebuild
index 230ccba5980f..cef16dc02f0e 100644
--- a/dev-python/webob/webob-1.8.7-r1.ebuild
+++ b/dev-python/webob/webob-1.8.7-r1.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 distutils_enable_sphinx docs 'dev-python/alabaster'
 distutils_enable_tests pytest
diff --git a/dev-python/webob/webob-1.8.7.ebuild b/dev-python/webob/webob-1.8.7.ebuild
deleted file mode 100644
index ba47d746d75d..000000000000
--- a/dev-python/webob/webob-1.8.7.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-MY_PN=WebOb
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="WSGI request and response object"
-HOMEPAGE="https://webob.org/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-distutils_enable_sphinx docs 'dev-python/alabaster'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# py3.9
-	sed -i -e 's:isAlive:is_alive:' tests/conftest.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/webtest/Manifest b/dev-python/webtest/Manifest
index 4672ef510afe..af83e8da4853 100644
--- a/dev-python/webtest/Manifest
+++ b/dev-python/webtest/Manifest
@@ -1,5 +1,4 @@
 AUX webtest-2.0.33-no-pylons-theme.patch 1556 BLAKE2B e108d05467d87aa0dcc50e8a9fcb8032eeabdf6801d5a66fa9cbe6f51b6dd4539c71b4ff1cf0ef39edfee689e51a6e67e30e473fffa8f2db9225ff23e3b4619b SHA512 6423cc275c2774b07819079d8fe8478cf2b322c16860b600dbd039480a8883252046a6c9fc2136ec4ff54a8adbfceeb3a8ee4a7e43faea17ec588f42a5eafd5e
 DIST WebTest-3.0.0.tar.gz 75871 BLAKE2B e97d050c1077d74e463e3409580d021424f755933bb9d5ac5e119c70c76890d5632e565f03a02f3497e21fed95158c56b199a877fc4575968f6b4af2655db8b6 SHA512 b97a6311d7e3bf653bec93c2390fb75c991d0dea6148680d8b6ff87861c130518a5d150dd157eab9b032b278566ad12c0ac8f5fc2ddbeba31e35de1e1f06f747
-EBUILD webtest-3.0.0-r1.ebuild 1102 BLAKE2B 98445082deae7a69cedb1d952871b4504e4cf978b225f2ffe3613399fa9215b70569b9351cbf891a2cea732e72c5d5ac7da8e8b02a8981d5f38ac702239c57f6 SHA512 fd67b06185033574ca78a93518c5018db9349421c807c01dbd9f70a6a556f535493fd5c7d71a324cf54f7f50a580c00f506f777bed1e9d66ddc12f925237dc63
-EBUILD webtest-3.0.0.ebuild 1018 BLAKE2B 70275e44e464318952d11b9d544493b1a7015ad14408e0160eb26211c946c76ac40fe8b6840926f564994be931898737edd7ed9b068717fc3e2fbb814b25d498 SHA512 97a8266840e72851ec7c680560cf335999c6c34ec3ad80775de806df96d955260548545daeb6a7d5af9d022a45d1c45fc44f25204448edf5451365898d4316b9
+EBUILD webtest-3.0.0-r1.ebuild 1094 BLAKE2B 712d192b8dde275b91a646581419699f91d03fa5d9df6d1e64744f6b16b8de5f90690c5bf84aff3b6c42aee326d667cc318835f4ea185d4dddc715acf988789f SHA512 0b7692b41191ea3f9eb4160eff2b3588bd2aa3b19b6e7707f6fdde54d308415216df1d44ef3b8e973bd4c812928420b1f362d8a907f4aec591ad0092f793f5b9
 MISC metadata.xml 335 BLAKE2B 423ef6b809d06fc79897080a0a1d99beb5c8ed05ea68b0bb9d93076d21407b75f332478de3462a7f267b495b7d99d0ca8b05fc04f2420ad05df7151048655b95 SHA512 c4f686825404a8be87906b4492ce190e9dd350eed9a9ddbe765f48e296e771be0db4937c608e49ff2b8a7d82c63e1d62cd84a67cfe57bfc1622e2223f8b8ee70
diff --git a/dev-python/webtest/webtest-3.0.0-r1.ebuild b/dev-python/webtest/webtest-3.0.0-r1.ebuild
index 69095a63ef2c..e630a7ea4cf4 100644
--- a/dev-python/webtest/webtest-3.0.0-r1.ebuild
+++ b/dev-python/webtest/webtest-3.0.0-r1.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/paste[${PYTHON_USEDEP}]
diff --git a/dev-python/webtest/webtest-3.0.0.ebuild b/dev-python/webtest/webtest-3.0.0.ebuild
deleted file mode 100644
index 8a826aad32b8..000000000000
--- a/dev-python/webtest/webtest-3.0.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-MY_PN="WebTest"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Helper to test WSGI applications"
-HOMEPAGE="https://pypi.org/project/WebTest/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/paste[${PYTHON_USEDEP}]
-	dev-python/pastedeploy[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2[${PYTHON_USEDEP}]
-	>=dev-python/waitress-0.8.5[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup4[${PYTHON_USEDEP}]"
-BDEPEND="
-	app-arch/unzip
-	test? (
-		dev-python/pyquery[${PYTHON_USEDEP}]
-		dev-python/wsgiproxy2[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}/webtest-2.0.33-no-pylons-theme.patch"
-)
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
diff --git a/dev-python/whisper/Manifest b/dev-python/whisper/Manifest
index 77c131adea63..cda355793297 100644
--- a/dev-python/whisper/Manifest
+++ b/dev-python/whisper/Manifest
@@ -1,5 +1,3 @@
 DIST whisper-1.1.10.gh.tar.gz 39459 BLAKE2B 998c4335236ace6b28f11b23fe74d3b618ba2f56939a3e9766e7010eb6b5d9bbdb46de83ba41dd926d3d38e738851133dc9805a4c79bd80dd67897e627147550 SHA512 291d441287ba090157fa01a7feb6985a6e1f057f4dae0f9133e2355e00f5fe219e10de339ecad3438a56b8dec97def14496d85c7a5fc5fc7611771bb3de08de8
-DIST whisper-1.1.8.gh.tar.gz 39117 BLAKE2B 591a3529725f300c6d8bab40444bdd41bcfe3d832893e954295d5387e047e2a639db4235131cd90fdb686395d51afccf30f64a52e194e4cd8e00b86e38f841d6 SHA512 0452c684128a750e30e926aee0cfd6c94f129eeb561246f9e1c66d7cf1f27f139df84f91e935237f89d0b4fac98678108568cfb94c2ab4138480f4db31471ab4
 EBUILD whisper-1.1.10.ebuild 629 BLAKE2B 45c3e838266832a96c3db3f04c674a5a6e744b01cb707181985522db46665d8697ece6d017ca558007af8889be834a409ee3f5c5f4cb51d3f21cd271724d6c34 SHA512 dd1edef606060c39bfef4ad175f221eb9df5ccbfe90bc49423c5f7e9e6100e3b5a50fa316921f525172293e1894b3efaacf68202ddeca35f188022978a9e086c
-EBUILD whisper-1.1.8.ebuild 608 BLAKE2B 9c03b7315b46c5db44cf13c384c61e226fa1608b1bc9d381b445bbcc3bf343e82c492187a210684c1b3dbbfe1f3fc126b5274fbbcf4ade996405c22fb865aa8a SHA512 a944b6e748575e26243fd9ee0636d9c1979e7404eb19400ce3b8c8d76dba0d4808d9a7f4c476973ee53ef9815b3a83684395e6f6219be073fe888fce314b52ef
 MISC metadata.xml 680 BLAKE2B 070ec3c5c71cea8d95302162acda73a61d7c0fbd195ec4edb8cc34c496be8e89d8254be122dbb2797de2fc5255fcc69a26f308aaf5058088b9df14f06a8e1e95 SHA512 3de2424fa3cf4c2482fc5ce743b37b53cd354424b0c11823918f64be6ab2ff5195794d73a0504a4e119e861d3f5f0f6a0dbb385cf37641e7acbf96812d752702
diff --git a/dev-python/whisper/whisper-1.1.8.ebuild b/dev-python/whisper/whisper-1.1.8.ebuild
deleted file mode 100644
index f960a40caf88..000000000000
--- a/dev-python/whisper/whisper-1.1.8.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Fixed size round-robin style database"
-HOMEPAGE="https://github.com/graphite-project/whisper"
-# PyPI tarballs don't contain tests
-# https://github.com/graphite-project/whisper/pull/253
-SRC_URI="
-	https://github.com/graphite-project/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-
-distutils_enable_tests --install pytest
diff --git a/dev-python/whoosh/Manifest b/dev-python/whoosh/Manifest
index 7993c080d80a..fa60c521e4a8 100644
--- a/dev-python/whoosh/Manifest
+++ b/dev-python/whoosh/Manifest
@@ -1,5 +1,5 @@
 AUX whoosh-2.7.4-tests-specify-utf8.patch 319 BLAKE2B b889ccda8723208af56659616ead64b1779c1bd96abff594a099ddeaa9aac3be86603dd0825507b30a900f38d80b184dfdbddfa42087969ec7fbce43cc8c1617 SHA512 53dc8336ac9895659d92001cb22137011d9da753c299bc3fecd34ed6b42f0f169967dfd41b0403462e54e62af1f6390c58386a91a89ddc880a4fe0a4e05ce14b
 DIST Whoosh-2.7.4.tar.gz 968741 BLAKE2B 698ec603eb1201f2b1a934785f84108cb5d91114c9a4e1943cfcd2c8c878f7fb0a0868d54d3a11f8aa30890179c555bdc11cbf34962f5f4781c6d43a090ba872 SHA512 7cdefdcf52b704ffe50c00718c42677e2ddfe879f81ad2d14b580b0e026cc0ebb6b9ddc99d8709eaff4eb9b83f654b042c8792821e1ed90aa85cfa6f82845074
 EBUILD whoosh-2.7.4-r1.ebuild 951 BLAKE2B 44614c3141871f95690ca85f3ea395f313e23787db959910c8030ffeb2cc6f3ad58788dbbc37c00e99512b6a1bae57e75a5ccc9255d831e990204e4642baa8a0 SHA512 b2ee09d070fd3bde49f01e778309e5d34b6c2fdd9524bcd295995944380c9ff7d1d2bfb7785e190b2f0859a848f12d4c234507a4be2996c7eb9e02c8c6938a19
-EBUILD whoosh-2.7.4-r2.ebuild 990 BLAKE2B 54c592b4b8f7f7a66cf00a32690d0333ef0fa9d5e092f3fc51e6b1a11667852d9e2b847a025f492c56652b9e8a47cdd034edd0adeb81c98e765388aa6724ace6 SHA512 5eeaf92b29cf0a86c5d36ea3358bb0b3782d0d70de4087db3cdf080176731c772c738849837cb19518fdfe4d6ab030d52b11500c186445ecc096f6f5a70b2c23
+EBUILD whoosh-2.7.4-r2.ebuild 984 BLAKE2B 76a20a856540c91c93fcdb7a2161a28ca85f5095f0ee9f2d35b337440b40108cd30e080df47035d6a5f6df4a8fc1f90c0d8cee094efebafdb6fa8af20d2a7567 SHA512 ab104650a5e1a18f32f97758f9078984840c4ff27e1f51ac601e4482010f07228ff23a67880c7bcd294474ff5723f822e30d42f270ccbf933bd0287e4945f12c
 MISC metadata.xml 761 BLAKE2B 5d3afd52974b702eb26f977f515504376f882070bf446569394569c7a08729d360d0a36ec6be4105388efdc573ed0149c04c6663df4370230b03652ac8cf57c4 SHA512 40e03c23018f70b331f168e19b78b54f1ad74b516227c2d4a8274dbd6b9fb058bd073a041d897253838c8f8ff9bfcfaeb1f6dd5312c4c4d6592acfbca4099fe9
diff --git a/dev-python/whoosh/whoosh-2.7.4-r2.ebuild b/dev-python/whoosh/whoosh-2.7.4-r2.ebuild
index f53d19aec534..7be34d942057 100644
--- a/dev-python/whoosh/whoosh-2.7.4-r2.ebuild
+++ b/dev-python/whoosh/whoosh-2.7.4-r2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P^}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.7.4-tests-specify-utf8.patch
diff --git a/dev-python/wrapt/Manifest b/dev-python/wrapt/Manifest
index 78dcf8927112..5c2faddeb198 100644
--- a/dev-python/wrapt/Manifest
+++ b/dev-python/wrapt/Manifest
@@ -3,5 +3,5 @@ DIST wrapt-1.14.0.tar.gz 133565 BLAKE2B 7548183c4b0b566df3a96cb309b44975a633976f
 DIST wrapt-1.14.1.gh.tar.gz 133767 BLAKE2B 407a9531f581b034be7fe4392dcbf94803aa9c3a82d7c392750dfef62a5cbb84582e292819bf749356fad2b6e98cc89777df0f3b0f4ca70422e75b72ad256711 SHA512 c67e99eb29afeefb2512fb545cd180b8e96f69235d6281edebe62ea5e411188a904a7e683afdda2d6a86cf8b7fd74f79a3c3bec04e19a7c5ef347729bb43f94c
 EBUILD wrapt-1.13.2-r1.ebuild 731 BLAKE2B 3ddc82845bfb1d3b9d3772c5dadba7251d373f57970ee6b88f0f14f00607552cb9d3969862178f7ec14fbd693fa488b74f24dc0af7b367aead78a8774f3ddb6b SHA512 657d6983a892deb69ebb395e4882b39bcbd4917cde336d7e4663ff56c1b96656b826ade7a54f2abd06fe9e11a8e7bf6b603485d9d06316af4e9a5d5cd5a2210c
 EBUILD wrapt-1.14.0.ebuild 731 BLAKE2B 3ddc82845bfb1d3b9d3772c5dadba7251d373f57970ee6b88f0f14f00607552cb9d3969862178f7ec14fbd693fa488b74f24dc0af7b367aead78a8774f3ddb6b SHA512 657d6983a892deb69ebb395e4882b39bcbd4917cde336d7e4663ff56c1b96656b826ade7a54f2abd06fe9e11a8e7bf6b603485d9d06316af4e9a5d5cd5a2210c
-EBUILD wrapt-1.14.1.ebuild 794 BLAKE2B 107e0a66cc07f3dd1e6822708dd65f4517c19f3e18d786a9762d96ffc058684cb51142198147414bdbeacbbac2ec040971553c698cce03009a655a913168db29 SHA512 93b5aa13f5a82cfd8a06a37dad4de6af967b2b13d29bd4d9a09e709ce7b0307a695dbd9eeb5013bb88ee05ad432c1943e892d57ea9e01395f73b98a0819f9151
+EBUILD wrapt-1.14.1.ebuild 788 BLAKE2B 928e9a6095460de4509dcb120773adf8bb5757de320066fbc479f2e8f2cda05d160faa10875a297a55de4b554bc94c7b4aa8ea8c965ac5a8d7ebdc59bd22f5d3 SHA512 00040b8c60e3569b707974e3dd9da97385e42fcefecb31c121c10774d07013503ee8b483c3b1e3e99e5b3fde310e13cda2198c48abf776f26e6e8257f85d3e5d
 MISC metadata.xml 370 BLAKE2B 251d8c90cd2a0a1b9fbc714b624c7113e9791f268130211160655f4e4e32aadaddaf98a95bb6d9fff5a5df128da9d551b1281a28e4bd7fa6e3c9db7d35b10829 SHA512 31b369317f4a44d593d9fb72bcb9fcb792809323862866da7c3464ca2282e29a65cd353909c05782b85b162cff363b0ad8ea4750d89c942d442034b9a6eb7dba
diff --git a/dev-python/wrapt/wrapt-1.14.1.ebuild b/dev-python/wrapt/wrapt-1.14.1.ebuild
index a2dc94a888c4..da0d959e740f 100644
--- a/dev-python/wrapt/wrapt-1.14.1.ebuild
+++ b/dev-python/wrapt/wrapt-1.14.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
diff --git a/dev-python/wsgiproxy2/Manifest b/dev-python/wsgiproxy2/Manifest
index be2022baf6c7..708cbe7cdae6 100644
--- a/dev-python/wsgiproxy2/Manifest
+++ b/dev-python/wsgiproxy2/Manifest
@@ -1,4 +1,3 @@
 DIST WSGIProxy2-0.5.1.tar.gz 16565 BLAKE2B 54bdc404111d910af61a59a7da5d47924e1950162dfb79dc0fd221a417c4fbb717dc4e7cf521589e3d087ffce1917449a199f5278bd4410ccce391b9c551eced SHA512 6be9d4893515cc70ee1c5d7b7a29895a8c8b5afd316e2ad05f92fc1fa93e26da22b93440994ec9782f0663ff7073e476f75351fb7955bde93a2b6fbf9f4bf78a
-EBUILD wsgiproxy2-0.5.1-r1.ebuild 850 BLAKE2B 3aa9ae4fd3b703d91776cc98eb2241a5cef556a59c79f8a17a109cccee95f6d85ebda47beb8c7fa24f0251f33cb81afb41d51745f1848b1d502e486ed0f4e70c SHA512 47f02944da9365c7c294e724df4676a5b2d2700a03d5bf125ddd5aa25f1b428afd8735bc2403d02d92c23a5938aa7c3b09dbd0c930d0b17a7a19762fc643493f
-EBUILD wsgiproxy2-0.5.1.ebuild 767 BLAKE2B 3c34feaa97c96509ff4dc76af2f9a3f4329db69c4cc38567646080ac94769578a367977487d397371fe550699aace291cb151e3de21ec2c1995f42e69e12a7fd SHA512 75353c8e861c128605710c82285893ecb73ecb5a202bc89fa91250f7e65a0dd798a5074a6b150317cde73534af6e7570fe9cecc6ac60506aeab41be5a3a81829
+EBUILD wsgiproxy2-0.5.1-r1.ebuild 842 BLAKE2B 4e520a2f784db92e661ae3397437001ffefc6dbe78276699f258d831a9f057e64fe8f0de8c4242793604924e830520ce509932ed21470bc68979d55beb53be6b SHA512 94f5c76d833406420a4119523869f14c245a3a25efc26125c5bf9a139501cffb51d5680be4c7de30c86a54fbeeec59341e453cf79504f823ab5b56a4ec002e7e
 MISC metadata.xml 338 BLAKE2B ad788fd89f5187ab162da326b7d3351c92f99a61f2a947832ae91c692f2202803fa6a754b05ff8f4ce9d752d28a490870dfbf630ecae510d03b24b2725329261 SHA512 38439e1fe9b37f8b911f42bd7e49b2f9455c7486551a8553e3b7ce91ef2f18ae50a93d535673bbff00b3faccee2082df96ac5e6da076dbc91fcecaf35c803f43
diff --git a/dev-python/wsgiproxy2/wsgiproxy2-0.5.1-r1.ebuild b/dev-python/wsgiproxy2/wsgiproxy2-0.5.1-r1.ebuild
index 5c20c2ae69e4..94bff3150d2d 100644
--- a/dev-python/wsgiproxy2/wsgiproxy2-0.5.1-r1.ebuild
+++ b/dev-python/wsgiproxy2/wsgiproxy2-0.5.1-r1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
diff --git a/dev-python/wsgiproxy2/wsgiproxy2-0.5.1.ebuild b/dev-python/wsgiproxy2/wsgiproxy2-0.5.1.ebuild
deleted file mode 100644
index 0c2ddec03054..000000000000
--- a/dev-python/wsgiproxy2/wsgiproxy2-0.5.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-MY_PN="WSGIProxy2"
-DESCRIPTION="HTTP proxying tools for WSGI apps"
-HOMEPAGE="https://pypi.org/project/WSGIProxy2/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/webob[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/webtest-2.0.17[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs
-distutils_enable_tests unittest
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index cfb7858638e8..ebfdc3ce3f49 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -1,9 +1,5 @@
-DIST xmlschema-1.10.0.tar.gz 396057 BLAKE2B 44facdb16e79ddf16ca798b937c4cf35444f9d31278c26121f179e5055134b82d425cc5b69a8a2e4fdd44388cbd3e96534b55794a267a3b4c0b606752ede533e SHA512 c4358b210cc96e46617cc11b1b7e2a4d69c1bd6489cc73602552b184f209eb90b13eff353741aa7b1dbc3ff8514f90b7bb331ac18ffc466b3ce36f42f7497899
-DIST xmlschema-1.11.0.tar.gz 453958 BLAKE2B d6879e0f0445dad7e86d7b11e14d3f249b3cde5242c7cde7c327005fb4268ae9f20b4bf0bc3c140284e82842e09cbcdc2d12a7f8df0bede85ffc8db39989ed49 SHA512 507b57b8d4f48eb9f2463898ad0bd245791a8c8086a544d45da1fb2d4f6edafa5e555d44bdba50974408f14251cb8acae2dfc2c1b5c4544088f336fdfee0793a
 DIST xmlschema-1.11.1.tar.gz 454932 BLAKE2B b80885b7bde87115caece3cdcd036c5ef7cc225acb01ca610c97b2759142a6deb1c29e9fbaf08f60ef4ec80ac4d7dd4b382dd5cd0b74f0f766101664a3cb7fca SHA512 58800377e4bdec70608286057093827fd72bce82117424753a37632c2dbccf2b4e354bfa6e62c3dec06ec98ff262eff258e18c0c6e6af2b5fd520ad11118531c
 DIST xmlschema-1.11.2.tar.gz 476302 BLAKE2B 61d194ae9d269c2bb8231b8ce9068cf0fb0019022abdb24748c4df8ede8821e1c197ea040e07bd267c060944ea1dcd4ada300995287f47e617daf2f923c54abc SHA512 777743e1a0711ceb3aa752b33d65b79e56252284cb911c504751152a86281fba9a39e96271fd8058093c65d69badecdd8e30d836578c9138ff988843fbe9b90c
-EBUILD xmlschema-1.10.0.ebuild 832 BLAKE2B 17e3942b555bc419a77695077c676163ecb80be93436724601c3d414d7c530a87e4845384108a6f99a5c8ce8895416aa5173f88979f4bfb771c357c1f2051ab4 SHA512 1b232654938e4bdbc443f080f7cd80793a52ac483ecbdf5540debb15cc16657fedda7845f7d89d0f2ef4a944c4cca9ca8e454710ad4c744f7cab2318e960a46c
-EBUILD xmlschema-1.11.0.ebuild 840 BLAKE2B e9d3ec065b1e72a9ad47329591f125f4ed683105f98cee1590d21309a357eb56794c8d9a3efb01af87819beef145aa3cc652d19e14d638bbfaf497a7860149a1 SHA512 d3c02d15745686e2aa0690a530a31eb57e83a3487fd09450fc7ed8cbaa089114bba443077fc3195e5ecc7b3eb7041a8b05b998c39337af71b937e34197cad4d9
-EBUILD xmlschema-1.11.1.ebuild 840 BLAKE2B e9d3ec065b1e72a9ad47329591f125f4ed683105f98cee1590d21309a357eb56794c8d9a3efb01af87819beef145aa3cc652d19e14d638bbfaf497a7860149a1 SHA512 d3c02d15745686e2aa0690a530a31eb57e83a3487fd09450fc7ed8cbaa089114bba443077fc3195e5ecc7b3eb7041a8b05b998c39337af71b937e34197cad4d9
+EBUILD xmlschema-1.11.1.ebuild 832 BLAKE2B 17e3942b555bc419a77695077c676163ecb80be93436724601c3d414d7c530a87e4845384108a6f99a5c8ce8895416aa5173f88979f4bfb771c357c1f2051ab4 SHA512 1b232654938e4bdbc443f080f7cd80793a52ac483ecbdf5540debb15cc16657fedda7845f7d89d0f2ef4a944c4cca9ca8e454710ad4c744f7cab2318e960a46c
 EBUILD xmlschema-1.11.2.ebuild 840 BLAKE2B e9d3ec065b1e72a9ad47329591f125f4ed683105f98cee1590d21309a357eb56794c8d9a3efb01af87819beef145aa3cc652d19e14d638bbfaf497a7860149a1 SHA512 d3c02d15745686e2aa0690a530a31eb57e83a3487fd09450fc7ed8cbaa089114bba443077fc3195e5ecc7b3eb7041a8b05b998c39337af71b937e34197cad4d9
 MISC metadata.xml 376 BLAKE2B 6aa6c0ef38b17f49452a3db71c7f449dfda8951e2196b904235592921620b6a2064021aae7a1a30639e637c3b9bdb46bcaebec1903a081a41832bd0c5199dde9 SHA512 b814209cd4b87ad5cb8bc447f1d485043d8386339607f39575faf2d26c19b69befa9fd7b7eb2d3fca4b5e60499091a59c1466cfc2f0d9651430949893e2edaeb
diff --git a/dev-python/xmlschema/xmlschema-1.10.0.ebuild b/dev-python/xmlschema/xmlschema-1.10.0.ebuild
deleted file mode 100644
index f3be2f731360..000000000000
--- a/dev-python/xmlschema/xmlschema-1.10.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="An XML Schema validator and decoder"
-HOMEPAGE="
-	https://github.com/sissaschool/xmlschema/
-	https://pypi.org/project/xmlschema/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/elementpath-2.5.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	"${EPYTHON}" tests/test_all.py -v ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/xmlschema/xmlschema-1.11.0.ebuild b/dev-python/xmlschema/xmlschema-1.11.0.ebuild
deleted file mode 100644
index 02ebb8c6be86..000000000000
--- a/dev-python/xmlschema/xmlschema-1.11.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="An XML Schema validator and decoder"
-HOMEPAGE="
-	https://github.com/sissaschool/xmlschema/
-	https://pypi.org/project/xmlschema/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/elementpath-2.5.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	"${EPYTHON}" tests/test_all.py -v ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/xmlschema/xmlschema-1.11.1.ebuild b/dev-python/xmlschema/xmlschema-1.11.1.ebuild
index 02ebb8c6be86..f3be2f731360 100644
--- a/dev-python/xmlschema/xmlschema-1.11.1.ebuild
+++ b/dev-python/xmlschema/xmlschema-1.11.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/yara-python/Manifest b/dev-python/yara-python/Manifest
index b2e4e8fbd80f..f7aff95853a8 100644
--- a/dev-python/yara-python/Manifest
+++ b/dev-python/yara-python/Manifest
@@ -1,5 +1,3 @@
 DIST yara-python-4.2.0.gh.tar.gz 34459 BLAKE2B fce460385eaa75dd1779fe49c7937ff36d7604433deb310b6fe9e66af9ea521952f92bee61829372cf19c7efee170329609530f1f9e863991720e4887c3c1349 SHA512 ba08d709fc51679ec9fe36165e0864b79fc241f85c681bf59823fe7bb0e34e928cded050ff296147eb5bcb837485f39949aa93425a0eb9ca8b3730e60fac93f4
-DIST yara-python-4.2.0.tar.gz 34459 BLAKE2B fce460385eaa75dd1779fe49c7937ff36d7604433deb310b6fe9e66af9ea521952f92bee61829372cf19c7efee170329609530f1f9e863991720e4887c3c1349 SHA512 ba08d709fc51679ec9fe36165e0864b79fc241f85c681bf59823fe7bb0e34e928cded050ff296147eb5bcb837485f39949aa93425a0eb9ca8b3730e60fac93f4
 EBUILD yara-python-4.2.0-r2.ebuild 773 BLAKE2B 628b2f73e6c9267383fd174b1cf51b934ce4913a369f4d1b095de44716c3dde86cebcb5144def6c7c06ff474e82aa57d51afa9ba41915907dce8d88d594e783d SHA512 0d379b146930496b2932f319923789d723f00d65586bf0eaa5d51b50a1031522dc4af97b3fa4c26da598c0e8614150cb4ab74e3a79b62b4dfb27ce17471d8a3f
-EBUILD yara-python-4.2.0.ebuild 801 BLAKE2B d3bc9bb4b97035346f9ba9044157e2041c8c6aef42c019fd1e9c96840794d39a60ad65a6a2e15aab7ca1dced6f17c38910633023dfaafca890c26b6c6f13a0e5 SHA512 8704c04cb423c518c454d3128d0fca22aef5b0f1a5481d5bb259e90587801eea38f952eb5624f7434c8894167afaf4d293fba53337e1fc5d3d9bcbec569147ed
 MISC metadata.xml 735 BLAKE2B 43ee6948356d63c37a63a904c1975c0698c5f5db1cc2087108e060a2a0b071900eb6615b8a7a8cea67589cb2dae17cbdd425d2e518785c45aadf490773fe88fa SHA512 d18530850cca51e764c8b3c1575464eabb23beea351d464358ab243dc463b916ed8a28c8ff958ce82486791575343d9be2083f90ab55aa11d342032d0ec1d3f0
diff --git a/dev-python/yara-python/yara-python-4.2.0.ebuild b/dev-python/yara-python/yara-python-4.2.0.ebuild
deleted file mode 100644
index c9eca9c95ffd..000000000000
--- a/dev-python/yara-python/yara-python-4.2.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python interface for a malware identification and classification tool"
-HOMEPAGE="https://github.com/VirusTotal/yara-python"
-SRC_URI="https://github.com/virustotal/yara-python/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="${PYTHON_DEPS}
-	=app-forensics/yara-$(ver_cut 1-2)*"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests unittest
-
-src_compile() {
-	compile_python() {
-		distutils-r1_python_compile --dynamic-linking
-	}
-	python_foreach_impl compile_python
-}
-
-python_test() {
-	"${EPYTHON}" tests.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/yarl/Manifest b/dev-python/yarl/Manifest
index 9875c4f687f7..7e51d3e105a8 100644
--- a/dev-python/yarl/Manifest
+++ b/dev-python/yarl/Manifest
@@ -2,5 +2,5 @@ DIST yarl-1.7.2.gh.tar.gz 108115 BLAKE2B 7bd212b652a77ac29fde4c6565c48c4067f2a24
 DIST yarl-1.7.2.tar.gz 168562 BLAKE2B 7da82193e9fa0d317bd4ba46d63ce04a36c95fc3a389d6800d12e0ddecaacb41c07a665db9e731a9112d98a0f3133861b174dc62523da202d0d06f4cb995c354 SHA512 ac5b630dd592ffa8b095e4d7eee2facaeac8ab578e55fd8856c6a6349f514081020c707cd0b33f250c0e78133e92ed6156835660f14c5ae54d60b4fdf6ea50ea
 EBUILD yarl-1.7.2-r1.ebuild 690 BLAKE2B f93b9addda1ad069ce2a3f301e60c6b377d26dd4f04cbb03236256807160c75a5157e6de4490ca7c129936cb9d6eb038b2a9fdb855c3cc423827560e2fc47bf5 SHA512 90012b9dab794efd3d197e25fa339232cc73b81808a69455d61e3ae2e5f3f571cd00604d13d8fbf202e19c58a655732107b4166f90d035c341ab775328501df7
 EBUILD yarl-1.7.2-r2.ebuild 766 BLAKE2B 53387e759c8c333638b684892b8d0dcf45e0fa6127f1305d7d686808dfc26af6cd2b948dfb030f44d2b82e653838e74409bfcc2a809e12675f7da4ede031536b SHA512 fd87d9cd9c3c5b82526d1e9dc1a681d2f116294489712a0e7cea4662f1cbd902dac9e18614abbfc81d64507467ac3bf8d6c0f4147253fda6b086856777c2df34
-EBUILD yarl-1.7.2-r3.ebuild 918 BLAKE2B 72373c54cf93ea0df89c030684cc0975fcc9aa6c508f10e19ef08dd4acd404477bc6cd2cfe02f6b334ddead19683f6416750eb9ecda206093a29b9d39253af4f SHA512 12460e120e522e3abb3355d0331e63ecc9c93a15e82219efde14c2afde343678e418987adc90d9e5a9ebe759ab9aa26d7918f58bf50a630651bf6433d07a9054
+EBUILD yarl-1.7.2-r3.ebuild 912 BLAKE2B e8808323941b75c661aa1503e30cedafbdb9ba14d6a364a4322f885a84c72a50632369fc51af5501ebf8cdd7fee89dc150c3a747844af595db632354113fd96b SHA512 520b80b458df4cdc1561cddf528acc63f68dd3ec8b86dd6a43ed60b1ec00f93dc8844c682386306c3e3e4a1b80a049a01d641b9e316a907b91058551b417a5dd
 MISC metadata.xml 440 BLAKE2B 10fd0e37c9be76c5d1dd90b9fd1cb1e5161fc5a7d2b51bcb5658a8c187a67d5f9573241733c3f9570e9fb7767bf84b38a6f8b2c212596627bea4e1686b7eb41e SHA512 c9e340124ed93cb0d52a0ae5abd43c10528197893c3d5ab57a0eb7046ebae5b80119f7b033d6697110c4bc064c0a8581d904788f6969cb52a433064067898cbe
diff --git a/dev-python/yarl/yarl-1.7.2-r3.ebuild b/dev-python/yarl/yarl-1.7.2-r3.ebuild
index 7ea5cc25c82f..0c3ba06ef0c5 100644
--- a/dev-python/yarl/yarl-1.7.2-r3.ebuild
+++ b/dev-python/yarl/yarl-1.7.2-r3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/yaxmldiff/Manifest b/dev-python/yaxmldiff/Manifest
new file mode 100644
index 000000000000..88fedfd23a33
--- /dev/null
+++ b/dev-python/yaxmldiff/Manifest
@@ -0,0 +1,3 @@
+DIST yaxmldiff-0.1.0.gh.tar.gz 8938 BLAKE2B 9fd9b9ede1d5c28c7d5a47967748de411dbc56b0191c4bcb7f2ee6270093523172497d470c6b99e87ccf50c8a70310500b103ecc3d28a49046f09c70055564b0 SHA512 3b853edd13a95f92d82f563d784d30df4f2876d0a9bf89ad67b3e53228a908fe32407386c221725b30668ac2b98be98623a2fb6da8e268380ee586b49e5ae78e
+EBUILD yaxmldiff-0.1.0.ebuild 724 BLAKE2B 1751663db22bc18661e56069febf01f051a7b591bf0744c4b13636ec0ed09753d63522f15684cc91c156cf935a13c77ac36fbffa0218893d9a71ae7bf2af9cb1 SHA512 d15e27c0f0dd28cb37c4b7ce2da72a42cd2c5262d148b8ddcf1cd779629446b2f352535c23948f4aa50476aced393941497658e78b6a224bcba3c4e5915b6630
+MISC metadata.xml 322 BLAKE2B d150713c55bd5a505278eab1b3912481dc9450ac4aa0e71b5f91807e967ed342e35763dc3a9dc6edf19ce31b6ce93d94aa6b751e2f88d58d01a30c0e3d6a0ffd SHA512 91346390be609364c482375fbef62e11ea5d1d0b9da9b36c1dd8b0a45f2f01b682c3fcc67035d1e6ac45e6468c6c5b63cd365b672a8adf170ecacc5bdb43fafb
diff --git a/dev-python/yaxmldiff/metadata.xml b/dev-python/yaxmldiff/metadata.xml
new file mode 100644
index 000000000000..a0414b1c10be
--- /dev/null
+++ b/dev-python/yaxmldiff/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">yaxmldiff</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/yaxmldiff/yaxmldiff-0.1.0.ebuild b/dev-python/yaxmldiff/yaxmldiff-0.1.0.ebuild
new file mode 100644
index 000000000000..36841a23fede
--- /dev/null
+++ b/dev-python/yaxmldiff/yaxmldiff-0.1.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="Yet Another XML Differ"
+HOMEPAGE="
+	https://pypi.org/project/yaxmldiff/
+	https://github.com/latk/yaxmldiff.py
+"
+SRC_URI="https://github.com/latk/${PN}.py/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/${PN}.py-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/lxml[${PYTHON_USEDEP}]
+"
+
+# no tests currently
+RESTRICT="test"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i '/license_file/ d' setup.cfg || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index d9c6527c16f8..22ad29943997 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -1,3 +1,5 @@
 DIST python-zeroconf-0.38.6.gh.tar.gz 134795 BLAKE2B 839d59d7c46d9ab16145e37bb58acc7a71072b00507ee0ae8325fea9a3ebc0e567f9e257937675f8eaf44095c7449f96e6bc42b82d34f75a39cc87fd29be2766 SHA512 274db525751191b0188a4f00505c795420f975de3f714f84f2207271ff484bb5de1c881c0ed00b1ad3a6265d5d461519cf46041ab907026d9e6937844bbab6af
+DIST python-zeroconf-0.38.7.gh.tar.gz 134866 BLAKE2B 060ffdc45d4ec8092cd278b99a74561fd1ea06aba3cdecadbd35c1c5e3f608befe3ced18009d8d64c5b37388ee57900b4b00a44c90d87923f259e798da5bb962 SHA512 a0ab90f30b843bc889daf95eab6d806a5e3fb4ffe5e3857c435f14a85de7b659b8386159f6428f05a34f2e3010f4582f7d3a55bbd6e6ede0008247821f666707
 EBUILD zeroconf-0.38.6.ebuild 1365 BLAKE2B 0d2b743e81200bb4a3a2cf7053fd572ac6cfa1cdd8a32cca98ed0d2338a264a2d02782c8352746e5041aba9d518755e018277eabc3e33bf9302f826f03acc3ff SHA512 d8f8fdb6f2bca9dea6b2a1901e9cc84575222b1585e8c0eb1339cd413cf303e95487592582fb8a27cc982a015ef40e8886a02d6120c1c828a042081d828be7bc
+EBUILD zeroconf-0.38.7.ebuild 1367 BLAKE2B f9a582d3632ec0ed395de8c7413b3df552f770489683fbccba02a97d33ee1432e90a15baaf85c98b0321cbdfbc20a636c8525a7aa59feb08e57359b72b77b34a SHA512 642de855934c35c1a60d430679b2293cb7652cbcd2267c2f682bdc66ed595a9e1bef30f68e5ce07808afa59d3ea3d960cb1d4a9206df49a2b86bad0c7df7e729
 MISC metadata.xml 413 BLAKE2B f93eceda07029400d2fd7ab38f234e5a1747e3d86f228adc973bbd6cdc71456778a7d926457f976cb2c6f55678b2c671d2415e5c7a480306582f1e70f6f733dc SHA512 d228e198b2f495dd02cd3d9d948aae123461c70c8e0185a47b133000f0316a84ff33d9b6f4cc0196bca5cf638e53ae58a3cd746338c33729d957a1170a5f08dd
diff --git a/dev-python/zeroconf/zeroconf-0.38.7.ebuild b/dev-python/zeroconf/zeroconf-0.38.7.ebuild
new file mode 100644
index 000000000000..5fbfc422a51f
--- /dev/null
+++ b/dev-python/zeroconf/zeroconf-0.38.7.ebuild
@@ -0,0 +1,50 @@
+# 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
+
+MY_P=python-zeroconf-${PV}
+DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
+HOMEPAGE="
+	https://github.com/jstasiak/python-zeroconf/
+	https://pypi.org/project/zeroconf/
+"
+SRC_URI="
+	https://github.com/jstasiak/python-zeroconf/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# network
+	tests/test_core.py::Framework::test_close_multiple_times
+	tests/test_core.py::Framework::test_launch_and_close
+	tests/test_core.py::Framework::test_launch_and_close_context_manager
+	tests/test_core.py::Framework::test_launch_and_close_v4_v6
+	tests/test_core.py::Framework::test_launch_and_close_v6_only
+	tests/services/test_types.py::ServiceTypesQuery::test_integration_with_listener_ipv6
+
+	# fragile to timeouts (?)
+	tests/services/test_browser.py::test_service_browser_expire_callbacks
+	tests/utils/test_asyncio.py::test_run_coro_with_timeout
+)
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 6fe06e434d8f..2df4b7a695e5 100644
Binary files a/dev-qt/Manifest.gz and b/dev-qt/Manifest.gz differ
diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest
index 6a98b853ee82..f251cf656fb0 100644
--- a/dev-qt/assistant/Manifest
+++ b/dev-qt/assistant/Manifest
@@ -2,5 +2,5 @@ DIST qttools-5.15.3-gentoo-kde-1.tar.xz 1472 BLAKE2B eb4f5555127b91767a06c126795
 DIST qttools-everywhere-opensource-src-5.15.3.tar.xz 8896764 BLAKE2B 65a5d67a5f1c00c244ed91baf24ca10cd2e371963c4f55b3837701d71859b7adc03897db2021040eb08b85eb0f5d353bc8b9d7944aecbeec64397f7e0c20735f SHA512 3c4ffee1d67126e3dd10c1dabae3660b94b97541480814b77bc88c0eaf86d8d43324d582465521fbdbd49dbb4155561f93e91c998dc1ad6553da02a3fcb0da47
 DIST qttools-everywhere-opensource-src-5.15.4.tar.xz 8897256 BLAKE2B e7d8055c9b4b52b188f61c73a300275838647d95f9eb0437129482d91584bbc0705ce9360b0a8fee2775a4cfefda53bc5aae70b10ca34d1bdeb09aa19b7d13bb SHA512 26edf546a1ec7195f1ff5a9e40e430fdd0c7ebb7d86e44ed22b093426c23ff25b2c972fa520abd1064369d32609019746c2fe972a3f593c6f7539d339642f06e
 EBUILD assistant-5.15.3.ebuild 1316 BLAKE2B e04358efb7e28a433664133c45f56fb54323dcdfd50469718fec2b50279bfa17e4b3a9c8cad0abd027b4a5b0daa7d75af8344bd019cce0b9a59779fcd8a15f42 SHA512 15f55981e0f5006dbc0c76c58d3c7342fa09d41a61e8d2b84137b2385cf5307c392b54d495b1f2cf5ff7e3619f899b35a32bbb379fe79da8883f8903aef4cc29
-EBUILD assistant-5.15.4.ebuild 1297 BLAKE2B 280a03272cce5ecfe95b4bcace41593465c4493b2973eb2d80037f428aaef6f25304e83f556818605eab344d93c570be65e4a9af19c04511e30d95ced70e78ca SHA512 79116973fe76853450e806f90763f66bece1e641b23fdef3bb544f9861020c47aa98ffcc74d54e4a6ed41e08b4b9e18fe01e904b696d09409ed3fe3bab74f1bf
+EBUILD assistant-5.15.4.ebuild 1295 BLAKE2B a8d6ee3f7e92eb14e34476d3962ca7d75007b068843cbb8051af3d879a7d7e4ab169434543c01c8a3d98e69ceb947df84000b59455597218a41987fd48f80968 SHA512 54ffe4d56c48c25d5d16b6873705f8047248694665aac35df3db75b8b2241487e64f3ed6238676af1f50206868efbaed769acbb95feb2f296b993c3aded51a22
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/assistant/assistant-5.15.4.ebuild b/dev-qt/assistant/assistant-5.15.4.ebuild
index 16ae7589bb8b..2a3b87115ad2 100644
--- a/dev-qt/assistant/assistant-5.15.4.ebuild
+++ b/dev-qt/assistant/assistant-5.15.4.ebuild
@@ -9,7 +9,7 @@ inherit desktop qt5-build xdg-utils
 DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/designer/Manifest b/dev-qt/designer/Manifest
index 6abd6aed0032..1304eecfeff3 100644
--- a/dev-qt/designer/Manifest
+++ b/dev-qt/designer/Manifest
@@ -2,5 +2,5 @@ DIST qttools-5.15.3-gentoo-kde-1.tar.xz 1472 BLAKE2B eb4f5555127b91767a06c126795
 DIST qttools-everywhere-opensource-src-5.15.3.tar.xz 8896764 BLAKE2B 65a5d67a5f1c00c244ed91baf24ca10cd2e371963c4f55b3837701d71859b7adc03897db2021040eb08b85eb0f5d353bc8b9d7944aecbeec64397f7e0c20735f SHA512 3c4ffee1d67126e3dd10c1dabae3660b94b97541480814b77bc88c0eaf86d8d43324d582465521fbdbd49dbb4155561f93e91c998dc1ad6553da02a3fcb0da47
 DIST qttools-everywhere-opensource-src-5.15.4.tar.xz 8897256 BLAKE2B e7d8055c9b4b52b188f61c73a300275838647d95f9eb0437129482d91584bbc0705ce9360b0a8fee2775a4cfefda53bc5aae70b10ca34d1bdeb09aa19b7d13bb SHA512 26edf546a1ec7195f1ff5a9e40e430fdd0c7ebb7d86e44ed22b093426c23ff25b2c972fa520abd1064369d32609019746c2fe972a3f593c6f7539d339642f06e
 EBUILD designer-5.15.3.ebuild 1327 BLAKE2B 1dfe125b3613bbc57d46957ca987898487599c496883852bc06a1636add78884d6676b54e16ddd3de5a31952693ecf86c7656a0fe0a436748c3dd71a36bc7043 SHA512 808d4d8655ba0a4e5ee725c2d3600a76636a55fb2a6d2140dcaab95fd7f97e6e1f0d5fdcacbd98883b992fea83d521eb410eb531cef8b57b6abebdf82113f7fe
-EBUILD designer-5.15.4.ebuild 1310 BLAKE2B 5c55425dfc038506d5382559500cadbb44ff9c03c22a8688bc4f2ed435af3f6d539c1d8a692cbf0a56a030ad2410959386a3db191d38d1c79a72b1817560a135 SHA512 8528ba1d3298dbc6deaa0710300a5609a16ba03760f1b94f4ce21278acf925787e0913b25c33db9c676f024eceddf6d579ebe430e85a0f32e792f6c6a42cde6f
+EBUILD designer-5.15.4.ebuild 1307 BLAKE2B 922162ae0c94bb1252f9b3a17f4ff55824ad780abcee2a4ed7b94d8d481630eab15b1034a633bf551e783122bbebb2f4855b6704e6b5e86b941c872e01064f36 SHA512 10d2ca94e19576a0a6dc9c2603309be99f71e313a868e68ace1f7604ea8b4618ad8ee812f92f53a568ef1d70713d0bee5fcd4269b38a8e2fe071d8bed54ec2c2
 MISC metadata.xml 565 BLAKE2B ff18f784bf09ba4add0fe5a9966a07ba2694dd84046bc528b22bcfd643a7e57be99235bd98eca4e58f68636f9fe6c8e274aabf82ed2055c6a4c70d10c60864ed SHA512 357d80b857e508aeceefcb45ab3757ce24d6ec3e1fd67642f2cbedf496748f89ab5a9726eb974bea8d5b1693601a965571913f79b1325aeaf9020183882ba16d
diff --git a/dev-qt/designer/designer-5.15.4.ebuild b/dev-qt/designer/designer-5.15.4.ebuild
index d95e33b3cfdb..e47414a7458f 100644
--- a/dev-qt/designer/designer-5.15.4.ebuild
+++ b/dev-qt/designer/designer-5.15.4.ebuild
@@ -9,7 +9,7 @@ inherit desktop qt5-build xdg-utils
 DESCRIPTION="WYSIWYG tool for designing and building graphical user interfaces with QtWidgets"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
 fi
 
 IUSE="declarative"
diff --git a/dev-qt/linguist-tools/Manifest b/dev-qt/linguist-tools/Manifest
index 57ec85f0527f..c13fe6028807 100644
--- a/dev-qt/linguist-tools/Manifest
+++ b/dev-qt/linguist-tools/Manifest
@@ -4,5 +4,5 @@ DIST qttools-everywhere-opensource-src-5.15.3.tar.xz 8896764 BLAKE2B 65a5d67a5f1
 DIST qttools-everywhere-opensource-src-5.15.4.tar.xz 8897256 BLAKE2B e7d8055c9b4b52b188f61c73a300275838647d95f9eb0437129482d91584bbc0705ce9360b0a8fee2775a4cfefda53bc5aae70b10ca34d1bdeb09aa19b7d13bb SHA512 26edf546a1ec7195f1ff5a9e40e430fdd0c7ebb7d86e44ed22b093426c23ff25b2c972fa520abd1064369d32609019746c2fe972a3f593c6f7539d339642f06e
 EBUILD linguist-tools-5.15.3.ebuild 734 BLAKE2B e57be70411810f6074b4ef3fa073717d8bf3d132efc9510453c80f523d959cfea1b04e5fc1cccc09d09d0866c9361559fde73d359861fdf22a66ff21ec0c978f SHA512 a60702ac97ff04c4d493dacd610f4c9ba90860c7d5eb6eea91ab630eb7b46998da9da8b9598693b96245b2e7642de7ffae763ed9745973d8e9af682c1fc11cdb
 EBUILD linguist-tools-5.15.4-r1.ebuild 740 BLAKE2B 616b3210eec8f78329a43fe236f2e7039d46b7592eeaf17bb610014c438221375e14432e5f7f690cc0b3f9f8d99b64c4927d2a62521712099725548e95df2839 SHA512 df9a82115c925e6714e72a1808ded642aa3e6cee85b922ad88f98f032c21d61072c4c1b8cec2a817ef8d9078b5f31654ac2c11773b0e8d317fc063d93cc334f3
-EBUILD linguist-tools-5.15.4.ebuild 717 BLAKE2B 0f85cd401b4e8c19e3a4d429dc1909eeab176071f1a08c780bcedd12a5f17351473a35523b80cff4bb93d8aaf4a4cdcf47244b02cbefa6ebc693e5cbb74832bb SHA512 df0067cc9750a93d1fe69abdeb773f63378c2ff8a2ee515718fd4052a3fbc8076a208dbdb6a9dd2c7e0e2ce363676b829a84e71cebad4faa388658749f3300e4
+EBUILD linguist-tools-5.15.4.ebuild 714 BLAKE2B 1811d97d6ecdf48b63ca00a342a6045f7a672a94a61750bb6bd0028953364c74806541adf3bb848b62d27593b14c78513bc75653b40a94093b1b143df3bfbeab SHA512 2c4012acbba4b785776982cb2688bafb5106a560ae1052ef2fe12216d6d62f13eb1f29dbdd6deb6d3816496b499e0d2180b1412d3d8fb25d5a72668c8b52677a
 MISC metadata.xml 553 BLAKE2B 0306175072e5a0abff04f61eca76aa56daba272d1308419efd9ab80c4693eb795012b4e45a4cc102f6a9ec842105a805d9c5e75f84ae8007508a4d7d807d444b SHA512 d1edc09cbb7d757cd72b9b3dce980e0fede2cf69a83b78a072d81aea97692cb235227213cf02aa8207f33bc4a510a63baee359d5e8669ea7e0e5268dcd522e79
diff --git a/dev-qt/linguist-tools/linguist-tools-5.15.4.ebuild b/dev-qt/linguist-tools/linguist-tools-5.15.4.ebuild
index 101a67080a34..7b1217781b43 100644
--- a/dev-qt/linguist-tools/linguist-tools-5.15.4.ebuild
+++ b/dev-qt/linguist-tools/linguist-tools-5.15.4.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Tools for working with Qt translation data files"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/linguist/Manifest b/dev-qt/linguist/Manifest
index 8a69927e86fe..a77c0b81b762 100644
--- a/dev-qt/linguist/Manifest
+++ b/dev-qt/linguist/Manifest
@@ -2,5 +2,5 @@ DIST qttools-5.15.3-gentoo-kde-1.tar.xz 1472 BLAKE2B eb4f5555127b91767a06c126795
 DIST qttools-everywhere-opensource-src-5.15.3.tar.xz 8896764 BLAKE2B 65a5d67a5f1c00c244ed91baf24ca10cd2e371963c4f55b3837701d71859b7adc03897db2021040eb08b85eb0f5d353bc8b9d7944aecbeec64397f7e0c20735f SHA512 3c4ffee1d67126e3dd10c1dabae3660b94b97541480814b77bc88c0eaf86d8d43324d582465521fbdbd49dbb4155561f93e91c998dc1ad6553da02a3fcb0da47
 DIST qttools-everywhere-opensource-src-5.15.4.tar.xz 8897256 BLAKE2B e7d8055c9b4b52b188f61c73a300275838647d95f9eb0437129482d91584bbc0705ce9360b0a8fee2775a4cfefda53bc5aae70b10ca34d1bdeb09aa19b7d13bb SHA512 26edf546a1ec7195f1ff5a9e40e430fdd0c7ebb7d86e44ed22b093426c23ff25b2c972fa520abd1064369d32609019746c2fe972a3f593c6f7539d339642f06e
 EBUILD linguist-5.15.3.ebuild 1116 BLAKE2B e229f5a67cf862235b4c43fad5ee5be8a18425f80b87a4cf744dc4fe0d4ea3b541f0610f9f3653a4181a563e1282f6713c8731ba0b33304b5329a52959f7527e SHA512 e27c03aa00b2d1d1055c56ff0177a4d1bca45d4756ec2aa07855de8895e1b0a5e08bffcc0bb565a1f30d849abe91c1997a1e51cdedb2b2fd94a5d596b422d7cd
-EBUILD linguist-5.15.4.ebuild 1097 BLAKE2B 31b24af0b9bc485b0d7047b9aabb3e4ad3075ff72e618eaddf3cff5602177b32dacfe1ccd7260f03afb31485e8b22775752b713d104be1b27d1e3c95abcfba3f SHA512 acaf3e20322e738ba5dce9f3da03c7ba91839142d66fcf5a63d3a40cbe506d68adfd1770fd507fa620f90851bd7fe81ffe4919026e3d809112d2ff03de96a25d
+EBUILD linguist-5.15.4.ebuild 1095 BLAKE2B 7dc6e906a1f5df26f8a157940cdb508167f2f877bf3917e0a89e4a444678303610b5bcbef561715ae35e7c3568addee99643692d7653585fcce760a15619755b SHA512 e068390af600867c4d7f9a59c167731ba00788e60df40dbbe57d6b4c194aacbcd11434bb259dd8e0973d7f9a8b39be3821bdca5e6ba2869df02507edaea7beeb
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/linguist/linguist-5.15.4.ebuild b/dev-qt/linguist/linguist-5.15.4.ebuild
index b04a8217b0c4..02259eb810bf 100644
--- a/dev-qt/linguist/linguist-5.15.4.ebuild
+++ b/dev-qt/linguist/linguist-5.15.4.ebuild
@@ -9,7 +9,7 @@ inherit desktop qt5-build xdg-utils
 DESCRIPTION="Graphical tool for translating Qt applications"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/pixeltool/Manifest b/dev-qt/pixeltool/Manifest
index 2891470986bb..d5514567e98e 100644
--- a/dev-qt/pixeltool/Manifest
+++ b/dev-qt/pixeltool/Manifest
@@ -2,5 +2,5 @@ DIST qttools-5.15.3-gentoo-kde-1.tar.xz 1472 BLAKE2B eb4f5555127b91767a06c126795
 DIST qttools-everywhere-opensource-src-5.15.3.tar.xz 8896764 BLAKE2B 65a5d67a5f1c00c244ed91baf24ca10cd2e371963c4f55b3837701d71859b7adc03897db2021040eb08b85eb0f5d353bc8b9d7944aecbeec64397f7e0c20735f SHA512 3c4ffee1d67126e3dd10c1dabae3660b94b97541480814b77bc88c0eaf86d8d43324d582465521fbdbd49dbb4155561f93e91c998dc1ad6553da02a3fcb0da47
 DIST qttools-everywhere-opensource-src-5.15.4.tar.xz 8897256 BLAKE2B e7d8055c9b4b52b188f61c73a300275838647d95f9eb0437129482d91584bbc0705ce9360b0a8fee2775a4cfefda53bc5aae70b10ca34d1bdeb09aa19b7d13bb SHA512 26edf546a1ec7195f1ff5a9e40e430fdd0c7ebb7d86e44ed22b093426c23ff25b2c972fa520abd1064369d32609019746c2fe972a3f593c6f7539d339642f06e
 EBUILD pixeltool-5.15.3.ebuild 607 BLAKE2B 76524be4fa072866df788ddd11de0392ff004d509a5137ac003dbfdc52280008c174cee2b9635766d2825ca05c72418874087ec9c5aec191f062cff2266e231c SHA512 a085561da318b762f079661e39b497708271893e144a28d33dcdfbd77cc7648c30db04d980ddffaf210b16bbb78e916fac517a5a0ca51c7b84c6a9125427c569
-EBUILD pixeltool-5.15.4.ebuild 588 BLAKE2B 10da0fa11e1018c316601bf8d078d798eb6dd19440a3323809128aacf8dbb287cfe648749822b7b17795b3771196433628c586d3f06ecaba88d90e60f744ad09 SHA512 fb9e79910326b902c5db9f379202feafc956302fdf041501e72d00475f3fde583382ee873ac92a552014d3e727acf2bf0cbd294c1c1b24e4c2898f8f79f98789
+EBUILD pixeltool-5.15.4.ebuild 586 BLAKE2B a1c051df1441ef10d68ac8bc79fb630bc60a2ccd2102bbd16b638fba917d4ae31483bf742a49faad84a37991df3309535ceca4141be2bf750a13613efdc28a8a SHA512 0288135b84358a75a2391d758652025f4fd16a1148feedabee8ee19da897bde5e27bce46880fa0bf6731d52fdd02690d3f7f24997e29b0e69bb84b8b065b02c9
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/pixeltool/pixeltool-5.15.4.ebuild b/dev-qt/pixeltool/pixeltool-5.15.4.ebuild
index 0b2b3de5b807..fe99c2830ccc 100644
--- a/dev-qt/pixeltool/pixeltool-5.15.4.ebuild
+++ b/dev-qt/pixeltool/pixeltool-5.15.4.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Qt screen magnifier"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qdbus/Manifest b/dev-qt/qdbus/Manifest
index 9f0a4f2bc038..621849e53b16 100644
--- a/dev-qt/qdbus/Manifest
+++ b/dev-qt/qdbus/Manifest
@@ -2,5 +2,5 @@ DIST qttools-5.15.3-gentoo-kde-1.tar.xz 1472 BLAKE2B eb4f5555127b91767a06c126795
 DIST qttools-everywhere-opensource-src-5.15.3.tar.xz 8896764 BLAKE2B 65a5d67a5f1c00c244ed91baf24ca10cd2e371963c4f55b3837701d71859b7adc03897db2021040eb08b85eb0f5d353bc8b9d7944aecbeec64397f7e0c20735f SHA512 3c4ffee1d67126e3dd10c1dabae3660b94b97541480814b77bc88c0eaf86d8d43324d582465521fbdbd49dbb4155561f93e91c998dc1ad6553da02a3fcb0da47
 DIST qttools-everywhere-opensource-src-5.15.4.tar.xz 8897256 BLAKE2B e7d8055c9b4b52b188f61c73a300275838647d95f9eb0437129482d91584bbc0705ce9360b0a8fee2775a4cfefda53bc5aae70b10ca34d1bdeb09aa19b7d13bb SHA512 26edf546a1ec7195f1ff5a9e40e430fdd0c7ebb7d86e44ed22b093426c23ff25b2c972fa520abd1064369d32609019746c2fe972a3f593c6f7539d339642f06e
 EBUILD qdbus-5.15.3.ebuild 636 BLAKE2B 35ea6b408c4fef0b9cb1a8420dcce4ec6b98086c891a6185f8cd89c878373a3ede7e8f5b82a19fbc45a6e2c05218c75bda00b66cf35a02e45b0fd91bbedbf99e SHA512 c74626854e828fd4e82937e79e564a35f2372a9925f2374d65b510ed62fc9c171f75519b19e357e9ce570cde7d6b9bb2a90b8c883010115a5968852b6a4d8961
-EBUILD qdbus-5.15.4.ebuild 618 BLAKE2B f3e59ec608f4e64abd9b96062b0fc2ca49ac39401fbe4df01d1ad2fd94513be758a91f4ced67532a79d35e2d7d588fa172ccb2266dbeaf7e9a436cc628db003b SHA512 ba111085cac5a404f902f52a7d2133164e7ecc665bb11cdadc83e7fd44273246526d88ad11ea0ce9768a24d18adcdd1bc51c681d0a7205410438f5ab497bf55e
+EBUILD qdbus-5.15.4.ebuild 616 BLAKE2B 60dc9edb68f2ac9e9b88882b2fc324f2374381b0792cf129cb955e735907667137a65a20d4a3aeca609c6670353b2cd6baf6d2c84144e5cebd6ed0cbcdc62478 SHA512 ec9697839239d27a972eb1e1353d0b35ee60b97d1fc89afde906dd0f19370d0e85def75d417cf7539519189622b611acfe459a6ead464df4b0f0106ced55ca30
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qdbus/qdbus-5.15.4.ebuild b/dev-qt/qdbus/qdbus-5.15.4.ebuild
index 5439a6a38815..d6a11383d139 100644
--- a/dev-qt/qdbus/qdbus-5.15.4.ebuild
+++ b/dev-qt/qdbus/qdbus-5.15.4.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Interface to Qt applications communicating over D-Bus"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qdbusviewer/Manifest b/dev-qt/qdbusviewer/Manifest
index 50de76072f9a..8a66fe08db90 100644
--- a/dev-qt/qdbusviewer/Manifest
+++ b/dev-qt/qdbusviewer/Manifest
@@ -2,5 +2,5 @@ DIST qttools-5.15.3-gentoo-kde-1.tar.xz 1472 BLAKE2B eb4f5555127b91767a06c126795
 DIST qttools-everywhere-opensource-src-5.15.3.tar.xz 8896764 BLAKE2B 65a5d67a5f1c00c244ed91baf24ca10cd2e371963c4f55b3837701d71859b7adc03897db2021040eb08b85eb0f5d353bc8b9d7944aecbeec64397f7e0c20735f SHA512 3c4ffee1d67126e3dd10c1dabae3660b94b97541480814b77bc88c0eaf86d8d43324d582465521fbdbd49dbb4155561f93e91c998dc1ad6553da02a3fcb0da47
 DIST qttools-everywhere-opensource-src-5.15.4.tar.xz 8897256 BLAKE2B e7d8055c9b4b52b188f61c73a300275838647d95f9eb0437129482d91584bbc0705ce9360b0a8fee2775a4cfefda53bc5aae70b10ca34d1bdeb09aa19b7d13bb SHA512 26edf546a1ec7195f1ff5a9e40e430fdd0c7ebb7d86e44ed22b093426c23ff25b2c972fa520abd1064369d32609019746c2fe972a3f593c6f7539d339642f06e
 EBUILD qdbusviewer-5.15.3.ebuild 1091 BLAKE2B 987e58e614cf3ba59f185925333f671e1bee6d2dda6ac7658bfc0a4c4d0072ff05d74082735c4cc2f8040073bd80d3c4f9f57e5ce67bc3d3793bf59f28205d86 SHA512 82f7c7f590c95540e7eef391a682d2519776da3af65f2b00069cb48b3f013ca0633a532972457897b0f7fcfff7575a0609ac0887cc52822b51faafcbac4c6f81
-EBUILD qdbusviewer-5.15.4.ebuild 1072 BLAKE2B 4adb52b7300f748a042d4cf6273288fdefdb77404f9ba766f900c9f754e282d8949b780c4cb0bfdef677ed11496da80cd31f4b1bcd12a0fa572f14d650b8cfce SHA512 d707abb17c729290612f295bc40b76c795b8fe1cee7419903d10145865abfd735e169ad7218e84d065bc9acb721d75d111fec6fa8304593ea10931150411ef07
+EBUILD qdbusviewer-5.15.4.ebuild 1070 BLAKE2B d45d309f6e718b7970f148bcaeb031db4654f1ef19aa6688d95bba5ab5641145f6cb158aef45448671cde84be51a077fb0209d1702c7bc1bedd5ee41342478d9 SHA512 8811ae62ddd92a8739bc5da24f8aa467d3bfb78e39e5ed6fd969e6aee217d9891ed2a0ec7fbe5482b60e83052273d487b8420cab2e2f61fd88141afa884f1e74
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.15.4.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.15.4.ebuild
index 6947519c66bd..766ca33961e5 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-5.15.4.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-5.15.4.ebuild
@@ -9,7 +9,7 @@ inherit desktop qt5-build xdg-utils
 DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qdoc/Manifest b/dev-qt/qdoc/Manifest
index 614f06538146..92a6ed36ced4 100644
--- a/dev-qt/qdoc/Manifest
+++ b/dev-qt/qdoc/Manifest
@@ -1,6 +1,3 @@
-DIST qttools-5.15.3-gentoo-kde-1.tar.xz 1472 BLAKE2B eb4f5555127b91767a06c126795930a8331b8431e77dc6c689098dd0249dc324bec37f2f7e816505cc41fd9578d62110a41d2d064b3ca509a56600f967c31690 SHA512 5572b228cd80df8d49627bba4078943eed3e284de53336608ef7c2db36d6f9fd03be0f6060ccce79c59ab439650125fd59ad7d8ae16a2aeeebe4702f7b7f9354
-DIST qttools-everywhere-opensource-src-5.15.3.tar.xz 8896764 BLAKE2B 65a5d67a5f1c00c244ed91baf24ca10cd2e371963c4f55b3837701d71859b7adc03897db2021040eb08b85eb0f5d353bc8b9d7944aecbeec64397f7e0c20735f SHA512 3c4ffee1d67126e3dd10c1dabae3660b94b97541480814b77bc88c0eaf86d8d43324d582465521fbdbd49dbb4155561f93e91c998dc1ad6553da02a3fcb0da47
 DIST qttools-everywhere-opensource-src-5.15.4.tar.xz 8897256 BLAKE2B e7d8055c9b4b52b188f61c73a300275838647d95f9eb0437129482d91584bbc0705ce9360b0a8fee2775a4cfefda53bc5aae70b10ca34d1bdeb09aa19b7d13bb SHA512 26edf546a1ec7195f1ff5a9e40e430fdd0c7ebb7d86e44ed22b093426c23ff25b2c972fa520abd1064369d32609019746c2fe972a3f593c6f7539d339642f06e
-EBUILD qdoc-5.15.3.ebuild 850 BLAKE2B 3f867eaaa673ad85092060b27a5da4086ebda12bde6a12d48de936991d84a7488d169dcb636638c862e6a37bd2e048a90941395889d4840d711d007bf8a40b3d SHA512 faa5cae28f36f0d75da34fa8a4a6b1990d86968e7cf481ea075147c4bb6819a50d0771fdf3c5c50ab5bb1032409c2d40edcd88159113d0a4fdb519dd430002d0
-EBUILD qdoc-5.15.4.ebuild 830 BLAKE2B 27c7b6842c221512a1f7d3bddc4605308910cea0e595c459ef8480d6c009505377240d3418a0c43ba10feb6dbe65d1aef000f777d754f719128c795ff750fca9 SHA512 d4dace298214bba834e6d84c6badd27bb28a20d8a8b221fecfdc0f8a2e3667ccac936d419b4b9d92d89e5b04eee63ab6debc9f82bab71d02fddc33662433691f
+EBUILD qdoc-5.15.4.ebuild 828 BLAKE2B 32b639569f782c96b1fcec85ba86e94b69019cac9621c6cb720ef71f36456fd1cbd048a4c833f1eda29f78fd34755f311d60cac9158a9e207cb035ab7abb84f0 SHA512 85ef7be7123e7d3d650585a7730777372dd756f1f13b188dbc2becb6e3983b57d53db07b04ff49b116d9b3b92220b0c0e58fb06ebc56bbf0c435c7a6d6f29da4
 MISC metadata.xml 553 BLAKE2B 6512e790088d4b7a76a22edfb8e278399315d3136239d5ea1e37ba5fcdd761fec2a1a30504882e7660b5ced6d582ad37cb9cfc68775e8593d638a4594f693339 SHA512 40075da7d634cc291dcc15c00d1fc63debc6704443fcc0c5d3d06d227b8cf86f89884ea43eb3a1cf8a722a6b260cf9cb6cd7f88c0b14babe301e4344533d472e
diff --git a/dev-qt/qdoc/qdoc-5.15.3.ebuild b/dev-qt/qdoc/qdoc-5.15.3.ebuild
deleted file mode 100644
index 4abca25a217a..000000000000
--- a/dev-qt/qdoc/qdoc-5.15.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=1
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Qt documentation generator"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-fi
-
-IUSE="qml"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	sys-devel/clang:=
-	qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qdoc
-)
-
-src_prepare() {
-	qt_use_disable_mod qml qmldevtools-private \
-		src/qdoc/qdoc.pro
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	# qt5_tools_configure() not enough here, needs another fix, bug 676948
-	mkdir -p "${QT5_BUILD_DIR}"/src/qdoc || die
-	qt5_qmake "${QT5_BUILD_DIR}"
-	cp src/qdoc/qtqdoc-config.pri "${QT5_BUILD_DIR}"/src/qdoc || die
-
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qdoc/qdoc-5.15.4.ebuild b/dev-qt/qdoc/qdoc-5.15.4.ebuild
index efb85abb24f3..8da082dbcfde 100644
--- a/dev-qt/qdoc/qdoc-5.15.4.ebuild
+++ b/dev-qt/qdoc/qdoc-5.15.4.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Qt documentation generator"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qt3d/Manifest b/dev-qt/qt3d/Manifest
index 00eabe8d9b89..7de5a443b7cc 100644
--- a/dev-qt/qt3d/Manifest
+++ b/dev-qt/qt3d/Manifest
@@ -1,7 +1,4 @@
-DIST qt3d-5.15.3-gentoo-kde-1.tar.xz 19244 BLAKE2B 3274f171719204af30272e4c20fd509f180a48bd7f179d1656dfc2d638154ed51efc0952c371e6ca707e035142ab0d1e074f4587ca47673673150265f88305fd SHA512 d453cc8eb91214165c3257fa9379efcd1f2c3e4c605895df82366006a9405b37a1222f93334e7925aebf27c5118d576e0ab1b3e24d27aef68cc51f114bc9fbfc
 DIST qt3d-5.15.4-gentoo-kde-1.tar.xz 18844 BLAKE2B 2ed592d7bbf5bb4c0adee70ac74fd46207e78e769b19d083d6317d1d561618135769914ac8b4e9d266c28b09764e89fe5dbbe2237c81ff48b27efff99a0ee5a1 SHA512 bca5329a68a1ffc5b679db847a1b327e746170fb194a091feb1a61dbf6fe30b3af1cf9c9c57a3a1b16c6af4a0529bbb309eb2bd269613d65f666203164562cd4
-DIST qt3d-everywhere-opensource-src-5.15.3.tar.xz 81930768 BLAKE2B 4ead826b786074993b8c536b4b7c8d781126d402ea55da116201b3d1ea859c83b9d46618b7705b14371064fc41d8aa249efbc5db62f0e9e88fb1424c03bc7a45 SHA512 1fa644ef53923b194efd2296c1505e2193897057774411b1bc50651c2fc4e781e427de13cdc4c1c770294a39d06f8e7360353361c75222c0eb457b560943d97c
 DIST qt3d-everywhere-opensource-src-5.15.4.tar.xz 81923836 BLAKE2B 60ca6a00bec8c20e1b2c209e4d15dd5b2e836eb578c98a90dbf02db89d5fc07642106cc0248a1fb356694793f5fdb5e3b6ab9898bc4e87730c379cbd3d1d8a48 SHA512 cb2ea961109a153e78147450310408f4f573186d12412ebdd71511eb273ca78113d3aede583ec8aa44fe19f5268bb6fab3386c5501142ad6a22e10890ce52f62
-EBUILD qt3d-5.15.3-r1.ebuild 980 BLAKE2B 9f4d84ee6689755353fd499c939fed86fb0f74ad03191d8440b3a1fdec463a4ad606f7139efa681ab82f967c76aba4e8581157f2b79cec942c8799a36614eff8 SHA512 a1c31558e7c17195d336876ede7f8b6adaee21afe988b773b1e8472deaf845ca9513966ebe9858ac78e8a619b200915e3b404332c77dc7a925a9be61ed72f551
-EBUILD qt3d-5.15.4-r1.ebuild 982 BLAKE2B ec732582dc7d401431bc71e326fbea8a2e8ef7a1cfe42558ab9be93cdbd201eae9eb3339015d9aebb91f10d9df80242b9a6dd1d9ceece023ea304a3895c38eba SHA512 8cbf1306a34bc206ada9dec11a9d65894faaa649891a3f06b16b9ef1708bb0f087c3b7ce612b57ce121cce13cf58f082eb946cf862ddfdff5402c8fee266599c
+EBUILD qt3d-5.15.4-r1.ebuild 980 BLAKE2B 9f4d84ee6689755353fd499c939fed86fb0f74ad03191d8440b3a1fdec463a4ad606f7139efa681ab82f967c76aba4e8581157f2b79cec942c8799a36614eff8 SHA512 a1c31558e7c17195d336876ede7f8b6adaee21afe988b773b1e8472deaf845ca9513966ebe9858ac78e8a619b200915e3b404332c77dc7a925a9be61ed72f551
 MISC metadata.xml 700 BLAKE2B 3f7d01ca331e1f43b3333f86f10901e6fdb6fb8482d9d0cebbd9c5d498b2a5971c7a17fe78aefe23d31eccfcf64eaee8b581f8f749ecb6c0eba286608d6c75e0 SHA512 3f6c2d8f227760e9e14f873147fc79bc5027cac6d5dc134c9ac071fd30c7fba39afad272829f8ae446682c3a1a5ba80b056b263963dcbdf308b0f55337563394
diff --git a/dev-qt/qt3d/qt3d-5.15.3-r1.ebuild b/dev-qt/qt3d/qt3d-5.15.3-r1.ebuild
deleted file mode 100644
index 0b8ba72cc7f2..000000000000
--- a/dev-qt/qt3d/qt3d-5.15.3-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
-
-QT5_KDEPATCHSET_REV=1
-inherit qt5-build
-
-DESCRIPTION="3D rendering module for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-fi
-
-# TODO: tools
-IUSE="gamepad gles2-only qml vulkan"
-
-RDEPEND="
-	=dev-qt/qtconcurrent-${QT5_PV}*
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*:5=[vulkan=]
-	=dev-qt/qtnetwork-${QT5_PV}*
-	>=media-libs/assimp-4.0.0:=
-	gamepad? ( =dev-qt/qtgamepad-${QT5_PV}* )
-	qml? ( =dev-qt/qtdeclarative-${QT5_PV}*[gles2-only=] )
-"
-DEPEND="${RDEPEND}
-	vulkan? ( dev-util/vulkan-headers )
-"
-
-src_prepare() {
-	rm -r src/3rdparty/assimp/{code,contrib,include} || die
-
-	qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri
-	qt_use_disable_mod qml quick src/src.pro
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myqmakeargs=(
-		--
-		-system-assimp
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qt3d/qt3d-5.15.4-r1.ebuild b/dev-qt/qt3d/qt3d-5.15.4-r1.ebuild
index f7dd66abb6f4..0b8ba72cc7f2 100644
--- a/dev-qt/qt3d/qt3d-5.15.4-r1.ebuild
+++ b/dev-qt/qt3d/qt3d-5.15.4-r1.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="3D rendering module for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 fi
 
 # TODO: tools
diff --git a/dev-qt/qtbluetooth/Manifest b/dev-qt/qtbluetooth/Manifest
index c73961e77ddc..4bc297f9d351 100644
--- a/dev-qt/qtbluetooth/Manifest
+++ b/dev-qt/qtbluetooth/Manifest
@@ -1,7 +1,4 @@
-DIST qtconnectivity-5.15.3-gentoo-kde-1.tar.xz 4708 BLAKE2B 62a24b899b6ccb73eb8ffe3558fa6451ab5d5f9d08e583c527f6dad971f990f574c9aafa56e479e528ca6e92c96a1363cc05ac6e96b8e3444e8b115b0811a30a SHA512 ae37b972a3f8e789793f66123e3ce66cc2b739560cf69676b72c50139a39b903556c6bc52dba6f73335d7ae368eb377f3cad1892a5992d83bc89474c04dc23fe
 DIST qtconnectivity-5.15.4-gentoo-kde-1.tar.xz 3384 BLAKE2B 4dfddcfb0ba91bad7126fafa5f202f0d4d0cd7585438a9842ccbe4ba0bbeea98e74c11dc87cff48fc033fa17d66adce3d9333c9d2d2a91ad54308251ee3056eb SHA512 a5ded5e0bd97273d3cd5ba8abbd1e518dc70facbc5fefe78a18b4d8d7968042a899b4bd2bed4daccb308afd298e6842c93ebf2963b1927f8f146e042c5328d60
-DIST qtconnectivity-everywhere-opensource-src-5.15.3.tar.xz 2815220 BLAKE2B 0aa3124def801baaad42cfd683afca4d0388355b17232c6cb5e211a98f83fc3bef632677e8e36619b74f8a7c9f02f8999153879628f993ce858dd4e322f6f4ee SHA512 23e515e36da9fb75c280cd8edaf29f3ce7e669ba294d6c1768ccd9c9967ede02dae161a6736a7dac4aa7d8087a309d67b06ba68532684c72ca9964e6ce229534
 DIST qtconnectivity-everywhere-opensource-src-5.15.4.tar.xz 2816924 BLAKE2B 73edd81da73a1438a4e33d3b553259865c7fab0b97213935803b17b00444f737407baa665c31b0e708f1efef7c0eddfd6706f2883a563847a28ecd5ca18b9429 SHA512 3f2c0a59ff6be9531f5ebc81a4344e0b12c8ef92fbfa466f2777d4ed3b4b08657214e93e0aada856a0c6475b6b760aeeb06f0b2be894e61cd7b344c49fefaf95
-EBUILD qtbluetooth-5.15.3.ebuild 697 BLAKE2B 89cb0cc3e265d6d11870951f3d479ed82eea250307491a0103f2bf56d5652ec8158db68aec83a7870a2affdbdcba0359459c4f9b9fff1636efe06933d1f5f22f SHA512 4f8dad6d4b73522a4761449f88b694a30293afa99e5a72a8804a4aec211f6829aa21f422ee88ed62c6c2cce67d86c7e9ab46e32ee735927d97d310a97d753898
-EBUILD qtbluetooth-5.15.4.ebuild 700 BLAKE2B 17dcb9c44ba7a84ab51a9cc5b9ec1a39e778ec7e72361ed20163be7c41490c445674de5b6ccc1fe8ce5b36f41c5d68f4a78e63634af8b21a3ef85ac1109f0fc3 SHA512 55851bc624a596332d440b8e180df9c0c4f9481445e25fecb2b3102d9b9d448eb99c033baaa784cf6625fff06eb5360bd546a32365c852fd3c1749c3ec2ca754
+EBUILD qtbluetooth-5.15.4.ebuild 697 BLAKE2B 89cb0cc3e265d6d11870951f3d479ed82eea250307491a0103f2bf56d5652ec8158db68aec83a7870a2affdbdcba0359459c4f9b9fff1636efe06933d1f5f22f SHA512 4f8dad6d4b73522a4761449f88b694a30293afa99e5a72a8804a4aec211f6829aa21f422ee88ed62c6c2cce67d86c7e9ab46e32ee735927d97d310a97d753898
 MISC metadata.xml 562 BLAKE2B 89a71be78fc40c86d01afd963f8a8519410086f36b572707e8029ea58e900d7e9563eb1b94fec26c2e078395bfa9ef20149fd8c0b2a5d6c3699198890215ebe7 SHA512 85467596f68320b2cd8440f9587f88992d36915b906a5b9139b29e07a9db9ca31853ae7c379bf90e9178e407ab3e526187ed761cd8cfa155658491ef68bbcf30
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.15.3.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.15.3.ebuild
deleted file mode 100644
index 6fe2898f1aa7..000000000000
--- a/dev-qt/qtbluetooth/qtbluetooth-5.15.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=1
-QT5_MODULE="qtconnectivity"
-inherit qt5-build
-
-DESCRIPTION="Bluetooth support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
-fi
-
-IUSE="qml"
-
-DEPEND="
-	=dev-qt/qtconcurrent-${QT5_PV}*
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	=dev-qt/qtdbus-${QT5_PV}*
-	=dev-qt/qtnetwork-${QT5_PV}*
-	>=net-wireless/bluez-5:=
-	qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i -e 's/nfc//' src/src.pro || die
-
-	qt_use_disable_mod qml quick src/src.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.15.4.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.15.4.ebuild
index 4abd1c1036a3..6fe2898f1aa7 100644
--- a/dev-qt/qtbluetooth/qtbluetooth-5.15.4.ebuild
+++ b/dev-qt/qtbluetooth/qtbluetooth-5.15.4.ebuild
@@ -10,7 +10,7 @@ inherit qt5-build
 DESCRIPTION="Bluetooth support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtcharts/Manifest b/dev-qt/qtcharts/Manifest
index 9f0a51164881..1f83ca1ef5f8 100644
--- a/dev-qt/qtcharts/Manifest
+++ b/dev-qt/qtcharts/Manifest
@@ -1,5 +1,5 @@
 DIST qtcharts-everywhere-opensource-src-5.15.3.tar.xz 4252036 BLAKE2B 38d7bb4b02aca7755f056845fa712ebeeeda1ad7c66f16500f53f98f4f82449f28725a2fe784297931ef4a2ea286acb6957aa78b0a2ea81c46a9e0e41582c642 SHA512 5f03db6d8c99f696aba0528812924c4d6d1a6b1331449c5e23fb094f9166ed1f35cd3bb98e3f17daf4a9b3e7b00b8cdc569ac0200343cd47b5de04468acf1d48
 DIST qtcharts-everywhere-opensource-src-5.15.4.tar.xz 4253512 BLAKE2B 833ce3ab26feff3521aa8d67b276f2a67c0efa595309870288bb543ccb7b70f73ff8004a0e5f895a0458352cc56479ba0f43eb5694f9cdc6ba8a7f33da89968c SHA512 e7a4cac3b3a0c60c7ab509d5a533521dd8dc0cb5ad69d66a87f12671c73c1928d902e0be377efb77e0ddadefe1ef8800c0cf07e8213f44367bcd80a787342bcf
 EBUILD qtcharts-5.15.3.ebuild 565 BLAKE2B 8ab6d2075b6807877478f3cdaba7003a959004cb6b7dec6921833a2506640e48cf632bfb6c0da93d746ba0eaa5500042829a5f77bbedbb30bccf3d7de5a6a4d1 SHA512 afc80ada7941d900db3b9265d3f967fbfa722832f6388f7354de92f5030fa3969931a3f30267a0bd7eafc659831252705fc4b057f9da2d03cc59eff9fd80ea34
-EBUILD qtcharts-5.15.4.ebuild 569 BLAKE2B c9a49f41818d27d1ab5410b98a2460a61ab3260df76ac49be1a881968ae31e626d836b516f7929318a398e1748f631424b1cc93533854f2e91135e5bc2c562b6 SHA512 e3c59b670e7f4a7aa71a3b34cb94a43d2cd76252cf922de9b129cfe7509b9bfdf45e958399df35950ea3293d5438c7d2834c41592939509dbb91c6e3d73747b5
+EBUILD qtcharts-5.15.4.ebuild 567 BLAKE2B a857f15d48101b95ca1283c6cdb68d633708b23b814cbeb01eff34eec69c7d0a39b2c305e0617432f81c00784624e261bdea43883c567a057cc2e001cbb86785 SHA512 8dcd738b41b0c06df9af4ddc271a980164a008471824bdb253da95f9253cd783120a68b2cc08539152852eea84b5d51032675832cc070e0acd1f57d8b8e6ebcf
 MISC metadata.xml 562 BLAKE2B 89a71be78fc40c86d01afd963f8a8519410086f36b572707e8029ea58e900d7e9563eb1b94fec26c2e078395bfa9ef20149fd8c0b2a5d6c3699198890215ebe7 SHA512 85467596f68320b2cd8440f9587f88992d36915b906a5b9139b29e07a9db9ca31853ae7c379bf90e9178e407ab3e526187ed761cd8cfa155658491ef68bbcf30
diff --git a/dev-qt/qtcharts/qtcharts-5.15.4.ebuild b/dev-qt/qtcharts/qtcharts-5.15.4.ebuild
index cefdcfcbc070..0f505dbcc8d1 100644
--- a/dev-qt/qtcharts/qtcharts-5.15.4.ebuild
+++ b/dev-qt/qtcharts/qtcharts-5.15.4.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Chart component library for the Qt5 framework"
 LICENSE="GPL-3"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtconcurrent/Manifest b/dev-qt/qtconcurrent/Manifest
index a75c82feb9a3..57b1d5b3f01a 100644
--- a/dev-qt/qtconcurrent/Manifest
+++ b/dev-qt/qtconcurrent/Manifest
@@ -3,5 +3,5 @@ DIST qtbase-5.15.4-gentoo-kde-1.tar.xz 507288 BLAKE2B a22d3745d3c690e29f7726cc46
 DIST qtbase-everywhere-opensource-src-5.15.3.tar.xz 50204364 BLAKE2B 9c011e8d6033e340a1d7be6bd9100a05d55638cfd53f647752853382574b6c444668eae36bf88cfedde0e7c0e00ecb1f91d025fc59c23be5438ba0ef91a5246c SHA512 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079
 DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B 3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b SHA512 91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3
 EBUILD qtconcurrent-5.15.3.ebuild 475 BLAKE2B 71ce360d1f382ad65f401d162cc0e6d5b62d709c1bd507d6fede5123bee901be8efa0c78ca7717fbb18e404f08d5f22be70a8f5674a26ede28d7fdfb0a2a2c98 SHA512 eed18c0fcb00eff001ff33377a636a8901380e4107dd2a75c6a41421472dbb108ec1325680c29f5d385dedb1338858f017d6d5e4c400f288bccaa685285d0bef
-EBUILD qtconcurrent-5.15.4.ebuild 487 BLAKE2B fb9ccc77ae0f22d7278f16f02aa6621fe857a43fffb158cd403aab1456ad328bc6157657dc2c81de7c21de6f6b1c9abaddc16f2af2bb56747308566164289766 SHA512 1783e1c46ae7e7c544b5fd23b7aa9767867d5114869aa5bc43745c7652c9f51b6e54d902d19c2b1b7c2ee12c34933b6ba254b43a9b2545b4e9b12e443c7cfc8c
+EBUILD qtconcurrent-5.15.4.ebuild 484 BLAKE2B d96c5505eb390b38aa11641463c1edff3e02da2f73dea479e5f510aecb7027c733a1119ee4ad50e2e9d32acac7c97c3193b0ddf9c5420709448bb98d528cd846 SHA512 980e6b5ee921fbc73f2793184d928973144858f45d1cc3abb64420a0d2fdd018943b67e53e72ea14482903fccbf702603b51e61bc19a242cd24d98a7c2c86991
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.15.4.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.15.4.ebuild
index 625d12cda83c..47b11093ce29 100644
--- a/dev-qt/qtconcurrent/qtconcurrent-5.15.4.ebuild
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.15.4.ebuild
@@ -10,7 +10,7 @@ inherit qt5-build
 DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index a5535d20a229..cef765d3c2ab 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -5,6 +5,6 @@ DIST qtbase-5.15.4-gentoo-kde-3.tar.xz 516480 BLAKE2B b7f94dd5315b9a16647c2d035f
 DIST qtbase-everywhere-opensource-src-5.15.3.tar.xz 50204364 BLAKE2B 9c011e8d6033e340a1d7be6bd9100a05d55638cfd53f647752853382574b6c444668eae36bf88cfedde0e7c0e00ecb1f91d025fc59c23be5438ba0ef91a5246c SHA512 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079
 DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B 3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b SHA512 91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3
 EBUILD qtcore-5.15.3.ebuild 2225 BLAKE2B 5338f40bff3dc63b42d00445c1c89f04bc65d2899cbf21753bf3dc87c82f87e3df28082fc6e51450e4aa769fe64d8bd624975b8abbde06acc8515985b54e46a9 SHA512 1755b7130556dcdc38e3c46e1d174d4aae3dfc66ed9c9eb207d53c8933dbdeca6d7c6308f006c78dfba305307116fa10dfa8de9d7e2d48abb1ce45eb26925191
-EBUILD qtcore-5.15.4-r2.ebuild 2961 BLAKE2B 1bef5706ef3a49e1186c326f5e3e522a1bddcd1411caf5e4b5b4a4e0f5bc6e1d944a3b139ec4c5b2ce34af6164de6731df5e3dfed2d5959808e30de507fc346f SHA512 bb200a9b126d4502cf7e3186120c70ab233a9f8bd87b5e88b60eb8d3dab946114a138f73abdf961d01f403c339db26614c3b8baaae66cd5b2be17fd7e97beb8c
+EBUILD qtcore-5.15.4-r2.ebuild 2958 BLAKE2B 186952624cc7887584dcb119f1356dae79da93e18bf1116bb22822ebc2905325f97b62f1955cf03ed364c962dfc42d2dd0ec856e8750d2b1100614c4140ba464 SHA512 013664614767dedd791ac00b14222c23e3b8cc315315b993b1720ddc3f232f372c4de893df3abf55c87bd9e33bd8b1a55e18aadfc273285b858fde5329639b7d
 EBUILD qtcore-5.15.4-r3.ebuild 2962 BLAKE2B 258a2bde66c8bfc3abbbe5895cd13e9010bd426333621b6dfc32de216d74bdd873b19a5f0a6de2b3241dc1e949743088ab67cfbc9e288a2185be46bfcda66f7f SHA512 54a897b4b5bc0a07383fadf2f057efa42928c5adad9d048186d94eec9c360358a1db00275fd7d10780f7454e8e6edc2515763f9c25177d348db25e32b381f269
 MISC metadata.xml 833 BLAKE2B 79b441c34e55017f23dd85cdb062ef4cbcfce05dff74936de887256ba8b9b596632b570b55b7014c38467829751771bb116f067cd6a246a11309f20b67fb55f0 SHA512 f1ffedc2ad17d198ba14a9a93e6c8dd35a7709e6f1e07dae606c16c05868f2f8e696f25fa5cf2602ed50f41eb5a914ff0d652b9ac37163e5130ddbfb475a1ff5
diff --git a/dev-qt/qtcore/qtcore-5.15.4-r2.ebuild b/dev-qt/qtcore/qtcore-5.15.4-r2.ebuild
index 0134dd907d3f..aca733538432 100644
--- a/dev-qt/qtcore/qtcore-5.15.4-r2.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.4-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Cross-platform application development framework"
 SLOT=5/${QT5_PV}
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="icu old-kernel systemd"
diff --git a/dev-qt/qtdatavis3d/Manifest b/dev-qt/qtdatavis3d/Manifest
index 59e11857e49e..821b93f74631 100644
--- a/dev-qt/qtdatavis3d/Manifest
+++ b/dev-qt/qtdatavis3d/Manifest
@@ -1,5 +1,3 @@
-DIST qtdatavis3d-everywhere-opensource-src-5.15.3.tar.xz 5191636 BLAKE2B 40e390f95e0c7d7aa28ec3add0ee51d9290c321118a5d2165eec7b03c5dddff2db0f3804173d776a19b76192ba4e8d0893603a26b916111c434298a6204b4794 SHA512 d38150d80ca700ab33f10b50faa412d930aabda157e5c671a9aeb00e7b257573f5cf77de363e8885bf507f00ce16aa14f5a7885dd308c47c2eaad08910c44ff3
 DIST qtdatavis3d-everywhere-opensource-src-5.15.4.tar.xz 5193192 BLAKE2B 1e48b446f7858f956e8d1c407466d878203abd5651a8921d2847b49090f9e237118d22329cffe19dd331d6f733827c4d860a44b6345f94ef45311037a43b775a SHA512 044cdee342ef4d9beb62b910cee59f9cb362c85d517e19a1c0327dfa2b518b2fa484e36756ee9302fb043cc506340b501202861a858d374a5f69cbcddec18301
-EBUILD qtdatavis3d-5.15.3.ebuild 662 BLAKE2B 16392c29ef9a10f0d33eb1d84fa058b0c658d250069c18f16568aa94ff16e0fee2211f76a89708dbd70cffcf9c22ce7c58c1746cff1ffc113b10cf08fcffee94 SHA512 88c3b0f0840c97329030b3f0090ceebcce71db5a6c9d8d4f252695bcbaba967215c19335843900f3c4807c0d618ceb00d043a5e71b35a25d4dafb46f3224b413
-EBUILD qtdatavis3d-5.15.4.ebuild 664 BLAKE2B c121a3ced649ecf9599efc2a9459de0e50766f78006752d60105ed1513c370b54d1553d3e660cbb20d8935d9ba3f7eadfd8eb9d43fc99f67f89977d81739bd70 SHA512 a60be636e908146c44544b2179efc1e8f36af7f75311d1c4636744b257fd87c6f4b906cdeb4044da10e1ce9133193c5c4d3811701ff7b64517043cc243404e62
+EBUILD qtdatavis3d-5.15.4.ebuild 662 BLAKE2B 16392c29ef9a10f0d33eb1d84fa058b0c658d250069c18f16568aa94ff16e0fee2211f76a89708dbd70cffcf9c22ce7c58c1746cff1ffc113b10cf08fcffee94 SHA512 88c3b0f0840c97329030b3f0090ceebcce71db5a6c9d8d4f252695bcbaba967215c19335843900f3c4807c0d618ceb00d043a5e71b35a25d4dafb46f3224b413
 MISC metadata.xml 562 BLAKE2B 89a71be78fc40c86d01afd963f8a8519410086f36b572707e8029ea58e900d7e9563eb1b94fec26c2e078395bfa9ef20149fd8c0b2a5d6c3699198890215ebe7 SHA512 85467596f68320b2cd8440f9587f88992d36915b906a5b9139b29e07a9db9ca31853ae7c379bf90e9178e407ab3e526187ed761cd8cfa155658491ef68bbcf30
diff --git a/dev-qt/qtdatavis3d/qtdatavis3d-5.15.3.ebuild b/dev-qt/qtdatavis3d/qtdatavis3d-5.15.3.ebuild
deleted file mode 100644
index 4ac3606b0fd2..000000000000
--- a/dev-qt/qtdatavis3d/qtdatavis3d-5.15.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt5-build
-
-DESCRIPTION="3D data visualization library for the Qt5 framework"
-LICENSE="GPL-3"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 x86"
-fi
-
-IUSE="gles2-only qml"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*[gles2-only=]
-	qml? ( =dev-qt/qtdeclarative-${QT5_PV}*[gles2-only=] )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# eliminate bogus dependency on qtwidgets
-	sed -i -e '/requires.*widgets/d' qtdatavis3d.pro || die
-
-	qt_use_disable_mod qml quick \
-		src/src.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtdatavis3d/qtdatavis3d-5.15.4.ebuild b/dev-qt/qtdatavis3d/qtdatavis3d-5.15.4.ebuild
index ba71c2b84b5f..4ac3606b0fd2 100644
--- a/dev-qt/qtdatavis3d/qtdatavis3d-5.15.4.ebuild
+++ b/dev-qt/qtdatavis3d/qtdatavis3d-5.15.4.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="3D data visualization library for the Qt5 framework"
 LICENSE="GPL-3"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 x86"
 fi
 
 IUSE="gles2-only qml"
diff --git a/dev-qt/qtdbus/Manifest b/dev-qt/qtdbus/Manifest
index 85ed53a42369..e0c05908afbb 100644
--- a/dev-qt/qtdbus/Manifest
+++ b/dev-qt/qtdbus/Manifest
@@ -3,5 +3,5 @@ DIST qtbase-5.15.4-gentoo-kde-1.tar.xz 507288 BLAKE2B a22d3745d3c690e29f7726cc46
 DIST qtbase-everywhere-opensource-src-5.15.3.tar.xz 50204364 BLAKE2B 9c011e8d6033e340a1d7be6bd9100a05d55638cfd53f647752853382574b6c444668eae36bf88cfedde0e7c0e00ecb1f91d025fc59c23be5438ba0ef91a5246c SHA512 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079
 DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B 3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b SHA512 91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3
 EBUILD qtdbus-5.15.3.ebuild 710 BLAKE2B 79906700516f8c279b878085f0bf9973233e72548e9d5415da6abf485b02ed4b357896160369f6de7f23910296a24f9919d5fd30c06a171d346f436e096563fe SHA512 88493b3355cd5d4e6ba7d2f874ebf1333e3137f9c33fc28a4096d6c954e860e20e340c6e1a1228ef7caba8998381e551f7d39b21ea075b01dbcdff7950c748d3
-EBUILD qtdbus-5.15.4.ebuild 722 BLAKE2B 2382461f7ae12ccf29b62400b27eafbb12588012c5245f80c15def55ecb5ddde7b921ac542a0a6f03ee4b3a165afb5c257c0c12b2c84cf6201c2d80b6e3531fe SHA512 cafda665156f91edb7b70192660f618eb68ee733362a9af67c94dcd47d4da840cee9c6c7237e6a260fd6cde858753b20d287976882b7b99735987986f8d0d0b0
+EBUILD qtdbus-5.15.4.ebuild 719 BLAKE2B 404236980092ef02786a733e3edf58a71025910e4a32220f0a3bd80a383fa63d246f83ce8a024c573d044389e43990e550030d2478522c612a65baa593082d76 SHA512 995a624e370a60cb79c1a5bfefe54e1dd1c678f3e55fbf976d51991505a7922c3258ee01779d3ee5dd959860a83991dfbd04ae8f1eb42495eb1f7814860ac80a
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtdbus/qtdbus-5.15.4.ebuild b/dev-qt/qtdbus/qtdbus-5.15.4.ebuild
index 1ab5732434a8..6981fe078c77 100644
--- a/dev-qt/qtdbus/qtdbus-5.15.4.ebuild
+++ b/dev-qt/qtdbus/qtdbus-5.15.4.ebuild
@@ -10,7 +10,7 @@ inherit qt5-build
 DESCRIPTION="Qt5 module for inter-process communication over the D-Bus protocol"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index e7c346329bff..57f6494b5017 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -6,5 +6,5 @@ DIST qtdeclarative-everywhere-opensource-src-5.15.3.tar.xz 21567896 BLAKE2B 897a
 DIST qtdeclarative-everywhere-opensource-src-5.15.4.tar.xz 21573148 BLAKE2B 092d323c89de0f8be786cfd9dcc3bf84f51c54f3e984b3c0fac1d110a92c94f67f8ba7da43e96dbf5afe1cfb7de49f204a684ea9b189be7f412d1f61a838b121 SHA512 8a4ff61238fde7cc563f9d94b5d1f4fd71ecb95ace447e57d08f71da82400b37c42f4f1ecdcd561116bffa1ed483219e06fb550f91c90842e5a43487bc4706b6
 EBUILD qtdeclarative-5.15.3-r1.ebuild 1488 BLAKE2B 52a5802c5f3c9726eeb4d05e128cd11ea3db267e0e9da243987558a8fc383f3d2f79c19fea9e27806363fe6b6ac92fa2a1a5e0bdd4909af50a4af6ce20a72517 SHA512 7cedad42cfa25b749d4f2a6058f8ef1923055939fa86f85d72232d61c4f23e1e7a07ab65be4c87f31ff1dbba98d372afae410507f5543497e1e2425415492eda
 EBUILD qtdeclarative-5.15.4-r1.ebuild 1501 BLAKE2B bd8234d29383740ba82d26f3bab5dd4c72d770a964888cfe3281a68fb055d000cd503188d14c346f7404a66dad84b03abc40d41843b057d0f9fb885635e33935 SHA512 b58a9b50f974b96056d080f018f2e7edface0b1d64ca6b743795d515e102c74bb2a277dd54bdb3f2fe1b8fd59ba9573d5b3f8a5adfc0ece9b0459559efa4893c
-EBUILD qtdeclarative-5.15.4.ebuild 1500 BLAKE2B 2b2450145fa99da4cf2d7a1bb64890eba91a8238996033b6a28d69907403ee2e93870a529acc44546e454f145e9bd0ad0498c865e4ab3eee520cee3675027dc2 SHA512 c1aaa9a575d372077e3e057fc5adb7c974bb9202cd55aeb3065e6c4aa2a8f7648f5dcef376463191c608e624db5c48b643aa96e2052c8030be379a0a6ae22390
+EBUILD qtdeclarative-5.15.4.ebuild 1497 BLAKE2B fb6bb617e057512241bb534a1cf5cd2a7dd99bcf0e6bd72f4786a9604f6174c85159cbdf4502f8865fcacecca5e524cfceb19d7e80b37cf9d65d478ad2bce4df SHA512 40fdf5a641b6627c963e6a5031cb2caa02803225a395f060c8590386af91bc686d7fc32cf786d0acf28498efc23debba59b398d0f30c1df13a1d9411da22acaa
 MISC metadata.xml 701 BLAKE2B f28878770fe3d7abe7d61ef71306a00ea53f3428c4002a76b484f8d99924567a640f8d091e33485bc46b9644ab1dbf34a19a3329e53040419c402ea70a6f33d2 SHA512 31d0a0f10002da589a2130c16548b36a67bc763aee5b3dbcf6b4ef815a2f0a64ee40b185867adbbc910ae99c2916e83104a91a90e0dba0e0a219e20c24674eb9
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.4.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.4.ebuild
index 6fe2ad238a65..e3821b9f753e 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.15.4.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.4.ebuild
@@ -10,7 +10,7 @@ inherit python-any-r1 qt5-build
 DESCRIPTION="The QML and Quick modules for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="gles2-only +jit localstorage vulkan +widgets"
diff --git a/dev-qt/qtdiag/Manifest b/dev-qt/qtdiag/Manifest
index 5cf58d9bd52f..353a6d14e28c 100644
--- a/dev-qt/qtdiag/Manifest
+++ b/dev-qt/qtdiag/Manifest
@@ -1,6 +1,3 @@
-DIST qttools-5.15.3-gentoo-kde-1.tar.xz 1472 BLAKE2B eb4f5555127b91767a06c126795930a8331b8431e77dc6c689098dd0249dc324bec37f2f7e816505cc41fd9578d62110a41d2d064b3ca509a56600f967c31690 SHA512 5572b228cd80df8d49627bba4078943eed3e284de53336608ef7c2db36d6f9fd03be0f6060ccce79c59ab439650125fd59ad7d8ae16a2aeeebe4702f7b7f9354
-DIST qttools-everywhere-opensource-src-5.15.3.tar.xz 8896764 BLAKE2B 65a5d67a5f1c00c244ed91baf24ca10cd2e371963c4f55b3837701d71859b7adc03897db2021040eb08b85eb0f5d353bc8b9d7944aecbeec64397f7e0c20735f SHA512 3c4ffee1d67126e3dd10c1dabae3660b94b97541480814b77bc88c0eaf86d8d43324d582465521fbdbd49dbb4155561f93e91c998dc1ad6553da02a3fcb0da47
 DIST qttools-everywhere-opensource-src-5.15.4.tar.xz 8897256 BLAKE2B e7d8055c9b4b52b188f61c73a300275838647d95f9eb0437129482d91584bbc0705ce9360b0a8fee2775a4cfefda53bc5aae70b10ca34d1bdeb09aa19b7d13bb SHA512 26edf546a1ec7195f1ff5a9e40e430fdd0c7ebb7d86e44ed22b093426c23ff25b2c972fa520abd1064369d32609019746c2fe972a3f593c6f7539d339642f06e
-EBUILD qtdiag-5.15.3.ebuild 846 BLAKE2B c65ec0118a1645369066c6cea6a2a45dbfebf84c11f9247806ed2801ab40027a96e715d4f0ebb3587b1d18242893646347618972d7a271f89c6ed64f1994fcd6 SHA512 69b7c3a6df902f2c626b57dd8fa784a82283bf35e46a7d759184df3897e704ac7b65acaf59d5dfafb6fd947bfdeaa1d2369bc3bcf3cfb47b07188459c936433d
-EBUILD qtdiag-5.15.4.ebuild 825 BLAKE2B efcb63dbc3acb3647cf18d6da74acebb0ef9eb6d02721e418a73392e45e11bcafe17483592cb358c9a18b9110b0ad1280f6e26ce4419c5af10ac7b0d6b02f8ee SHA512 db92fbecfc39d1fe5110fb734299e0c0a7c1b1b704c378b28e56a536ef4b91cd4100fb7d5516c40821c0eb980689a06402bfc50ed960068e45720c5aa99bb70d
+EBUILD qtdiag-5.15.4.ebuild 824 BLAKE2B d863a2f80f3b6bae95300804bd1b64e23f41eb4baba604273b374471cac8f6fe753f3320ac438d5612da6dfe5927e16a83a542dc5d06d87bbfb5d455079cc823 SHA512 5158a290301ecea0fdb98beb13b129abf8d6b15f06205a150cc05692318b1e8e7f130d3cf99ecda290f807674c01abb6a0894ded0d42ccff59792fb4e47685cc
 MISC metadata.xml 616 BLAKE2B c2e815f14a4c3967140cfeed9d4266b668217994cbdbc58300e3736b428f05449d83ae6ed746bb29debaaa1ab8371a37c054d03395be1f7b66e23c3209449a20 SHA512 8747ad7226372dc06c7e6b44afa0c5cf20a7fb877974c67bf4f599b6ffafff292f3c8a2a80243f6243dcc4c158034dc731451e3af9af8790a302c43ae83907fa
diff --git a/dev-qt/qtdiag/qtdiag-5.15.3.ebuild b/dev-qt/qtdiag/qtdiag-5.15.3.ebuild
deleted file mode 100644
index 4e602dcb6d00..000000000000
--- a/dev-qt/qtdiag/qtdiag-5.15.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=1
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Tool for reporting diagnostic information about Qt and its environment"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~hppa ~ppc64 ~sparc x86"
-fi
-
-IUSE="+network +widgets"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	=dev-qt/qtgui-${QT5_PV}*:5=
-	network? ( =dev-qt/qtnetwork-${QT5_PV}*[ssl] )
-	widgets? ( =dev-qt/qtwidgets-${QT5_PV}* )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qtdiag
-)
-
-src_prepare() {
-	qt_use_disable_mod network network \
-		src/qtdiag/qtdiag.pro
-
-	qt_use_disable_mod widgets widgets \
-		src/qtdiag/qtdiag.pro
-
-	qt5-build_src_prepare
-}
-
-src_install() {
-	qt5-build_src_install
-	qt5_symlink_binary_to_path qtdiag 5
-}
diff --git a/dev-qt/qtdiag/qtdiag-5.15.4.ebuild b/dev-qt/qtdiag/qtdiag-5.15.4.ebuild
index 0931b20b1fbd..4f524afa8dfd 100644
--- a/dev-qt/qtdiag/qtdiag-5.15.4.ebuild
+++ b/dev-qt/qtdiag/qtdiag-5.15.4.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Tool for reporting diagnostic information about Qt and its environment"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~hppa ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~hppa ~ppc64 ~sparc x86"
 fi
 
 IUSE="+network +widgets"
diff --git a/dev-qt/qtgamepad/Manifest b/dev-qt/qtgamepad/Manifest
index ee858cebdd1d..6d93ee71d8cb 100644
--- a/dev-qt/qtgamepad/Manifest
+++ b/dev-qt/qtgamepad/Manifest
@@ -1,5 +1,3 @@
-DIST qtgamepad-everywhere-opensource-src-5.15.3.tar.xz 387112 BLAKE2B 63de9daa102e07718733dfd2d85aebbec214390b0f1d399013a292db37544f1eb6d55f7cc71ccd0caa14d2602aa9a63351e4340cafe4c7dc85b638ed866307c3 SHA512 6a95ed24452d4df07ce0cb6ee482a333b74559935867e32467b6eb66b3c9e6f45a09d0d2bf41f549e85400523e1bea2dc5e571ef58016544aa1f1b056b2accaa
 DIST qtgamepad-everywhere-opensource-src-5.15.4.tar.xz 388656 BLAKE2B a061f95d4401b058fe66437e71394e3635c8d23e0fa686c3732979e1f1773bd02d2f7a65b6a08f91350d0e870e7653d9acd1069ef34a27e0fe81fcaee41915a7 SHA512 37eaad5338b6c5114571c6983fb806ff6537ba7d3dc4bf8d02899e693198a22ce17b0b3ddf2aa52447fcebb0ef97a3baa8e1bc3a7e3f265ad047509f53160ee9
-EBUILD qtgamepad-5.15.3.ebuild 723 BLAKE2B d7e60c8426952fb74e5a2aff6d3c540c7d48d8c7a6be20d8e0ab3e58537cc089e8a1acd973c76f66c6a9ee8e047a98bf1d7d8b94c8447feba863c60c621d2c33 SHA512 9704ffd0c87d89e81f3b4cf57c1a80454865498118423822e5d62391547475d9cdf7adf2dda6edc4ac6916d4d071e1fb4f53df1a26f104cef68e1399b036903d
-EBUILD qtgamepad-5.15.4.ebuild 725 BLAKE2B 0cba2e3ab2d02fe6e6f675233ca5103ebece086006de401e15faa6a4fd8d58ef635f29a7f40a5d3d189f8594a87e7ef217e152e5161fe4f50c71d379b589cff8 SHA512 c0ae3f9b30c9261a749130fb5f1e14828b1c59280a63fc435037ae636507ce0fd075a40c95da27e1daaee61b970b5ddc210e7e39ab2fa74d612aef5b533e272c
+EBUILD qtgamepad-5.15.4.ebuild 723 BLAKE2B d7e60c8426952fb74e5a2aff6d3c540c7d48d8c7a6be20d8e0ab3e58537cc089e8a1acd973c76f66c6a9ee8e047a98bf1d7d8b94c8447feba863c60c621d2c33 SHA512 9704ffd0c87d89e81f3b4cf57c1a80454865498118423822e5d62391547475d9cdf7adf2dda6edc4ac6916d4d071e1fb4f53df1a26f104cef68e1399b036903d
 MISC metadata.xml 613 BLAKE2B 02cac703ee9a9083829e963e9bc97424b58a36949b8237157976d9628f9623f806dee434e5eea3b63a1f2a4ac06509a3d0f0cd094590f12cb3b97ee09f9d6cf1 SHA512 9304973708ee729dc06cef8ac5b206a21ada747ca4efb36e2fc21007da61bfaf43947319be20b0ce73411f5eda2d13a4b226503c12b1d094d5f9180e84579432
diff --git a/dev-qt/qtgamepad/qtgamepad-5.15.3.ebuild b/dev-qt/qtgamepad/qtgamepad-5.15.3.ebuild
deleted file mode 100644
index eaf359db97b6..000000000000
--- a/dev-qt/qtgamepad/qtgamepad-5.15.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt5-build
-
-DESCRIPTION="Qt module to support gamepad hardware"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-fi
-
-IUSE="evdev qml sdl"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*[evdev?]
-	evdev? ( virtual/libudev:= )
-	qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
-	sdl? ( media-libs/libsdl2 )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod qml quick \
-		src/src.pro
-
-	qt_use_disable_config evdev evdev \
-		src/plugins/gamepads/gamepads.pro
-
-	qt_use_disable_config sdl sdl2 \
-		src/plugins/gamepads/gamepads.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtgamepad/qtgamepad-5.15.4.ebuild b/dev-qt/qtgamepad/qtgamepad-5.15.4.ebuild
index 24f81cd1d8fc..eaf359db97b6 100644
--- a/dev-qt/qtgamepad/qtgamepad-5.15.4.ebuild
+++ b/dev-qt/qtgamepad/qtgamepad-5.15.4.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Qt module to support gamepad hardware"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 fi
 
 IUSE="evdev qml sdl"
diff --git a/dev-qt/qtgraphicaleffects/Manifest b/dev-qt/qtgraphicaleffects/Manifest
index 83f965843782..093888dc84de 100644
--- a/dev-qt/qtgraphicaleffects/Manifest
+++ b/dev-qt/qtgraphicaleffects/Manifest
@@ -1,5 +1,5 @@
 DIST qtgraphicaleffects-everywhere-opensource-src-5.15.3.tar.xz 14040888 BLAKE2B 78de4dc63d496bf621f31de8aa6f4a62bae3582682619db498a12ee618d422e825346f6f0dad24dd877049d4cee0fe45e975d58d4fefeda8ad2e3d1a9390d929 SHA512 500f22c3845a0aeb5900dce2664b931c177b9b8357eac51594e84bcd55949292d9001467ea317cc8bc020560cb17b56fa16e1d6fdfc8e11a869aaef8d54b6b98
 DIST qtgraphicaleffects-everywhere-opensource-src-5.15.4.tar.xz 14043408 BLAKE2B 9e0eabcad7af03635b72433f19087e76dad85d63637de28afa97bfd4927bc8b811f42d0dcf9ea3553f9d6560e95fa82ef98334f8de9b78f5c4c0febdf219a99a SHA512 00cf02057dfc1624c84079e1a08a65ceb6fb7df712f05ac9cb0006de0add9241e56a8e3909eeb04d1f6a90d5032909a41d59341e002750ab99d2449f635e64e3
 EBUILD qtgraphicaleffects-5.15.3.ebuild 466 BLAKE2B ababa1fc6f7c5e8dd0f2eacc44372cee8c6c9483a5b8ec21ce5950a14b4bb280491f84e7f168845b1c5fc658482190a4101db30a020781796279b953f30eb53a SHA512 45f3c2d3994678545da37a6d9fb852ee1d1f123d9c409d22aa1e517bf8e27a9c8fa85f94ed20a5361decb8f83d0a5eacccc496d660deca05412a96aaac6fd33e
-EBUILD qtgraphicaleffects-5.15.4.ebuild 470 BLAKE2B afb3136b6648fc6fc70fc9d41baec8c77562632dbe6baa4ed67dc6c23e61024a1e46c101b700b38cf84c76cccf29ec8209f95614005927ea80895b47cb126583 SHA512 ab52dc11a841afa673969722027c199fa45c4ca2bcae321e0ab4ee294814dcacbcfbe052f0e3e90699c7e3ccace80503d36c822ac0d80726b861fc20651006e3
+EBUILD qtgraphicaleffects-5.15.4.ebuild 468 BLAKE2B 40bcec5506f59a28773b429fcf1cb215a710ffdeaa248bee9387dd831b31fb85e317b30eb8c946b79edc8f2f9c9bdaf510a0f781eece96439ff07bc5c8c774f3 SHA512 a92e32f17031b3680e530435015246463c0a60510603c47541430c9a7f6b6ca630335deff0dbdb35a76b831e11d8a87e803069f99e8a4e31a485a0fce6321bc6
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.4.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.4.ebuild
index 4a45f0d90d59..1a0a95060180 100644
--- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.4.ebuild
+++ b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.4.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Set of QML types for adding visual effects to user interfaces"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index 36c43c6a30f4..e4db948e2a93 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -6,5 +6,5 @@ DIST qtbase-everywhere-opensource-src-5.15.3.tar.xz 50204364 BLAKE2B 9c011e8d603
 DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B 3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b SHA512 91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3
 EBUILD qtgui-5.15.3.ebuild 3938 BLAKE2B fb74e5a11757ff91b9f1883132236c23823d4bf5e0f441a3e9cd233e4913a5cd78264cd43d8328b47b028ef00c730a6f9361a059f5ed84d613c9ef5fca8bedbd SHA512 5f3091fab54013cf872b77edbfe54e8b68eddc931bc011afb4c5b97b8a95029d5e76c3330c1a08812e9acd94429ffefe39d6a007cf36ed4f0f1b9b102cf309c4
 EBUILD qtgui-5.15.4-r2.ebuild 3965 BLAKE2B 75d2438db020a239e718be649e5e807187b9789007e749bf574841b4d9893dd825db2e9fbdffbfa8e0a8741aa8da10aa48d92d9e7d5a0506423d306caa6985a2 SHA512 bc4e0c519a8a94aa7ea1a144bd904f79bc34632540f792b98062f38e76251b18ce62c3df450c788843895d8304d26cbcc20868fb3655c98feff626c91a4b16b5
-EBUILD qtgui-5.15.4.ebuild 3964 BLAKE2B 6961345e0f9422d7888442a017cf5d64d622123ab77a6b651ba837b4882960cd5dfeada986a9fcb4b4606e31f42b70da37415bcad9d6182393db79648cd16922 SHA512 681ffeb0376768e2563a8768c393951f1d6b554d5ba5344b75f2f130b5a63652ef51ffc04b714fe0f075b0033701391142577ffca12397d68ef4b808ead00ada
+EBUILD qtgui-5.15.4.ebuild 3961 BLAKE2B 95015430b5166566242f8f5e274d654821aee5a5b5b2b0ff8c10576ca34a9258805269d7f367222523816d231107d6f6cd8a73750901ac53d8cab2a07cb0f81b SHA512 d1856df94664424b0ccafdfe4a8041c2f68d736f7a60b879315e1a150ec392f7f6fe2e4a2d52d9fc7a783dadf734a66b5441ada10de2fe7ea7cf7790d21ec1fb
 MISC metadata.xml 1387 BLAKE2B a370bc2dc77b3efcca29b46e9690b1b5e5c08c5fbfcf06211c1a384c9b998517b4da4357b1cc33998d4f480f9c5481e41b42f3b20f8f72d2635b317ed1d5b412 SHA512 ffa4622291427193109a83d422ff53f373fc3eb7449855849f0f39091383abc30fbfcb88a7d53e29bf2d39e1ec1c40f7aac7433b4d7c0aeefd48983047e912d5
diff --git a/dev-qt/qtgui/qtgui-5.15.4.ebuild b/dev-qt/qtgui/qtgui-5.15.4.ebuild
index 4b8ab3951979..779c787eb2ed 100644
--- a/dev-qt/qtgui/qtgui-5.15.4.ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.4.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
 SLOT=5/${QT5_PV} # bug 707658
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg
diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest
index 6eb4e512262a..b2266c8923f9 100644
--- a/dev-qt/qthelp/Manifest
+++ b/dev-qt/qthelp/Manifest
@@ -3,5 +3,5 @@ DIST qttools-5.15.3-gentoo-kde-1.tar.xz 1472 BLAKE2B eb4f5555127b91767a06c126795
 DIST qttools-everywhere-opensource-src-5.15.3.tar.xz 8896764 BLAKE2B 65a5d67a5f1c00c244ed91baf24ca10cd2e371963c4f55b3837701d71859b7adc03897db2021040eb08b85eb0f5d353bc8b9d7944aecbeec64397f7e0c20735f SHA512 3c4ffee1d67126e3dd10c1dabae3660b94b97541480814b77bc88c0eaf86d8d43324d582465521fbdbd49dbb4155561f93e91c998dc1ad6553da02a3fcb0da47
 DIST qttools-everywhere-opensource-src-5.15.4.tar.xz 8897256 BLAKE2B e7d8055c9b4b52b188f61c73a300275838647d95f9eb0437129482d91584bbc0705ce9360b0a8fee2775a4cfefda53bc5aae70b10ca34d1bdeb09aa19b7d13bb SHA512 26edf546a1ec7195f1ff5a9e40e430fdd0c7ebb7d86e44ed22b093426c23ff25b2c972fa520abd1064369d32609019746c2fe972a3f593c6f7539d339642f06e
 EBUILD qthelp-5.15.3.ebuild 636 BLAKE2B 1b4d04e4e765618d5bf5f69c2a6b9bb3871a63d6f2252bfbfe83483c7c86dbb79936abe3589665f449e01d23b554f9cb83540f58caf34f00d62572f4c4210e06 SHA512 41368f3dd72a6297fff9ef96c899ad5dd06c0234e692a0fd0a54d812488911dc1345030b009848ecab48b5894e3dffc3acba2229620ae436c8c54ab45068a024
-EBUILD qthelp-5.15.4.ebuild 732 BLAKE2B b487cc9e2f7daeda8a2a132c84166ccfc3168665378c925ffc60efef026e6ccd3edff7f023871506d839e8c4f5521d5cd7364433706dc6fb6be03be33662e901 SHA512 1c74186277828b23397d630a0f0c1fff5a30858c9441347262a1eacc2124e16bcb278e1d31f9b4e6fe157b03d83c2f0d39ab56dedf909ce68d00f470b5893bf7
+EBUILD qthelp-5.15.4.ebuild 729 BLAKE2B add59cb4d4ec884ebb29c13de85946b5365ad953b108044109651387d7191b8303ef0790c54cd9fb7f1f7bba15fcce833b38a020fc51466d4b7467a6a3286851 SHA512 b64499922b5eeeb6ca4ec1c2f4a02dbfb554b2afe99d5416f9eddd4847cb94d51e9aded9e3374bbefea0432be0dd6529d7d23428d67a77772606341c917dddd8
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qthelp/qthelp-5.15.4.ebuild b/dev-qt/qthelp/qthelp-5.15.4.ebuild
index ccba8db910db..bc602656cfcc 100644
--- a/dev-qt/qthelp/qthelp-5.15.4.ebuild
+++ b/dev-qt/qthelp/qthelp-5.15.4.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Qt5 module for integrating online documentation into applications"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest
index 5546a97fc347..60667ef70cb0 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -4,5 +4,5 @@ DIST qtimageformats-everywhere-opensource-src-5.15.3.tar.xz 1811496 BLAKE2B 1d06
 DIST qtimageformats-everywhere-opensource-src-5.15.4.tar.xz 1830288 BLAKE2B 7eebd51fe37d7fb33b78bb176a15cd943f0350307774f62c2a6635f5a603578819201402dd065f99dd01546c4d8d1e5e2fedaafa822656f7c5aa894a60dd17ca SHA512 388a9ceebdca6d32f606615af37233f2d8394856d067c9a80486b88ad5714eac90263cd6555a3efd9c1b5fdcc27431b7f99eed6fc02760b1a9974515bfe70274
 EBUILD qtimageformats-5.15.3.ebuild 688 BLAKE2B b5dfa71a03a904c1b5f0775111ef9d69ab0341985080f204de8ebf8489137381547a351e24bef0ff2aeb1afcde261bdc16d4624887f76a8cf1c68002772b20bd SHA512 5ecdd564edcc0e4955f5802e268833651706d254d6ffc1daf88767c63267c7adbd5b3365867d869a32d3a6ec44c53e986cd5ec53c7b3f3ebab46cca014d425ab
 EBUILD qtimageformats-5.15.4-r1.ebuild 714 BLAKE2B 1ff165bdf11e87d98fc1ff4c65cecebe1b96c6d4d3c6a0919f5bfdf9fce24ab828c05292c7d262e0d0c7a592d916562edf83bfb9ebe12ef6e0b5d24c0a9814dc SHA512 18e33ffa32485d256191449450c65b5d580950082673f208e9f6135acf5fdc23a5640f6dedda69ddb0dfd86c733b4ea50cf04a2429f606fe56052ae873a29e34
-EBUILD qtimageformats-5.15.4.ebuild 713 BLAKE2B 41052499e3fcae3c65f3cad7bba53b695458e66e596dd43b7f3eed78107d3ff6b0f921034c5d1cc4c7927deea76ddec6be4c6d19cb71dd6b4a468f4ba1d173a9 SHA512 94c883ffb5ce1af3748602b0a8343b0e8228c03150dfeb8a76d65dd0b38123f93df29041890d6da749ee10a2a78534d87ea7a490e9c1b37f46aea634dc5596c7
+EBUILD qtimageformats-5.15.4.ebuild 711 BLAKE2B 783fe1fc4741d358462aba66b876aa3c8d44b8e25c9b705a8e57321f91cf66054df3ffb7fb08ee33cd1a9d8e766bfa662750a50a50401ce26217b9965b5855c2 SHA512 d4e03713a518baf52d503a55a37c4740ceef37767589014f61aa89b040be7cf670c70789dfc1f4374cd36567f73d8c3fac94627da08a7811159a867bb8af1def
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtimageformats/qtimageformats-5.15.4.ebuild b/dev-qt/qtimageformats/qtimageformats-5.15.4.ebuild
index 375df23db8be..40f1e5e704fc 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.15.4.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.15.4.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Additional format plugins for the Qt image I/O system"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="mng"
diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest
index c8dff7e73b7b..294dbba3ffdf 100644
--- a/dev-qt/qtlocation/Manifest
+++ b/dev-qt/qtlocation/Manifest
@@ -1,7 +1,4 @@
-DIST qtlocation-5.15.3-gentoo-kde-2.tar.xz 1000 BLAKE2B bf03283153bed5f2e67cfcc42784fb6cec7574492cbc63979316602e9f2684fdd10f140b743f82076ec39e0831faa8a5a2074e9cfdf7c4743eff354e076b635f SHA512 f44f5aa2f6aac3a62fbc3cc6eaa88949d54f4238d1cbc12d770ba3b48f97712678c491083029ba871fb9eb31f5172296e8951e83a3f874ac2a8a1a78478559e4
 DIST qtlocation-5.15.4-gentoo-kde-1.tar.xz 1000 BLAKE2B d50546826373a9123f91d2e21f670c030a4a9530494c4ab173a4045f79ea7c6907e39c0acb57e7e3e872146ad72785c4b72b7257672e432ff5870730f66a54cc SHA512 5d2217a3d40b873cd6b0b7c7815a9a52aa19824b7c2aed1d1ea3dac2fafa8b2af9a62ff3dacbdcb588072f2edb1cb226bc808d094ca4c6240a58835d4e93854c
-DIST qtlocation-everywhere-opensource-src-5.15.3.tar.xz 6556680 BLAKE2B aa187e23ed544e380516d93f3cb83fcff73ee501e7b790eb55b9ca9ddcdbf96d31b8b645b70e003423bf6e8945e2fb06be0ba62785a1ba5680acca2129003d83 SHA512 755434db4cdea1c98159a2891c3efcda03fd03b144c37e7a71f57cb5d5dbc5ea1b35d1dcafa7301fc904ede910b4a9f7cfc834b7722cc06fcc360ad3be7b2886
 DIST qtlocation-everywhere-opensource-src-5.15.4.tar.xz 6559260 BLAKE2B ea43ae7e788f7d117fea9db50660cc2f4e7b6f8cf4ae390b41ed3adfa794d66596d8d7ac184d1edc432d2aa6057727321459a29ddbe399201ad428d290982297 SHA512 6208052d6ac173d19dc77496d8108558e7f31696dc5792fcbbeef2029539db76a60c5a51a7d198f54ea6c0ec23977a57cd8c8f8fa80fe5eac9528d2510c3dbb3
-EBUILD qtlocation-5.15.3-r1.ebuild 1152 BLAKE2B a558ff0535ab968941bebb72a42e78086be818f381c9be2e9f30457a75b9a0ca51d3a6409f358631f1b46035f1192c78c00cc2667eeb36ca6faa59318474b342 SHA512 a862db787475b9be16a35f0617d41de50584832c044e3a77b4bf01354eaa278d7eb6c4490fb3257edac9253ad685c1a3997a94b258c6793e45887424c57db199
-EBUILD qtlocation-5.15.4.ebuild 1155 BLAKE2B d88da4a25a306429124bd46135b4952ce819464cc9fdaf7d0238a6cefc2b08019d90c8fa32d48af79716e06dc959337b43398744095ad25b640fe81bc2c1c82b SHA512 fbdf9b135fbb71948921e921c91f4c0d090c251d3978a181d2be55c515e0db27585adfcf38714d1cd3f40335578748d43a862439b515be287103c86b5d843f12
+EBUILD qtlocation-5.15.4.ebuild 1152 BLAKE2B 94668b0c9701804380400a3dd605cbdee83cf1bb23507d359b0fe24042a433091f41d36f55c5b78867fc4b134d68e1670982995c11835e33210d75f0ca5c3a7e SHA512 27e9b6a171f0dd8819549a7f69fa87282b23a3bf0f8e3e73629d1e580aa9992ddf64831e9d62ebb627e0fbc1d5c44044fd9ca168e7edd6578e9b078b5788cc15
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtlocation/qtlocation-5.15.3-r1.ebuild b/dev-qt/qtlocation/qtlocation-5.15.3-r1.ebuild
deleted file mode 100644
index 3f67cfe608df..000000000000
--- a/dev-qt/qtlocation/qtlocation-5.15.3-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=2
-inherit qt5-build
-
-DESCRIPTION="Location (places, maps, navigation) library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~riscv x86"
-fi
-
-IUSE=""
-
-RDEPEND="
-	dev-libs/icu:=
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtdeclarative-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*
-	=dev-qt/qtnetwork-${QT5_PV}*
-	=dev-qt/qtpositioning-${QT5_PV}*[qml]
-	=dev-qt/qtsql-${QT5_PV}*
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	=dev-qt/qtconcurrent-${QT5_PV}*
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/3rdparty/clipper
-	src/3rdparty/poly2tri
-	src/3rdparty/clip2tri
-	src/3rdparty/mapbox-gl-native
-	src/location
-	src/imports/location
-	src/imports/locationlabs
-	src/plugins/geoservices
-)
-
-src_configure() {
-	# src/plugins/geoservices requires files that are only generated when
-	# qmake is run in the root directory. Bug 633776.
-	mkdir -p "${QT5_BUILD_DIR}"/src/location || die
-	qt5_qmake "${QT5_BUILD_DIR}"
-	cp "${S}"/src/location/qtlocation-config.pri "${QT5_BUILD_DIR}"/src/location || die
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtlocation/qtlocation-5.15.4.ebuild b/dev-qt/qtlocation/qtlocation-5.15.4.ebuild
index f21217ce6085..92e5cfbab96f 100644
--- a/dev-qt/qtlocation/qtlocation-5.15.4.ebuild
+++ b/dev-qt/qtlocation/qtlocation-5.15.4.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Location (places, maps, navigation) library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ~riscv x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index d1916b8edffa..7e0e48cb3746 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -3,5 +3,5 @@ DIST qtmultimedia-5.15.4-gentoo-kde-1.tar.xz 1324 BLAKE2B 8080e8f35ae0dab394bac1
 DIST qtmultimedia-everywhere-opensource-src-5.15.3.tar.xz 3828384 BLAKE2B d6b9c892411d25381aa8fbb648f6989808f56cbeebb4df5cbbba87f18694b7d03de741ff65654bcb2ac5e0953c97db4a1d039887cf61e485a2651693a2553518 SHA512 8206df23a84ce77d234a97cd4847f7185d7b5ca2c6bf1cd48dc19c833a302f92f85c53d8bccd4bcfbfb6cdc82c2246b2fb62400eefd5d4b152e95e378dded668
 DIST qtmultimedia-everywhere-opensource-src-5.15.4.tar.xz 3833720 BLAKE2B bd381125280527eee7b5cec117c3d4c64ce2000b459effc1d912e5209d57bd88baf547967d61eefc94adf3f8aa85e3caf010b7ca9f7551b29182a90f483c5cfd SHA512 bb0ada7560093b89751b5b3c0e1a573de215a388d621d356bc3c0e1acfffc2d696230c67b7a7cef037b18c4da900c7eb3d315bd2e73ce12f9aedd0e340399117
 EBUILD qtmultimedia-5.15.3.ebuild 1555 BLAKE2B 1581096539ea2ca42e4cd37b195887793608b7395b42a42238419f94797b18545fa08a41d9d6e65a2ccac56c6e14e91bf0c3efca232ffe02251f5c1610b3bc7d SHA512 52ac518e8a09f846ba349c5104dedd2f6d4a63dc0b712f77cd228c790ee3ae50c728ddb68359d03ee8d4a199da594fc026b69684da2b48b9e6a1a07a8ed66c11
-EBUILD qtmultimedia-5.15.4-r1.ebuild 1582 BLAKE2B acb96ec2a25051a4ffc9d6bb6a28ba03610661a7ecc22f2bd8c4c95038d41b998e744ec694a46f4545de021fc8509c255ba80f9848115b0104270b54c20f3921 SHA512 14775c129d62c046ff5072e508857b5c9ced17258c21c651327baa75093fcca1e728a4a079da6b13c65e936786a941a2202aeeb8da3098de77d1ad71f71e61e2
+EBUILD qtmultimedia-5.15.4-r1.ebuild 1579 BLAKE2B d66f8de0b5b4b31fa0e00232725303711fb10f39ef705cae00e584e3d47935c81e6449e4c3e36d85151df537974e32ba3eeb0b235c6c3a17c308b3eaf731aa38 SHA512 ef54602ab7f35ede08fa495b52e7ef4d1cdfd499b876b5731d5e0f04fb5e7d5b8bf2bce6d7aeaea813168213420d587f3a36cad59fabd5af5175933a75976019
 MISC metadata.xml 718 BLAKE2B d3acc9acd94e1da1ab42aae7d809442769d2d5896aca86124daf5e7d9e7140d98f3898809266fcc2aaff5eafa333e90f41f333b2615a558c1cfb52020a452d6d SHA512 ff422b18cf9870677a9cfc7c9f89b976f3c4e3bd16ae5323ee380f3804ea0ff1fac9054022ae9d272e79454c893cea31961cde5bb4d2fc4ea1795e85614122db
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.15.4-r1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.15.4-r1.ebuild
index c5a1782af0a0..c1f451ef54d4 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.15.4-r1.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.15.4-r1.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="alsa gles2-only gstreamer openal pulseaudio qml widgets"
diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest
index 4340bed31f7d..4db8291320f4 100644
--- a/dev-qt/qtnetwork/Manifest
+++ b/dev-qt/qtnetwork/Manifest
@@ -3,5 +3,5 @@ DIST qtbase-5.15.4-gentoo-kde-1.tar.xz 507288 BLAKE2B a22d3745d3c690e29f7726cc46
 DIST qtbase-everywhere-opensource-src-5.15.3.tar.xz 50204364 BLAKE2B 9c011e8d6033e340a1d7be6bd9100a05d55638cfd53f647752853382574b6c444668eae36bf88cfedde0e7c0e00ecb1f91d025fc59c23be5438ba0ef91a5246c SHA512 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079
 DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B 3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b SHA512 91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3
 EBUILD qtnetwork-5.15.3.ebuild 1606 BLAKE2B fc28d77ccbcaa9830262913af3bd344b006474591271f0c0ba8f73c73d68e5f678a997382022b5d9ae11e582ae56dfaa5c5f379542f81137e7c1fdab92abd2f4 SHA512 027d7e2f023e5027cb03f84a09d740eb23d3e2ab495cdc48b6e07cacf359b1ab9958c3eb6f53deb0ba17ce0651e2ad818d648b5d7eb12fdb982a98ac3d371eb6
-EBUILD qtnetwork-5.15.4.ebuild 1618 BLAKE2B a62c70b47a197993feebc804e3a71c1775a64d4af14e1905cf94fdd9a883038c41aeadab240105a0c866abac70c17748d07ddca02008285c84b8b734daf67a96 SHA512 7a3ac51a3340fc5d9e25d0942c4db29dee6f7bcc2370c80842fa29b7ec57e5ed9ded10bdde903c8985b730bca2a78a987447596b702e06d96bb6084015cd3a97
+EBUILD qtnetwork-5.15.4.ebuild 1615 BLAKE2B b65a7764b08738ef1099f708e8e3eac379afa9691aa1d2ed5edecd005b84d8d556d8eb763ab15ab13992405acb90912eb51b3cfd57380c0e6d7bf9ae47605812 SHA512 f460753327a95dda38f618e974b0eeda6a11590d81223223f205b48c482e602c31a72eef5808cd7c0137a6a3470bf811cc44c42670e837e78362e919741e8639
 MISC metadata.xml 877 BLAKE2B eefc4aa477bcc6ffb2a2fb0711861a9bd7c79af5c5febe0205da57a3fae7206f3ae96dffb8b57e15dfe2f1e26891691886e02984654556d3d53a269dde5ce757 SHA512 dad0239dceb378c1ad4f52c287fb5d61cc248ac533a3df3673b30c0f332eb5cd3a34255052afe2a42084bf1c1d6a1ee501723e43eb268ab5e215fb37f90bcf36
diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.4.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.4.ebuild
index 1aa556714875..0d4836c16214 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.15.4.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.15.4.ebuild
@@ -10,7 +10,7 @@ inherit qt5-build
 DESCRIPTION="Network abstraction library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="connman gssapi libproxy networkmanager sctp +ssl"
diff --git a/dev-qt/qtnetworkauth/Manifest b/dev-qt/qtnetworkauth/Manifest
index 50565bfe4c93..3f2c1aa35498 100644
--- a/dev-qt/qtnetworkauth/Manifest
+++ b/dev-qt/qtnetworkauth/Manifest
@@ -1,5 +1,3 @@
-DIST qtnetworkauth-everywhere-opensource-src-5.15.3.tar.xz 141748 BLAKE2B 71b48d66be1e4ccb731384bb1a7cfcbff964df78d20ebca49bcd89f50a5fe7d65a786d3c6408a897c379129c1fd84c45bf89780f253ed46badc48e2f3303bba8 SHA512 0d155fe4b50a412153a4da8423714aabaf24bdafa0dbe789a33c18b4111b0641c93dd0d5f31774c8ff5ccc0737cfde7992d8181a69d12c93ccebc7c65c5a1654
 DIST qtnetworkauth-everywhere-opensource-src-5.15.4.tar.xz 143472 BLAKE2B 661e2e704a4e58697c509b0feced0c27d2dd0b1419cbf128c64683afc6a462763c89f43c51a4e152bd909810b9771381409f8026d7b4365295e713abc85a5db2 SHA512 a36ce21151cb98bcbc99a819e873ef10f68d988aebfbae9aaaa7dc85bd4a693ad7510c47627f0f3841c5ef50173b21cdebe6a602fa429839fd9ad9bcc02d6c3c
-EBUILD qtnetworkauth-5.15.3.ebuild 402 BLAKE2B c8ca356b8863d197ec4f0a0077f28780fcbf03a22145d6cb3053f6b7739767447046ca98b89644fb5f9bba95cda67b0a2e9b9f0a1552b91d46d66d2e017d3f87 SHA512 8da9b85349bdf422963698005eb44a044cbde09fe18d6710e17967ae378c86babb43c5e4fe44b8301d187a687f413e81d7597eb9a53ef63ef594f2e2c627aa0e
-EBUILD qtnetworkauth-5.15.4.ebuild 404 BLAKE2B 912a0f4459c9f72ffbc3278fad670ce2fb4a18b52b07bd0fd4886b8213d195b92091bd2fcc933e483a961b46bf6264185598744da43d27ad45b6dd76b67c336a SHA512 de35f12462ae9de1e38bc556d24a6637a1865c5b75968a2e7887dbd7b98edf2a56fa7175ead23dddb044811a2f36c2ccc2dea487015118eff359d373e393b5a5
+EBUILD qtnetworkauth-5.15.4.ebuild 402 BLAKE2B c8ca356b8863d197ec4f0a0077f28780fcbf03a22145d6cb3053f6b7739767447046ca98b89644fb5f9bba95cda67b0a2e9b9f0a1552b91d46d66d2e017d3f87 SHA512 8da9b85349bdf422963698005eb44a044cbde09fe18d6710e17967ae378c86babb43c5e4fe44b8301d187a687f413e81d7597eb9a53ef63ef594f2e2c627aa0e
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-5.15.3.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-5.15.3.ebuild
deleted file mode 100644
index 7ead57ade6af..000000000000
--- a/dev-qt/qtnetworkauth/qtnetworkauth-5.15.3.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
-
-inherit qt5-build
-
-DESCRIPTION="Network authorization library for the Qt5 framework"
-LICENSE="GPL-3"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtnetwork-${QT5_PV}*
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-5.15.4.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-5.15.4.ebuild
index a8f4366c65fe..7ead57ade6af 100644
--- a/dev-qt/qtnetworkauth/qtnetworkauth-5.15.4.ebuild
+++ b/dev-qt/qtnetworkauth/qtnetworkauth-5.15.4.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Network authorization library for the Qt5 framework"
 LICENSE="GPL-3"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtopengl/Manifest b/dev-qt/qtopengl/Manifest
index 2568c4d1f770..3ec036e8a06c 100644
--- a/dev-qt/qtopengl/Manifest
+++ b/dev-qt/qtopengl/Manifest
@@ -3,5 +3,5 @@ DIST qtbase-5.15.4-gentoo-kde-1.tar.xz 507288 BLAKE2B a22d3745d3c690e29f7726cc46
 DIST qtbase-everywhere-opensource-src-5.15.3.tar.xz 50204364 BLAKE2B 9c011e8d6033e340a1d7be6bd9100a05d55638cfd53f647752853382574b6c444668eae36bf88cfedde0e7c0e00ecb1f91d025fc59c23be5438ba0ef91a5246c SHA512 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079
 DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B 3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b SHA512 91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3
 EBUILD qtopengl-5.15.3.ebuild 686 BLAKE2B c2d82b9f170fdb10a2080503bb37a7af1390de81b52d6a9701b29cc49cdbeb72d3c589ad176c2800fc7b9270a41f1d0759f9c59e904b622b7880303bccc2a2a7 SHA512 d8ef406bbd81743f529554bf34eb1cafe8a2818459c8a4e39521722eee50b37a84c5685f1aa08be5dbc5a086b9d12c633fca0da9af8bd368862dab8e566a3d84
-EBUILD qtopengl-5.15.4.ebuild 691 BLAKE2B 26c3ea50a2a0546ae26aff328250376c716f428c7c499665b4091739970da135edab6252966d1c30f9197d9f99f03915357e6643ffe6a0b97d6b49b75fc484a5 SHA512 d054cb700ca2c8ccd101f21cc2d435329812784f3e887f12c21438ae1fc014eb1c9dbf1fb865046285ba3ade89c41a1fcea423af6f9861669c62a105e3376af8
+EBUILD qtopengl-5.15.4.ebuild 688 BLAKE2B 78c1a3b5567d6f9b82291d3ae2b3aaf3f98514a85e4162505990c0c62154b1baecdcf9f34fcd19ae467eedae4bf08bf8572a22d674b7286059f524d6b7e9c1f2 SHA512 25a506d45a70f073d719d6ab342a5d0dd9ec67d8feeab4761ca3355070e7729b51aa111b6754d431be7de6cd6f6751bde59be88bbd2b85d8ae896a255aa7c966
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtopengl/qtopengl-5.15.4.ebuild b/dev-qt/qtopengl/qtopengl-5.15.4.ebuild
index 0a7c9f6f1193..5c09985ad0e6 100644
--- a/dev-qt/qtopengl/qtopengl-5.15.4.ebuild
+++ b/dev-qt/qtopengl/qtopengl-5.15.4.ebuild
@@ -11,7 +11,7 @@ inherit qt5-build
 DESCRIPTION="OpenGL support library for the Qt5 framework (deprecated)"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="gles2-only"
diff --git a/dev-qt/qtpaths/Manifest b/dev-qt/qtpaths/Manifest
index e3b508cfa14a..8627ba0df87e 100644
--- a/dev-qt/qtpaths/Manifest
+++ b/dev-qt/qtpaths/Manifest
@@ -2,5 +2,5 @@ DIST qttools-5.15.3-gentoo-kde-1.tar.xz 1472 BLAKE2B eb4f5555127b91767a06c126795
 DIST qttools-everywhere-opensource-src-5.15.3.tar.xz 8896764 BLAKE2B 65a5d67a5f1c00c244ed91baf24ca10cd2e371963c4f55b3837701d71859b7adc03897db2021040eb08b85eb0f5d353bc8b9d7944aecbeec64397f7e0c20735f SHA512 3c4ffee1d67126e3dd10c1dabae3660b94b97541480814b77bc88c0eaf86d8d43324d582465521fbdbd49dbb4155561f93e91c998dc1ad6553da02a3fcb0da47
 DIST qttools-everywhere-opensource-src-5.15.4.tar.xz 8897256 BLAKE2B e7d8055c9b4b52b188f61c73a300275838647d95f9eb0437129482d91584bbc0705ce9360b0a8fee2775a4cfefda53bc5aae70b10ca34d1bdeb09aa19b7d13bb SHA512 26edf546a1ec7195f1ff5a9e40e430fdd0c7ebb7d86e44ed22b093426c23ff25b2c972fa520abd1064369d32609019746c2fe972a3f593c6f7539d339642f06e
 EBUILD qtpaths-5.15.3.ebuild 523 BLAKE2B d0209104e2b9f442814465eeef987fb756be45c35818bb447c817498582ed5bdbd80b8da9163fe2abe210388a8885b4802ae68da726a2428457717fd9df785ba SHA512 f99b7d6333d09fd917bafad2fe0da0ce46ca83ad6d818ad035c7a86568a78d091d956ab64fb8743e48e65645c074a42ea6ebed5bfcc610c1c8d75a308f8a2fa9
-EBUILD qtpaths-5.15.4.ebuild 505 BLAKE2B 957e41570ee418fee06434392226e79df3d357317fb5ebe80dce7c72257c4ca7b5ca35ef1897734c0bad923162ef959375a77dbf99aeb7bfb094d7e2f591febb SHA512 b3a42464da24333946fdac7741ab087a7fc4b9603a8ac1d306e791ac8d451d7cbbbc7675e48f5b527341c7fb25a5a348dfe5e92423f93d382ae103060c093cae
+EBUILD qtpaths-5.15.4.ebuild 503 BLAKE2B bbde7d7dae97f2658f4ed9be591e51d9b2f8ede3499e344d65630b95332f1fc918c5724bd881b2bdad1785ff3c9dcf4e1722fc77659c1193f7081e555dabc5df SHA512 f1236449f0080415cf11588bfd828f0237a3e626e291c83ae7a14d9506bb75c436a5c00e186184aadd2dd77566c598c5c8a2da291a73803530917ddc698c1966
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtpaths/qtpaths-5.15.4.ebuild b/dev-qt/qtpaths/qtpaths-5.15.4.ebuild
index 71bc040b3199..94aee6a60249 100644
--- a/dev-qt/qtpaths/qtpaths-5.15.4.ebuild
+++ b/dev-qt/qtpaths/qtpaths-5.15.4.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Command line client to QStandardPaths"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtpositioning/Manifest b/dev-qt/qtpositioning/Manifest
index 37c09a1e6726..6ea919bb868a 100644
--- a/dev-qt/qtpositioning/Manifest
+++ b/dev-qt/qtpositioning/Manifest
@@ -1,5 +1,5 @@
 DIST qtlocation-everywhere-opensource-src-5.15.3.tar.xz 6556680 BLAKE2B aa187e23ed544e380516d93f3cb83fcff73ee501e7b790eb55b9ca9ddcdbf96d31b8b645b70e003423bf6e8945e2fb06be0ba62785a1ba5680acca2129003d83 SHA512 755434db4cdea1c98159a2891c3efcda03fd03b144c37e7a71f57cb5d5dbc5ea1b35d1dcafa7301fc904ede910b4a9f7cfc834b7722cc06fcc360ad3be7b2886
 DIST qtlocation-everywhere-opensource-src-5.15.4.tar.xz 6559260 BLAKE2B ea43ae7e788f7d117fea9db50660cc2f4e7b6f8cf4ae390b41ed3adfa794d66596d8d7ac184d1edc432d2aa6057727321459a29ddbe399201ad428d290982297 SHA512 6208052d6ac173d19dc77496d8108558e7f31696dc5792fcbbeef2029539db76a60c5a51a7d198f54ea6c0ec23977a57cd8c8f8fa80fe5eac9528d2510c3dbb3
 EBUILD qtpositioning-5.15.3.ebuild 870 BLAKE2B 999d8763bcb4e6f76a7620214c7038fab89e3023baa5d887604ca93b9677e273707c85e9d07be45722e6c08e074d9c357684324200c273d5a4f270707c5b7edd SHA512 05333d0b413afdf112f2dec4a624cb04c9726fedf8c94bd35c4412185fee98c106f9f3de7d9f0e4ad0b740392972d64d76dd813c068ea45adf5513126d3ce0bc
-EBUILD qtpositioning-5.15.4.ebuild 875 BLAKE2B 38b728c4b9e00101865dd2160dbd229f479f69ac647b338845e51640cec30f04f2cb31b1a237d9bb1b9b46eb0fbd748ddab93b210782645255eac3bde97b29e8 SHA512 c6509ce292758122d47e8136b0a15e7dde24a18df2fd59f975806f24bba2731818b16ceb51dd0a2bde94fc9fb1258888eba9dbd1a3e04a7047dae89dd40d17c2
+EBUILD qtpositioning-5.15.4.ebuild 872 BLAKE2B f8109ec5f455301e7f6505e3fbde24efc8417bba2dd3be128d36269824d67a70e8e9dce5ceb2fa51d7299497b8eb3850508a38cef11144a75ace308f5717b207 SHA512 dd877680041577dd7e036bcdafc04f696c116b6f0f58599529dadfa3f8e80f3b318c0f5c6bebf2e74ed4f22e8bebe95c6f00736dad2c504ba6b7b00e92cd08f7
 MISC metadata.xml 639 BLAKE2B e49b21d1ca752b501e8fd6421e3166f490fd5b304ad04edae73db2634189b63bc3ee321d358ce2ca1b412ec0c1c608327aefc92658b27f28f5ff15b2e41fe31b SHA512 275f24bb9566eace9bb35aea94925088131784b094835fbd4cdfbdc050ec9c411091fa73496de59d28a5d137986a0a6b4ad1cccf06db2e72fb86f31da6b1cc10
diff --git a/dev-qt/qtpositioning/qtpositioning-5.15.4.ebuild b/dev-qt/qtpositioning/qtpositioning-5.15.4.ebuild
index 2860daa5a9f4..2d39fe6d9bd5 100644
--- a/dev-qt/qtpositioning/qtpositioning-5.15.4.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-5.15.4.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Physical position determination library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="geoclue +qml"
diff --git a/dev-qt/qtprintsupport/Manifest b/dev-qt/qtprintsupport/Manifest
index 6ad52e6d16e9..1c377e495492 100644
--- a/dev-qt/qtprintsupport/Manifest
+++ b/dev-qt/qtprintsupport/Manifest
@@ -5,5 +5,5 @@ DIST qtbase-everywhere-opensource-src-5.15.3.tar.xz 50204364 BLAKE2B 9c011e8d603
 DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B 3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b SHA512 91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3
 EBUILD qtprintsupport-5.15.3.ebuild 826 BLAKE2B 15904b05281477fadefd40f9720b8ad74cfc9c990a9390945985aa9750556bd3e41a6f7eba9b7d72656bb1ec1df75ce833945aca3a2194ef7a3c5f1228d439cf SHA512 5fad2e5a78292e52d082b31c45355de9198f2e40384ac4cc25e6bcaf692de6b542c7207186aabf6ec3fccc59c17f6116eae6443d077e919087822f4c7938b357
 EBUILD qtprintsupport-5.15.4-r1.ebuild 832 BLAKE2B 4b37c677589286e6405a8e6b0defd36a73f3fbf38a9343366441ca821524db83a928accd523aebe22d0f5208339dbe7fe537295fb68ebf2a0e9babee08340d42 SHA512 f7f8ce63b110e832debf4c8ed909dd5f702294f067a985920ae24fa5983baef1e43d81466e80919fd98a8478fdd6e2008b824ab857717c46ad578f5d20561676
-EBUILD qtprintsupport-5.15.4.ebuild 831 BLAKE2B 6e6ea3cca6e295650a1d746e43e0c4449d64d3e6870407133c05c87fe71216a62fdc7e3b229b3a21a6cd492671a685e58d343d34dcc20503660897bdde702ddb SHA512 0c41f1b27e3f285f15ea863186e2c5e93c8f3cd5cd3392192c5f7bec749e27540388b2578db5716402867b81d02422acef4179875cf0beaeef38d11427d1f207
+EBUILD qtprintsupport-5.15.4.ebuild 828 BLAKE2B 6039406cebb135183b825f1a3700b8cb7606bf98eaff972c8ca20029135846f03013a5d9bd0ee273ca366ee74df20497430665d8d9dd810da9bebe512b844870 SHA512 7e428573a8a7d5aa2c3ced595a156d6217f59254a52ba25d84e70359cfb35e485d7ae5a0287ca07b2326f5fa5375d06c8acfa1722dcc7a159016eda13a572e0c
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.15.4.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.15.4.ebuild
index 42c419f997a1..fba3716d024d 100644
--- a/dev-qt/qtprintsupport/qtprintsupport-5.15.4.ebuild
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.15.4.ebuild
@@ -11,7 +11,7 @@ inherit qt5-build
 DESCRIPTION="Printing support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="cups gles2-only"
diff --git a/dev-qt/qtquickcontrols/Manifest b/dev-qt/qtquickcontrols/Manifest
index e9146224f520..bab092a4c8eb 100644
--- a/dev-qt/qtquickcontrols/Manifest
+++ b/dev-qt/qtquickcontrols/Manifest
@@ -1,5 +1,5 @@
 DIST qtquickcontrols-everywhere-opensource-src-5.15.3.tar.xz 5982868 BLAKE2B 62a9f972b744f54d8799587c915312797caf91087b8724081a0e1ce1a32f034b237e02db4a0064734117a4b0fede70f94f0c1399b9c3835250a157706899e7e2 SHA512 756bffb68ad3bd7b6f6c91dbf544e19ff897f8b97ef25bd5da7f9acf8edb903376776ab90cc1b4cf3a0a73e7be37bfbf06e3bfc9afd698aab83e27945c3a5b9e
 DIST qtquickcontrols-everywhere-opensource-src-5.15.4.tar.xz 5984236 BLAKE2B 0da3a2c3bd86a9fdb1e50627c3de51af3aa057ae76fd2492465d9eb0158384a0381f218df1f0b673934eb94d71aec33325e7fca82bf8a6466a49fb0b5518c78c SHA512 887a8f5fdcd3764575f9068ec8428526a049bb09ae0c214daef3652527d5e448baa53738dccf316b20ccf18f36951ecebd570aee3a27f9c32b9213ef7629de10
 EBUILD qtquickcontrols-5.15.3.ebuild 765 BLAKE2B bd853912661473ae971ee766b7898061dac95ef44774e3d9171ad2fa87b20c599a4b42cb4e0b5e9371d117d8d9dcd110a07f37756dc338c350ba85a5b4a3f74d SHA512 cc48bbc736550e64f7fdd6b24666edcc6a14d04ecbbd5b1b4a374e5859246901c7b3116eb2bccb0f016ad88209bdf61106178829d8c35aa2b6e8b2b56928e781
-EBUILD qtquickcontrols-5.15.4.ebuild 769 BLAKE2B 4de1ed0f92f1422c8f8ba6c1bfcd200c1cd205ff2f8fdd8af7d4410ddc4578fab33db1d788f90c24a25cf3dfae4ebd75098e42c7a8070674562513e79bf6234b SHA512 32595c15062e976e78f1261a12d31a8d16d4b1e64d32b68fce5b0b521fb6d27dd730b1e8a86fe7a84e3fff7c1439f3837e3e5df39410b44972f55225b852e480
+EBUILD qtquickcontrols-5.15.4.ebuild 767 BLAKE2B 2efcab4bd893559d53effc30ef2833dea27daac515d49fc2436b9d02da7a27774d62e132eb0b3f5a50235056d6540ece39455041be09b99a068090b2208e4b94 SHA512 f8ade80c6c96e19cee2ec4e0c79a73ccdb337f3dd6c0aac1afafe329502742c194d60fa3514f011d11db2db4b0f4613d3cf27bf54f40ef877d92b0f8ba19bde4
 MISC metadata.xml 552 BLAKE2B 8294b8e326a177905eb8b0510295d6b3cc97818c836b6b5d2940b78a5ecccc743c8818436fee3f3a61b2f984560c6fe6346d44e1e6b4fa27a7cf5a9a84f20dd4 SHA512 25f93b07946f9319e9762b9ba6c9adb5ca6348a71ebd5710c0f1690a75ca7f93af8967f323a9e11e7af04fd970a92fedf3ec30d962f85516c7b44f1ea749dbbf
diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.15.4.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.15.4.ebuild
index f674bb766067..d42984d99e89 100644
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.15.4.ebuild
+++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.15.4.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Set of Qt Quick controls to create complete user interfaces (deprecated)"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
 fi
 
 IUSE="+widgets"
diff --git a/dev-qt/qtquickcontrols2/Manifest b/dev-qt/qtquickcontrols2/Manifest
index 90bfbbe81c91..fc8d2523bf46 100644
--- a/dev-qt/qtquickcontrols2/Manifest
+++ b/dev-qt/qtquickcontrols2/Manifest
@@ -1,7 +1,4 @@
-DIST qtquickcontrols2-5.15.3-gentoo-kde-1.tar.xz 5628 BLAKE2B 97ac16b23318acea01d3c3a74321bca7d44e9ca84c5c542cc64817e6c21dcf6efe074c6ba0b4b6ad0a74369f2f8a249904ffeb7c977e2d951bbfff42e887470a SHA512 4c29c40a5f5cbb76de7073685eb8289fa046a9c25762146f5e42f262ff3debedd9b891bae45ecf7723921643dbd8418eada836f1409b75dd44b88b5548759016
 DIST qtquickcontrols2-5.15.4-gentoo-kde-1.tar.xz 5636 BLAKE2B 7a1e5b7b00b52389516d133d903543c840cadacdf95911a11218726f190dac61df4bc9d0ca885e9df2284b42238ecb45b243de136d4e403da2fcc19965372a12 SHA512 a1ee7486b7e3dd8cbfcdc72d7fc6c238edae4ce56f7319437ad75310ab25973780065ff6fd7af1b3903645ce3ce6f35c059125e4700b8840587d067bb5888195
-DIST qtquickcontrols2-everywhere-opensource-src-5.15.3.tar.xz 8286960 BLAKE2B 51cc31ead2b8943e59045065da68ab7a9e0785ac0e20947db95286ff41e411821e810cf34bcf1ad418cf847255e9409c3652b48e6a415d3ebcacdb84b8811a40 SHA512 c7127ed4b74c4d4d91ab7d167fffde0f20acbf75065be5e85adda19cd033afe4862430689e58a43719cab523864d615aa8befa004ae13e5337596dac1be0fddb
 DIST qtquickcontrols2-everywhere-opensource-src-5.15.4.tar.xz 8289400 BLAKE2B 2976bfd78117c7db4158e828753f0ce0c39582d92f5840967c4eab9a8af61bbd023cd3d3ea3fb3dde8debd340e4e2f4b2717da73de3a2b87a9f9e15985ab87cb SHA512 4ebbb0199db156307140406b6da4fa83c47aee2105e8c46c0da96313ddc4d6d7ea2f1f85691856144eb8c5109c108bb6810ba0693a2d2411b4feaeed1ec9a8f4
-EBUILD qtquickcontrols2-5.15.3.ebuild 661 BLAKE2B 92330a5576ed55bdb0952d8e74a4c4fe6c5300ac631b922af081cc018d61319ff271ced6c78e615b7766e369f249520bf094594755647c007b0f8e53adcb0807 SHA512 efce11739239ae381f2154edd0b5f37bcf4fd4dc70c2ebe7ac73247c1850e3a7518f9f65a4be2937c64b759938c838fe02fa8d007c42fcb4a263b20259a4624a
-EBUILD qtquickcontrols2-5.15.4.ebuild 663 BLAKE2B f528e54901a31af930f12959a0f660d31add8f33b170e23a40bf38662e3dcec75fecff85419388e615a53fe49cc4cbad02fb80fcd127d9aaca51706a4908751f SHA512 4f61ae9a52e44ea7a5b35d91f1e7306de9a1c3585f799aabfc9a59972f1de57fd7b934c94ff818ebd11613edeab7ccbb9233c6c31f552410a486a1ee79ce4adc
+EBUILD qtquickcontrols2-5.15.4.ebuild 661 BLAKE2B 92330a5576ed55bdb0952d8e74a4c4fe6c5300ac631b922af081cc018d61319ff271ced6c78e615b7766e369f249520bf094594755647c007b0f8e53adcb0807 SHA512 efce11739239ae381f2154edd0b5f37bcf4fd4dc70c2ebe7ac73247c1850e3a7518f9f65a4be2937c64b759938c838fe02fa8d007c42fcb4a263b20259a4624a
 MISC metadata.xml 552 BLAKE2B 8294b8e326a177905eb8b0510295d6b3cc97818c836b6b5d2940b78a5ecccc743c8818436fee3f3a61b2f984560c6fe6346d44e1e6b4fa27a7cf5a9a84f20dd4 SHA512 25f93b07946f9319e9762b9ba6c9adb5ca6348a71ebd5710c0f1690a75ca7f93af8967f323a9e11e7af04fd970a92fedf3ec30d962f85516c7b44f1ea749dbbf
diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.3.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.3.ebuild
deleted file mode 100644
index 45db95baf177..000000000000
--- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=1
-inherit qt5-build
-
-DESCRIPTION="Set of next generation Qt Quick controls for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-fi
-
-IUSE="widgets"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtdeclarative-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*
-	widgets? ( =dev-qt/qtwidgets-${QT5_PV}* )
-"
-RDEPEND="${DEPEND}
-	=dev-qt/qtgraphicaleffects-${QT5_PV}*
-"
-
-src_prepare() {
-	qt_use_disable_mod widgets widgets \
-		src/imports/platform/platform.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.4.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.4.ebuild
index 9173b1200ba4..45db95baf177 100644
--- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.4.ebuild
+++ b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.4.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Set of next generation Qt Quick controls for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 fi
 
 IUSE="widgets"
diff --git a/dev-qt/qtquicktimeline/Manifest b/dev-qt/qtquicktimeline/Manifest
index c0dceec0d2a3..90b1fe5dfcf2 100644
--- a/dev-qt/qtquicktimeline/Manifest
+++ b/dev-qt/qtquicktimeline/Manifest
@@ -1,5 +1,3 @@
-DIST qtquicktimeline-everywhere-opensource-src-5.15.3.tar.xz 102668 BLAKE2B 73549b1ca701b67341f552ceec6aff714b132d7b37ece3ac071ee9fed72a0bde8516feff4d48b8eaaf78ad8d45e420f56b5902c2aae4a050d0a571778e004c3e SHA512 4ce49a112a6352b75bbce21bb262d26bb1e073678879ec82547da683a2dc7f2e9940687954bbfcc4c3012d9ebec9d768fa67d2beba941d187d444fc0049782bf
 DIST qtquicktimeline-everywhere-opensource-src-5.15.4.tar.xz 104348 BLAKE2B 0bd3ba5e18df88309418825428f23f1b64fa5e13b48c53b9f79484aa0997dceaf61248727d19479a7cf99ffb30197e95bf085d086dd2ef033dfc62541b26d362 SHA512 8c2f3bb898a56e78ddbf60efa40650e7203ed2cfc5c882619a20d65596c8538191f3ffb438cb38f41117fe07c04791af11ac2505dd521ca40ada33f6dc809e5d
-EBUILD qtquicktimeline-5.15.3.ebuild 367 BLAKE2B 9277628f8ddc066de3a200293cc02dcaa1c58127af081ed739a55cde5d0e9284ce76132d9392bb14aef54cf6167c6645d5c0af9136bf30a17bd9061561ba165f SHA512 0c4c90b683682a5e0a775f13f598b479344c51f5ee034275abd11dc23b7b4571e7b2f2a387a65211b22b73aec7c3e1b089e9b23f422e16765539a5b3516c0fe4
 EBUILD qtquicktimeline-5.15.4.ebuild 367 BLAKE2B 9277628f8ddc066de3a200293cc02dcaa1c58127af081ed739a55cde5d0e9284ce76132d9392bb14aef54cf6167c6645d5c0af9136bf30a17bd9061561ba165f SHA512 0c4c90b683682a5e0a775f13f598b479344c51f5ee034275abd11dc23b7b4571e7b2f2a387a65211b22b73aec7c3e1b089e9b23f422e16765539a5b3516c0fe4
 MISC metadata.xml 383 BLAKE2B 8f734db19973b4ebfe57cf9417f7fbf6db00ca254cf2410e336c2f252aff7e85500d5fdb944e511a48bf08ebb3ee74e729073f567b9d7558efb19024f7c1e10e SHA512 c0c9a947c7ab5edce2487560d6d9c215966ba5804e370557f2d2a35d67bc6c1ac8a04afdaac8c733cc66be0977835826ecd817248b83c01f4230f8824fbc41a1
diff --git a/dev-qt/qtquicktimeline/qtquicktimeline-5.15.3.ebuild b/dev-qt/qtquicktimeline/qtquicktimeline-5.15.3.ebuild
deleted file mode 100644
index f0aff5d0626f..000000000000
--- a/dev-qt/qtquicktimeline/qtquicktimeline-5.15.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt5-build
-
-DESCRIPTION="Qt module for keyframe-based timeline construction"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtdeclarative-${QT5_PV}*
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtscript/Manifest b/dev-qt/qtscript/Manifest
index 1b26a38eccfc..4581e1d2c54a 100644
--- a/dev-qt/qtscript/Manifest
+++ b/dev-qt/qtscript/Manifest
@@ -1,5 +1,5 @@
 DIST qtscript-everywhere-opensource-src-5.15.3.tar.xz 2663512 BLAKE2B 742c35cb037378d3379e0311daea5d051f448832e470a7d1a7ede9e3e685472804c84d2432e7974030d7469023f5f8e7868bb2e24a854d4f41929c2fabddc9b3 SHA512 ce35799a5625226fd62b394ecdc9d6826ef386a4b2d1a085a3def927ff3cf4808542a7e06be313baf12838fa0d2c1dbe6496a4e34818e3d035734305e60c24d9
 DIST qtscript-everywhere-opensource-src-5.15.4.tar.xz 2665104 BLAKE2B f57661251785d21983871840675c38184b01ae7cc216c9431400fcf2567cc446edca1250e8e1c66a6970dc0da9721368f9baabc362fcfffd1ea3d6e81196587b SHA512 01d3b03eec23f462a7931e268eb8572d85ed560dd8b24f85b420ff8ebb1932d4c18f47c8d5fad7b7c09c147158b02b6cceb9c571b10249ba4008b363e23d7f95
 EBUILD qtscript-5.15.3.ebuild 685 BLAKE2B 3fc07079a14a52774b26208963f00d6737646e1fcd05b7d3cba2a40abc2374e0a453f53cfdfe25c5c20b093262041466becc4d6d48f0ca5971b9687a4045807a SHA512 fdfb34d567c21db9113cb9638379ac0b9f6c6ea5f8fb2ddca0e3dfb084be9790729c655a23fe94c0f00b582f4cc3cf95d11a2d5358af65891a903a9d3d3997c2
-EBUILD qtscript-5.15.4.ebuild 689 BLAKE2B 476f917f07dace249a73677520ca703016d55b035efd647533bdf58560ff8df2fa69cd7e572a2f67f49b0dbade2a5008a36aea6251c0c1e9193b6678911bf50a SHA512 27d3920dfd2a4d9964af274bebb29075d36d4c4b227bd63f2de6c432c9d47a33b6b9c14b0d051dfd596c69a27a5e8bccd231150e9123d0608840eb75dd2c18f4
+EBUILD qtscript-5.15.4.ebuild 687 BLAKE2B adf1d38e130b1c43f6a519055d9c1cab7dc4ce0d5368064a993ad43244bae70f09f184b4bd8bd17d382bb66718d5c62f2515ebfb9d7d409a1d1a5776452af5d2 SHA512 9baa6db94de3e2d72eef0206a073f5dd4952d3c48da0ab1e63416b388ccb517cd1f6ad994478d376e2e1c41b21057dadcc0e761b86de87bece44fbb56a090c86
 MISC metadata.xml 583 BLAKE2B 5389c382561f060259c9eb626a98fa6d1861a33cffb3ca62899cfb6f1b020d6841314edd05c4fd0e5f05593f6015af8826f1d087078754a3dd31ae72be7da4aa SHA512 f8d07eb515db1b455670371655c572aac73653a2d1af68d8a226ecfeaf77b62737114a66bc41375cf7f32d575df792a685298487a90c650b6c6dfb4a7c113181
diff --git a/dev-qt/qtscript/qtscript-5.15.4.ebuild b/dev-qt/qtscript/qtscript-5.15.4.ebuild
index 992cb5e9e577..5a14d97da1b5 100644
--- a/dev-qt/qtscript/qtscript-5.15.4.ebuild
+++ b/dev-qt/qtscript/qtscript-5.15.4.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Application scripting library for the Qt5 framework (deprecated)"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="+jit scripttools"
diff --git a/dev-qt/qtscxml/Manifest b/dev-qt/qtscxml/Manifest
index 24ec37d307a0..49bb02693c64 100644
--- a/dev-qt/qtscxml/Manifest
+++ b/dev-qt/qtscxml/Manifest
@@ -1,5 +1,3 @@
-DIST qtscxml-everywhere-opensource-src-5.15.3.tar.xz 434432 BLAKE2B 4fca0228dfae034b19e8021f717f71ac84f71b54e8245ac06168abd509925c16ed4403f0af2c7d7d20bea2043c4fb22cecc33f9e54972788370b8227050d8c45 SHA512 59b4f2f5bf86a6528cbcffa64a1f3d300fde8509f94c95956558f8643d8f4d093609f4f6d4c095a58e5ea639619f7fd0da6046b2cb72c3cf505859de83aa05d1
 DIST qtscxml-everywhere-opensource-src-5.15.4.tar.xz 435952 BLAKE2B 83b599360a3b82fa2e5e203f0a9dcf3ed52c4989f885540a5ffb203fc7d4d70f17c1a21fd1d81ff93b469c91eb3333b5c647c507214175da3c38d14651c7e9b3 SHA512 2664e4e707fd10aa2ef832fdfc133695da3f6f80c2a611dc94b4e22b34c3226d5baa1e5afc77db2115317c654460ebb60896c006aa93b324fe67d6860ae9b431
-EBUILD qtscxml-5.15.3.ebuild 398 BLAKE2B d97708b7ba07f13cb55fa5f0f3f291b432b34db2125cdd06f56ab43b1d2d312ab4b07f3ad2a7eb062e61a8f7b42dc6268ae969ac2f23fd3b65fd7a4bec0f2dc6 SHA512 07cf036cbf059263719cbbca7447642e9329f22684d874280d7e68ba3fc9a3d18c24e9d7c776812ff6276433199c71250d800e0173880cbd022082a77dbd47d6
-EBUILD qtscxml-5.15.4.ebuild 400 BLAKE2B ece7ee3dd3062aec947fe099ad9366256c0f1f14d1ed2c2e3a313b6f718c1d2bf88387a8cc01a4cca56cb49f09fd13c55a125e916a81fab868a13f247a427c4b SHA512 aa90f831e3dc2d2bf7fb6e44a14f44d14f9b75e6cf674696a3d943f6dd227cad15b594c6899c1a444e29278b9d0f7d4abd135355035bac6fdd99256567afb10c
+EBUILD qtscxml-5.15.4.ebuild 398 BLAKE2B d97708b7ba07f13cb55fa5f0f3f291b432b34db2125cdd06f56ab43b1d2d312ab4b07f3ad2a7eb062e61a8f7b42dc6268ae969ac2f23fd3b65fd7a4bec0f2dc6 SHA512 07cf036cbf059263719cbbca7447642e9329f22684d874280d7e68ba3fc9a3d18c24e9d7c776812ff6276433199c71250d800e0173880cbd022082a77dbd47d6
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtscxml/qtscxml-5.15.3.ebuild b/dev-qt/qtscxml/qtscxml-5.15.3.ebuild
deleted file mode 100644
index a778e477a992..000000000000
--- a/dev-qt/qtscxml/qtscxml-5.15.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt5-build
-
-DESCRIPTION="State Chart XML (SCXML) support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtdeclarative-${QT5_PV}*
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtscxml/qtscxml-5.15.4.ebuild b/dev-qt/qtscxml/qtscxml-5.15.4.ebuild
index 22172e9314d7..a778e477a992 100644
--- a/dev-qt/qtscxml/qtscxml-5.15.4.ebuild
+++ b/dev-qt/qtscxml/qtscxml-5.15.4.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="State Chart XML (SCXML) support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtsensors/Manifest b/dev-qt/qtsensors/Manifest
index f9ec90c7ec38..30e0c6bc2448 100644
--- a/dev-qt/qtsensors/Manifest
+++ b/dev-qt/qtsensors/Manifest
@@ -1,5 +1,5 @@
 DIST qtsensors-everywhere-opensource-src-5.15.3.tar.xz 2057388 BLAKE2B d6eb62a51e19ea18d2ea1183e5d74fa8e4b7e7b3a1d3d0a5654d51c287860c3a2537ac74ed1526c56024697840da954a24e0656b0a02f94b7d591ae55678f309 SHA512 c9e69e78cbb3624cb1130c172a46d4916dbe5fc93f0f844262483468c2f53503844158e72b25692625f588452350bc2f125f583ef7244c62b2ea788ac72e32e2
 DIST qtsensors-everywhere-opensource-src-5.15.4.tar.xz 2058828 BLAKE2B 86ff838bf3d02fcd42b280f6027e3d0e3ca93c17475cf85c9cec7d4615398c12d507f79a810f33491d5b2601566fdbfaa0371c2e3cd3349d5e29042846fb22a2 SHA512 b8b9ffedfdcd392bd5c1ab76db3f621d16094f444e14900726378a289c04c08a75b82628cb61f4ca66bba8c1eeba2a56d9f90d9a82adfdc90fc00ac1b579c63e
 EBUILD qtsensors-5.15.3.ebuild 559 BLAKE2B 78224588951cae1bddb1998a88a639d52ed8496ce5ab4dcbca7844e101338bd07056b31513154a0680a29c7c8b77a8e7236f45d0b39f18f5cd1d3c6d74e30d89 SHA512 58203d919cbf1946d01208df3ce4ac7ec37dcc516ce5c982d832d554224d50c65c90e9abc9736e0d9baf561504369eeb95250c4e24619b38fb2d2d5b0f69b532
-EBUILD qtsensors-5.15.4.ebuild 563 BLAKE2B 259e4c8937e390adfca09afaefe70390ca9d05912887a054221030cd8f251a675a5fa35bcf91584c6ba9c4790d127596e43a74cdc9c785bf3a6ba39924b25b39 SHA512 03c89a27966a7d745d98e720c7ebb2d98cd52e0da1cd3829de8c630e7dccf0bec0c8fe8a0c563cf46f7924449b9669d075940e8904bcc0b07dc3b67d53ae5ebe
+EBUILD qtsensors-5.15.4.ebuild 560 BLAKE2B 2f90d8df6a5a01e49ece0c5646e09926a32cfb3d12b7a2cce85404c41e511e79380cbba0aac1ef9a313a19d37a09f21e077403da9dad7127b2a9a6cedb23ddf2 SHA512 b691c9dd9863433c3a518a81b952a057f92a5a4fb4dd7c5815b8e6c7141cb5ed3634aae7322950368cc74ad4100e06b2aa455dd1321b0dd5d8ae683891a94120
 MISC metadata.xml 542 BLAKE2B 45db7e0814cd2ecae2053ed664d6af55c1f2c175eeceba4364fc37c558ddb51c8e28309722e8c2404441ca009613c045ddf7e501d4b5ed27d208c027c3aa1573 SHA512 5bc7be4d72823fdb716ce7eee0c36eb2a5fe7ea9a59a95792727efbddbe474fb44dfa0286a3064ee674a41d8d5415fd48c717735b6818cf3c28e1d60193f3ce1
diff --git a/dev-qt/qtsensors/qtsensors-5.15.4.ebuild b/dev-qt/qtsensors/qtsensors-5.15.4.ebuild
index 223a7144bed2..85c3b42cf0c7 100644
--- a/dev-qt/qtsensors/qtsensors-5.15.4.ebuild
+++ b/dev-qt/qtsensors/qtsensors-5.15.4.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Hardware sensor access library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 # TODO: simulator
diff --git a/dev-qt/qtserialport/Manifest b/dev-qt/qtserialport/Manifest
index c0ac2ac58ecb..2c37dce334ab 100644
--- a/dev-qt/qtserialport/Manifest
+++ b/dev-qt/qtserialport/Manifest
@@ -1,5 +1,5 @@
 DIST qtserialport-everywhere-opensource-src-5.15.3.tar.xz 321572 BLAKE2B 1ddfdb27afda4486b6ffc137076055a20eebae5ab099c22512c94a1a735730b13632961ea27defbda48b333f0867f16b93dfdfea7382f32022c7456e4bb836d0 SHA512 1fb4dbb5d41c3280b07119d625030489566be29a1b8a7c555f9d484a7dd8c812a7e831147a8017d9026a77fdd57d48985a96f4e6c7887d90342005cf496b7b3a
 DIST qtserialport-everywhere-opensource-src-5.15.4.tar.xz 323248 BLAKE2B 3c48bf1a9ad927c69f7e0b6bc425b8aa2182b2dac3e0a5f8cb2a434a815865d24da4237eabf3d3bf6276b3901015da2827063849223a9f845a6a3535eea10131 SHA512 d8bc3d0b89bb4fc05bfe27a4c76bc3732ef5f8ba889400c8116f18c2ed58db7a3b99c4bda1cd60d1e8051121d31a4b55b95d20e89578a6e523d527e6182262ba
 EBUILD qtserialport-5.15.3.ebuild 558 BLAKE2B d92e70df53f6ead0ed247b8461bbf57ca2c83a0e9ef18feaf8052ce9ae23499432fc0c0491b316a53cfa2af41d6e784e9207b582ece8b415d3c4ac5aa99904a1 SHA512 d38f4ded5ed4a9d73b59ee7f8ef134d29d943a744b570ea794807b96b0debf3b2bceb10c80181f4ed6790d6c78323c6928129daf8fc22f5990eb54b2a937354c
-EBUILD qtserialport-5.15.4.ebuild 563 BLAKE2B 2b034f1a6753742fb76b0b187b9905791fbd3002b4dd8defd2b00a777da6d46747d481f56b4f3ab817d347fc1c887ad0abb3585292a819dbafe282e0bde97bb4 SHA512 0ab591acca4ca8590d4813e7faf92f4cce7b987b300ba98df74d06bd3e700ea844309a2f7d1403bf8f5382c9421398601a0889f687c8ddeaa5f8280f344eab0a
+EBUILD qtserialport-5.15.4.ebuild 560 BLAKE2B c4b6bc3f096ab88659ba9a7026c113061a7e49ad06314873cfab1a658f6cedf65aae74c5ae31e6d20ddd570f807fb1895f178e57a282ffb00cbef1b3bc4ef378 SHA512 431fcc3b6659437a527e2653ac6911558578ded40248e5857520d60f68422bde9bc285d19dc4c00e98f1bab48c1663d19c008052b0571e2bc4a5d1eda592c78d
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtserialport/qtserialport-5.15.4.ebuild b/dev-qt/qtserialport/qtserialport-5.15.4.ebuild
index 9cfd3d007f56..a78b8ba9fc77 100644
--- a/dev-qt/qtserialport/qtserialport-5.15.4.ebuild
+++ b/dev-qt/qtserialport/qtserialport-5.15.4.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Serial port abstraction library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtspeech/Manifest b/dev-qt/qtspeech/Manifest
index 8a897a154de4..6ca1ff9f8785 100644
--- a/dev-qt/qtspeech/Manifest
+++ b/dev-qt/qtspeech/Manifest
@@ -1,7 +1,4 @@
-DIST qtspeech-5.15.3-gentoo-kde-1.tar.xz 1036 BLAKE2B 8b648b77ed363060aa59bfcb8dcae81af1f9712e347b3f29969bb5a2a0b39087a8f469240c70f3bb9d2e371c70cac5a659f96fd3c34c02814bf619aa55fe8161 SHA512 0c0714b7a603eb7baa45af7fcbcb922750d38d4e5f8bba4426a7b5e5986fdaca4b3538ec4f5fd5f78df1e12892ad77713231cc1553cb875c1903f8ce0f61adc9
 DIST qtspeech-5.15.4-gentoo-kde-1.tar.xz 1036 BLAKE2B b842d09405198fee63d7ef54db26c683ec81319ae5fe48925349bec70e27019852259b80005d33a30b8462c573ab7e34308dc5d36c4ac0b99d273400eb7603f5 SHA512 5604f2c491ff9c33335c1f65fa67d17d0aac37a6dfc6b188053bf338fbabdf00243c6a1f1d4ff07a3344de5241d1fca08d82768874d2888cd02d3a6a4a675ebc
-DIST qtspeech-everywhere-opensource-src-5.15.3.tar.xz 101852 BLAKE2B f6184e0bb28f480c7843aea772fa3bb59219dbff79213671051cf6b7322a14e8ad8f6bffdc190b5d0059695e6d780f6a97abc661a97d64bee55b5a919208eb44 SHA512 43790477887f533df9a1cfeb60194e171cbdbb79bce0f7d90228750219a67baa4b94a7f9d3833958bf7f9553f3f6302f980f269ce52c3756c116a61eae632a2a
 DIST qtspeech-everywhere-opensource-src-5.15.4.tar.xz 103820 BLAKE2B 2c9fabcda61223ead3e3a7d51f4b28c86048fa4e1766b7c43fe5c41470782edfd6a9b1b784a50d69f40efbd5b8aac44ad01427b013f3aa7530c466c393b0433f SHA512 6582fe36950aee8428c72582ff2eda2dae433ad969c323e0c6e8be611be7d81766ceb1cae85a10dcd4d266e33a0cf782fe857e1502d7f3863e0dfb2306af2aed
-EBUILD qtspeech-5.15.3.ebuild 736 BLAKE2B cbd822e11649702a466183361a95063a61e7e3074e56bba84360de3a906ae2a3b4ce9991d0b627074adfcfc8423d8ad1bee7da0b4e60d91061c1d3c5d22967b2 SHA512 4093d3ff0e2d50f3aa079a172ef88f05da150d3433be1cb13ce43b85c16652986d6879fc21c3a02c6d266e7f1679dfaf409ae66caf71f154c6520a9f61216194
-EBUILD qtspeech-5.15.4.ebuild 739 BLAKE2B acaaf272f66b5f39016f5918494e6672289ac013e51bdd0504f432f5dcb9e96ded44bcaf0b0bf76052b234709b51db47a8a6065829f3f577b3b57d744bfa5784 SHA512 12c1ade4810912ad0e96126a684b101109bca01907da021041300567f8a8def246de7b252d47c0db83d5e6d4fae9cc72728ac643bb5a01408ad348b7c82a349d
+EBUILD qtspeech-5.15.4.ebuild 736 BLAKE2B cbd822e11649702a466183361a95063a61e7e3074e56bba84360de3a906ae2a3b4ce9991d0b627074adfcfc8423d8ad1bee7da0b4e60d91061c1d3c5d22967b2 SHA512 4093d3ff0e2d50f3aa079a172ef88f05da150d3433be1cb13ce43b85c16652986d6879fc21c3a02c6d266e7f1679dfaf409ae66caf71f154c6520a9f61216194
 MISC metadata.xml 614 BLAKE2B 93e681cc8d9a330c55a86b22fd190c98c9d834cdf85755c4e61365e288f51fa31854788df2ed2a73aab1736b47f0e7e79f8cb6ec504d74614a0e068d8b783365 SHA512 780dc74110dc359d3764fa7f3a1e4c60f1e05f51cfeb377de8ab043d95c8154535657e46e5f026b66dcc612a1f36e007ae2d531622766518a108bd58407dc2f9
diff --git a/dev-qt/qtspeech/qtspeech-5.15.3.ebuild b/dev-qt/qtspeech/qtspeech-5.15.3.ebuild
deleted file mode 100644
index a73f0796dd13..000000000000
--- a/dev-qt/qtspeech/qtspeech-5.15.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=1
-inherit qt5-build
-
-DESCRIPTION="Text-to-speech library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
-fi
-
-IUSE="alsa flite"
-
-RDEPEND="
-	>=app-accessibility/speech-dispatcher-0.8.7
-	=dev-qt/qtcore-${QT5_PV}*
-	flite? (
-		>=app-accessibility/flite-2[alsa?]
-		=dev-qt/qtmultimedia-${QT5_PV}*[alsa?]
-		alsa? ( media-libs/alsa-lib )
-	)
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	qt_use_disable_config flite flite \
-		src/plugins/tts/tts.pro
-
-	qt_use_disable_config alsa flite_alsa \
-		src/plugins/tts/flite/flite.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtspeech/qtspeech-5.15.4.ebuild b/dev-qt/qtspeech/qtspeech-5.15.4.ebuild
index 215b248f32c0..a73f0796dd13 100644
--- a/dev-qt/qtspeech/qtspeech-5.15.4.ebuild
+++ b/dev-qt/qtspeech/qtspeech-5.15.4.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Text-to-speech library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
 fi
 
 IUSE="alsa flite"
diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest
index 6da6da9c3b15..d1f41d28f110 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -3,5 +3,5 @@ DIST qtbase-5.15.4-gentoo-kde-1.tar.xz 507288 BLAKE2B a22d3745d3c690e29f7726cc46
 DIST qtbase-everywhere-opensource-src-5.15.3.tar.xz 50204364 BLAKE2B 9c011e8d6033e340a1d7be6bd9100a05d55638cfd53f647752853382574b6c444668eae36bf88cfedde0e7c0e00ecb1f91d025fc59c23be5438ba0ef91a5246c SHA512 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079
 DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B 3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b SHA512 91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3
 EBUILD qtsql-5.15.3.ebuild 1265 BLAKE2B 13e902c32e37d5cfddfc7d250e7e534aadfd9eb78a4df108448ea71548d85e520e8400d98190bf97c370b10bd5f77e273d3a64ea43c909faf6db52ee0a710c80 SHA512 235338720210c84624728b09dc42a5fd8394b3d27d6c4242483fdfdaccf56b2ab6873f9843e55d1c254c5549952a54d5c552091ea951c926602d4ba6061e5f6a
-EBUILD qtsql-5.15.4.ebuild 1270 BLAKE2B b6334b4f80df14b734452ae5f15bb672471f6720da3a087db52e4cddd66556460158296624e164c920e66997dcbe733b06ac1f806e63afe06391ec26483c731c SHA512 aa9ef4d67f138165a740672da405749def8802fc9b61ac18ef24a26e8b5595955e87dd84413db02324cb7c4da885230daff7f7264c8fb1b433c80e436ad18d81
+EBUILD qtsql-5.15.4.ebuild 1267 BLAKE2B b6306a3e341370c946b97e0ca65b788123fb0c9b2c5695372c0b386e74288d066bd4e0c30623758b93015d19c18cd8948570efd671bed364c6b577c52a735b88 SHA512 662a06e04bfbad79643f1bba42fc9dec7609a7518c7941353697f7e4574f2b9b06c45f6990045538de395714e913c48cc4767a16dd4e3a8b3f1e227ee76fe6af
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtsql/qtsql-5.15.4.ebuild b/dev-qt/qtsql/qtsql-5.15.4.ebuild
index 945c9e3808f7..bb5945081f0a 100644
--- a/dev-qt/qtsql/qtsql-5.15.4.ebuild
+++ b/dev-qt/qtsql/qtsql-5.15.4.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="SQL abstraction library for the Qt5 framework"
 SLOT=5/${QT5_PV} # bug 639140
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="freetds mysql oci8 odbc postgres +sqlite"
diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index 98809c3985e9..65aa2c2d5d63 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -5,5 +5,5 @@ DIST qtsvg-5.15.4-gentoo-kde-1.tar.xz 6804 BLAKE2B 30e43ecf736cc2f9067e82fc55d72
 DIST qtsvg-everywhere-opensource-src-5.15.3.tar.xz 1886104 BLAKE2B feced6caaa2e2be089ffed77f32d3b0de899b8a97632234ca8aa9d1f34fc0ee94ecd44227bb7c40ec49f0a76b305dc29ad23498bff3c62f45054854ed632b1d1 SHA512 288ce98bb6dd746564c7ffbd0d8221d0816c62b7e33424cd21d945b40308292ec9a0b1e2b9cca6ce91d606c06813f05068cad590d827810383175bebfa8ab527
 DIST qtsvg-everywhere-opensource-src-5.15.4.tar.xz 1888900 BLAKE2B ceb055e09f877e826c36569ff41cceab69b8da9eebdb5b7851a582bb4389d16feb939257b8b102aef7229ca8c8777ac0f586d554a88606cb27d287de4a5f5246 SHA512 364400e17cdc659ff1a521f7bd171c5dfe537136f263cd5f64c6b5e27b0398d83ae0b5fe46e77847f3a2feccf0ea75f9591ff4b932d0250e5859272630b5a31c
 EBUILD qtsvg-5.15.3.ebuild 840 BLAKE2B 5be8735e823010cd3857c82351276e98f5f0b700a7b97c0d914f9442e28143596795bc11afb91cdd2d19cb5e6a801cb7c415887d7340957db1144e7661953fe4 SHA512 2ca9e9d1afdb6ba9e96fbfefef41d1b953dc24ae9253f4e825303f4aa1c8e9a80d4c008787da81938e02f7bc0092e4f4e3da50e6306fb332c84bcb42737a0772
-EBUILD qtsvg-5.15.4.ebuild 513 BLAKE2B 6fb1f795824a0f3240c1111091226da5bd4a8c2495615fa6574455ea1fcef8d4e6d8e12178a22acdfa8701697e1a71ed108e8fff53e00c495bb04e6c1e1cf823 SHA512 c28bff24102be3efdce10dce26a2c0af7a48f31cc870765ed9b771e305ead4ac421eafb2dce48a8e32a945fd50a4f3ffa87a3f9a5b31e784bff228d5857048fd
+EBUILD qtsvg-5.15.4.ebuild 510 BLAKE2B 12a8922f534b8cc8ca3aeb2876e3df352f88a775d5648218b8024da91936bd94ff89db73ce58adb19e1fdc2029a455f4c82ef4cf8599631718173cf3433d6344 SHA512 c401a1cba165b5a0cd3f057a842a05be51e308bbf6a9486ae777d566b335bd9945164769d9dbfd3507accc716fe82083aa5ff40c5e040cf40feac6f22b25e132
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtsvg/qtsvg-5.15.4.ebuild b/dev-qt/qtsvg/qtsvg-5.15.4.ebuild
index aa770ec1b2ed..fdcee3ba71d7 100644
--- a/dev-qt/qtsvg/qtsvg-5.15.4.ebuild
+++ b/dev-qt/qtsvg/qtsvg-5.15.4.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="SVG rendering library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qttest/Manifest b/dev-qt/qttest/Manifest
index 1120c9359c4e..78d858a4f1f8 100644
--- a/dev-qt/qttest/Manifest
+++ b/dev-qt/qttest/Manifest
@@ -5,5 +5,5 @@ DIST qtbase-everywhere-opensource-src-5.15.3.tar.xz 50204364 BLAKE2B 9c011e8d603
 DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B 3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b SHA512 91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3
 EBUILD qttest-5.15.3.ebuild 583 BLAKE2B ba7aaf137e4d0644f14d3da5bda9c75bb11077b0ccbd2343ac9b4e7a3953ef0eeb1b1b3d5ad42ce8d9988f3111c6d03eab02723beb6c4e600be9bc57cc6d0d54 SHA512 9aa25ab7783d36278f1009e6039dfa695621e14bfb5694961789e1940adb9d7dabb92f5eef1b46dd2219442b0e0f285bb8f3382745ff016b5c49b5554a86e715
 EBUILD qttest-5.15.4-r1.ebuild 596 BLAKE2B 2d0b054cde37a90f91e394ced1dbeece33470c4f5b5212bbde3c09fc2069e5f9046ed9dcba8ee56d03d0a5ea8f06ffaa4abdf04be576a5c7b4467c62f4cd1e30 SHA512 02abd0e0b6e01cbe911134365b2e3c2c349a94f0d711483219c96b56ae1e71fe714c983a2def825985deb9ac31ee3723260dd9a4bba57590ce17c1b96bc57bcd
-EBUILD qttest-5.15.4.ebuild 595 BLAKE2B e22de25f657ed811e23f4e0257f0cab84072f431aa61bbf7081df9e1baf4f1dc38b8532e5e321231dc4c70eff2921441db565223afad84ab86e0c1cc3e2fd644 SHA512 104a8e730e46b5b71b107d36d68d079a58bc6d7fa3795d5604c86e86d05773c855a7913adde335d05fc4cd955e2329eb71529b027decd619843f63e2c1bfacf9
+EBUILD qttest-5.15.4.ebuild 592 BLAKE2B 59494c9eaa224d4798fc7f32e4e5a1e9329c7a130e3f3094a6617ae6d2eac56a92f8f1c426391b34dc85fee54b0f3cb8fa49e4ae9e7957f8068dce1c2faed44d SHA512 8082c83dd55684e9a4e218643f675a916ec27d3b9db22b42aa0834d70ef38e073ff116afd9df647a9a27c4010213600111fb26a3c042ad29b7b90562545f440a
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qttest/qttest-5.15.4.ebuild b/dev-qt/qttest/qttest-5.15.4.ebuild
index 0ce6332242e8..df877cde63be 100644
--- a/dev-qt/qttest/qttest-5.15.4.ebuild
+++ b/dev-qt/qttest/qttest-5.15.4.ebuild
@@ -11,7 +11,7 @@ inherit qt5-build
 DESCRIPTION="Unit testing library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qttranslations/Manifest b/dev-qt/qttranslations/Manifest
index 9c0c679caa29..3640f951dd73 100644
--- a/dev-qt/qttranslations/Manifest
+++ b/dev-qt/qttranslations/Manifest
@@ -3,5 +3,5 @@ DIST qttranslations-5.15.4-gentoo-kde-1.tar.xz 1108 BLAKE2B 873e90fb86fc497a36e4
 DIST qttranslations-everywhere-opensource-src-5.15.3.tar.xz 1617284 BLAKE2B 983f3ca42c3d0c896925e9ccdd9036eb9c91152515f5b99227508d96b41ff3a6b10dff33bb5142c2ec141f7757ab2ef10af11ecdc4c31cb43fa2375dd153a926 SHA512 d2939a93a328aa1a8011a0e61970d9ce6a99b918aa35dac9fe10d8b65662ea5086207708157751573431aa24973a1a07e05c25fb90a254861a40d85a845bb1dc
 DIST qttranslations-everywhere-opensource-src-5.15.4.tar.xz 1618964 BLAKE2B 9377cdaee2839fe0672596e041502037a345bbb52b04a1ce8aedd46e542301c3883e378a9406d0112f615cc46172df062182d6530390dc3ff3bf3b78b6dac644 SHA512 56b20c0174cb68c3e4def85ec6c113576bc8872d1cdac318bc3d9a121645f67ce68e9bd3a73e32fd53617fcef641fb95831b37c40f1250c1c05e109e55b41ee2
 EBUILD qttranslations-5.15.3.ebuild 407 BLAKE2B 0b2db1f33ec94ea0cfe85a5708e3dc3afc3d30263fe12a1728c53d32c41e6ae9fd2568e0d63de9e9ca78adc634cfba7f6df7e715d4b10a7f2245052849530a58 SHA512 b161d86275f28e0167e93b59550b586f353af80b58a9ec782733929aaed05810d435c1be8b8206e6e9fb2500271a81164bed9f6f4891e16362a1c6429b7b0b0b
-EBUILD qttranslations-5.15.4.ebuild 419 BLAKE2B 662df63f947d59ce59acc901a4432d21d460fa79d326c6364dae284749501d0a202b575e7def7861d41b91fc5f26a476123408eb101466760df5708dbf5bc417 SHA512 a914b83e81341b6b6089d0d2ddb527f2ee70a9c8ed3c5ae8afa2c8b0ea46d593b29046986658d4f07f694441ee7693f692ec7acc8b3fc18ba90ef73949b1347d
+EBUILD qttranslations-5.15.4.ebuild 416 BLAKE2B 666039f909c98f17410e7ea415c12f3f609d3ca397ae1b9e602fba2ea691393786a0683ab131897613e39943a4c0fd91d2a6b65eea1e53d486bc0c79b4a55fd1 SHA512 91b325ad2446a09df10ecfa385ab2893913ed980d51336a8262dd4abbde4cd8440d29315aa2f0edee0ee847bd63bd57da26b240e077c6d1d8947bc5226eafd89
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qttranslations/qttranslations-5.15.4.ebuild b/dev-qt/qttranslations/qttranslations-5.15.4.ebuild
index 38749696508b..cf3292e25088 100644
--- a/dev-qt/qttranslations/qttranslations-5.15.4.ebuild
+++ b/dev-qt/qttranslations/qttranslations-5.15.4.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Translation files for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtvirtualkeyboard/Manifest b/dev-qt/qtvirtualkeyboard/Manifest
index e9b20f22cc54..310f610aecfe 100644
--- a/dev-qt/qtvirtualkeyboard/Manifest
+++ b/dev-qt/qtvirtualkeyboard/Manifest
@@ -1,7 +1,4 @@
-DIST qtvirtualkeyboard-5.15.3-gentoo-kde-1.tar.xz 1068 BLAKE2B 963ce43df400ec01f8d483f75d46f50e61b22d33df59f82fc50e4f3bc1d62a39a8556744d5b3f5bc9425aa69f5d30b74abbe6390287c2319824b9b95733c2411 SHA512 373ff84f82e5e8b202dd42c03b446efecab71af110363387ea885cf76eb618bdca02b80935b15cc14e49d613191af11a60aeef723383a5e2b2b9340c430e56b4
 DIST qtvirtualkeyboard-5.15.4-gentoo-kde-1.tar.xz 2968 BLAKE2B c1d8fa4309f1bdaff7240177ee0ea5487ea4d36c591c44ab4144afbd73051fa051376ed071eefdd1e9d85bc0f2fa386770b06c64cdff62b759142d2f5f2dae79 SHA512 b5106085b9e40071fdc1776afede0065218e8585e73c1367a7ae428641b4be0664146577f8de41e83707db5a3b74347821d5f485458fdd4642090c9c2351aa98
-DIST qtvirtualkeyboard-everywhere-opensource-src-5.15.3.tar.xz 10959776 BLAKE2B 1147b74d148398736dbdadd3e6513d23816be889a0995fcd375d36b41ad4624ac295afc89a9dd089b4b7587a8e1d09c654d081adfd26d5847d6e6b10a892d794 SHA512 f6033438d9a847d3592bcdbc9c525a2bac730621b2279b36157f8eb11c6f49fa27b5155835c3cc1fa412a0509ca387c5a7063d20b6ae0ff7aedaba786d3c75f2
 DIST qtvirtualkeyboard-everywhere-opensource-src-5.15.4.tar.xz 10964124 BLAKE2B c688273a37243b68fd228de559baa8fd6def9f772bc8d032f9947a19541ac27e748cea6b1c33777e8a79791df75da6164706aa9631106f562965bb4e14eb8b5e SHA512 870279299a5e166badea0746a2d4badc758c66f8404e36d1df05997dcfeb66733154fc2a9830c433fbacf885b7afb44bc8dc8a5aacc02713966630ce98231ba3
-EBUILD qtvirtualkeyboard-5.15.3.ebuild 1243 BLAKE2B 68a7afa2bf230226abb43df6f46d18979169e5182b242ec23491dc7342215511000b581dd27db2759cbf814d8ca5acc5a3b7199b13729002c9c6a11fd55ce500 SHA512 ab6774a30655d7e19c781cff5b29c05a4c0a6e73f6f4a9e21a60129f3184dd2ccf553cb0237f0f267ea0ff31d76ec1ee3971ab1c9ac65e1d40fb887831eb09b6
-EBUILD qtvirtualkeyboard-5.15.4.ebuild 1245 BLAKE2B 016eddeb75f641faaa34bec046f6cc5843179160c0b583f4b6b26f293a0413fee631e80b9390a20c95abe502764d70be8bd1fa6cb7c56ed0f5c2d97be9d11ee3 SHA512 8d23ebff8dcf12f6cf97e15823b0832cc4615a8fa9c2f473825efee3e6df8850f7e2c991e56d599dc2ce17b7b30fcf54e460860dadbf322d7581570fa957d97a
+EBUILD qtvirtualkeyboard-5.15.4.ebuild 1243 BLAKE2B 68a7afa2bf230226abb43df6f46d18979169e5182b242ec23491dc7342215511000b581dd27db2759cbf814d8ca5acc5a3b7199b13729002c9c6a11fd55ce500 SHA512 ab6774a30655d7e19c781cff5b29c05a4c0a6e73f6f4a9e21a60129f3184dd2ccf553cb0237f0f267ea0ff31d76ec1ee3971ab1c9ac65e1d40fb887831eb09b6
 MISC metadata.xml 580 BLAKE2B 18223136bcc07b46ab272ff282bcdce54dad6e6d97fe39b5431850a8960992a16eed32a580980748368ff120ea50ada55be823ba1e16950856462979835562fb SHA512 e865c0a030aeffbf270300806f99d1b2ff4ca148b3e1a3a901df25d1193e84d63a99b643da033a469dfbdbc99e559f71addc7671487c92d94e9019e742977020
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.3.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.3.ebuild
deleted file mode 100644
index 9ee74099b8cc..000000000000
--- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=1
-inherit qt5-build
-
-DESCRIPTION="Customizable input framework and virtual keyboard for Qt"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-fi
-
-# TODO: unbundle libraries for more layouts
-IUSE="handwriting +spell +X"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtdeclarative-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*
-	=dev-qt/qtsvg-${QT5_PV}*
-	spell? ( app-text/hunspell:= )
-	X? ( x11-libs/libxcb:= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local myqmakeargs=(
-		$(usev handwriting CONFIG+=lipi-toolkit)
-		$(usev !spell CONFIG+=disable-hunspell)
-		$(usev !X CONFIG+=disable-desktop)
-		CONFIG+="lang-ar_AR lang-bg_BG lang-cs_CZ lang-da_DK lang-de_DE \
-			lang-el_GR lang-en_GB lang-en_US lang-es_ES lang-es_MX \
-			lang-et_EE lang-fa_FA lang-fi_FI lang-fr_CA lang-fr_FR \
-			lang-he_IL lang-hi_IN lang-hr_HR lang-hu_HU lang-id_ID \
-			lang-it_IT lang-ms_MY lang-nb_NO lang-nl_NL lang-pl_PL \
-			lang-pt_BR lang-pt_PT lang-ro_RO lang-ru_RU lang-sk_SK \
-			lang-sl_SI lang-sq_AL lang-sr_SP lang-sv_SE lang-tr_TR \
-			lang-uk_UA lang-vi_VN"
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.4.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.4.ebuild
index a5b723cb7012..9ee74099b8cc 100644
--- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.4.ebuild
+++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.4.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Customizable input framework and virtual keyboard for Qt"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 fi
 
 # TODO: unbundle libraries for more layouts
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index e6ff7198ee95..f9caa3e2b04a 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -5,5 +5,5 @@ DIST qtwayland-5.15.4-gentoo-kde-1.tar.xz 32156 BLAKE2B b18c35f07bc20ab778d92596
 DIST qtwayland-everywhere-opensource-src-5.15.3.tar.xz 565004 BLAKE2B bc146caf77d42436dcb599df8d2aea422ac8717151dee91b9be129b97902d5af274dec90bd5ffceef62512515e5cf57a61ab773cfc6c13742a6cc5d9b6f72726 SHA512 0a9768282170709050490fb1b9daef59c21c8b5c4785f56a452d7954ffb6f016ec836022693941c99c5c10b2c3c55c75ba37fdad09dd1e0cde627f8b87b90c89
 DIST qtwayland-everywhere-opensource-src-5.15.4.tar.xz 567300 BLAKE2B e2f77a8e6a81ef105d218db6f40164b95beee2d3f34253b4208170a1a25f52ba2574d231979ec05d2bfa7d41a1949b01bd3f6bfcab75487e88d11b6fd1e32455 SHA512 58ae262f7aa0455fb577a36fe9413a969398a2043160642501bac064d6fbc3280f76aa566e62b9d73c67a8c3606849b1b97bcb9b0250d26c269ec921112f40e4
 EBUILD qtwayland-5.15.3-r1.ebuild 1140 BLAKE2B d77564631bb1bcb235ed75f85d8db4118d4bf144c1183936f319557eb0df0b4ffd45b3680bf3b8d84e9ead3298fc567fcb024002161cf116ab2955533a1e62bd SHA512 9e34ccb4bb2904fe21006d4de5a6eb617eabcf2546d07bf410f01bc17637c7f4dcabc2c75a3335a6d6b615437b924e2fda0857165b14b70398a4f835f83f07f8
-EBUILD qtwayland-5.15.4.ebuild 1152 BLAKE2B 45dc0e60d9624c446fbb722ec4b3a8a2d979fd8c48e8a0c6aaaa9005c42bfa0184cf4ff738cc47b4fa24f352caa2fda88b51b2d0881bca7093354d57001689bd SHA512 d7eef2359505649fc0882d773ff9b869b8f650af98e4cdfe5ad919ef702db05fb67bf69918b1aad37b474bc2608023ea259e19f4c6e7f9314bc4d306789ee602
+EBUILD qtwayland-5.15.4.ebuild 1149 BLAKE2B 9a630db97899e18a5c3278fcf49a5734bcb8213c83b46f8895fbd42d9594029741c7e49dcb9f77ed9d24308da1983ad9c456f5ec201a7c886abf8b9bc2d1fabc SHA512 4a7f20652537133a872f744fa149f1cc1680ab03ff894c26d4e8e129ac87ea869cef69a0ae725791d7253de36b69c91160c57fd736cd98eb6ad86f2992b8bc01
 MISC metadata.xml 584 BLAKE2B ad42909b120209835e121a29de558d338bae4348eb55e69a94e8ac8b54f26564df0a750839bef9418ae8056a0d24f234615247a610b8287f5b0fbffbc60193f2 SHA512 86fd81d63b19fc6e95bdcb92e9da9b03861248a4e78e9de36aca6996e61644ab8bce7a60ca22ee7ad86fefc9b407a1fd0136240b8fdfa3c40a149444ab1dcbe2
diff --git a/dev-qt/qtwayland/qtwayland-5.15.4.ebuild b/dev-qt/qtwayland/qtwayland-5.15.4.ebuild
index cd0762f3eeea..878bf7c558a8 100644
--- a/dev-qt/qtwayland/qtwayland-5.15.4.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15.4.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Wayland platform plugin for Qt"
 SLOT=5/${QT5_PV} # bug 815646
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="vulkan X"
diff --git a/dev-qt/qtwaylandscanner/Manifest b/dev-qt/qtwaylandscanner/Manifest
index 8c6a6ac70829..7ee00674de92 100644
--- a/dev-qt/qtwaylandscanner/Manifest
+++ b/dev-qt/qtwaylandscanner/Manifest
@@ -1,5 +1,5 @@
 DIST qtwayland-everywhere-opensource-src-5.15.3.tar.xz 565004 BLAKE2B bc146caf77d42436dcb599df8d2aea422ac8717151dee91b9be129b97902d5af274dec90bd5ffceef62512515e5cf57a61ab773cfc6c13742a6cc5d9b6f72726 SHA512 0a9768282170709050490fb1b9daef59c21c8b5c4785f56a452d7954ffb6f016ec836022693941c99c5c10b2c3c55c75ba37fdad09dd1e0cde627f8b87b90c89
 DIST qtwayland-everywhere-opensource-src-5.15.4.tar.xz 567300 BLAKE2B e2f77a8e6a81ef105d218db6f40164b95beee2d3f34253b4208170a1a25f52ba2574d231979ec05d2bfa7d41a1949b01bd3f6bfcab75487e88d11b6fd1e32455 SHA512 58ae262f7aa0455fb577a36fe9413a969398a2043160642501bac064d6fbc3280f76aa566e62b9d73c67a8c3606849b1b97bcb9b0250d26c269ec921112f40e4
 EBUILD qtwaylandscanner-5.15.3.ebuild 494 BLAKE2B cedf94150eed4b2edd9c43685a7e4c9be8145f2c8b718f257db499073fe1149e58a8e49c2ced53a56a3cb08a540d2a8f1ca5a096940977c6a34f8b6bf30f7e29 SHA512 fa35ac4052ff42cee4506d96e78c64ab873a740bef41370ef9a0f54268c479c7948eb723d396f052194c2212789bb13a6631a0055a63091c541d7653c296c051
-EBUILD qtwaylandscanner-5.15.4.ebuild 506 BLAKE2B 3894c5ed2a846410c4d833af1406560939ae926856515f3e2ae4e3250e1acbfd94a68abdac410622eee3f7d7582be54a9eefc71aa5be2bb8f86e329b4565b49a SHA512 7bfdcfddb444bd2696e422402a1b4dae3540c4f25d041a41ec26e242a443b4171b73e2746f976bcd3a90f36a7abea5b8e9a6f227a4d9d36ddc6261297ea769cd
+EBUILD qtwaylandscanner-5.15.4.ebuild 503 BLAKE2B fabc1bbce3dcc29c5e5f7ce930688ba3d7c0ae45829b8efd0e4e15efa54f2ac565ba31846235ede3fd8db7e37c5568fd1f599aaae2f10164bffcc284784d0d6e SHA512 35a0a2e6837d365ede97167510b0f94991f155d4ccf92f9e7eb6b6cf862e485ca0b5c1b1a767f36ab5ccd68edae45692d156fb9b272f0119d1c6867a0e6f7a02
 MISC metadata.xml 352 BLAKE2B 7354be163c38b0299856f17a85621782e367e3186e0cece5d55a29d4848ba95a7d0ebc4e1614b9ffa3de21bad70c7c7ecc86fd81a0cb83038c619a1e763fc211 SHA512 cc03c3e78ee03f9be941ce1b54ee4ffa5655c933d2cd4c2bcc252a447632ed0587d41c4d07b9e1738aed5526b4f0b934342cb99d196ba3b0f49b762bf1de7c7b
diff --git a/dev-qt/qtwaylandscanner/qtwaylandscanner-5.15.4.ebuild b/dev-qt/qtwaylandscanner/qtwaylandscanner-5.15.4.ebuild
index b30fa6744384..96353b257bb3 100644
--- a/dev-qt/qtwaylandscanner/qtwaylandscanner-5.15.4.ebuild
+++ b/dev-qt/qtwaylandscanner/qtwaylandscanner-5.15.4.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Tool that generates certain boilerplate C++ code from Wayland protocol xml spec"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 DEPEND="=dev-qt/qtcore-${QT5_PV}*:5="
diff --git a/dev-qt/qtwebchannel/Manifest b/dev-qt/qtwebchannel/Manifest
index aae1ff9d55ce..9b98beea047d 100644
--- a/dev-qt/qtwebchannel/Manifest
+++ b/dev-qt/qtwebchannel/Manifest
@@ -3,5 +3,5 @@ DIST qtwebchannel-5.15.4-gentoo-kde-1.tar.xz 5780 BLAKE2B ce4325efd23f9b207c5bf6
 DIST qtwebchannel-everywhere-opensource-src-5.15.3.tar.xz 209116 BLAKE2B 08edc7a3fdb5556274bc7b746dfcd1e46c64c019c30c171f6c25202aee22335a8fdec8cb1e94dd60ffcf70b245bba67714374bd2d3b55b7ede7ee7fbf2e6824e SHA512 77ec10187601c826d15dad9a5112553bc1f954d11f54a40d38a2e1a1cf7412fe2c74e0b100c91befd8be06274dc537dbed4c6f858856a3b38974a363ff380415
 DIST qtwebchannel-everywhere-opensource-src-5.15.4.tar.xz 210728 BLAKE2B 276792545d413cb5522fbfd5602224e1a8c085919f89830892d2fecda88e09519bdc8d3b2b2e846ce2d16b6a6f20cd250c09c61e65ffd489b334cfebbc28488e SHA512 18d5e6f44b780c7dfc94e1620ba76d7b0731d671df537b2e29fef062a0775e8dc973deb6c949b37000f5e8a49bdd31a723aa069bafcb9ecdc3259d0bf97e5a26
 EBUILD qtwebchannel-5.15.3.ebuild 604 BLAKE2B 7c990056bb14f9a555a9de45ee52f26f2f0afa103475edb0e54e55394443e242941657c659ef5166c2ae2d94521382a9c163b081b5c3f6879cc5865fb2074038 SHA512 4bac324583c4ab4a1bfd9ad7d7e144ba8c4310079fc91f4fe78fbe24b5e058652a729bf391937653ff1200b5e7c29787060e1376f26a884d4bd0cfc6f25dbf85
-EBUILD qtwebchannel-5.15.4.ebuild 608 BLAKE2B 8f55b324cfa89b108a641d35accb76eb40930fd485434af9b0de5c7147c9364148b5abd1f6a81cff2aacebc6441075ee7dee73a1050d6b8240041dad4e0da6a8 SHA512 8984610ae79e48c4073b4f25482a0957875e1867e700a18c69d4e70b7031e7894d5ff0b8568cc7aba5abce24b425004a812d8de331097266f3be4119e162fe32
+EBUILD qtwebchannel-5.15.4.ebuild 605 BLAKE2B dd4a6d398dd0487d04f51f25bcf7a04b6e868b3821aa18860acad1098d1ed772fa9f867231cbba36a9e0e5b451e6eb67b17cc8bb85b300143ac4a2f9f1c9141b SHA512 621057c00a35779b0af8d17831aa4a53a0318e5aaf7e673ba8d58fd467b68085fa89e4078f9c55e5cfdf78b0222118bcbfa35fc8c6f4ba687d394f91951f8707
 MISC metadata.xml 562 BLAKE2B 89a71be78fc40c86d01afd963f8a8519410086f36b572707e8029ea58e900d7e9563eb1b94fec26c2e078395bfa9ef20149fd8c0b2a5d6c3699198890215ebe7 SHA512 85467596f68320b2cd8440f9587f88992d36915b906a5b9139b29e07a9db9ca31853ae7c379bf90e9178e407ab3e526187ed761cd8cfa155658491ef68bbcf30
diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.15.4.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.15.4.ebuild
index ebffff3c45cb..99d83479ca0c 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-5.15.4.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-5.15.4.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Qt5 module for integrating C++ and QML applications with HTML/JavaScript clients"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 9383520bb2b3..732d2a18c656 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,6 +1,5 @@
 AUX qtwebengine-5.15.2-disable-fatal-warnings.patch 442 BLAKE2B d2f303f03f817c1e10d0c3c64deaefce773cb63852e8a37ba1c4611e26e850c5722e708425525a6fbfe170ce757a7fcb89e0324e3ea41f4ddeafd4bc15cc5c3b SHA512 79503e9278b50b5ac799852958850c54027c329f32242747514bbc7253192893c9ce5b9c6feeae7918f9e0f4047526adfb1c9ac9c0c5dcc625fe7b1507a93d23
 AUX qtwebengine-5.15.2-enable-ppc64.patch 1249 BLAKE2B b8b9957bbf848ee8b19e4a7d43f1bfb8c2e63e691f2f0c4b10ef5367bc71b12fb6d161767f7669825e423c08af83e70ff744dd08facf92281c431de90a36847e SHA512 8e29e4e3c2085e5bba9c5a6ce7b366814767bb421132474cae413bba81217a70aec941b09a63d1f914c1e6b9e417b108df236d0b9d39e0df4b4d74111ddcda47
-AUX qtwebengine-5.15.2-extra_gn.patch 503 BLAKE2B 7949b35e725d920605ee7337de7aa29c22dee43ffaa383b4351e1e4170b06755e8b16eed28faf004486831fb020cd4fca1d5e54f61e99b7c8f084cad0d5d847c SHA512 2d916d918a1b12d91387da8b1161b15d33a55a9445de9725927fb88bb91666506a91df0df9224ec4a273b0c3f2fd3dbb2bb10857164a4204023f277707c099d0
 AUX qtwebengine-5.15.2_p20210224-chromium-87-v8-icu68.patch 7361 BLAKE2B 0a5ab9077982df3afea7d156e0dbaf11384d7b9ab6ea70ef4dc0b82f1690e455144318734cb50b7bf2349a95b99325e67bbfcbdf5c88f55f3ecc65c7e593c468 SHA512 585dab11bf6cf811b657831292d5b6b90dd01d9e4c1fa4b6a446d0eb66f436c46a6fcd4851e9c6b6b0bda8a41cbea57fe74ca5ecca4e40cb35f85d7c2f5265e7
 AUX qtwebengine-5.15.2_p20210224-disable-git.patch 501 BLAKE2B a295e5061830da6bfaf0c0ae6db832c86f797fa2426ec29e244133e862c0998a03373c11a2a31944bc09e0a20bf30c0a0a91eb06b1f8a9fdcdd9762f5ba7c542 SHA512 b795328058be945e7a323ea50f01cd5c11b130bc1204c8274fec920e04cce1643d8f9313e975f451dbb7dfecd6214f9ff9ea0aec87ad29237b6e9bb1b4114c5f
 AUX qtwebengine-5.15.2_p20210521-clang-libc++.patch 358 BLAKE2B a03de632ac4e01cf56c52af3a3bd5ff5bcfd525c67bf2e5d960904a9f3b53e1fa18f0e0df380c0cf84f17914fb313a028e26efaefe6ab5057f0d9a9cf2f6f0fd SHA512 6dc3864064d6084e70d4696fda744701c293ee62e9c9088e3247988ffb8085f30c632e94ac19aef715cbd211b21dfcb98691d5809e21cffd9f04bbb8b04cf0da
@@ -12,10 +11,6 @@ AUX qtwebengine-5.15.3_p20220505-extra-gn.patch 458 BLAKE2B 0595f06d31fd83a04cc0
 DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
 DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B fca1d1406874d04eafb64bb4d8730512a6307ba44fb99d76f428ca1bd4a303758e0c3bd8f92a59f7bcf62e5b767c5a8ed239028bdb74ad7a8b62abf88d38c101 SHA512 61cbfbe4ff340b75ea8d356e031e932ac03fe65dd009999ff897ca4b0185d1d989490daf75ffeaaabb3e92c870c11c7ff8ad2cd6372f5363b3d774b8ecca6d89
 DIST qtwebengine-5.15.3_p20220406-patchset.tar.xz 35480 BLAKE2B ce6aeebbb3255196611130d04ee7a3907ba45d6d2a283f2433e2176cf67e473e74137b180de0a9998762cc54439bb06825815e81e9f95f9413ce2956ac9308b7 SHA512 47e29a1429dce2db324929af91c8ef8421c75ae48f5a491db71b434f8017a5b1e7475e9938989e331e8e012220852848565242e09747892e1a8a8d3ab7386840
-DIST qtwebengine-5.15.3_p20220406.tar.xz 318979648 BLAKE2B 3aba9293c52f96379cfe37c418c7a29a28e2fc0a8526d35452bef28c03b101054131d0daf75f07f058f80fbd42678b6bd24733573318169908f1d5e18d147db8 SHA512 80bf51b547cc8e15473652327a0cb753211911e8c98b1cb8b2cd696af923e79eccdc74aa4b68b6184c74ceb3a9bd708c7313f48eab4381ebeaac8192daa163b6
-DIST qtwebengine-5.15.3_p20220505.tar.xz 318923536 BLAKE2B 18798ee82864bf513525be30aba58636518b5f13061826a5f80a791baeb3a7695f2626a3eec8b8be88ef6ae4a4caa989f9a35b8b9d8d6f85f727ce3e3a18e110 SHA512 c5f0688aa782f1e8f6a076b0bc4ba0c5bb0518a784399d915da924f1a4e798dff1d23158b3bc73e46629020f5490a15823d6d5b36463dc7ebdec14331fe4323e
 DIST qtwebengine-5.15.4_p20220526.tar.xz 318787804 BLAKE2B 946331d1460f2db43730c7a1f506690eb1f6f25438e52ff627fff0776cbca439cde2d2654679a238ce0384b0a92bf8eb84db97d1093b2a733dd97fa08bf4c864 SHA512 a27d31ef46b5841fec91c10b91c3c1735ace77fde17fa09018836f8d11d85b34b08318b150b791a68efde59c1317109633e938dfbb5542c22033e8ba0ce46cad
-EBUILD qtwebengine-5.15.3_p20220406.ebuild 9209 BLAKE2B 47aaad432cc93ee82ab1fa314e6c79132eee92ddca0abab16df7a9527f0c0158ba0b25214832f84e2256a2b500426d597030ad47eaa0972ade279121a27bc6d3 SHA512 7d6db92208ac9ee9a5df2bf9a48cce30b1361d5d718d60275e9d4e064fbaeff75a76d562c5dd862b30ed8e722073ed69f4531c451b1308527c8bb768ec10961b
-EBUILD qtwebengine-5.15.4_p20220505.ebuild 9262 BLAKE2B d9b68fba2f326e9910105907b5e0f8f2b73cd564e69950169975934406209edd4c7a5684321323f4f08d2ea8619f8feca70991f9afc93be06264725c5dc9c3c0 SHA512 6860f8b4be6c9e4cb1d9f206f13e3adc9f13525e307c62a77671589bd5f2672e9fe6d540c9c93a890c5b1d31ede3882a3ca8a9fb032839af9765b608d78da6e0
-EBUILD qtwebengine-5.15.4_p20220526.ebuild 9225 BLAKE2B 59ad825f83c802c548cbd8298ab3c911cdb8793bfad449372276ce9144b2950c26ef1bcb8dca0f06fa255596d7e8521f7edecbc0b759d1426f05e4e87ea58a9e SHA512 b9f309a015e0f77c6e587a74ec46e8c8cf636e98c1bda213bafa7d9e9dc8618ed22b74e45131dde9b679451e0c40fde52d61ae1e738e7cb3df14fb501d65393f
+EBUILD qtwebengine-5.15.4_p20220526.ebuild 9223 BLAKE2B 734141be64f31fccaafc4dc71e5eeea816e5bb6dfe545448dbee1d1df93b1a2aaabd359ab783a751c3b8838d8b224ae79cc231e113e05bc377b6045c12af0b5b SHA512 e326b28a15abac627250ecf72c536127a6473a688a1462f197baf8a6b5741985046440641982c1672fe565fb0d8dd98e4dc8b03e218b477c34f8c600e23244d5
 MISC metadata.xml 1379 BLAKE2B 67b694ac104e8f16a0bb4a33bd178b4507b5c411d62634d88dd8187dd27b32d6a11829883cde03c0a856134c498df7d6c946221a05fec356e62296b64add4121 SHA512 afa7bd418df63335a1b6ad7f1a53be74a710ffaaee294a1db7691ce98d45d2e98e3f40c2e47e2e9e89f766122392def7a3c2198680413c647c9202c1f4c2f0e7
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2-extra_gn.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2-extra_gn.patch
deleted file mode 100644
index 0488122ce92f..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2-extra_gn.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/core/gn_run.pro b/src/core/gn_run.pro
-index 3d6fda80e..3d0bc86fe 100644
---- a/src/core/gn_run.pro
-+++ b/src/core/gn_run.pro
-@@ -38,5 +38,6 @@ build_pass|!debug_and_release {
-     }
- 
-+    gn_args += $$(EXTRA_GN)
-     gn_args = $$system_quote($$gn_args)
-     gn_src_root = $$system_quote($$system_path($$QTWEBENGINE_ROOT/$$getChromiumSrcDir()))
-     gn_build_root = $$system_quote($$system_path($$OUT_PWD/$$getConfigDir()))
-     gn_python = "--script-executable=$$pythonPathForSystem()"
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220406.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220406.ebuild
deleted file mode 100644
index a0c5b039fdfa..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220406.ebuild
+++ /dev/null
@@ -1,280 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9,10} )
-PYTHON_REQ_USE="xml(+)"
-inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt5-build toolchain-funcs
-
-DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
-HOMEPAGE="https://www.qt.io/"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-	if [[ ${PV} == ${QT5_PV}_p* ]]; then
-		SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
-		S="${WORKDIR}/${P}"
-		QT5_BUILD_DIR="${S}_build"
-	fi
-else
-	EGIT_BRANCH="5.15"
-	EGIT_REPO_URI=(
-		"https://code.qt.io/qt/${QT5_MODULE}.git"
-		"https://github.com/qt/${QT5_MODULE}.git"
-	)
-	inherit git-r3
-fi
-
-# ppc64 patchset based on https://github.com/chromium-ppc64le releases
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-5.15.2_p20211019-jumbo-build.patch.bz2
-	https://dev.gentoo.org/~asturm/distfiles/${PN}-5.15.3_p20220406-patchset.tar.xz
-	ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-r1-chromium87-ppc64le.tar.xz )"
-
-IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast +system-ffmpeg +system-icu widgets"
-REQUIRED_USE="designer? ( widgets )"
-
-RDEPEND="
-	app-arch/snappy:=
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	dev-libs/expat
-	dev-libs/libevent:=
-	dev-libs/libxml2[icu]
-	dev-libs/libxslt
-	dev-libs/re2:=
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtdeclarative-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*
-	=dev-qt/qtnetwork-${QT5_PV}*
-	=dev-qt/qtprintsupport-${QT5_PV}*
-	=dev-qt/qtwebchannel-${QT5_PV}*[qml]
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/harfbuzz:=
-	media-libs/lcms:2
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:0=
-	>=media-libs/libvpx-1.5:=[svc(+)]
-	media-libs/libwebp:=
-	media-libs/opus
-	sys-apps/dbus
-	sys-apps/pciutils
-	sys-libs/zlib[minizip]
-	virtual/libudev
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libxkbfile
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	alsa? ( media-libs/alsa-lib )
-	designer? ( =dev-qt/designer-${QT5_PV}* )
-	geolocation? ( =dev-qt/qtpositioning-${QT5_PV}* )
-	kerberos? ( virtual/krb5 )
-	pulseaudio? ( media-sound/pulseaudio:= )
-	screencast? ( media-video/pipewire:= )
-	system-ffmpeg? ( media-video/ffmpeg:0= )
-	system-icu? ( >=dev-libs/icu-69.1:= )
-	widgets? (
-		=dev-qt/qtdeclarative-${QT5_PV}*[widgets]
-		=dev-qt/qtwidgets-${QT5_PV}*
-	)
-"
-DEPEND="${RDEPEND}
-	media-libs/libglvnd
-"
-BDEPEND="${PYTHON_DEPS}
-	dev-util/gperf
-	dev-util/ninja
-	dev-util/re2c
-	net-libs/nodejs[ssl]
-	sys-devel/bison
-	sys-devel/flex
-	ppc64? ( >=dev-util/gn-0.1807 )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.15.2-disable-fatal-warnings.patch" # downstream, bug 695446
-	"${FILESDIR}/${PN}-5.15.2-extra_gn.patch" # downstream, bug 774186
-	"${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606
-	"${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix
-	"${FILESDIR}/${PN}-5.15.2_p20211015-pdfium-system-lcms2.patch" # by Debian, QTBUG-61746
-	"${FILESDIR}/${PN}-5.15.3_p20220329-clang14.patch" # by FreeBSD, bug 836604
-	"${FILESDIR}/${PN}-5.15.3_p20220406-gcc12-includes.patch" # by openSUSE, bug 840326
-	"${WORKDIR}/${PN}-5.15.2_p20211019-jumbo-build.patch" # bug 813957
-	"${WORKDIR}/${PN}-5.15.3_p20220406-patchset" # bug 698988 (py2--), pipewire-3
-)
-
-qtwebengine_check-reqs() {
-	# bug #307861
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
-		ewarn "You may experience really long compilation times and/or increased memory usage."
-		ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
-	fi
-	eshopts_pop
-
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	# (check-reqs added for bug #570534)
-	#
-	# Estimate the amount of RAM required
-	# Multiplier is *10 because Bash doesn't do floating point maths.
-	# Let's crudely assume ~2GB per compiler job for GCC.
-	local multiplier=20
-
-	# And call it ~1.5GB for Clang.
-	if tc-is-clang ; then
-		multiplier=15
-	fi
-
-	local CHECKREQS_DISK_BUILD="7G"
-	local CHECKREQS_DISK_USR="150M"
-	if ! has "distcc" ${FEATURES} ; then
-		# bug #830661
-		# Not super realistic to come up with good estimates for distcc right now
-		local CHECKREQS_MEMORY=$(($(makeopts_jobs)*multiplier/10))G
-	fi
-
-	check-reqs_${EBUILD_PHASE_FUNC}
-}
-
-pkg_pretend() {
-	qtwebengine_check-reqs
-}
-
-pkg_setup() {
-	qtwebengine_check-reqs
-	python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	case ${QT5_BUILD_TYPE} in
-		live)    git-r3_src_unpack ;&
-		release) default ;;
-	esac
-}
-
-src_prepare() {
-	if [[ ${PV} == ${QT5_PV}_p* ]]; then
-		# This is made from git, and for some reason will fail w/o .git directories.
-		mkdir -p .git src/3rdparty/chromium/.git || die
-	fi
-	# We need to make sure this integrates well into Qt 5.15.3 installation.
-	# Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it.
-	# See also: https://www.qt.io/blog/building-qt-webengine-against-other-qt-versions
-	sed -E "/^MODULE_VERSION/s/5\.15\.[0-9]+/${QT5_PV}/" -i .qmake.conf || die
-
-	# QTBUG-88657 - jumbo-build could still make trouble
-	if ! use jumbo-build; then
-		sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
-			src/buildtools/config/common.pri || die
-	fi
-
-	# bug 620444 - ensure local headers are used
-	find "${S}" -type f -name "*.pr[fio]" | \
-		xargs sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' || die
-
-	if use system-icu; then
-		# Sanity check to ensure that bundled copy of ICU is not used.
-		# Whole src/3rdparty/chromium/third_party/icu directory cannot be deleted because
-		# src/3rdparty/chromium/third_party/icu/BUILD.gn is used by build system.
-		# If usage of headers of bundled copy of ICU occurs, then lists of shim headers in
-		# shim_headers("icui18n_shim") and shim_headers("icuuc_shim") in
-		# src/3rdparty/chromium/third_party/icu/BUILD.gn should be updated.
-		local file
-		while read file; do
-			echo "#error This file should not be used!" > "${file}" || die
-		done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null)
-	fi
-
-	# src/3rdparty/gn fails with libc++ due to passing of `-static-libstdc++`
-	if tc-is-clang && has_version 'sys-devel/clang[default-libcxx]'; then
-		eapply "${FILESDIR}/${PN}-5.15.2_p20210521-clang-libc++.patch"
-	fi
-
-	if use system-ffmpeg && has_version '>=media-video/ffmpeg-5'; then
-		eapply "${FILESDIR}/${PN}-5.15.3_p20220406-ffmpeg5.patch" # by Archlinux, bug 831437
-	fi
-
-	qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri
-	qt_use_disable_config pulseaudio webengine-pulseaudio src/buildtools/config/linux.pri
-
-	qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro
-
-	qt_use_disable_mod widgets widgets src/src.pro
-
-	qt5-build_src_prepare
-
-	# we need to generate ppc64 stuff because upstream does not ship it yet
-	if use ppc64; then
-		einfo "Patching for ppc64le and generating build files"
-		eapply "${FILESDIR}/qtwebengine-5.15.2-enable-ppc64.patch"
-		pushd src/3rdparty/chromium > /dev/null || die
-		eapply -p0 "${WORKDIR}/${PN}-ppc64le"
-		popd > /dev/null || die
-		pushd src/3rdparty/chromium/third_party/libvpx > /dev/null || die
-		mkdir -vp source/config/linux/ppc64 || die
-		mkdir -p source/libvpx/test || die
-		touch source/libvpx/test/test.mk || die
-		# clang-format is used to re-format sources
-		# but we'd rather make it a no-op than introduce a clang dependency
-		# https://bugs.gentoo.org/849458
-		clang-format() { : ; }
-		export -f clang-format || die
-		./generate_gni.sh || die
-		popd >/dev/null || die
-	fi
-}
-
-src_configure() {
-	export NINJA_PATH=/usr/bin/ninja
-	export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs "${MAKEOPTS}" 999) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
-
-	local myqmakeargs=(
-		--
-		-no-build-qtpdf
-		-printing-and-pdf
-		-system-opus
-		-system-webp
-		$(qt_use alsa)
-		$(qt_use !bindist proprietary-codecs)
-		$(qt_use geolocation webengine-geolocation)
-		$(qt_use kerberos webengine-kerberos)
-		$(qt_use pulseaudio)
-		$(usex screencast -webengine-webrtc-pipewire '')
-		$(usex system-ffmpeg -system-ffmpeg -qt-ffmpeg)
-		$(qt_use system-icu webengine-icu)
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-
-	# bug 601472
-	if [[ ! -f ${D}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
-		die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
-	fi
-}
-
-pkg_preinst() {
-	elog "This version of Qt WebEngine is based on Chromium version 87.0.4280, with"
-	elog "additional security fixes from newer versions. Extensive as it is, the"
-	elog "list of backports is impossible to evaluate, but always bound to be behind"
-	elog "Chromium's release schedule."
-	elog "In addition, various online services may deny service based on an outdated"
-	elog "user agent version (and/or other checks). Google is already known to do so."
-	elog
-	elog "tldr: Your web browsing experience will be compromised."
-}
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220505.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220505.ebuild
deleted file mode 100644
index 9c2a93d1c3b2..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220505.ebuild
+++ /dev/null
@@ -1,280 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9,10} )
-PYTHON_REQ_USE="xml(+)"
-inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt5-build toolchain-funcs
-
-DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
-HOMEPAGE="https://www.qt.io/"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-	if [[ ${PV} == ${QT5_PV}_p* ]]; then
-		SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${PN}-5.15.3_p20220505.tar.xz"
-		S="${WORKDIR}/${PN}-5.15.3_p20220505"
-		QT5_BUILD_DIR="${S}_build"
-	fi
-else
-	EGIT_BRANCH="5.15"
-	EGIT_REPO_URI=(
-		"https://code.qt.io/qt/${QT5_MODULE}.git"
-		"https://github.com/qt/${QT5_MODULE}.git"
-	)
-	inherit git-r3
-fi
-
-# ppc64 patchset based on https://github.com/chromium-ppc64le releases
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-5.15.2_p20211019-jumbo-build.patch.bz2
-	https://dev.gentoo.org/~asturm/distfiles/${PN}-5.15.3_p20220406-patchset.tar.xz
-	ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-r1-chromium87-ppc64le.tar.xz )"
-
-IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast +system-ffmpeg +system-icu widgets"
-REQUIRED_USE="designer? ( widgets )"
-
-RDEPEND="
-	app-arch/snappy:=
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	dev-libs/expat
-	dev-libs/libevent:=
-	dev-libs/libxml2[icu]
-	dev-libs/libxslt
-	dev-libs/re2:=
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtdeclarative-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*
-	=dev-qt/qtnetwork-${QT5_PV}*
-	=dev-qt/qtprintsupport-${QT5_PV}*
-	=dev-qt/qtwebchannel-${QT5_PV}*[qml]
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/harfbuzz:=
-	media-libs/lcms:2
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:0=
-	>=media-libs/libvpx-1.5:=[svc(+)]
-	media-libs/libwebp:=
-	media-libs/opus
-	sys-apps/dbus
-	sys-apps/pciutils
-	sys-libs/zlib[minizip]
-	virtual/libudev
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libxkbfile
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	alsa? ( media-libs/alsa-lib )
-	designer? ( =dev-qt/designer-${QT5_PV}* )
-	geolocation? ( =dev-qt/qtpositioning-${QT5_PV}* )
-	kerberos? ( virtual/krb5 )
-	pulseaudio? ( media-sound/pulseaudio:= )
-	screencast? ( media-video/pipewire:= )
-	system-ffmpeg? ( media-video/ffmpeg:0= )
-	system-icu? ( >=dev-libs/icu-69.1:= )
-	widgets? (
-		=dev-qt/qtdeclarative-${QT5_PV}*[widgets]
-		=dev-qt/qtwidgets-${QT5_PV}*
-	)
-"
-DEPEND="${RDEPEND}
-	media-libs/libglvnd
-"
-BDEPEND="${PYTHON_DEPS}
-	dev-util/gperf
-	dev-util/ninja
-	dev-util/re2c
-	net-libs/nodejs[ssl]
-	sys-devel/bison
-	sys-devel/flex
-	ppc64? ( >=dev-util/gn-0.1807 )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.15.2-disable-fatal-warnings.patch" # downstream, bug 695446
-	"${FILESDIR}/${PN}-5.15.3_p20220505-extra-gn.patch" # downstream, bug 774186
-	"${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606
-	"${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix
-	"${FILESDIR}/${PN}-5.15.2_p20211015-pdfium-system-lcms2.patch" # by Debian, QTBUG-61746
-	"${FILESDIR}/${PN}-5.15.3_p20220329-clang14.patch" # by FreeBSD, bug 836604
-	"${FILESDIR}/${PN}-5.15.3_p20220406-gcc12-includes.patch" # by openSUSE, bug 840326
-	"${WORKDIR}/${PN}-5.15.2_p20211019-jumbo-build.patch" # bug 813957
-	"${WORKDIR}/${PN}-5.15.3_p20220406-patchset" # bug 698988 (py2--), pipewire-3
-)
-
-qtwebengine_check-reqs() {
-	# bug #307861
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
-		ewarn "You may experience really long compilation times and/or increased memory usage."
-		ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
-	fi
-	eshopts_pop
-
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	# (check-reqs added for bug #570534)
-	#
-	# Estimate the amount of RAM required
-	# Multiplier is *10 because Bash doesn't do floating point maths.
-	# Let's crudely assume ~2GB per compiler job for GCC.
-	local multiplier=20
-
-	# And call it ~1.5GB for Clang.
-	if tc-is-clang ; then
-		multiplier=15
-	fi
-
-	local CHECKREQS_DISK_BUILD="7G"
-	local CHECKREQS_DISK_USR="150M"
-	if ! has "distcc" ${FEATURES} ; then
-		# bug #830661
-		# Not super realistic to come up with good estimates for distcc right now
-		local CHECKREQS_MEMORY=$(($(makeopts_jobs)*multiplier/10))G
-	fi
-
-	check-reqs_${EBUILD_PHASE_FUNC}
-}
-
-pkg_pretend() {
-	qtwebengine_check-reqs
-}
-
-pkg_setup() {
-	qtwebengine_check-reqs
-	python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	case ${QT5_BUILD_TYPE} in
-		live)    git-r3_src_unpack ;&
-		release) default ;;
-	esac
-}
-
-src_prepare() {
-	if [[ ${PV} == ${QT5_PV}_p* ]]; then
-		# This is made from git, and for some reason will fail w/o .git directories.
-		mkdir -p .git src/3rdparty/chromium/.git || die
-	fi
-	# We need to make sure this integrates well into Qt 5.15.3 installation.
-	# Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it.
-	# See also: https://www.qt.io/blog/building-qt-webengine-against-other-qt-versions
-	sed -E "/^MODULE_VERSION/s/5\.15\.[0-9]+/${QT5_PV}/" -i .qmake.conf || die
-
-	# QTBUG-88657 - jumbo-build could still make trouble
-	if ! use jumbo-build; then
-		sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
-			src/buildtools/config/common.pri || die
-	fi
-
-	# bug 620444 - ensure local headers are used
-	find "${S}" -type f -name "*.pr[fio]" | \
-		xargs sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' || die
-
-	if use system-icu; then
-		# Sanity check to ensure that bundled copy of ICU is not used.
-		# Whole src/3rdparty/chromium/third_party/icu directory cannot be deleted because
-		# src/3rdparty/chromium/third_party/icu/BUILD.gn is used by build system.
-		# If usage of headers of bundled copy of ICU occurs, then lists of shim headers in
-		# shim_headers("icui18n_shim") and shim_headers("icuuc_shim") in
-		# src/3rdparty/chromium/third_party/icu/BUILD.gn should be updated.
-		local file
-		while read file; do
-			echo "#error This file should not be used!" > "${file}" || die
-		done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null)
-	fi
-
-	# src/3rdparty/gn fails with libc++ due to passing of `-static-libstdc++`
-	if tc-is-clang && has_version 'sys-devel/clang[default-libcxx]'; then
-		eapply "${FILESDIR}/${PN}-5.15.2_p20210521-clang-libc++.patch"
-	fi
-
-	if use system-ffmpeg && has_version '>=media-video/ffmpeg-5'; then
-		eapply "${FILESDIR}/${PN}-5.15.3_p20220406-ffmpeg5.patch" # by Archlinux, bug 831437
-	fi
-
-	qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri
-	qt_use_disable_config pulseaudio webengine-pulseaudio src/buildtools/config/linux.pri
-
-	qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro
-
-	qt_use_disable_mod widgets widgets src/src.pro
-
-	qt5-build_src_prepare
-
-	# we need to generate ppc64 stuff because upstream does not ship it yet
-	if use ppc64; then
-		einfo "Patching for ppc64le and generating build files"
-		eapply "${FILESDIR}/qtwebengine-5.15.2-enable-ppc64.patch"
-		pushd src/3rdparty/chromium > /dev/null || die
-		eapply -p0 "${WORKDIR}/${PN}-ppc64le"
-		popd > /dev/null || die
-		pushd src/3rdparty/chromium/third_party/libvpx > /dev/null || die
-		mkdir -vp source/config/linux/ppc64 || die
-		mkdir -p source/libvpx/test || die
-		touch source/libvpx/test/test.mk || die
-		# clang-format is used to re-format sources
-		# but we'd rather make it a no-op than introduce a clang dependency
-		# https://bugs.gentoo.org/849458
-		clang-format() { : ; }
-		export -f clang-format || die
-		./generate_gni.sh || die
-		popd >/dev/null || die
-	fi
-}
-
-src_configure() {
-	export NINJA_PATH=/usr/bin/ninja
-	export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs "${MAKEOPTS}" 999) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
-
-	local myqmakeargs=(
-		--
-		-no-build-qtpdf
-		-printing-and-pdf
-		-system-opus
-		-system-webp
-		$(qt_use alsa)
-		$(qt_use !bindist proprietary-codecs)
-		$(qt_use geolocation webengine-geolocation)
-		$(qt_use kerberos webengine-kerberos)
-		$(qt_use pulseaudio)
-		$(usex screencast -webengine-webrtc-pipewire '')
-		$(usex system-ffmpeg -system-ffmpeg -qt-ffmpeg)
-		$(qt_use system-icu webengine-icu)
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-
-	# bug 601472
-	if [[ ! -f ${D}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
-		die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
-	fi
-}
-
-pkg_preinst() {
-	elog "This version of Qt WebEngine is based on Chromium version 87.0.4280.144,"
-	elog "with additional security fixes from newer versions. Extensive as it is, the"
-	elog "list of backports is impossible to evaluate, but always bound to be behind"
-	elog "Chromium's release schedule."
-	elog "In addition, various online services may deny service based on an outdated"
-	elog "user agent version (and/or other checks). Google is already known to do so."
-	elog
-	elog "tldr: Your web browsing experience will be compromised."
-}
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220526.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220526.ebuild
index 6c1f60c130b3..9ba4c484f9b3 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220526.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220526.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applic
 HOMEPAGE="https://www.qt.io/"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 	if [[ ${PV} == ${QT5_PV}_p* ]]; then
 		SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
 		S="${WORKDIR}/${P}"
diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest
index fdec1d8ea885..d169d192a59a 100644
--- a/dev-qt/qtwebsockets/Manifest
+++ b/dev-qt/qtwebsockets/Manifest
@@ -3,5 +3,5 @@ DIST qtwebsockets-5.15.4-gentoo-kde-1.tar.xz 2036 BLAKE2B 563c0baaa8ad1b9c786f35
 DIST qtwebsockets-everywhere-opensource-src-5.15.3.tar.xz 259184 BLAKE2B d37056edef6a8618f773c5b51d3e3d3d48e996ddf27b04129a9b2ef4e313405018ec0325482d2157245f31fc25e3938a03d2aab773735269930c4cb175593ef0 SHA512 a4d1442028e842f5e97bb5d9142d2be768193a0807e51a72adc36bf9bf554fd3ae86373d3de841dc6e0c8bd8312d7bc23b2e46fdf90fce59ab5e35e4462ce4ea
 DIST qtwebsockets-everywhere-opensource-src-5.15.4.tar.xz 260792 BLAKE2B 5e494c712e859bac610547ab3c4fe7552b2a4fe6d0c120bd445937903b120395da21c0ebee5c1de97c02e60ce48e53551d6b509fecc5ca38e142677857130adc SHA512 01714b9927c3a234fac9386a596aa3dc3833d9cfe8cc152892fec969e51b428bed00f501c16b8e4f810452739ff8491e5c64f9b936aa10e1a839c09c8f2832ce
 EBUILD qtwebsockets-5.15.3.ebuild 583 BLAKE2B 03765c46170ca5eb45df9f2773b60ef2fc126c9bf14bea4fc084f3984c3fd16a804de1625577da27658af0201c486f3a3ca1dc3977cdac546456954717cb707c SHA512 0fe201988a3af2a80c11da78c23e99f88abdbe45228284a24cafcc582118764bf761b5157476076bf1d448479ca874e7d83d2d39036cc386da4611dc5f28e57b
-EBUILD qtwebsockets-5.15.4.ebuild 587 BLAKE2B 1e18e16cd1521a6016ecfbf0ba4c32074ed2c6b3aec05fd2d618ac63aa27ec3b434f33fd9e6b63649a2b862b885d59d9e4a8e4de4b64f09ca808d6ebec3cb3e7 SHA512 77b54f5bc3972252e85c0f715970c15e816001eb1a6421b7ffac2867f7ff3e10083d0e5cf8e319294ed44ac0f3fd533ad387fb02201b1d2a75c1592cf83abba2
+EBUILD qtwebsockets-5.15.4.ebuild 584 BLAKE2B fd83042c8cd6631d66d9493f8ef6aea0f959bb603607075aa64fce2d40b795b4ca8b835d3c12adc6ba72da132fcd6331c5fc9f064c88f2300a490551003aa8ff SHA512 5278598f55e2c9fa01575f2b54303bd3c0d69e4d49ce9c86ccd4791fff624e9bdd4883c08594461c3d2dc4d9f4fc57aa7d48887cf73c0f275b5d9ade36136087
 MISC metadata.xml 542 BLAKE2B 45db7e0814cd2ecae2053ed664d6af55c1f2c175eeceba4364fc37c558ddb51c8e28309722e8c2404441ca009613c045ddf7e501d4b5ed27d208c027c3aa1573 SHA512 5bc7be4d72823fdb716ce7eee0c36eb2a5fe7ea9a59a95792727efbddbe474fb44dfa0286a3064ee674a41d8d5415fd48c717735b6818cf3c28e1d60193f3ce1
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.15.4.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.15.4.ebuild
index 8d610d19b6d1..01cea4901716 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.15.4.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.15.4.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="qml +ssl"
diff --git a/dev-qt/qtwebview/Manifest b/dev-qt/qtwebview/Manifest
index fc3ac9bada2f..2771d889fe1d 100644
--- a/dev-qt/qtwebview/Manifest
+++ b/dev-qt/qtwebview/Manifest
@@ -1,5 +1,3 @@
-DIST qtwebview-everywhere-opensource-src-5.15.3.tar.xz 133700 BLAKE2B 7ca5b2e18f08a7a7dd08ff7c835e796dbba5dfd77deaed0e5909d1622d478de69e190b68b3f02e4c48ba04fd37196ea63297ffea4f6e999966b3938944491614 SHA512 3a2a7c06df79a6ac4bfd3a45c2ad9e06dc1c2c71ca6a14f9006e031b0679549a9f1d09a9c82439c700e1c0c0785cf7baa402ea2d230a4ebd122dc4e5d2b07030
 DIST qtwebview-everywhere-opensource-src-5.15.4.tar.xz 135316 BLAKE2B 7c8554abeb07014f51b9e61e352cb5b473973ae52c675a7027e95cfca2bf8bfecfac2bd2b5d1b1f6170420bd9a3c4280ee9de7604834cc42841ea0db51cc3dd9 SHA512 fb5177f0e8f79490598120f01b6cdd78ce5cbac8f313c0e088ded7b4daada290d2c058ecd6eebdba76fd15efd2e198bc03cbaf544fba664d49efb55709703be6
-EBUILD qtwebview-5.15.3.ebuild 454 BLAKE2B 8f380ecf5efbd5e38d4b94e224cd191d342bc59c9730a929f6c1c6f5f68ff64e5b3b3604970396f05e7c7ce757d92c8a9b82868a37136b7ebb34f4ec94a4c35a SHA512 6ecad94dcfe6a2517a1af4194aad7ca2696d066bb2483ca73c8d45495c8389d1b59358dad8d71ef5a84fc67bc384dee6b141772cf0438a6edeae22037c57843a
 EBUILD qtwebview-5.15.4.ebuild 454 BLAKE2B 8f380ecf5efbd5e38d4b94e224cd191d342bc59c9730a929f6c1c6f5f68ff64e5b3b3604970396f05e7c7ce757d92c8a9b82868a37136b7ebb34f4ec94a4c35a SHA512 6ecad94dcfe6a2517a1af4194aad7ca2696d066bb2483ca73c8d45495c8389d1b59358dad8d71ef5a84fc67bc384dee6b141772cf0438a6edeae22037c57843a
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtwebview/qtwebview-5.15.3.ebuild b/dev-qt/qtwebview/qtwebview-5.15.3.ebuild
deleted file mode 100644
index 288f86cec680..000000000000
--- a/dev-qt/qtwebview/qtwebview-5.15.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt5-build
-
-DESCRIPTION="Module for displaying web content in a QML application using the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
-fi
-
-IUSE=""
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtdeclarative-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*
-	=dev-qt/qtwebengine-${QT5_PV}*:5
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index 95052a32eafc..1ddc374dc788 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -4,6 +4,6 @@ DIST qtbase-5.15.4-gentoo-kde-3.tar.xz 516480 BLAKE2B b7f94dd5315b9a16647c2d035f
 DIST qtbase-everywhere-opensource-src-5.15.3.tar.xz 50204364 BLAKE2B 9c011e8d6033e340a1d7be6bd9100a05d55638cfd53f647752853382574b6c444668eae36bf88cfedde0e7c0e00ecb1f91d025fc59c23be5438ba0ef91a5246c SHA512 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079
 DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B 3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b SHA512 91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3
 EBUILD qtwidgets-5.15.3.ebuild 1195 BLAKE2B 45122f3ba71a6317214797a0caf6ebe0cf904864df95ec158250bbcc082ef473716422a963a9ca8a3e62914e94824e3a873bdb9c0214102c6c189b65eb9c4c1b SHA512 d6ea638d68a94a8131c6be95ae71b6c44db7cc0edc4f5bcc9937589cbfcf8d23bdd213e8aef337eaa23820ecf8743df579224fed76505912ca9d493395e70b14
-EBUILD qtwidgets-5.15.4-r1.ebuild 1207 BLAKE2B 6d43b1f77d4704f3ca7ec91515a9f8606502f5d35d03b2a8e31fc6ff7b20556c3cc78a833bdae84d380c1610d629005b46db502275cdde2fa6bd35709d6575c5 SHA512 44393abccf96b374b00eac0b4a6f74363ce6c2bd345979c592f168b6c652fb26693d01818b9f4c19e450c9558a882a3edca6a3055fc7d769cbdcf0ba7854523d
+EBUILD qtwidgets-5.15.4-r1.ebuild 1204 BLAKE2B f9fb7a616a8f6c51cda8edfa03d65342446791ec7469312227084071a4e2d8740c1cb5a192429912ea35374444e5216aa934ae25913ed900ad09891a9a94255e SHA512 bc3a77d109edcee4e0cdd4efdbf6fab28ac86be3740e4f6d0706996cbc9aae442a7c18395a01dc5d570350bbdb886210436207b51af2232fbf3cdd4cb84f5c66
 EBUILD qtwidgets-5.15.4-r2.ebuild 1208 BLAKE2B f63c4881b72fcef1114a6a5b22cfedb006def40f6a05a96e5076700e11a66d2e649dc2f5782bd5c45296b9435e987c64c8fc46bf81c69b2d08c7f4cc52293a3a SHA512 0cb6f5be33e5c8fb9a3c96ac8a16bd148eb525dee02ce4ff0c5728c4d5116c320a0ca54d71c7c9bc96c15cb98bae7d115dca0b18e0ba274dc41a5dffc3cc9e0c
 MISC metadata.xml 559 BLAKE2B 3ea80a5e419db32987d68d7e5033fa75fa0ff22b31b0842fd7ead902172cbe83650b0bbdf8657a57e428726e7cdf114d9011bd16066c080bc5f6ecb3f691d42c SHA512 51172365a186fbca09651bfd751284960dda4036390af2afab9812a7ae3fabdd9d60a336dee3cfc5e3d133a0216bf77e29660b9cdee2f0bcd2ce43c27297bdb1
diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.4-r1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.4-r1.ebuild
index 6d61c9a1a47f..c337b70acaf7 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.15.4-r1.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.15.4-r1.ebuild
@@ -10,7 +10,7 @@ inherit qt5-build
 DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 # keep IUSE defaults in sync with qtgui
diff --git a/dev-qt/qtx11extras/Manifest b/dev-qt/qtx11extras/Manifest
index 5eff924ab989..650a499921bc 100644
--- a/dev-qt/qtx11extras/Manifest
+++ b/dev-qt/qtx11extras/Manifest
@@ -1,5 +1,5 @@
 DIST qtx11extras-everywhere-opensource-src-5.15.3.tar.xz 143996 BLAKE2B 5e6fa4d15c6fd16d81d4923cdace8e90baaa2b6484667a516890b4c6da5befa61205809bf4f52273bc25747b1d7a6355b8f85ecbf891a0d97548362a01e0acb2 SHA512 eaf5e639c68cc4e1a35f82a877f461f8023b92dede3819808fdb7334364f4428400a94e7d8cff30985410bf7754258c6376504fd068ba3d792683fd23f586133
 DIST qtx11extras-everywhere-opensource-src-5.15.4.tar.xz 145612 BLAKE2B 4c67f50d8a1cf152a5e46d208f4cd4faaa100d8b0a178bd610c825dcdf7cbbc0ec2b8ac904856ebc7b08aebbb9b6c4b6d0503fdc5af21d32ed3d4c2d7bdf170f SHA512 79c718eff9daba9ff3f361d38f828f8f3c447b87486d652d4ed1f964ec686259ae4d0a1a50b7b6b9349453ba3f8b56b3c20c8a5f26971d5cc3c8f99d668744d6
 EBUILD qtx11extras-5.15.3.ebuild 452 BLAKE2B b656ce186a73820dca95a70df22be14900718d2040fa7bd31f55dd02e8d3bc48bfb6874e1ab5c3945cf345af6633161242860ed23b646927e821b74aaa1eb168 SHA512 18ab71f09f5b0454583af9531d738c8d6277f92c183a533beffa8f310f8e9eb5db9c22bc1966408c4eadad3f193c7c17978192c0c04b6f16177e670bf7c1b57d
-EBUILD qtx11extras-5.15.4.ebuild 464 BLAKE2B 8ff7fac9622f13b4ede2235fd737b39b3ea7a5e54ce7e53f89cf7c8a6c528e1eb47f0fb70baf0ad347e7570be8527912e0642f2d61fc47d4ad4ca03cfe352f5b SHA512 de609e4d0c5d9a6fdb209496de0c93ee4021bd26d3a570e90d81b58d7f79c617f86aaa0f6d1048906aa9e41ef2e7c88f2ee7f32061afb594177c1c408e61513e
+EBUILD qtx11extras-5.15.4.ebuild 461 BLAKE2B f148f14535b3d4720ce85877ac9ec3e2778e22672d6c4587e85daea5d605d88535c62fd7baad4772d317f5e47811b624b9d11330571b93d32248d0d46451b0d7 SHA512 9d67012fd01a120f2eb9f3f7eaab35d7a465560cd7cd506a9d9520aed7dabe51cae1d3cf4e587d13bd0fc84318148decdfd322a4d6a8fabf87400128c0d3bf14
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtx11extras/qtx11extras-5.15.4.ebuild b/dev-qt/qtx11extras/qtx11extras-5.15.4.ebuild
index 0f353476fc44..3842c5cbcdc4 100644
--- a/dev-qt/qtx11extras/qtx11extras-5.15.4.ebuild
+++ b/dev-qt/qtx11extras/qtx11extras-5.15.4.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Linux/X11-specific support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtxml/Manifest b/dev-qt/qtxml/Manifest
index c7d193f92509..5c60dc7769ad 100644
--- a/dev-qt/qtxml/Manifest
+++ b/dev-qt/qtxml/Manifest
@@ -3,5 +3,5 @@ DIST qtbase-5.15.4-gentoo-kde-1.tar.xz 507288 BLAKE2B a22d3745d3c690e29f7726cc46
 DIST qtbase-everywhere-opensource-src-5.15.3.tar.xz 50204364 BLAKE2B 9c011e8d6033e340a1d7be6bd9100a05d55638cfd53f647752853382574b6c444668eae36bf88cfedde0e7c0e00ecb1f91d025fc59c23be5438ba0ef91a5246c SHA512 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079
 DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B 3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b SHA512 91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3
 EBUILD qtxml-5.15.3.ebuild 540 BLAKE2B 8fe67c477cd44dce4a039e6b1a298346dc0ff7334a7b711a991d3f73097f7126c771879a6d2188573a89e83b869e92b4494c4205a602ab7f6abb92fb6316fc0b SHA512 8c1d6622f9291e3b85e0ae6ea4d0c5a005f9adbfbaab69b146f9dd1897c9af321ab1985b34afd2041a8edf46890b4796a7d7eef69f90d4e9665f692b1774d842
-EBUILD qtxml-5.15.4.ebuild 545 BLAKE2B f10488c7ac8437c0dc24002757d375859a71e9ed2b0eab1afe630bcc740592f4f2d413521f7b43ea14375a1a4b397fd47c8cc62904c92fd5e17032c2f71d3413 SHA512 4a9235565afd2f20a9cab545790022841f505804e152400225b77d165d025e89241ab08295b6e09d4573c4ba0777b06b88ae56089861325ebe40b4afa3896366
+EBUILD qtxml-5.15.4.ebuild 542 BLAKE2B 59c856fd4c607bf75262f2c4b5a6db8ea2ff1b6503b67449051855e075a8b62d95ea3b3abc5ad5ce7a23038c0081c1a1e2b1051f688c3a8623226e338e595e5c SHA512 9fc9ff254614e5541e6e91316fdaa79648c1891bb89da8516ff28cc46214f8b17fb6c959d8be3bbd2039a5c9afa61f532d6799dbc19f5c05ad085898ece1f6b8
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtxml/qtxml-5.15.4.ebuild b/dev-qt/qtxml/qtxml-5.15.4.ebuild
index de237b8b04b1..c521bfaeaef4 100644
--- a/dev-qt/qtxml/qtxml-5.15.4.ebuild
+++ b/dev-qt/qtxml/qtxml-5.15.4.ebuild
@@ -10,7 +10,7 @@ inherit qt5-build
 DESCRIPTION="Implementation of SAX and DOM for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtxmlpatterns/Manifest b/dev-qt/qtxmlpatterns/Manifest
index dfe2fd84c8a2..b96ddfa8df71 100644
--- a/dev-qt/qtxmlpatterns/Manifest
+++ b/dev-qt/qtxmlpatterns/Manifest
@@ -1,5 +1,5 @@
 DIST qtxmlpatterns-everywhere-opensource-src-5.15.3.tar.xz 5211100 BLAKE2B 808b3f047603e31a973c1455632c2b4425f2daffbe977572682155c6421062285481b7847fe21ea796991bc21aebb4be65f6a17d1d2bfeb3b0ff722b6785f234 SHA512 4a5f7d68db6f950caedbb94291ab6aad77e7c52cc8adea2e41ddf600106c8d75b4eef83bc716bb1aa3696042c48c34979d8d216a16ccec3a539118b46691c5a4
 DIST qtxmlpatterns-everywhere-opensource-src-5.15.4.tar.xz 5211620 BLAKE2B 2255ad1fe12a356b6b7aae515fa469df89a0d54e841062d68fa1f9b69d4fc88eab9f4a71510c6d8261bd146172b16a2fcb5b23127870a8a249573d1bca66cb63 SHA512 fc4b4723407f6a1e765933d9d76ec4ffe874cb4a70e47bc4110def2c4a491b86fa753c33ef31ef95ad1a6eaa3de1fadbc49deb7783d32d8fc2f51672670d5a87
 EBUILD qtxmlpatterns-5.15.3.ebuild 801 BLAKE2B 7c427cd11fe454b218e0d6e1c066fba3e1f9aeff5cc10de3737096900a18057594bed9f7ec1b6e1f97708370b04944d9d68f93f9dd30606c85fc7586e5443b49 SHA512 f69dc0523fb04eb5b632fce2acfd6b8cc22857e60011b1429a710f56a004ad606bf1de0dc151af51da9503f0a32bcc53a3945d2cce86518448f32f5ac70c0403
-EBUILD qtxmlpatterns-5.15.4.ebuild 806 BLAKE2B df7ee6d22c7be2d8db67992d5f9b900fb2ca429d8d16a8bda705dfd6937a4ee1243e34aff6ecb6c756135c709d4f8dcc14d3253cae9eceda17781904ecf4e646 SHA512 6794d9844adced4e030f9e72a738aaaf2306a7e2e082458f2d1cfdc368de40bcaf8087589e67cae32024510c9cb3c74bebad958067cb3e5848bd4f31c27b8df0
+EBUILD qtxmlpatterns-5.15.4.ebuild 803 BLAKE2B 6db0bd39ae163d9f9e8f52f2d09608040c9f7914826142291b9ef4f132e26cc4385a9dfb5f891475a704466c4999e1d76c5847368ecd791f20bda70bd3de70d8 SHA512 1902d1ce59f41e7ffae5c4ecdc04a29527cf324da439891db29992b3db76d5eaa6ac268d85d1fb5b437a37dd18fdd8f8f90f6f0380ae87df43a9945ffeda1966
 MISC metadata.xml 590 BLAKE2B 2f67cb5fc0572aa19ed1775ac6a1cf2de7aae77141a76f81ad00d9620c0ba4238c1058ed53bd6332f8862f24cb59f3f23984df84d062c295868f3914ad8efb8f SHA512 50bbcf3579ec5613429e2a7c613e41ccd79d04f0ed7bb2e5db1ae22868aea8922f0b3509bc4fe91ab7cbc9ad6b86bb536993638d3562d811203814e64e2ae22b
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.4.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.4.ebuild
index dedba8abaebc..e7184106f6c0 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.4.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.4.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="qml"
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 4eb26c3cd9e4..a2a3f6acd689 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/hiera-eyaml/Manifest b/dev-ruby/hiera-eyaml/Manifest
index a1484e88e785..560a06f5442d 100644
--- a/dev-ruby/hiera-eyaml/Manifest
+++ b/dev-ruby/hiera-eyaml/Manifest
@@ -1,5 +1,5 @@
 DIST hiera-eyaml-3.1.1.tar.gz 54848 BLAKE2B 8daa4925bf1fb945ddb5ce7a485c3bf2bfca8747eb0cf00530eb91307d18d3f5c73699a30631b80e7825baac3a8b0c1695bd0313906bc8c7aba9c3c00d69b9cc SHA512 3bc93ca31af96383401f28644490f5540a70cf719e47d340794daf6c8bcc7fe9800d1d1e6ba99aba344831966f8d15f1a1fd9d1522696457f0bdec79dd45a108
 DIST hiera-eyaml-3.2.2.tar.gz 59174 BLAKE2B 2e31d1d0807096757f338a3f112a2f853f9dc61d14f92720a06e8835ef5b2228cea1ef2db1d5d7a2758422158acca14e882e1fa88a3189fcc254573e15e32185 SHA512 ac7800d35cba9b11e1fcfd831419caa1fb32fc1747499f780a40005cf57a87be4562f52251b8f5482156ad98892d41fe5060e48f74a75a0d1657dd5c04b8ee92
-EBUILD hiera-eyaml-3.1.1.ebuild 1465 BLAKE2B 5dd4ccf526c16d9ff861dcb7fb01b773284c4b8d6ae941a5ee0f9279bf2f1ea6188e5bcc4944a942960e76e73b77348c02fc77f55f3f1ad264298518622bc7eb SHA512 fe8673a634ae9c93a63960a0d836cc6b70d36f8f2a93c5fc3f1c7a5c588a139b295a19139e6153369a67a583250f5bb837546ea9571b2f8f6ee689a271d3ccdb
-EBUILD hiera-eyaml-3.2.2.ebuild 1542 BLAKE2B 8f6a3bc6abcc961039a60a98bb94a353fc2a284c7275d92f7ac3144da92a505c08b0bcfbb8bf8a875270e3d8f9539855bcc30963f45c27446aed9e06e47a0902 SHA512 d285f61f97292f8cc483787f42e9f6873d770e8d3bd9e547fdee90189f9b284d07771401405b7c811db3ae36e7ef166eae23dd56050ea0c2a2b05f32de0d46d3
+EBUILD hiera-eyaml-3.1.1.ebuild 1465 BLAKE2B 216f1ebf7dc84646bc6ab1b2af26f12452d09a48e6d5ebc1715bed2152a7dc5d1b5b49c732c5497d7174f5ed289c2ca9a2e73f47c149be09819ee28d44ba3b2b SHA512 0b4ce0fff54180da7bd7fffb4f5bb64c3675054055fa20a8dbb4b97e69777c1ebcbd2c4918d863c3c95e461fe16816044b2e15eefdf7071931be4581f11e4e76
+EBUILD hiera-eyaml-3.2.2.ebuild 1542 BLAKE2B f7a8bcd7b18685197f33a8444ddfed1a8b341f7845961e50ffa7d897440c87d035ac300b91fa2a5ac6fb7674e8bdf427d7498e1156b61be3d2c335142b65b7b9 SHA512 39d89d0c857e27de9c2977d73deb93693a9cebda225dbc1be0e63428e3b865aad7348b2bb7f77ab6ca3e7600b7e7c14e84c3e09a9a0e5e7c7c96ea14164d0fb1
 MISC metadata.xml 475 BLAKE2B d544bc1b3bee5ee303ee340c6cb73360fbf9e1cb48ff81986f8c7dbc6de01a7961c9a5320355851ab9892712b381357e37897d8d906633dc7b7d39c46ae87026 SHA512 34e60583c13d377291e47d7f9ef7dd016298d0b3cb139a4cb658e946324ca0383cc8e357994468524b80be882e5ca96136088831dddadbfd90c260cd053cd9d8
diff --git a/dev-ruby/hiera-eyaml/hiera-eyaml-3.1.1.ebuild b/dev-ruby/hiera-eyaml/hiera-eyaml-3.1.1.ebuild
index 29e79172ccd4..cb1acb35e03f 100644
--- a/dev-ruby/hiera-eyaml/hiera-eyaml-3.1.1.ebuild
+++ b/dev-ruby/hiera-eyaml/hiera-eyaml-3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -31,7 +31,7 @@ all_ruby_prepare() {
 	sed -i -e '/highline/ s/~>/>=/' \
 		-e '/gem.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
 
-	sed -i -e 's:/tmp:'${T}':' \
+	sed -i -e "s:/tmp:${T}:" \
 		features/sandbox/puppet/environments/local/modules/test/manifests/run.pp \
 		features/sandbox/puppet-hiera-merge/environments/local/modules/test/manifests/run.pp \
 		features/puppet.feature
@@ -39,7 +39,7 @@ all_ruby_prepare() {
 
 each_ruby_prepare() {
 	# Run tests with the correct ruby interpreter
-	sed -i -e 's:I run `eyaml:I run `'${RUBY}' '${S}'/bin/eyaml:' features/*.feature || die
+	sed -i -e 's:I run `eyaml:I run `'${RUBY}' '"${S}"'/bin/eyaml:' features/*.feature || die
 
 }
 
diff --git a/dev-ruby/hiera-eyaml/hiera-eyaml-3.2.2.ebuild b/dev-ruby/hiera-eyaml/hiera-eyaml-3.2.2.ebuild
index 076d16797b4c..c20c61b8599b 100644
--- a/dev-ruby/hiera-eyaml/hiera-eyaml-3.2.2.ebuild
+++ b/dev-ruby/hiera-eyaml/hiera-eyaml-3.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -31,7 +31,7 @@ all_ruby_prepare() {
 	sed -i -e '/highline/ s/~>/>=/' \
 		-e '/gem.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
 
-	sed -i -e 's:/tmp:'${T}':' \
+	sed -i -e "s:/tmp:${T}:" \
 		features/sandbox/puppet/environments/local/modules/test/manifests/run.pp \
 		features/sandbox/puppet-hiera-merge/environments/local/modules/test/manifests/run.pp \
 		features/sandbox/puppet-envvar/environments/local/modules/test/manifests/run.pp \
@@ -40,7 +40,7 @@ all_ruby_prepare() {
 
 each_ruby_prepare() {
 	# Run tests with the correct ruby interpreter
-	sed -i -e 's:I run `eyaml:I run `'${RUBY}' '${S}'/bin/eyaml:' features/*.feature || die
+	sed -i -e 's:I run `eyaml:I run `'${RUBY}' '"${S}"'/bin/eyaml:' features/*.feature || die
 
 }
 
diff --git a/dev-ruby/hiredis/Manifest b/dev-ruby/hiredis/Manifest
index 84502e34489e..ffbd02b8a7f7 100644
--- a/dev-ruby/hiredis/Manifest
+++ b/dev-ruby/hiredis/Manifest
@@ -1,4 +1,4 @@
 AUX hiredis-0.6.1-unvendor-hiredis.patch 599 BLAKE2B 941d7f370c1dc85de07334b77e89180285fc57e604ffb904eb03fbb9c810d28c2c2e229f1589b98f58c80f68f3a21fa881ea78805361b67032a3006605428c1f SHA512 34d527c1182bd5bbc17e0a4e08b29bfeb15a55c02d1cfde75e5bb2b1589ee3dec622d87ed00cc3d7db390f4cb0ddc9c60e2344ef28c48b725eb37262cb349c55
 DIST hiredis-rb-0.6.3.tar.gz 19106 BLAKE2B 2892fd28bf7e7edfc3563a0c321fd781baeca9eb31a64dd559a6c828bb9c4fe37c995748782c5222db46b5b35a4d17f5b8b4d8e5306209a0e374ec7096d3cd4b SHA512 3e081d46aeb128789fa41fe9422186dd30e88c5a7a3c16dfcf1a92fe7faf99cced352ea39a885785fc12f0a974625be329d9ff2a5936a786febe8a2c81f5e139
-EBUILD hiredis-0.6.3-r1.ebuild 1036 BLAKE2B 8fb65afb45e448ecb5c5bd5ae6278f359f309ad0ff5d13656fbb4e920623071335c9573c32b6eb62290aac594fd67a68054760b7af012ec0b6ddfd5d787e6a76 SHA512 2de02a6eef243c5c638a362bab63e17b019a1307020a6672d9d60caf374f0121828a2f111774ad65f0258a31e7e199f3a02fb5c2a50c152df5d274c94b4721e0
+EBUILD hiredis-0.6.3-r1.ebuild 1034 BLAKE2B 1571d2d2e0640efae7f6ebf7fd3685a8b88908ff76f809ae9b504166c3a23a181cf376e06c40231201de53064c56136adf8a85daf9f0073a66ded76cc0c055db SHA512 cd908ec037c2cf3e20690d35103f88eab8ccbf2fea6c83fef4677c5f254a649c20e8fa9417e083bfb006a417329c5e05dbd4e8986b60cfc54612c21828afcc4b
 MISC metadata.xml 343 BLAKE2B 816ce03a7c4a846888ea2410f1def09d8c56b2f11e6637e0c74fd58eec1117c6ad363411bc4bca45a462320ebbae34785db0b56b9a7bb66de65d4bb316ea70bb SHA512 7cc1565a72c805d327fc2df68c813c5191e6e50dab1901dcc04a4c7f19145ede350dbad584a0bb37387d3a28d9ee0aa93b0918b20adc0d612c751c7730f3b813
diff --git a/dev-ruby/hiredis/hiredis-0.6.3-r1.ebuild b/dev-ruby/hiredis/hiredis-0.6.3-r1.ebuild
index ec852faec264..9c657f2774af 100644
--- a/dev-ruby/hiredis/hiredis-0.6.3-r1.ebuild
+++ b/dev-ruby/hiredis/hiredis-0.6.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -33,7 +33,7 @@ RUBY_S="${MY_P}"
 PATCHES=( "${FILESDIR}/${PN}-0.6.1-unvendor-hiredis.patch" )
 
 all_ruby_prepare() {
-	sed -i -e 's:/tmp/:'${T}'/:' test/connection_test.rb || die
+	sed -i -e "s:/tmp/:${T}/:" test/connection_test.rb || die
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/minitest/Manifest b/dev-ruby/minitest/Manifest
index 35c88b115ca8..c5dd33acac26 100644
--- a/dev-ruby/minitest/Manifest
+++ b/dev-ruby/minitest/Manifest
@@ -2,8 +2,10 @@ DIST minitest-5.13.0.gem 83968 BLAKE2B 90f2bc20328a5522a51bcfee94d69e6fd03189190
 DIST minitest-5.14.3.gem 84992 BLAKE2B baad3e8198bcee1b2748f81a7ea822785423c2bfb07130397b2c21993c686aa6edf58811cd58c4c9685b63b8a7373948a0aa2eacb6b02383399847edbad5deaa SHA512 2aadb99c5eac8d29c78865f8ce3fae51f11c2e1dd17157b6d0c6684733a3b870146df16fd26626c6f9c56806422e1e2457208afa1c69238a2bdaa4a859c23645
 DIST minitest-5.14.4.gem 86016 BLAKE2B 1f7b8c72b41e1f4e47852021dd99df411a427ac8bbe564a2b86edbb727a4976030176331442a3a44f734347cc42f80444f8d3937e561f0063ec6bb3132d4c402 SHA512 f967a11cfce82e167879905082859273b270e8d8e663a0c1c553964a345fb8564547627b8cf97418ac5bda544bb76c1385438ad74ec8e846666dc2952d55c9e9
 DIST minitest-5.15.0.gem 87040 BLAKE2B 71e7a7952c25fd37067a449867d74a2f18a8a42d1fbd72f24d6db226c54a18e9a21958654d4176176804bedd09ef9d1d3be68f79e29312c3f85d0930d3d68d7b SHA512 5e97a7aa616966ffc60e10cdc0ba123a7e793f10283ec3b6bf36066177036788cb950ad566fbac49e613b93f08b9846534f463017cde966b4890c3a34a2286be
+DIST minitest-5.16.0.gem 92160 BLAKE2B 2d7b325e9907564aa1763877281b56347511d0e1ce0224642c4fec9f4e43c25449ee285d48e64fc07ffca063c2821209b07a2c2d7e378fdaf41a82d079ea9667 SHA512 97eda6bbd592dd08528cecd8bc85e0dacdc5417ca1204c182cf0833d5ede36f4ccdd56dd23ffe5fd7d9a859d2bfbfe2a59c989dec17e392749980eff9b3e43ce
 EBUILD minitest-5.13.0.ebuild 720 BLAKE2B c0dfaa029354a66dde23b3cb3fb1655e88cbd2d1fd8bf97bda8573e003aef8980e95ca1b38da252687c465dcc8309d62f5ac5ca7a5656971a559c9208dfa8ef8 SHA512 09c38e025fe40616270f14f05a7716b3a1c703d2d504dc3ff612f38403874f54e927835fb769b8c80c01c27c03f2f4ca7e6bf72f72feffbd585cdd6009ea257f
 EBUILD minitest-5.14.3.ebuild 728 BLAKE2B 1005d9c83954d6cbd0d61c9a86130a84326df283dc31a369ccc2ca77c4dcd0fb871a3ffa31b53eb97d2e8450c342ec5614c3d65315acf1ce7abd7fb3051ba569 SHA512 5c2735d7dedc124a3532bb28241a4ff8eaa00f7813980c1ceda8277566c70f654e7b8672e9b4d286423f2c0390d30eab69ee9f3758ef0cb164752e3c2ac8bfa9
 EBUILD minitest-5.14.4.ebuild 735 BLAKE2B 22766653091e002fa662a279753ed8ebe22283ccab1156c7ddb503864f41251e1e83270f00dc5efb0496ffe0165b37add6318ae65cc04b2fb0ae2746aa8ebef2 SHA512 9fc9d5bcc391cdf6995995bfec88f39e91e23838edc4c041f17ff1accf667dd5a34ce91c36b0fed0a05f98713612fcfb4a600a45c3d857e981013d4dba43d74b
 EBUILD minitest-5.15.0.ebuild 761 BLAKE2B 3b8b86a9826aaa1a2439ff70a0762175321236d94201699fda644878bd4186b149d929762010938233aec8f35d75ccba0948a0ae563bbdfb8d88f6be8cf0d971 SHA512 3e7c7244504052f7235801ff5b8be1843385bc536656d9d4756c3888d0d5a6883f944295942d9c61a7ca6bc562583c8419b689f05bb62278f4928c0939963039
+EBUILD minitest-5.16.0.ebuild 774 BLAKE2B f89999b511cf70efe1d9629d0dae15a71d2444a6d102821aad142ff148d50ace0eb1fa9418ef26ee123f39aaf869ab1f781182f3438a4306939f78279a51c973 SHA512 dc971935e750e17880ac8b0edbded90db194904be0fcf0f65592ad20a04c6623488c6c2cbfd6c22c27f8821b8f57bf08896f87b672f0b12c7ad54078ae9fdde3
 MISC metadata.xml 345 BLAKE2B aa5fc9309fc2803a64737c45818f713867ae504409b879c1481125131fb661a1c71f99d3facb5c7253561b62c32ea4d27c9344bfa0c6ad66a15eb1daea81ff42 SHA512 df9736bf7588243c9d1ff886c8b428237cf96f239fccbfe6561d60b910a07f70750db6576d3aa4597746d18fcce8a708f1aa9be4f9f2796823d1a4e154c6fb4a
diff --git a/dev-ruby/minitest/minitest-5.16.0.ebuild b/dev-ruby/minitest/minitest-5.16.0.ebuild
new file mode 100644
index 000000000000..82de4175ebb6
--- /dev/null
+++ b/dev-ruby/minitest/minitest-5.16.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="minitest/unit is a small and fast replacement for ruby's huge and slow test/unit"
+HOMEPAGE="https://github.com/seattlerb/minitest"
+
+LICENSE="MIT"
+SLOT="5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+each_ruby_test() {
+	export -n A
+	MT_NO_PLUGINS=true ${RUBY} -Ilib:test:. -e "Dir['**/test_*.rb'].each{|f| require f}" || die "Tests failed"
+}
diff --git a/dev-ruby/ruby-mp3info/Manifest b/dev-ruby/ruby-mp3info/Manifest
index afe07ddbe46f..4db548019504 100644
--- a/dev-ruby/ruby-mp3info/Manifest
+++ b/dev-ruby/ruby-mp3info/Manifest
@@ -1,3 +1,3 @@
 DIST ruby-mp3info-0.8.10-git.tgz 89178 BLAKE2B fb9a046890851f3325a80bd47f6adc6c0bd7af74955b277a1a38d3727599e2fa0686b662419e1a8265a23aa7d4d102bbd26b97d5f2fa28e1d84df52484a46c0f SHA512 778d7cf80783385c2889a42eaf821a8544e1fa26d7bed743c52852c137ac5cff84483f638ffb931edd6df528c613ea5ac62ea2e4f0ee8ccc31d77846297e3291
-EBUILD ruby-mp3info-0.8.10-r1.ebuild 749 BLAKE2B ed2c0b2a97bf31a2273f36a8ad75056057b9340ac542e1452731c29042aa086e0113e07c1872968c0f59063a8eff85255ab4cf83af13de829961e06f0ceb9ccd SHA512 ea12666ca1bec9eee9625f9f5c3d73f1f2a8354a4b72b7ce0e0a16c36bba203c4221ebfaab366410b6fc09a99610d0eeafa164261a8b78882ba4caf393d7fc32
+EBUILD ruby-mp3info-0.8.10-r1.ebuild 747 BLAKE2B c64aa97f7b9a76dfac11c4134d67beee348a111de0561e9ccb1457bcad9c5417c286786cb0b736e7271236f556c814b8aa329645774e46f3f6ace8480a336034 SHA512 dbbd71cc76baeeb335ca43ced2453629ad1754d580fd12175b8db0bf9b51c1071e24dd7c14b25e31b6a8015784dd40511b6997c243a93a35d5d6f5c450aa01f7
 MISC metadata.xml 346 BLAKE2B 8820d82e8871e61d95327d5745b5cc0d886613a19e9ad88405d89e105df8613f70321dc063add61a76487e1d6ea7010f5e0e4319d6a00f4da9ac879437372e85 SHA512 21c40e6490221ca53410fcca1d89815d643ebdc03071d6916f36293ab233b3bcf2af9fe33b5fc680052672173a2bbf354bc6030e7339515950b4035613b7f739
diff --git a/dev-ruby/ruby-mp3info/ruby-mp3info-0.8.10-r1.ebuild b/dev-ruby/ruby-mp3info/ruby-mp3info-0.8.10-r1.ebuild
index 3e1dcd6cc9ae..af889031971f 100644
--- a/dev-ruby/ruby-mp3info/ruby-mp3info-0.8.10-r1.ebuild
+++ b/dev-ruby/ruby-mp3info/ruby-mp3info-0.8.10-r1.ebuild
@@ -24,5 +24,5 @@ DEPEND+=" test? ( media-sound/id3v2 )"
 ruby_add_bdepend "test? ( dev-ruby/hoe dev-ruby/test-unit:2 )"
 
 all_ruby_prepare() {
-	sed -i -e 's:/tmp/test.mp3:'${T}'/test.mp3:' test/test_ruby-mp3info.rb || die
+	sed -i -e "s:/tmp/test.mp3:${T}/test.mp3:" test/test_ruby-mp3info.rb || die
 }
diff --git a/dev-ruby/rubyzip/Manifest b/dev-ruby/rubyzip/Manifest
index ad63b5545335..e1f1402f5bf4 100644
--- a/dev-ruby/rubyzip/Manifest
+++ b/dev-ruby/rubyzip/Manifest
@@ -1,5 +1,5 @@
 DIST rubyzip-1.3.0-git.tgz 156664 BLAKE2B 2bde6515ddc71da32fc2d2819770857f7dde8605718c868f73edb8493f7db5ce66a7115d09933ffc6a06ac0979ab07e8cbdcd47984707688b7a5db43394847bc SHA512 5a764725d1f6a797f710581dbe07bd7971f0a8a5b0ffb7fc9b1a627c32e6e342ff54e2ad39e74e294dd283b8cbf358ed2dc40857f6f656007adff80d4769b9f4
 DIST rubyzip-2.3.2-git.tgz 225923 BLAKE2B ed901326cd0f79c8be004d9c14b32d7e67e90ab4d2d5b67dc64559fd4691dfb63cfa1ee18363a7cf864bd62559f1bc2fae71fc25ad1c727d7cc01f94d1ec62ee SHA512 6c64e53c1f5ca530abfa22baf388f87c8cf098d81cc9c639f20903e5193cf26243fbf861ac12002ae954f026e04168d8a55beeaf3ac5542bd0618ca85a5c90de
-EBUILD rubyzip-1.3.0.ebuild 1321 BLAKE2B f164c3bad0db8bcc903760dba8afe1861bf7e0db1f4445185f3cd7dd69126aa24d18d8bd8b78c2cb7a8492110ac5c2b313f38b95843c1abc2bcbd2f8e869a065 SHA512 49cb399b04de09f83a8acb49ee90e519b67ed598516c344e62fee01d7aaf758791c5a55faad02a0eb5dc45da4106e18396e286f77f78f2f59764580f6bd7bb67
-EBUILD rubyzip-2.3.2-r1.ebuild 1390 BLAKE2B cdd515d5da09fa9cb841efd62a72ee740bcc5f60f51c97a2c0c5a47ecab440a55573409ba2c47791a31edb7d4c648af3dd2cebc846491832f9fe86e3d104f4b5 SHA512 93a62fed0ec4d6f9cbee14f89bc9223bd537aaecc0e613e14b034a1b5c42e5d48947edd07ccc3b7280b0dc36770d43ba1aff3e89f4e638b0ab5b9ca08d3d24a7
+EBUILD rubyzip-1.3.0.ebuild 1319 BLAKE2B dcec63d8db9c4045fced87ea1ba688f296e70a794d747ea0d830e4a5d391e7cec12a10d0a425b551b1aae6f3dde73a941d78ad02b4ec2a3376a77d28e9592408 SHA512 84661737857656452e382bdfbbf54d1d2c33382eb3588892beaab4d3b9295562994d4824fd8dc32fc03d25fa2b07a36b0c1d446ad84b8d0cb91e1ade510bc32f
+EBUILD rubyzip-2.3.2-r1.ebuild 1388 BLAKE2B 3db61919d153ce3695dadb3df2bf1378fd4220de1156340bea6bac57b1492cd53c83c4eecafc0a60697edd1071906846867c4099988276c5720d8d8ed8ae5598 SHA512 327c7c670557d9c27d5c0938fff1839e24de9ae267cb59b2e21d52014e39d8a09e2fbbcc53bcf6e5807185309ac2c6d977e4925a69aa8a8f96b8210d1c8ec3e8
 MISC metadata.xml 342 BLAKE2B 1619c520edda34ca9b5b8eed0ba9d1a69491c0411698cc0cb32b192226e3c888dce2c2b22c8996a69222ab8521402b6efe644c93567b26a6ee906bf4d3bfe8e5 SHA512 93ae61d55a80d335c5d362181e5e8fad279739b178de0fc5ed4cec7508b74f088c041a3f544ba80f511e11fc2baeb223cc589231db5ce06d9349f3cc0c85e21e
diff --git a/dev-ruby/rubyzip/rubyzip-1.3.0.ebuild b/dev-ruby/rubyzip/rubyzip-1.3.0.ebuild
index 20c157d72842..b27c27810122 100644
--- a/dev-ruby/rubyzip/rubyzip-1.3.0.ebuild
+++ b/dev-ruby/rubyzip/rubyzip-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -42,7 +42,7 @@ all_ruby_prepare() {
 	sed -i -e '/bundler/ s:^:#:' Rakefile || die
 
 	# Fix hardcoded path to /tmp
-	sed -i -e 's:/tmp/:'${T}'/:g' test/entry_test.rb || die
+	sed -i -e "s:/tmp/:${T}/:g" test/entry_test.rb || die
 
 	# Add missing requires
 	sed -i -e '1irequire "forwardable"; require "pathname"' test/input_stream_test.rb || die
diff --git a/dev-ruby/rubyzip/rubyzip-2.3.2-r1.ebuild b/dev-ruby/rubyzip/rubyzip-2.3.2-r1.ebuild
index c44bdc3a4f9b..ed7059e5e1b7 100644
--- a/dev-ruby/rubyzip/rubyzip-2.3.2-r1.ebuild
+++ b/dev-ruby/rubyzip/rubyzip-2.3.2-r1.ebuild
@@ -44,7 +44,7 @@ all_ruby_prepare() {
 	sed -i -e '/bundler/ s:^:#: ; /rubocop/I s:^:#:' Rakefile || die
 
 	# Fix hardcoded path to /tmp
-	sed -i -e 's:/tmp/:'${T}'/:g' test/entry_test.rb || die
+	sed -i -e "s:/tmp/:${T}/:g" test/entry_test.rb || die
 
 	# Add missing requires
 	sed -i -e '1irequire "forwardable"; require "pathname"' test/input_stream_test.rb || die
diff --git a/dev-ruby/sassc/Manifest b/dev-ruby/sassc/Manifest
index ff2ccf7858a3..175de4910f26 100644
--- a/dev-ruby/sassc/Manifest
+++ b/dev-ruby/sassc/Manifest
@@ -1,3 +1,3 @@
 DIST sassc-2.4.0.gem 304640 BLAKE2B a4cd96859855cfd26e78a35becba30af8b7ee52d8ba67f7dcbc6354786f26e60a312be4e773f515f6edda6623142249a4a470f418d9fae3db734f8ae11498dc8 SHA512 835ba03d0fc5a791b2d620367f63202973f778bd8ebaa87c27f6a1de75b5895270205e8746fbb242d2739c9830a27d72453a75c1b536090840de581c52caade6
-EBUILD sassc-2.4.0-r1.ebuild 1165 BLAKE2B a050e54f25423691755b67dd3f43c3ad838c956af596e894c57fe1231c8ddfadc8b1fc214029f4b844cc3ee27acc9eb12ae267975cb9f161e8283a06903d137e SHA512 2cd7401a8f0eb361f286470fc7d54ac36f3e892c2021e8372e14390f2085ba07e6101dab5ba645ec07c9e3c232997d56900aa2ae669e7bb26e48b79c6314d749
+EBUILD sassc-2.4.0-r1.ebuild 1159 BLAKE2B a2c2387b3604bfb9bca0b22437a128271d9e88cf03443b846d863d4f6c1b16eb5cc0749e6fd53a8eab80be93a759a3a6504b8efc3cf515548669ad105c75b40b SHA512 9db3770559170e2ace280e7cec1d9de63a3f5075b9d9290de7fb9ebb29920a8ae7fda486feffdd034e2f431a6b21bd81cc955dd414afb8be94c720c3e1cf7526
 MISC metadata.xml 342 BLAKE2B e142db9aa3fbeca45133f091bff39a3452a51917779f21f78928295cd69bed7e12fb68de1e1d432d5765fe1560b5841a6c12be62487375b206170052c8aacd2e SHA512 39e8f3ff146ac9ee2b06246a6277b9abf3b5466dde0820ffe309f0303923310610dced252f33ed5ac342bea64f8bc3941d71d5d57b7c36bd8d302f415b32e10d
diff --git a/dev-ruby/sassc/sassc-2.4.0-r1.ebuild b/dev-ruby/sassc/sassc-2.4.0-r1.ebuild
index 00ac747def08..2fd15deecd5c 100644
--- a/dev-ruby/sassc/sassc-2.4.0-r1.ebuild
+++ b/dev-ruby/sassc/sassc-2.4.0-r1.ebuild
@@ -34,7 +34,7 @@ all_ruby_prepare() {
 	# Use unbundled libsass
 	rm -rf ext || die
 
-	sed -i -e '/ffi_lib/ s:__dir__:"'${ESYSROOT}'/usr/'$(get_libdir)'":' \
+	sed -i -e "/ffi_lib/ s:__dir__:${ESYSROOT}/usr/$(get_libdir):" \
 		lib/sassc/native.rb || die
 
 	# Avoid version-specific test so newer libsass versions can be used.
diff --git a/dev-ruby/serverengine/Manifest b/dev-ruby/serverengine/Manifest
index d54f83a43f7f..fd909215961c 100644
--- a/dev-ruby/serverengine/Manifest
+++ b/dev-ruby/serverengine/Manifest
@@ -1,3 +1,5 @@
 DIST serverengine-2.2.5.gem 40960 BLAKE2B a7b256c1029c38b35673d104f6aba118bc5644947db7feb185d57456af60baebafb3c6a74996998630b7a0dbe3ee0baa5d4f260538ca7a8abf542b7528cd7204 SHA512 fb4abbf35553b8d69447be195a14018e335cbce0756b9ae91160bc4dc8253968a4b94c383f40aad1e1bd20aaeb700efced91341f3b26077a0d44b3dc00aa89c7
+DIST serverengine-2.3.0.gem 42496 BLAKE2B 944e0e6b6bd31b6609e21fac0ea688b9a4acac3b02c4c1f06a34fe29a51c67db79e9a55c43243ce601d42a30b31ca1da605caeab05bdd9587536c4fb540bb5ce SHA512 0887ac556f9f4faa7d8e25743b2f79694153c0e7e39666c8ea02d0313c17835e0e5697da498ad1b23612ec938d8d9f430cfb9699711479ae088011c5a7fee4c4
 EBUILD serverengine-2.2.5.ebuild 773 BLAKE2B a6c2d9ef6aed9461422a987588629133f1727185ab8f74eaf502727e7c05884d8beff4adf5f401054b19458660de0b08946d837ac8a965d6798bb6c4531bd256 SHA512 571e659ebea165fc69f4937581ab9419975456222a4ee721b63a0ee888f4044b77e51d2c4334425d40e4ff64a6bd1779b1809af7e10a5ce1b3121c999f5ab7e0
+EBUILD serverengine-2.3.0.ebuild 773 BLAKE2B a6c2d9ef6aed9461422a987588629133f1727185ab8f74eaf502727e7c05884d8beff4adf5f401054b19458660de0b08946d837ac8a965d6798bb6c4531bd256 SHA512 571e659ebea165fc69f4937581ab9419975456222a4ee721b63a0ee888f4044b77e51d2c4334425d40e4ff64a6bd1779b1809af7e10a5ce1b3121c999f5ab7e0
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/serverengine/serverengine-2.3.0.ebuild b/dev-ruby/serverengine/serverengine-2.3.0.ebuild
new file mode 100644
index 000000000000..bab728791f52
--- /dev/null
+++ b/dev-ruby/serverengine/serverengine-2.3.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="Changelog README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A framework to implement robust multiprocess servers"
+HOMEPAGE="https://github.com/fluent/serverengine"
+LICENSE="Apache-2.0"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/sigdump-0.2.2:0"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler )"
+
+all_ruby_prepare() {
+	sed -i -e '/rake/ s/~>/>=/' \
+		-e '/rspec/ s/2.13.0/2.13/' \
+		-e '/rake-compiler/ s:^:#:' serverengine.gemspec || die
+}
+
+each_ruby_test() {
+	# The specs spawn ruby processes with bundler support
+	${RUBY} -S bundle exec rspec-2 spec || die
+}
diff --git a/dev-ruby/sqlite3/Manifest b/dev-ruby/sqlite3/Manifest
index 26f7b9189e5f..66275194e6fb 100644
--- a/dev-ruby/sqlite3/Manifest
+++ b/dev-ruby/sqlite3/Manifest
@@ -1,3 +1,7 @@
 DIST sqlite3-1.4.2.gem 70656 BLAKE2B ef7fa7667fd080a6f175bcfbd1fe8dfba00d3fdf1214cc3d776f0576dc29386b627db8d6c0dd06f07ab65fff877a6803a6dcacefd4fbc5bb0f7d2149e355c88d SHA512 c4630dd2fa13914e2fcc70092c35568103f61f976958b439fe205abdfcff61702ca176d10bea40ff0cfea3169644cdb9146b7be94dff883cad3b753e84629545
+DIST sqlite3-1.4.3.gem 71168 BLAKE2B a529c24536b39356131bb027713c7c5fac6d6d72c701c97b419222aceb46778a69e5c2d27a7dffae220e5a1acd1c7354eaa0b25dcd48a4c9b29ed617c5020ed8 SHA512 482e436257a2364deb62158f4541e7b6c8ba3ad73bf9f750194d778bc43233142cd6166bdbce0a9e29862c2621acd2f4b95563cf1944889a676f792179b90c3c
+DIST sqlite3-1.4.4.gem 71168 BLAKE2B f49d055b0d040f12b00abaf5c3a245b4e018445f41d496ae0d27426970f208b066bdd5a1b562a8fbb575397bac132384111fa59d6079dd6f384a6b1d90d272b8 SHA512 48753652d2aec201dfeac37f284bfdbc1b39c208c4ef605a2b7073a8a56cf5edf2021a889d98e0939cc0fbc476ccfda1aa01a0d8848a6129cab3af68761fcf38
 EBUILD sqlite3-1.4.2-r1.ebuild 2339 BLAKE2B dc4a27912d5f2eb983c99fa5899c46ffbfe6bf63ab888d28567108841b7053a5993339bd5b6637e1afe926d3440c376fb6db713e481b129a4063dfd66352b714 SHA512 84d013557f52120f323d655b1ee210698585507acfea8e21f3e1b39ae0ff96ce7e9da6a52b5d6f02c96751fbd2da6805bd15259374e131784901a011d7dba94d
+EBUILD sqlite3-1.4.3.ebuild 2334 BLAKE2B 456abdc8aec4e07520496ec5810b01b8e311af167675d485f262caa3a42e3c1e813ca5638aa016b72a2ff141874265888dd6b95256090cbe60f103b42c5da927 SHA512 ffbc7259d8ca9b0622e1c99aa82d13fe25bb16fb5192477f37356009f60871bda399f03806e87ab9f05a856fc183bdc9ca9e3dd033828df559ea57443da131de
+EBUILD sqlite3-1.4.4.ebuild 2361 BLAKE2B b2eedf895576907a2d083da1dcfd46872e978407cfab47db79eef258c1671ccb938d5769c576acbf8f24b4e9997e3b4a91b0487533067af6207acfb1270bf7ed SHA512 68238a53e77c098057078404b8a81ea1d8680e67fb94942c59da251d680437bfe5f01b7beabc5f7efd31fc7f82d6644c32b01757db6aa802152ac03261d999dd
 MISC metadata.xml 343 BLAKE2B 8246e0b7df67080839741f0258357ae19da18bd7ad8615bb77b943bc89db7560d58f95a8cba4e770070efc477ba56ee1f5c9ba098674ffc01dd5fdd9b912189a SHA512 541f2db81c9383013da74a8a54f318ff7535ffe5c6ea789f8ddc451f629a121e56b322d8b3a0730e0b27b111e16e27d8fa49bc5805a7c61fcf91ac7110ca712b
diff --git a/dev-ruby/sqlite3/sqlite3-1.4.3.ebuild b/dev-ruby/sqlite3/sqlite3-1.4.3.ebuild
new file mode 100644
index 000000000000..5fbaf84aba41
--- /dev/null
+++ b/dev-ruby/sqlite3/sqlite3-1.4.3.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_TASK_DOC="faq"
+RUBY_FAKEGEM_DOCDIR="doc faq"
+RUBY_FAKEGEM_EXTRADOC="API_CHANGES.rdoc README.rdoc ChangeLog.cvs CHANGELOG.rdoc"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/sqlite3/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/sqlite3
+
+inherit ruby-fakegem
+
+DESCRIPTION="An extension library to access a SQLite database from Ruby"
+HOMEPAGE="https://github.com/sparklemotion/sqlite3-ruby"
+LICENSE="BSD"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE=""
+
+RDEPEND+=" >=dev-db/sqlite-3.6.16:3"
+DEPEND+=" >=dev-db/sqlite-3.6.16:3"
+
+ruby_add_bdepend "
+	dev-ruby/rake-compiler
+	doc? ( dev-ruby/rdoc dev-ruby/redcloth )
+	test? ( dev-ruby/minitest:5 )"
+
+all_ruby_prepare() {
+	# We remove the vendor_sqlite3 rake task because it's used to
+	# bundle SQlite3 which we definitely don't want.
+	rm -f rakelib/vendor_sqlite3.rake || die
+
+	# Remove gem tasks since we don't need them and they require hoe.
+	rm -f rakelib/gem.rake || die
+
+	sed -i -e 's:, HOE.spec::' -e '/task :test/d' rakelib/native.rake || die
+}
+
+all_ruby_compile() {
+	all_fakegem_compile
+
+	if use doc; then
+		rdoc --title "${P} Dcoumentation" -o doc --main README.rdoc lib *.rdoc ext/*/*.c || die
+	fi
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+
+	# sqlite3 was called sqlite3-ruby before, so add a spec file that
+	# simply loads sqlite3 to make sure that old projects load correctly
+	# we don't even need to create a file to load this: the `require
+	# sqlite3` was already part of sqlite3-ruby requirements.
+	cat - <<EOF > "${T}/sqlite3-ruby.gemspec"
+# generated by ebuild
+# ${CATEGORY}/${PF}
+Gem::Specification.new do |s|
+	s.name = "sqlite3-ruby"
+	s.version = "${RUBY_FAKEGEM_VERSION}"
+	s.summary = "Fake gem to load sqlite3"
+	s.homepage = "${HOMEPAGE}"
+	s.specification_version = 3
+	s.add_runtime_dependency("${RUBY_FAKEGEM_NAME}", ["= ${RUBY_FAKEGEM_VERSION}"])
+end
+EOF
+	RUBY_FAKEGEM_NAME=sqlite3-ruby \
+		RUBY_FAKEGEM_GEMSPEC="${T}/sqlite3-ruby.gemspec" \
+		ruby_fakegem_install_gemspec
+}
diff --git a/dev-ruby/sqlite3/sqlite3-1.4.4.ebuild b/dev-ruby/sqlite3/sqlite3-1.4.4.ebuild
new file mode 100644
index 000000000000..b1349bc90389
--- /dev/null
+++ b/dev-ruby/sqlite3/sqlite3-1.4.4.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_TASK_DOC="faq"
+RUBY_FAKEGEM_DOCDIR="doc faq"
+RUBY_FAKEGEM_EXTRADOC="API_CHANGES.rdoc README.rdoc ChangeLog.cvs CHANGELOG.rdoc"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/sqlite3/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/sqlite3
+
+inherit ruby-fakegem
+
+DESCRIPTION="An extension library to access a SQLite database from Ruby"
+HOMEPAGE="https://github.com/sparklemotion/sqlite3-ruby"
+LICENSE="BSD"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE=""
+
+RDEPEND+=" >=dev-db/sqlite-3.6.16:3"
+DEPEND+=" >=dev-db/sqlite-3.6.16:3"
+
+ruby_add_bdepend "
+	dev-ruby/rake-compiler
+	doc? ( dev-ruby/rdoc dev-ruby/redcloth )
+	test? ( dev-ruby/minitest:5 )"
+
+all_ruby_prepare() {
+	# We remove the vendor_sqlite3 rake task because it's used to
+	# bundle SQlite3 which we definitely don't want.
+	rm -f rakelib/vendor_sqlite3.rake || die
+
+	# Remove gem tasks since we don't need them and they require hoe.
+	rm -f rakelib/gem.rake || die
+
+	sed -i -e 's:, HOE.spec::' -e '/task :test/d' rakelib/native.rake || die
+}
+
+all_ruby_compile() {
+	all_fakegem_compile
+
+	if use doc; then
+		rdoc --title "${P} Dcoumentation" -o doc --main README.rdoc lib *.rdoc ext/*/*.c || die
+		rm -f doc/js/*.gz || die
+	fi
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+
+	# sqlite3 was called sqlite3-ruby before, so add a spec file that
+	# simply loads sqlite3 to make sure that old projects load correctly
+	# we don't even need to create a file to load this: the `require
+	# sqlite3` was already part of sqlite3-ruby requirements.
+	cat - <<EOF > "${T}/sqlite3-ruby.gemspec"
+# generated by ebuild
+# ${CATEGORY}/${PF}
+Gem::Specification.new do |s|
+	s.name = "sqlite3-ruby"
+	s.version = "${RUBY_FAKEGEM_VERSION}"
+	s.summary = "Fake gem to load sqlite3"
+	s.homepage = "${HOMEPAGE}"
+	s.specification_version = 3
+	s.add_runtime_dependency("${RUBY_FAKEGEM_NAME}", ["= ${RUBY_FAKEGEM_VERSION}"])
+end
+EOF
+	RUBY_FAKEGEM_NAME=sqlite3-ruby \
+		RUBY_FAKEGEM_GEMSPEC="${T}/sqlite3-ruby.gemspec" \
+		ruby_fakegem_install_gemspec
+}
diff --git a/dev-ruby/zeitwerk/Manifest b/dev-ruby/zeitwerk/Manifest
index 49d7c2370f8c..a11c350e8fec 100644
--- a/dev-ruby/zeitwerk/Manifest
+++ b/dev-ruby/zeitwerk/Manifest
@@ -1,5 +1,7 @@
 DIST zeitwerk-2.4.2.tar.gz 99974 BLAKE2B 5913561057a6d5cd9bfa4eb549770ca18de3aafa1549a40e5315cd1d71a2dec5f865e7bc79f6ab2a098e515a930c5f8c83b85c91d7dbe441fa8dfb08ffdbdb03 SHA512 774cc17a8732afea0a854ea22ec860fa5bca65e8743aa800017c06a251dfdb1d2c5af8e541cb56d22a4202a9faa42707ed2ad395d9472360cf64f46ce9b907f2
 DIST zeitwerk-2.5.4.tar.gz 109202 BLAKE2B 4c1302bdb6ac30afbb23ea06ef2ac2ecea9c8139c36f1b766ec6f62bb6a77faf1efa3f670cb31b5073a6dc36d6a0bd8d66a937d8b84b12438411a7f2df29eeed SHA512 f7a4b88c030b2eeae5ba07c6e01900fa66312a58e5c9da3d13a293d0959d67bbcfb385de5790e1764188752dfc9de161c202b35e0e35ed6e0cca7bbc2c2f6c83
+DIST zeitwerk-2.6.0.tar.gz 112854 BLAKE2B 5549624fdf793fa37bd8c45679246e0297ba96d95175a63f0cb7093fae85804d1eac9506ad539a256e9b3237816ec0ef29ecd4461bdfbef52bfbd1c6964d2f8d SHA512 750aade9b995b3e889d15bd4d6bd6bf267999ee1fd4b44bd9a32db083f19e86d0ce12f673f84f2b79629e1fee409f587fb2829e76ac23a23898dbb18cbb58b0b
 EBUILD zeitwerk-2.4.2.ebuild 900 BLAKE2B f944c93347913374c6f1d50e4cc48d2c499fd6fce7b10f411795fb5bb2708262fda6ede489ae3c32e6b8aa03f3f933d3f878ffc6e928c491d5ced3c203e87e98 SHA512 99dffffb4ed0dff209f0930224cd63b552ed3a3c8f229976d2887ce0cefd4132851e0aff0bcdbd1d8635c1cd35a255d13ce77824a802ceb217a7b1a62dea3748
 EBUILD zeitwerk-2.5.4.ebuild 915 BLAKE2B d07f14403ae6a30d5920e88da5d1bc9de459b4dc6bbe75b5e9616427f07d207bf5a4f2d15ae9b39192ceff1e2c31d98507af462bc565d9afb8071dd9cf268ad3 SHA512 02d5e9ed4e43cc5890150e3cbc1c9a320319b1e2f06bb1cb5a7a4bbd85b44109424648def0e96167e05a7be70c292768c5dafa2625e4219ecd7297da5fb0031a
+EBUILD zeitwerk-2.6.0.ebuild 915 BLAKE2B d07f14403ae6a30d5920e88da5d1bc9de459b4dc6bbe75b5e9616427f07d207bf5a4f2d15ae9b39192ceff1e2c31d98507af462bc565d9afb8071dd9cf268ad3 SHA512 02d5e9ed4e43cc5890150e3cbc1c9a320319b1e2f06bb1cb5a7a4bbd85b44109424648def0e96167e05a7be70c292768c5dafa2625e4219ecd7297da5fb0031a
 MISC metadata.xml 641 BLAKE2B 27f5d9950eee9945425ab5606b78e7c745345e49dcfc201b55bf52693b3882d44206a82af09134696e694e524202d9c43f642c0854bdcf640356db8f8c84972a SHA512 b744fa895c31a93a5566151b3b3d73308ad41a7b43638ccd9aa00c9fceda495279d32f56e9c68cf44adea06f0e6842e38324c2f20b412e46f05b78c35288869c
diff --git a/dev-ruby/zeitwerk/zeitwerk-2.6.0.ebuild b/dev-ruby/zeitwerk/zeitwerk-2.6.0.ebuild
new file mode 100644
index 000000000000..4f75e8c49b53
--- /dev/null
+++ b/dev-ruby/zeitwerk/zeitwerk-2.6.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Efficient and thread-safe code loader for Ruby"
+HOMEPAGE="https://github.com/fxn/zeitwerk"
+SRC_URI="https://github.com/fxn/zeitwerk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/bundler )"
+
+all_ruby_prepare() {
+	rm -f Gemfile.lock || die
+	sed -i -e '/\(focus\|reporters\|Reporters\)/ s:^:#:' Gemfile test/test_helper.rb || die
+
+	sed -i -e 's:require_relative "lib:require "./lib:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -S bundle exec rake test || die
+}
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 28fc408ea07e..75750e6abcd5 100644
Binary files a/dev-scheme/Manifest.gz and b/dev-scheme/Manifest.gz differ
diff --git a/dev-scheme/kawa/Manifest b/dev-scheme/kawa/Manifest
index b913df94efd8..8936840d3a5f 100644
--- a/dev-scheme/kawa/Manifest
+++ b/dev-scheme/kawa/Manifest
@@ -3,6 +3,6 @@ AUX kawa-3.1.1-configure.ac-single_AM_INIT_AUTOMAKE.patch 396 BLAKE2B f63432756e
 DIST Kawa-3.1.1.tar.gz 3216501 BLAKE2B abaea589c33ec01c49df9b376b43330a1246832428d64da2eded9899b06fb32ac5875112749f94e55b1d75ad628535b71dc41b8d7e0edf62ea7baabd20b8b182 SHA512 557fe8cc2eb7bea1e18dcbb0e4df6d82ed17e02724d55889591141b8db02245378bb0cd27acfc73e452cfbc0d6d1cbc50dd27b325fa437778eca5ce8db4211be
 DIST XQTS_1_0_3.zip 30956043 BLAKE2B 30d8980e8076eec3291487e582139f1e6a47e6c819ba0e06d9d34ca8867c81db266817e25e50d4823234ae73529c97c939d1aa168056ce0a5379f150425cf62d SHA512 e00efd3dbf0b1cf530795073f7548cf4ab4f3c55921f76af7c000e61e1d7293cd11f41d617b3ce5343df5e9c5b6de4ee3819a6db2b15df9441a19489ae46e1dd
 DIST kawa-1.14.tar.gz 2691484 BLAKE2B bd4e2e725cfd51d65ba55d6511f09ab99ea6d9435d95febc16f9486b47b1bf1cdcde601b58266ae20059f6e776d2119bcb017d7061ff571bbaddd5bcbb297b8c SHA512 e0a0eafd4ed0ce7d254f295db8e920b82cfef6f4f71c440db655d73761a2f99ab743def1daa54241998497db8f29269c7d98f7e3bf819a36d7f7151d3ba2913e
-EBUILD kawa-1.14-r2.ebuild 2532 BLAKE2B 3c05839e512ca81a47c3c59cc7b2f7ccd02421a12630b0924bf9679b382cb8f4876b834699d9c782a97ba40f1047404cc322f136c254f48f9771f4a04650f0d7 SHA512 6af4070642ba6e617fe8d8117b2d355a4e53e4283fffeb292be804d03bb82c5ed725dc48cbfe1a6aaade16ee73902e1642768194b4a03fbacc0113393c711e1e
+EBUILD kawa-1.14-r2.ebuild 2534 BLAKE2B fa3cc1865cf3dd81cb12fa3c8b779e0b1639d3d4a36b18348c61089fb13eaf523a9cee28027770d6a8314bb60ac1b2de1794a061d8546265cd78ef4f5e06c6d5 SHA512 7bf8197e38e2548d64005be55b3321c7518306dc43bc816b5a5df8057bc7767025b4615d0bb9367c9c7810ebf0873110997819d0fa296f76184d48db0c553f4d
 EBUILD kawa-3.1.1-r1.ebuild 2065 BLAKE2B 8ba887bed9392346cf00abd001d4fc1a1eebecbdb7d3b97d49539eb83b5fc54b3fee35eee13e3a1cc6af42fb5bbfa41636bf6260d48b35825796113bb7cd86af SHA512 d393ffad45851cd1bcd76c99b41a2c185b6b79faf45d5b2c20e374a687e504a8f8e6015aebb358bec5407c82d31eefe6db06cfb80d60e8aef53362cf12a61089
 MISC metadata.xml 1178 BLAKE2B 5a7b5ef1369023679f8227368b53f9a5f18307ff19bd2d34c50e42ec5529c53cc74d462ecdcf0ad117ee0d6f7b2d8651e184e154b3cb40ed9eea91ddd4966e57 SHA512 137a0aa387493f4977a4b5ae7855360a858d0c33417f3b6473cc9354745bff5386c7c15598cafa874021c3027588d66e50c1c50aa2d5c1937b0a14e1875faecf
diff --git a/dev-scheme/kawa/kawa-1.14-r2.ebuild b/dev-scheme/kawa/kawa-1.14-r2.ebuild
index b4e6737db228..46c2161cc790 100644
--- a/dev-scheme/kawa/kawa-1.14-r2.ebuild
+++ b/dev-scheme/kawa/kawa-1.14-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -68,7 +68,7 @@ src_configure() {
 		myconf="${myconf} $(use_with swing)"
 	fi
 	if use xqtests; then
-		myconf="${myconf} $(use_with xqtests XQTS=${WORKDIR}/${xtestsuite})"
+		myconf="${myconf} $(use_with xqtests XQTS="${WORKDIR}"/${xtestsuite})"
 	fi
 	if use servlets; then
 		myconf="${myconf} --with-servlet=$(java-pkg_getjar servletapi-2.4 servlet-api.jar)"
diff --git a/dev-texlive/Manifest.gz b/dev-texlive/Manifest.gz
index d323ad86d851..32f46a637ca9 100644
Binary files a/dev-texlive/Manifest.gz and b/dev-texlive/Manifest.gz differ
diff --git a/dev-texlive/texlive-luatex/Manifest b/dev-texlive/texlive-luatex/Manifest
index 162596722586..44882278df68 100644
--- a/dev-texlive/texlive-luatex/Manifest
+++ b/dev-texlive/texlive-luatex/Manifest
@@ -138,5 +138,6 @@ DIST tl-typewriter-2021.tar.xz 25272 BLAKE2B 5a63be8eb8f5848dd1c8af2d24a5aea1903
 DIST tl-typewriter.doc-2021.tar.xz 101056 BLAKE2B 6043494b217558258138bbdd27b32480923ed6b2608b51032328baa16157b08cd43a0eaacf6ac8fa771b46aa6154438fbb3d9610469b509cdb97f0a0dd72920d SHA512 12376247fd8500e7c147609bf47acab379e36126976ea9f2dc0a352b8b0d779b1cd43bd1394f3961b1a7fa894a8b6448b0369f612d8bbf8d1bec3175e850f89c
 DIST tl-uninormalize-2021.tar.xz 5720 BLAKE2B 36c8746438d815f1854047260ba0c4a968df5d3a18eb0cd7361eedb52ebd3d94c4638c249d0c66e3688eb72be8c6d030dfe9b3292d0c3beaaaab60cb4285dc2c SHA512 b9b0e91a61d99005be4f37d2e5aababf70729c60d959cc57295a7197b5e360ed183bb9cd80bbb287508bf584db48f061bcbb25c6a5bfd0936923b106d9962f60
 DIST tl-uninormalize.doc-2021.tar.xz 63868 BLAKE2B ecc5b6b2f73aacae10680c8525977c935ae8ada4214ef22bad43076d3d5a43c225827f0a5d88f1843045b7350a06c278709bc215f22df5bc307137e37372cc58 SHA512 804c2e70ff09a677c30f531db5605512453506ab83dce8f9dab4bfbb5602f8605376becc8f65cf375b28c9d6d35ad9f3a92d6f185697e2e9f9d367638d58fb56
+EBUILD texlive-luatex-2021-r1.ebuild 2758 BLAKE2B 49619d5901b4acfdb9776802a38c5478628c71549b64baf47a994c126d27875ad565fb44c0d4c3baa2a2722e1ab99438fc64fdc76279a0efcd497ec79ab8f080 SHA512 1fd75aab75d51242f547d2ddb8456a543a3067536500d1a6850172292a45ce0a956a85423a52ad1bad1abf2d4b40109a172070593d9726b70c2ae6145de5808b
 EBUILD texlive-luatex-2021.ebuild 2709 BLAKE2B 73ecc037f1dee3fff194c1789e7889aba6af9e0511c739697d42511c9e084065cc201d28de5a4965c69b23545b5bed3a5f09f4bf40f2bf1ddd43a3afd2cfa6e9 SHA512 4a8a792d295db713b0933ecc1e903280f9003a7eb2c0b6c3b9e4b974691bf2cb60118ee9042fde8309121e81688162a9643a6de1a7b2c8372db6c72aa1c9903c
 MISC metadata.xml 549 BLAKE2B c37c78fe7241a7757ab2bfd8c5075e1866d903d8400634aebd6c67b0fd3afe263ec3e7eee097f89d39b3d0f8c9bf88bb2135d2bb7845a0ee9858ec62ed356621 SHA512 f1f83f3556a8f490f7b28007c33539b6a8ab1a0785e1b0ee39f83b9a4bb4921e638280bd28294b605a29fd265521d537f1cbca45c540356a4092c8aadd19e2f4
diff --git a/dev-texlive/texlive-luatex/texlive-luatex-2021-r1.ebuild b/dev-texlive/texlive-luatex/texlive-luatex-2021-r1.ebuild
new file mode 100644
index 000000000000..c85525805217
--- /dev/null
+++ b/dev-texlive/texlive-luatex/texlive-luatex-2021-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+TEXLIVE_MODULE_CONTENTS="addliga auto-pst-pdf-lua barracuda bezierplot checkcites chickenize chinese-jfm cloze combofont cstypo ctablestack ekdosis emoji emojicite enigma innerscript interpreter kanaparser lua-typo lua-uca lua-uni-algos lua-ul lua-visual-debug luacode luacolor luahyphenrules luaimageembed luaindex luainputenc luaintro luakeys lualatex-doc lualatex-math lualatex-truncate lualibs luamplib luaotfload luapackageloader luaprogtable luarandom luatex85 luatexbase luatexko luatextra luavlna luaxml newpax nodetree odsfile optex pdfarticle placeat plantuml selnolig spelling stricttex typewriter uninormalize collection-luatex
+"
+TEXLIVE_MODULE_DOC_CONTENTS="addliga.doc auto-pst-pdf-lua.doc barracuda.doc bezierplot.doc checkcites.doc chickenize.doc chinese-jfm.doc cloze.doc combofont.doc cstypo.doc ctablestack.doc ekdosis.doc emoji.doc emojicite.doc enigma.doc innerscript.doc interpreter.doc kanaparser.doc lua-typo.doc lua-uca.doc lua-uni-algos.doc lua-ul.doc lua-visual-debug.doc luacode.doc luacolor.doc luahyphenrules.doc luaimageembed.doc luaindex.doc luainputenc.doc luaintro.doc luakeys.doc lualatex-doc.doc lualatex-math.doc lualatex-truncate.doc lualibs.doc luamplib.doc luaotfload.doc luapackageloader.doc luaprogtable.doc luarandom.doc luatex85.doc luatexbase.doc luatexko.doc luatextra.doc luavlna.doc luaxml.doc newpax.doc nodetree.doc odsfile.doc optex.doc pdfarticle.doc placeat.doc plantuml.doc selnolig.doc spelling.doc stricttex.doc typewriter.doc uninormalize.doc "
+TEXLIVE_MODULE_SRC_CONTENTS="chickenize.source cloze.source ctablestack.source ekdosis.source innerscript.source lua-typo.source lua-ul.source luacode.source luacolor.source luaindex.source luainputenc.source lualatex-doc.source lualatex-math.source lualatex-truncate.source lualibs.source luamplib.source luaotfload.source luatex85.source luatexbase.source luatextra.source newpax.source nodetree.source placeat.source "
+inherit  texlive-module
+DESCRIPTION="TeXLive LuaTeX packages"
+
+LICENSE=" BSD FDL-1.1 GPL-2 GPL-3+ LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free "
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+DEPEND="!~dev-texlive/texlive-latexextra-2020
+	>=dev-texlive/texlive-basic-2021
+"
+RDEPEND="
+	${DEPEND}
+	dev-texlive/texlive-latexrecommended
+	dev-texlive/texlive-fontsrecommended
+"
+TEXLIVE_MODULE_BINSCRIPTS="
+	texmf-dist/scripts/luaotfload/luaotfload-tool.lua
+	texmf-dist/scripts/checkcites/checkcites.lua
+	"
+
+TEXLIVE_MODULE_BINLINKS="
+	luaotfload-tool:mkluatexfontdb
+	"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 187ffd766668..71677b0f17e9 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index 0779edc5b7be..3340bafecdef 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -9,5 +9,5 @@ AUX site-config.jam 688 BLAKE2B e43a7ad1a94d113a7f890e8b634770f5c60556101d428d83
 DIST boost_1_78_0.tar.bz2 110675550 BLAKE2B ed7da98862ec1e0a28472544400e6f44ffadbc967eed969ce6cb62b1c4f0b7a4b98a395269eb374b57326eff9cdb1dd6e47df9d1a9730aff7c926cc44388fb2d SHA512 9c34a387a203b99aa773eb0c59f5abac7a99ba10e4623653e793c1d5b29b99b88e0e4e0d4e2e4ca5d497c42f2e46e23bab66417722433a457dc818d7670bcbbf
 DIST boost_1_79_0.tar.bz2 113456811 BLAKE2B 61f47ca022e60745868e6bdd3b5c75603dd68d878e126dcbb73de5b40fc03c0eec8eede3ec304ece58050435ef2fc1ed7eb763773c20673f85e32bbf4d5f978a SHA512 70909e0561c213d10a1fdd692f9ae7b293d3cdc63e925bdc207da9e9bba6e86474341100e7ee5de6d94f9561196b1a3a1597055a7b7382babf8931131170a312
 EBUILD boost-build-1.78.0-r1.ebuild 2166 BLAKE2B e65979c0a57bc8d4c30514f51be2051ed73b33221d69fccc429dacf699c8ce9fb2e65c39cd6c04a511ab1c33ccbcc73bdeac9e3de8a1de3a8994678e3e6fa561 SHA512 7f3c708126c863f3cc052f16442bc360dcdff51be044b1f820820a5d70a7404e4e104d75556cd7e487e31f6c16cd095ffa05b495b60cdc04cd0332d3183c3fbe
-EBUILD boost-build-1.79.0.ebuild 2128 BLAKE2B 7f16e6fccb539ce95f7009f32e372abff648afab7eb018ff28527f157aaf501b2bc43f4243b65aa3c6998be12bf8e2197f53e2a83060ea512ea8166de316851c SHA512 c21379b193d681d20a1d686fa120b03e831e3e1130bda509fe7c531336dab97237256be630efc0bfe80383a23a348fcd643df7c29bd1b51323d98f692b39df41
+EBUILD boost-build-1.79.0.ebuild 2124 BLAKE2B 20881a697033b3bc88bfef03597f7b62c84eaec2368204283711ed1a656f997cdf4a0f6bfe5399091b6f843d6aae00d870ceaef71a70c6d3bf52496d06d62ae5 SHA512 6b9644c229222e3c0a5b3e71480912c76182af707aa47212bebc401dbac71e29dcbb3472d582deb66b816bfc646384c99b43029f1ded66d767400de40364c4b0
 MISC metadata.xml 320 BLAKE2B b8916adb7b84ead3feef70414578019e07de58086e6954cf2a26a77368a99bc75bf99ca18f111a67531d318863fab700083ebcd7612e7d40ece89086d9d4974c SHA512 7c2c8fa591a6c3d05b5d4808077b890d5757bbb4c12a9fe7ed7b4ebc738244266196baba07da434ac3609c0d00aed4ef9c2346524f141e679b94376f804c508b
diff --git a/dev-util/boost-build/boost-build-1.79.0.ebuild b/dev-util/boost-build/boost-build-1.79.0.ebuild
index bfd4625231b3..d781a10cd329 100644
--- a/dev-util/boost-build/boost-build-1.79.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.79.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/boost_${MY_PV}/tools/build/src"
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples"
 RESTRICT="test"
 
diff --git a/dev-util/clazy/Manifest b/dev-util/clazy/Manifest
index 97f325647df1..50608c282a3b 100644
--- a/dev-util/clazy/Manifest
+++ b/dev-util/clazy/Manifest
@@ -1,8 +1,3 @@
-AUX clazy-1.10-gcc-build.patch 1571 BLAKE2B a6409a491fc142690fe34d15415a4bd0aa90052cfc900d45fa81fc679497cff979d4c9e63319f315a97f3395fad8f39b1aaea30bbff994ab7e0c6af4f8545be0 SHA512 1ecfa3d9899f685996933f3f1d476537e942f37cb4f28d46c87bb5c14575d403407beac4a091966225e00d495a9d5aaedaea88e313fdad1396e14e5adaf0c59d
-AUX clazy-1.10-llvm-earlier-than-12.patch 692 BLAKE2B 40b2920f7017031f99603cbeb5f823445309dbf3bd774cb59c70ef15f556f15835f49143ed884be36620adf61511075ce338c9517fcca8ad16af0a66815999d9 SHA512 56e5d9b44ab9661d4a1bf2e550f12a683d119bf6f784287f64971a76d50009a5fa85950f86307887428a8a929da05ea067b1c15a0fd9dd271e0a8655cc0c2a32
-AUX clazy-1.10-use-c++17.patch 1159 BLAKE2B e7ec20f4c879d13046499f308c732e966a9c75ae23ffd6657a61b8472974aadee947f5ac0ce4a246589d2c2e4f22f63db8ebb90b31df28cdc66b75e347df8661 SHA512 67d3ab6a87217e8ca5da68789d06b771cda6ccae8fd69d36ca60f6b68edfeb87078ed169844a10943340789e5452a470f3040d854f38a3ad003f7e688835977d
-DIST clazy-1.10.tar.xz 398920 BLAKE2B 1cdc160de21363c7dc9c93ea7e780412a4971b18e97c7ec6e06f1c7450c56e0fbbdb7592d6b92ae53e4c161f6d9abca205984f83b68646f04ea11d63e3c45fa6 SHA512 59dd8c6903bcc239dfc356804cab265597a771de3858a6add4877149e0e7875b3c9ddae9aeec889c9102fb9ec6b0125bb8a786344e47872b01ba87425ba021eb
 DIST clazy-1.11.tar.xz 404088 BLAKE2B 1a69fe07ef81a0efe3c9db9129083247d60943592967f705d62d3859039cec250673eecc06184f70d134cbab85708d957b0a085beff8b3e46325a69547e005b7 SHA512 6a7c162392dd30aea29669275cea814d6daccf7931b8cdb20997f9bbff5619832d5461a6d0f854ecbc4726e52b6937c4f9cb8651087ffe73676c04239a38ca2b
-EBUILD clazy-1.10-r2.ebuild 1301 BLAKE2B 6e66f772f4f98db3fc824b18da18c69b28a593a251909cb8f200ca92b6708be851172b7ab3e8aabb582c3b7e5b03b3fc0de22859cc7c56fba83c7ca898e85ea4 SHA512 03124499d436fb114c1f751889d9a97bcf0287e7221b01e0cfdb8dde3e8caa9d07dbea4018e0418fa05fbf8915ee6d21e5936e7f192db91c2de2144cdf94b109
 EBUILD clazy-1.11-r1.ebuild 1169 BLAKE2B 941ab83e4ee06ec2da6b81f20299262124f120ce8196b0b81ceac6fdd0eb878492428cf29926b648399e5ef252831bbb2cb09cbe2c0b4b44220d554d51b02112 SHA512 e466bc654f1a3fca0ab13f1dcaf604350f7ab300e15d31ed6ade12efe3bbf41908242c00b8dffb3029173b59d74916b1432212f0b95e754625d9b7a48dc39eac
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-util/clazy/clazy-1.10-r2.ebuild b/dev-util/clazy/clazy-1.10-r2.ebuild
deleted file mode 100644
index 077cb9c6224d..000000000000
--- a/dev-util/clazy/clazy-1.10-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LLVM_MAX_SLOT=13
-PYTHON_COMPAT=( python3_{8,9,10} )
-inherit cmake llvm python-any-r1
-
-DESCRIPTION="Compiler plugin which allows clang to understand Qt semantics"
-HOMEPAGE="https://apps.kde.org/clazy"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):="
-DEPEND="${RDEPEND}"
-BDEPEND="test? ( ${PYTHON_DEPS} )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc-build.patch
-	"${FILESDIR}"/${P}-use-c++17.patch
-	"${FILESDIR}"/${P}-llvm-earlier-than-12.patch
-)
-
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}" && has_version "sys-devel/llvm:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-
-	llvm_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -e '/install(FILES README.md COPYING-LGPL2.txt checks.json DESTINATION/d' \
-		-i CMakeLists.txt || die
-}
-
-src_configure() {
-	export LLVM_ROOT="$(get_llvm_prefix -d ${LLVM_MAX_SLOT})"
-
-	cmake_src_configure
-}
-
-src_test() {
-	# Run tests against built copy, not installed
-	# bug #811723
-	PATH="${BUILD_DIR}/bin:${PATH}" LD_LIBRARY_PATH="${BUILD_DIR}/lib" cmake_src_test
-}
diff --git a/dev-util/clazy/files/clazy-1.10-gcc-build.patch b/dev-util/clazy/files/clazy-1.10-gcc-build.patch
deleted file mode 100644
index 647c254b644d..000000000000
--- a/dev-util/clazy/files/clazy-1.10-gcc-build.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-https://invent.kde.org/sdk/clazy/-/commit/b74c8729b7b71528c1528579435cda7fdb5d31b4
-
-From: Sergio Martins <smartins@kde.org>
-Date: Thu, 2 Dec 2021 11:05:51 +0000
-Subject: [PATCH] Fix build with some newer gcc complaining about deleted Lexer
-
---- a/src/SourceCompatibilityHelpers.h
-+++ b/src/SourceCompatibilityHelpers.h
-@@ -117,17 +117,13 @@ inline auto getBuffer(const clang::SourceManager &sm, clang::FileID id, bool *in
- }
- 
- #if LLVM_VERSION_MAJOR >= 12
--inline clang::Lexer getLexer(clang::FileID id, llvm::Optional<llvm::MemoryBufferRef> inputFile,
--                             const clang::SourceManager &sm, const clang::LangOptions &lo)
--{
--    return clang::Lexer(id, inputFile.getValue(), sm, lo);
--}
-+
-+#define GET_LEXER(id, inputFile, sm, lo) \
-+clang::Lexer(id, inputFile.getValue(), sm, lo)
-+
- #else
--inline clang::Lexer getLexer(clang::FileID id, const llvm::MemoryBuffer *inputFile,
--                             const clang::SourceManager &sm, const clang::LangOptions &lo)
--{
--    return clang::Lexer(id, inputFile, sm, lo);
--}
-+#define GET_LEXER(id, inputFile, sm, lo) \
-+clang::Lexer(id, inputFile.getValue(), sm, lo)
- #endif
- 
- inline bool isFinal(const clang::CXXRecordDecl *record)
---- a/src/SuppressionManager.cpp
-+++ b/src/SuppressionManager.cpp
-@@ -91,7 +91,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
-         return;
-     }
- 
--    auto lexer = clazy::getLexer(id, buffer, sm, lo);
-+    auto lexer = GET_LEXER(id, buffer, sm, lo);
-     lexer.SetCommentRetentionState(true);
- 
-     Token token;
-GitLab
diff --git a/dev-util/clazy/files/clazy-1.10-llvm-earlier-than-12.patch b/dev-util/clazy/files/clazy-1.10-llvm-earlier-than-12.patch
deleted file mode 100644
index 714d196b5fd9..000000000000
--- a/dev-util/clazy/files/clazy-1.10-llvm-earlier-than-12.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://bugs.gentoo.org/829134
-https://invent.kde.org/sdk/clazy/-/commit/0ee1ed9ff1bd4cf2a49e1232696747f1898e2987.patch
-
-From: Allen Winter <allen.winter@kdab.com>
-Date: Sat, 11 Dec 2021 14:57:52 -0500
-Subject: [PATCH] src/SourceCompatibilityHelpers.h - fix compile with LLVM<12
-
-fix the GET_LEXER macro for LLVM versions less than 12
---- a/src/SourceCompatibilityHelpers.h
-+++ b/src/SourceCompatibilityHelpers.h
-@@ -123,7 +123,7 @@ clang::Lexer(id, inputFile.getValue(), sm, lo)
- 
- #else
- #define GET_LEXER(id, inputFile, sm, lo) \
--clang::Lexer(id, inputFile.getValue(), sm, lo)
-+clang::Lexer(id, inputFile, sm, lo)
- #endif
- 
- inline bool isFinal(const clang::CXXRecordDecl *record)
-GitLab
diff --git a/dev-util/clazy/files/clazy-1.10-use-c++17.patch b/dev-util/clazy/files/clazy-1.10-use-c++17.patch
deleted file mode 100644
index 73bd52aef0e4..000000000000
--- a/dev-util/clazy/files/clazy-1.10-use-c++17.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://invent.kde.org/sdk/clazy/-/commit/b0d831a6716229d18f2677c5d356b37f36d4dfd6
-
-From: Sergio Martins <smartins@kde.org>
-Date: Thu, 2 Dec 2021 11:31:58 +0000
-Subject: [PATCH] cmake: Require c++17
-
-Fixes build with newer compiler which were nagging about not
-finding std::filesystem
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -69,7 +69,7 @@ if(MSVC)
-   # disable trigger-happy warnings from Clang/LLVM headers
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4267 /wd4244 /wd4291 /wd4800 /wd4141 /wd4146 /wd4251")
- elseif(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
--  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -fno-common -Woverloaded-virtual -Wcast-qual -fno-strict-aliasing -pedantic -Wno-long-long -Wall -W -Wno-unused-parameter -Wwrite-strings -fno-exceptions -fno-rtti")
-+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -fno-common -Woverloaded-virtual -Wcast-qual -fno-strict-aliasing -pedantic -Wno-long-long -Wall -W -Wno-unused-parameter -Wwrite-strings -fno-exceptions -fno-rtti")
- endif()
- 
- set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-flat_namespace -Wl,-undefined -Wl,suppress")
-GitLab
diff --git a/dev-util/clion/Manifest b/dev-util/clion/Manifest
index 32bcf6ffcb4f..3d98d904bfdd 100644
--- a/dev-util/clion/Manifest
+++ b/dev-util/clion/Manifest
@@ -1,3 +1,3 @@
 DIST CLion-2022.1.1.tar.gz 785792506 BLAKE2B 9665bf3fe08aebb00b8bb1a26a0537c520444f66da679d01b9aab2230583abc0ecdf5b4510e7d6b39437ed6c9dc58939d5f9d1dab2568ea0c60438ad2c76e07d SHA512 bad80efeb9bcf88e31aa845605fb903dcc7deebe783100a40d0c5548c5f9ab3580804a2a924a511be007a94bc642df1c16bfd3477630719a0965ca075fdb72fb
-EBUILD clion-2022.1.1.ebuild 2841 BLAKE2B 4cabd130c88c12546f11fb2bb535d8c294032a33dc719b18b127ce287b74172e30c85a1d618b57a1dbb1a3ddde148d05d2e4ecea1681bc188a62a6b655008aff SHA512 e189e070c16c73526392c9f0f681e8d4e91be9243d709682a8cd402ce1cb2015f51345eec708030c38b065e6c628f2276e959fb7cf8937aa796ad9756536f36a
+EBUILD clion-2022.1.1-r1.ebuild 2909 BLAKE2B 7d076bd82e60471ee0a191a813e5ada30e8d7d3bf2cb528ea25a89435190e5f878df8a7f0b93bf61c0907e36a6208e02672d06182d52baa20e936739fc5294a2 SHA512 47c52f6acfd230c5b7f348a5ae5795e54ab42dce4ca9c215028ec72dcaa91b4e4fc9dc9b9081fe103bd0b7de4f6775955da61ce5aefa7485b1672490750a54de
 MISC metadata.xml 402 BLAKE2B a74ce91089fa83dc91f1878f17b0e2adc483fdfdd987eb2dd4b184b2a98b8f1d995ab5d2c4dca2d7f25d3a8e1dfec711625e980feb5a0422fe5635c5816ef4fe SHA512 6d425358265cac8deb12c18632cfe520d82a733e4caab71eeb89b6d6643eddbfa27df03fcd8111477a77efea136aca1093c84024c89b85dc66ce1b92633709c6
diff --git a/dev-util/clion/clion-2022.1.1.ebuild b/dev-util/clion/clion-2022.1.1-r1.ebuild
similarity index 97%
rename from dev-util/clion/clion-2022.1.1.ebuild
rename to dev-util/clion/clion-2022.1.1-r1.ebuild
index e4ebf8ec95c6..c6fcdf218e77 100644
--- a/dev-util/clion/clion-2022.1.1.ebuild
+++ b/dev-util/clion/clion-2022.1.1-r1.ebuild
@@ -96,6 +96,7 @@ src_install() {
 		# Fix #763582
 		fperms 755 "${dir}"/jbr/lib/{chrome-sandbox,jcef_helper,jexec,jspawnhelper}
 	fi
+	dosym -r "${EPREFIX}/usr/bin/ninja" "${dir}"/bin/ninja/linux/ninja
 
 	make_wrapper "${PN}" "${dir}/bin/${PN}.sh"
 	newicon "bin/${PN}.svg" "${PN}.svg"
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 1c89c212d1e5..5477b024ef61 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -4,5 +4,5 @@ DIST diffoscope-216.tar.gz 2711117 BLAKE2B d4818fc89a511c2387c486a38df0b925a78b4
 EBUILD diffoscope-207.ebuild 3297 BLAKE2B 38b17dc44cf8feccd717f69ae028dbada341c4b0dae653cc00fa4032da7c26a9d9026b5d8d29f6dc6f4cda42ee66ffb0d25f63c6dc253dbd0320e1848d01dfc7 SHA512 b97eb645cf2fcd16d472c265913373247d1b923586955860008ce2325369d10b6616704b88001e6260dc39bf409f2d4b5645ee4efec9c9e81f59731cce67ed74
 EBUILD diffoscope-214-r1.ebuild 3314 BLAKE2B 4249250c8390bc42972a495b2df794abf1818873c7223153758995e56d151e8cd901832f6c755e8f3e5f89663e1ccb4a8f417fb3b9f45e462cf98bc958775367 SHA512 2e53328aae5099f552df69f22bfd458109a3668885feeab4022effdf02686d001140006aa556e5b49f1e7080fe8bf91155d8fb6741c3d484992331d5d6c0432f
 EBUILD diffoscope-214.ebuild 3296 BLAKE2B 0d6f5c5ffa8be6470d622af2cf72181d283ece6bad089459d6ca12847df804b1174e104d74d39c447e632c6be4c182b56de8fb484c41e6afad9cbd0991ea98b9 SHA512 b8d9e8d6fdc0ab77d79d5f78a3718a6cf90c23afda16a37cad7fb70209f936eca1236f7b3058c89d14e36c1ffe645a81cc08963b2c25ec4c78b39320af30db37
-EBUILD diffoscope-216.ebuild 3314 BLAKE2B 4249250c8390bc42972a495b2df794abf1818873c7223153758995e56d151e8cd901832f6c755e8f3e5f89663e1ccb4a8f417fb3b9f45e462cf98bc958775367 SHA512 2e53328aae5099f552df69f22bfd458109a3668885feeab4022effdf02686d001140006aa556e5b49f1e7080fe8bf91155d8fb6741c3d484992331d5d6c0432f
+EBUILD diffoscope-216.ebuild 3319 BLAKE2B c4257c1bc58660cc5491ddd947a69c72659b84b105d24b2479df2f1b9be717dd715e8a01534c56fd12683723ec0c951fe056c37f51779a726913b40e7d802184 SHA512 a9437fdc6ff0fa80b839dea95a0102f1032d105b1f4c4f1bcdcfb540f9827af0da070f71a961f64fd6f5fc882618af5171391030c58927b8b440686627f0a33b
 MISC metadata.xml 2078 BLAKE2B 3bb126836e45e8d4e5b6170a12219ec9cceb1a12dca4658211b1971cb16fa5593622642ade363904cf24df16de0749b957d0fc03838d2a9a004484d0b551c886 SHA512 382cefe0478282000b74e404cdd9d636a0323fceb55b97fd8545190628c319e0c5e213c7d082198e4b8b1fc693a52ce85c52b3ad831778e6fadbe6ba401782f5
diff --git a/dev-util/diffoscope/diffoscope-216.ebuild b/dev-util/diffoscope/diffoscope-216.ebuild
index d3cec4443ea4..02e3933b9367 100644
--- a/dev-util/diffoscope/diffoscope-216.ebuild
+++ b/dev-util/diffoscope/diffoscope-216.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
 find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
 mono opendocument pascal pdf postscript R rpm sqlite squashfs
diff --git a/dev-util/difftastic/Manifest b/dev-util/difftastic/Manifest
index 195710084fb5..9da97900fc3a 100644
--- a/dev-util/difftastic/Manifest
+++ b/dev-util/difftastic/Manifest
@@ -4,47 +4,78 @@ DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585
 DIST archery-0.4.0.crate 21265 BLAKE2B d5e98cd65b7ae426affc3cd905d7cc4b4296c059a305ae5bb3cfcb206f0bffb6dc4aaf24c820d855ca8acd1be1bd80e2bd8c2e172af5824bcd9b300224d8159b SHA512 4726598957f2fda480fe4fb28b518307030dc032b1b79a9ce83a5e58872e57517a632e205cb83870f48937c3090956045faa066171248d615cb6b029127ee693
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
+DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
+DIST bumpalo-3.9.1.crate 77507 BLAKE2B b248a0c2a9faaf52061f2fe0a82b9fd4efb4dae01da9dbd986493941f3ef2632f1d5608d167f2d088536dc96b4cce28981602220062892a7af51c3ead7a74a4b SHA512 40bf3f0d261aaff1f7c30a539953b9c14f4526f05586af0dbe2e4df4cc042cbe6180e3dcc2fbc6f1802e694066f72e629e74de40bc2951c5527edaf551722a52
+DIST bytecount-0.6.2.crate 12347 BLAKE2B 1ed4fa4a515567d8eabc2af03f0e1a3c89a24aa6cd77696a57bb94c25650f02b2f0e1e476fe9cb024a17d910442b940ea21bac3a99588146b8d89ab4adab0eca SHA512 990460eedfd41b6b52278c9dfcac81872e755d40cb839d162bddf44a30eec3a9fd76369847f10edf6c2b2d95cbec562e9a2a6c6dce37f2ee59ca9edfe972a279
 DIST cc-1.0.73.crate 57880 BLAKE2B be8d7a25a54afdd759844e76aec61526fc2bd5ca09480e6cdd3bdcf27e5f9d3a88dc16cbcbf54cd021470a7cc521e1ad468116c112bbd30752bac0d5486939ac SHA512 980f012b90c6410144f6de4995048337e09214f19603076db6d4edb88e9ef9ac9e8c6e25569f66c2be3a47e99298f5886dafc102e1a9122316179aa26bc1c985
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
+DIST clap-3.1.18.crate 209664 BLAKE2B 97b499c2909045fe25ed77a22d55f32085e85876e18f00fc23f19fec5e87e1d1a7a9b1c6ac4c44cb6cd4a1fe7647effc9825be0621bd088b17a421ec6e738c0d SHA512 bd06202304e04cdbe12e7532ff9f112e0cd3c8fbab00232149eaf9f296acc308b18d2a7e7926c22f1c39db92a2af140b39eeb7affeb30226d9a9cd73dff41b39
 DIST clap-3.1.8.crate 206494 BLAKE2B efead669adb2f2acd231f8161da79022768d2438bd73a3f8d4e0edec91a3a7f9220b90b5993501749dc350fa09b46e24fdab3a33b7c9a78213dfe8671ac4dba8 SHA512 74787dd0a8cd25952a0019c7ec6bce454de2b3b9ce452d2f736b52bdac668d16abe00c08ca42439805296af8bcbc69bbe7f9110baead1296b93abad6b5f84271
+DIST clap_lex-0.2.0.crate 9581 BLAKE2B 47bef7e0b35c7a934deeb2821f0a552e05eaeeb68bbcdb82a013cd3b74f2cc42736207a394b9be8c46b3d253dac41dc22e96e1e2ccd09cc416743f22cbf78891 SHA512 d4acd8e2b8d1d19214fde1f0f21f0e0a755cb44e326893bc65350d742c2e260bda61f0abce5fdcb08fc5c4c835d0419cb02452d9f6a85cffa2b5dc7c4bc1e962
 DIST const_format-0.2.22.crate 72234 BLAKE2B 89d6f58458777d10e21bcf960e57d24069bf2325fd63904dddef10b6186570bf937fb1dc99d5302a1184d2946c35175d92970db583288bf5af45139aa8ac6e7f SHA512 3ed65106b3fa49fe7cbc0592a8a5b0fc9b99d9d44cb51c1fbdb2fb2eb916d801aa19d9ec568560d6df33373324ea226de3db6e82cbeb9a850426589472a1ec9c
+DIST const_format-0.2.23.crate 72319 BLAKE2B 3cb7a72e52709989207d84387cd5c7bb9681d76c9b12834843dd299a75ad8deb49d0d744837a7000d6b5ec799b69fb5f7e9ed0c4bcb7a41c98e27e0ae941330a SHA512 cc6b3254d82be2285e240b86e90593c971bf122ce576a6943281df660a6febecf5b69d7a4512a3c0f3f4759cb2314ce1acd49063a492821a0a957433744b30ac
 DIST const_format_proc_macros-0.2.22.crate 24274 BLAKE2B 61a41f89bb1302cd8a9b2b5b2bb6a90eea2aa6e331840c2b0033acdaef5ddb9cb7a63df028db9e6065a4883aa53002330c6af0bc0b8b3479ef8260c5d088cd71 SHA512 a0382a50502cff46c966fca1518ae1102cc749a9fff142a7fc29c3f3dce4b947ef05576e27248ed682aa9db2e1c0af149f41981d02d8415b63734a0ceccb68f4
 DIST crossbeam-channel-0.5.1.crate 86919 BLAKE2B b223d0dcacbb09850d457825cb2a018494d798d0000a20eed3f54b1152e41ebca4698e7d50e81f467b86543779155ad08566da9496eee36aa06644b69cf5d7eb SHA512 f15aff67e9105584f5fe41e1ee650ae4fdd0d0ca0fa9202ee83c6f6025398a300decaa50d1b4682e8afb9bd6e11e95b69bcf23f68ae117419aa84df14ee7747b
+DIST crossbeam-channel-0.5.4.crate 88237 BLAKE2B ffcab003305b80586a9b61c6309dcf6f4ced483856c4501753cddd23fb0fa9a71b7870b676ccba78119cc29f03974ff4731cef9a92840c0b38ae944f0b3825b5 SHA512 39b17dbaefc15d7faafca4ae6b060665471d384956aca7439fc407ed2632bd458e473efb62b74629b42a5f3d237e13503d2084cac6f6b3f42b9e03aa1fde0982
 DIST crossbeam-deque-0.8.1.crate 20852 BLAKE2B 0e7a2616b82c5e501c0f74935adfea3ee09db5475408be83db8f1b6faab4cd5509de2e029bdf6df90435e474ef91f3fc8d482ce3a72966b2a3bec5967666bdc4 SHA512 44a4fe1d4ab7457e2b0950be787b76b15e1bb0b1c108d032381ce3fe99bf7bf76f3d1718085660083d813e2639e66fdd3635d9186e85a9eb7267063b117eaca4
 DIST crossbeam-epoch-0.9.5.crate 43883 BLAKE2B c0ee0879c583bd1051b63d29eccac37ceb9f9446ee8cb64756b2e3d95a30c5c11bc79d9d460be4ef4b62513049e28900a96085031f805d064e81b5eae4bc297a SHA512 ad822e967e5ef45fa0c4a939f057f44146f1f051032fd032355a75c0f45ae4e0a55e1d31c80bc67c01ff8d9c87a51aba7ccfe9a440f061fd8225c879aa663064
+DIST crossbeam-epoch-0.9.8.crate 46012 BLAKE2B 181df06d1a9925ad1b3e2df70f290fc9c75682037d68c4d3727b3e5bc0f92eaf01c2f8ec239b77f524bc4af53d014cb3c4d49dc82922fa9e65baebee68904a6b SHA512 c102e7ce9e927424f6c7c20f5eef5dee3457ef6ae3b81ab26e7dd4c787dc525610f1dcd85c3b06773b263c0835a717ce39bf35b927cea03abea62bc0a0a15624
 DIST crossbeam-utils-0.8.7.crate 39751 BLAKE2B 79e1d6454887e8c61f498be0f4475726529e1c45d5b24bb0799cebedacc8d92db735bbc0ececf2d64a9601dfffd142b372bd2802fd0aa0e98dd4994158846a3e SHA512 b9c999f570640513c38c95fe5e50d0e89adfd27a9370952a8ee441118ffc0f092d21f6dbe7c68f653a6e766e5c1aeb209145d49542f1bdaa1f561e6707ad482b
+DIST crossbeam-utils-0.8.8.crate 39681 BLAKE2B 2b3e64bfcaa044a9351c1cc8e9ea53fd68fd0bb9875ae523e0cd309a85ad23b340267bdb742d363b5d99fc065ed74f6cbb3ad1e33dec7d14d99ec458875e7e10 SHA512 ab960afdb82863160a3fa1c21c64b35b3112725bd72fc8e0724175937f4b23d0628253032229501938cd86a8e406a59c06cb44e8bdf34619de781a84ebb46ea0
 DIST ctor-0.1.21.crate 9303 BLAKE2B 8feeaacd3d870b721ecfed7c8df60a27005de1f2a099eef816bd6df2d7b07dbfa00badeef44027398ff4505871a69814d7d4ec90b07d36e371099e4d0aebfae6 SHA512 18a914f5bd55172e5ff199778babad9a20dd4214f36f24cc00531db5e169af66f77eacab425e8e64d053907366ebd3b448a0c3275ee1f8244822778b62c4cb71
+DIST ctor-0.1.22.crate 9311 BLAKE2B a13fb97cf767fae19486ca8b970f1712bfcf4ec9edda40c01add4bdb7a81e9136acb1208c79763cd612160bf39b342460fecc334c6e421e7f7ff610c4bc44e2f SHA512 cd7c60dae8fb19c3b10e0bf1ffbcedac90cbbd147d564335e4da2d5483f64ea3dc10ad17d7573b00958db0a72cce45f8b7bc10c32864dd943fe64df8d22aaaab
 DIST diff-0.1.12.crate 10223 BLAKE2B 369f305661f1da31207f3801ed1841dbce12451ac9c3e9d3736f7158ece433af9b2e42c29063e5d93bb86b1d300e503caa9c3ce7dd0b25553f91d72a9eea5298 SHA512 0e81331c0424e9369963e23894a6412b65a3ed4f3154ccc184fc84cf1c5985b81c586a6b34e8c6c0e5c3afba38fb15277cfd89e7f50c85bd5d8d4d24ba670d16
 DIST difftastic-0.28.0.tar.gz 15829294 BLAKE2B aa83cb671b2f8a4abaec319916f5ddb4378bf35bf97847d04199ebaf0c0af6a6f63aa69eba3c291b964bbffa79161ffbc9b570590cc97362ff12a92467f2411c SHA512 47cdbc30abe71dac6ef84efdb934d87d5527fc8822e696bcf20424d07529cecea9e67b4d62e45e81a567064909923de2d8f09f12f1a120fbb43ec911e254521e
+DIST difftastic-0.29.1.tar.gz 15891069 BLAKE2B ceffafa32e600dbf51c4864c386a92620ff1e5b877cb8a5b00443636e13cd383293ce249c52543ca23e01ee93fe08f3b61c13508ff3d00a85670b8d0c9d17b29 SHA512 d9dee1d4d5e165693353c29442b90438b14832545790495616cbbd14c449fecbca73e3e4c5743d86bc9c23f5534a4f361fb596d0ee38ef67f6ddc4bdf20f55c1
 DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
 DIST env_logger-0.7.1.crate 32281 BLAKE2B 6f1894c64f301ca4b687270c911dbe230f674662aa0561b97c4d2537886e404664b5773d4e223e2018047c222a951232c3cb52ec5bddbfb6665e34c3e7ea52f5 SHA512 604060d2ee83ab337a2d20d6784d1b7541534d2fd9e1662fc5c709fa681672a9db5e34d00face864b56ae321962e644ebe29fbb6d68a0d556419cf5d71c6149f
+DIST fixedbitset-0.4.1.crate 15551 BLAKE2B bcebd833a45215566a565bcc8cc3440c5bacbced810d2658048da7050808b56c13951bacdd3930f85530129a118bdc23c42381206b63265da7d6846085937536 SHA512 8c53515f1a372a2626e83bc6999adaa00be6451f68627a63e0207ce6a8967e9cab6061adde3e33305c700c472be750903eb36b6f5ce071248db461c0af450b33
+DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
 DIST hashbrown-0.11.2.crate 85713 BLAKE2B 402f9f1bdcb92631206f9b72923ee35e28db8623e87469c0f1496664bc7185077013ab3c8aea68268241e5b2504f10cddc613a350abd4291050deda6c112e559 SHA512 c21ca68fd49bbb741901f59fed04cc124b8da99e2a4dfc26e2e5e1140637872b344612a01691bd30cc771575c571be15f756c84dde225441699cd2322af2ad6c
 DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
 DIST humantime-1.3.0.crate 17020 BLAKE2B 37efaacedac293197ff7acc8b0446a73243a2d90ed8dbdcecd9cb0af6e901f135e1d92aa1a642460f531a6811a5f08075f8aabaa9941e96eddef301e205fdbe1 SHA512 2589bfdac96108951882b7ee497528b9084ddd344a67914810ea9961a1e319167d5cab959c66cbb26e398e75ca50d488a251694fff35f3c2f69a88b6f22844da
+DIST indexmap-1.7.0.crate 50363 BLAKE2B b45318ae2a6e1f008494db77a3159eea3fed4f77eb04ae65599be9392d6ef78d4677b65d04fefab8f917f6808fee821a33bcf53a50b88785fae5ef6848e3a08a SHA512 9b882b4a7068a686acaee0a08bd4f3b35b58d36e786358cf14a3436eb61339649e64f1757331cc7833a2fa364c76eb6b75cf0c732afaeb202113de1e66b72ab9
 DIST indexmap-1.8.0.crate 52583 BLAKE2B fce94d24af0ae74f8173dcdfd35bcc51a23451cdeebbcb10c92dda74312c1ec980e925020ba7bdfa9e4a54b72a619068ca7ae133eea66a4df8775595a3a3551a SHA512 6af44320a80c8256291cc6e3c90311ce67b7f69ce039d640bb3abbcb6057f16eb443a407060ba647d7b16f44214acf59b566772a4802ba5000f036f69ca82a43
 DIST itertools-0.10.3.crate 118661 BLAKE2B 0095d6e7f14ddda69605d09f74e8cc881eec1a1d234f705e667d7f9e738ef157b7ddee066855cbcad7f134bf79b99a4a4c77bff3371397a567cd34d98b68bf97 SHA512 9d17357eb68159edf4f4ccd2eb9895672c7fb633803166d5e24ee12350639eaf66f1c822910518185cd1f1ca5d9c3e228dd37525e6c337ba3fc7ce967f9bfc85
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST libc-0.2.112.crate 571445 BLAKE2B 3936f4fd08cda0ad5be7b1ff417b6dfc9abad14ea5cf647425d8a2e7306275e958fb5cab4de9eeaab95065176bc295065bafec3846ebadb6e15cba20de495280 SHA512 6c1a027eff21d3ef8078ad19b90b06d90790919a848e95a4c878e8c8b850d2e9be3fca36d8db39b24e472f15e5352ead1182d5491a0b382e06f8c3ead379c45f
+DIST libc-0.2.126.crate 590481 BLAKE2B 1000de6b9fa2b3ff025b961e504d6d20b401f37cdeda6710187d18ad2dfe8ec89142bba65486d7853f1796897b58f343c5a34dd6381a0d0794b615635ac31175 SHA512 9bbb17f64a7503819616a71076ebe8ee317daf07b17b9fff783a4459da0439aecee535c09e7185bf148b1993e6fc958d182a490fc9c9a7b9fb635429c491ca44
 DIST libmimalloc-sys-0.1.24.crate 1119801 BLAKE2B a7ac3bfb48805c85566916b4ad7aa14434d21d7758d1c2f96a8b4889cdc1950ef27661223166fb2671040788e8f6a6fdfed3a0a42e5dc38b525e6100d1d9b6de SHA512 b35b72948581ec3505f569af21a1e55cab9024d3f2fe543972863e74e2c1620fc295a3632122e5548b01dbafc6230a1e2a39456070cbc9d3aadafa10fe166900
 DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
+DIST log-0.4.17.crate 38028 BLAKE2B b46be3719fc0a53e50b1f342762e188587e9f1ceb692c72473ce2663edfb8253742d30024e68c1444780ab7fc0e2d5b0601b8ea7228dc3405a9342a57548e605 SHA512 2477d88db42b1d92c30708d88823212e236f613b3465e85eb425f83f8d16fadfaf0352f06c2999a1852102edd2f6ffb10ecb539d8a3b6c48f552a25622ccffa2
 DIST memchr-2.4.1.crate 64977 BLAKE2B 31479718c118093b684bed946eae0706d77d9d275bd49f5aeff4de490f479abd60c7dc462150eafffc6d6fc1da0853123b78be038826b775d2a41a4c39d93ab5 SHA512 d8912e3902a2126f86159bdc998532a2890b882cbb7d59b5a470fffcad4c32281e045f2fff48a235aa4189f1928866bf3d33b699d50866ad6b6c272bba7adb11
+DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa
 DIST memoffset-0.6.5.crate 7686 BLAKE2B 9a797388702389076c426052c3d54dc62802d5db8bc5c9c83990429f2ffaec4fab4c7dd3f09cd0704d1ea555e87976563bb43408ba54b5e66ce7e406d4604009 SHA512 11bdd9185b99dfee8e659e051b09ee301c7142a372a8117864745a5085c015436d2efbb1478192886f09cbc562529e209d2e3325d94938a64bc75b1d91d2bf3f
 DIST mimalloc-0.1.28.crate 4987 BLAKE2B 01c419515664332335f4f017c2a651ad84607230640921d9d3cfd8c95d319473e1892dc64da1333132b9b7e0bc3641eab1e558258f3b87eff2b05eab20069229 SHA512 07725666f13c3681c58dc646aae9cd916459932140fed34a41eb651d1a5b03b36e48e8bb3fb470d95923140c9c1368c0ee6e526d5ffcc7df2242aabc71918a39
+DIST minimal-lexical-0.2.1.crate 94841 BLAKE2B e6b8919b80d938d0b98d60d4f5f29ce43d77ebfcf8b18bde08909141915c6ef4f0d07a543538d4f3ba8527a9f55926d4a8e83473248469d087e80b274d701d61 SHA512 385fab51884bdcc7b0f2728a219ab164d0dc8efe42160b918f2c09f79ecf853fb12bda006d11e649f097bae1499dcd41ddf2a8784ee7d178cf2c28059e46078c
+DIST nom-7.1.1.crate 115818 BLAKE2B 1ec3df3d9a7527f26618a9b6b976ca8ad5176d711dc7e6163dafb1ec214a55345e952439b4c98b2ac371c9a67c7ffdc3213d1081b62b699b36af68207fa8b320 SHA512 1456efdbda4f5b3da6c8580721acf101ed7d779619ee0190c1df103244e405a8ffa0c3889901a2d8beeab0ab84074ed4c7cec5330c7cc2a5a3c30e36a2530be8
 DIST num_cpus-1.13.1.crate 14752 BLAKE2B 27490aeee349d944c29e50b44e9a84371030459353a9316ffaa0245ce499df4424e39c25a81be59cd0f9a19c3214c78bdc7a84b632059282be476d8f918c44d6 SHA512 91ffe0ec792228621d6c2d5cc544ef4744203d19fc9c86e0aad2610038c43aca0448b6c27d82979417a0f6c939ea73523303a44c28df0d1c1b8d09814d5306d9
+DIST once_cell-1.12.0.crate 31549 BLAKE2B 72a6c2efe279abce207096dfc47d207adae34764642f742bcbddcd8ebab9f78f6c2ea7750bd670844de5f6989e4951904b5f624281c28346cb6c41c585137e91 SHA512 02da0e6eccee2d5246fff5e6323bd7eff0f4641801be5e5910763929a5e9d8b62c07f81001c405cc6aff03f68a14ed5bfebd9900bbdd09568bd1ab9ca9b73093
 DIST os_str_bytes-6.0.0.crate 21046 BLAKE2B 9d2a9f47aac852ca2e27e63a22c7267e1a4affde2277d50e128b54f377758322f07ca7263478c39c91e11a2b32b0e7a5fc5ba1b31e0ee014b412a4151642e605 SHA512 d2d3741a1190092cf251e035d2c55a7d022d99512160ed4ddccccb44ca85f664f94f8a937a76eff88581b593e2ebaddab6e753009f3046a8a2ebf451418e41d8
+DIST os_str_bytes-6.0.1.crate 21079 BLAKE2B 85c4a5f450d74bae23e2d2ad1c20cc944ff93fee1ab2fb700692645586acb388d552dca2b326f7df2cc4d07f6a3bdf7aa6704833be211f392250a56786519224 SHA512 16035d3032d499575faf5e8114868d57826acf2b4a54e848f9101713b7965a2fecd6c486945b1c8ccc3ddacdbb95a1c6f8a74ca4fcdee24729648edc817c4472
 DIST output_vt100-0.1.2.crate 4062 BLAKE2B eed08c0a1800560d4f623f451d818e3c7f0dcd72fa99f4e5e6dd4934e50a9649011ec955e06728fd017d58bb9f36cecbeb9b4aa8c13c040225c24019f774e63a SHA512 b8eb00a541bebef2e0bb44975c4547fadfd4ab88a14aa8e31945f3c73531a550cf5729f1f3d18fae5cf36286b82d1a54fb08b28720f1592ab6cfe0814c8d3036
+DIST output_vt100-0.1.3.crate 4473 BLAKE2B 8c75dbcd413e1273ddf077f3b57996953d70376be6e438ee1a4de83a8c3c535d4cc866849aed91df74aa9b22d41d428b1142cefe035dab7404ec89af9efaa832 SHA512 ccca3b4c582e860b0643dea78302fbcb96f8f86b356041ae9c685e7c48f1721fd3366dd1bea39afc1bcef03b298d0f6c87918a1ba92a56e6b06bc8b4123c0d89
 DIST owo-colors-3.3.0.crate 27287 BLAKE2B 7b557c7bf358797bf259d520f6bde27b9fc1322e5dcea2934e4c71c89e549509f295aee9c8704f32bb6375fc70311a1dbd887426c8a6dca3cfaa4116e35e9359 SHA512 177b23fe7c665da52b489f274d013b3d52cf126af6cf185cd842658ac3dbf1bcbe9a9b341870e3f7ad978270fb78cb302f7e7a28e83be84105e76b6d357234fe
+DIST owo-colors-3.4.0.crate 30305 BLAKE2B 5e8605592f91e081ffa883b8373d0dbcb4651ab2284e9507bf55ed97860e472916cc1f9bab7edf5198c08935df253d858b9662cc19908325929626bd7e9de6ba SHA512 7c8720a6f142f9f728f98e3a7415b980b4fda7ce3c225e07569b3c9547bd7109c2cbf68659813bdd58a4b7063cd422b2476f8cb485bb2348e37fb705a009d199
+DIST petgraph-0.6.1.crate 184340 BLAKE2B 2e83013cac75f00b231b952067956320485d75951ea197cae191646ea35f2acc79e274e8060066cb7f006a888504bf30c56ccdb97a5ac2fbeae837e125b6b80f SHA512 4f1a9402190e70a63f138f0248248038986bbc4edaa85d4a101f85b006fd33e3ffbbdeb2deb66f303d12f9216f8cb1af88d363fa0dafc3700aa20d546811f88d
 DIST pretty_assertions-1.0.0.crate 73836 BLAKE2B bfe519373be45508354c160acde346c17bea9c1d6b1b3c8e1b96025a6d690e42759cbc54369b458308fab3db1df734d6d6640b8d3c544d0dd696ec83290a4f35 SHA512 65065b7efc5e7003499063464e4b996c84f22637143a01f8857552369960425156e0ce0571a62e876df3a8ac9d1361548bf5d4676749b0baf5bdd3a22f66b1a5
+DIST pretty_assertions-1.2.1.crate 79474 BLAKE2B fbdc7c7ddc40aedaaa845f9096d52eeadd9772f64fda71eb2a2ecfd40745ae6a7ed8baa2a83c909f2a01bfaad31c00aa7c24af6d449022486dac204a3671dd55 SHA512 6e6cb21bf03f34effe3c38ab9b31d768c7a7c02dfb385efb5c1dade7547a367276c5b00c4eae11aa85d90b6f2dbe5033acdf109200196e225e335e73bf5e0ad4
 DIST pretty_env_logger-0.4.0.crate 8690 BLAKE2B bd6cff07f3a9ad860378cd0bc7d44c1fe9ea346aba2970adfc1f23e6fbd3613f11cf8fb19a401f006ea69e8f05f687636d0ef870c25ccdc97c8b60505e2e0447 SHA512 770de8e256cedfb21fc89cc1ecc564ae1a8e67263705b4234b91867996c4db77ec703b70a46aef6b018c6ce09aab6a232fd1eedf8324c39f119a6807daa534f9
 DIST proc-macro2-1.0.36.crate 41411 BLAKE2B d7d99aed41080b65680736d92dd027e21c9e9e0b03601915c000f5dea8f2b2d9126b116af32f2fb04b4fa407775f0131423055d0b62fdbfe87fa4ba7ec098beb SHA512 f31b0f2356af2746321c4f808ac9af87d21a5657c103ed6bc1383855e40caf49246cc8ec1edff58eacf193424abfc2163148b7298e527714e65e602f14b2e50a
+DIST proc-macro2-1.0.39.crate 41663 BLAKE2B f7d83709efa289ccf12500389c7a4f4f0e32aa686f2d9c47f0da2a5381981e70e45f1b689023891c2543ce633c593a68a629c6414fbb3c2266e4cd99b8660048 SHA512 cd1572831493f83eb51985eed06d8ef5c0ea96ce4231d5ce3be5af9db97e7dd24400332d3b80e0e9c808091fc11889340dd86d8783ff3d9681dc53b876f49a0e
 DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9
 DIST quote-1.0.13.crate 28042 BLAKE2B fd0e1674c073e26732270591a79744daae7d129976dd35586a8e37d607eaab7e4c2d8f466f80646d3669f874bf4fbb648bc75a0e9f1d07c98394f178d55e7609 SHA512 a0a67ce4ff5e7cfc97467505cbdcf8880cd9be40fac8cb7e5bd57ef398fa1201854ec96a51dc4b163552c237ba19300253c8d87bed777d7eecc7e21a36a6ba06
+DIST quote-1.0.18.crate 28911 BLAKE2B 623872402cb185a57e2ffb1bfe4105c49c152c33c44c8054af59df7bb193d14416ea2caa7b28b3f9b9ae6985bec7fc7825bc946e2e41915d2744c887a51559b6 SHA512 3fa537aa96a8970104411471b0e4b7b9339583d552c1d9297737a59ef5301af41da105b92aeace87376e1395e379153f6551bfcfe9c740e6945064426f5f6f84
 DIST radix-heap-0.4.2.crate 9323 BLAKE2B 5d891bd823cd4a564f139457f01a8fe59256f51516265398586ace2077aab9e2ef19d303a8efeebc8849c2255383154d97ab3c5eedacd72dc91945e4012aa04b SHA512 ce80f6abe1d631374aa814830b4e354e4604d8a29b70e3fdc0544d7441fbda9ef3311f5ae55b671c26e543aa54548764c95675b638a8aa060f9047eb077fc715
 DIST rayon-1.5.2.crate 165456 BLAKE2B 0a08064df966422d32f582f44570504bb405c59f35f20fcd792f4aa980b62fbd8797e8e01f01a9c3ec4f87eb3a1557f485a16ca2191749759beb31f4d704f082 SHA512 3c11bd89692af7e245be2c0b26d96e864a6353eb901706fe6394e3ff8bba13a829609d2a086aa69fbf716ca4286a1977123a950080d673814edf6bd55d29d459
+DIST rayon-1.5.3.crate 167246 BLAKE2B bb312c9879fea3cedecb70bff78616eb7fc761e2201d5576d86074f4926dee6266ff6f917cc97a63b6e6daffc33f5d693a5c73daa49724643b93f3b9ac77d8dd SHA512 47909226951c4d6b774880dd308e2633b1582e41e7730ac8af902895578e6f29a9b1bc47debbd9618c5a45f317b4f264480392c8982aa33576deeb9d5f8ffb82
 DIST rayon-core-1.9.2.crate 65221 BLAKE2B 44b1bcf748e0bf19e7341c032eed6ea348f284ff9f834af628baa2484d3b468d6c8c31ed0309e226def441ee7a94e2ad0b9a2adf107493bef1ae27882d93a7ed SHA512 83c17e71e3da636d97ad77b64d988bfaa78addfd0c512f0fc09b1755614dab2a35532a4dcb126fa15da4e62461e59f5683b922a1fb4a5381a629992617d0383f
+DIST rayon-core-1.9.3.crate 65300 BLAKE2B de5700c9def379f6a27ee0ac0667f741913c28ba4d98e95d7ae964c32f13967b4ca160d219b53394985ff4557a11a6ab3c242333e2a6d3790801bdffef3f9153 SHA512 4b852f083766e7e414132840cc8dfef148e15db47967eeedc2ddbff9a4372521c296dd4f66e0b6990f49a8ce88ebed9d44e7ad674df42f96b99b24469b1852a5
 DIST regex-1.5.5.crate 238119 BLAKE2B 175cec668da4321930a070993feb1671e14348b78e8b432f9fa25afd764863ff233b0d1d8931951ff99a3b5bc2e18774f68a6c0a4e31125ffcdb990b5b1b009c SHA512 a5873edc75a64f03be77151c318bc90c7dff565f838d811f5973ebca2e86247efd58830b0a8ba41e372f5a72f5402d93873f8d34c36481fa4359874b2fa5d571
+DIST regex-1.5.6.crate 238593 BLAKE2B d2b200d9d3d8924e7dd7a1f96c769a5bdf01d9bcd358ffb90692c526a81ac6f1a5db8ab0c343b96868ef9d71e78633373744468fe97d281676c84ac795352745 SHA512 43ad2ebe14f43d69c62f563a4fd53b5657f0f2cc130a0e6353a13073027640ff891e9f9b40ea85858507047bddb2e023d668c9bf57f2ba0ae045b74b5f0d2a1f
 DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
+DIST regex-syntax-0.6.26.crate 293912 BLAKE2B b0ea1ea1f87a493c770265a8d9371e3c532bf5ca20330b5946f5c922292d4420ddcfc30105a4ec3c1b154b5a77e55e86987f7edd61ef34c12eb0b4bbcaf23d2b SHA512 46087f5a2abfb48f24da77e79e66f6e514b5d005c4ae2c3283418ec471ddac9e4a1361edbae9d27efeb10217157092f812946b7b98182cf9f8aa703e01c03634
 DIST rpds-0.10.0.crate 67570 BLAKE2B 6728d606f1795668a5aceb44c63f5480d4fa3c5dbd7c84da59138117b240d7fbe7cf050573037b3fd095f9073f4c6db89660b7633fd85238d7c9b8ae76d77f4e SHA512 6f0edf48240be43f373e9f329baa42d32e09ae434e1d6982a5f1ddbd92cc89dae7413877c0e9a53662a6ce6431702dc5ed8bd587fbde711ac413af9fb8253bea
 DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
@@ -52,13 +83,18 @@ DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017a
 DIST static_assertions-1.1.0.crate 18480 BLAKE2B 358dd5ac413d06f62da0388e2016c5fcb8ec68fd7dceb0dbbcb97665c032b7509b7e083c20701648b6a9174485f117c02682ae4bde7ef037e80a85cdf6a0c86e SHA512 46d0e35f77941dee6f60f574c130472248063dc38494c1c4f84f7c048244cc2a58a86fe17c0990e3f0f01406b75ed385a13d00058612b27cf0e867c8d31c92ee
 DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
 DIST syn-1.0.84.crate 235025 BLAKE2B 98fb0ff91c6b103588a12b718445d9cfefced59b2e66fbfff75d44b65f8c411cebb70eaa1bb0e19fbae076c87f179e8ba6231f696ad97a687b58b394c2eaca7c SHA512 c1bfbe6896e8b7e414b2241462aefe9552a5292ba58214e5ee3c70ea54f9cb5d4c77dfc3ebf3b2809bf6fbf297222b4570f2e6e3eb91931cc686d28a58c7dffb
+DIST syn-1.0.95.crate 236676 BLAKE2B a42463accafeda7b69ce1b69b3be5e8131f612e2e0eb1522d85623cc210b8640aa4489b8450e388e87c78a832eafea3b7074af01901df429a4dd8c37a6ee28de SHA512 a03283c628e85debf93a08bf906cfa7764c157176673cc32ed7c74d9dc8a087d83579fb2671bce5ba30f6fc13f504ebf9abe0ea5440194b13f81ff0e5e753aca
 DIST term_size-0.3.2.crate 10917 BLAKE2B 2302faf4cc03e0e40e4b4b0ca79cea5e70caed8087a16f2b985673476041d19ee6908bb17931b453e63a89e33158f7e01875716879964664487fb26395ff7f49 SHA512 7e820ca667f841719e82cf97e90bd2546cdd7ecd4834c68f8eeadd2e530bb13ced1d058ea7beda5db77eabacfaef64b8c3699c482bd912ff570f6ab78149dc88
 DIST termcolor-1.1.2.crate 17287 BLAKE2B 5ff748064c9fb6663befce2fd299edf6a6deb06ea72d21a62d6e77642934cca0933e10340fa84f636631cc08c76ba83ef2284b2212759129d54248e5fccb4c49 SHA512 f37b034345382cd621b1344a3fb301ca3d4d9db8b5858ac1ea82372c983229fce3c0ea8213d6b7e91291b6034affe11e2c3e593dbd95256294ce5c584b33e14c
+DIST termcolor-1.1.3.crate 17242 BLAKE2B 5aef69c0004081bd3cc4d531d13d63627cc02313868c0faab62358d13abfa7b4ba82f142c2801d25a6ae46ecbc8b7bdbeaa21c9105ea3b8950ab6a38cdb88513 SHA512 5838fcbfd70f300cb4b62aab50565db52074c56b152ccc8ac1173e4676c0d5a636271bf5a645a77da6e1d4edbf0091af2cd4dd6d73b85c3d198c760898c06f3a
 DIST terminal_size-0.1.17.crate 9141 BLAKE2B 048d8e8e9dad08aecde12323681d428b9182afb737136cd6699e13d231f7882091c9167cb10a08e5151df912421a6f89132645627e42ccc73d07553cadb1c8cd SHA512 96ec1bc8abd597f01ae59da567036d5d40b422764a4da662e2030c3ef4ce80a983c8b6a4ef1f34d88e649e0b1ea27b206d56a31924bcd2d31ff7e5a2e96d4201
 DIST textwrap-0.15.0.crate 52998 BLAKE2B f6c3057ea6ffde88dd9824cd3159d398316d9d21f327d2af59239ff84d79f893a9d0e96dfbd883aab6c64b631dc99457018e38baf14d40789f02d633425ded86 SHA512 f44271c542c22f17a4e3a459255f95e6c02d999f7d6bc8414d3973fd4ac9353aa4ef436932a45340738126905463d776902715feaa9329371f8a14f14b5a7bfd
 DIST tree-sitter-0.20.6.crate 130955 BLAKE2B e925baa4fb92627b8fecaa9076fac741752f8e015cf2e9b548ca2a3307974c784448dc900a12427a70d1b2c44f22cd1c1c4e1070dc8365e7df3e590ad0b2e0b5 SHA512 b1c7425db2903b889c90cd283ab557ad34d0dead01ec1313571fd537f2b783df88849caf4f253d27c65cd84fc43eeb3c5073e2df876b5a5d716186563b37b92a
+DIST tree_magic_mini-3.0.3.crate 15406 BLAKE2B 84b8761c1496e1d771bb7d884a0afd48d1a457b87db26edc23f0db63aeb5780966f330662e9725570bffb0122b8544a4e0828e48cdf7ebb892d70f43aaa1145f SHA512 6299f42c3286a9a4b38a1503810b0eee302e99cfd386256dde275bd5df402ba6800cf94b4bb94444b011898657d687f89642634d20f6f07e2a7719c27188d684
 DIST typed-arena-2.0.1.crate 11439 BLAKE2B b5bd230a22894c5545966279b40a8493940719fdf79bed144ad41c363e7f73bfd40e1492efa8d96fb9b5b32e3a31405ef9dbddd55d10bb900ac082d41a034b03 SHA512 182fdac0ef9b494fc2966005ece2107a3c53b6eafe4eebe9be3d552aebe143e05f3db2b51693c253831744fc265ec2a557d31ee42cf0ba5991b38d075278415d
+DIST unicode-ident-1.0.0.crate 34224 BLAKE2B 62100357db87b74e44166a70a1d0f911281fc7410571554e9e89c94f3529920d1d43a8cdf3a3bf163c8acb8e9f575e83a024cb94217b84ecddc582751486954e SHA512 ccdad29fc63f71c507cdf276b02a5bb7fad44dffa123bf04d5b1495eb9c26bd7ec42ad6e11717eb10dc6499693047952c6b766c40d7b0696bd011779649d5fc9
 DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
+DIST unicode-xid-0.2.3.crate 15174 BLAKE2B 5cfb2a094047106a45eaeb77ebc1ae2e17ca51ece71082c127d3e2bf36773959f52df1c6df0d0d5cbc40ec4ee7f81820a094fd7ee99f01a2f99a1f7f68317223 SHA512 2adea0c8447c9450be34859f2b2e2b87a61b5e313685da994d21bc24a96dd94088f3320bcdb8d20466a3fdafb0bc0375823f0c28ec0077c9c42a9818f66ac1f5
 DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
@@ -66,4 +102,5 @@ DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST wu-diff-0.1.2.crate 33439 BLAKE2B 78b90ed8a42b3a7a1697f92227edb9f0cb8e74583edf8079b8f85110f6fc049eb68370e93ead3940ae222d108c2f18b7f301e9285968e046d362669a79bbb3ca SHA512 6d93c8854dba66f48f736db3f9e997d11d07a0fef3e13219716e553c0f5936f1d00468b88d9164329cfd195271aa242ec7dfd58560074f1a41e8558719ba5af0
 EBUILD difftastic-0.28.0.ebuild 2148 BLAKE2B a44f10bf53c917b81e755d27b1c804f4790be22f1b52c0d1f9dda127a96c406e4e40596ca1df31875c869a710d776e4ac7f31befea318e1499975294cbc7f01e SHA512 ab85edbd33b1e0af4eec9e5ec8738a2a24e02af51cd2ddcfabe36a088c9b4c22e15ba2432acbf02ebec612962bcb035bf1db964a543cc6dc5e50f9ac6d8064c7
+EBUILD difftastic-0.29.1.ebuild 2288 BLAKE2B 6e8775b5d597500fbed5c72719d2bf8fbe30657df6bb43b27e20afe1a8699a1ef41338201700a5d95506b55d62e38d06acce5c4b8e7073b1428f37c0fc99827d SHA512 1487d5b518cafbf7dcd1ab8aefc664361bb4baea3c7aa0af8254a70d2f4de806cdee9d3cdcc101a6741f1a77da85e983d3719d8c7fb8603ad9b4a7c191b6b495
 MISC metadata.xml 333 BLAKE2B 3ba43124273c8969651c7ff68c86718cf0484850e98b2e5de2b4aaacea67e95609b286c6156dc74cb1fa1201e198f0cb685b9cb1f80a6c81cfb8b712dec96a05 SHA512 0726b7ca030ff47d0a304f30f97671e7274905c9c5187edd61eba9224207430ad1cd98d76ecb4120f8b9d722e628834f7bc3d0a3734ef22f0df48fcb44c6c2b3
diff --git a/dev-util/difftastic/difftastic-0.29.1.ebuild b/dev-util/difftastic/difftastic-0.29.1.ebuild
new file mode 100644
index 000000000000..0878bc1c1c1f
--- /dev/null
+++ b/dev-util/difftastic/difftastic-0.29.1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Auto-Generated by cargo-ebuild 0.5.1
+
+EAPI=8
+
+CRATES="
+	aho-corasick-0.7.18
+	ansi_term-0.12.1
+	archery-0.4.0
+	atty-0.2.14
+	autocfg-1.1.0
+	bitflags-1.3.2
+	bumpalo-3.9.1
+	bytecount-0.6.2
+	cc-1.0.73
+	cfg-if-1.0.0
+	clap-3.1.18
+	clap_lex-0.2.0
+	const_format-0.2.23
+	const_format_proc_macros-0.2.22
+	crossbeam-channel-0.5.4
+	crossbeam-deque-0.8.1
+	crossbeam-epoch-0.9.8
+	crossbeam-utils-0.8.8
+	ctor-0.1.22
+	diff-0.1.12
+	either-1.6.1
+	env_logger-0.7.1
+	fixedbitset-0.4.1
+	fnv-1.0.7
+	hashbrown-0.11.2
+	hermit-abi-0.1.19
+	humantime-1.3.0
+	indexmap-1.7.0
+	itertools-0.10.3
+	lazy_static-1.4.0
+	libc-0.2.126
+	libmimalloc-sys-0.1.24
+	log-0.4.17
+	memchr-2.5.0
+	memoffset-0.6.5
+	mimalloc-0.1.28
+	minimal-lexical-0.2.1
+	nom-7.1.1
+	num_cpus-1.13.1
+	once_cell-1.12.0
+	os_str_bytes-6.0.1
+	output_vt100-0.1.3
+	owo-colors-3.4.0
+	petgraph-0.6.1
+	pretty_assertions-1.2.1
+	pretty_env_logger-0.4.0
+	proc-macro2-1.0.39
+	quick-error-1.2.3
+	quote-1.0.18
+	radix-heap-0.4.2
+	rayon-1.5.3
+	rayon-core-1.9.3
+	regex-1.5.6
+	regex-syntax-0.6.26
+	rpds-0.10.0
+	rustc-hash-1.1.0
+	same-file-1.0.6
+	scopeguard-1.1.0
+	static_assertions-1.1.0
+	strsim-0.10.0
+	syn-1.0.95
+	term_size-0.3.2
+	termcolor-1.1.3
+	terminal_size-0.1.17
+	textwrap-0.15.0
+	tree-sitter-0.20.6
+	tree_magic_mini-3.0.3
+	typed-arena-2.0.1
+	unicode-ident-1.0.0
+	unicode-xid-0.2.3
+	walkdir-2.3.2
+	winapi-0.3.9
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-util-0.1.5
+	winapi-x86_64-pc-windows-gnu-0.4.0
+	wu-diff-0.1.2
+"
+
+inherit cargo
+
+DESCRIPTION="A structural diff that understands syntax"
+# Double check the homepage as the cargo_metadata crate
+# does not provide this value so instead repository is used
+HOMEPAGE="https://github.com/wilfred/difftastic"
+SRC_URI="
+	$(cargo_crate_uris ${CRATES})
+	https://github.com/Wilfred/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+"
+
+# License set may be more restrictive as OR is not respected
+# use cargo-license for a more accurate license picture
+LICENSE="Apache-2.0 MIT MPL-2.0 Unlicense ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+
+QA_FLAGS_IGNORED="usr/bin/difft"
+
+DOCS=(
+	CHANGELOG.md
+	README.md
+	manual/
+)
+
+src_prepare() {
+	rm manual/.gitignore || die
+	default
+}
+
+src_install() {
+	cargo_src_install
+	dodoc -r "${DOCS[@]}"
+}
diff --git a/dev-util/gcovr/Manifest b/dev-util/gcovr/Manifest
index 687c3d072308..1752c0195812 100644
--- a/dev-util/gcovr/Manifest
+++ b/dev-util/gcovr/Manifest
@@ -1,3 +1,5 @@
 DIST gcovr-4.2.tar.gz 222847 BLAKE2B 44864c89b58b526c5afc293168c8af2c9082a99e92f2315485f10430fa5ff959046d189c018e0fa121ff4e9fc3685c13b737c112856c841966052d5fd6c9169a SHA512 bf9e22a58b8390eca391dc8f6ba58c4ca0765e66f18ac6f8d8f80609411df2bab74a846eb179a1aded81b7774fa8a8121bb2d586556aeaf43fd729205b0d0c72
+DIST gcovr-5.1.tar.gz 1676960 BLAKE2B 106c30c7e349f8ffa7a9c52d70e59c32799a8def11986027e3b794ada07fc11ab27b322c377b553f4bb96ca8662bf152eeb7de2d1913381e6068123d2430aa6c SHA512 ae2f0d9ad04f2dc851db9bc99a30a5dc1b1f43dbc6336422ecf5228d37f6994406a83e50f1ee6b5c8d6ec6d7b9e2bba726fd3d502dc5022fe359d480e6d267a5
 EBUILD gcovr-4.2.ebuild 960 BLAKE2B 4864811a5f83e87c1b5acd1c7148d8dad1e48986ccc20aafa3ee1ec61adebb2e3869ac0593dbb41d4a812caba33dcc09134f60406efdfed79e23c88f7062ebbb SHA512 29b855c81c3c3f27aeef82a5e20b47f58803dfcbc96437d9a9632ca61fe6f3e5e176543d67aeef250732fdd3bed809c554d0a8b7f5c6b0e8cacf957fcbc9a593
+EBUILD gcovr-5.1.ebuild 1010 BLAKE2B c19e665d9db7f789c8c296da9d733f26ebd892e1297f016e105f4848d9572e95016ad9729dbfebf3980e5b943e42ef4653eb5b5d71fe1cb97d12ba894ebd53b1 SHA512 90502af6227a1ac3673d3941f2063738e13adeeb433282ac875a1973bdfcbbb50e4ba9a0990d7229347c136060da8007349e5ab807bc932275cb6ea2d05c19ba
 MISC metadata.xml 326 BLAKE2B 0ff392fe3a804fc6d8ea83de983357676a8155dee2fbb5204baf0ead2800210ea30a0171398c71dc60b1d9423a6fd65c0a9032d4511caa459c9b4d4f70ee4132 SHA512 5f5a49bfbbd3d3b77314f7de0c5981a3e700b42733d1c4f6868a7c25d12bb6227ebd254925cbbb6a5d73bf8a0b9f99115d396009d55797e39b53dc43a1a79107
diff --git a/dev-util/gcovr/gcovr-5.1.ebuild b/dev-util/gcovr/gcovr-5.1.ebuild
new file mode 100644
index 000000000000..3d42ed3be468
--- /dev/null
+++ b/dev-util/gcovr/gcovr-5.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7..11} )
+DISTUTILS_IN_SOURCE_BUILD=1
+
+inherit distutils-r1
+
+DESCRIPTION="A Python script for summarizing gcov data"
+HOMEPAGE="https://github.com/gcovr/gcovr"
+SRC_URI="https://github.com/gcovr/gcovr/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+# tests fail on gcc newer than 5.8
+#RESTRICT="test"
+
+distutils_enable_tests pytest
+
+python_test() {
+	distutils_install_for_testing
+
+	local -x PATH="${TEST_DIR}/scripts:${PATH}" \
+		PYTHONPATH="${TEST_DIR}/lib"
+
+	local deselect=(
+		# those tests fail on gcc newer than 5.8
+		# https://github.com/gcovr/gcovr/issues/206
+		gcovr/tests/test_gcovr.py
+	)
+
+	epytest gcovr ${deselect[@]/#/--deselect }
+}
diff --git a/dev-util/geany-plugins/Manifest b/dev-util/geany-plugins/Manifest
index a03710727a98..33f19df93cd1 100644
--- a/dev-util/geany-plugins/Manifest
+++ b/dev-util/geany-plugins/Manifest
@@ -2,5 +2,5 @@ AUX geany-plugins-1.37_use-stdbool.patch 1392 BLAKE2B ff3e64bb921b01cd35943d9fcb
 DIST geany-plugins-1.37.tar.gz 4711239 BLAKE2B 7f4fd121f6f0784aecf2dcc04d208c89e502b23debcbc40889f93c1421e414c33c8634376cfe01e91c370f70818d33b373b88698f5cb0ee23dff5edee9d781cf SHA512 47f8d7170593114c773067a8132c724471cbf881582a0a739da578ca42533783d8ecbccb04e039f2990ceed440bbd2d94e4be4a28e336c7f74b8e11a15ba4ce9
 DIST geany-plugins-1.38.tar.gz 4783970 BLAKE2B 386a05d7136183799059ef6d73b28a0d67d738939b0dc57649ac68f1049104568fe7c8453ebf2144277f60ee0834564b19bf4e756168864f1551962ba2411c14 SHA512 82d04331e23c5d81765b11e081a960a7a17172184cabe94efd2ddb37ac94668349b036e6083f77c867ac650fa7b251ba3970ae26b562b4568d6e313652763339
 EBUILD geany-plugins-1.37-r101.ebuild 2958 BLAKE2B 3603524165c8758bfd9b2a5812fe8a3835ceb77490638c712ba8ac91fdb71f052207024aacfdb889847c5a4e85b4e225d3badede012e2e65c29c3c5b24ebfd38 SHA512 19f06e58c5587a16809ad2557b7a292412e3adee3dbbfc16173545520ae3b7f07e1debdb1eb495b5ac5d4ae3254460956f575c3549402e8487f33274ae2b10db
-EBUILD geany-plugins-1.38-r1.ebuild 2911 BLAKE2B 73eb607cc8a8bc3c744b10d95741c7413e29d92d8bb1b36634ffa859aaef98a852a02b1c20d83abdcbba075fe11e0a1f428d1d1c8ec9363f3a4fc3ee663c28f6 SHA512 ac503041948a9d2ccbff6ac060acf4cb3735a01ee963782a6cc8e7059fc2748c0218efa104bb591324a37d7816ca376a58628473bc49f4dcda5a3edd3eb98089
+EBUILD geany-plugins-1.38-r1.ebuild 2910 BLAKE2B 76181571b98ee1e7296a5f2859aea3b0acb51cda51fb729e670ea9c4d3818377b5d9d54d8399a9af866a0451b82fea5198cc13eb9b233682357b64849a14bbbb SHA512 e7f18ef4f0f9ba326050e9ff48aed4bd3a493be4d71ede5e76da1952c870b78c8c56d1d9cb5401b8fdec0cf0cf2248e11e84cb5aee7f32c266dbe24441460f89
 MISC metadata.xml 1201 BLAKE2B 4ee72164edb11f331607e02bc93f143214ca497d7ef461e6bb621d1dae99d128bc2243ec712707d63a935969bdacc6309ce4edb5d4f30eda08b2827c8674aa79 SHA512 5180861ae35b043f48125ac03dc6f28864f83186c84b6a3b0111da3b264537553ddb296e960dd2bbb8b7626b8bb842e4ff76931837210d39ab885213608ef51a
diff --git a/dev-util/geany-plugins/geany-plugins-1.38-r1.ebuild b/dev-util/geany-plugins/geany-plugins-1.38-r1.ebuild
index 1235abcad0e5..75c0519d993a 100644
--- a/dev-util/geany-plugins/geany-plugins-1.38-r1.ebuild
+++ b/dev-util/geany-plugins/geany-plugins-1.38-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm ppc ppc64 ~sparc x86"
 
 IUSE="ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope soup workbench"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
diff --git a/dev-util/geany/Manifest b/dev-util/geany/Manifest
index 5499f6985ed6..08936f51e5f6 100644
--- a/dev-util/geany/Manifest
+++ b/dev-util/geany/Manifest
@@ -1,6 +1,6 @@
 DIST geany-1.37.1.tar.bz2 4689173 BLAKE2B fe17674294e314204b490d0586bc360229a95348236f48a9d25bb49b0d1face415a11e60925501f22018ad047061521258d90af55d8d250499bbf6a09b02028a SHA512 9dafaa540ba4d37ae66f3cc1c4d9670aa8ea30e74e960f0ad010dcbcd1647d1dc2eea4ae7454f589fc6ec0ded0da2de98d85fecc92d8d1ff36cd62d3255a47f4
 DIST geany-1.38.tar.bz2 4860717 BLAKE2B 3dda3a7454f96be18de95f8dfeb7a6ee2627ffe370879fa3ee7aee851e21fa46076de6b9741b6e83af94b66afa245a0f69237db4582858bc40f819d8a3c78e6e SHA512 5aff0643d0d9e667d0fb526e9c8426cb80c89decf92110683086c2a7a18e0d3d55ab514fdd68aa0c4431c98ae0c4685607b49c620525184c89e21b26fca06699
 EBUILD geany-1.37.1.ebuild 1680 BLAKE2B 565a642939279f39f7ac3894da598afc08c0ec4c68535664f52c7625be8197638d2158f683617d034d32d6ba06bcaa79fff5e770bbe05df7d2c49faa1a87b30f SHA512 a44a768db04b6f1e2f94eaf6e6fc7e9391330ea85bf18741a34efff72c823f5a180d49afe92e040cc7116ecb2c3b773d902fa853fad33cf16c98584cfc5c55a9
-EBUILD geany-1.38.ebuild 1606 BLAKE2B 7aee6f7dee078f6b5993a38ee0555f59e867febd33e8da2ee3789db41b3f67f2dabd0982bea007b9591222f3e24105fcffebb58e1c2bf7205c57765dade984c2 SHA512 acd4b2cdc875a8b6d3df87ed6399bbfcda01294ad3dfd8b8cd9ad13f8e48b3fb9b0aeeb4f943e612fd170a29955d665733b69603670210d9f3c07611d9c84aa4
+EBUILD geany-1.38.ebuild 1605 BLAKE2B 61b37847cda68f05f067812e5d98bd299bc024f720864fd94e712e4f6b6852f9fd1ce5bf9dd2f7810489dc7683cd748d0fc56eee07ddf1cb9a809ef9180905bf SHA512 25822cae5e64b0e175eac51af3effcdc8373860635785107f17e70d6b1d8550898b76c3c95b7e8954c65baf029c9dd237dfb93b86fd7fb6948098c2ff969bf32
 EBUILD geany-9999.ebuild 1610 BLAKE2B 6abc84159775826a0e5b6ee85986fbae208b2c0a83ad3c5f711a92681b716713873f7564abb2dd4fcc929ab337e15a0a5bb9d75bd323986b38261d26aa765a6a SHA512 2d9eb564a87d1a7d797cc8f0ad580c9c4e0db548d0d30599313896628dc694e671aa6bab1189d98e4e260443890f3f7ec3dd4cfecf0238920495e01c09d8595f
 MISC metadata.xml 1979 BLAKE2B f8c9b0a93b7f1aa26aa05d36db0dcd8b77e1ae4472b571a58cf5696866ba27a99bc753bb902b3476f662944d356556132ae3ad15fb947cfb7205153510c819e2 SHA512 04345509acf04bc36dd74ae2fae602c17021374379fe64656059aaaba0482d0ce1da8f3a7e7e5966433aed44cea7e992f4c723c8da0c773887519b28efc93c18
diff --git a/dev-util/geany/geany-1.38.ebuild b/dev-util/geany/geany-1.38.ebuild
index 66fee3d55682..b707976061e6 100644
--- a/dev-util/geany/geany-1.38.ebuild
+++ b/dev-util/geany/geany-1.38.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" = 9999* ]] ; then
 else
 	[[ "${PV}" == *_pre* ]] && inherit autotools
 	SRC_URI="https://download.geany.org/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 fi
 LICENSE="GPL-2+ HPND"
 SLOT="0"
diff --git a/dev-util/hip/Manifest b/dev-util/hip/Manifest
index 7e8ecdf3e126..79b4fb4300bd 100644
--- a/dev-util/hip/Manifest
+++ b/dev-util/hip/Manifest
@@ -10,6 +10,7 @@ AUX hip-4.2.0-config-cmake-in.patch 588 BLAKE2B 98081d4caa593756c966b8eff9e3a306
 AUX hip-4.3.0-hip_vector_types.patch 304 BLAKE2B 2821fb3bc7aa093a2f17fbb8baff8c5d68080f61a8636163d0c69463390f0ff553a0b67aa0a5879edbfd54a6afdae81325a8eaf58fb89cb6168cf6ccc5cc9208 SHA512 6d32cc886229d94b18b9779f30e81bb2e9cf51bd47385dc692ae49dd308de16e229a2fc560e5c40dad15f1c9c75038f13960754e0dbc57b3f281e5dfa6701f6c
 AUX hip-5.0.1-DisableTest.patch 1689 BLAKE2B dd25393370a594abd3cb6fe8abab6481c2c544edb3f84c7b6481501fd5c2cd33970245cb38d148c5218915a67a8c1d24fde14a5a5c47ed809c613ec78b6d25c7 SHA512 6932af7662b067766b6566f858dba9606818757070b642778d559b83052097ee2ecedb1ae0184ab000c7b068b5413201bb5521e0aa3bf090df369139f292306e
 AUX hip-5.0.1-hip_vector_types.patch 312 BLAKE2B fb5a61a73e741e2456c031adc9c2e96fdccb5b88a3d99e6b4d31a9b53897f6ccbb41c9535296b55512055f0581a394289bae31036d3b7c07a8081e88708b9a19 SHA512 2ab41b46baf0f8adcb82f55b7ebfcfa3097159b7317d2609b490c0406ba47728c37531c03b0a4e474d760776cf7b614e32ccab45c769ce2fb8e54fcdffa61f5a
+AUX hipvars-5.0.2.pm 590 BLAKE2B b67de8f86bc53d9fbcd50a9cfa9759feb0145f3b3e40360cc322676411e038ff21b8f81265ba27d099e51c3dc55230f87c477cbadfba2b48c08978216f2fbd81 SHA512 0becd625e6f34d687338e25ca4697e68a735a1df60a4c2c53f577e7999a34bc07041f513632f9534aa4b35da2cf50b02c96187f69fd183bff893343257aa85b9
 AUX hipvars.pm 598 BLAKE2B 1645b12179195b95757d207248c85b7c8d9eda0347caee5cb48bdc66e85fda517f607bcb69cdfc63657a0db04ad8e96494a0a80268df7c17d6bb0e689325c2e8 SHA512 6c4e71455341673a329b4b0163fefd7f2f4b7d62da3496643d0de096755899c99b3b5a80fffbdf29896c234cb4f617b368217f4eecfd005849b294ff434b79c6
 DIST 5.0.2-update-header.patch.gz 5136 BLAKE2B 290b9e250e3004a1147ad28606d7d205078affbd809c6a429744767ebabf35bd8df6395dc135984d345ae2f23fa457dcb2524bcbf31c5bf16903d3ee2007bf5d SHA512 41b1025c403e874026a712ec6f6571c873203b08ddadf68848f6d1f63924c21b206677b330f79edad2c4b85e2ba5053b1d33f70c7c09ff9c17bc5905b849da0c
 DIST rocclr-5.0.2.tar.gz 853965 BLAKE2B a0d568eb3b230845970d8256a5a2f32018e4b9fb68e0f1aa13a1f3fc953e614025315b90cbe68c107f7150cf91b4b1ea438455429062c7dc06ef77d65dedd2ec SHA512 b30a57c09973d8ef624511f422babaf9722685b9f85643783aebc000671b41fd54f44b308cece0baab187e1ee00b10335c6d22b6bad6fb3468abe6ef0da97d73
@@ -30,5 +31,5 @@ EBUILD hip-4.2.0.ebuild 3634 BLAKE2B 6ab4a5d74b08a2dd765bae85bb91fa7174cb0fbe411
 EBUILD hip-4.3.0-r1.ebuild 3782 BLAKE2B b3f7e96b664662e9cdae955993251af254cd44f66e9a4306035875eaed8f507badca6c357bf4fa82e93e76eefdbdf7923de5f56a9eeee762c7ba364abff2b1e7 SHA512 97f34852764c8810eb093ee2aa09f3484382f5a0af5f21543020138bcd8cc40838480a03b1ea88be8044bca71500bf746ed768749e6c71e939b8438f569bd8cb
 EBUILD hip-4.3.0-r2.ebuild 3978 BLAKE2B 16ffbeddfdd5c6d0338e5be1fd609272bb4d00e1a5d1530a00a75d82a5882f52fc0bfd97b14bf9042affa4af4617507a5cd1b8d8f90a1f4c8744028ab63b7f38 SHA512 e664a11e69cc4a7629a8f088992d2e26517635d1f4e685d8dac69e74e6f94e8c1f782f09d0f54308b73c134021579a624bfa2ba8ecac3c470ab81cb317dcb67a
 EBUILD hip-4.3.0.ebuild 3761 BLAKE2B 7fdd7e65a7b1b246ad94a1e5ee37e7c3199f9dcc02df575e774fdbacf9690ac7609f53c122eff5dd87cddf9afd9c4f52d66a5502b3ec311fd6e9db5f3889a895 SHA512 07d8317cae9f7b2f4c179938477eb00ff8d0a136c730bd18582a835c23a8d9934d03824c2bb520c53cb1c2525e26618236b12dfcbfe520612a60c191a1d2947b
-EBUILD hip-5.0.2.ebuild 4404 BLAKE2B 325bd471effb9762f5498e433417f5825dcfb249d57989435f4cbb876d432c964958e6cc811b0ff6d9b1376138f537ac0c180d72582e61cde38843a86ee5d4a8 SHA512 c2241888800b9cacd4abd58a9bb5cdb23d3534bb4f7b89678c371e73283f95323a08e071d8825d62c9050888632bab7015266ee94ea3ed95bec5936199a70338
+EBUILD hip-5.0.2-r1.ebuild 4420 BLAKE2B fa07d665c9ca825c550fedfbd924d6b03d56fb599141613224effcc4849adac06fd8852d56453982ef93ec543a161186205db5b0a54da6f3d9fd9768dcdc919d SHA512 1677c4d47c8ab94c514017512e34685896914fe4afd63cadfce6336b8b806075232e706fcec54d0eaebe58ef0130cd702b9cbfa292a4ee2ab075a92df0840c32
 MISC metadata.xml 597 BLAKE2B cca1b105463e26741aa4bf95c9d85dd582df075795646f633ed5f0d39bace0b07be98f771aa8eb1b89984788249837303b67617e92c4076eb7601611cd2abf6d SHA512 42767156ae0e89b3ce438bfb163161b543e15114838a5c14b4b1c889fe799e44dd9bf9684ee685798a1fc5d2d4c520d3c42c9c74a88178a079ccb634148e0738
diff --git a/dev-util/hip/files/hipvars-5.0.2.pm b/dev-util/hip/files/hipvars-5.0.2.pm
new file mode 100644
index 000000000000..88d3c27bab99
--- /dev/null
+++ b/dev-util/hip/files/hipvars-5.0.2.pm
@@ -0,0 +1,20 @@
+#!/usr/bin/perl -w
+package hipvars;
+
+$HIP_BASE_VERSION_MAJOR = "@HIP_BASE_VERSION_MAJOR@";
+$HIP_BASE_VERSION_MINOR = "@HIP_BASE_VERSION_MINOR@";
+
+$isWindows = 0;
+$HIP_PATH='/usr';
+$ROCM_PATH='/usr';
+$CUDA_PATH='/opt/cuda';
+$HSA_PATH='/usr';
+$HIP_CLANG_PATH='/usr/lib/llvm/roc/bin';
+$HIP_ROCCLR_HOME=$HIP_PATH;
+$HIP_PLATFORM='amd';
+$HIP_COMPILER = "clang";
+$HIP_RUNTIME = "rocclr";
+$HIP_VERSION_MAJOR = $HIP_BASE_VERSION_MAJOR;
+$HIP_VERSION_MINOR = $HIP_BASE_VERSION_MINOR;
+$HIP_VERSION_PATCH = "@HIP_VERSION_PATCH@";
+$HIP_VERSION="$HIP_VERSION_MAJOR.$HIP_VERSION_MINOR.$HIP_VERSION_PATCH";
diff --git a/dev-util/hip/hip-5.0.2.ebuild b/dev-util/hip/hip-5.0.2-r1.ebuild
similarity index 97%
rename from dev-util/hip/hip-5.0.2.ebuild
rename to dev-util/hip/hip-5.0.2-r1.ebuild
index e3438bc87ea4..771cda985e88 100644
--- a/dev-util/hip/hip-5.0.2.ebuild
+++ b/dev-util/hip/hip-5.0.2-r1.ebuild
@@ -79,7 +79,7 @@ src_prepare() {
 	hprefixify $(grep -rl --exclude-dir=build/ "/usr" "${S}")
 	hprefixify $(grep -rl --exclude-dir=build/ "/usr" "${HIP_S}")
 
-	cp "$(prefixify_ro "${FILESDIR}"/hipvars.pm)" bin/ || die "failed to replace hipvars.pm"
+	cp "$(prefixify_ro "${FILESDIR}"/hipvars-5.0.2.pm)" bin/hipvars.pm || die "failed to replace hipvars.pm"
 	sed -e "s,@HIP_BASE_VERSION_MAJOR@,$(ver_cut 1)," -e "s,@HIP_BASE_VERSION_MINOR@,$(ver_cut 2)," \
 		-e "s,@HIP_VERSION_PATCH@,$(ver_cut 3)," -i bin/hipvars.pm || die
 }
diff --git a/dev-util/kernelshark/Manifest b/dev-util/kernelshark/Manifest
index 58cb18e99b87..ec4a9286fbe6 100644
--- a/dev-util/kernelshark/Manifest
+++ b/dev-util/kernelshark/Manifest
@@ -1,5 +1,9 @@
 AUX kernelshark-1.2-build.patch 1619 BLAKE2B 14d7d2d949c4d738470c1f0102a72617400a3bd01718d3cd580cbac88588b268ce57b06cbe7052648e27241aa5904681a01817067785d9313eecfd4747af2027 SHA512 6f7ba465cf3c449c590b684c67302d35ef8332e4fcbe77763003c40502d26ca3078613e68232314f407f5e0185c42faad6f559efead0b337a6b065cc4503cd36
 AUX kernelshark-1.2-desktop-version.patch 196 BLAKE2B 6800b889e03902caf27a73c6358180499bf7a1051fe19af38c90aa5ea38e4230eb3a4670fcb2a8fc6b54afea371c3b3f689b06ee51f1596e14450615256c7708 SHA512 58331560d558b4fb4bbd50a24fb0cfce6b50b73cfe8481449e5d4a87836d3d2be8bd1a7f5453e8b28d87f1657b426d0453ebcefa78f97b8da44e1ed7ee8fd629
+AUX kernelshark-2.1.0-fix-desktop-version.patch 287 BLAKE2B 1bc518523d6c49d642335479b28295bab333486ecf128614a98d37e64924beb5275c7804cbb8de792e12a238e392d0bf2462a39ec6a0e044497648fc2e29909f SHA512 e6edbf73b1889e7ec21c969ae1f49f82882f619b933606ee4b8c4e5f02aa98baffdbcea4bdd716aadeb4d7264f0ee5ae68d1c4f2e25808832c9b8df8a4fd2797
+AUX kernelshark-2.1.0-no-ldconfig.patch 583 BLAKE2B 38cebadb90970f34644915a074cc14867e495e44df35714131d7bd302029dc80b79645f443b5d1f0b6228860535848de60a8930ed94b0c54aeb09f0a606a2539 SHA512 60031ff80c80c7f533c59dd997128ef23091bb693473d2177d2731705e3bd5e516027c424020dfe9f8aa8613d62e8477745f27f187eb5a3b84ccf7d31947cc4c
 DIST kernelshark-1.2.tar.gz 4298175 BLAKE2B 2ebe70c2b7c0691b65b0251027f1c558fc2fc5ef9bf61512d3ddd554fbb6ec349e36fca4dd0060c6b7db49eca0ec81a2f1296d635459b91883e54e77146ea3ae SHA512 059ac0ced71fa00de34c30ece433430f1e2fc36acb1b3a3f15cb84ce74d7a4f115e4ee8fbf9a256d5a731050aee02823a90a024dca4b4f6a17061652b871b935
+DIST kernelshark-2.1.0.tar.gz 4098666 BLAKE2B 2798626c598ec2464f018b5808a6da460a552920c373dbf1eaba5d243e2f150da2a9a25668f8cb27e2ddc7dc286d4d5215d942893456de9339a63bde0e4d7381 SHA512 4b463cf06a919d67fa38ada8221e4702e2fac725d917e7abd12e1d69880ba964881ac549caf90bd7cb22edea4f28d7937494a05f75218f16fe2edcdff7161c3e
 EBUILD kernelshark-1.2.ebuild 1256 BLAKE2B b7f5ce31272a8034fea5ecd17e259112d0b0b310e221c861529b5cef6e4a87532c6eb574938534e656171bc703eb546d1a4c60c40b0269f225acd9f7d5aa1b48 SHA512 4a85706ac373a672ed577ef0960583ba9010e2ebe801616a3829344322e1c4efd8882f15efab28aab138191196b4e0564a5d0c01dcec32232c73e04cc53e67e0
+EBUILD kernelshark-2.1.0.ebuild 1334 BLAKE2B 36da94dd1146aa980b1bcf06a434e1070e8f1252b3c086d02cfb44985c7324b334510d03e147c0288dde74cb1c22616e616a417859f02b53f3b0a993fe7dcfde SHA512 d9ad05f7c7dff38233ecd71745ca0369508f8928a19690dfcfa9c00b0fd3359954d85b9c6643787d7ce68bc841375c6facc17456ee12b063bc53e92761d5e928
 MISC metadata.xml 410 BLAKE2B 48b6f70e304fd3acde7e9b2f940b0a0d7f39ae36b0779c7e9335f456fa2ff52cfc87fa095ffed6eb918f4fba2e9132d9d496a1bfe63e12a5a7b56ef008e2674e SHA512 ee0b11f53d3f11a4f64225f7a1bfd30052c768ce3512c1a810411404a4b65590b80225ecb1b9cc3627fc80cf317ca2ecfea3e071436126467314bead2675cc68
diff --git a/dev-util/kernelshark/files/kernelshark-2.1.0-fix-desktop-version.patch b/dev-util/kernelshark/files/kernelshark-2.1.0-fix-desktop-version.patch
new file mode 100644
index 000000000000..a6a93be0ea0d
--- /dev/null
+++ b/dev-util/kernelshark/files/kernelshark-2.1.0-fix-desktop-version.patch
@@ -0,0 +1,11 @@
+diff --git a/build/ks.desktop.cmake b/build/ks.desktop.cmake
+index 2b02c0d..9765e61 100644
+--- a/build/ks.desktop.cmake
++++ b/build/ks.desktop.cmake
+@@ -1,5 +1,5 @@
+ [Desktop Entry]
+-Version=@KS_VERSION_STRING@
++Version=1.0
+ Type=Application
+ Name=Kernel Shark
+ GenericName=Kernel Shark
diff --git a/dev-util/kernelshark/files/kernelshark-2.1.0-no-ldconfig.patch b/dev-util/kernelshark/files/kernelshark-2.1.0-no-ldconfig.patch
new file mode 100644
index 000000000000..7a7ea5bd435e
--- /dev/null
+++ b/dev-util/kernelshark/files/kernelshark-2.1.0-no-ldconfig.patch
@@ -0,0 +1,16 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 9e0b4ae..732c14a 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -46,11 +46,6 @@ install(FILES "${KS_DIR}/libkshark.pc"
+         DESTINATION ${PKG_CONGIG_DIR}
+             COMPONENT                 libkshark-devel)
+ 
+-install(CODE "message(\"-- Executing: ldconfig ${_LIBDIR}\")
+-              execute_process(COMMAND bash \"-c\" \"ldconfig ${_INSTALL_PREFIX}\"
+-                              ECHO_ERROR_VARIABLE)"
+-        COMPONENT libkshark-devel)
+-
+ if (OPENGL_FOUND)
+ 
+     message(STATUS "libkshark-plot")
diff --git a/dev-util/kernelshark/kernelshark-2.1.0.ebuild b/dev-util/kernelshark/kernelshark-2.1.0.ebuild
new file mode 100644
index 000000000000..ddf6b441a088
--- /dev/null
+++ b/dev-util/kernelshark/kernelshark-2.1.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic cmake
+
+DESCRIPTION="Graphical reader for trace-cmd output"
+HOMEPAGE="https://kernelshark.org/"
+
+if [[ ${PV} =~ [9]{4,} ]]; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/kernel-shark.git/"
+	inherit git-r3
+	S="${WORKDIR}/${P}/kernel-shark"
+
+else
+	MY_P="kernel-shark-${PN}-v${PV}"
+	SRC_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/kernel-shark.git/snapshot/${MY_P}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE="custom-optimization doc"
+
+DEPEND="
+	>=dev-util/trace-cmd-3.0.2
+	dev-libs/json-c:=
+	dev-qt/qtcore:5=
+	dev-qt/qtnetwork:5=
+	dev-qt/qtwidgets:5=
+	>=media-libs/freeglut-3.0.0:=
+	x11-libs/libXmu:=
+	x11-libs/libXi:=
+	>=dev-libs/libtracefs-1.3
+	>=dev-libs/libtraceevent-1.5
+	media-fonts/freefont
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	doc? (
+		media-gfx/graphviz
+		app-doc/doxygen
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-no-ldconfig.patch
+	"${FILESDIR}"/${P}-fix-desktop-version.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-D_INSTALL_PREFIX="${EPREFIX}/usr"
+		-D_LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+		-D_DOXYGEN_DOC=$(usex doc)
+	)
+	use custom-optimization || replace-flags -O? -O3
+	cmake_src_configure
+}
diff --git a/dev-util/maturin/Manifest b/dev-util/maturin/Manifest
index 64f24304388c..72bc1a2042b8 100644
--- a/dev-util/maturin/Manifest
+++ b/dev-util/maturin/Manifest
@@ -34,10 +34,10 @@ DIST cargo-platform-0.1.2.crate 11645 BLAKE2B 7770acb90e299f71c60bbadceaf894a310
 DIST cargo-xwin-0.8.5.crate 25263 BLAKE2B b2a7574009838ce255f807cf8e568bb3cc7a78906c21b57f3698c74829191da8e09afc39a7ab824a5036569a6c1b321105a56ac3c6da63034e0621b1274a6549 SHA512 23195a622e3de5ccc6a06d2e72b80b519b3d9c302b7c652da150cbfd3c382b5129ec55892e12a60f3dfa6dd089eb74933efbe539bd4becdaad0c613f10ea5880
 DIST cargo-xwin-0.8.7.crate 25282 BLAKE2B f38bcdcec890cbeb3a7f1d73bdcdfcc0e3c497adea64926899b5aac075687ad36f52a29983e6d580a28bd0fd4ff9e14f2b88eaa0efb5df7b04db0f74f952ea98 SHA512 8c86564c8f88ee7238d28c2c3dd680a301e6fba65bfccd11364b0d603a5446d4e850048cbed475912fb4be3e4c677f8cadc6201d0a6a6541e8034873fb657702
 DIST cargo-zigbuild-0.8.7.crate 24298 BLAKE2B 6494498df507125456b9dca7688710404ab92f88c9b5ec5caec072fdb65ec22216f2244d995a3509a9b839f247b1c062df42ef378c8161ead7dce99da0cda565 SHA512 0e911033c425327bad4115ba4b7cf26f8f31f7ceba82f08d382075df16575a49e01b0cdaddbcf3c21e4e9dfc99ef9dba1cb8cfa5f462090bfa1af27f12bc5e38
-DIST cargo-zigbuild-0.8.8.crate 24427 BLAKE2B 20e06c2c123dd86bcd04361f38a2f2b505c73f8fcb717cb2e6ed501ba7135f29cf561bbda9cdaa3554beac7586ec83183a8f77ecbcf6ae637ac03b3fb0d25e0c SHA512 6f54342ab135b090acfaf08caa47f709d25f2773225fe79381f1ce0df43bd39892d67c15f82e3f90e2289ce1c75da43b7d46fc27acf8229af784737804eb1e3b
 DIST cargo-zigbuild-0.9.0.crate 24926 BLAKE2B 91b2bfe9a59f1749da54ec73602af29420fc4dfd885c845463a08b493c724261e241b3f5006e2790b45a1a0297dd8a2db33111a60033280c71a34700b135ae77 SHA512 8eeff655568676a88cf3b058131511d1b58d7967d75dccefb0464633df1e178dc15e6e8fde20935d13e899a86815bcace3acdce2b3e85533804a29905be1d777
 DIST cargo_metadata-0.14.2.crate 17469 BLAKE2B 4e64bff7710c51d95944faac60b4881b5a43d5edd07ef87c8f4b9826e63dd708719cab27542fdf82cfe869d8781c1a6918a050aa0de71086316bd2f480aad947 SHA512 16e6bb3ddcfd4c6d48ba3415780518428f771c393ffe10ce15e1f3c026a6f3bf40ea9f25214049841b1d7d51f2208ed032961a75cb641c5afc52e02cb84d3262
 DIST cbindgen-0.23.0.crate 188128 BLAKE2B cca6830ad99538e4e6697ab5fe6b6d36c96efbb33a9e971cf54923f0da327bdedbcae73d388fe522bf0e090b9b90041d6e32f5b083402590ba3de858bcdc6d10 SHA512 d7218e55526abfb226df524e634a72060de752eafe5b7f5c60bb746e2c4b105040455cfa16859e6b231c07cdf0256bbd608fe1afbec35fabe2f961927c19d04c
+DIST cbindgen-0.24.3.crate 195698 BLAKE2B f5c65e9c77a7c2f98a44382a6e4b852071b70bd832a3da3220bb8a7c4729a44b5964e651cd63577f555c5bf4e6594b1148a5afd96dc1d3f599b2fd1d523b54d4 SHA512 3a39be67a87aa7a4dd9baaf6b803215f4587bd7925c4315c5ec93954e021471919fa977ad2084f099c606daa392350de3557bba56cef77806def99c40318ef05
 DIST cc-1.0.73.crate 57880 BLAKE2B be8d7a25a54afdd759844e76aec61526fc2bd5ca09480e6cdd3bdcf27e5f9d3a88dc16cbcbf54cd021470a7cc521e1ad468116c112bbd30752bac0d5486939ac SHA512 980f012b90c6410144f6de4995048337e09214f19603076db6d4edb88e9ef9ac9e8c6e25569f66c2be3a47e99298f5886dafc102e1a9122316179aa26bc1c985
 DIST cfb-0.7.0.crate 62356 BLAKE2B 108d4a20d436b84963f972335988dda39949d72c8f096177eb88bcb929f0873c3ec8346bf8e606913799ffd0882901f8721b753714ca49ad307a1ee788fbe0b9 SHA512 f1c3dec790377bac4cd0ba1d017a0cab951395ec6e1314bbacbe44e61b3fccd58ca97f81c5f284552561edb69023a4e8b79bcf5aa1f6b3aad1bc677a34ffcb4f
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
@@ -46,10 +46,15 @@ DIST charset-0.1.3.crate 14330 BLAKE2B 928771e37cc4f86f49cf09b671cc016cb66227579
 DIST chunked_transfer-1.4.0.crate 9238 BLAKE2B b29737023c78041fa1166d56bb5fb7be2e502b06c56b0fe127c1ec2eaaf3ebdbf9bfdc8645d7234dc17703706529406072b90fb06a15df482b1065044d3dd4c4 SHA512 b3891bc1b101677c2ae6bbac19e74f5ad0aee7b499b0a339b78fa0af7150b2ae0b2151d640bd2a7c4d052a12cf935d16e04db3d37d0048ec1d79a9ff01f13389
 DIST cipher-0.2.5.crate 13099 BLAKE2B a728a53007340dcc55da52cc170e5b801c8ad20c4e159d31200d5ab7f8bf4407af9a60713b4385ef0d65c06cc81692cfbd7339cb7449367d1eaf7c529ca34373 SHA512 e55627f5424d9b566dfb0787eebb1fb17ae98b4016c9091e87040ed37b36e0256b7681958a0d90aaf06c125c71123270bf986128ca1e0dc125f3162a868848b9
 DIST clap-3.1.18.crate 209664 BLAKE2B 97b499c2909045fe25ed77a22d55f32085e85876e18f00fc23f19fec5e87e1d1a7a9b1c6ac4c44cb6cd4a1fe7647effc9825be0621bd088b17a421ec6e738c0d SHA512 bd06202304e04cdbe12e7532ff9f112e0cd3c8fbab00232149eaf9f296acc308b18d2a7e7926c22f1c39db92a2af140b39eeb7affeb30226d9a9cd73dff41b39
+DIST clap-3.2.4.crate 208372 BLAKE2B 5cbf38ab3a7022ad02efeb535675a6813bc0cc81e966be0968d50a044053dc6436eab105d45f45df205d903592d6ede4cb49528d05233c2b6d01ebb4310e518a SHA512 88998d5121a558ceefed5ed70a53f7760cc8f017d2f0c8c26c42e467ba1765d75f036600c4d764f8161c50744768bb3d9d21df6836deac043e5b5d61d516eeb0
 DIST clap_complete-3.1.4.crate 31223 BLAKE2B ee08809da96889594fcd7f85a63ef9c4ba9bfae3feb5b7b7c491c39712b2b1d2e98e734ed4b138f919535ddcfb20cc093602cc1587ec58d97a62fe008e86714a SHA512 3a76e4e94090c8fceebdaed4e6674ab8af2e5282c72e19643998e55dcc8e07298153baf67b4bfa430ef814c92a3c3b8513d2c857eaddc7a586693bd3a9d2b1ec
+DIST clap_complete-3.2.1.crate 31543 BLAKE2B 3e4e83f52d056736851bf8db7376943f0f43955d8e7d32e66f7c1e2b8ee1cc7ec24740c1c1bc7aba2ac3159aba70a3ea07bb154bf551d2f08b1463521b2bedc4 SHA512 75a42ce30a5661a75763373381477862157161b01c0972c80c01d6610f3fd9f20ac167aa55921557e574d2d895b614ba5c780780562b46aaa31fdb487ac11127
 DIST clap_complete_fig-3.1.5.crate 9919 BLAKE2B 7f817bd2a2046c9d2dd3d38c5202a6334cd10b7656e94d5e217f8e3b66c5d1d0a0fb96e6ab58c39cf0165f533b43aa54821b4bbd77bb8a8b36e8ab1fa2ad9e18 SHA512 93ff5ef5e21e5575ac2cef2e33ee3d005b17d5d6849493b282f956ae65dd8f7245fbcfdda0a76bc10a0ab038b89a136833771761d4e64715fa4f68e8cdf568a0
+DIST clap_complete_fig-3.2.1.crate 10106 BLAKE2B 74a9d4c3027afbdd61294e7ded25317b6b4b1d78a12b1f16d03ef2860c262c6dcf5f65670f752fa490eefd9da1d0b934c1989120f6e4bdd7cb966016028098d7 SHA512 cd2aa876ef54de086dd68f1c389a0e2f2ef3b8cc7b6ad56e231ac34e87936eec906ac1b6ca552f9a7bda272084ce6468c543e7d4359bab5b3e3bf7e84ef268fb
 DIST clap_derive-3.1.18.crate 25521 BLAKE2B 4c46e0793bc945d9ebfd7ba104264a8cd7c92782c24a9116a8cbf92696476adbe6d5059ee0c220bf71c297bd66f976b91ab95ca75d4ba56714a2824ca7e1af7b SHA512 9bf92e45de15bdfe1ca9a1363f1d243b8df1e5e7d957d6240fa351387b362ef91dc9acffea7256c2161ae8472e35ee2cd678c0bee1f9a27771ae9f4f3f71b351
+DIST clap_derive-3.2.4.crate 27646 BLAKE2B 3ca6cd0b3b5d35bf3eba6aef4235dfb94c977fee1a5f11506272432b85917193b688de97daa134fe2e85c7a5c736dd67a0f09a17343dea3a4796c55ddc97133f SHA512 f2c2fed1656ac7a81b86e2cf8b4925864476b687b935b1c2b69bec9466403d4f80d98f19cb16cfafdd98ea0289a1256f4b500c954085bd8be584f4f24804a5b1
 DIST clap_lex-0.2.0.crate 9581 BLAKE2B 47bef7e0b35c7a934deeb2821f0a552e05eaeeb68bbcdb82a013cd3b74f2cc42736207a394b9be8c46b3d253dac41dc22e96e1e2ccd09cc416743f22cbf78891 SHA512 d4acd8e2b8d1d19214fde1f0f21f0e0a755cb44e326893bc65350d742c2e260bda61f0abce5fdcb08fc5c4c835d0419cb02452d9f6a85cffa2b5dc7c4bc1e962
+DIST clap_lex-0.2.2.crate 9657 BLAKE2B 74f6ed5c674664f0b81eb6d61427c0bd4bb2a2e7159aa00c2839a32e360f41fdf388c1455b52658a97900bb1b8d729bdd4f00cc5313e3115234e65a0704ed3fd SHA512 ea1d37bfb29412409db06c1991413dfbb83e393d74c3cdeca80ff317a423f41891510f6ed471f7cb7dd97288393726b14645287ae59cdf7be41f3a1bc9a3991e
 DIST cli-table-0.4.7.crate 13195 BLAKE2B 498e7434639a4bf21f4b793def59e2f045f8353eb2e12ccbf8778a0a92196ed589ddd94e696a000fa7a2bd50470624f2972eb613cba538956e50c6ecaebc1b53 SHA512 2696d3204107f2bf104312fa1e13a92638fe9ea1894263cf707cfe3891ec083499b1b0594d8571169ca242abd6a41396a88ca41dae8a3ce7f04365292158a87b
 DIST combine-4.6.4.crate 132144 BLAKE2B 9d6b513adc63b49888dc33444e3db2c0c4b950a6c4e30ff17e0bbf4b3bb39fbd679cd31ce7e584a1bedca69868606a13c0e3bd0a136a1fca1dbcdb516452d34e SHA512 2550aba009b8ab66230e7b21fd1cb5085c92bc280e31f35c9b02dc78fa138ef9b9ece0d7801473b88d11866b013c6fa3bb6e9611bdc1a7b85144e50a49829774
 DIST concurrent-queue-1.2.2.crate 15859 BLAKE2B 97eb49d7f6270999f24d37e7a3967c0abcbf584637388c4507f89fd5284120759c9845219c463cf066f6568191b874fefddd7edee9292ed02183123161074514 SHA512 84e348dc3d40c73c11c54ecd0f1e6cf7fd6c7033f4723a428ed1c09bc9548cf317a0d8182144b689cb9781190b9c8ce4374717012eccee54a11ed0869dee10fc
@@ -108,10 +113,13 @@ DIST futures-task-0.3.21.crate 11815 BLAKE2B ec3f2e2c025e9a482d86912099e68722099
 DIST futures-util-0.3.21.crate 153768 BLAKE2B b3bc5632bbc7616d33f74361d68f83e0cb051125475101c84212ea2bd03307e927cd125e2f93eeb0f84946cc45d3964a590dcbfcfff88d3ce1970f127e71aed3 SHA512 ff952fb74a54e793de943e3aee2ac771357bf9f1aa5de89af128868c46a6b44e414fc4ea97f2d9b201ff7ff41023e119f1adf90d314343ff53ab987c3e07f5d4
 DIST generic-array-0.14.5.crate 28915 BLAKE2B 0a8c7f20ec91d218fad8a9a87b0700564744ccbdc2f1eb84bc363fd55e86a5ad68c68e446b100752238d45abd7c005f1994bc26e079270d42635c6e296e96f29 SHA512 30c86b24222503245b494c5f88cdf8115ba08c73df55930bb01bafcea22560f4d20e38c348c3896d6e1ef03209cc1571745881b4a77fd28f66b0cc435f5249a2
 DIST getrandom-0.2.6.crate 28043 BLAKE2B b9871b18389f6e5503b3b817baa37dc585eec980851114b3407f34d25bbf68fd70e8bdef60ab682967a1397cb9659b343312deee740aa2107bbf38d1f4629d60 SHA512 3fca26198bbab1a9e189fb45ad6cc7c7a18969eed6f68ca43407a2d463fe004955b1d199c1794a23a53ba21fedb61eff86d380d2bf49bfdb6c7055c11d543096
+DIST getrandom-0.2.7.crate 28854 BLAKE2B 30c054361c9b1d9f95bc505e27e98d8cbb685f37c91437948d9d26f22028e0797a7c704d88912c1648b3704bfe10623a8c5e130e81746c8f85848b831771db80 SHA512 01803e609848662ad8650cf451dfc2c37580da0b7b5e0d4cc764da6ded253cf49ae42a433b1c53e89773bde00c1ccc136394e58ed4548e7b5c0ca7e202e857e1
 DIST gimli-0.26.1.crate 716168 BLAKE2B c138e890457e8724295cc8996f8e60f1f4d3eed46c865dc7ff2379c65e8d470080953eee70718867b73524f57d54d4a91b5d5ba74d79bd3da38084a880f3fed6 SHA512 c341354e13a78c4afeb651a0ed651f60d188957216ba51079512531ab1273b1b79c86c57e904b87064015f8e7efe4280d9edd4acf90e25fb29f8813a4c7bf9a9
 DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
 DIST globset-0.4.8.crate 22886 BLAKE2B 726fceb279ef00589ebd6f77bbbe0642a22a9852a12ac9d14139af679ef2af0a68bb90f51f9cbb08d44190eafc35145df72ea3ff2f346d23cf22e428c887bb42 SHA512 1a1fb9731d310ced63742b2c6f7ef7f414c89780751d9881859a6e6fbc512e91bc23c91e3743bb36114dcef6dc1962fd376d67bc536752ba6a8a2fda7aa80bec
+DIST globset-0.4.9.crate 22929 BLAKE2B 91dfaeb99a3f6f40a5a025ad8527c91770545487324e191801eedb6f916739b5efe687d84a43eb8b712cd181d98d3ab17b839f30c19e0da041b4c34d9286089f SHA512 66841495098b028b8d294c0832276b8864760df3a16b93b57222037c351591ac7773a99a65b85a20c438fbfc04c56ea4901188cb18ed470d3481eeef29eab708
 DIST goblin-0.5.1.crate 156923 BLAKE2B e71e22f276ebddc164ff326a2d819a3d208c3e449b0667b8b374a4810710eb5d8857280fcad2602b36b949bc634ecfc59ae01248626c2e5f6b21fa236345db22 SHA512 0bc3cf899adf42906664697503cb4633cd2af13a91a0eee85e353a6247b1874745f1f77fd1b4c5aea4bf78c6a94adb01bedb1c5b79604b06378d9a485c9fe346
+DIST goblin-0.5.2.crate 158017 BLAKE2B b590ffbbc10430f470410a784934a8c14525055ee922074ba7ef19dd1a3326e9b42fee3c20b2e1d6257719df7574397f188373abd29ac7ef6125fb0c4cdd0b1a SHA512 e061cdef41c0c6896c8e9842b33090c4bb2b8760e27f73b2a4d680c5e68aab272d977f5cfea4fd528af5d42366f5047623d64e41f9a6b42203dff2521b3c68f8
 DIST hashbrown-0.11.2.crate 85713 BLAKE2B 402f9f1bdcb92631206f9b72923ee35e28db8623e87469c0f1496664bc7185077013ab3c8aea68268241e5b2504f10cddc613a350abd4291050deda6c112e559 SHA512 c21ca68fd49bbb741901f59fed04cc124b8da99e2a4dfc26e2e5e1140637872b344612a01691bd30cc771575c571be15f756c84dde225441699cd2322af2ad6c
 DIST heck-0.4.0.crate 11161 BLAKE2B 13b8bc39cf3ab90e71433e3c7b3e5f1c19404bec58dc4298dca05d94d5c14c2fc97350de737cb78aa45196b1241aa8f1ccf3a11ca309da5fe0f6a657673412b3 SHA512 33bdbf4ff9ecc4f4d74cf06590e056f4d96bf0d990d5381b9da5b65682b2495ed74e27b45419c2afa986c1f6200909d5175b137ae73ced5cc8ac869e4e1bce8f
 DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
@@ -129,6 +137,7 @@ DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed8139206896
 DIST itertools-0.10.3.crate 118661 BLAKE2B 0095d6e7f14ddda69605d09f74e8cc881eec1a1d234f705e667d7f9e738ef157b7ddee066855cbcad7f134bf79b99a4a4c77bff3371397a567cd34d98b68bf97 SHA512 9d17357eb68159edf4f4ccd2eb9895672c7fb633803166d5e24ee12350639eaf66f1c822910518185cd1f1ca5d9c3e228dd37525e6c337ba3fc7ce967f9bfc85
 DIST itoa-1.0.2.crate 11112 BLAKE2B e277db8e2f506d4d20b6888b609d9726d594e1cb2c9f21df60a8cf8dcbad1808d8c1bdb0b7857ce7734b92c0f23fb1ec56f8564e779f27eea953d0ffbfcd3f84 SHA512 44a732a102d60b58e72fe76c43a1d185fa12ff08d04eeacf03234368552f84d3de87a2ea0a6e7a56b8cfa74cb6f6697005afcee26f45afe0c2fc7dce5da3b593
 DIST js-sys-0.3.57.crate 78605 BLAKE2B 260e2fe94a213ea169d9296dc8f5639fe62f47ce69eb69f2ac2f9b1f409c3f2dc1b26fef56cda5cbfbb775a7f85d2b6d866bd4e30cd6041feb337b744e57358f SHA512 797865ba4c40bdd338ea3b980d6f7139b580a12057437319d3427da6c5045455e0612461289ecbd6ed445e8b675369a8ce77ec8ac0383c8a800a7fc84606ac2b
+DIST js-sys-0.3.58.crate 78794 BLAKE2B d664fda1e19a7ebb621596cd4773e7ebe86b3749ec8e0e45477d170aa472a80a75bd0ca7f6ca47c9aace5e3962451039b1bf44615ac77ee4db21f46d673943e5 SHA512 74656493c36d9110aae99f58cf1f72a1c89bd971c574ceef8194f68387bcefaa5e93aee736b41a1de1c192113257bd544948dd79a227b5451d13ba2319b58a15
 DIST keyring-1.1.2.crate 30205 BLAKE2B c2f3c48daa6c06b0de4c9f459d563d70b483764e53237e6b868aca4d4d08835ad92df3c2f928c8ec571f54e96173148a530f463ed55e5e5a8a63a975b7b496ed SHA512 aeee8dde066f3f49a4089aa778be6934758fecf7877c3bf285d84b2a97f47f504c7d4bb7903f9af32e479895e6842a7ff84399e520e7d80050c896839aa2628f
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST lddtree-0.2.9.crate 11163 BLAKE2B 19994b60d263e80408917110cd932f99298e149c000de599194c46b4a186cff271e34ea70a3e4ce13241500a63fbd29c60436504e1763cd5f55a32b5ea489d8e SHA512 812f9febd86c4e5d8182a47d37630485030c3feac7a27d904db43fcdc685217abd7e8e5a94e26d863d8fd6cedaba3e767687fee368bd9597c37e00e1ea8ba612
@@ -142,8 +151,8 @@ DIST mailparse-0.13.8.crate 36008 BLAKE2B 8112658b4ceb5b3528375f4f8a178a26c18b54
 DIST matchers-0.1.0.crate 6948 BLAKE2B ec3a5d01d2fedbb4dbf5bb185afbb9401410463a61f51674e0df6a571db352b2bbabfb99cdbdcfb4e511ae783165bf0258f5163f240a229b9087f9edbd0df41a SHA512 84214c1a84952d85631aa1ab5115df7cda223ac64e2acf055b6129ba1aa26ddc87615a8b51ca890ce3fee0419053fa7fe1599ae128f1d211b58c07b0c4af3b19
 DIST matches-0.1.9.crate 2246 BLAKE2B de155202636c6a03ed68cdb21e8ef96e19b45be040a82943d2d7e5192c0ab5c253ab6d65f0b30b2689e21da79cba684af5be6e63c48266681aceba356f6eea41 SHA512 6a2809687d30ff04ea97bf9d1610d746e097699a4c3625ffd1b7b1e4a9673ece9d559058c9f760b99d6ab509024f7b338e7cfa6fe767499c983efa98bfb98305
 DIST maturin-0.12.17.tar.gz 299343 BLAKE2B 28daf0ae1aead28075c730c8acdef875918f0c65fcb6828987ffd1b6967221dea201c7988574e216826a35a7938972318e1ec22ade3977259dc610464c940b7e SHA512 21649167f9fc6ebd1388e2cf5aa58a1656fec3bbd1f4d97e4753de7992171faf56bb2a9c0e5d19d2965076ae0e0333db0c1958e7af13473b4af7ccd3c2039992
-DIST maturin-0.12.18.tar.gz 302918 BLAKE2B 2a899d9162e2f893a9effe09996590193b3b04dc54b315728167e7db588c0db87a57b1c0d85ec7060977cbf9948d294a6bcdf66ac639f15415a5c6da7b6b930b SHA512 c4e4c758d9f73e6a6804bb9daccc60b21b9b77b6e3e0f32afc7788e98ce5664de77227f89e7c9f1d4b4330d671c190e3fb6f3c6b3abfcb1c22722b080a53bfbc
 DIST maturin-0.12.19.tar.gz 303088 BLAKE2B 16311ca462bb38432156e09a3c15133bbe0dbb9dbdbb390610b1e97d89940dc01c4e4e8e01649baa90e9bede9cbf203b89ab730ee8251c867e26d6e1aff2d053 SHA512 782fb0f1715fdae913b34a6fc5eed6b750546903b0d7a522db1280ac8ebaece221c48acc200a4e10687ea8acc5e9b596079e8e8eb990f0a824ef78a5ab41b57a
+DIST maturin-0.12.20.tar.gz 303609 BLAKE2B f509401b4b32a6700e08b72ec9ae49d5593df9b55e26ce3f44d62c9755429ef785a60442b540fe05159ed0ea6fae72c3230dcf517cef7e5085184ce99d0d0032 SHA512 e221711509d6c3997df49e934e73f41df3c7cdd975db9fd13a22fc9d6a2f2bb9aed33763c70f8516665918537a032e113b55d69936f65e72bb2ac5e46b45be89
 DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa
 DIST memoffset-0.6.5.crate 7686 BLAKE2B 9a797388702389076c426052c3d54dc62802d5db8bc5c9c83990429f2ffaec4fab4c7dd3f09cd0704d1ea555e87976563bb43408ba54b5e66ce7e406d4604009 SHA512 11bdd9185b99dfee8e659e051b09ee301c7142a372a8117864745a5085c015436d2efbb1478192886f09cbc562529e209d2e3325d94938a64bc75b1d91d2bf3f
 DIST mime-0.3.16.crate 15206 BLAKE2B 9a599ca82fd0dd6d3d2dea68a47b8441b1024d016ee1fb23cc6431b39ead20c9b3fe1ff3397af79c2c1b2cd277c440d4fff69f6b28c550ddbe15f680923c834b SHA512 cb1d691610cb82720e553247336fc5eab63407ad37febf2eb50aaa4e329cca70959ecd8bb8c7af5753acec2c8e86fc9a0f8ad9ad2de93fe9295ce84033d6054c
@@ -246,6 +255,7 @@ DIST sct-0.7.0.crate 27502 BLAKE2B 93912044e47473d72d7415e01cbe2545f84d7d087e7a7
 DIST secret-service-2.0.1.crate 26355 BLAKE2B 01d0457e7fe16a2f86a67a3e96c6acb3b68bde05cd89f7446e4a248c8832dff51b409a106b73b21e9017315da603fd79ee9dbb1f1552f1c56fb9bfcc70eac5f0 SHA512 b7d348a236719e8371e17e71931f764edc1e7a0a19704cd85643ecef020769ff6dbce4f9169ced5167441c4d87fe77fde0b45a3bf39a482ff9dd35f625094c49
 DIST security-framework-2.6.1.crate 71688 BLAKE2B 45236a76721bde18400aa286263b5dc389db66a02a5b8feb38fc6ca576fca305cdc5f7e7d6984ebef1379209740ebef3180c4598d5117b04394562de5ceb52d8 SHA512 e4690acf5609f52c89cbe0b577c68a22caf0763d8dc781817010e695824dae44dc27f58c9ffec4254a8461e88040892b89f9628d6a71102d06ab5441b84800a4
 DIST security-framework-sys-2.6.1.crate 17717 BLAKE2B 5951228dab98af742825a30584e38aafb096d1580375c960feb1ccce7163c6e42802fba4212f556ea8b8b09b1b40bdeec0bcf4af1d7eb4b05fbd271aa3a4cd01 SHA512 7315c0d67d2e792932cd6634cbb9da5021c8d9a1a1e96b9d92c6718d73be3aafbc5613cb355fa1a3d1860f13c62e829bc220b43ad18d739ea1b5aece0cab470a
+DIST semver-1.0.10.crate 30912 BLAKE2B e0addb727cfec75ac00d0941bec66433f549c5e731a86cf19954c1c402cb5a6721f20af11f1da87370791fd71f95b1febc1b9c90acba8d5416987fe97502cd5f SHA512 92f01a95f6d20bca1e9101f17cd7a7be7e002d55a0ad792c0a1b6b47c510c8e902a8dc33f683ac35800e39020453b0300b79a41fc32f29c8eda9a9d57d456fbc
 DIST semver-1.0.9.crate 30843 BLAKE2B 52c90056ec744bccbeb4a603b8e138a9b980a063c05462011d3b4cd11c5272c5284d0eec427ffd1e838d73f97a21af70a6c7f8094b6faecd3c18adb1b0be1449 SHA512 23da181209ca26a9e78d8111444c465273cdaac23ef6023b1e9a9a10e2ab9dfb13baf51f8b6f597598bde84c36910e0a45bae4f14555d731a9c9a3e94f37214a
 DIST serde-1.0.137.crate 76182 BLAKE2B dffef53be259eeb051a375e532c3748219f8219413af0615debdbbce61c5ca17be13b06c0bbbd7a85a696b4bc76ae8e252d880b01ecf540b758fc10f11415b21 SHA512 28223488e18826f83a7e90029aebc0722e0cd238a2c0c021e5a162d0f5deaa494713fad10f7ac79c8e14de856af931b6d83cb3efcfd0885837fc71e35ee38a2b
 DIST serde_derive-1.0.137.crate 54831 BLAKE2B 19a0324c18bd00da4feabcf83dd78de2ff7a1905abb82d5600c6128a8351f5ccc37df21e0135601167a51ea1e6691bd22957c2bbd9da637653c7673dbb808d24 SHA512 ee47d3bad717ae16118c43e6f308a0e264bde80caab8f8649bef96ed3f7aa0f9b6a479311df22ecdc7bbcdade65f7b03b79100f8b86caf02f9a0bc77ce01035a
@@ -284,8 +294,10 @@ DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f14
 DIST toml-0.5.9.crate 55667 BLAKE2B f2bbcac136e0182cad9b51f07943610c8700b68afd08fdbb822b47bb79d215e8132376da8ac61fd550e86c353a83b007297b6ac92ef5d503e1b90e746c40c649 SHA512 7151bcafbe2bdb1d2bb91562daebd357c884819af047843f1b4a56bc3812d4153eaf70683d0f9bff51bd1048700920322d64d41da13ebb4cbf34f0f7822d7ce7
 DIST toml_edit-0.14.4.crate 105387 BLAKE2B 63b364d812969fb206ec8ec38e8c0264bdea3a3e7482e2f253c8b0c4e9903bb5becbea6ec03f38d9236be7cbe8111a437e667b901ed75fe32d6de3f94d3a2790 SHA512 613aefe6b648eb202002d447a63cec1b83aaf6ba04e964491069198a0fc39ad11268509a2ebaddd68ee3253bc28df2a0e771cc2876c57136e517850a3926fa4d
 DIST tracing-0.1.34.crate 72775 BLAKE2B afdcc78ba29f68f3e87e401a89e4c5944da620890823d56f3d345c2e97a2268c19c342014903aa4a62b8d39b67a5313506563a7be0a555b86cd93aa9db4dbae4 SHA512 d4641f3f239d158547d7c811a80cbd2d1d7df366122dcc678d01844988ef3c5f5db637707e7e91bfb2ea16bef5463d52f8a481d1a9804bac197157453b5877d8
+DIST tracing-0.1.35.crate 72680 BLAKE2B e3f07d2c7bdc72b6845be0a18473a3a24ec0d5212a88eb1bae34795319b6500d6b8c52ff674842f5ded1f0c8cf983977a66964c16779ce1511a2e0d81cc3855a SHA512 939f649d1578e569b974ced1f28678e494f4c42fa5e6c981f38188dcb2d960f71140627e4f60b86d926d44473b311bc855e85f8d90e43932ec3ac7eca7c02394
 DIST tracing-attributes-0.1.21.crate 27552 BLAKE2B 999e6e257c8778f01cf43365db21d97b9f055019bebba5462968a806e173fc7effc35cacbb60696e3db45d3487627ec3858c282458b38fad74f2f49bdcaa75c0 SHA512 a48da3338cd86e7d9a196e06505d53a6d60278bcd3b709e175219c8d1cbd9c0191af07c335b6401a157563e22d75dd13d5be664c02913c289079bfa667f99e65
 DIST tracing-core-0.1.26.crate 53727 BLAKE2B 1e3efbd8e5ad0617ce15ea14eb6365752067f580504a4cc90f1f486ad3eb7e59087c0f332e3e93ae32a2f4c42a42482a9ecbe180f43dcf34a427babd5290fc61 SHA512 b9d44c307d0fee51675bef07ed7f7d2eb8de8a6ffb37256994f3485f7f80e40f1fa9de1663e5360f945270f10d22e42cd9af60193449bd0a0d323895e994bdbb
+DIST tracing-core-0.1.27.crate 58328 BLAKE2B 3461f13caa1042fc63d7defed2e3f49a286d870e0dee51776a90ee8558a2036781c5561923afd9b858b8029bc95a224bef973009b928c9ae050fe4a20d42a8d7 SHA512 8627b2cf4285e461b47288d885ac627bc6cef1083111e1413e2608dccb9c65e55fd2cf1a979d8a507891cf8bf11de40af32a434e9ddec4ff57f7d4c04e3bede0
 DIST tracing-serde-0.1.3.crate 7329 BLAKE2B 55d924fc3acfd496abca8b42bf3fa4a2511340cf2ebb060fb31bc0b5d81dcbbaa299daef3cddc3647625afd124b9c83efc1ef104f55dc6d4cd4d91e0e667c160 SHA512 3822ac747df404c33573ad2a5c722f9708066a72c2893dbf507563ef29bebcab79cec17515fa87c0fa64be8a08073c38ab57ccc463c74df8caf3df69c72e131b
 DIST tracing-subscriber-0.3.11.crate 184827 BLAKE2B 83686c5affeb40a84e95c161b121dcdd533b782151896b86752f4d9a922683847dc350482a7436fee23a23cbadbb9522dcb7966993e877fb84fa8e6deda050e2 SHA512 5d45d5108742aece42bfe7d6f6ed71b0bee81c3e3e3a3117489ec5d4d4ee9c23c157077ad5020b74b019d212fb2a46623e93dc57a7f6bc0a1a853981ea097493
 DIST twox-hash-1.6.3.crate 21842 BLAKE2B 67c261b2b0a93293717a4e2e07dc11df2abde09da6fe713b9d04917ace73de1b59b8d4fd9449ab46cb7cf496fad1e440effdfa1fae6f5cae4ca78af8cd019c42 SHA512 f7ce63e6e5ca79ce9330caf40b32578a5d2088c5d8ed371604268760d6e212d447d9e3a95378378a283024155bccdaea47597902c488a94c5d5f79770baec8fc
@@ -293,6 +305,7 @@ DIST typenum-1.15.0.crate 40741 BLAKE2B 5752d80396d0a37b0069b98ace9efe96d94ccaf4
 DIST unicase-2.6.0.crate 23478 BLAKE2B 6e580108ac81b1cbee70e5bd331f43b12f266dae4f4f758bb8f5f073bd1af61943ee0de34cc27769525b19da8c24f8dea4941d0f5454594ab0cc8b78071ff053 SHA512 7e76a5f344e32c56cf87223585d87a56c79627b52bba0b29eb6de82de874b2964accededa8e9b5741f57944b6750fba5c61e679a50d4fd5a5646f431e2f4f188
 DIST unicode-bidi-0.3.8.crate 36575 BLAKE2B c0442dd47a8ee81f575b28e34c9781ccf507b53ea96d1d4df2e8117231e8e67579031e4244a2dacfd6f4c24ec01fbbd4da7c9ab72ad50af51ef56d7d813b6444 SHA512 810b5be48159ecbca542c715496f279518285c3b09f7c39451986f94e6c259fab1057512a2148bf99ba9abf76e861a24456b547cc2273f0b45ed5d3ce9dfe3d5
 DIST unicode-ident-1.0.0.crate 34224 BLAKE2B 62100357db87b74e44166a70a1d0f911281fc7410571554e9e89c94f3529920d1d43a8cdf3a3bf163c8acb8e9f575e83a024cb94217b84ecddc582751486954e SHA512 ccdad29fc63f71c507cdf276b02a5bb7fad44dffa123bf04d5b1495eb9c26bd7ec42ad6e11717eb10dc6499693047952c6b766c40d7b0696bd011779649d5fc9
+DIST unicode-ident-1.0.1.crate 33770 BLAKE2B e028e9f1d6c01a7a37c8f9ecd6b1d99041b45674bc7699066bb7479822cb8d5a1b4083db1117d9d44ab05096d8a37a9bd5d93dfe8cc5db6bb58950b4f5d5c8e8 SHA512 505650712a51c6f309c97bf72029de1eede33c71b84de9733f5f987859a61225e3d07d369b85a89797d870ea436f30b5b5046306f3d5fd672551a4b30c43e428
 DIST unicode-linebreak-0.1.2.crate 69293 BLAKE2B 825dc2a29d86314cff3492cac71add2cd48948284d9e9b684580186f4c021c8ce1e288d21cc47493eb19a158385ec602f0cd5608a7618e38667c1cc7445a302d SHA512 170db67d6d74df913dffc921986b92df8a2ba68776ddb17c8ffca51d0d4bee597a5460591e7ba593c1eaec8b6227956f4e0f9b11d217aed4ee85cf46f1be5277
 DIST unicode-normalization-0.1.19.crate 107353 BLAKE2B 4c69d50efcae131eb4b91d385a64b49412a11ba913b3c0364cd04ad107d59e31adbda74d34ed13a065d9a7825d79fb740e82a4dc66b7813a9837af4352ac9e16 SHA512 7459e9d2867308cac80a98d8dd0b0cce797e2830ea5ff55b878f7a37a6f5e1f0bc14340e1a29955298d660ba2be57754a1478d74851b1b90576dd5bc4231729f
 DIST unicode-width-0.1.9.crate 16745 BLAKE2B 38d4b92e47a284d6881a8073089be59a73d82b91efe5522f55be977f95f479890b6c02cd519544729f1b1e62eb21bcfff8c5f5382917f953603b760e39cf1ea7 SHA512 0f5ec46c57e3b5e50cb8430c89db8d9c129e80ca11a9c398b5312bfe95001e19ca3efbfeb01c3ac09c4ce7e26c6ee1f352f7e114ecef78cefd68c54d2d50f5f4
@@ -303,8 +316,8 @@ DIST ureq-2.4.0.crate 91872 BLAKE2B 07a4fc5f4c285931ee31f869e1a0b96a82ac1bf61a77
 DIST url-2.2.2.crate 68555 BLAKE2B f8e59f784b6c2e16bacfba36ad68670a6af17c16ea3b0866b5aa98e5bf4686cf1b1aac9b1f0a0ea3b89a01e044a2ca37830416f42d147158ea8e88f23fd28ac2 SHA512 f9b6ad99d69ff303283b3fd9e98945fbd6cb411a3d141badcbb3a0566723a451375e6dd5d5357e3eb7a1b5b1ee5756a2347c43817db2de6fe35b9004b090e077
 DIST uuid-0.8.2.crate 37909 BLAKE2B e6ede5f8ae05572d4c55909eb3fe6946de6f10ad9bf71bd357739bc01201bf93f59ccbb3dabcbfd7b3e54b0c98c3b52d21f1bf1877b7283c6df623e9b2b3f33f SHA512 5a1f5ead9a920b9bbc120c02049c24b62ec215765e486d3a15c5015ef49fa506206efb737e6f6555cf6e2eddddfe55f0ca1d7dcfa9aa8bcf3e0ef570a54fa2d8
 DIST uuid-1.0.0.crate 48627 BLAKE2B 87a7b85a7423869a78631dd49855f662185db6be21162da2168cb88c8b6d271bc079e3226026b32919a00e9c4e5fcdc0dba2a8d8aa05ae7f79397c77571404c0 SHA512 9bcd708e12924f0af8c7b554ea428d809f1f93e21a0ffb9aaff2ce9f74d8829677b9d0a4e95200a219c88a0bf8bb5437597ce5c5a7174b458d9ab3e6abe70c57
-DIST uuid-1.1.0.crate 49697 BLAKE2B b3075465f818705e4ee47f25f6a25e189c2220dd46796ab7aa3a6ca88dc276fe6d298962c4f1e3832c032704736f6c2b9dc8bcb874681f92cd82ea1ad173d566 SHA512 75b2801cce746e10779ecbe64695b7aee99bf5cfdb34a54d825e1cfee55c559f78c65c210943338be30a35c5729d024dd0aba140a7cbcc07f0f413d60205ddf6
 DIST uuid-1.1.1.crate 49103 BLAKE2B 03ad96b55272df3a8056cef35d56f4e0dcd39908208d7da37d0d1fb569c146304677bcb1adb59e3eb0c67101713e3ad81ae409d36e00638f533f06d1a74659f5 SHA512 b894f06fc1103e22876f00d29b40668cf8074d9025f00318ae0791502eff4f5840d088be810b5af3abc74ce710af4c4c0196817eef6748c4c588a3d97ddad30d
+DIST uuid-1.1.2.crate 49511 BLAKE2B ea25eeae5181b977fcf9a462cbfd4fc5175b0dd16dc19aaf0d6c250a7eec312a6c617aa320c4ec9f452c200ca3aa803146a45cbb91053f500b100eeb14d8c7bc SHA512 de1d1019d224c248e19cbf8a8539dc55937b23f74c5a8b11a445f8b7c155d35caa2001d6c710f4a4a8c034446162ef32c0e3be9f3d43631477c6f3d350acf7d0
 DIST valuable-0.1.0.crate 27718 BLAKE2B ef5ded994c9a6dd302bed27f0d757447b0c86dfefa499c1ef0d25c3a6745ce61cfa2c926826534c9f605f9b89b4a19f91f06f94ae7c03f1ddc4c58fab3ae58bb SHA512 a97f65db1f1c5049a276dbb0e45e25c6fc6ce9d27ac1fcd77c945324cd8216ef60344065c79799ca04e338455e4f7422c44078eea32d5fc359dd0211ee7eb387
 DIST vcpkg-0.2.15.crate 228735 BLAKE2B 6b6bacd9a7fa38919241f45a97f58cae957e58d3aac99df208a26aa718e4f1644f4ccefa31b09151e5c1952288e0e5837c363918b98c7f55079a948a952c1c50 SHA512 7322a21e8811b2fe4e79e09dc321458068ecdf1953f05d36233f3278ecc0b1dfc64194db7010dd46fcf692285f42475beb090c6c6cac0c8f9fe0eb5c770e3172
 DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
@@ -312,12 +325,19 @@ DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968d
 DIST waker-fn-1.1.0.crate 7114 BLAKE2B e510eec0490f0caca3930000cecccde209ad387d1657c380f95122c68ccc15fcbe0684315d0aea28f094f2c65f7b7b08ae62f6ec95e0d67fc47e6af0ba4589e9 SHA512 80f612597534d9f8bdcd5e6bdff740805efe28242822bc6db360e114a23cb47ff88c74b8ab855bc764f0a73545e85a69d76bce1441e5899a36e41ca270695dc5
 DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da
 DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856ad80dd74990be19eb6af99823b147163384f61d471e2d9ec054d78a7064072344be53783e57073e8fffc6d5555c149b4834a9bf31dba SHA512 06977a294d76369a3867c45abdd8a87ea5c84e5a3681075ba0d14af1aee3114ff24495c7e7f7fe1e6e42230e65fba0e062898e69bc89e0209af62c2d14094ec7
+DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f
 DIST wasm-bindgen-0.2.80.crate 164576 BLAKE2B ee581f812bdab9dcf23c73ce25afa6aafeffb7b9c70d5a64539487548efb290bfcb94cbe5af6e12b5a5912548ae0fc6cc3168de4a5ab63b3823b6b071d41161c SHA512 928fd6575217909a46f23ea8147caa438efed8eef31d1e0d75610fc380c18d7cf51cb74c7d5c83136d36433fd19bc9256b6566c2624a4008daca1b3e155aacf1
+DIST wasm-bindgen-0.2.81.crate 165467 BLAKE2B 4b02ad703362d89c280bff92552a632b6cc50a586db4a476fa4f476118b94a89707712c1f6ff65c49a4d6001e9c9e16922a35e36b315b8f544e261ceb43dd5a4 SHA512 dd9a9902789dc8c7c3a8107c52018783b505efcc534c94c95ce55ad735c51489c928f767c319d97f78868a58d4aff7a71b2d1513350c30adb9122401b493906b
 DIST wasm-bindgen-backend-0.2.80.crate 25741 BLAKE2B bac730f41a17aa963bdb005bcbce76e988b0c163fdf1b117cb3bf838d7186b732f81ce4edc068c6e3d2934802c974e19f1d8588ff71310462a189b3e5b9d4653 SHA512 20c33664f194dbc5998093831d8ed0eae82cfa6c90b8c3b9338c4f32104594a8864c68a51ee3e39fca1eba166b241a9a8e508d5f942791d727deb2decd9056d2
+DIST wasm-bindgen-backend-0.2.81.crate 25737 BLAKE2B dbfbd09a4d5a1c585fbd8cf8a29dd375c887e77fb5759c74bfbf0dbf012a0340df06f063e1a4908a80a2ff8298689cfb92ef67707e5d2e163abe155523c2029c SHA512 0d3b14b530adb2a32ad3ea169f0555973a25232613ff4269600dc1e86a6d75e4717be2388f132b6bab9a12625f645f644f59dc30a0b4ff3f20c20106083bcfa3
 DIST wasm-bindgen-macro-0.2.80.crate 11805 BLAKE2B ce070eac93a0cecac6d2e303f40b9f9784489133da2cf7fabbadd57afdeff5966308481276d4375150f0950fdbee165f466b4b099f0932ce26dd02ce6007af10 SHA512 816922762591e7ccd07d9bab1f089d1d0484c04ca4d8b9060d432fabe4ca28a6b6f0e701129f6d0a3fc341b845115c2dd1bea3bb67493234a73f7cd2bc0c66db
+DIST wasm-bindgen-macro-0.2.81.crate 11796 BLAKE2B 3fb6a60ca59279d3921dd65f7e7d4d91a457e31524671d465c5ce8fb31db7f28f49d80fc0161c2faa9f5a7dbad4c44584f0fed6177e8908de2a421951c62479d SHA512 f1164f7a4413685ec34e22c462b4a4cbaa79eba47079d90b7e15304db222afcc8e966f3bc994a231f21e29ba68a844b3e6622f840e0c335d09201c1dfa046ea3
 DIST wasm-bindgen-macro-support-0.2.80.crate 17857 BLAKE2B 9f51e4193f64088d95079a105164c75d2397f07846bc8fb29bf7f9dd3747dd7d4d6f3b340cde219fbc3b181199c8f1aaf62317ddd3ce8e7f25f68b2d5ffbd514 SHA512 8d4a68c363dde93d9644f30ab69ef28879e8c354e41e6ed1d1598beeeaba5bb6c8e6769fac5404faf438a90d87fbdaf9bc9b4d082dd7b1986f789d739f7b5108
+DIST wasm-bindgen-macro-support-0.2.81.crate 17855 BLAKE2B 2afb7807913ba01d99ea93030461842b7eeb405f4be0f0d671e1d430b6cc0aa111518c9549b71c8a94dda418c149050fc9d0613e10cdc7fd0dce354d87b8c4c0 SHA512 1fac5ac8b546e4fe55484649d7e2a39537b49797e20a2859a17ac98cc8c25cb3d91dca09e94c33651b9963efed6045ddd79bf646489bbd11065c62e66a59cda4
 DIST wasm-bindgen-shared-0.2.80.crate 7204 BLAKE2B dd955b920bb74d96734b58c3143a10182c64ff5d4c1cbcdcba909521b45c0f97422c3aca2894722d96a226884a7c334b06649ca7c1cb2e7b08c2cac5acf53dd5 SHA512 c170759d46e12edd41dcafc908caa887756a811006a178b3bf5ae73f73556d51fa13fc4a0844e28071d21c177a1d98e1e2f6dcac41dc240b972b697d36d74203
+DIST wasm-bindgen-shared-0.2.81.crate 7194 BLAKE2B bc31b0e75cafc2dcd207ffcf44b9ae84de4e5bebebe471404736352e9aaa1c2da45e22892a548c05cda24750be028dcaf66e6529d1ff2f833986ab2085b74fb9 SHA512 5ca631a720623e42caf737d3f8faa4961a051eb71b6b0854e4f697f753889cd58df980962d39650acce7712449ae50cf86effa542bd85e451cdb86767aa7ab34
 DIST web-sys-0.3.57.crate 686563 BLAKE2B ddb687a252181a9198bc96da3feaea007ff188641996172293772257cffd748a79f306c24d9eb619c61a5ddcec4bb6e423288a831ff14c7b5ec6b37839b52508 SHA512 144a481ff7562ff5f96145c7db64ecc704863e2fd6c0c9afc87fe87513e5be660fcadec6b1114ed2c86da36ccd97024ce601b843c8768dd8b5c53c71daae9800
+DIST web-sys-0.3.58.crate 696212 BLAKE2B a76b29a2a1b46239e1e6b134004bf43bd127466d9920077196e59b3ff419e059f433f94a68c24f3a6361d4f751ad3b69c6bfa67cacec0f0a2a58c87f319cd475 SHA512 58215a0d34bf0478514affa8d85f46017ab565b1dafd36f98a1d0f93e04f909b8b09348c06a189700111b5a8bee2049640a3a3a1433c4939e60bb12f32092b05
 DIST webpki-0.22.0.crate 58663 BLAKE2B 4fff91a8ce3d46a9daa9e39c50755f79574c91faddead2f6c879f6e9bc2189b76c4951cbc36e607e099ab8a870b422e1afcd4bcbecc14e96555c26c8cbefeb84 SHA512 7c2916d47f2232587e3ccaa8fefc8b576addaf84b55166011032e471f91ce54a79d2fca7fcc1144552c254f5baead708fba2b0ce76a1c34286838a8744b0f570
 DIST webpki-roots-0.22.3.crate 242291 BLAKE2B 70509e4fe7e1df706c66dee61200dd73372ed37ad9dd08db81687bfca6d2baffa4a9588054a827cae3c7e55a0aa31de220c5cb205467bc2891188cef1949b776 SHA512 4015b9f98127324efd8219a3a1f3e7f3bc7d67023838fa924a52df8815ff80a5caca351e12219b24be594fe55448ea06b5e040c19b4d14156a115fe5c70c245f
 DIST wepoll-ffi-0.1.2.crate 31309 BLAKE2B cd1b01c9fdb6482baff3ab12a9926c1a5a9b6e430e4609890a94b13480f8223de166558724b4d6926d6e9dd7f466926c783df54f9beabc75d646edf4f3429a73 SHA512 f0f5c379d08642aee9c6ef36175b9d858ee1cb7d444b832d6e7ad194167a4db2de5aaee3b2356ca42ef9f48a9872928c61b456305c05dd40cc53e5204686b8a7
@@ -341,6 +361,6 @@ DIST zip-0.6.2.crate 60077 BLAKE2B 3353cb0b8557ad1f16f3a3964a5c6d992bd044eebe385
 DIST zvariant-2.10.0.crate 64374 BLAKE2B 65f5ec09b812217b2d96f57fcaca7fba97545dc715b1395cafe6386553a52e9a72d08c3a599bc08d5f563ea71324f1e7d60db2797c3ad1ad23a9c322a3939346 SHA512 48227afe709c1cc54cb70b4d9ae26e7f836559b4b11a68136d7720d01bacf757c1f5f40cad9de634fa27e196e4942df69c33a7de1334bb23ca995ea34690c5ba
 DIST zvariant_derive-2.10.0.crate 8746 BLAKE2B 8408e6689f6f849d37d0ade5549dbac25a01a8ef6de5692290f24462e0984128fb5b1d72e87e94e4c422896d68f9acaa382ca6af57f47f470448894a85071b1a SHA512 ba06d0761de8e20839246517d89494e5728fd654cf95eec193a4ca4cdb90090542bbfd7ed0ffbc9fc44edda38c5270139f54e63cb88d09f6c26b39199ea1deec
 EBUILD maturin-0.12.17.ebuild 8048 BLAKE2B 2ca2c23ebcd4eab658582ded92ae7e32d42a9f642953991d69d0787f45515665bd7358261debc340ef5fb687c6982e6ca1938e95c8268247ad58de03c0ae016a SHA512 7c772feb45bbc138bab97cc0d2552ed7337276b383caa2b89fc09e74be7e02f64321c4920154377a5fa6d7f25368d46e094c0509000f4de20aa31f9845d28c1f
-EBUILD maturin-0.12.18.ebuild 8134 BLAKE2B e729626a411391f6eaf9b458b5d08794d698911f79642268283dd88e09a03dbb89874fd6a78e453a5d5d8c6688997a032d489e175dcb2faafc4626048a3de2ea SHA512 3ace063222579f6c9cf0fed78436c5f783aa248be9349ec1e68ccbacd8eca74bcda4ca1e98c19428ebc1d09d835faa9e8a504696d04811fda5f6e5ebf7d543ce
 EBUILD maturin-0.12.19.ebuild 8167 BLAKE2B 32b8e18d61f4db169d8f150002e09583c7140158476612605db1299a354198ed1d1f6ec58a7208bfd90377248cc81f73181edab871bc7a73f6da0a7da63d2813 SHA512 9a23972d2fd9b3a8999b11bd30c2a51e00bb0d5dea2efc16545625380773202baa28ee909d90cb0ddfa2efda387b9a69dc726b936e9d1a048cb34ff38a2fd1b4
-MISC metadata.xml 536 BLAKE2B a94fef48d69a1f23ab4cb0c676c47c8b3b3337f78f2095384e9ef73fcf04a9c117766b633cca82c8bde782e70051a944d7508863e36e69f821de7399ea4afab8 SHA512 b66a31403684e70656c7cc25cb0654ac04e4e5c79f822ef3c4ae8aa9ff44fbd13914a90290c922e98c2e55e90a06f9250b93d71fdab51a7d2a727c33d872f247
+EBUILD maturin-0.12.20.ebuild 8187 BLAKE2B f19d7ed987df5feea76be8f8c239426a1973baedba7570afe11cb6afa94cd0edf41ad6fda2a126437664552ef2878a0e4e26a11d5cab7da46d025dc51fcb64ec SHA512 753aa99b32527b7b0ed226a9a0a710f50fbc1c509873127d5434703619d3bb29f12f0b33fd64660c102f2c48ba483e82007b09f71567365b39b35625a0992efc
+MISC metadata.xml 536 BLAKE2B db6debbdfe3fbc3107e6683cab0a93686735191fe9a04602112023938ce570f5c6ded2a72c850280e61f7ba8b1e7ca93198f93e03d4750649f2c03d7bf60095b SHA512 010e51df2a4364b5f26e2c2aa6e645e5f26d40d9c22e7782305eccc25f59b37b5287f210373383994a5db40f9ffd2a6a52848bc9ed80066521de665358b1e29a
diff --git a/dev-util/maturin/maturin-0.12.18.ebuild b/dev-util/maturin/maturin-0.12.20.ebuild
similarity index 93%
rename from dev-util/maturin/maturin-0.12.18.ebuild
rename to dev-util/maturin/maturin-0.12.20.ebuild
index 589c97ccd2e3..119a4031e96b 100644
--- a/dev-util/maturin/maturin-0.12.18.ebuild
+++ b/dev-util/maturin/maturin-0.12.20.ebuild
@@ -22,7 +22,7 @@ CRATES="
 	block-modes-0.7.0
 	block-padding-0.2.1
 	bstr-0.2.17
-	bumpalo-3.9.1
+	bumpalo-3.10.0
 	byteorder-1.4.3
 	bytes-1.1.0
 	bytesize-1.1.0
@@ -34,9 +34,9 @@ CRATES="
 	cargo-options-0.1.4
 	cargo-platform-0.1.2
 	cargo-xwin-0.8.7
-	cargo-zigbuild-0.8.8
+	cargo-zigbuild-0.9.0
 	cargo_metadata-0.14.2
-	cbindgen-0.23.0
+	cbindgen-0.24.3
 	cc-1.0.73
 	cfb-0.7.0
 	cfg-if-0.1.10
@@ -44,11 +44,11 @@ CRATES="
 	charset-0.1.3
 	chunked_transfer-1.4.0
 	cipher-0.2.5
-	clap-3.1.18
-	clap_complete-3.1.4
-	clap_complete_fig-3.1.5
-	clap_derive-3.1.18
-	clap_lex-0.2.0
+	clap-3.2.4
+	clap_complete-3.2.1
+	clap_complete_fig-3.2.1
+	clap_derive-3.2.4
+	clap_lex-0.2.2
 	cli-table-0.4.7
 	combine-4.6.4
 	concurrent-queue-1.2.2
@@ -105,11 +105,11 @@ CRATES="
 	futures-task-0.3.21
 	futures-util-0.3.21
 	generic-array-0.14.5
-	getrandom-0.2.6
+	getrandom-0.2.7
 	gimli-0.26.1
 	glob-0.3.0
-	globset-0.4.8
-	goblin-0.5.1
+	globset-0.4.9
+	goblin-0.5.2
 	hashbrown-0.11.2
 	heck-0.4.0
 	hermit-abi-0.1.19
@@ -125,7 +125,7 @@ CRATES="
 	instant-0.1.12
 	itertools-0.10.3
 	itoa-1.0.2
-	js-sys-0.3.57
+	js-sys-0.3.58
 	keyring-1.1.2
 	lazy_static-1.4.0
 	lddtree-0.2.9
@@ -141,7 +141,7 @@ CRATES="
 	mime-0.3.16
 	mime_guess-2.0.4
 	minijinja-0.15.0
-	miniz_oxide-0.5.1
+	miniz_oxide-0.5.3
 	msi-0.5.0
 	multipart-0.18.0
 	native-tls-0.2.10
@@ -164,11 +164,11 @@ CRATES="
 	openssl-macros-0.1.0
 	openssl-probe-0.1.5
 	openssl-src-111.20.0+1.1.1o
-	openssl-sys-0.9.73
+	openssl-sys-0.9.74
 	os_str_bytes-6.1.0
 	os_type-2.4.0
 	parking-2.0.0
-	parking_lot-0.12.0
+	parking_lot-0.12.1
 	parking_lot_core-0.9.3
 	path-slash-0.1.4
 	percent-encoding-2.1.0
@@ -218,7 +218,7 @@ CRATES="
 	secret-service-2.0.1
 	security-framework-2.6.1
 	security-framework-sys-2.6.1
-	semver-1.0.9
+	semver-1.0.10
 	serde-1.0.137
 	serde_derive-1.0.137
 	serde_json-1.0.81
@@ -236,7 +236,7 @@ CRATES="
 	static_assertions-1.1.0
 	strsim-0.10.0
 	subtle-2.4.1
-	syn-1.0.95
+	syn-1.0.96
 	tar-0.4.38
 	target-lexicon-0.12.4
 	tempfile-3.3.0
@@ -252,16 +252,16 @@ CRATES="
 	tinyvec_macros-0.1.0
 	toml-0.5.9
 	toml_edit-0.14.4
-	tracing-0.1.34
+	tracing-0.1.35
 	tracing-attributes-0.1.21
-	tracing-core-0.1.26
+	tracing-core-0.1.27
 	tracing-serde-0.1.3
 	tracing-subscriber-0.3.11
 	twox-hash-1.6.3
 	typenum-1.15.0
 	unicase-2.6.0
 	unicode-bidi-0.3.8
-	unicode-ident-1.0.0
+	unicode-ident-1.0.1
 	unicode-linebreak-0.1.2
 	unicode-normalization-0.1.19
 	unicode-width-0.1.9
@@ -269,20 +269,20 @@ CRATES="
 	ureq-2.4.0
 	url-2.2.2
 	uuid-0.8.2
-	uuid-1.1.0
+	uuid-1.1.2
 	valuable-0.1.0
 	vcpkg-0.2.15
 	version_check-0.9.4
 	void-1.0.2
 	waker-fn-1.1.0
 	walkdir-2.3.2
-	wasi-0.10.2+wasi-snapshot-preview1
-	wasm-bindgen-0.2.80
-	wasm-bindgen-backend-0.2.80
-	wasm-bindgen-macro-0.2.80
-	wasm-bindgen-macro-support-0.2.80
-	wasm-bindgen-shared-0.2.80
-	web-sys-0.3.57
+	wasi-0.11.0+wasi-snapshot-preview1
+	wasm-bindgen-0.2.81
+	wasm-bindgen-backend-0.2.81
+	wasm-bindgen-macro-0.2.81
+	wasm-bindgen-macro-support-0.2.81
+	wasm-bindgen-shared-0.2.81
+	web-sys-0.3.58
 	webpki-0.22.0
 	webpki-roots-0.22.3
 	wepoll-ffi-0.1.2
@@ -310,6 +310,7 @@ CRATES_TEST="
 	once_cell-1.10.0
 	once_cell-1.11.0
 	once_cell-1.9.0
+	parking_lot-0.12.0
 	proc-macro2-1.0.38
 	pyo3-0.16.5
 	pyo3-build-config-0.16.0
@@ -320,7 +321,9 @@ CRATES_TEST="
 	pyo3-macros-backend-0.16.5
 	python3-dll-a-0.2.3
 	syn-1.0.94
+	syn-1.0.95
 	target-lexicon-0.12.3
+	unicode-ident-1.0.0
 	unicode-xid-0.2.3
 	unindent-0.1.9"
 DISTUTILS_USE_PEP517=setuptools
diff --git a/dev-util/maturin/metadata.xml b/dev-util/maturin/metadata.xml
index 0a1aa95948fc..87c093bb0471 100644
--- a/dev-util/maturin/metadata.xml
+++ b/dev-util/maturin/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>steils@gentoo.org</email>
-		<name>Stefan Strogin</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>ionen@gentoo.org</email>
 		<name>Ionen Wolkens</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>steils@gentoo.org</email>
+		<name>Stefan Strogin</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>rust@gentoo.org</email>
 		<name>Rust Project</name>
diff --git a/dev-util/mdds/Manifest b/dev-util/mdds/Manifest
index 734555f71c11..ee2d288a6326 100644
--- a/dev-util/mdds/Manifest
+++ b/dev-util/mdds/Manifest
@@ -1,9 +1,5 @@
 AUX mdds-1.5.0-buildsystem.patch 1006 BLAKE2B a6205a749a5a619443a060912bd863c93f74eb88cc68e62b077bdbab0a3e67e2f9ab35774ec5fcd23599b5b10478f529ebd2f89806fe926786d63967f83a9075 SHA512 eb03daf08605c9e54326621af3be39214659627fc4922c9cd3f031073f78a0823c2f1bb7267eb671c189b0326f9ff5d1fe3f60cda14fe9a7ac58d293972d67b9
-AUX mdds-1.7.0-bashism.patch 2061 BLAKE2B 766eb3b27b55f058175894d01c91d4b9fa544c8ba15fab79eafb0e333ddf86ed328fa928d21add6bb2da9a31420f35de3a97e960723ce2766b898313434c56d5 SHA512 4994df435477e600aba80c8c7e80cf2b8a76f4d20b19090b61ce94aadfa3d9ff0b75d26fc88094a6b1aa5742fd5ddc70a535dcb6456c890416ac9393aeab0738
-AUX mdds-1.7.0-rtree_test.patch 1673 BLAKE2B c5913765972b2c6346a8414cc9b980337e7fabed862286e421adc59de81ef67cde97cbe084c1b3c8a8549d94a0a4699be8e10c9ca41a101b71f6f45b1dc4c906 SHA512 1bb8fdeffb0cba1eba713856d408f9962531fd73b8b5e61cca382c6ddd09cb10f2afe3a2f964e98201c0ca29d8138f14fe0d8fab1c922d92a66205a353939caa
-DIST mdds-1.7.0.tar.xz 313220 BLAKE2B 02ab09ad1338223da2911c05fc8d67c9d0d5414d1dcedac066dc95a2b0853f3801347c9791a5fc5700d666933be78efc52f735453769f9f2123ce06eca1fa67f SHA512 ac2bfe5186d499a79f4379c1dc7cc869bbbd9a59d4943399409dd4dd1ef7e3567a993deda5d5a06ad67dbd94b0a534439805837f2f405c5aca0aeb197178291a
 DIST mdds-2.0.3.tar.xz 419884 BLAKE2B bfadf334ccf7695ac0234a9355e5c466e4f8b8fced2b37a4446a3ef899ce28cc9f155223ac5c4ba88ed54886ffd9a38996973195a5120abb886d2e791f596609 SHA512 6600cca5cd2272905dfdeea21a8a1615bb8f15e0c0ae5efec99345b34387cc18fa2aa61ae7142edaddb41738f7386a74a91997ac5ed1a8cfc7cf4b72b0bd2935
-EBUILD mdds-1.7.0.ebuild 1333 BLAKE2B 5ba353dbe3dbff0e00daf82152cbd934830f12f2909aa99fe8fe8823667cbf35db19a519ca040f17ea58fbd3c1d2e7690de19f6f16ec3494d5782c373d22d51d SHA512 e21a374912de23b50f637364c182db46e948c08fceb0baba4301e1c485c4c01f6afcde3a2562a80204fbe2980b7befd84ea15490775672e01e2237e5d8e07798
-EBUILD mdds-2.0.3.ebuild 1237 BLAKE2B ba18e8141b110f254a62197d12962c63a263de3850ffcfc6093892ea97a3c6180ea18158648d284dd59213ddde06cd30c8df43d63a752edeb8a0d91ac18b2800 SHA512 357f53324b9dc10c81f43d1d01e93258a9c32b8bb4d58f9cd25d735d18a5cc946c1d96301ad1ddae5e20f89137526df8ca384a469046fac89eda6db6ed2be3e8
+EBUILD mdds-2.0.3.ebuild 1235 BLAKE2B a586927914b85a4deff10886ccbefc9f9c3e6aabf898fabb3b27e3929470e30484bc3e27fc4473f6789df2950ee4be5b9952892934b0e1dd453d63a0478463be SHA512 fee04d2e294c953b95e5b5c32650c146e8c357a67927210b06508a08147c013bd6499a48abe40bd937b87ccdaa81e23aecf4f69b9d9755ca241ddcb6b3ee929a
 EBUILD mdds-9999.ebuild 1238 BLAKE2B a2b718ac576154410d7f621be4f14ff08c7c113d691e2007d2ea0a84614bb4f47aabb9e61ba23cf8344bcf173dcf635b3f6c549c7d740744072b7141a9a9f05a SHA512 679ee1ea68f9f4dbe88e59393d83d4d4e4f4e8e019c6b10e782896952078ce85dd6b6bbac945113c7088a76565782bc6aaf693d62a5fa917ef1e6bb3c8d039c3
 MISC metadata.xml 457 BLAKE2B 571d7e12d435c01accaf935cda5f1847ef38c5d8f996c098dcf689e63e6b03c2401e52b05552f03b0ac9a466b72a3359ba3cfc7a36c0dff1b2536d2f627faa38 SHA512 cc5b5a07a05e8bc74ceb3a53965b7d7256d66134c60ed933c9d75054be8cc9aef833b3383a00bac3efe360943f5bf8cd886a5da3c5dd44943e50da0f7055aa1c
diff --git a/dev-util/mdds/files/mdds-1.7.0-bashism.patch b/dev-util/mdds/files/mdds-1.7.0-bashism.patch
deleted file mode 100644
index 3e94f32e8f8b..000000000000
--- a/dev-util/mdds/files/mdds-1.7.0-bashism.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 65da7c25f4d8204b1379a0afb46d82dc1b263ab0 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Thu, 28 May 2020 18:36:07 +0200
-Subject: [PATCH] Fix bashisms in configure.ac
-
----
- configure.ac | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 00ab937..2282165 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -32,7 +32,7 @@ AC_ARG_ENABLE(debug-stdcxx,
- ]
- ,debug_stdcxx=yes)
- 
--AS_IF([test x"$debug_stdcxx" == "xyes"], [
-+AS_IF([test x"$debug_stdcxx" = "xyes"], [
-   CXXFLAGS="$CXXFLAGS -D_GLIBCXX_DEBUG"
- ])
- 
-@@ -42,7 +42,7 @@ AC_ARG_ENABLE(release-tests,
- ]
- ,release_tests=yes)
- 
--AS_IF([test x"$release_tests" == "xyes"], [
-+AS_IF([test x"$release_tests" = "xyes"], [
-   CXXFLAGS="$CXXFLAGS -DNDEBUG -O2"
- ])
- 
-@@ -56,11 +56,11 @@ AC_ARG_ENABLE(loop-unrolling,
-     [enable_loop_unrolling="$enableval"],[enable_loop_unrolling=yes]
- )
- 
--AS_IF([test x"$enable_loop_unrolling" == "xno"], [
-+AS_IF([test x"$enable_loop_unrolling" = "xno"], [
-   CXXFLAGS="$CXXFLAGS -DMDDS_LOOP_UNROLLING=0"
- ])
- 
--AS_IF([test x"$enable_gcov" == "xyes"], [
-+AS_IF([test x"$enable_gcov" = "xyes"], [
-   CXXFLAGS="$CXXFLAGS --coverage -O0"
- ])
- 
-@@ -69,7 +69,7 @@ AC_ARG_ENABLE(openmp,
-     [enable_openmp="$enableval"],[enable_openmp=yes]
- )
- 
--AS_IF([test x"$enable_openmp" == "xyes"], [
-+AS_IF([test x"$enable_openmp" = "xyes"], [
-   CXXFLAGS="$CXXFLAGS -fopenmp -DMDDS_USE_OPENMP=1"
-   LDFLAGS="$LDFLAGS -fopenmp"
- ])
-@@ -79,7 +79,7 @@ AC_ARG_ENABLE(sanitizer-coverage,
-     [enable_sanitizer_coverage="$enableval"],[enable_sanitizer_coverage=no]
- )
- 
--AS_IF([test x"$enable_sanitizer_coverage" == "xyes"], [
-+AS_IF([test x"$enable_sanitizer_coverage" = "xyes"], [
-   CXXFLAGS="$CXXFLAGS -fprofile-instr-generate -fcoverage-mapping -O0"
- ])
- 
-@@ -122,7 +122,7 @@ AC_ARG_ENABLE([werror],
- 	[enable_werror="$enableval"],
- 	[enable_werror=no]
- )
--AS_IF([test x"$enable_werror" == "xyes"], [
-+AS_IF([test x"$enable_werror" = "xyes"], [
- 	CXXFLAGS="$CXXFLAGS -Werror"
- ])
- 
--- 
-2.26.2
-
diff --git a/dev-util/mdds/files/mdds-1.7.0-rtree_test.patch b/dev-util/mdds/files/mdds-1.7.0-rtree_test.patch
deleted file mode 100644
index 391f89798915..000000000000
--- a/dev-util/mdds/files/mdds-1.7.0-rtree_test.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 7ab81002fe127d16602b85b391c1d1b0422a9afd Mon Sep 17 00:00:00 2001
-From: Kohei Yoshida <kohei.yoshida@gmail.com>
-Date: Mon, 14 Jun 2021 22:52:14 -0400
-Subject: [PATCH] std::deque::erase invalidates all elements if the erased
- element ...
-
-... is not the first or the last element. My previous assumption (
-that only the elements that occur after the erased element become
-invalid) was in fact wrong.
-
-This should resolve #66.
----
- include/mdds/rtree_def.inl | 21 ++++++++++++---------
- 1 file changed, 12 insertions(+), 9 deletions(-)
-
-diff --git a/include/mdds/rtree_def.inl b/include/mdds/rtree_def.inl
-index ed0e9be..84f0673 100644
---- a/include/mdds/rtree_def.inl
-+++ b/include/mdds/rtree_def.inl
-@@ -836,17 +836,20 @@ bool rtree<_Key,_Value,_Trait>::directory_node::erase(const node_store* ns)
-     if (it == children.end())
-         return false;
- 
--    it = children.erase(it);
-+    // NB: std::deque::erase invalidates all elements when the erased element
-+    // is somwhere in the middle. But if the erased element is either the
-+    // first or the last element, only the erased element becomes invalidated.
- 
--    // All nodes that occur after the erased node have their memory addresses
--    // shifted.
-+    std::size_t pos = std::distance(children.begin(), it);
-+    bool all_valid = pos == 0 || pos == children.size() - 1;
- 
--    std::for_each(it, children.end(),
--        [](node_store& this_ns)
--        {
--            this_ns.valid_pointer = false;
--        }
--    );
-+    it = children.erase(it);
-+
-+    if (!all_valid)
-+    {
-+        for (node_store& ns : children)
-+            ns.valid_pointer = false;
-+    }
- 
-     return true;
- }
--- 
-GitLab
-
diff --git a/dev-util/mdds/mdds-1.7.0.ebuild b/dev-util/mdds/mdds-1.7.0.ebuild
deleted file mode 100644
index aefcb358f629..000000000000
--- a/dev-util/mdds/mdds-1.7.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://gitlab.com/mdds/mdds.git"
-	inherit git-r3
-else
-	SRC_URI="https://kohei.us/files/${PN}/src/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-fi
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Collection of multi-dimensional data structure and indexing algorithm"
-HOMEPAGE="https://gitlab.com/mdds/mdds"
-
-LICENSE="MIT"
-SLOT="1/1.5" # Check API version on version bumps!
-IUSE="doc openmp valgrind test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	doc? (
-		app-doc/doxygen
-		dev-python/sphinx
-	)
-	valgrind? ( dev-util/valgrind )
-"
-DEPEND="dev-libs/boost:="
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.5.0-buildsystem.patch"
-	"${FILESDIR}/${P}-bashism.patch" # bug 723094
-	"${FILESDIR}/${P}-rtree_test.patch" # bug 775056
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable doc docs)
-		$(use_enable openmp)
-		$(use_enable valgrind memory_tests)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	tc-export CXX
-	default
-}
diff --git a/dev-util/mdds/mdds-2.0.3.ebuild b/dev-util/mdds/mdds-2.0.3.ebuild
index 946458f73bb0..6599638fac76 100644
--- a/dev-util/mdds/mdds-2.0.3.ebuild
+++ b/dev-util/mdds/mdds-2.0.3.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://kohei.us/files/${PN}/src/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 fi
 inherit autotools toolchain-funcs
 
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index 0c8d7bd42716..cb9ce9fa656f 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -4,9 +4,9 @@ DIST cuda_11.6.0_510.39.01_linux.run 3488951771 BLAKE2B f66d8b7779dc8e1e06ef5b83
 DIST cuda_11.6.1_510.47.03_linux.run 3529826023 BLAKE2B 93acd3a2984e89b1458d11051f4927e7bd2ac20bccce9166a2a4efcf16cf01a1ccbb6fa8be2f7a82ef1b5a403e4814c1e24aca493dd246c3a3c16e9107fbc1cc SHA512 75c8f28bcd3de638f780b4d8c5e80cea3023fb0e57b4075bd6905071da273e9d09281d947d660f2e4ab6d71f47c12cc021f12656fd8fbf56d11cf7e520e90a9e
 DIST cuda_11.6.2_510.47.03_linux.run 3462542823 BLAKE2B 8160591bc491a8d18bf9810c248a1e1966f82f6170fe4f98915fd51e984e594da390aab2eddee8a02ee245428c9db3ca4dbf6871d71a54823c06b5ba16769c4d SHA512 8afec50a2697074ee25eca59d5061041eb517bf324e20c21d7595f7000b445b9baeb8902b50fd2dcee16861502a7789b1c81994e1cba312426eea24f1252f21f
 DIST cuda_11.7.0_515.43.04_linux.run 3490450898 BLAKE2B f5984a3ae67a116f7944d8e1c2b3b0a25b41aa5081bff869dd30ea2213cc96d23459dffdfd84ec145d5a860bd683d81d212f331939d7b39f9d9b5f17c838f13c SHA512 070c9a4b3bb11503d99212cf483ead88ae182e7da7eabd7390a0211b57ea550fb8a806ed3c009b8bae654529a7dc6c11dd35c0d59066f6f4eebe064c94d4e071
-EBUILD nvidia-cuda-toolkit-11.5.1-r1.ebuild 7593 BLAKE2B e428e8a25ea69f0274eb87ace918fcb5f13d0c60635a0ead0edbaaf29b85149610b703d41c19094f0d159566d9f5a741841bdc2f5187ec9b50cd5a71f3cd86cd SHA512 d7238f3a1fd3b4585b2e1a374d4ae3ce02bcc2938488bc2a4755f624d6e24fb8650a5f580fd6501e5d28f38879a81c9f19cd5b8af7914b107f5e707e1d0b1e91
-EBUILD nvidia-cuda-toolkit-11.6.0.ebuild 7883 BLAKE2B 77a825c4a6f4d92910a36d47e8de59d7c0ceb3593c90592c9adf7566f6c89dc0694029ec84e6a13f37c3079d9f78e99aa1ff4b38437d9e82c2141359d024c3e4 SHA512 f1e565ed37015a363256b31c1aff63dd894ee12dd4e87fb10705f6425dd5cddc890f0f951b97119dd8fd3473f6dd63225b9b04751b8a29a80e311f392caaa332
-EBUILD nvidia-cuda-toolkit-11.6.1.ebuild 7883 BLAKE2B 48e3bc6d54e0da99aea1abaaecb3bb3176cd903c934de16e3309eb1d839377840abf1eb94ae39bc33ca543d8eccd2a3e3d476c476cae0063139c6a6274301fa2 SHA512 fb58a51dbf9402264121c09df93861fd7714544890b66c06a9207138571eeebe960165b5dca788132433d0a7bcfd81092755c7fe9e4a5c6625b24fc8413f5e20
-EBUILD nvidia-cuda-toolkit-11.6.2.ebuild 7883 BLAKE2B 48e3bc6d54e0da99aea1abaaecb3bb3176cd903c934de16e3309eb1d839377840abf1eb94ae39bc33ca543d8eccd2a3e3d476c476cae0063139c6a6274301fa2 SHA512 fb58a51dbf9402264121c09df93861fd7714544890b66c06a9207138571eeebe960165b5dca788132433d0a7bcfd81092755c7fe9e4a5c6625b24fc8413f5e20
+EBUILD nvidia-cuda-toolkit-11.5.1-r1.ebuild 7595 BLAKE2B efbc0f8747cfb846820311457f82d13ecfde0c42d68908ef9a9de5cdae905fddb67382d96c1845098005041f93240d1b6152e91db3c9b3cbcd3c2914b5d2a858 SHA512 168ff4effb724474068ab66ca03a0963f3bc3827396279356569de11c6b3d5e973935a9117738e55f2c447d9d15f702cb5fd1a737c0be8ae52d937d77c2d18fa
+EBUILD nvidia-cuda-toolkit-11.6.0.ebuild 7885 BLAKE2B 738dddb098d327bc4bcfdb464ef6599f5dd499f9afebe9540137f07ed19f445214039d7a7a584914644db56d1adc3e2d0da1358b344f462e266db10b87fbf3b0 SHA512 be71bac77074319782dff9f9a52ec093228f3079950c7aca3c05dc33e32ca3dfce4fb45a6bfdfb025f62ebf6ed872af95fa7a8b4d11c42726682e09f8d013f5e
+EBUILD nvidia-cuda-toolkit-11.6.1.ebuild 7885 BLAKE2B cde8e87114871685e4891be06633065dc181c1ede3c7690a6d8cfe5537f518147862b426d01187c9265c452628b3db340aa1d7bcc3a63507c3d576aa79005ea7 SHA512 aff120e1c3140cb353aa37366d58c9a08185ab4ca603f4161ff33253d1e5fd065ec1a8e9d73490ca8fa2eff87464c1a15a35944b012c93c5d8560f46de1d1b57
+EBUILD nvidia-cuda-toolkit-11.6.2.ebuild 7885 BLAKE2B cde8e87114871685e4891be06633065dc181c1ede3c7690a6d8cfe5537f518147862b426d01187c9265c452628b3db340aa1d7bcc3a63507c3d576aa79005ea7 SHA512 aff120e1c3140cb353aa37366d58c9a08185ab4ca603f4161ff33253d1e5fd065ec1a8e9d73490ca8fa2eff87464c1a15a35944b012c93c5d8560f46de1d1b57
 EBUILD nvidia-cuda-toolkit-11.7.0.ebuild 7883 BLAKE2B 82d39c2fa7bf2c64f3b66064195c6e8c4fcd9abe5997e77b7811be4ff4f5c2730f8087f9bc6400d19bfb4d19bb649297e980a803809602e46925793b696f33d4 SHA512 048ea897160a7c9149f23cbc1208a72f84e342d4f236830e8b4629aae7862c9a18b30d4765dbffa0e2e0595928bffcbc7fa9fa21d860bd1ad382c002b5bfcabd
 MISC metadata.xml 671 BLAKE2B 20d0b15061270bdb0604e9e76e8913c9d304c51a05102f92b2ef64cddb1b369705a742aefca28f4d36976bb633d0a2cf090bf3d307ea579121578d29c41264e1 SHA512 09fe8a1c60ca7924e433c5aca460d6a757c9962371b3f2a3c42c2ff1b0dd819f1704dd5943bd31a3e74337ad0f14aa4d7836912a435396c15e4f0daaed33800e
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.5.1-r1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.5.1-r1.ebuild
index 9494da726a43..af1b73407ee0 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.5.1-r1.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -221,7 +221,7 @@ src_install() {
 }
 
 pkg_postinst_check() {
-	local a="$(${EROOT}/opt/cuda/bin/cuda-config -s)"
+	local a="$("${EROOT}"/opt/cuda/bin/cuda-config -s)"
 	local b="0.0"
 	local v
 	for v in ${a}; do
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.6.0.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.6.0.ebuild
index 78e78d4974bf..11c041589e75 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.6.0.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.6.0.ebuild
@@ -232,7 +232,7 @@ src_install() {
 }
 
 pkg_postinst_check() {
-	local a="$(${EROOT}/opt/cuda/bin/cuda-config -s)"
+	local a="$("${EROOT}"/opt/cuda/bin/cuda-config -s)"
 	local b="0.0"
 	local v
 	for v in ${a}; do
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.6.1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.6.1.ebuild
index 3f76059cf7ac..4df8463010fc 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.6.1.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.6.1.ebuild
@@ -232,7 +232,7 @@ src_install() {
 }
 
 pkg_postinst_check() {
-	local a="$(${EROOT}/opt/cuda/bin/cuda-config -s)"
+	local a="$("${EROOT}"/opt/cuda/bin/cuda-config -s)"
 	local b="0.0"
 	local v
 	for v in ${a}; do
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.6.2.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.6.2.ebuild
index 3f76059cf7ac..4df8463010fc 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.6.2.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.6.2.ebuild
@@ -232,7 +232,7 @@ src_install() {
 }
 
 pkg_postinst_check() {
-	local a="$(${EROOT}/opt/cuda/bin/cuda-config -s)"
+	local a="$("${EROOT}"/opt/cuda/bin/cuda-config -s)"
 	local b="0.0"
 	local v
 	for v in ${a}; do
diff --git a/dev-util/packer/Manifest b/dev-util/packer/Manifest
index 93ebe5f716f5..c3e3a09f99ee 100644
--- a/dev-util/packer/Manifest
+++ b/dev-util/packer/Manifest
@@ -1,4 +1,4 @@
 DIST packer-1.7.10-deps.tar.xz 628140836 BLAKE2B 6cfb8409a9a9aef2130e58f2b70b1bb73b491aa9fb2d1f2b59b2c3c9e721465a51111f0e6357a58e9eed4d8b024a4fe9a0f20cf9a5b84e7d20f3a8d52ad55e4c SHA512 cd0af0f60029b7b3e887fbe4245e26e12d798fe5c3b650d63774ffeb2d5eab9609d8506a06c35d8ff4d499db1cab69d767b8b386d04136fd65ea43de3940df88
 DIST packer-1.7.10.tar.gz 2414352 BLAKE2B 7c48aaac8411dd81cae2201cf9b03eab0906b78dcc6aecf654f498b44884a0758f0d5fc10d03b9e526f7753d18db8754b74d8c2eef133b4170b872f41c8261f3 SHA512 12f032afef95be92be4f6e98cf2af5548189cb179c25d74b8f7943b4a6af0ab49c5a86523f27385e5eee05624d7e9de8d572fe19442305227c5bddd21a66f97a
-EBUILD packer-1.7.10.ebuild 807 BLAKE2B 59ec21b77aae58956bc5591ae252f4c4dd7c7a3c10ae3fd5c7c4600c501eee42d8a9de2f3e71c89faa5ff0cc07c172d21ac9a7941572f44dcfc69e1ee096d361 SHA512 66a30196b814cc32a7b77f0f03788728756cfd2f47ab6421af8effd46558af013d6b31edfedc405530ca2d81da5751c35d6ed66a4a4a983377b1ed3a0a3dec47
+EBUILD packer-1.7.10.ebuild 814 BLAKE2B 87cfb6c771d3db81356e281bd38f0228ce3add56feb3cb0f503b8295a58bf47224694bd602320239eabfe0a4b331b81ac8c60d4619b7f40866b4f2ee75d3186d SHA512 5e9867211442b3cd8b275ed40a484530c60b43348290f5674c47c7d9b856f63968fdb98878817a9e0f1b09078ea4ff63e73e5ce34b52b75a18d63f7f4db71a68
 MISC metadata.xml 1408 BLAKE2B 04204c3ac4c45b58a23e611fbd34014423fd1839829101f7a30a188fc8b4588532f72b05c41a77f093170c6a6d9bd804c47bc831a8006ecbda5d3a30ccf6ade6 SHA512 2a45870ccadf85968c81c3129cfffa16184c3cc6ed135b716a84e545d9c80ed35064be231386b0bbfbe6fb7f9a12704c25d7fabc9383b3211d61720691c2ae9b
diff --git a/dev-util/packer/packer-1.7.10.ebuild b/dev-util/packer/packer-1.7.10.ebuild
index 11e6c760ac8d..2805c0f9c87d 100644
--- a/dev-util/packer/packer-1.7.10.ebuild
+++ b/dev-util/packer/packer-1.7.10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0 BSD-2 BSD-4 MIT MPL-2.0 unicode"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="~amd64 ~arm64 ~riscv"
 
 DOCS=( {README,CHANGELOG}.md )
 
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 1f574ec9ac9c..c00fbcc71351 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -5,7 +5,7 @@ DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7
 DIST linux-5.17.tar.xz 128399340 BLAKE2B 82dc4a45cc25c781ac67aa6ed1e4c369544154960f41c4634d47621f381159687a227054976d078524cda28884d395a15f7542fe44ca74ce98ca6ff54a81d6d0 SHA512 89f0a7ca69d20a539d4b612a7028a30a5e98b402e4b6b88516f14237e5da4b626d7929eab8b40fccc90766e8f3bae87e9858a19077ffad20d8204acf18794f5b
 DIST linux-5.18.tar.xz 129790264 BLAKE2B e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb SHA512 dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5
 DIST patch-5.17.1.xz 15244 BLAKE2B f340b8a103754122153dd381fe210b18ba37b7262dae4fc7a1f99c5a62868c9bdb178e83865b35f00b82bd2d67ae127c440515d1740093825f7ec7fa4c4a490d SHA512 fb9a28ce7c68daeca82586e7631dc0be00a1a8393b4cef4c659fc1f9dac6e1f941bd60671c0350d1dea9cb035f56d627f64a394a9acb00b2b5dea8a1d44c065f
-EBUILD perf-5.15-r1.ebuild 7402 BLAKE2B 4cad55c8b6ffd7ff8889fa737872e166e1c5e1271385db2c223c676d3b19f6eae1fcd0b31db8ab4f3ebd07b9e0105a502c7f9b5dd9256cfd4d2d8911b9d19c39 SHA512 b3996aeab01f19c4b40230976983455e2bd586281b13c01fc4a0f7c76f0b30954254aa5e43caccb1c9e4f8e836e9c24c60182b5b7633944c89938cd0fdaf9ece
-EBUILD perf-5.17.1.ebuild 7333 BLAKE2B d875f3553e4b54b4af9a5f56a0edd3ff7932763415447bcd08c0fa96f51309e93c7fd2ad725f68a3850acb9cd3cbeb9470ec4634bedaed3e228af5dc20c04a78 SHA512 d0ff31084203c1c1ee9b1ffe8d950f3a0b6d8682413f5537c289e657eed5545b23838a2dc96e4dc59558093f9e443b3b88c18e44a318ceddbfefcf4ecd09e07f
-EBUILD perf-5.18.ebuild 7333 BLAKE2B d875f3553e4b54b4af9a5f56a0edd3ff7932763415447bcd08c0fa96f51309e93c7fd2ad725f68a3850acb9cd3cbeb9470ec4634bedaed3e228af5dc20c04a78 SHA512 d0ff31084203c1c1ee9b1ffe8d950f3a0b6d8682413f5537c289e657eed5545b23838a2dc96e4dc59558093f9e443b3b88c18e44a318ceddbfefcf4ecd09e07f
+EBUILD perf-5.15-r1.ebuild 7402 BLAKE2B 34680ee1fa303907add5dec4f041a978e41c5812bdef05141b6e4d3f8a31d984166788c6250f18ebcf6e4f6b4b4b55a71187d6084c149c7b2e684a470658a30b SHA512 c9395d36355c5bb83a28cfbefeab508baf1fd1a35fc817107a28000ef46f4c631893077d82218b9bc9949d5bf28ea633f657b40e91b1974a0093619388f410d7
+EBUILD perf-5.17.1.ebuild 7333 BLAKE2B 0d41316a6c0b736f5250af84d7e39ac69e9670b54ee46965f7a80de5bb64eb0e7b45e9e1ec8288850c853db035506269bba409ce4900481532f2c0384e84d77f SHA512 459add81f9fe2b917908286186bbad5e65253483b5b9e40983e6edb2cb1a1eba42682c815f73b25ae31e7ef8fd2a8b54efe4c1f3464677517d80b5a2282c1d72
+EBUILD perf-5.18.ebuild 7333 BLAKE2B 0d41316a6c0b736f5250af84d7e39ac69e9670b54ee46965f7a80de5bb64eb0e7b45e9e1ec8288850c853db035506269bba409ce4900481532f2c0384e84d77f SHA512 459add81f9fe2b917908286186bbad5e65253483b5b9e40983e6edb2cb1a1eba42682c815f73b25ae31e7ef8fd2a8b54efe4c1f3464677517d80b5a2282c1d72
 MISC metadata.xml 1484 BLAKE2B 243ab78a71b56aae7a125cf18435a0e7b37e956a7483986efd07c60c16d6817f53bc30d182f7b413379fdbff7fb5a50faf5be180415bf16b57e793afea80517c SHA512 504af925b9b73dc041e79233dd88b1a8aeb382de82db301cecc3dcc6194836bf1b2e80b104cc83be445d1383f7b1a78a0b46edb40988670764874643a99d9028
diff --git a/dev-util/perf/perf-5.15-r1.ebuild b/dev-util/perf/perf-5.15-r1.ebuild
index 21985387f161..9f1e52387618 100644
--- a/dev-util/perf/perf-5.15-r1.ebuild
+++ b/dev-util/perf/perf-5.15-r1.ebuild
@@ -150,10 +150,10 @@ src_prepare() {
 	# Drop some upstream too-developer-oriented flags and fix the
 	# Makefile in general
 	sed -i \
-		-e "s:\$(sysconfdir_SQ)/bash_completion.d:$(get_bashcompdir):" \
+		-e "s@\$(sysconfdir_SQ)/bash_completion.d@$(get_bashcompdir)@" \
 		"${S}"/Makefile.perf || die
 	# A few places still use -Werror w/out $(WERROR) protection.
-	sed -i -e 's:-Werror::' \
+	sed -i -e 's@-Werror@@' \
 		"${S}"/Makefile.perf "${S_K}"/tools/lib/bpf/Makefile || die
 
 	# Avoid the call to make kernelversion
diff --git a/dev-util/perf/perf-5.17.1.ebuild b/dev-util/perf/perf-5.17.1.ebuild
index a2e565d93fcb..773d205044fc 100644
--- a/dev-util/perf/perf-5.17.1.ebuild
+++ b/dev-util/perf/perf-5.17.1.ebuild
@@ -148,10 +148,10 @@ src_prepare() {
 	# Drop some upstream too-developer-oriented flags and fix the
 	# Makefile in general
 	sed -i \
-		-e "s:\$(sysconfdir_SQ)/bash_completion.d:$(get_bashcompdir):" \
+		-e "s@\$(sysconfdir_SQ)/bash_completion.d@$(get_bashcompdir)@" \
 		"${S}"/Makefile.perf || die
 	# A few places still use -Werror w/out $(WERROR) protection.
-	sed -i -e 's:-Werror::' \
+	sed -i -e 's@-Werror@@' \
 		"${S}"/Makefile.perf "${S_K}"/tools/lib/bpf/Makefile || die
 
 	# Avoid the call to make kernelversion
diff --git a/dev-util/perf/perf-5.18.ebuild b/dev-util/perf/perf-5.18.ebuild
index a2e565d93fcb..773d205044fc 100644
--- a/dev-util/perf/perf-5.18.ebuild
+++ b/dev-util/perf/perf-5.18.ebuild
@@ -148,10 +148,10 @@ src_prepare() {
 	# Drop some upstream too-developer-oriented flags and fix the
 	# Makefile in general
 	sed -i \
-		-e "s:\$(sysconfdir_SQ)/bash_completion.d:$(get_bashcompdir):" \
+		-e "s@\$(sysconfdir_SQ)/bash_completion.d@$(get_bashcompdir)@" \
 		"${S}"/Makefile.perf || die
 	# A few places still use -Werror w/out $(WERROR) protection.
-	sed -i -e 's:-Werror::' \
+	sed -i -e 's@-Werror@@' \
 		"${S}"/Makefile.perf "${S_K}"/tools/lib/bpf/Makefile || die
 
 	# Avoid the call to make kernelversion
diff --git a/dev-util/pkgdev/Manifest b/dev-util/pkgdev/Manifest
index 8ff5ae49199d..4470db6fb4b8 100644
--- a/dev-util/pkgdev/Manifest
+++ b/dev-util/pkgdev/Manifest
@@ -1,10 +1,5 @@
 AUX pkgdev-0.2.1-fix-signoff-example.patch 920 BLAKE2B dbf577e4dbc374b26519d459b2bb17ae5dc659e8373a7cf3aac52699c6ec101159fbdb2fce78b8b22b525637e35b6aea0e2b94ed9d81fc3e320b7290934cde09 SHA512 aa9f067dcbec520392327333317eef17f3153369e0d072d2b0f85f971de2151a649d5ce23183fcbb4b6210b872ce905f99e223ad91950e47dc7bdaa761f522a4
-DIST pkgdev-0.1.9.tar.gz 57093 BLAKE2B 5f5d9b4956cdc949d5e37c24160c692c32cf7e5d9fe90c167adc364993370dc42291edca048db3b0a2f17b199003aea61bd6b541bc58de1c1a084365ce517660 SHA512 78c117163549cb021e8cb9bd65e9a7752633506f3db825133fc3c4c515549c6e10dc974164489c06f94c1a1e25acb8fe050a57754353b907d6026892ef034cb2
-DIST pkgdev-0.2.0.tar.gz 59836 BLAKE2B 89de7179b1365f7f4bf1359720200bc8dba53e3b3133fead12b224db8d9a6cf7accbed3c5ed89760030efd3a992d46cf525756a522ac4d9128376e4c03b2a5e9 SHA512 6bf17e8188c809e8862c1a39ce4c0c2e60ed0a261f00bf93707257df0395b03120838247bdc7f5a3375111797564a5a6b16bb8f7e571ce957efe92e173a6ed11
 DIST pkgdev-0.2.1.tar.gz 66455 BLAKE2B 6f89b1601813adcb1263a044a096d187d7fa926f116a09dc2b1cec083f8d82da54ae00577c36d64ece5733d8952f8dc5f4dff94aeb695e851f340a30f04b203e SHA512 8277f74f3d9902da295c5436a46302627bdc1cb2a63f29b0603bf9bfa2c8bb812b26f12a54630cbbcba1e2bbac7352146f6ab59fc04cd8b89b46df1fe7c9f8dd
-EBUILD pkgdev-0.1.9.ebuild 1587 BLAKE2B dab7a719a4103397c584290a5705bf882a1e60a7ea12d9772cd206f15a833d6712b04edc024e3e16b3d9cf2a1b2e2d88dde2cfb275eaa04207de84906cd94110 SHA512 45f80f4d7ed3cd97c5d88596e25fc495a4fc88cb888f353319461a3af5f461a1f491956d4fc93687d6a843a492676cbad208d60fdfe03dbe6d3319625260f2bf
-EBUILD pkgdev-0.2.0.ebuild 1602 BLAKE2B 4921ad31f4a0a936ed1a390f7575030c8a04d77542ca4903e0b2c93dbea27687da417b9ab1a7a3ebe4589ae0ba68f6dd2f4f7625d9e432b453c7b973a215ea02 SHA512 9da646cc648eb745a2a24d7fa0390d2add59005accfe7c6d591954671e4ca087ae8025413f6d250d0d3b3ab0090e09ae38ad315a15a0c274cd1989ca482b1b50
-EBUILD pkgdev-0.2.1-r1.ebuild 1663 BLAKE2B b6ba4edbf3d0652ed9f89c0cac0d1028f629da521483e69c291fcc2d2106278ecf5c0bff4a543ca6c997c0c75265beface0d313cc4b9ff995bc9940a890f1d49 SHA512 7b61e39836a66a35c85dd67a91f857181fcabd832486a446266ba29680ac76f03d88e92d7a10cc1ca69feafab6ef0f19c093f7bdfe1738bfbf5ba66ff4ce87cb
-EBUILD pkgdev-0.2.1.ebuild 1602 BLAKE2B 4921ad31f4a0a936ed1a390f7575030c8a04d77542ca4903e0b2c93dbea27687da417b9ab1a7a3ebe4589ae0ba68f6dd2f4f7625d9e432b453c7b973a215ea02 SHA512 9da646cc648eb745a2a24d7fa0390d2add59005accfe7c6d591954671e4ca087ae8025413f6d250d0d3b3ab0090e09ae38ad315a15a0c274cd1989ca482b1b50
+EBUILD pkgdev-0.2.1-r1.ebuild 1655 BLAKE2B edf95d40cb96f7abc2853578c87ff3e8edfeee86844e2ab942d83d55171706806f64f19cb829458f9a312d73d6e385930ab7f439a363f314ae01684e0bee63c5 SHA512 576098e57216e1639827d25aad586465a9c5fde7391e4c0521474c9e1923371903d30de1b835b5d21fd822c5ef3d6a579f2ff0935d6437e998f095d709f7c225
 EBUILD pkgdev-9999.ebuild 1604 BLAKE2B a39780d43843a44a4bac8cc14a22ea279be859e8c27b0c02bdf2f60529be3d377c42b0622d5124612f3595d7079bae8b4e94147846eb2441e98c5dfaa204ca64 SHA512 02c76fe419682bff30cdb0146e6ac8898aa6b05957a957831154847764be1fd00de0bfc95dea334b9005861d96d1ce0189594d779c4f789d6ccdb61c092d4ad2
 MISC metadata.xml 606 BLAKE2B 9c87b0b058df2a15ad455e54499d6a52e31e5c8f51187d36a42a775f1fa03745c69c99179a21f8c44f64562f78ddade051a2a4568b7984600fc529f35e36811a SHA512 5c7151cd72132faf4d47837a58812aefb919edca3fb613a6751de265994bff327515a07d80dfe175069bde7097581f10cb453dde1545383e300735dfcac09bec
diff --git a/dev-util/pkgdev/pkgdev-0.1.9.ebuild b/dev-util/pkgdev/pkgdev-0.1.9.ebuild
deleted file mode 100644
index 657e91d61ce2..000000000000
--- a/dev-util/pkgdev/pkgdev-0.1.9.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgdev.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86 ~x64-macos"
-fi
-
-DESCRIPTION="Collection of tools for Gentoo development"
-HOMEPAGE="https://github.com/pkgcore/pkgdev"
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]] ; then
-	# https://github.com/pkgcore/pkgdev/blob/main/requirements/dev.txt
-	RDEPEND="
-		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
-		~dev-util/pkgcheck-9999[${PYTHON_USEDEP}]
-		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]
-	"
-else
-	# https://github.com/pkgcore/pkgdev/blob/main/requirements/install.txt
-	RDEPEND="
-		>=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
-		>=dev-util/pkgcheck-0.10.0[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.12.0[${PYTHON_USEDEP}]
-	"
-fi
-
-# Uses pytest but we want to use the setup.py runner to get generated modules
-BDEPEND+="test? ( dev-python/pytest )"
-RDEPEND+="dev-vcs/git"
-
-distutils_enable_sphinx doc
-distutils_enable_tests setup.py
-
-python_install_all() {
-	# We'll generate man pages ourselves
-	# Revisit when a release is made
-	# to pregenerate them, making USE=doc
-	# for generating the real HTML docs only.
-	if use doc ; then
-		cd doc || die
-		emake man
-		doman _build/man/*
-	fi
-
-	cd .. || die
-
-	# HTML pages only
-	sphinx_compile_all
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/pkgdev/pkgdev-0.2.0.ebuild b/dev-util/pkgdev/pkgdev-0.2.0.ebuild
deleted file mode 100644
index 6e52159b76e3..000000000000
--- a/dev-util/pkgdev/pkgdev-0.2.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgdev.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
-fi
-
-DESCRIPTION="Collection of tools for Gentoo development"
-HOMEPAGE="https://github.com/pkgcore/pkgdev"
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]] ; then
-	# https://github.com/pkgcore/pkgdev/blob/main/requirements/dev.txt
-	RDEPEND="
-		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
-		~dev-util/pkgcheck-9999[${PYTHON_USEDEP}]
-		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]
-	"
-else
-	# https://github.com/pkgcore/pkgdev/blob/main/requirements/install.txt
-	RDEPEND="
-		>=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
-		>=dev-util/pkgcheck-0.10.0[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.12.0[${PYTHON_USEDEP}]
-	"
-fi
-
-# Uses pytest but we want to use the setup.py runner to get generated modules
-BDEPEND+="test? ( dev-python/pytest )"
-RDEPEND+="dev-vcs/git"
-
-distutils_enable_sphinx doc
-distutils_enable_tests setup.py
-
-python_install_all() {
-	# We'll generate man pages ourselves
-	# Revisit when a release is made
-	# to pregenerate them, making USE=doc
-	# for generating the real HTML docs only.
-	if use doc ; then
-		cd doc || die
-		emake man
-		doman _build/man/*
-	fi
-
-	cd .. || die
-
-	# HTML pages only
-	sphinx_compile_all
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/pkgdev/pkgdev-0.2.1-r1.ebuild b/dev-util/pkgdev/pkgdev-0.2.1-r1.ebuild
index 8b26eec8e20b..d325a89554c8 100644
--- a/dev-util/pkgdev/pkgdev-0.2.1-r1.ebuild
+++ b/dev-util/pkgdev/pkgdev-0.2.1-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+	KEYWORDS="amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv sparc x86 ~x64-macos"
 fi
 
 DESCRIPTION="Collection of tools for Gentoo development"
diff --git a/dev-util/pkgdev/pkgdev-0.2.1.ebuild b/dev-util/pkgdev/pkgdev-0.2.1.ebuild
deleted file mode 100644
index 6e52159b76e3..000000000000
--- a/dev-util/pkgdev/pkgdev-0.2.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgdev.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
-fi
-
-DESCRIPTION="Collection of tools for Gentoo development"
-HOMEPAGE="https://github.com/pkgcore/pkgdev"
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]] ; then
-	# https://github.com/pkgcore/pkgdev/blob/main/requirements/dev.txt
-	RDEPEND="
-		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
-		~dev-util/pkgcheck-9999[${PYTHON_USEDEP}]
-		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]
-	"
-else
-	# https://github.com/pkgcore/pkgdev/blob/main/requirements/install.txt
-	RDEPEND="
-		>=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
-		>=dev-util/pkgcheck-0.10.0[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.12.0[${PYTHON_USEDEP}]
-	"
-fi
-
-# Uses pytest but we want to use the setup.py runner to get generated modules
-BDEPEND+="test? ( dev-python/pytest )"
-RDEPEND+="dev-vcs/git"
-
-distutils_enable_sphinx doc
-distutils_enable_tests setup.py
-
-python_install_all() {
-	# We'll generate man pages ourselves
-	# Revisit when a release is made
-	# to pregenerate them, making USE=doc
-	# for generating the real HTML docs only.
-	if use doc ; then
-		cd doc || die
-		emake man
-		doman _build/man/*
-	fi
-
-	cd .. || die
-
-	# HTML pages only
-	sphinx_compile_all
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/ply/Manifest b/dev-util/ply/Manifest
index 1619d3f79add..1eccb6d442b5 100644
--- a/dev-util/ply/Manifest
+++ b/dev-util/ply/Manifest
@@ -1,4 +1,4 @@
 DIST ply-2.1.1-arm-build-fix.patch 1433 BLAKE2B 305bb06ce1e5516dc3868cd276edc94d89cb7c20866094c6947092048af2c090a29bae52dc82956cbf7f36e42e15d873c553948dade17f4b1f9d490bb8191ed9 SHA512 e7572e5e777e13b483e9123fc5c62d63f3f1a2c753d7dedce8de8d78a4c5baa9c10b45b0e31ba16a92b0e2af11e206662cfe815643f0a8145f8d79e388d536b9
 DIST ply-2.1.1.tar.gz 71578 BLAKE2B b63d0bd355985035b8d1c934c13982e21eeda0d710f40b8131562e9ef6a21a3eaf04960b871f5ab83d718ab1726450996988a2aef1a6fbd2e8f1a3c55db92beb SHA512 fdc66d752989a239e01d2746e6c56610c2c945fbeeff8f2a79be1db487a6cbba365d1bd1b553d25c43a3fdc3634ab96bf4a37ab4f694c6eb6eba82c35b37231e
-EBUILD ply-2.1.1-r1.ebuild 1152 BLAKE2B 734d087c563d20908fe4e955f7d99e57591b380ebe21b984819bd9853ea0b7fd9cef771cfff0c18d9de4214511d0b5bc773c60c2e18f7597bd5b5c11dc713cd4 SHA512 fdb92e65ef8063fb29c8312e7fa26ac0e9432c4550eba8a5a5e2bb965d18f28eb2fbbb3f2f4b3d594a3b6edf635da1eb640db9b871106a7e0ad4e7b217c0c098
+EBUILD ply-2.1.1-r1.ebuild 1153 BLAKE2B a20a03dfe620089eeef14dd66024987988bc41764981269f90bed5a0caf9c639559bb76ed7a2733c10b21142483e2018028c7dc747ca0d27881aa452f41541a6 SHA512 f874469caf76087df9b38cd3b31fa93f205848f9d84352312940d2563646b1521679753bc278619d24a7bf250b889ee57533a69f7019b68b491b0495eb169b9a
 MISC metadata.xml 686 BLAKE2B 4f79afe33694be9e96ba00640dfbbd096e307af9a7b62277fc5e8ea865f88462343511d3bcf72b132649c240fca68c345e1994b36a5949dc428b20d78e03449e SHA512 ef92a165fd0df510f4f0f4ea5a08ee164293c43173ded75d7a8eb9b9fcb0ac7e9193d2cb37d7aa7957b426cb0dacddec9903ff51d8aed8eacf9a046393bc1657
diff --git a/dev-util/ply/ply-2.1.1-r1.ebuild b/dev-util/ply/ply-2.1.1-r1.ebuild
index d90a8aeee807..05d466b6b261 100644
--- a/dev-util/ply/ply-2.1.1-r1.ebuild
+++ b/dev-util/ply/ply-2.1.1-r1.ebuild
@@ -21,7 +21,7 @@ RDEPEND="!sys-boot/plymouth"
 
 pkg_pretend() {
 	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
-		~BPF_JIT ~HAVE_BPF_JIT ~BPF_EVENTS"
+		~BPF_JIT ~HAVE_EBPF_JIT ~BPF_EVENTS"
 
 	check_extra_config
 }
diff --git a/dev-util/pycharm-community/Manifest b/dev-util/pycharm-community/Manifest
index 0684f4aa5672..ad628e291bc0 100644
--- a/dev-util/pycharm-community/Manifest
+++ b/dev-util/pycharm-community/Manifest
@@ -1,8 +1,8 @@
 AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73156f63892b1e126ac068d5b2f271d1b71a77486205848cce72452d671692418b6e09e8e25da60e SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2
 DIST pycharm-community-2021.1.2.tar.gz 466806126 BLAKE2B 403cc5949ccb0e5f7d39d55b91d962889e35342715501466c007a5b3b044cbe33260de99e7d299f35a6e789c6f7e5726bc7106bc206d4e4890f8948eab7a15a2 SHA512 180d813d1162456312eb4482f414443350d784effab56cc53f2f6c2c79931f9af597849ec395089d8fc1ca2b87015722fad3cc43e03bfb4418e2c926b5af0107
-DIST pycharm-community-2021.3.3.tar.gz 505370200 BLAKE2B 52b236f8e556cb64dfc4688a6580606ae5f39cad4db204fcf19565565306ffcc516393e66a92c951dea3e8997b75e97e2fbad199a35b1807e737a62bb319df31 SHA512 146bfdd6fdff1714f6ed569fce31c9ebbe64359c28ae9069738f24bf1022071ca157ccb3bb4e8fe2ef906d3bde85d94b7d3f9e2cd3d650e6498f5c32a0fad706
+DIST pycharm-community-2022.1.2.tar.gz 540611282 BLAKE2B 0b83dda7b6ac4b8b2dfb3187893533b7399ed5a4db1022ef1c0466ee6ef1b9440c8dbe17bf50a588d8a4c6a94b2944bfe8d5a60eb10b7ecbc2c1d49018235a8c SHA512 1c0bab9ddbe33b8661ec6d0ee40a507a3a74c5336f06f2f903656661326fcff265f05dd0d99eb704af238e1012fb240883ce47bf6f5b831fe2565ac0cd2a22ff
 DIST pycharm-community-2022.1.tar.gz 540005306 BLAKE2B db0ac63e81e618484936cd1859acc366690ec81ce8eb722cf91ec1d0c109321fc156b88a41af06fc3d28af942387c816d709bf5a18970472b701a6fb4c4d1928 SHA512 2d1f048d0318ecce3334257e9119c84a1af612635a06bcc0335679bb03c046e4a76e06b4d54ee4ba700fbfd3ad120fd19b4b82e80c6ad52420b9a91e9c197321
 EBUILD pycharm-community-2021.1.2-r1.ebuild 3198 BLAKE2B 94d0ce4a952f182fcca3d10ab2f405d9fec7dbfa10638e5bf73f870300cb4b172fe6c1717ebf2dbeb3a731900ac981c87ebc327d6108b2917498e1a26f0ba607 SHA512 6fa94b51a29292e428850e99ae95776339a49afa4d8840d2f5b876546e797755c09778e60387fba9442f4a4b19ac6c8caaaca44d94cee59413231e4eb8042db9
-EBUILD pycharm-community-2021.3.3.ebuild 3165 BLAKE2B 0a44bac0d58eea54735acc9b257f5267c34e5ba3847c04684c2d3917fc67e914cd4d188447876da47fb2b8df8762afff5a832c18e023b2434b7c8434c47a97a5 SHA512 ecce4a8f505740d89963893977f4da1a12fbec4f13dd14406a8f4295ca643fc0e74d29f157476b639d3b7dfd305c88ebea6f67a276f4c7516a6d3728d084f7ba
+EBUILD pycharm-community-2022.1.2.ebuild 3171 BLAKE2B dfeda95c96764dc909ed829788c85573354fc87cc7e3ead8bf1f7b64846ce5be7f0922b01e6d3bf5800880aab09b90329cc4e6709bcc94b879dd22d5901b928e SHA512 652b28798bbd775c3036ac0242cbddfad92f9f71df0b723603ce48f5f70a338ecaa4916ffc52a31f448c47942850766d36b1263c9589138c9269d357656a25b5
 EBUILD pycharm-community-2022.1.ebuild 3159 BLAKE2B 2296aba03357caad8b050b8563c071e57695dccf7b6ccb5d022186c7c9ee932ed8c7efc6b9c8293eb36c9af0117c0da9f1662e734bdeeeb5e974c8c479c6cb45 SHA512 c0c4559f7cdb0483b2fe693fac85317ec274b21131db353a2b306e78eeb04f27f78b3db2ec43a9e0403129914a0ccc19f4ff747de889934a85c0e166df29886c
 MISC metadata.xml 305 BLAKE2B a5ee9ceb727e22160e23fc785ddcf2b7b22afd9599e956de38bf4318c4cab2acf5cffa6d1f075ac24d866d407e9412ba02362c9942b3aa34a7276e55cc44f161 SHA512 e67f65a2f5fcb0c7a7bfecdbba77c91844e89f4110ec66bb5838fdf7fb5abb57d141c2a816b7867001fc919c8721fd7837705b9a4f8853ce0728e33096fee19f
diff --git a/dev-util/pycharm-community/pycharm-community-2021.3.3.ebuild b/dev-util/pycharm-community/pycharm-community-2022.1.2.ebuild
similarity index 94%
rename from dev-util/pycharm-community/pycharm-community-2021.3.3.ebuild
rename to dev-util/pycharm-community/pycharm-community-2022.1.2.ebuild
index 219b26936799..308a7ffdcb3b 100644
--- a/dev-util/pycharm-community/pycharm-community-2021.3.3.ebuild
+++ b/dev-util/pycharm-community/pycharm-community-2022.1.2.ebuild
@@ -34,13 +34,13 @@ RDEPEND="!bundled-jdk? ( >=virtual/jre-1.8 )
 	media-libs/freetype:2=
 	media-libs/harfbuzz
 	media-libs/libglvnd
+	media-libs/libjpeg-turbo:0=
 	media-libs/libpng:0=
 	net-libs/gnutls
 	net-print/cups
 	sys-apps/dbus
 	sys-libs/libcap
 	sys-libs/zlib
-	virtual/jpeg:0=
 	x11-libs/libX11
 	x11-libs/libxcb
 	x11-libs/libXext
@@ -97,9 +97,9 @@ src_install() {
 		rm -r "${JRE_DIR}" || die
 	fi
 
-	fperms 755 "${DIR}"/bin/{format.sh,fsnotifier,inspect.sh,ltedit.sh,pycharm.sh,printenv.py,restart.py}
+	fperms 755 "${DIR}"/bin/{format.sh,fsnotifier,inspect.sh,ltedit.sh,pycharm.sh,restart.py}
 
-	fperms 755 "${DIR}"/"${JRE_DIR}"/bin/{jaotc,java,javac,jcmd,jdb,jfr,jhsdb,jjs,jmap,jps,jrunscript,jstack,jstat,keytool,pack200,rmid,rmiregistry,serialver,unpack200}
+	fperms 755 "${DIR}"/"${JRE_DIR}"/bin/{jaotc,java,javac,jcmd,jdb,jfr,jhsdb,jinfo,jjs,jmap,jps,jrunscript,jstack,jstat,keytool,pack200,rmid,rmiregistry,serialver,unpack200}
 	fperms 755 "${DIR}"/"${JRE_DIR}"/lib/{chrome-sandbox,jcef_helper,jexec,jspawnhelper}
 
 	make_wrapper "${PN}" "${DIR}/bin/pycharm.sh"
diff --git a/dev-util/rocprofiler/Manifest b/dev-util/rocprofiler/Manifest
new file mode 100644
index 000000000000..51baf5ccba45
--- /dev/null
+++ b/dev-util/rocprofiler/Manifest
@@ -0,0 +1,8 @@
+AUX rocprofiler-4.3.0-fix-gcc11.patch 410 BLAKE2B 04516f2da7ed09de30243bb05241489deb9ee23e94ef5014dede9c9d54869d24a8467699cdc7e7fa5840c98102b386555c40ab77c4fe1d9679d2bdf17fb7855f SHA512 170963d5a52b5b42924f39d0dc9b2c6c8e4ae468b97cf453a28d6a1be8f2b5bf49f73de80a40cd98b837038f53bbd4002f9ed83864129c36682f317b376da83c
+AUX rocprofiler-4.3.0-gentoo-location.patch 2651 BLAKE2B 296c84acb0887ef0792698636ca521d749fb81e283e0e42a9799f2af002a7f5397eb9051ee2711b3d78a34b9061db3be420e7de07fc1c0ee478c2b6402cecfa5 SHA512 a55c83584fb40a0a342125ae88689eea7857e6663759e5d5664a9c618afeea74662d551e9cab78ec03859d4503d67ea0f6b26143a8bea05d213f6426112ffb18
+AUX rocprofiler-5.0.2-gentoo-location.patch 2218 BLAKE2B 1f7a2279ee98be6ca5f225e4a034c661f992a61010d43096e63174a38b9bdb02726d7dfd32d8cbf2b9f328c25edd030f9db8d6cc1043ecf28f908aba94173f97 SHA512 83de59a2650349d9ce3ca761a67d0cb5e3c8f5b1c64eef75637ddd7fbba2cc869c5ce6665966bd033df9f5dbbf99677de6b433ef4398814acdcefaf6687c79df
+DIST rocprofiler-4.3.0.tar.gz 1402250 BLAKE2B 3826c3b26b0d5838ab3475614c2ecd2265e177fe40b8a90abb491746513bd50841e5ceb34d1fcb4bcb2fbe8a6854b9715d0670d38f08775e5e14cd855f15629b SHA512 e327146604459f2f827ab943a21d0eaa0ee41cf6770ab94dd019d461cf6438e70a48139ce67ec1553d0f450fa5bb233a7ed39438e8bf39b33218d53e2c270d3b
+DIST rocprofiler-5.0.2.tar.gz 1401732 BLAKE2B ae870bc50dbd39c11e24f77ccb41773df1107b76cb7a12e1cebc66f8d66ddba6ad3bd6f9fe61657b03b22ef35f88fb608cf6070178f6aab24fe7a1bdcac43a96 SHA512 244e2b827126b7299ec0510daa5e1245a4a5a877394419f8bc9113f443231f67fc935609cbde6eeb26bb138ab4e95e2a88829ffa79ecc8f9881b5a77b5910c02
+EBUILD rocprofiler-4.3.0.ebuild 1535 BLAKE2B 005e60d70f9f864ec8084ea75719a1bc3e921df7ca375f9d2db59106da35aecd22afa6a394fc38699da7b38aec4afe5e73b181ac5ef458396cf5fb15aff4528a SHA512 d8bae2d1077a1e628769fdc2692dcfbc9d18780aa26735be8a79688575ac9f7ecd9ba2d213f4551c0f6639928f87d01d0981fcba25ddf8323bffc4a327f23c54
+EBUILD rocprofiler-5.0.2.ebuild 1498 BLAKE2B f8ae118b0187d8ce12c2768d19a3d0e45efe29c7634109dec2307a7f9423735fa5c939ecdf876a7464e9187dde65415a4f38bd26bd5d16eb3c63e0e2ddfeb892 SHA512 9a6c3d028d65ba230932d7a7121aa5a427aad2ba44b8af6e069415d372aba8ac09842aa6729aa9ef4cec68fb05ce7041e6cdcfceca75c4b56f0e60f13734a828
+MISC metadata.xml 493 BLAKE2B 79000a74b13a0d35e0bcdb8254471fde9027c498ca75e761a3f694690315149e711ae8f7b73ae9bc5aa462358784fac055b975149109829e00cb2acac73ef138 SHA512 3f49c336aee801fb73d26b9d43a52816ca15c75061bed885c1b1406929ae1a3b9b01ce6f3c71b17ca9e121dcbc73f525d5a843c526ea8d4b433642eeff89ccd5
diff --git a/dev-util/rocprofiler/files/rocprofiler-4.3.0-fix-gcc11.patch b/dev-util/rocprofiler/files/rocprofiler-4.3.0-fix-gcc11.patch
new file mode 100644
index 000000000000..0aec99627a4a
--- /dev/null
+++ b/dev-util/rocprofiler/files/rocprofiler-4.3.0-fix-gcc11.patch
@@ -0,0 +1,13 @@
+Index: rocprofiler-rocm-4.3.0/test/ctrl/test_kernel.h
+===================================================================
+--- rocprofiler-rocm-4.3.0.orig/test/ctrl/test_kernel.h
++++ rocprofiler-rocm-4.3.0/test/ctrl/test_kernel.h
+@@ -23,7 +23,7 @@ THE SOFTWARE.
+ #ifndef TEST_CTRL_TEST_KERNEL_H_
+ #define TEST_CTRL_TEST_KERNEL_H_
+ 
+-#include <string.h>
++#include <string>
+ #include <stdint.h>
+ #include <map>
+ 
diff --git a/dev-util/rocprofiler/files/rocprofiler-4.3.0-gentoo-location.patch b/dev-util/rocprofiler/files/rocprofiler-4.3.0-gentoo-location.patch
new file mode 100644
index 000000000000..b6d8454dfedd
--- /dev/null
+++ b/dev-util/rocprofiler/files/rocprofiler-4.3.0-gentoo-location.patch
@@ -0,0 +1,71 @@
+Index: rocprofiler-rocm-4.3.0/bin/rpl_run.sh
+===================================================================
+--- rocprofiler-rocm-4.3.0.orig/bin/rpl_run.sh
++++ rocprofiler-rocm-4.3.0/bin/rpl_run.sh
+@@ -25,18 +25,18 @@
+ time_stamp=`date +%y%m%d_%H%M%S`
+ BIN_DIR=$(dirname $(realpath ${BASH_SOURCE[0]}))
+ PKG_DIR=$(dirname $BIN_DIR)
+-ROOT_DIR=$(dirname $PKG_DIR)
+-TT_DIR=$ROOT_DIR/roctracer
++ROOT_DIR=$PKG_DIR
++TT_DIR=$ROOT_DIR
+ RUN_DIR=`pwd`
+ TMP_DIR="/tmp"
+ DATA_DIR="rpl_data_${time_stamp}_$$"
+ 
+-RPL_PATH=$PKG_DIR/lib
+-TLIB_PATH=$PKG_DIR/tool
+-TTLIB_PATH=$TT_DIR/tool
+-ROCM_LIB_PATH=$ROOT_DIR/lib
++RPL_PATH=$PKG_DIR/@LIB_DIR@
++TLIB_PATH=$PKG_DIR/@LIB_DIR@
++TTLIB_PATH=$TT_DIR/@LIB_DIR@
++ROCM_LIB_PATH=$ROOT_DIR/@LIB_DIR@
+ 
+-GFX=`/opt/rocm/bin/rocm_agent_enumerator | tail -1`
++GFX=`rocm_agent_enumerator | tail -1`
+ 
+ SPM_COUNTERS_FILE="spm_counters.txt"
+ 
+@@ -75,7 +75,7 @@ export ROCP_HSA_INTERCEPT=1
+ # Disabling internal ROC Profiler proxy queue (simple version supported for testing purposes)
+ unset ROCP_PROXY_QUEUE
+ # ROC Profiler metrics definition
+-export ROCP_METRICS=$PKG_DIR/lib/metrics.xml
++export ROCP_METRICS=$PKG_DIR/share/rocprofiler/metrics.xml
+ # Disable AQL-profile read API
+ export AQLPROFILE_READ_API=0
+ # ROC Profiler package path
+@@ -109,7 +109,7 @@ usage() {
+   bin_name=`basename $0`
+   echo "ROCm Profiling Library (RPL) run script, a part of ROCprofiler library package."
+   echo "Full path: $BIN_DIR/$bin_name"
+-  echo "Metrics definition: $PKG_DIR/lib/metrics.xml"
++  echo "Metrics definition: $PKG_DIR/share/rocprofiler/metrics.xml"
+   echo ""
+   echo "Usage:"
+   echo "  $bin_name [-h] [--list-basic] [--list-derived] [-i <input .txt/.xml file>] [-o <output CSV file>] <app command line>"
+@@ -270,7 +270,7 @@ run() {
+   fi
+   if [ "$KFD_TRACE" = 1 ] ; then
+     API_TRACE=${API_TRACE}":kfd"
+-    MY_LD_PRELOAD="$TT_DIR/lib/libkfdwrapper64.so $ROCM_LIB_PATH/libhsakmt.so.1 $MY_LD_PRELOAD"
++    MY_LD_PRELOAD="$TTLIB_PATH/libkfdwrapper64.so $ROCM_LIB_PATH/libhsakmt.so.1 $MY_LD_PRELOAD"
+   fi
+   if [ "$HIP_TRACE" = 1 ] ; then
+     API_TRACE=${API_TRACE}":hip"
+@@ -380,11 +380,11 @@ while [ 1 ] ; do
+     export ROCP_METRICS="$2"
+   elif [ "$1" = "--list-basic" ] ; then
+     export ROCP_INFO=b
+-    HSA_TOOLS_LIB="$MY_HSA_TOOLS_LIB" eval "$PKG_DIR/tool/ctrl"
++    HSA_TOOLS_LIB="$MY_HSA_TOOLS_LIB" eval "$PKG_DIR/bin/ctrl"
+     exit 1
+   elif [ "$1" = "--list-derived" ] ; then
+     export ROCP_INFO=d
+-    HSA_TOOLS_LIB="$MY_HSA_TOOLS_LIB" eval "$PKG_DIR/tool/ctrl"
++    HSA_TOOLS_LIB="$MY_HSA_TOOLS_LIB" eval "$PKG_DIR/bin/ctrl"
+     exit 1
+   elif [ "$1" = "--basenames" ] ; then
+     if [ "$2" = "on" ] ; then
diff --git a/dev-util/rocprofiler/files/rocprofiler-5.0.2-gentoo-location.patch b/dev-util/rocprofiler/files/rocprofiler-5.0.2-gentoo-location.patch
new file mode 100644
index 000000000000..0605675e41c6
--- /dev/null
+++ b/dev-util/rocprofiler/files/rocprofiler-5.0.2-gentoo-location.patch
@@ -0,0 +1,59 @@
+Index: rocprofiler-rocm-5.0.2/bin/rpl_run.sh
+===================================================================
+--- rocprofiler-rocm-5.0.2.orig/bin/rpl_run.sh
++++ rocprofiler-rocm-5.0.2/bin/rpl_run.sh
+@@ -25,16 +25,16 @@
+ time_stamp=`date +%y%m%d_%H%M%S`
+ BIN_DIR=$(dirname $(realpath ${BASH_SOURCE[0]}))
+ PKG_DIR=$(dirname $BIN_DIR)
+-ROOT_DIR=$(dirname $PKG_DIR)
+-TT_DIR=$ROOT_DIR/roctracer
++ROOT_DIR=$PKG_DIR
++TT_DIR=ROOT_DIR
+ RUN_DIR=`pwd`
+ TMP_DIR="/tmp"
+ DATA_DIR="rpl_data_${time_stamp}_$$"
+ 
+-RPL_PATH=$PKG_DIR/lib
+-TLIB_PATH=$PKG_DIR/tool
+-TTLIB_PATH=$TT_DIR/tool
+-ROCM_LIB_PATH=$ROOT_DIR/lib
++RPL_PATH=$PKG_DIR/@LIB_DIR@
++TLIB_PATH=$PKG_DIR/@LIB_DIR@
++TTLIB_PATH=$TT_DIR/@LIB_DIR@
++ROCM_LIB_PATH=$ROOT_DIR/@LIB_DIR@
+ 
+ if [ -z "$ROCP_PYTHON_VERSION" ] ; then
+   ROCP_PYTHON_VERSION=python3
+@@ -70,7 +70,7 @@ export ROCP_HSA_INTERCEPT=1
+ # Disabling internal ROC Profiler proxy queue (simple version supported for testing purposes)
+ unset ROCP_PROXY_QUEUE
+ # ROC Profiler metrics definition
+-export ROCP_METRICS=$PKG_DIR/lib/metrics.xml
++export ROCP_METRICS=$PKG_DIR/share/rocprofiler/metrics.xml
+ # Disable AQL-profile read API
+ export AQLPROFILE_READ_API=0
+ # ROC Profiler package path
+@@ -104,7 +104,7 @@ usage() {
+   bin_name=`basename $0`
+   echo "ROCm Profiling Library (RPL) run script, a part of ROCprofiler library package."
+   echo "Full path: $BIN_DIR/$bin_name"
+-  echo "Metrics definition: $PKG_DIR/lib/metrics.xml"
++  echo "Metrics definition: $PKG_DIR/share/rocprofiler/metrics.xml"
+   echo ""
+   echo "Usage:"
+   echo "  $bin_name [-h] [--list-basic] [--list-derived] [-i <input .txt/.xml file>] [-o <output CSV file>] <app command line>"
+@@ -374,11 +374,11 @@ while [ 1 ] ; do
+     export ROCP_METRICS="$2"
+   elif [ "$1" = "--list-basic" ] ; then
+     export ROCP_INFO=b
+-    HSA_TOOLS_LIB="$MY_HSA_TOOLS_LIB" eval "$PKG_DIR/tool/ctrl"
++    HSA_TOOLS_LIB="$MY_HSA_TOOLS_LIB" eval "$PKG_DIR/bin/ctrl"
+     exit 1
+   elif [ "$1" = "--list-derived" ] ; then
+     export ROCP_INFO=d
+-    HSA_TOOLS_LIB="$MY_HSA_TOOLS_LIB" eval "$PKG_DIR/tool/ctrl"
++    HSA_TOOLS_LIB="$MY_HSA_TOOLS_LIB" eval "$PKG_DIR/bin/ctrl"
+     exit 1
+   elif [ "$1" = "--basenames" ] ; then
+     if [ "$2" = "on" ] ; then
diff --git a/dev-util/rocprofiler/metadata.xml b/dev-util/rocprofiler/metadata.xml
new file mode 100644
index 000000000000..922afe7981b0
--- /dev/null
+++ b/dev-util/rocprofiler/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <maintainer type="person" proxied="yes">
+    <email>xgreenlandforwyy@gmail.com</email>
+    <name>Yiyang Wu</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ROCm-Developer-Tools/rocprofiler</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-util/rocprofiler/rocprofiler-4.3.0.ebuild b/dev-util/rocprofiler/rocprofiler-4.3.0.ebuild
new file mode 100644
index 000000000000..28e57bde66a4
--- /dev/null
+++ b/dev-util/rocprofiler/rocprofiler-4.3.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake python-any-r1
+
+DESCRIPTION="Callback/Activity Library for Performance tracing AMD GPU's"
+HOMEPAGE="https://github.com/ROCm-Developer-Tools/roctracer.git"
+SRC_URI="https://github.com/ROCm-Developer-Tools/${PN}/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-libs/rocr-runtime:${SLOT}
+	dev-util/roctracer:${SLOT}
+	"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	$(python_gen_any_dep '
+	dev-python/CppHeaderParser[${PYTHON_USEDEP}]
+	')
+"
+
+PATCHES=( "${FILESDIR}/${P}-fix-gcc11.patch"
+		"${FILESDIR}/${PN}-4.3.0-gentoo-location.patch" )
+
+python_check_deps() {
+	has_version "dev-python/CppHeaderParser[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	sed -e "s,\${DEST_NAME}/lib,$(get_libdir),g" \
+		-e "s,\${DEST_NAME}/include,include/\${DEST_NAME},g" \
+		-e "s,\${DEST_NAME}/bin,bin,g" \
+		-e "/ctrl DESTINATION/s,\${DEST_NAME}/tool,bin,g" \
+		-e "/CPACK_RESOURCE_FILE_LICENSE/d" \
+		-e "/libtool.so DESTINATION/s,\${DEST_NAME}/tool,$(get_libdir),g" -i CMakeLists.txt || die
+
+	cmake_src_prepare
+
+	sed -e "s,@LIB_DIR@,$(get_libdir),g" -i bin/rpl_run.sh || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DCMAKE_PREFIX_PATH="${EPREFIX}/usr/include/hsa"
+		-DPROF_API_HEADER_PATH="${EPREFIX}"/usr/include/roctracer/ext
+		-DUSE_PROF_API=1
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-util/rocprofiler/rocprofiler-5.0.2.ebuild b/dev-util/rocprofiler/rocprofiler-5.0.2.ebuild
new file mode 100644
index 000000000000..ff321726622e
--- /dev/null
+++ b/dev-util/rocprofiler/rocprofiler-5.0.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake python-any-r1
+
+DESCRIPTION="Callback/Activity Library for Performance tracing AMD GPU's"
+HOMEPAGE="https://github.com/ROCm-Developer-Tools/roctracer.git"
+SRC_URI="https://github.com/ROCm-Developer-Tools/${PN}/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-libs/rocr-runtime:${SLOT}
+	dev-util/roctracer:${SLOT}
+	"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	$(python_gen_any_dep '
+	dev-python/CppHeaderParser[${PYTHON_USEDEP}]
+	')
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.0.2-gentoo-location.patch" )
+
+python_check_deps() {
+	has_version "dev-python/CppHeaderParser[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	sed -e "s,\${DEST_NAME}/lib,$(get_libdir),g" \
+		-e "s,\${DEST_NAME}/include,include/\${DEST_NAME},g" \
+		-e "s,\${DEST_NAME}/bin,bin,g" \
+		-e "/ctrl DESTINATION/s,\${DEST_NAME}/tool,bin,g" \
+		-e "/CPACK_RESOURCE_FILE_LICENSE/d" \
+		-e "/libtool.so DESTINATION/s,\${DEST_NAME}/tool,$(get_libdir),g" -i CMakeLists.txt || die
+
+	cmake_src_prepare
+
+	sed -e "s,@LIB_DIR@,$(get_libdir),g" -i bin/rpl_run.sh || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DCMAKE_PREFIX_PATH="${EPREFIX}/usr/include/hsa"
+		-DPROF_API_HEADER_PATH="${EPREFIX}"/usr/include/roctracer/ext
+		-DUSE_PROF_API=1
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-util/roctracer/Manifest b/dev-util/roctracer/Manifest
index 6e5dda7642c2..3bc5ccd9bd79 100644
--- a/dev-util/roctracer/Manifest
+++ b/dev-util/roctracer/Manifest
@@ -1,8 +1,11 @@
 AUX roctracer-3.8.0-gen_ostream_ops-toPython3.patch 1496 BLAKE2B 951878e73412f08de88e073e2f790620c4a0f97d479211668cc9eb0e1d9cb3245070df8d0a81374d2a22d6c3d68591f85c99114639fc620a8c742167eb5a5044 SHA512 7a8808b33cf2c4280e70773768b4a5997aafe8916262fb4be562d42867847e6d4600a6559955c901d0841059a1b3764c6acef5b755b61f1ee116bc9b9d7a62c0
 AUX roctracer-4.3.0-glibc-2.34.patch 993 BLAKE2B 54f25b35525da414aa3eafd48398e9e1fc28f750b08fdb0193789d6df60866c384434a79b2d52113fd29dd1e261a46f2117a89334ea6839493e33c8541516f0a SHA512 fe9f9a89220ac93a05a1b23f70a24d8522c9809afd90e6c0677d78276a8db66e9bb0d9896b5a0ad751795118cc9dfccd5743108feba027fd8123d39fc20ebc33
+AUX roctracer-4.3.0-tracer_tool.patch 1554 BLAKE2B a142ec337b6baefae4da54443c6794fec1c79a7ff9bda3269c665eee046eae1c84fbab94248dc7a1dc2aaf0e5da6ce6b215694da566e10cec32b43873f961980 SHA512 cf45ee52c781623e34db493fe7f9bfb826eeb4040fd9cf88cbf03d9bce0913035ce32a1b13d9816420a4e2dbe20d19244182297e4a9cf94e6c62b6a9488aecee
 AUX roctracer-5.0.2-Werror.patch 922 BLAKE2B 5644e5450de7372ee1ad6d8158a50e006f1eae666bb62652976f88d0c36b152df59ad4b7a30e98a42fa47322777ffc90edd283c3642ca260fdbd58cf697dd88f SHA512 0b37cd7432f0d9de42c2ca2e669697b782730afc10952349d47612f59122e1a5415c83b795c6ea2fb01c695263304b7e9702e45903a7177d02a48d86734ead9f
 AUX roctracer-5.0.2-headers.patch 2452 BLAKE2B b5e34ddef1e61277d01b771b59e345c3ace07ff90f7e53c0bc50d0ebb6a13e07480173ac72b216a3fb54c3af2df5c1277fdc62db7f3e028213f71a889fa725c5 SHA512 073b45703bf37c5df1ed44843b17e08d8ada0373dce5f29a21cdea1d6d7fb73563501461a2b0c33f65c70e2c99d036523d012c7787b399a785f0ded89ad60f66
 AUX roctracer-5.0.2-strip-license.patch 681 BLAKE2B b7c78ca54fb208e1d943d9f217a8d40911a98823ff1b4c58441c87fdf60297200b4d02e5fbe685fea331c3d8f87c395291c19ac2621aa90c9fb1308071e176ba SHA512 56aae25b4c24d0f9a361c10007d0e3d90960191b08e254a0f6ffef9a36fb8d17270f8bed36c36ea866da137297ab96de4e211e8c06ace7ed7444e821f0589322
+DIST hsa-class-4.3.0.tar.gz 37431 BLAKE2B 6fa2eb327256c44e0b9af3f0eabc775059d0e37ea976be155d4c6f05c73489abbf3abda20683c3ca4c720c2e6899c690d2a104decb56f80a8f76dde0a1cc08ef SHA512 4d0c554f6ecc66495d9493df39cc7a00c2912c93285146e891efa6b636b2b44ba9b6447fada5e664fce3329abd2670333e61cc2978e9e4f5973e99d165a93131
+DIST hsa-class-f8b3870.tar.gz 37432 BLAKE2B c2a09e4a4c3708e8db432378874c63b9cefefb567ad19a9c17181ed2b60f38d0591a618f72b11f606eb44efc5e170adaf72f0ec1b93cde628ca2230a62e2d6de SHA512 f371a955bf59b7e0af07261981a6e68562fad0753d3f39d1e220034c17501abf839ed2fd88fbf376d659970395c8795a82c0560c7ed8d3b87c11c79864f5f612
 DIST rocm-tracer-4.0.0.tar.gz 462166 BLAKE2B 1294b5639a743a9d32737c72dc0f082b5a33ee1b3365f48221ad6392cdde7637926c42ea344fa96e9fc8410ea04e9ce3f535e188a25130f4be764c4d4a59b69c SHA512 312cd6c4c98a83e28a9f8b9e6123862af2e80a0d0852acff11be65d198f277c6ea194e72f6dbaccab1dd5d4af318bef28ca546e49440f22d024a546a4e5e9e15
 DIST rocm-tracer-4.2.0.tar.gz 476974 BLAKE2B 3a7be9c269fec5dcca98d7de514d97a2e1de7bbfaa54a1aca2df70453d05326564c8ee7bf793c7d176069ecd3f7f91409c6a20dd0773aa157f7abc1dac41448e SHA512 002d9fccee4761af4853e589b116bc5844b98abb84517c260aedcb5f31f5c92b862a233062ec280a6f878343c4f751d55f47fd38483e1882feb8c970f9836120
 DIST rocm-tracer-4.3.0.tar.gz 477647 BLAKE2B d597df2efef0c750637c8f509b89ad62927cb839ba7c9a42fa71882ee13d4a0bba295af19b02eda5310421e53187e9a98a76777f0d3a587e7e652ecf4c10cb6a SHA512 47ea2705a361cb863f33a9f4c1a7d5005bb679221fa95f14dd5404ef5af32377bad5c7d9807e2fff8030a9c26ac4230f2bab833344ef49ecebbd5653f0edfc2c
@@ -12,6 +15,6 @@ DIST rocprofiler-4.3.0.tar.gz 1402250 BLAKE2B 3826c3b26b0d5838ab3475614c2ecd2265
 DIST rocprofiler-5.0.2.tar.gz 1401732 BLAKE2B ae870bc50dbd39c11e24f77ccb41773df1107b76cb7a12e1cebc66f8d66ddba6ad3bd6f9fe61657b03b22ef35f88fb608cf6070178f6aab24fe7a1bdcac43a96 SHA512 244e2b827126b7299ec0510daa5e1245a4a5a877394419f8bc9113f443231f67fc935609cbde6eeb26bb138ab4e95e2a88829ffa79ecc8f9881b5a77b5910c02
 EBUILD roctracer-4.0.0-r1.ebuild 1572 BLAKE2B dbdbf598991d569c3bc4788d5be653678431df80f8dd5229f5be5a0dda05146ca9417d738ecae08eb6eb10f9056e09403b5289a25badddf5b24d1a863ea778fc SHA512 b4dc5f0f4b189139df9ffcc854daedb0a59547ad99156814ae50b95c888a209d2b4b4771e39599cc3bc5afb5fa44a4010d0fc77b8e80299ecd7a275b7bbf4647
 EBUILD roctracer-4.2.0-r1.ebuild 1809 BLAKE2B 11126fdae37659f3d58b0ca3d3f6d5bdc7664577d02c07966c8af50eae42779a02e944b994957123a85131227c904b3a86fc15a2471acb954eb326fac1c1f808 SHA512 bb934a99d460828da3569ebe848294a46170995faca74b3d97443f8ef193605dae5554d68cbc6749a15f0e686833897ebe9c376e415555ae0118d112c206aa5f
-EBUILD roctracer-4.3.0-r1.ebuild 2114 BLAKE2B 4261ddd8b20cb8a9ec6b650953055183d5c352e798230259c6a0f07df3ef054821cf29ca299774f4fc652f7cc048a2b88c85c3aac0385bbb33f6da05224ead76 SHA512 fe8e5a9963cb69936da43561778d0757e9f57172244af685a3bceeafcb434fd2a987e0361e51918b1b1fc7dd5a5a4527a0c26418ec61ea755d6b34a58f3ef40d
-EBUILD roctracer-5.0.2.ebuild 1917 BLAKE2B cf6baddd3de65a79a96f8b9ae3b4299a40af63bebc8ab2a1402a227d651cf9a7b8ce9bd1bbb27f25d73a033dfc6cd5eb2cb03be4a6746eed59796053d5316ea4 SHA512 bc8dc0e0168863597a08a0497df8d71a577e00e9a24334a39dc6e056b6a9e03bff4b4db87af90b06e6b3c4434885d0160917ab8a80caeeeaa945f5e5fe45db8d
+EBUILD roctracer-4.3.0-r2.ebuild 2397 BLAKE2B df6fcd39dee72197f4e9af17033b9413c6d559ee99d10ed6611085978205db5e8d3cc48160880140509d55d2a3ddd5ef729b5f4eb4557d23982a3c982c73909b SHA512 3c679252fb45d74d0db627621ef90c66ffc35a05eeed04762fcd6de079e5f20ffbd926189bbb37736dbe66da9d6d111d5afb78ffd63f306e2973681603f318b4
+EBUILD roctracer-5.0.2.ebuild 2417 BLAKE2B f507e90f56e1cb91950bffdec61dd33fc16f07155362420ba51923af1816b00a5c3399ebe511376076f97ab9f44c137687d31593d29c2d6fc3d36eeb5592a76a SHA512 ef83e5f30a12ad59a8f0bff05e2bd05c1d6424d0d89238cc702446757e8fd023bc91ff55cb005520258f086b7da8e57ee84cc20e90b3ea74d1f79b84dae462c4
 MISC metadata.xml 603 BLAKE2B b81a956c8e1b3d4bb6363919f82389ec7030baf7cd949e2ee8704543c515335acc8e497743dffeca426cefc5a89210e75b85c90f5dbc482f54f257e52f5fc77d SHA512 dcad8256b50fbed9b24458d845330756081aaef4c864ca753c074c6299a9dc0234e9dbe421e12e28548887d5ce8a07c06fc54d6942e4902d63964fb229cc734b
diff --git a/dev-util/roctracer/files/roctracer-4.3.0-tracer_tool.patch b/dev-util/roctracer/files/roctracer-4.3.0-tracer_tool.patch
new file mode 100644
index 000000000000..f59c83a96110
--- /dev/null
+++ b/dev-util/roctracer/files/roctracer-4.3.0-tracer_tool.patch
@@ -0,0 +1,35 @@
+Index: roctracer-rocm-4.3.0/test/CMakeLists.txt
+===================================================================
+--- roctracer-rocm-4.3.0.orig/test/CMakeLists.txt
++++ roctracer-rocm-4.3.0/test/CMakeLists.txt
+@@ -75,7 +75,7 @@ set ( TEST_DIR ${HSA_TEST_DIR} )
+ set ( TEST_DIR ${TMP} )
+ 
+ ## Util sources
+-file( GLOB UTIL_SRC "${HSA_TEST_DIR}/util/*.cpp" )
++file( GLOB UTIL_SRC "${CMAKE_CURRENT_SOURCE_DIR}/../src/util/*.cpp" )
+ 
+ if ( DEFINED ROCTRACER_TARGET )
+   ## Build test library
+Index: roctracer-rocm-4.3.0/test/tool/tracer_tool.cpp
+===================================================================
+--- roctracer-rocm-4.3.0.orig/test/tool/tracer_tool.cpp
++++ roctracer-rocm-4.3.0/test/tool/tracer_tool.cpp
+@@ -285,7 +285,7 @@ void stop_callback() { roctracer::RocTxL
+ void roctx_flush_cb(roctx_trace_entry_t* entry) {
+ #if ROCTX_CLOCK_TIME
+   timestamp_t timestamp = 0;
+-  HsaRsrcFactory::Instance().GetTimestamp(HsaTimer::TIME_ID_CLOCK_MONOTONIC, entry->time, &timestamp);
++  util::HsaRsrcFactory::Instance().GetTimestamp(HsaTimer::TIME_ID_CLOCK_MONOTONIC, entry->time, &timestamp);
+ #else
+   const timestamp_t timestamp = entry->time;
+ #endif
+@@ -1148,7 +1148,7 @@ extern "C" PUBLIC_API bool OnLoad(HsaApi
+ 
+   // Dumping HSA handles for agents and pools
+   FILE* handles_file_handle = open_output_file(output_prefix, "hsa_handles.txt");
+-  HsaRsrcFactory::Instance().DumpHandles(handles_file_handle);
++  util::HsaRsrcFactory::Instance().DumpHandles(handles_file_handle);
+   close_output_file(handles_file_handle);
+ 
+   ONLOAD_TRACE_END();
diff --git a/dev-util/roctracer/roctracer-4.3.0-r1.ebuild b/dev-util/roctracer/roctracer-4.3.0-r2.ebuild
similarity index 77%
rename from dev-util/roctracer/roctracer-4.3.0-r1.ebuild
rename to dev-util/roctracer/roctracer-4.3.0-r2.ebuild
index 5b0d3c3f5b5d..1daabb2c9bc6 100644
--- a/dev-util/roctracer/roctracer-4.3.0-r1.ebuild
+++ b/dev-util/roctracer/roctracer-4.3.0-r2.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8,10} )
 
 inherit cmake prefix python-any-r1
 
 DESCRIPTION="Callback/Activity Library for Performance tracing AMD GPU's"
 HOMEPAGE="https://github.com/ROCm-Developer-Tools/roctracer.git"
 SRC_URI="https://github.com/ROCm-Developer-Tools/roctracer/archive/rocm-${PV}.tar.gz -> rocm-tracer-${PV}.tar.gz
-		https://github.com/ROCm-Developer-Tools/rocprofiler/archive/rocm-${PV}.tar.gz -> rocprofiler-${PV}.tar.gz"
+		https://github.com/ROCm-Developer-Tools/rocprofiler/archive/rocm-${PV}.tar.gz -> rocprofiler-${PV}.tar.gz
+		https://github.com/ROCmSoftwarePlatform/hsa-class/archive/master.tar.gz -> hsa-class-${PV}.tar.gz"
 S="${WORKDIR}/roctracer-rocm-${PV}"
 
 LICENSE="MIT"
@@ -30,6 +31,7 @@ BDEPEND="
 PATCHES=(
 	# https://github.com/ROCm-Developer-Tools/roctracer/pull/63
 	"${FILESDIR}"/${PN}-4.3.0-glibc-2.34.patch
+	"${FILESDIR}"/${PN}-4.3.0-tracer_tool.patch
 )
 
 python_check_deps() {
@@ -39,21 +41,24 @@ python_check_deps() {
 
 src_prepare() {
 	mv "${WORKDIR}"/rocprofiler-rocm-${PV} "${WORKDIR}"/rocprofiler || die
+	mv "${WORKDIR}"/ROCmSoftwarePlatform-hsa-class*/test/util "${S}"/inc/ || die
+	rm "${S}"/inc/util/hsa* || die
+	cp -a "${S}"/src/util/hsa* "${S}"/inc/util/ || die
 
 	# do not build the tool and it´s library;
 	# change destination for headers to include/roctracer;
 	# do not install a second set of header files;
 
 	sed -e "/LIBRARY DESTINATION/s,lib,$(get_libdir)," \
-		-e "/add_subdirectory ( \${TEST_DIR} \${PROJECT_BINARY_DIR}/d" \
 		-e "/DESTINATION/s,\${DEST_NAME}/include,include/roctracer," \
 		-e "/install ( FILES \${PROJECT_BINARY_DIR}\/so/d" \
-		-e "/DESTINATION/s,\${DEST_NAME}/lib64,$(get_libdir)/roctracer,g" \
+		-e "/DESTINATION/s,\${DEST_NAME}/lib64,$(get_libdir),g" \
 		-i CMakeLists.txt || die
 
 	# do not download additional sources via git
 	sed -e "/execute_process ( COMMAND sh -xc \"if/d" \
 		-e "/add_subdirectory ( \${HSA_TEST_DIR} \${PROJECT_BINARY_DIR}/d" \
+		-e "/DESTINATION/s,\${DEST_NAME}/tool,$(get_libdir),g" \
 		-i test/CMakeLists.txt || die
 
 	hprefixify script/*.py
@@ -62,7 +67,7 @@ src_prepare() {
 }
 
 src_configure() {
-	export HIP_PATH="${EPREFIX}/usr/lib/hip"
+	export HIP_PATH="$(hipconfig -p)"
 
 	local mycmakeargs=(
 		-DHIP_VDI=1
diff --git a/dev-util/roctracer/roctracer-5.0.2.ebuild b/dev-util/roctracer/roctracer-5.0.2.ebuild
index 7c53e956e347..755100264624 100644
--- a/dev-util/roctracer/roctracer-5.0.2.ebuild
+++ b/dev-util/roctracer/roctracer-5.0.2.ebuild
@@ -3,14 +3,15 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake prefix python-any-r1
 
 DESCRIPTION="Callback/Activity Library for Performance tracing AMD GPU's"
 HOMEPAGE="https://github.com/ROCm-Developer-Tools/roctracer.git"
 SRC_URI="https://github.com/ROCm-Developer-Tools/roctracer/archive/rocm-${PV}.tar.gz -> rocm-tracer-${PV}.tar.gz
-		https://github.com/ROCm-Developer-Tools/rocprofiler/archive/rocm-${PV}.tar.gz -> rocprofiler-${PV}.tar.gz"
+		https://github.com/ROCm-Developer-Tools/rocprofiler/archive/rocm-${PV}.tar.gz -> rocprofiler-${PV}.tar.gz
+		https://github.com/ROCmSoftwarePlatform/hsa-class/archive/f8b387043b9f510afdf2e72e38a011900360d6ab.tar.gz -> hsa-class-f8b3870.tar.gz"
 S="${WORKDIR}/roctracer-rocm-${PV}"
 
 LICENSE="MIT"
@@ -30,6 +31,7 @@ BDEPEND="
 PATCHES=(
 	# https://github.com/ROCm-Developer-Tools/roctracer/pull/63
 	"${FILESDIR}"/${PN}-4.3.0-glibc-2.34.patch
+	"${FILESDIR}"/${PN}-4.3.0-tracer_tool.patch
 	"${FILESDIR}"/${PN}-5.0.2-Werror.patch
 	"${FILESDIR}"/${PN}-5.0.2-headers.patch
 	"${FILESDIR}"/${PN}-5.0.2-strip-license.patch
@@ -44,22 +46,29 @@ src_prepare() {
 	cmake_src_prepare
 
 	mv "${WORKDIR}"/rocprofiler-rocm-${PV} "${WORKDIR}"/rocprofiler || die
+	mv "${WORKDIR}"/hsa-class-*/test/util "${S}"/inc/ || die
+	rm "${S}"/inc/util/hsa* || die
+	cp -a "${S}"/src/util/hsa* "${S}"/inc/util/ || die
+
+	# change destination for headers to include/roctracer;
 
 	sed -e "/LIBRARY DESTINATION/s,lib,$(get_libdir)," \
-		-e "/add_subdirectory ( \${TEST_DIR} \${PROJECT_BINARY_DIR}/d" \
+		-e "/DESTINATION/s,\${DEST_NAME}/include,include/roctracer," \
 		-e "/install ( FILES \${PROJECT_BINARY_DIR}\/so/d" \
+		-e "/DESTINATION/s,\${DEST_NAME}/lib64,$(get_libdir),g" \
 		-i CMakeLists.txt || die
 
 	# do not download additional sources via git
 	sed -e "/execute_process ( COMMAND sh -xc \"if/d" \
 		-e "/add_subdirectory ( \${HSA_TEST_DIR} \${PROJECT_BINARY_DIR}/d" \
+		-e "/DESTINATION/s,\${DEST_NAME}/tool,$(get_libdir),g" \
 		-i test/CMakeLists.txt || die
 
 	hprefixify script/*.py
 }
 
 src_configure() {
-	export HIP_PATH="${EPREFIX}/usr"
+	export HIP_PATH="$(hipconfig -p)"
 
 	local mycmakeargs=(
 		-DCMAKE_PREFIX_PATH="${EPREFIX}/usr/include/hsa"
diff --git a/dev-util/systemtap/Manifest b/dev-util/systemtap/Manifest
index 42720a17a484..13ddd8930648 100644
--- a/dev-util/systemtap/Manifest
+++ b/dev-util/systemtap/Manifest
@@ -5,7 +5,7 @@ DIST systemtap-4.5.tar.gz 5549909 BLAKE2B 3c180a49c81070cb374ae23f95f1e90cc3cf25
 DIST systemtap-4.6.tar.gz 5588126 BLAKE2B 7a0b1ed201f3661d5737bbf2c8b10b8bcf708df0c9aeeb941d501f5001e13b254ff779e20ed6af72b457a9e8236f064b9d5ee6d79438f96abb09d913f5732db3 SHA512 835b45597e9de0ea17857b47d542c87d155cb5c772f8595f41845a25ff06b862cb9c4b635292c3a6c66cb5255a07eee3af7cb7861110a4a05f545a4b35f11402
 DIST systemtap-4.7.tar.gz 5611495 BLAKE2B 839a824c3ef249add3edb2c9329c7bcb297d36d268d463c2913d945688845b7a6af8d811b2a533c4da8ce496cabccbdfabd080be847c754c2614f9c9efb22c61 SHA512 7d7c213dc4f7c5430f81763668da21403fbc351d1701b1096eb1ad233e3f0325e35f01dfd0a33e75f277b26fdde88c46d42dd32e32e4d4f27a45d53e2dd0f831
 EBUILD systemtap-4.4.ebuild 2885 BLAKE2B 3ab515c217ac8b58b70a2c46e44e2f3fbc55f5f3294e3b019a30048de33c9b908729dd50a13b4866923fe52ae06f33f0653f2db918f46fe214c0b613a8c569e7 SHA512 fdf5b5824f6c3ecd0cf1d926e8674bdd72288aef315803da1ac23188c93571aa525bdccf5ba09a23faed7c099990247452243ffb1b44c3b278e569dd19bac974
-EBUILD systemtap-4.5-r1.ebuild 3261 BLAKE2B a946a63a5cf9242435c12c1bb1f71d416a97848e74c08424a6eb7d9580661187225b55fdde2a17ae956b151c14dfd77846462d2aa5010015b53688d9c6259c18 SHA512 049f6e6d6e6f146a0d467f17c2c6614627b6f575da1f45d2c750c69646899ea9f3fed2014d7cebf5098636a535749a4f39925f0a747f6c32e979aa46d841c5c1
+EBUILD systemtap-4.5-r1.ebuild 3257 BLAKE2B 820e5ab1f3e123c2e265c89f77dd02964603641ac9b47c1de1187f130b8d4b68b039c6f44ad4e6d8792ab705570aa0982fe8d8676001abf672d4d36812505497 SHA512 5522e91b54d98aec2a304b7b26c450e48ddf50a315db51d35c09246a1f9ef4fe60b2db9d8ecec4d605e571a843b403163239f59b16f13edee0858eb75a6e72c6
 EBUILD systemtap-4.5.ebuild 2821 BLAKE2B 45cd56187b5b8da6a7e815f0953c2d826ce668f1018910501c267ab7a145c7cabe4a615643a05b4180dbbe59e679c8fb913d3235a0f1d7bd03a57f7b7ffbb00d SHA512 b19089f6c2efc45620045abe7be37963136beb5c453645be1f7f1b52ed007c733291907334843de71cbb11e4089b5935703cd0f17ff6ecf9672a40ba13649cae
 EBUILD systemtap-4.6.ebuild 3264 BLAKE2B 36768eae7877b68327662f9b125689c51ab74a44915709a58136af03031d88aad996c377dd8d8d66f14007a7b013cdb4d88339fb049ecf2a9712f276d260958e SHA512 c3ab1a88139b673e5c13e72d44b4e4dd60c296319a249e9f789bfa9b99c4e26e7d6cd0fb1eaff066c54bc45f9b03842ed4e1a7b0464b79ccb108d6ca8aaac0fc
 EBUILD systemtap-4.7.ebuild 3264 BLAKE2B 36768eae7877b68327662f9b125689c51ab74a44915709a58136af03031d88aad996c377dd8d8d66f14007a7b013cdb4d88339fb049ecf2a9712f276d260958e SHA512 c3ab1a88139b673e5c13e72d44b4e4dd60c296319a249e9f789bfa9b99c4e26e7d6cd0fb1eaff066c54bc45f9b03842ed4e1a7b0464b79ccb108d6ca8aaac0fc
diff --git a/dev-util/systemtap/systemtap-4.5-r1.ebuild b/dev-util/systemtap/systemtap-4.5-r1.ebuild
index 0c87466e5d34..cb7728fb5a3e 100644
--- a/dev-util/systemtap/systemtap-4.5-r1.ebuild
+++ b/dev-util/systemtap/systemtap-4.5-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.sourceware.org/${PN}/ftp/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="libvirt selinux sqlite +ssl test zeroconf"
 
 CDEPEND="
diff --git a/dev-util/trace-cmd/Manifest b/dev-util/trace-cmd/Manifest
index ec85577c1905..7adeec2c7b25 100644
--- a/dev-util/trace-cmd/Manifest
+++ b/dev-util/trace-cmd/Manifest
@@ -1,3 +1,5 @@
 DIST trace-cmd-v2.9.1.tar.gz 4298008 BLAKE2B f7aa2f12b2c90f35390857ed6f5818b74c42be36ce70835d86410f9f4931d27410123baaad007fa2795c1ba1f5bafc739db620f467ccc48021d774ee7be8a68d SHA512 186bfdd8ff1e88e9e6d3ae87b123f049892deaaa8d6a42944b6f8abee6b828946b88774029aa96daf4423a3dfc01b42835508f44f636dd02579ef9a8ef425131
+DIST trace-cmd-v3.0.2.tar.gz 308097 BLAKE2B 109cf260a2bc219c9bef92fb85bdd5abd0698d261ecec35ea31b152986af720aae26720cfa6148f798fca1d33f631ea3e50906a5fc7ef00dbd705c63d3b83f2a SHA512 3f364409f4a8931a09b762b19ee19ae52215b46e7ed90610a0fa4092e71d88d0dae91353ff98ba11f18012c27ef67289097c6c132f0f07193fac459ac52861d0
 EBUILD trace-cmd-2.9.1.ebuild 2787 BLAKE2B 22b4be76ae6d985733791fe7c47fc274b83e5861695b99d4065e24667e567704591f0e532867e6524e603101c7a7b131eed7ee310beb2fb6f69dc279d7360548 SHA512 589e69f1c0c06887bfd27438617c9038ee59e4c9f21bf0807489aaf1c114b630756ed31a37c2fdda40c5474aa6a2699b88fd71e2eb0d356942b065e75cbabd61
+EBUILD trace-cmd-3.0.2.ebuild 3021 BLAKE2B 0fa5c12c6fc8be5adc4bd8bf170bf6c4636cb430d333ca1b8c54d53daba33b73421f32cb97842a8f7cd5f1c2c0718eb18d3af60c8314812b40d15710377a2fe8 SHA512 7cb9c9ed0f79a45090b5227206d92e5ed4ea64dbc7bac40f65d59789ad71b1bac9175beb28027ca86eb79ad5a5ae8da5fca8b4798a6cc908cb4a55858dc21662
 MISC metadata.xml 350 BLAKE2B 2504f9b76218d15f29a847c28e7a3d6c656b332ce39eee66700d510fe6c6a993848fc3a83c1a0e74113ea8022449723e31ebdcd09ac05e3310a3eeac1d7ee390 SHA512 6c8207a666c677c74cab3112b23b21867d2f1face36b5cdb7200d7edd9dd04f6e095551abf7ffdbe7d2c77df20d90062f17fc83e309bfe85568af791548c5a18
diff --git a/dev-util/trace-cmd/trace-cmd-3.0.2.ebuild b/dev-util/trace-cmd/trace-cmd-3.0.2.ebuild
new file mode 100644
index 000000000000..6fad1f86144f
--- /dev/null
+++ b/dev-util/trace-cmd/trace-cmd-3.0.2.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_OPTIONAL=1
+
+inherit linux-info bash-completion-r1 python-r1 toolchain-funcs
+
+DESCRIPTION="User-space front-end for Ftrace"
+HOMEPAGE="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/${PN}-v${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-v${PV}"
+fi
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0/${PV}"
+IUSE="+audit doc python test udis86 +zstd"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+# XXX trace-cmd autodetects this without configurability. This might cause
+# issues if the libraries are picked up with the useflag disabled and later
+# uninstalled
+RDEPEND="
+	audit? ( sys-process/audit )
+	python? ( ${PYTHON_DEPS} )
+	udis86? ( dev-libs/udis86 )
+	zstd? ( >=app-arch/zstd-1.4 )
+	>=dev-libs/libtracefs-1.3
+	>=dev-libs/libtraceevent-1.5
+"
+DEPEND="${RDEPEND}
+	sys-kernel/linux-headers
+	test? ( dev-util/cunit )
+"
+BDEPEND="
+	virtual/pkgconfig
+	python? ( dev-lang/swig )
+	doc? ( app-text/asciidoc )
+"
+
+# having trouble getting tests to compile
+RESTRICT+=" test"
+
+pkg_setup() {
+	local CONFIG_CHECK="
+		~TRACING
+		~FTRACE
+		~BLK_DEV_IO_TRACE"
+
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+	sed -r -e 's:([[:space:]]+)install_bash_completion($|[[:space:]]+):\1:' \
+		-i Makefile || die "sed failed"
+}
+
+src_configure() {
+	EMAKE_FLAGS=(
+		BUILD_OUTPUT="${WORKDIR}/${P}_build"
+		"prefix=${EPREFIX}/usr"
+		"libdir=${EPREFIX}/usr/$(get_libdir)"
+		"CC=$(tc-getCC)"
+		"AR=$(tc-getAR)"
+		"BASH_COMPLETE_DIR=$(get_bashcompdir)"
+		"etcdir=/etc"
+		$(usex audit '' 'NO_AUDIT=' '' '1')
+		$(usex test 'CUNIT_INSTALLED=' '' '1' '')
+		$(usex udis86 '' 'NO_UDIS86=' '' '1')
+		VERBOSE=1
+	)
+}
+
+src_compile() {
+	emake "${EMAKE_FLAGS[@]}" NO_PYTHON=1 \
+		trace-cmd
+
+	if use python; then
+		python_copy_sources
+		python_foreach_impl python_compile
+	fi
+
+	use doc && emake doc
+}
+
+python_compile() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+
+	emake "${EMAKE_FLAGS[@]}" \
+		PYTHON_VERS="${EPYTHON}" \
+		PYTHON_PKGCONFIG_VERS="${EPYTHON//python/python-}" \
+		python_dir=$(python_get_sitedir)/${PN} \
+		python ctracecmd.so
+
+	popd > /dev/null || die
+}
+
+src_test() {
+	emake "${EMAKE_FLAGS[@]}" test
+}
+
+src_install() {
+	emake "${EMAKE_FLAGS[@]}" NO_PYTHON=1 \
+		DESTDIR="${D}" \
+		install install_libs
+
+	newbashcomp tracecmd/trace-cmd.bash "${PN}"
+
+	use doc && emake DESTDIR="${D}" install_doc
+	use python && python_foreach_impl python_install
+}
+
+python_install() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+
+	emake "${EMAKE_FLAGS[@]}" DESTDIR="${D}" \
+		PYTHON_VERS="${EPYTHON}" \
+		PYTHON_PKGCONFIG_VERS="${EPYTHON//python/python-}" \
+		python_dir=$(python_get_sitedir)/${PN} \
+		install_python
+
+	popd > /dev/null || die
+
+	python_optimize
+}
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 5876e4bb22d0..1c4857c994a5 100644
Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ
diff --git a/dev-vcs/cvs/Manifest b/dev-vcs/cvs/Manifest
index 29aae6b2bf09..181d1bd7fad4 100644
--- a/dev-vcs/cvs/Manifest
+++ b/dev-vcs/cvs/Manifest
@@ -21,5 +21,5 @@ DIST cederqvist-1.12.12.html.tar.bz2 137581 BLAKE2B c3e7a7a3783fc122bffbf100abb8
 DIST cederqvist-1.12.12.pdf 1252423 BLAKE2B b7649c1165695776e914a3b287fd8883c512e9ab2efb1db995f2128d29b48674460bce0902067fabb5b81beaafae70c36e6c0a717d71f7c5b625b408327c4a54 SHA512 aa90b76664ca103cf41831a5595d5e99df9fd87633aa5a500569f43854ca6e409a26b655f02ed59cde1c37ce88c40e06f3b3376ad71fdc9487032c3f0898706a
 DIST cederqvist-1.12.12.ps 1262208 BLAKE2B 4e26173e7deac7fbcd6ec8d50f6be8432df00ad15ecaadc3a64de15d53c4f1220f0496f270688baa4f6b29cfb1f5a1b548c7330408cc0afd94c3de2070a1eca9 SHA512 9a061ef90c664fbb4f882644f72c4f80ffbe0233b6b364511b1c7f18f0a53383980a6ddda326b6df1f2fe1899aed3225de89b55a65a1d9101ba81d1c10c067e2
 DIST cvs-1.12.12.tar.bz2 3197171 BLAKE2B bb0aeacd4d89d32c7aeb30b2f96ec9c89277f01c54561ce082031433bc9914c40c1c7041df3859868e879ccaacc7a47aa915fb18aef3777463ba11a7077e99b8 SHA512 31c679b77b887e02d9c8c381b0dfb42f1207ef4ca806cd92843638eb2126ed032e99bda70a3e20ea2a029670ff39c40088a43435632e381739e6c2f978e6f4bb
-EBUILD cvs-1.12.12-r14.ebuild 3002 BLAKE2B 4fb8aa878eb6dc2ed99d5af7487f06e5bd595bfac988b48b1a1d0c6800db8fcd8953696cf8108f28113d31fdfb46f7f2841ca09b02e80c0b311b17f1d88b47fa SHA512 86bcbe2a209001d749127b53817c8dc1db1379f65d78b681760837c1cdcf8e78a44f2ac5e1baa4631b0ebb2e2869622c26dbb393f44e8be46be6b474daea74d6
+EBUILD cvs-1.12.12-r14.ebuild 3004 BLAKE2B 4a174b9890bd0a95763c4c801d28bbe5fea31a377893ebdf7a4b808c7e9124ddc0e8dff6ad051a0dc42c335d244bdf42a6c4be8b21128db6314da5098e3fcaf0 SHA512 88614ef8e78b8e12dc6b58afc265135c4b941b460eaf33079236788fa6d05f73a5d49231d0ec31d65505620bf8ef6bc6711cca79b08224c0b71328336598ff54
 MISC metadata.xml 239 BLAKE2B 4512d26ef49f8be5951a62431eade863184ce1434a783b3f46e0c9d11637b1c051328f19b6b1eb072bb15eac91acd9de87ac1cb1ecc4f218fcab76a0e62809d5 SHA512 ead5297bbff4ed78327587de93404ddc4865d2390f7269ee7e63c8311644783b206a0fe7163c5696af3c319e1469a311a29b4340230ce7c0d9c84ce78f516a4e
diff --git a/dev-vcs/cvs/cvs-1.12.12-r14.ebuild b/dev-vcs/cvs/cvs-1.12.12-r14.ebuild
index 3c6a6e2beee6..219adc7e7046 100644
--- a/dev-vcs/cvs/cvs-1.12.12-r14.ebuild
+++ b/dev-vcs/cvs/cvs-1.12.12-r14.ebuild
@@ -65,7 +65,7 @@ src_configure() {
 	fi
 	econf \
 		--with-external-zlib \
-		--with-tmpdir=${EPREFIX}/tmp \
+		--with-tmpdir="${EPREFIX}"/tmp \
 		$(use_enable crypt encryption) \
 		$(use_with kerberos gssapi) \
 		$(use_enable nls) \
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index b2ed6df68c52..82ea07d7adcf 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -3,6 +3,7 @@ AUX git-2.31.0-darwin-prefix-gettext.patch 893 BLAKE2B d350b752473346991e1ed38a3
 AUX git-2.31.0_rc0-optional-cvs.patch 14184 BLAKE2B 6f4d56487fda1e9b9f20a77b0c6ba4c01fcc0341c2ed37756a8fd7edeea7760be9455ec5ed695f76debee3cea894ced0a988b4baac80e14cbc918106be36dc7a SHA512 35221088fe49254d9fa9186d12b40c58b20f58289a119e64071cf20d0952c52238f546bac4d16e634a768559587f0acc6567a546bd79c9f709dc9b158938c81f
 AUX git-2.32.0-r1-test-t5582.patch 754 BLAKE2B 6bd9fc93cea8f565ef7b5bd7d45770c5bdfae297b596a8a34451677c06cff24ddaa5b8a6f632849b3816e07d070efb6fdc0e9629ff98671fcbcba7897bca5430 SHA512 fb6a41d51bdbad862426cf5bbb70c08c722da807a462dfb0f2b069fc10801b53478bbcd8253b3ca3631737b448b3eeecffd1b523df3fabfe9ddf08db2a1a187b
 AUX git-2.33.0_rc0-optional-cvs.patch 14216 BLAKE2B a4179e0269917dd75b3e5b63fc70e931e42da3e6e170b5950efc20df89ac90eba1a18793eaa431150c8d8acb3fe1e3967a90075e9c940eae22f8b9a4fe158723 SHA512 ffdce5cca99b9c3196855316799470431e1ab064b7a8c739e7fc5b38029fd2bbceb415533d4b0000278eba3252f89e1fb2cdb52ae140668701d28bb88c07541b
+AUX git-2.37.0_rc0-optional-cvs.patch 14281 BLAKE2B 2600e15bac20d8bd5671bee2635f696c821e3b9444c8e43f014d72cd523cc993762662c14b48793bcda94787bf63af2c11546d199938ef243acca38f3c6fa1e7 SHA512 bce46cab8b8aa7a219a35e90f12e3c6f8c43a1b0ed0e6b5493aeb486312bfc3f930849241efca1db0181344d607a794c9bd6344082ee8870c298b9b6caee90ab
 AUX git-2.7.0-mediawiki-500pages.patch 1317 BLAKE2B fa90ac6f90b7b5b948dc1f9b8f300419df7b2b957aad9c15121f0b8df873d854cd74def68cd80788f085635cbbef65502b40e3eea2b3d8fb35fb02b4a4a1afa5 SHA512 efe580f288c6fdb6d55b742a3e4335ac32ed96cb12c10b959a5f283e505ab0aeed039d0d19d9dbf148a07ac6c7aec075ecea0c0be68456fdbe23dcad77ca01be
 AUX git-2.7.0-mediawiki-namespaces.patch 3188 BLAKE2B a5949c317f01244d7344bd0f5088e4bf77f723bf32734b85aa7d0abad274999733b7b33568aab5009b07fccc0f3f16ede633965fe351eb552d018a7eadfd9e83 SHA512 f1597fcb8e771917561d92bf428825e28477ed792be7494e34754434c73422dc52fdf99d981656b291f7eb91a199abe54038ae87e9b5229c9a382a4ea88e9d4f
 AUX git-2.7.0-mediawiki-subpages.patch 2091 BLAKE2B 01c6735edd80c3f264b8fe41edd5acb9fb375f0cd439ea4719932d0f0ebb8e00e3acea8e4de465bd75d35cce096dc720e3b4edabd13e80d1374af9806158e40f SHA512 e294c0d4588499961632bcc6ea20474984c4bcc7a804ff3cd9d12584cecad3c36f5772c21cf7a884b517370eb7d87542f7bdc3b2c5482c18dbc623abe5e7c73e
@@ -20,6 +21,7 @@ DIST git-2.35.2.tar.xz 6876028 BLAKE2B 2d59f0ef195770b3bd57ef8160ab24da5e1402531
 DIST git-2.35.3.tar.xz 6876328 BLAKE2B f584e9d94d167ba19bd2a00377f04eb4edf69cddbd2993a324178338b2e20e7fd126b51882ac7c7914c5118d0eab1ff9beddeb96a901a18fdfe027e21351ab61 SHA512 c92f8663988c57702bb5ee542ac8f36e8a43d377d16106ee462ce0b0a575b9d51baaafc654bf1821fbea2fe476ffd64d7fb87084c7de4dd8065b01d5083492c5
 DIST git-2.36.0.tar.xz 7003024 BLAKE2B 72bb148fc5fded2976554788eaf599d20fe9f200ac1dd1ddd4ed89f7f5c8d6c1025907080620bab477b4efadf41d883e890dff73c80d0ff5f0becd83f13ebd88 SHA512 dce0d7dbe684af070271830a01bf1b9cc289182f5106f6e3303b1b3a0d5dc74bebf6ac0174373db05a28f5acc62acb095bc9385dabeeecc1d6e8567dce29b766
 DIST git-2.36.1.tar.xz 7004044 BLAKE2B 99f54efb4ea1d8db0e3afd3dc9780cb37fc853e4757f4b37d68a6badd90eeed3e2943c97393eaed6adf61c82b97b5d01ca8d015784f5425072b1db14d39144ce SHA512 459432bd0c1d5a87c828a6fbf6d3473f14bf6b95783b3f27ea4f3af1ba9fd0e712a96a41276a16c6ebeb7ac3583a5f445eedd0a9e19fe160c2c8e309ec58818e
+DIST git-2.37.0.rc0.tar.xz 7041604 BLAKE2B 6382e7c225c01178e9e9010329d239ff7e63f52c13709b761e94d4491786e8d7fc9f3515f714f872d8d658e43578e8508fab000a1b38a342b01e605dca7a0fd7 SHA512 bcb69bc211ea4a439260dca6b61afeb0ea1f61ad892f169d990454038ad83e28eccbf9d1da6d9f4deb56b1016d8cca6a431374e8f3401c33a6ca99f403391790
 DIST git-htmldocs-2.32.0.tar.xz 1381664 BLAKE2B d1b47aa99d32a252fd20df26eff44a558044f3a389379b161bb43621eb28375eb0621969849a31938ba7fc9fc58b140d27d703559ea5735d0a0ffd2e93cd9692 SHA512 12b84e342f0d19afe385ab8a685ae625e86c3295d1555992e0c427b361aa2cdfc89a679e7dbc468d3568a325dafbf699468aadcdb02f93e372eff3dd96a7cf7f
 DIST git-htmldocs-2.33.1.tar.xz 1396744 BLAKE2B cbd65cf08fc7ea466fcd72820ba3e2135ade37f69c436a4ee7276dc71fb62f6270b71e2f46d981f5681a0fd3c30613d61680c2ef2460d0d7d292f7455e114128 SHA512 5b856b919067e1f644539d43a85aab6f602537ea0970b6248b471e3fa6756a8494f0525a69d22ad3795fcf9e106ff8439e0f6716ba0b8c895d7aad8c59e5bd74
 DIST git-htmldocs-2.34.1.tar.xz 1406464 BLAKE2B 6ee2f58df3c1622d96ac4b1a70d4dc3d0c973635774dd6bb89fea3e502dd82d99d676e2f9cb33c14c429c3d4680cd6020213154099b3f7fe71ad67602ca9bc6c SHA512 cf9fa952d43e477528deece9f22d1bb63fa50b3a831fae20812c6af31c1dbaf193abe2fed48ac9966bcf1787442ceed19f00c00e524a1911f0ea31952a52fc8f
@@ -28,6 +30,7 @@ DIST git-htmldocs-2.35.2.tar.xz 1411248 BLAKE2B d4f318f6277015bb6aef3a556bbf7a9a
 DIST git-htmldocs-2.35.3.tar.xz 1411664 BLAKE2B c7d849b9573a257de47fc8d654f7f791d21917cf65315b4ae6909ba2ebbe90970bc9e6c9949266913b1e529e662bfc375acee26ebf9304162eeccc87ce3da067 SHA512 52b97dab838fff1a865ae4d449fbb77fbac3c528666d1b936c73bffac856f16583d1b182379bc4e6851f78bccab519c3ea7e5902fc502b2e8ab7bb85043c7eea
 DIST git-htmldocs-2.36.0.tar.xz 1426148 BLAKE2B ba121e8f7d6a232f3df2b5a50c0f4a798c80808562c710f306f26fa79c124e5e1580c0626a2fce04f4a17b96d40a2683809550f37028cbc436b359de91100599 SHA512 62ee14c2f1ff34c0fbdf281ea2bb08bf6a24850d1d8dc68ffb12ae15e343c167ac869559395769fb352bd441baa8f2d45d696923a04e2f04bca921c990d75a9d
 DIST git-htmldocs-2.36.1.tar.xz 1426284 BLAKE2B 2213f870b7fe35cc76ce8654ed8c50c0e9694c58acac4aa2350f826422db6bf2fc238fbd12075f98e84539fdf6ca5624984e21844d1d1c1ceb90e3b090438a7d SHA512 3aa2ca197a789161571a6961dae8c2723ff5ba05a2d8ce7443f7fd9ef46fe5a3d001364831345f3fc4e028140022d20afefbabdf4a82cdeb311167793b292c1f
+DIST git-htmldocs-2.37.0.rc0.tar.xz 1443848 BLAKE2B da2069cafc595475d2fe0390365c2fac4163d58d03ca9e047f38259da3e0fb1393c82678857248d3ef593ddf6d05447ce199a1315af7b9e8d8cc5884adbbb3fc SHA512 012dc4512747273ac2c15204d540ab7bfe81275e723788fce88daa02dabbf44e51b4d379361bf9732012b801af3211912af10ba64aaf9c43391f2ee9e1753dd0
 DIST git-manpages-2.32.0.tar.xz 491868 BLAKE2B 7598a864246aed771371924604ee13d3f51b839b10b254bb1159dd47266513f5cd6484aab200a7b4ed427edc76538a98e39a040a17201483965175f5e1c5f484 SHA512 5c9950bd5d6904972cddf4afad534197d843c0dee8198d14ec5a3448873cab37dac88295b2a4df3658749f048bda4800b54fdc850517be7208906c911832c66e
 DIST git-manpages-2.33.1.tar.xz 494288 BLAKE2B 1f8bd4f23de31a285d3f4327e562dddafdf9f28e8b36334e54f5e280c81fc8170e8b153ca42baa642d02d8e6fdfcac9a8fdd3cee1e32c29bcd53f689d1a6c463 SHA512 d465a7b491046b7a5da6ad1fc6c62b351c69905932e0672263de5a1d3abe1113660cff9fe30c7be1d1695c6170ceca5a11b3f65e9b2d1545f35cc653e4c6ad62
 DIST git-manpages-2.34.1.tar.xz 497280 BLAKE2B aa3c67cec861eb40eda3e7827d3e380fdfb6f189027fb7e5618258b80ac33918cb3c2ca4d2f8dc5fbee959578766564137e9c4818672f5138304270c486658fe SHA512 8f3b56fa477e5aafec3ef29933234c362a372f59ed95694c4fb82ebb82d2a8ebc0ac17ae36caa9185964eef1700ea8732816e73df4ddd918afc949a8371fa0d8
@@ -36,6 +39,7 @@ DIST git-manpages-2.35.2.tar.xz 497548 BLAKE2B 5e7c9e85879e57e5b157dc8d0a8b836d8
 DIST git-manpages-2.35.3.tar.xz 497672 BLAKE2B aef5a7c579392f55fa63f1ce36c03579f4fcce443e867ac2a162a3d72344639ee11949748a51547315579b37e0fc6d5915ea203ddc556b2511125781428ce001 SHA512 25ac8f1690ccbc0e36b7d05115aebde1911909307ac29d930158b61ecd68972b8a9c3af018d73f34251d42cabf8d3d392173a448ec948df0a3119c2a2b87bd60
 DIST git-manpages-2.36.0.tar.xz 503604 BLAKE2B 438f533dce6628143c0ca348bc372017f049126933bf07a63ce9150114632a048778d8e0876970b406144aa584d512470ae4426be9c5bb8a3a581680ac9443a1 SHA512 67c2fb1c974ffe15aa09b9c36338f3ae9805573b35291e128210fc99c9fd97b1e26be571819d6b073c5adfe4c6f688c15e31790aa9eb62c1effacfb8aa21eb1c
 DIST git-manpages-2.36.1.tar.xz 503680 BLAKE2B d43fc90584b2f9e3bae30460f0c545b4fb96a5c70ad03c73d655481e5737b75a8d7a293db5bfdd752aabfc835a4a11e77474a5a0f144c8791b2dd433a3e45b70 SHA512 dd2fd6c5186aac53d7834ccf0cb6c380758624bb4583c6c5703b5b7a24c65d4199403fbcf7033c69bd3dcfbe048baaef3e886b9ba99c8afeb375e18e5b3e6e40
+DIST git-manpages-2.37.0.rc0.tar.xz 509724 BLAKE2B 0ba6edfe696a3757fad0cff1e7ada57debfe95baa6c1d46b064fdc9e3bd1c15e59afce718272186efed0d390ff2bd9ca48f5a8738ba71dc25e9b32a62cda4f47 SHA512 a0e38bec9857c04bb3e1fb3088cf540f80b68801efd35f48fa5e93da3188cf972fe43bbfd7268654f638026c80bc1b4113d3943ad9df1bce55afdf5f82e15d22
 EBUILD git-2.32.0-r1.ebuild 17396 BLAKE2B d3e72aee885b6c6f42fd8299943ef62bffa72bb6795b8d363d3f51d811643f3e497b580ba76e09041621006ac0cbb37edcbddc153c7857cae6c86ce76312aa7d SHA512 fff18efa738dbf828654033931ae7eab90e8f4995ff9033a7865559c4f0cbc270f406cd4c87c7ff9ea14af38e9a3be9c70b6254caddd98250f60ca6b6bec97eb
 EBUILD git-2.33.1.ebuild 17292 BLAKE2B 64fd297bf8d695d2f82745eec25790b26f7faa1f1c95af123cbefdc216964dbecbe2e01b2775c43d40633355b81b1d5047fd0a05d3394c1d736a25d38c7cbc55 SHA512 0379fee683ef4e83bb9d0da35a1d1e7371b3975263351fad482f14f550e17c2ea5bd6041bdd834541b585afd87136d74a8102db3205b953edbd9232a551e7221
 EBUILD git-2.34.1-r1.ebuild 17299 BLAKE2B 0b6dde0f056ea0682e71561d993ee90660753942c4e6b876af48f0c341adcac3d524ba83a948e9bda970e363e53ca0a9e057ab21a41647c4624af87994b8d0ff SHA512 154f6e0172f32906fc833e9228c95e0014fcfcfaf041dae8539c0f8113e8201bfac04a8f5299d678aab0bd05af0e96243b0c86936fba453d01ffa82ca2a335bb
@@ -45,6 +49,7 @@ EBUILD git-2.35.2.ebuild 17306 BLAKE2B d012ebbd57af3c0c0b71d14736dd096877daae1be
 EBUILD git-2.35.3.ebuild 17351 BLAKE2B c53d5280e677a26a03b0088bd556e57934c6c469ad6ae93c012b24b4c4c898d518c11f254743fa46419325cabda81037391da7fa8fbd31a7fcf7385ac16f8eee SHA512 8f8a26b123116af16ff9e145c07d531da2ac968437f815296a826d5750c74c615123af3865e0a37695bab5c7ec214e788d176c4b69ebd4e7aa1f00b2ae867298
 EBUILD git-2.36.0.ebuild 17351 BLAKE2B c53d5280e677a26a03b0088bd556e57934c6c469ad6ae93c012b24b4c4c898d518c11f254743fa46419325cabda81037391da7fa8fbd31a7fcf7385ac16f8eee SHA512 8f8a26b123116af16ff9e145c07d531da2ac968437f815296a826d5750c74c615123af3865e0a37695bab5c7ec214e788d176c4b69ebd4e7aa1f00b2ae867298
 EBUILD git-2.36.1.ebuild 17351 BLAKE2B c53d5280e677a26a03b0088bd556e57934c6c469ad6ae93c012b24b4c4c898d518c11f254743fa46419325cabda81037391da7fa8fbd31a7fcf7385ac16f8eee SHA512 8f8a26b123116af16ff9e145c07d531da2ac968437f815296a826d5750c74c615123af3865e0a37695bab5c7ec214e788d176c4b69ebd4e7aa1f00b2ae867298
+EBUILD git-2.37.0_rc0.ebuild 17351 BLAKE2B a9ee58aa9ca53e8e34f4cc8c24a191631443757dce260eb882f924e583adf008d3141f454a7207ce8bd230bcf6d02f79ead1e6c77ed130a842f313919da5afeb SHA512 e1a64031c748408578c9a7ee43153fa9cea10c4128362fe9b379916e6ad910ca399a8dcc780594b54c0f8f7a39fdceddc839bd2fd5502ffa4632647d2d1e7094
 EBUILD git-9999-r1.ebuild 17351 BLAKE2B c53d5280e677a26a03b0088bd556e57934c6c469ad6ae93c012b24b4c4c898d518c11f254743fa46419325cabda81037391da7fa8fbd31a7fcf7385ac16f8eee SHA512 8f8a26b123116af16ff9e145c07d531da2ac968437f815296a826d5750c74c615123af3865e0a37695bab5c7ec214e788d176c4b69ebd4e7aa1f00b2ae867298
 EBUILD git-9999-r2.ebuild 17351 BLAKE2B c53d5280e677a26a03b0088bd556e57934c6c469ad6ae93c012b24b4c4c898d518c11f254743fa46419325cabda81037391da7fa8fbd31a7fcf7385ac16f8eee SHA512 8f8a26b123116af16ff9e145c07d531da2ac968437f815296a826d5750c74c615123af3865e0a37695bab5c7ec214e788d176c4b69ebd4e7aa1f00b2ae867298
 EBUILD git-9999-r3.ebuild 17351 BLAKE2B c53d5280e677a26a03b0088bd556e57934c6c469ad6ae93c012b24b4c4c898d518c11f254743fa46419325cabda81037391da7fa8fbd31a7fcf7385ac16f8eee SHA512 8f8a26b123116af16ff9e145c07d531da2ac968437f815296a826d5750c74c615123af3865e0a37695bab5c7ec214e788d176c4b69ebd4e7aa1f00b2ae867298
diff --git a/dev-vcs/git/files/git-2.37.0_rc0-optional-cvs.patch b/dev-vcs/git/files/git-2.37.0_rc0-optional-cvs.patch
new file mode 100644
index 000000000000..6bd079472312
--- /dev/null
+++ b/dev-vcs/git/files/git-2.37.0_rc0-optional-cvs.patch
@@ -0,0 +1,458 @@
+From 199996fa5119b39f85489058e9e1c3335aa5342c Mon Sep 17 00:00:00 2001
+From: Robin Johnson <robbat2@gentoo.org>
+Date: Tue, 14 May 2019 08:53:06 +0200
+Subject: [PATCH] Makefile: Add NO_CVS define to disable all CVS interface
+ utilities
+
+Forward-ported from 1.7.12 to current git.git v1.8.4
+Forward-ported from v1.8.4 to v1.8.5.1
+Forward-ported from v1.8.5.3 to v1.9.0_rc3
+Forward-ported from 1.9.0_rc3 to current git.git v2.0.0_rc0
+Forward-ported from v2.0.0_rc0 to v2.0.0
+Forward-ported from v2.0.0 to v2.2.2
+Forward-ported from v2.2.2 to v2.8.4
+Forward-ported from v2.8.4 to v2.10.0
+Forward-ported from v2.10.0 to v2.12.0
+Forward-ported from v2.12.0 to v2.17.0-rc1
+Forward-ported from v2.17.0-rc1 to v2.18.0-rc1
+Forward-ported from v2.18.0-rc1 to v2.22.0-rc0
+Forward-ported from v2.22.0-rc0 to v2.31.0-rc0
+Forward-ported from v2.31.0-rc0 to v2.33.0-rc0
+Forward-ported from v2.33.0-rc0 to v2.37.0-rc0
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ Makefile                           | 50 ++++++++++++++++++++++--------
+ t/t9200-git-cvsexportcommit.sh     |  5 +++
+ t/t9400-git-cvsserver-server.sh    |  8 ++++-
+ t/t9401-git-cvsserver-crlf.sh      | 15 ++++++---
+ t/t9600-cvsimport.sh               | 41 +++++++++++++++---------
+ t/t9601-cvsimport-vendor-branch.sh | 11 +++++++
+ t/t9602-cvsimport-branches-tags.sh | 11 +++++++
+ t/t9603-cvsimport-patchsets.sh     | 11 +++++++
+ t/test-lib.sh                      |  1 +
+ 9 files changed, 119 insertions(+), 34 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 04d0fd1fe6..31e00ec7e6 100644
+--- a/Makefile
++++ b/Makefile
+@@ -316,6 +316,8 @@ include shared.mak
+ #
+ # Define NO_TCLTK if you do not want Tcl/Tk GUI.
+ #
++# Define NO_CVS if you do not want any CVS interface utilities.
++#
+ # The TCL_PATH variable governs the location of the Tcl interpreter
+ # used to optimize git-gui for your system.  Only used if NO_TCLTK
+ # is not set.  Defaults to the bare 'tclsh'.
+@@ -605,6 +607,7 @@ PROGRAM_OBJS =
+ PROGRAMS =
+ EXCLUDED_PROGRAMS =
+ SCRIPT_PERL =
++SCRIPT_PERL_CVS =
+ SCRIPT_PYTHON =
+ SCRIPT_SH =
+ SCRIPT_LIB =
+@@ -637,31 +640,33 @@ SCRIPT_LIB += git-sh-setup
+ 
+ SCRIPT_PERL += git-add--interactive.perl
+ SCRIPT_PERL += git-archimport.perl
+-SCRIPT_PERL += git-cvsexportcommit.perl
+-SCRIPT_PERL += git-cvsimport.perl
+-SCRIPT_PERL += git-cvsserver.perl
+ SCRIPT_PERL += git-send-email.perl
+ SCRIPT_PERL += git-svn.perl
+ 
++SCRIPT_PERL_CVS += git-cvsexportcommit.perl
++SCRIPT_PERL_CVS += git-cvsimport.perl
++SCRIPT_PERL_CVS += git-cvsserver.perl
++
+ SCRIPT_PYTHON += git-p4.py
+ 
+ # Generated files for scripts
+ SCRIPT_SH_GEN = $(patsubst %.sh,%,$(SCRIPT_SH))
+ SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL))
++SCRIPT_PERL_CVS_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL_CVS))
+ SCRIPT_PYTHON_GEN = $(patsubst %.py,%,$(SCRIPT_PYTHON))
+ 
+ # Individual rules to allow e.g.
+ # "make -C ../.. SCRIPT_PERL=contrib/foo/bar.perl build-perl-script"
+ # from subdirectories like contrib/*/
+ .PHONY: build-perl-script build-sh-script build-python-script
+-build-perl-script: $(SCRIPT_PERL_GEN)
++build-perl-script: $(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN)
+ build-sh-script: $(SCRIPT_SH_GEN)
+ build-python-script: $(SCRIPT_PYTHON_GEN)
+ 
+ .PHONY: install-perl-script install-sh-script install-python-script
+ install-sh-script: $(SCRIPT_SH_GEN)
+ 	$(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+-install-perl-script: $(SCRIPT_PERL_GEN)
++install-perl-script: $(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN)
+ 	$(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+ install-python-script: $(SCRIPT_PYTHON_GEN)
+ 	$(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+@@ -670,12 +675,13 @@ install-python-script: $(SCRIPT_PYTHON_GEN)
+ clean-sh-script:
+ 	$(RM) $(SCRIPT_SH_GEN)
+ clean-perl-script:
+-	$(RM) $(SCRIPT_PERL_GEN)
++	$(RM) $(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN)
+ clean-python-script:
+ 	$(RM) $(SCRIPT_PYTHON_GEN)
+ 
+ SCRIPTS = $(SCRIPT_SH_GEN) \
+ 	  $(SCRIPT_PERL_GEN) \
++	  $(SCRIPT_PERL_CVS_GEN) \
+ 	  $(SCRIPT_PYTHON_GEN) \
+ 	  git-instaweb
+ 
+@@ -2350,13 +2356,27 @@ git.res: git.rc GIT-VERSION-FILE GIT-PREFIX
+ 	  -DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" -i $< -o $@
+ 
+ # This makes sure we depend on the NO_PERL setting itself.
+-$(SCRIPT_PERL_GEN): GIT-BUILD-OPTIONS
++$(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN): GIT-BUILD-OPTIONS
++
++_SCRIPT_PERL_GEN =
++_SCRIPT_PERL_NOGEN =
+ 
+ # Used for substitution in Perl modules. Disabled when using RUNTIME_PREFIX
+ # since the locale directory is injected.
+ perl_localedir_SQ = $(localedir_SQ)
+ 
+ ifndef NO_PERL
++_SCRIPT_PERL_GEN = $(SCRIPT_PERL_GEN)
++
++ifndef NO_CVS
++_SCRIPT_PERL_GEN += $(SCRIPT_PERL_CVS_GEN)
++else
++_SCRIPT_PERL_NOGEN += $(SCRIPT_PERL_CVS_GEN)
++_REASON = NO_CVS
++_REASON_CONTENT = $(NO_CVS)
++endif # NO_CVS
++
++$(_SCRIPT_PERL_GEN):
+ PERL_HEADER_TEMPLATE = perl/header_templates/fixed_prefix.template.pl
+ PERL_DEFINES =
+ PERL_DEFINES += $(PERL_PATH_SQ)
+@@ -2380,7 +2400,7 @@ endif
+ 
+ PERL_DEFINES += $(gitexecdir) $(perllibdir) $(localedir)
+ 
+-$(SCRIPT_PERL_GEN): % : %.perl GIT-PERL-DEFINES GIT-PERL-HEADER GIT-VERSION-FILE
++$(_SCRIPT_PERL_GEN): % : %.perl GIT-PERL-DEFINES GIT-PERL-HEADER GIT-VERSION-FILE
+ 	$(QUIET_GEN) \
+ 	sed -e '1{' \
+ 	    -e '	s|#!.*perl|#!$(PERL_PATH_SQ)|' \
+@@ -2426,14 +2446,18 @@ git-instaweb: git-instaweb.sh GIT-SCRIPT-DEFINES
+ 	chmod +x $@+ && \
+ 	mv $@+ $@
+ else # NO_PERL
+-$(SCRIPT_PERL_GEN) git-instaweb: % : unimplemented.sh
+-	$(QUIET_GEN) \
++_SCRIPT_PERL_NOGEN += $(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN) git-instaweb
++_REASON = NO_PERL
++_REASON_CONTENT = $(NO_PERL)
++endif # NO_PERL
++
++$(_SCRIPT_PERL_NOGEN): % : unimplemented.sh
++	$(QUIET_GEN)$(RM) $@ $@+ && \
+ 	sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
+-	    -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \
++	    -e 's|@@REASON@@|$(_REASON)=$(_REASON_CONTENT)|g' \
+ 	    unimplemented.sh >$@+ && \
+ 	chmod +x $@+ && \
+ 	mv $@+ $@
+-endif # NO_PERL
+ 
+ # This makes sure we depend on the NO_PYTHON setting itself.
+ $(SCRIPT_PYTHON_GEN): GIT-BUILD-OPTIONS
+@@ -2737,7 +2761,7 @@ MSGMERGE_FLAGS = --add-location --backup=off --update
+ LOCALIZED_C = $(sort $(FOUND_C_SOURCES) $(FOUND_H_SOURCES) $(SCALAR_SOURCES) \
+ 	        $(GENERATED_H))
+ LOCALIZED_SH = $(sort $(SCRIPT_SH) git-sh-setup.sh)
+-LOCALIZED_PERL = $(sort $(SCRIPT_PERL))
++LOCALIZED_PERL = $(sort $(SCRIPT_PERL) $(SCRIPT_PERL_CVS))
+ 
+ ifdef XGETTEXT_INCLUDE_TESTS
+ LOCALIZED_C += t/t0200/test.c
+diff --git a/t/t9200-git-cvsexportcommit.sh b/t/t9200-git-cvsexportcommit.sh
+index c5946cb0b8..223fd5409b 100755
+--- a/t/t9200-git-cvsexportcommit.sh
++++ b/t/t9200-git-cvsexportcommit.sh
+@@ -11,6 +11,11 @@ if ! test_have_prereq PERL; then
+ 	test_done
+ fi
+ 
++if ! test_have_prereq CVS; then
++	skip_all='skipping git cvsexportcommit tests, cvs not available'
++	test_done
++fi
++
+ cvs >/dev/null 2>&1
+ if test $? -ne 1
+ then
+diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh
+index 210ddf09e3..a620126d3f 100755
+--- a/t/t9400-git-cvsserver-server.sh
++++ b/t/t9400-git-cvsserver-server.sh
+@@ -14,9 +14,15 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+ . ./test-lib.sh
+ 
+ if ! test_have_prereq PERL; then
+-	skip_all='skipping git cvsserver tests, perl not available'
++	skip_all='skipping git-cvsserver tests, perl not available'
+ 	test_done
+ fi
++
++if ! test_have_prereq CVS; then
++	skip_all='skipping git-cvsserver tests, cvs not available'
++	test_done
++fi
++
+ cvs >/dev/null 2>&1
+ if test $? -ne 1
+ then
+diff --git a/t/t9401-git-cvsserver-crlf.sh b/t/t9401-git-cvsserver-crlf.sh
+index a34805acdc..0d7759f73b 100755
+--- a/t/t9401-git-cvsserver-crlf.sh
++++ b/t/t9401-git-cvsserver-crlf.sh
+@@ -60,15 +60,20 @@ check_status_options() {
+     return $stat
+ }
+ 
+-cvs >/dev/null 2>&1
+-if test $? -ne 1
++if ! test_have_prereq PERL
+ then
+-    skip_all='skipping git-cvsserver tests, cvs not found'
++    skip_all='skipping git-cvsserver tests, perl not available'
+     test_done
+ fi
+-if ! test_have_prereq PERL
++if ! test_have_prereq CVS
+ then
+-    skip_all='skipping git-cvsserver tests, perl not available'
++    skip_all='skipping git-cvsserver tests, cvs not available'
++    test_done
++fi
++cvs >/dev/null 2>&1
++if test $? -ne 1
++then
++    skip_all='skipping git-cvsserver tests, cvs not found'
+     test_done
+ fi
+ perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || {
+diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh
+index 5680849218..7288db820b 100755
+--- a/t/t9600-cvsimport.sh
++++ b/t/t9600-cvsimport.sh
+@@ -11,14 +11,25 @@ if ! test_have_prereq NOT_ROOT; then
+ 	test_done
+ fi
+ 
+-test_expect_success PERL 'setup cvsroot environment' '
++if ! test_have_prereq PERL
++then
++    skip_all='skipping git cvsimport tests, perl not available'
++    test_done
++fi
++if ! test_have_prereq CVS
++then
++    skip_all='skipping git cvsimport tests, cvs not available'
++    test_done
++fi
++
++test_expect_success 'setup cvsroot environment' '
+ 	CVSROOT=$(pwd)/cvsroot &&
+ 	export CVSROOT
+ '
+ 
+-test_expect_success PERL 'setup cvsroot' '$CVS init'
++test_expect_success 'setup cvsroot' '$CVS init'
+ 
+-test_expect_success PERL 'setup a cvs module' '
++test_expect_success 'setup a cvs module' '
+ 
+ 	mkdir "$CVSROOT/module" &&
+ 	$CVS co -d module-cvs module &&
+@@ -50,23 +61,23 @@ EOF
+ 	)
+ '
+ 
+-test_expect_success PERL 'import a trivial module' '
++test_expect_success 'import a trivial module' '
+ 
+ 	git cvsimport -a -R -z 0 -C module-git module &&
+ 	test_cmp module-cvs/o_fortuna module-git/o_fortuna
+ 
+ '
+ 
+-test_expect_success PERL 'pack refs' '(cd module-git && git gc)'
++test_expect_success 'pack refs' '(cd module-git && git gc)'
+ 
+-test_expect_success PERL 'initial import has correct .git/cvs-revisions' '
++test_expect_success 'initial import has correct .git/cvs-revisions' '
+ 
+ 	(cd module-git &&
+ 	 git log --format="o_fortuna 1.1 %H" -1) > expected &&
+ 	test_cmp expected module-git/.git/cvs-revisions
+ '
+ 
+-test_expect_success PERL 'update cvs module' '
++test_expect_success 'update cvs module' '
+ 	(cd module-cvs &&
+ 	cat <<EOF >o_fortuna &&
+ O Fortune,
+@@ -94,7 +105,7 @@ EOF
+ 	)
+ '
+ 
+-test_expect_success PERL 'update git module' '
++test_expect_success 'update git module' '
+ 
+ 	(cd module-git &&
+ 	git config cvsimport.trackRevisions true &&
+@@ -105,7 +116,7 @@ test_expect_success PERL 'update git module' '
+ 
+ '
+ 
+-test_expect_success PERL 'update has correct .git/cvs-revisions' '
++test_expect_success 'update has correct .git/cvs-revisions' '
+ 
+ 	(cd module-git &&
+ 	 git log --format="o_fortuna 1.1 %H" -1 HEAD^ &&
+@@ -113,7 +124,7 @@ test_expect_success PERL 'update has correct .git/cvs-revisions' '
+ 	test_cmp expected module-git/.git/cvs-revisions
+ '
+ 
+-test_expect_success PERL 'update cvs module' '
++test_expect_success 'update cvs module' '
+ 
+ 	(cd module-cvs &&
+ 		echo 1 >tick &&
+@@ -122,7 +133,7 @@ test_expect_success PERL 'update cvs module' '
+ 	)
+ '
+ 
+-test_expect_success PERL 'cvsimport.module config works' '
++test_expect_success 'cvsimport.module config works' '
+ 
+ 	(cd module-git &&
+ 		git config cvsimport.module module &&
+@@ -134,7 +145,7 @@ test_expect_success PERL 'cvsimport.module config works' '
+ 
+ '
+ 
+-test_expect_success PERL 'second update has correct .git/cvs-revisions' '
++test_expect_success 'second update has correct .git/cvs-revisions' '
+ 
+ 	(cd module-git &&
+ 	 git log --format="o_fortuna 1.1 %H" -1 HEAD^^ &&
+@@ -143,7 +154,7 @@ test_expect_success PERL 'second update has correct .git/cvs-revisions' '
+ 	test_cmp expected module-git/.git/cvs-revisions
+ '
+ 
+-test_expect_success PERL 'import from a CVS working tree' '
++test_expect_success 'import from a CVS working tree' '
+ 
+ 	$CVS co -d import-from-wt module &&
+ 	(cd import-from-wt &&
+@@ -156,12 +167,12 @@ test_expect_success PERL 'import from a CVS working tree' '
+ 
+ '
+ 
+-test_expect_success PERL 'no .git/cvs-revisions created by default' '
++test_expect_success 'no .git/cvs-revisions created by default' '
+ 
+ 	! test -e import-from-wt/.git/cvs-revisions
+ 
+ '
+ 
+-test_expect_success PERL 'test entire HEAD' 'test_cmp_branch_tree main'
++test_expect_success 'test entire HEAD' 'test_cmp_branch_tree main'
+ 
+ test_done
+diff --git a/t/t9601-cvsimport-vendor-branch.sh b/t/t9601-cvsimport-vendor-branch.sh
+index 116cddba3a..a7e7299c81 100755
+--- a/t/t9601-cvsimport-vendor-branch.sh
++++ b/t/t9601-cvsimport-vendor-branch.sh
+@@ -37,6 +37,17 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+ 
+ . ./lib-cvs.sh
+ 
++if ! test_have_prereq PERL
++then
++    skip_all='skipping git cvsimport tests, perl not available'
++    test_done
++fi
++if ! test_have_prereq CVS
++then
++    skip_all='skipping git cvsimport tests, cvs not available'
++    test_done
++fi
++
+ setup_cvs_test_repository t9601
+ 
+ test_expect_success PERL 'import a module with a vendor branch' '
+diff --git a/t/t9602-cvsimport-branches-tags.sh b/t/t9602-cvsimport-branches-tags.sh
+index e5266c9a87..0e1878ffd3 100755
+--- a/t/t9602-cvsimport-branches-tags.sh
++++ b/t/t9602-cvsimport-branches-tags.sh
+@@ -9,6 +9,17 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+ 
+ . ./lib-cvs.sh
+ 
++if ! test_have_prereq PERL
++then
++    skip_all='skipping git cvsimport tests, perl not available'
++    test_done
++fi
++if ! test_have_prereq CVS
++then
++    skip_all='skipping git cvsimport tests, cvs not available'
++    test_done
++fi
++
+ setup_cvs_test_repository t9602
+ 
+ test_expect_success PERL 'import module' '
+diff --git a/t/t9603-cvsimport-patchsets.sh b/t/t9603-cvsimport-patchsets.sh
+index 19f38f78f2..bd5727e8bf 100755
+--- a/t/t9603-cvsimport-patchsets.sh
++++ b/t/t9603-cvsimport-patchsets.sh
+@@ -14,6 +14,17 @@
+ test_description='git cvsimport testing for correct patchset estimation'
+ . ./lib-cvs.sh
+ 
++if ! test_have_prereq PERL
++then
++    skip_all='skipping git cvsimport tests, perl not available'
++    test_done
++fi
++if ! test_have_prereq CVS
++then
++    skip_all='skipping git cvsimport tests, cvs not available'
++    test_done
++fi
++
+ setup_cvs_test_repository t9603
+ 
+ test_expect_failure PERL 'import with criss cross times on revisions' '
+diff --git a/t/test-lib.sh b/t/test-lib.sh
+index 736c6447ec..b9871d7d35 100644
+--- a/t/test-lib.sh
++++ b/t/test-lib.sh
+@@ -1572,6 +1572,7 @@ esac
+ test_set_prereq REFFILES
+ 
+ ( COLUMNS=1 && test $COLUMNS = 1 ) && test_set_prereq COLUMNS_CAN_BE_1
++test -z "$NO_CVS" && test_set_prereq CVS
+ test -z "$NO_PERL" && test_set_prereq PERL
+ test -z "$NO_PTHREADS" && test_set_prereq PTHREADS
+ test -z "$NO_PYTHON" && test_set_prereq PYTHON
+-- 
+2.36.1
+
diff --git a/dev-vcs/git/git-2.37.0_rc0.ebuild b/dev-vcs/git/git-2.37.0_rc0.ebuild
new file mode 100644
index 000000000000..3cd38061de34
--- /dev/null
+++ b/dev-vcs/git/git-2.37.0_rc0.ebuild
@@ -0,0 +1,641 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit toolchain-funcs perl-module bash-completion-r1 plocale python-single-r1 systemd
+
+PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/git/git.git"
+	# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
+	# See https://git-scm.com/docs/gitworkflows#_graduation
+	# In order of stability:
+	# 9999-r0: maint
+	# 9999-r1: master
+	# 9999-r2: next
+	# 9999-r3: seen
+	case "${PVR}" in
+		9999) EGIT_BRANCH=maint ;;
+		9999-r1) EGIT_BRANCH=master ;;
+		9999-r2) EGIT_BRANCH=next;;
+		9999-r3) EGIT_BRANCH=seen ;;
+	esac
+fi
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER="${MY_PV}"
+
+DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency"
+HOMEPAGE="https://www.git-scm.com/"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI_SUFFIX="xz"
+	SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git"
+	[[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing'
+	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			doc? (
+			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			)"
+	[[ "${PV}" == *_rc* ]] || \
+	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="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test"
+
+# Common to both DEPEND and RDEPEND
+DEPEND="
+	gnome-keyring? (
+		app-crypt/libsecret
+		dev-libs/glib:2
+	)
+	dev-libs/openssl:0=
+	sys-libs/zlib
+	pcre? ( dev-libs/libpcre2:= )
+	perl? ( dev-lang/perl:=[-build(-)] )
+	tk? ( dev-lang/tk:0= )
+	curl? (
+		net-misc/curl
+		webdav? ( dev-libs/expat )
+	)
+	iconv? ( virtual/libiconv )
+"
+
+RDEPEND="${DEPEND}
+	gpg? ( app-crypt/gnupg )
+	perl? (
+		dev-perl/Error
+		dev-perl/MailTools
+		dev-perl/Authen-SASL
+		>=virtual/perl-libnet-3.110.0-r4[ssl]
+		cgi? (
+			dev-perl/CGI
+			highlight? ( app-text/highlight )
+		)
+		cvs? (
+			>=dev-vcs/cvsps-2.1:0
+			dev-perl/DBI
+			dev-perl/DBD-SQLite
+		)
+		mediawiki? (
+			dev-perl/DateTime-Format-ISO8601
+			dev-perl/HTML-Tree
+			dev-perl/MediaWiki-API
+		)
+		subversion? (
+			dev-vcs/subversion[-dso(-),perl]
+			dev-perl/libwww-perl
+			dev-perl/TermReadKey
+		)
+	)
+	perforce? ( ${PYTHON_DEPS} )
+	selinux? ( sec-policy/selinux-git )
+"
+
+# This is how info docs are created with Git:
+#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
+#   .xml/docbook  --(docbook2texi.pl)--> .texi
+#   .texi         --(makeinfo)---------> .info
+BDEPEND="
+	doc? (
+		app-text/asciidoc
+		app-text/docbook2X
+		app-text/xmlto
+		sys-apps/texinfo
+	)
+	gnome-keyring? ( virtual/pkgconfig )
+	nls? ( sys-devel/gettext )
+	test? (	app-crypt/gnupg	)
+"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+	BDEPEND="${BDEPEND}
+		app-text/asciidoc"
+fi
+
+SITEFILE="50${PN}-gentoo.el"
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	cgi? ( perl )
+	cvs? ( perl )
+	mediawiki? ( perl )
+	mediawiki-experimental? ( mediawiki )
+	perforce? ( ${PYTHON_REQUIRED_USE} )
+	subversion? ( perl )
+	webdav? ( curl )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	# bug #350330 - automagic CVS when we don't want it is bad.
+	"${FILESDIR}"/git-2.37.0_rc0-optional-cvs.patch
+
+	# Make submodule output quiet
+	"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
+)
+
+pkg_setup() {
+	if use subversion && has_version "dev-vcs/subversion[dso]" ; then
+		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+		ewarn "have been warned."
+	fi
+
+	if use perforce ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+	local extlibs myopts
+
+	myopts=(
+		ASCIIDOC_NO_ROFF=YesPlease
+		$(usex cvs '' NO_CVS=YesPlease)
+		$(usex elibc_musl NO_REGEX=YesPlease '')
+		$(usex iconv '' NO_ICONV=YesPlease)
+		$(usex nls '' NO_GETTEXT=YesPlease)
+		$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
+		$(usex perforce '' NO_PYTHON=YesPlease)
+		$(usex subversion '' NO_SVN_TESTS=YesPlease)
+		$(usex threads '' NO_PTHREADS=YesPlease)
+		$(usex tk '' NO_TCLTK=YesPlease)
+	)
+
+	if use blksha1 ; then
+		myopts+=( BLK_SHA1=YesPlease )
+	elif use ppcsha1 ; then
+		myopts+=( PPC_SHA1=YesPlease )
+	fi
+
+	if use curl ; then
+		use webdav || myopts+=( NO_EXPAT=YesPlease )
+	else
+		myopts+=( NO_CURL=YesPlease )
+	fi
+
+	# broken assumptions, because of static build system ...
+	myopts+=(
+		NO_FINK=YesPlease
+		NO_DARWIN_PORTS=YesPlease
+		INSTALL=install
+		TAR=tar
+		SHELL_PATH="${EPREFIX}/bin/sh"
+		SANE_TOOL_PATH=
+		OLD_ICONV=
+		NO_EXTERNAL_GREP=
+	)
+
+	# can't define this to null, since the entire makefile depends on it
+	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die
+
+	if use pcre; then
+		myopts+=( USE_LIBPCRE2=YesPlease )
+		extlibs+=( -lpcre2-8 )
+	fi
+	if [[ ${CHOST} == *-solaris* ]]; then
+		myopts+=(
+			NEEDS_LIBICONV=YesPlease
+			HAVE_CLOCK_MONOTONIC=1
+		)
+		if grep -Fq getdelim "${EROOT}"/usr/include/stdio.h ; then
+			myopts+=( HAVE_GETDELIM=1 )
+		fi
+	fi
+
+	if has_version '>=app-text/asciidoc-8.0' ; then
+		myopts+=( ASCIIDOC8=YesPlease )
+	fi
+
+	export MY_MAKEOPTS="${myopts[@]}"
+	export EXTLIBS="${extlibs[@]}"
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]] ; then
+		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+		cd "${S}" || die
+		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		if use doc ; then
+			pushd "${S}"/Documentation &>/dev/null || die
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			popd &>/dev/null || die
+		fi
+	else
+		git-r3_src_unpack
+		#cp "${FILESDIR}"/GIT-VERSION-GEN .
+	fi
+
+}
+
+src_prepare() {
+	# add experimental patches to improve mediawiki support
+	# see patches for origin
+	if use mediawiki-experimental ; then
+		PATCHES+=(
+			"${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
+			"${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
+			"${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
+		)
+	fi
+
+	default
+
+	if use prefix ; then
+		# bug #757309
+		eapply "${FILESDIR}"/git-2.31.0-darwin-prefix-gettext.patch
+	fi
+
+	sed -i \
+		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
+		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
+		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
+		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
+		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		Makefile || die
+
+	# Fix docbook2texi command
+	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
+		Documentation/Makefile || die
+}
+
+git_emake() {
+	# bug #320647: PYTHON_PATH
+	local PYTHON_PATH=""
+	use perforce && PYTHON_PATH="${PYTHON}"
+	emake ${MY_MAKEOPTS} \
+		prefix="${EPREFIX}"/usr \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		perllibdir="$(use perl && perl_get_raw_vendorlib)" \
+		sysconfdir="${EPREFIX}"/etc \
+		GIT_TEST_OPTS="--no-color" \
+		OPTAR="$(tc-getAR)" \
+		OPTCC="$(tc-getCC)" \
+		OPTCFLAGS="${CFLAGS}" \
+		OPTLDFLAGS="${LDFLAGS}" \
+		PERL_PATH="${EPREFIX}/usr/bin/perl" \
+		PERL_MM_OPT="" \
+		PYTHON_PATH="${PYTHON_PATH}" \
+		V=1 \
+		"$@"
+}
+
+src_configure() {
+	exportmakeopts
+}
+
+src_compile() {
+	git_emake || die "emake failed"
+
+	if use perl && use cgi ; then
+		git_emake gitweb || die "emake gitweb (cgi) failed"
+	fi
+
+	if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
+		pushd contrib/credential/osxkeychain &>/dev/null || die
+		git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
+			|| die "emake credential-osxkeychain"
+		popd &>/dev/null || die
+	fi
+
+	pushd Documentation &>/dev/null || die
+	if [[ ${PV} == *9999 ]] ; then
+		git_emake man || die "emake man failed"
+		if use doc ; then
+			git_emake info html || die "emake info html failed"
+		fi
+	else
+		if use doc ; then
+			git_emake info || die "emake info html failed"
+		fi
+	fi
+	popd &>/dev/null || die
+
+	if use gnome-keyring ; then
+		pushd contrib/credential/libsecret &>/dev/null || die
+		git_emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PKG_CONFIG="$(tc-getPKG_CONFIG)"
+		popd &>/dev/null || die
+	fi
+
+	pushd contrib/subtree &>/dev/null || die
+	git_emake git-subtree || die
+	# git-subtree.1 requires the full USE=doc dependency stack
+	use doc && git_emake git-subtree.html git-subtree.1
+	popd &>/dev/null || die
+
+	pushd contrib/diff-highlight &>/dev/null || die
+	git_emake || die
+	popd &>/dev/null || die
+
+	if use mediawiki ; then
+		pushd contrib/mw-to-git &>/dev/null || die
+		git_emake || die
+		popd &>/dev/null || die
+
+	fi
+}
+
+src_install() {
+	git_emake DESTDIR="${D}" install || die "make install failed"
+
+	if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
+		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
+	fi
+
+	# Depending on the tarball and manual rebuild of the documentation, the
+	# manpages may exist in either OR both of these directories.
+	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
+	use doc && dodir /usr/share/doc/${PF}/html
+	local d
+	for d in / /howto/ /technical/ ; do
+		docinto ${d}
+		dodoc Documentation${d}*.txt
+		if use doc ; then
+			docinto ${d}/html
+			dodoc Documentation${d}*.html
+		fi
+	done
+	docinto /
+	# Upstream does not ship this pre-built :-(
+	use doc && doinfo Documentation/{git,gitman}.info
+
+	newbashcomp contrib/completion/git-completion.bash ${PN}
+	bashcomp_alias git gitk
+	# Not really a bash-completion file (bug #477920)
+	# but still needed uncompressed (bug #507480)
+	insinto /usr/share/${PN}
+	doins contrib/completion/git-prompt.sh
+
+	#dobin contrib/fast-import/git-p4 # Moved upstream
+	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
+	newbin contrib/fast-import/import-tars.perl import-tars
+	exeinto /usr/libexec/git-core/
+	newexe contrib/git-resurrect.sh git-resurrect
+
+	# git-subtree
+	pushd contrib/subtree &>/dev/null || die
+	git_emake DESTDIR="${D}" install || die "Failed to emake install for git-subtree"
+	if use doc ; then
+		# Do not move git subtree install-man outside USE=doc!
+		git_emake DESTDIR="${D}" install-man install-html || die "Failed to emake install-html install-man for git-subtree"
+	fi
+	newdoc README README.git-subtree
+	dodoc git-subtree.txt
+	popd &>/dev/null || die
+
+	if use mediawiki ; then
+		pushd contrib/mw-to-git &>/dev/null || die
+		git_emake DESTDIR="${D}" install
+		popd &>/dev/null || die
+	fi
+
+	# diff-highlight
+	dobin contrib/diff-highlight/diff-highlight
+	newdoc contrib/diff-highlight/README README.diff-highlight
+
+	# git-jump
+	exeinto /usr/libexec/git-core/
+	doexe contrib/git-jump/git-jump
+	newdoc contrib/git-jump/README git-jump.txt
+
+	# git-contacts
+	exeinto /usr/libexec/git-core/
+	doexe contrib/contacts/git-contacts
+	dodoc contrib/contacts/git-contacts.txt
+
+	if use gnome-keyring ; then
+		pushd contrib/credential/libsecret &>/dev/null || die
+		dobin git-credential-libsecret
+		popd &>/dev/null || die
+	fi
+
+	dodir /usr/share/${PN}/contrib
+	# The following are excluded:
+	# completion - installed above
+	# diff-highlight - done above
+	# emacs - removed upstream
+	# examples - these are stuff that is not used in Git anymore actually
+	# git-jump - done above
+	# gitview - installed above
+	# p4import - excluded because fast-import has a better one
+	# patches - stuff the Git guys made to go upstream to other places
+	# persistent-https - TODO
+	# mw-to-git - TODO
+	# subtree - build  seperately
+	# svnimport - use git-svn
+	# thunderbird-patch-inline - fixes thunderbird
+	local contrib_objects=(
+		buildsystems
+		fast-import
+		hg-to-git
+		hooks
+		remotes2config.sh
+		rerere-train.sh
+		stats
+		workdir
+	)
+	local i
+	for i in "${contrib_objects[@]}" ; do
+		cp -rf \
+			"${S}"/contrib/${i} \
+			"${ED}"/usr/share/${PN}/contrib \
+			|| die "Failed contrib ${i}"
+	done
+
+	if use perl && use cgi ; then
+		# We used to install in /usr/share/${PN}/gitweb
+		# but upstream installs in /usr/share/gitweb
+		# so we will install a symlink and use their location for compat with other
+		# distros
+		dosym ../gitweb /usr/share/${PN}/gitweb
+
+		# INSTALL discusses configuration issues, not just installation
+		docinto /
+		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
+		newdoc  "${S}"/gitweb/README README.gitweb
+
+		for d in "${ED}"/usr/lib{,64}/perl5/ ; do
+			if [[ -d "${d}" ]] ; then
+				find "${d}" -name .packlist -delete || die
+			fi
+		done
+	else
+		rm -rf "${ED}"/usr/share/gitweb
+	fi
+
+	if ! use subversion ; then
+		rm -f "${ED}"/usr/libexec/git-core/git-svn \
+			"${ED}"/usr/share/man/man1/git-svn.1*
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+	fi
+
+	if ! use prefix ; then
+		newinitd "${FILESDIR}"/git-daemon-r2.initd git-daemon
+		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" \
+			"git-daemon@.service"
+		systemd_dounit "${FILESDIR}/git-daemon.socket"
+	fi
+
+	perl_delete_localpod
+
+	# Remove disabled linguas
+	# we could remove sources in src_prepare, but install does not
+	# handle missing locale dir well
+	rm_loc() {
+		if [[ -e "${ED}/usr/share/locale/${1}" ]] ; then
+			rm -r "${ED}/usr/share/locale/${1}" || die
+		fi
+	}
+	plocale_for_each_disabled_locale rm_loc
+}
+
+src_test() {
+	local disabled=()
+	local tests_cvs=(
+		t9200-git-cvsexportcommit.sh
+		t9400-git-cvsserver-server.sh
+		t9401-git-cvsserver-crlf.sh
+		t9402-git-cvsserver-refs.sh
+		t9600-cvsimport.sh
+		t9601-cvsimport-vendor-branch.sh
+		t9602-cvsimport-branches-tags.sh
+		t9603-cvsimport-patchsets.sh
+		t9604-cvsimport-timestamps.sh
+	)
+	local tests_perl=(
+		t3701-add-interactive.sh
+		t5502-quickfetch.sh
+		t5512-ls-remote.sh
+		t5520-pull.sh
+		t7106-reset-unborn-branch.sh
+		t7501-commit.sh
+	)
+	# Bug #225601 - t0004 is not suitable for root perm
+	# Bug #219839 - t1004 is not suitable for root perm
+	# t0001-init.sh - check for init notices EPERM*  fails
+	local tests_nonroot=(
+		t0001-init.sh
+		t0004-unwritable.sh
+		t0070-fundamental.sh
+		t1004-read-tree-m-u-wf.sh
+		t3700-add.sh
+		t7300-clean.sh
+	)
+	# t9100 still fails with symlinks in SVN 1.7
+	local test_svn=( t9100-git-svn-basic.sh )
+
+	# Unzip is used only for the testcase code, not by any normal parts of Git.
+	if ! has_version app-arch/unzip ; then
+		einfo "Disabling tar-tree tests"
+		disabled+=( t5000-tar-tree.sh )
+	fi
+
+	local cvs=0
+	use cvs && let cvs=${cvs}+1
+	if [[ ${EUID} -eq 0 ]] ; then
+		if [[ ${cvs} -eq 1 ]] ; then
+			ewarn "Skipping CVS tests because CVS does not work as root!"
+			ewarn "You should retest with FEATURES=userpriv!"
+			disabled+=( ${tests_cvs[@]} )
+		fi
+		einfo "Skipping other tests that require being non-root"
+		disabled+=( ${tests_nonroot[@]} )
+	else
+		[[ ${cvs} -gt 0 ]] && \
+			has_version dev-vcs/cvs && \
+			let cvs=${cvs}+1
+		[[ ${cvs} -gt 1 ]] && \
+			has_version "dev-vcs/cvs[server]" && \
+			let cvs=${cvs}+1
+		if [[ ${cvs} -lt 3 ]] ; then
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+			disabled+=( ${tests_cvs[@]} )
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled+=( ${tests_perl[@]} )
+	fi
+
+	einfo "Disabling tests that fail with SVN 1.7"
+	disabled+=( ${test_svn[@]} )
+
+	# Reset all previously disabled tests
+	pushd t &>/dev/null || die
+	local i
+	for i in *.sh.DISABLED ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+	done
+	einfo "Disabled tests:"
+	for i in ${disabled[@]} ; do
+		if [[ -f "${i}" ]] ; then
+			mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}"
+		fi
+	done
+
+	# Avoid the test system removing the results because we want them ourselves
+	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' -i Makefile || die
+
+	# Clean old results first, must always run
+	nonfatal git_emake clean
+	popd &>/dev/null || die
+
+	# Now run the tests, keep going if we hit an error, and don't terminate on
+	# failure
+	local rc
+	einfo "Start test run"
+	#MAKEOPTS=-j1
+	nonfatal git_emake --keep-going test
+	rc=$?
+
+	# Display nice results, now print the results
+	pushd t &>/dev/null || die
+	nonfatal git_emake aggregate-results
+
+	# And bail if there was a problem
+	[[ ${rc} -eq 0 ]] || die "tests failed. Please file a bug."
+}
+
+showpkgdeps() {
+	local pkg=$1
+	shift
+	elog "  $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+	elog "Please read /usr/share/bash-completion/completions/git for Git bash command"
+	elog "completion."
+	elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
+	elog "Note that the prompt bash code is now in that separate script"
+	elog "These additional scripts need some dependencies:"
+	echo
+	showpkgdeps git-quiltimport "dev-util/quilt"
+	showpkgdeps git-instaweb \
+		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
+	echo
+	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
+}
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index d81db814dce9..c6b62ef3caa4 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -6,6 +6,6 @@ AUX svnserve.xinetd 332 BLAKE2B 95af871ddd83c405cd4072a8bb6293376383d5437562aa60
 DIST subversion-1.10.0_rc1-patches-1.tar.xz 2984 BLAKE2B 7c9619b95ca6b433a58dc5baf3a1e1b14ef0017f714af81762b975d50a37b743788a4da65cf7f9eb8e633cbc813ad8dd974b530a19ec2d3fc74b75921f8f0c17 SHA512 aa7a25a253ea2da99520399d292d3e1602985392bae6dc5582003fdb9719d654638754b6e370b68b184ee6729ba3833bd511c09b2cb36f8f476b42063f55fbb2
 DIST subversion-1.14.1.tar.bz2 8504612 BLAKE2B 27c6c5a9e656680b10fbc4b5c6d5fed36759d42d908e2bd5e56e19a7477c779c72314eb4a6766a13f1af047a759f9f9334b963c1d41cd48573b9800d5b671cc1 SHA512 0a70c7152b77cdbcb810a029263e4b3240b6ef41d1c19714e793594088d3cca758d40dfbc05622a806b06463becb73207df249393924ce591026b749b875fcdd
 DIST subversion-1.14.2.tar.bz2 8606570 BLAKE2B cf15c61b932823fb18b52f83d84907386f068d2d40e14dbab94c42ad9d4c0fdf35d82db78036d7c1f2be47c2d51cdd27bfb966eb7607a52a21e072aeff76fb38 SHA512 20ada4688ca07d9fb8da4b7d53b5084568652a3b9418c65e688886bae950a16a3ff37710fcfc9c29ef14a89e75b2ceec4e9cf35d5876a7896ebc2b512cfb9ecc
-EBUILD subversion-1.14.1.ebuild 12730 BLAKE2B e5303384557b0901ef1e975a29ba19330e56d3750fd705359504694b77dfdf3e1d09c418c9ed288b6c2d2b7a220e6eaab37dfcbe5c6f23be456f70fe6fcfc0b1 SHA512 c17b6b929970ca9d8e8dbd641d9276ae4bd891317bee1c3d7e43d632d7fb17ce5f7c187a43a21b28be4a7d08c0da18364567b4510889c62b56963cc8556f67d5
+EBUILD subversion-1.14.1.ebuild 12732 BLAKE2B b14f4d45aeee58b6f35220db98190fd7cf43dbf6438b402410e0a3797e62e37379a175e26ff23fd0ec580b02579f571e258982e02fb9556b80925015fd0d8e59 SHA512 a4594ab26152e2988ef82a50bb9dffba3cf6711178f986f188ee5102d3f1c37e0a30df6a8a897a6e7eab152b56f8361b1c204e72cb8f9aae0d3f13d71388ccbd
 EBUILD subversion-1.14.2-r1.ebuild 12716 BLAKE2B 1e88fa2efe2ba4ee79ecfa0e9f8dc5bd8c56c38aa78f140534d7ef5d32863180ebb4d199c70eb12076fd6a244d2b5bfff9434acd0d72174477ebd0fcd51a9f94 SHA512 022a2dfd3c43367454425808f5c7ec59ae0c6e17424fe581a6c16f37725494fdd4dc17964fcd28007bf500035fc88d8eafc9d2a84af0716c5aca5ae3cf775db6
 MISC metadata.xml 845 BLAKE2B 01e13e03afd275ac996834a9aae57d8b07cda38acd55f77a6b7e28533faf96f9b5091830e34298f9af68a2b712bfae82637400151e2b73e563e36348951ef23c SHA512 337bc69860f94b798dfbb957f501781fe0039407c6768a53bee9e6badad430ba080baad0edd20ede40638a0a018bf57481b049a46f4303b1a2a42d9dd3e76d1b
diff --git a/dev-vcs/subversion/subversion-1.14.1.ebuild b/dev-vcs/subversion/subversion-1.14.1.ebuild
index b05d9fd700e2..a7a8cdbc9104 100644
--- a/dev-vcs/subversion/subversion-1.14.1.ebuild
+++ b/dev-vcs/subversion/subversion-1.14.1.ebuild
@@ -90,7 +90,7 @@ want_apache
 
 pkg_setup() {
 	if use berkdb ; then
-		local apu_bdb_version="$(${EPREFIX}/usr/bin/apu-1-config --includes \
+		local apu_bdb_version="$("${EPREFIX}"/usr/bin/apu-1-config --includes \
 			| grep -Eoe '-I${EPREFIX}/usr/include/db[[:digit:]]\.[[:digit:]]' \
 			| sed 's:.*b::')"
 		einfo
diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index 3bf127cf7bd6..26916c66dada 100644
Binary files a/games-action/Manifest.gz and b/games-action/Manifest.gz differ
diff --git a/games-action/noiz2sa/Manifest b/games-action/noiz2sa/Manifest
index aab474b7a83d..b1139f1882f1 100644
--- a/games-action/noiz2sa/Manifest
+++ b/games-action/noiz2sa/Manifest
@@ -1,5 +1,5 @@
 AUX noiz2sa-0.51a-gcc41.patch 621 BLAKE2B 834ba58a31f739009843e905235bb2bc9013258914aaf46edfe4675eac03ac601856fe21a69f7ca839091985d7b04a3928be1a09800fda6e9a6e269c89311365 SHA512 895c81865aefd54a20f9b22b07f6a1dd8a11034a20c62f08888d73cba5e106c30a78c4b11575a991e2c34d84911614e1b5a1d34231b52f8d55ff9751d5d18bdc
 AUX noiz2sa-0.51a-underlink.patch 971 BLAKE2B 0fe04349a4f5a5bf02c9f15d29750cf46f336c2e387c6dc1f0f67662469062e7748cd9cd799b5d8c17e77510f43f0cf6e9437ceba5395ae6fabedb0600e5adc1 SHA512 fcc3bc67fe1d06fdb8466112f6c3bd15b681ba3da83a0b70b09ebc734c53f390eb1f380cffb0d2753a7c42ca2d483255a39b1979e7b745ee9e63fbb0a65e506b
 DIST noiz2sa-0.51a.tar.gz 8861907 BLAKE2B e6b4747945fe15cdfd58f1a5cfa80ecae4e3bdabcdba9d7c2e826315ff90bed0a2f66e9e308ef621dd282b3809b13be7a8bf0115be3fa88dad35e6cf3f6a458e SHA512 be0893f96240c00c15073d99e0c73667f65bd4aa98a303d6b4e0b7d5ac9fa510843b37841f9cf6c98f602cb7a70c518107272df1f42682a74ec52a3221e10174
-EBUILD noiz2sa-0.51a-r1.ebuild 844 BLAKE2B 5f1fbef7d36755255d4b52a93727a99c762354c682ae99973b5899b5825ad49416a51265a1aea79b28311d9d2d6ea7627d6084d215a8ce993b3cdd27a8ad6469 SHA512 174033d706eaf394514729dc019fe97a70f27b332c63c6a9cc96816f5eedf6ff2e886bc051d611345037cd553e846f3b5319c5778375e8814b4622e703ac999d
+EBUILD noiz2sa-0.51a-r2.ebuild 873 BLAKE2B 15b27f151054340012631b0e09b4456674d43a0de366d0b17c1d445bd215145fea9cac98a0c8f2939072f0648e4cac92c4d28ced291176081546b64a45ca60fc SHA512 2d2f4727fca718e33ba70e46aaaeb9e819ff6b13e7b48e3a45310fa3ff30321d4fd0a8b36009a9bc530cf7fe8f4af4405b428a6b1f8f3ab08e175b2a479b9167
 MISC metadata.xml 331 BLAKE2B 772e7dc180461c89101038685474752438ae508919f6391bb9256c7c17f72034ed70cbd42b70a9aadf2c6cb25f5b903676c4dd037ae251daa3d768d12dd8756d SHA512 ee1fc5dd90308d5c0a8f1f3e3dcb2e1c7a594b62924a59c119e1057438d5f6e7acae57668f99b0a1e363c9b82d5fbc60493b5782794b33facb4b15f1762f3259
diff --git a/games-action/noiz2sa/noiz2sa-0.51a-r1.ebuild b/games-action/noiz2sa/noiz2sa-0.51a-r2.ebuild
similarity index 92%
rename from games-action/noiz2sa/noiz2sa-0.51a-r1.ebuild
rename to games-action/noiz2sa/noiz2sa-0.51a-r2.ebuild
index e53a3e1fbd3e..068023a39b23 100644
--- a/games-action/noiz2sa/noiz2sa-0.51a-r1.ebuild
+++ b/games-action/noiz2sa/noiz2sa-0.51a-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,6 +16,7 @@ KEYWORDS="~amd64 ~x86"
 
 DEPEND="
 	>=dev-libs/libbulletml-0.0.3
+	media-libs/libsdl[joystick]
 	media-libs/sdl-mixer[vorbis]
 	virtual/opengl"
 RDEPEND="${DEPEND}"
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index d08439369c87..3a94b2cef5b4 100644
Binary files a/games-arcade/Manifest.gz and b/games-arcade/Manifest.gz differ
diff --git a/games-arcade/cdogs-sdl/Manifest b/games-arcade/cdogs-sdl/Manifest
index 895efc6f1cf1..eb64536ba275 100644
--- a/games-arcade/cdogs-sdl/Manifest
+++ b/games-arcade/cdogs-sdl/Manifest
@@ -1,6 +1,4 @@
 AUX cdogs-sdl-1.1.1-cmake.patch 410 BLAKE2B b2a36bf3644e885dcf05147f63c4c72e5936acc7727fc37daf9f1732ab3edd699d7a990f63f1977e9e2e9e775b8102429fbba6ffdaf77834a9e7acd3e1933023 SHA512 dd2ffe17f21640d50dec2021fa133baed11f93eba53686792116f15d21d37aed144cc03708baf633d0e0b1c74999202fe58a92eae9f15b81f61bb1b215d39ac4
-DIST cdogs-sdl-1.2.0.tar.gz 35018104 BLAKE2B 1a87f0c6e4af0fda69c0dd98249b319b58411a5b0b7377c21ebef51939f2b6e76959a00bf7fd5602b07bebb9eaab22c840699ae1c54e5d4dcb1aa26852fb8ba0 SHA512 70a5a4bb8e48cf53a4497807b14d8a70e26ad6b74f0c4675b3d98667c867d499d372f323e7abb669ebef08b1d6b5ac9c840ab14eada38e7b868d3099ed6b3e35
-DIST cdogs-sdl-1.3.0.tar.gz 35201522 BLAKE2B bdfeab22edc0e5bfe46d23862bb0e8a829eb8c782519f473340a73d6823fcf6236d61892dff5f6be52e985a8560ce2175b5aab50fb899359d47d3acdf937fe5d SHA512 913ee8a70ab2190259a88891e4f3e30034b7a88dac5fa1a79fcc9452a42fe9fa6679e24104848fab63c7aace8dac311d2166fa01c7175f14243d8658f25aee69
-EBUILD cdogs-sdl-1.2.0.ebuild 1024 BLAKE2B 3519b9c3f554a654e70ca2c68172eb7debd13d11b272bf0c8b7b3b8e640157b3b66c812d5af487a4e029b03cd1b5390eaea1005dba706fbe759e5e0d83452134 SHA512 ead8c69d596c43166e145a688b5c32c8453111c23e37dd38c7207e7fc74b56d88fdb55fb139b80fba48bb453e8404e4fe8c190497924f55eb9e46b8d7f5e93eb
-EBUILD cdogs-sdl-1.3.0.ebuild 1000 BLAKE2B b3cf3c37eef6678721c351290556dbf29fa6fe8a387995de55653d902d5c63f06657c59aa80fb580ceac99acc21fb9d3ca86da3faa5cee19de04c4badab6b53e SHA512 ac53d6208a4137e808fc4f2bc1b00336be1eb53fa1be09cb3cbbb85edd908cfd56788f3b665d312960eed608343ba15f88505ecce1c1d8540f24ef8ff72813b7
+DIST cdogs-sdl-1.3.1.tar.gz 35202950 BLAKE2B 0f1da8a8475fec784042dc31d329361cc11266816a03e64a156362064e19a057908abf6d97cc5c7903307dae039713eeab27b87bba0764cf770cf49eaae806a1 SHA512 504736eddb6aa314072059ca76b65dcbc56c622dc217f78ca12a55a0fdf5e05b5c4cf49408d6af52d00d9cf8b7d3c2e246d7f44c98486520f31e94879e855e3e
+EBUILD cdogs-sdl-1.3.1.ebuild 1000 BLAKE2B b3cf3c37eef6678721c351290556dbf29fa6fe8a387995de55653d902d5c63f06657c59aa80fb580ceac99acc21fb9d3ca86da3faa5cee19de04c4badab6b53e SHA512 ac53d6208a4137e808fc4f2bc1b00336be1eb53fa1be09cb3cbbb85edd908cfd56788f3b665d312960eed608343ba15f88505ecce1c1d8540f24ef8ff72813b7
 MISC metadata.xml 738 BLAKE2B d88ddca3d0f022c5dc03aa79cd3e64bc11e3328c53e75ec0ce719edb389ee4d119e044ded0c1c3fa7de058c62a6614459f2d3927d745cb3cb3a3e55e32ddac39 SHA512 49e02eb89ad38a8b2e8375940a9e30e2368d970c01a88095dd679e828ba91a6054c9db264a0af038648cf42f8da99800f682a6394db77c0278d98a87dc6648cb
diff --git a/games-arcade/cdogs-sdl/cdogs-sdl-1.2.0.ebuild b/games-arcade/cdogs-sdl/cdogs-sdl-1.2.0.ebuild
deleted file mode 100644
index 9f3981f80c07..000000000000
--- a/games-arcade/cdogs-sdl/cdogs-sdl-1.2.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION="Classic overhead run-and-gun game"
-HOMEPAGE="https://cxong.github.io/cdogs-sdl/"
-SRC_URI="https://github.com/cxong/cdogs-sdl/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ BSD-2 CC0-1.0 CC-BY-3.0 CC-BY-SA-3.0 XMAME"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	media-libs/libsdl2[haptic,opengl]
-	media-libs/sdl2-image[png]
-	media-libs/sdl2-mixer[vorbis,wav]
-	net-libs/enet:1.3="
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.1-cmake.patch
-)
-
-CMAKE_IN_SOURCE_BUILD=1 # msg.pb.c not found
-
-src_configure() {
-	local mycmakeargs=(
-		-DCDOGS_DATA_DIR="${EPREFIX}"/usr/share/${PN}/
-		-DBUILD_EDITOR=OFF
-		-DUSE_SHARED_ENET=ON
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	dodoc doc/{AUTHORS,original_readme.txt}
-
-	# CREDITS is used at runtime, rest is licenses or duplicates
-	find "${ED}"/usr/share/${PN}/doc -type f ! -name CREDITS -delete || die
-}
diff --git a/games-arcade/cdogs-sdl/cdogs-sdl-1.3.0.ebuild b/games-arcade/cdogs-sdl/cdogs-sdl-1.3.1.ebuild
similarity index 100%
rename from games-arcade/cdogs-sdl/cdogs-sdl-1.3.0.ebuild
rename to games-arcade/cdogs-sdl/cdogs-sdl-1.3.1.ebuild
diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index f170275b4c52..9202e96b3241 100644
Binary files a/games-board/Manifest.gz and b/games-board/Manifest.gz differ
diff --git a/games-board/tablebase-syzygy/Manifest b/games-board/tablebase-syzygy/Manifest
index 99c2ce82b49f..6b8d33599490 100644
--- a/games-board/tablebase-syzygy/Manifest
+++ b/games-board/tablebase-syzygy/Manifest
@@ -1019,5 +1019,6 @@ DIST KRvKP.rtbz 193424 BLAKE2B 9ba5e45c763f973faaeac3ee902e93c21d06e44c6697500b0
 DIST KRvKR.rtbw 12944 BLAKE2B 42839f64c0e8ec8b3be09c128ee2e8d768ce5d77ca06c3cf90322a773148d949ac66be0d45de7606728e9d7989b9e0fcd111f658818996037ddf59d46a44ed10 SHA512 328639da515a9b36bf6cad80a684c2759e03f8ca7ad78fe7a1e4b1f3ec4c79b418ec74755fa80f86d6523dee43f9e79b4f4e36c56ece06f367850d2a4f39f5c4
 DIST KRvKR.rtbz 3408 BLAKE2B e56df50b368a89acb767a827f17d83ec028a87c06e9ad9d18826db9ce8da6024cbc69f961cad24846ed48e839ef5e6f95bd0798455ee2e1cc6e625df573c7309 SHA512 729068cb50ed6abff51a2b8f4041edfb0d109f163d961db9240a0c74069a7e792f3904a7d712882ad25d356059917a64a84f511914f05c20d41185815f23e3d9
 EBUILD tablebase-syzygy-0_pre20131213-r100.ebuild 1598 BLAKE2B 5750013dbb20b436b231b711bf0e76b7c0c2e304a4b4d13891c8a48dfca390a987048ca84d8a5e3550fdbb90eca2f11af3b437f9ef1b28de325aecbc8a900a8e SHA512 86f0df3e6ad0364cf70d73215cca12be43517af545c60be714d79d4422c98079a4469949232dd0deae28578e2e476861454898460eabd8245357f6f262c6fdc6
+EBUILD tablebase-syzygy-0_pre20131213-r101.ebuild 2091 BLAKE2B 27672bc3eed25e6fc2c82b79fb69a5d445d85d0bb1987324283625327ed14efa4e6db0df2c04b0ecbd9bc0685cdb2e4126b3423a0083ac707f20b1314b6a8c81 SHA512 492b626b5ecb87a99af98721daa0972dd4496ded1aae5d815bf4ea3fa12c316f7f34fbd07ff95a727c3e798e4b206364e9007c18a566eaf697aea236ac4cd1eb
 EBUILD tablebase-syzygy-0_pre20131213.ebuild 1550 BLAKE2B 25081190ea10704e5ba3151d3806c694b8308a203f3763e6a6daca825e7b58ce2643aef6bb5a27f7b4b27cee186f388736a97db0e28cb5b71ee8fb5decc2a4dd SHA512 e0b53e707638ead230bac7e856c5e8a2acc7c0cc1b88a3b2668b7350d8637113f15d7f42a74683a65cb7faac4156667445ef70aff4a80027452e889a8d9b5c66
-MISC metadata.xml 297 BLAKE2B cab6beee8c5c4152710b693371a86dd67d96a092bc98968e205cf45f45c2c913cd83177f2e83a053855d522be0693c088183c174cbbf477756629b3a96bc23b7 SHA512 2aeb8c60f3e214b713f2be339a521bd9afaafd65b0ec8f57dffd968a91b0549a58213c2a7c812c524406fc76789e0188fa520655f7b004c923aac3e9fe828575
+MISC metadata.xml 320 BLAKE2B db06554da7072cf16734f6b8b12c895bc146e0913c2b938ee2c39d8e7345b75903d649066e78c00607ef368e58c53ffb102ab2dde8626c243c7af67c045f8a10 SHA512 9e638a98c83732368812cbc1f6feb097781bcefd3c57daed970188d5b12bc094d11517b07c991ef8dfc0b9cbaaadeb0af855afe970f71f8e3de749efc2d17bd5
diff --git a/games-board/tablebase-syzygy/metadata.xml b/games-board/tablebase-syzygy/metadata.xml
index 02e3af9bf16b..1cd7130c4c50 100644
--- a/games-board/tablebase-syzygy/metadata.xml
+++ b/games-board/tablebase-syzygy/metadata.xml
@@ -4,6 +4,7 @@
 <maintainer type="person">
   <email>ulm@gentoo.org</email>
 </maintainer>
+<stabilize-allarches/>
 <use>
   <flag name="6-pieces">Install tablebases for 6 pieces (huge!)</flag>
 </use>
diff --git a/games-board/tablebase-syzygy/tablebase-syzygy-0_pre20131213-r101.ebuild b/games-board/tablebase-syzygy/tablebase-syzygy-0_pre20131213-r101.ebuild
new file mode 100644
index 000000000000..0c4bc8049cbb
--- /dev/null
+++ b/games-board/tablebase-syzygy/tablebase-syzygy-0_pre20131213-r101.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit check-reqs
+
+DESCRIPTION="Syzygy chess endgame tablebases for up to 6 pieces"
+HOMEPAGE="http://tablebase.sesse.net/
+	https://kirill-kryukov.com/chess/tablebases-online/"
+
+tb345=()
+tb6=()
+m=(P N B R Q K)
+for ((i=4; i>=0; i--)); do
+	tb345+=(K${m[i]}vK) # 2+1
+	for ((j=i; j>=0; j--)); do
+		tb345+=(K${m[i]}vK${m[j]} K${m[i]}${m[j]}vK) # 2+2, 3+1
+		for ((k=4; k>=0; k--)); do
+			tb345+=(K${m[i]}${m[j]}vK${m[k]}) # 3+2
+			((k<=i)) || continue
+			for ((l=k; l>=0; l--)); do
+				((k<i || l<=j)) && tb6+=(K${m[i]}${m[j]}vK${m[k]}${m[l]}) # 3+3
+			done
+			((k<=j)) || continue
+			tb345+=(K${m[i]}${m[j]}${m[k]}vK) # 4+1
+			for ((l=4; l>=0; l--)); do
+				tb6+=(K${m[i]}${m[j]}${m[k]}vK${m[l]}) # 4+2
+				((l<=k)) && tb6+=(K${m[i]}${m[j]}${m[k]}${m[l]}vK) # 5+1
+			done
+		done
+	done
+done
+
+tb345=("${tb345[@]/#/mirror+http://tablebase.sesse.net/syzygy/3-4-5/}")
+SRC_URI="${tb345[@]/%/.rtbw} ${tb345[@]/%/.rtbz}
+	6-pieces? ( ${tb6[@]/%/.rtbw} ${tb6[@]/%/.rtbz} )"
+unset i j k l m tb345 tb6
+
+LICENSE="public-domain" # machine-generated tables
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="6-pieces"
+RESTRICT="fetch"
+
+RDEPEND="!${CATEGORY}/${PN}:nofetch"
+
+S="${WORKDIR}"
+
+pkg_nofetch() {
+	einfo "Due to their large size, fetching the Syzygy Endgame Tablebases via"
+	einfo "BitTorrent is recommended: https://oics.olympuschess.com/tracker/"
+	einfo "After downloading, place all K*.rtbw and K*.rtbz files in your"
+	einfo "DISTDIR directory."
+	einfo "(For the tablebases with up to 6 pieces, there should be"
+	einfo "$(echo ${A} | wc -w) files in total.)"
+}
+
+pkg_pretend() {
+	CHECKREQS_DISK_USR="$(usex 6-pieces 151G 939M)"
+	CHECKREQS_DISK_BUILD="${CHECKREQS_DISK_USR}"
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	CHECKREQS_DISK_USR="$(usex 6-pieces 151G 939M)"
+	CHECKREQS_DISK_BUILD="${CHECKREQS_DISK_USR}"
+	check-reqs_pkg_setup
+}
+
+src_unpack() { :; }
+
+src_install() {
+	local f
+	insinto /usr/share/${PN}
+	for f in ${A}; do
+		[[ ${f} == *.rtb[wz] ]] && echo "${DISTDIR}"/${f}
+	done | xargs doins
+}
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 02d90a79f037..007da165fe3f 100644
Binary files a/games-emulation/Manifest.gz and b/games-emulation/Manifest.gz differ
diff --git a/games-emulation/mgba/Manifest b/games-emulation/mgba/Manifest
index e7b1bab2c763..a3be5274bec4 100644
--- a/games-emulation/mgba/Manifest
+++ b/games-emulation/mgba/Manifest
@@ -1,8 +1,8 @@
 AUX mgba-0.9.3-ffmpeg5.patch 4952 BLAKE2B a6f03faafb0316516aba79bb5c6e7c474124ea4259c34456bc28cb4aa86543da7ddfed363256160294293f4882e3116076400c042caf7e1f31811739f8fd86dd SHA512 5badf11d8d24ed2cb13c45e7ff9d56159c63b2557076fe92ade4d0b7051bfcd0f8b9fc3c8bf95faf5612789c9aa6609fc8e0c11b6e9a00816f2a17b72a3c183c
 DIST mgba-0.9.2.tar.gz 12761919 BLAKE2B f0f3ca5f47d38c8018541426a229d52a2ebc9e47dc07fe4b739bde3f7ef2a4d75e6db5ca5f8dfaee01ae9648035f24c9d02556078b0b5eb51aefecfc9305432d SHA512 ea9868c104996c44a2fcfdf9d3f4d6177b853dec478ab7a2dd19a0f127b597a887150200bfbf14de593328217ff5493ca675bfcb4f0b2ee6a5097e0cdf0e2997
 DIST mgba-0.9.3.tar.gz 12763090 BLAKE2B 7d9ff6fc7bdff5d734540b74893a888d400b4bb6e1ce5b3b2a856239db8798ac76b8535dc770330d0451e2568a6d402558eeef27d643c0d5d3454441f45cf09b SHA512 da65b3c7ec32d732163f129c4fd38949ae2da2980beb3257bf6def5e35534a27b6d30309bb3c9a8d651642f99e1a45db7a8577c8dbf5472153d4551167471b3a
-EBUILD mgba-0.9.2.ebuild 2659 BLAKE2B f5f2ab5f770ff8ba4ec4667ce7a40d262692cf2a52e2644591735ecd1f780478d4b3184d3ec453321950c7cd57a8817b1f8916c697d6f1382f9fd39da53d2d37 SHA512 92c02e4d249228bd4e3e5a3142877cdda4999e20db8b65f458af275f867d6f1e8d58af50f6f2b35d2bf2ebdce4f750d62704bdeffd5d8980ba64806d21f14112
-EBUILD mgba-0.9.3-r1.ebuild 2723 BLAKE2B 75a00f0fb0824bb2efe78805539106b90596dc1240fff2397f6264c7b19afbc3edb86dd4c67fe4b6800cb95d76c23e246354066bf79eb19ef0db005ef035f918 SHA512 e39e9cdd808884e9641c15b268d0bde455f6ac5b7af7011ef7ffeeba9f38d0dbd42fd4d1dcc849b9f7acb0fc5308f925180d9a35234be8c2a955608ad030de95
-EBUILD mgba-0.9.3.ebuild 2661 BLAKE2B 84e11e71873217013a106be1744dbf990d0e15167458457a1e6c86bf958ef752e02dae28b49f22faeff9971126683416a634b5f41ea894b9bf2d04a13bf9319c SHA512 904b060cd5198257b22b88593c20d4aa156f38ae88e15a78f5467dac34ec961c27fe0be579d35d8c0f180f9fda1cefd81ac5031d71664634216f5f50ff72d988
-EBUILD mgba-9999.ebuild 2661 BLAKE2B 84e11e71873217013a106be1744dbf990d0e15167458457a1e6c86bf958ef752e02dae28b49f22faeff9971126683416a634b5f41ea894b9bf2d04a13bf9319c SHA512 904b060cd5198257b22b88593c20d4aa156f38ae88e15a78f5467dac34ec961c27fe0be579d35d8c0f180f9fda1cefd81ac5031d71664634216f5f50ff72d988
+EBUILD mgba-0.9.2.ebuild 2665 BLAKE2B e51a4a1dc11165c34f868fcb158d17993ce353340347753a30c29e8b154e64fca74ace2f62f669cac8cdec75712a29ac9ca776921a41c14a1630a130e3e491f3 SHA512 b1c3537ec21c54f620106f738099ada4f987cce85021f1b74d91e8966be9a423d38ffc0970c94beac604a4bcadcb21a8f53c59c82852a4915ac22a2c3747c363
+EBUILD mgba-0.9.3-r1.ebuild 2729 BLAKE2B 7986a68ce6802698b0a1f5e95887d8906bfb513f6f716bf9748633492a63b6f7877c2332d3bcbe8f12d7dca28bea5c59c16cb66ea02291a7482375bf2854b16b SHA512 bb866d0984c0b718a4f34c6409569ae99deb21b8f7aa64219ce6969124c6f11231f09e1664f1bfac5282acd8fccd18a2d1700b28b7060427b29c224047902981
+EBUILD mgba-0.9.3.ebuild 2667 BLAKE2B 6ecc15660f152df0260a517a385ec261e6902be59193e8b0cb8bdfe53d3d480e9150402e9350fa72603bd4004d08a8bc25d334b1253688c2ff46aad9b01d5253 SHA512 cc35bed7f09990ccbbc881acfd1a7e2673012e7e04aadd3fa9e739b123a7eef8989ed6893b729ce0a69642ccba8c692b780899d931881240178666821af444f0
+EBUILD mgba-9999.ebuild 2667 BLAKE2B 6ecc15660f152df0260a517a385ec261e6902be59193e8b0cb8bdfe53d3d480e9150402e9350fa72603bd4004d08a8bc25d334b1253688c2ff46aad9b01d5253 SHA512 cc35bed7f09990ccbbc881acfd1a7e2673012e7e04aadd3fa9e739b123a7eef8989ed6893b729ce0a69642ccba8c692b780899d931881240178666821af444f0
 MISC metadata.xml 631 BLAKE2B f54017bc3de8d00be3405495cf08f4d9f9ba9bc723a205c783a3e71c239835ee68044cb88d22df6d6f33174e2b4a20c350363145df6c0e9f54ca9585ef3eee9d SHA512 c71bc82f75a7a68e59c46eaadcf173a9b8274167e2f3a3f69dd5cdc0e9822c93c442f75e6817168cfc1470c411bec0fcb5f9695913816326b719a81f915f75b8
diff --git a/games-emulation/mgba/mgba-0.9.2.ebuild b/games-emulation/mgba/mgba-0.9.2.ebuild
index cef008e8c593..971993505d7e 100644
--- a/games-emulation/mgba/mgba-0.9.2.ebuild
+++ b/games-emulation/mgba/mgba-0.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -94,7 +94,7 @@ src_compile() {
 
 src_install() {
 	if use qt5 ; then
-		dobin ${BUILD_DIR}/qt/${PN}-qt
+		dobin "${BUILD_DIR}"/qt/${PN}-qt
 		doman doc/${PN}-qt.6
 		domenu res/${PN}-qt.desktop
 		for size in 16 24 32 48 64 96 128 256 ; do
@@ -103,10 +103,10 @@ src_install() {
 	fi
 	if use sdl ; then
 		doman doc/${PN}.6
-		newbin ${BUILD_DIR}/sdl/${PN} ${PN}-sdl
+		newbin "${BUILD_DIR}"/sdl/${PN} ${PN}-sdl
 	fi
 
-	dolib.so ${BUILD_DIR}/lib${PN}.so*
+	dolib.so "${BUILD_DIR}"/lib${PN}.so*
 }
 
 pkg_preinst() {
diff --git a/games-emulation/mgba/mgba-0.9.3-r1.ebuild b/games-emulation/mgba/mgba-0.9.3-r1.ebuild
index 92f2ac4813da..8ac2d817bb04 100644
--- a/games-emulation/mgba/mgba-0.9.3-r1.ebuild
+++ b/games-emulation/mgba/mgba-0.9.3-r1.ebuild
@@ -98,7 +98,7 @@ src_compile() {
 
 src_install() {
 	if use qt5 ; then
-		dobin ${BUILD_DIR}/qt/${PN}-qt
+		dobin "${BUILD_DIR}"/qt/${PN}-qt
 		doman doc/${PN}-qt.6
 		domenu res/${PN}-qt.desktop
 		for size in 16 24 32 48 64 96 128 256 ; do
@@ -107,10 +107,10 @@ src_install() {
 	fi
 	if use sdl ; then
 		doman doc/${PN}.6
-		newbin ${BUILD_DIR}/sdl/${PN} ${PN}-sdl
+		newbin "${BUILD_DIR}"/sdl/${PN} ${PN}-sdl
 	fi
 
-	dolib.so ${BUILD_DIR}/lib${PN}.so*
+	dolib.so "${BUILD_DIR}"/lib${PN}.so*
 }
 
 pkg_preinst() {
diff --git a/games-emulation/mgba/mgba-0.9.3.ebuild b/games-emulation/mgba/mgba-0.9.3.ebuild
index e9baa50b1056..bfc1bea7e039 100644
--- a/games-emulation/mgba/mgba-0.9.3.ebuild
+++ b/games-emulation/mgba/mgba-0.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -94,7 +94,7 @@ src_compile() {
 
 src_install() {
 	if use qt5 ; then
-		dobin ${BUILD_DIR}/qt/${PN}-qt
+		dobin "${BUILD_DIR}"/qt/${PN}-qt
 		doman doc/${PN}-qt.6
 		domenu res/${PN}-qt.desktop
 		for size in 16 24 32 48 64 96 128 256 ; do
@@ -103,10 +103,10 @@ src_install() {
 	fi
 	if use sdl ; then
 		doman doc/${PN}.6
-		newbin ${BUILD_DIR}/sdl/${PN} ${PN}-sdl
+		newbin "${BUILD_DIR}"/sdl/${PN} ${PN}-sdl
 	fi
 
-	dolib.so ${BUILD_DIR}/lib${PN}.so*
+	dolib.so "${BUILD_DIR}"/lib${PN}.so*
 }
 
 pkg_preinst() {
diff --git a/games-emulation/mgba/mgba-9999.ebuild b/games-emulation/mgba/mgba-9999.ebuild
index e9baa50b1056..bfc1bea7e039 100644
--- a/games-emulation/mgba/mgba-9999.ebuild
+++ b/games-emulation/mgba/mgba-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -94,7 +94,7 @@ src_compile() {
 
 src_install() {
 	if use qt5 ; then
-		dobin ${BUILD_DIR}/qt/${PN}-qt
+		dobin "${BUILD_DIR}"/qt/${PN}-qt
 		doman doc/${PN}-qt.6
 		domenu res/${PN}-qt.desktop
 		for size in 16 24 32 48 64 96 128 256 ; do
@@ -103,10 +103,10 @@ src_install() {
 	fi
 	if use sdl ; then
 		doman doc/${PN}.6
-		newbin ${BUILD_DIR}/sdl/${PN} ${PN}-sdl
+		newbin "${BUILD_DIR}"/sdl/${PN} ${PN}-sdl
 	fi
 
-	dolib.so ${BUILD_DIR}/lib${PN}.so*
+	dolib.so "${BUILD_DIR}"/lib${PN}.so*
 }
 
 pkg_preinst() {
diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 4fda8535a0f2..b3a5bacc9e52 100644
Binary files a/games-fps/Manifest.gz and b/games-fps/Manifest.gz differ
diff --git a/games-fps/yamagi-quake2/Manifest b/games-fps/yamagi-quake2/Manifest
index 66a891c4536a..1c74cf4e2085 100644
--- a/games-fps/yamagi-quake2/Manifest
+++ b/games-fps/yamagi-quake2/Manifest
@@ -4,5 +4,5 @@ DIST quake2-ctf-1.08.tar.xz 136468 BLAKE2B cce9f75333c03494dccc1a693c3c0a6219445
 DIST quake2-ref_vk-1.0.1.tar.gz 290799 BLAKE2B 0716d539704a58067fd2d6d4f21b27976c6bd073b2722584a804c9702f2886b252701d81f2fe1e5aba22ab83fbddd1e35ce3574c3e3d41b609ebac417ee7cfe4 SHA512 99a6b7191a2eed714f70ec389a1f1972f430b9ba324e6880ce96101336beac640fef2d45adc1a6bf04c386a1d088fafd401d303704079ed7207fe7b56d2758db
 DIST quake2-rogue-2.08.tar.xz 282140 BLAKE2B e4ead304f35028010f4ffea6eed15753feac99cfa301975f8cae88d9ac10313c9e1a9e29e37d4f186df34abf659dd45b79bda04b5f420565f256bde8b69ab199 SHA512 216b8a9862c7f189bdabc68770306ead4fa2173f9051a8fd2a7927eae8aa4e42116bbde947591432d200832a3038c79316325549822fa531fc0e76a2bec57762
 DIST quake2-xatrix-2.09.tar.xz 214096 BLAKE2B a4115da0d5624245d1065a67379d95a2b22330e1a5a999d7493d832d5edca4c83752f3a447ab1934c6709b7ed9247d5edd2b3f4b9b398a04982a9428381f2f9d SHA512 a4cf351eca2a72e6b5d8eeecf5d582a3c2c677b71dcf6bcdea310f1503f55ad8ccaf7225461bd78fc695e90d57525fd9a53c5d17e1eabd3a1d28e9386331399c
-EBUILD yamagi-quake2-8.01.ebuild 3703 BLAKE2B ff516ec4856871b12181bb3ce7632dc175e8b7afa012fc65901b126c32edf64ceb6cc03c5293f79b356e08cf54e009bcc5f66c8ec3ba012268df587a5c30975e SHA512 4f64b0e621ca5bb6c3538bac755f55578237bf9364614a5a1a60d5588e6d4f9bca37453d78cd80392e55149a43074776ff8ff1731a21678de31478432f9f8866
+EBUILD yamagi-quake2-8.01.ebuild 3710 BLAKE2B cd358f893dcf0d2cdde8b2b5f9e46bb5b0a20cc4e5140cc0e14aa5d6e86bc7b439db0800fac1fdedbd4e5e9f174d7d90984a37b599763a47578c04ff6a85b023 SHA512 31f4d183027fb7c0c530c8dce7bf244017036e828106e22bbb84c3b9c0c0960723991967667e3d62e1c4b212f4755f1c16d8211305874c244fcd11aedf26177e
 MISC metadata.xml 997 BLAKE2B 66368300709fa3d96efe1ef99188a77f0aab83526a0685e9f10d91100233352e115082eaf00713d2df6a4b42a7607efc0099fa4176d7b8b739061592969a51cc SHA512 7127d9fc2234157ad10a801fd27c6c84f132d7a05fb0a8bc4c4d31f2e0294827f416747cf0298680d99e29a87c1f261273e960c42c96708d67ee99b72f402284
diff --git a/games-fps/yamagi-quake2/yamagi-quake2-8.01.ebuild b/games-fps/yamagi-quake2/yamagi-quake2-8.01.ebuild
index 12f94411a485..539afb02311d 100644
--- a/games-fps/yamagi-quake2/yamagi-quake2-8.01.ebuild
+++ b/games-fps/yamagi-quake2/yamagi-quake2-8.01.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/quake2-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="+client ctf dedicated openal +opengl rogue softrender vulkan xatrix"
 REQUIRED_USE="
 	|| ( client dedicated )
diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index e386854b1d3d..390bfc985384 100644
Binary files a/games-util/Manifest.gz and b/games-util/Manifest.gz differ
diff --git a/games-util/pyfa/Manifest b/games-util/pyfa/Manifest
index f798bec58257..ed30b0029a22 100644
--- a/games-util/pyfa/Manifest
+++ b/games-util/pyfa/Manifest
@@ -1,9 +1,7 @@
 AUX configforced-1.15.1.py 153 BLAKE2B 135edf54e69c985693bcdde747eba5e46f7ed1390a77e1a1d40c0a624f3605c3ec8dad2f3526cbd8f406ed39fc67d3b027b7e7e462bbfa48c5649c71f0692da6 SHA512 632576b9fbff3e93c26b6c2d4be74298aa8657affe82d2c5d571a645d733a7b96d5db6b89b819d3aec9ca68e4bef11e368f7c1cbac416e9bfed88a1025a46bfe
 AUX pyfa-2.9.3-import-pyfa.patch 666 BLAKE2B 13b67511a64be93335453b617e1fad56768c9c582da4ebbef36b4848aca225220e2057c0fab088a060cc2149aed961f2063a1a34326b71f0cf3bb411105a77a7 SHA512 a0174726777d82229dcd167b005e176012a9c4398f066f183bf0b8d59bd1854411e74bca1c3848396a8c50be327c8ec4e21dde6d56d045b2af4cd13a68e0cc99
 AUX pyfa.desktop 155 BLAKE2B bccfc81c4bc7dd9099ac4bd11fdb0d5f8d72b53b5dc8a700147e7e5996b14aac9e4b46e2884a473ecc8d8b1f49305e66c46cbc7e6c5e43e93e5a3fa71c5efa08 SHA512 d62a44e4e724057581a360cc1eb10aa4c7a0c50cb1d95137e58ba14db17644c852da2582be8d508c50b7359e7f99dc893d78d15cb11c46967a9b7896ff667781
-DIST pyfa-2.33.0.tar.gz 28872031 BLAKE2B fe7fad57e43a8efc78f828d0ff81788147fa64ef02a20a71d6fef8ab0130d39b5ebffc18d58a774a61d805b8d0e570cbedb0b8fa536c8c71e61102fb6d093998 SHA512 bfa4e41b387e9f23aeae41a4884a0492316cc6e51841243ef56dc733edab10e6c9609ca7918d4de9fcd052b4da8f8048ce7578d164ad98237b53cb05f7c168d8
-DIST pyfa-2.37.0.tar.gz 29991827 BLAKE2B d2dd51becc037176ef0e4394799d6d35ea5025b4b9aba7a1e2a12d908b1d8d9a436d2e2b2e9d06b3592ea2276b3dfe24c639d02cd77fe25a6ea673d9f048a238 SHA512 e3ccee3ee3b74644f208afdf719bf1e3dc29335041e3cdd19b5742f51e1fbb0fcab2376c26fc789e7992d1f35215c128bf6480860a0eea75eeb69c9b466ba1cf
-EBUILD pyfa-2.33.0.ebuild 2627 BLAKE2B 67af875c3c233f08b4b70e2597fd44f07d256672610ad9925603ea6f04d857317c2880b85d1827b72ae7c04a175723361692aa0547064db232a7af5d6ad80caa SHA512 301908cd18992a20c324266921eb45c7932b7cfa869d6c9466bb4cf77c5abe6f2860044c3145ae214689b274d3d96d6d8a37e4cf0ddbef07cca9fc1dc3ea32f8
-EBUILD pyfa-2.37.0.ebuild 2627 BLAKE2B e2814731753c6c468916830993c6a1937aff33ab1f374c45511e37af7fd613fe7c47d22b538574aa1f5958eefa856c4af7fe8f67ac1b9be57674a0f08785896b SHA512 c1a47119da6bdd57fe2ce5c87f089da24fe87b898d9eb9406956982d45c2199061ea572e4dc4ed33a0ef414893fc338f4f37127b3fd926d35b69bfa13eafb631
+DIST pyfa-2.43.0.tar.gz 31776698 BLAKE2B 819596e670b62dad4a10edbb49f5b93e5b0d53b1976b6c1f3272731f5769897ec6f12ae681f6503966de2d91d31dc0ee5d5c8ce0cd34354279dc71a6ae20996f SHA512 847ed7b9590103b2d49fa1e60d5162c800c58a94be20bd67bb10aa0b9e2957db987464bec9941feed27b61fd49d38e6c4171d932a5450e317427a8ea54b4e890
+EBUILD pyfa-2.43.0.ebuild 2733 BLAKE2B 742fb98ce9aea88bd097bb5ccfd8d7fa9f2815d3ed7277aafc06384710380d65eb0a437173b8db5030681b006fd9e715d8cf3b22ef9ea94a13f07d95f58b398e SHA512 d671f922d7ca3f9b7d558e1276c1894619766e847f5d4f88efe728dbec41aa339b3511d86d1f87bc63f3ea92b0771dda8c232cb3e128bfad87f1c1c995610e22
 EBUILD pyfa-9999.ebuild 2627 BLAKE2B 67af875c3c233f08b4b70e2597fd44f07d256672610ad9925603ea6f04d857317c2880b85d1827b72ae7c04a175723361692aa0547064db232a7af5d6ad80caa SHA512 301908cd18992a20c324266921eb45c7932b7cfa869d6c9466bb4cf77c5abe6f2860044c3145ae214689b274d3d96d6d8a37e4cf0ddbef07cca9fc1dc3ea32f8
 MISC metadata.xml 775 BLAKE2B 263cdaa1ca901b306a3efd828ed9ff7abf06dc97f00e03355ae2df3bb1979e87e33ff0050e0681d74056d1ff4e5fb8b268393e28401d3d5a798b34756545a079 SHA512 9eec729a2954ec206f385853b1d00871fd18addaed0b386888bb6509497441d29f38474e0a1db9a22fd9ccf37408cc75084f66a07b2b0646ef76c28e42dcacdb
diff --git a/games-util/pyfa/pyfa-2.33.0.ebuild b/games-util/pyfa/pyfa-2.33.0.ebuild
deleted file mode 100644
index 1bf3c9464b03..000000000000
--- a/games-util/pyfa/pyfa-2.33.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="sqlite"
-
-inherit desktop edos2unix python-single-r1 xdg
-
-DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online"
-HOMEPAGE="https://github.com/pyfa-org/Pyfa"
-
-LICENSE="GPL-3+ all-rights-reserved"
-SLOT="0"
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/pyfa-org/Pyfa.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/pyfa-org/Pyfa/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/Pyfa-${PV}"
-fi
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="mirror bindist"
-
-DEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
-		>=dev-python/logbook-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/wxpython-4.0.6[webkit,${PYTHON_USEDEP}]
-	')
-	${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		>=dev-python/beautifulsoup4-4.6.0[${PYTHON_USEDEP}]
-		>=dev-python/markdown2-2.3.5[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.19.2[${PYTHON_USEDEP}]
-		>=dev-python/packaging-16.8[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/roman-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/matplotlib-3.1.2[wxwidgets,${PYTHON_USEDEP}]
-	')"
-BDEPEND="app-arch/zip"
-
-PATCHES=(
-	# fix import path in the main script for systemwide installation
-	"${FILESDIR}/${PN}-2.9.3-import-pyfa.patch"
-)
-
-src_prepare() {
-	# get rid of CRLF line endings introduced in 1.1.10 so patches work
-	edos2unix config.py pyfa.py gui/bitmap_loader.py service/settings.py
-
-	default
-
-	# make python recognize pyfa as a package
-	touch __init__.py || die
-
-	sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
-		-e "s:%%EPREFIX%%:${EPREFIX}:" \
-		"${FILESDIR}/configforced-1.15.1.py" > configforced.py || die
-	sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
-		pyfa.py > pyfa || die
-}
-
-src_install() {
-	python_moduleinto ${PN}
-	python_domodule eos gui service utils graphs
-	python_domodule config*.py __init__.py version.yml configforced.py db_update.py
-	python_doscript pyfa
-
-	insinto /usr/share/${PN}
-
-	einfo "Creating database ..."
-	${EPYTHON} ./db_update.py || die
-	doins eve.db
-
-	einfo "Compressing images ..."
-	pushd imgs > /dev/null || die
-	zip -r imgs.zip * || die "zip failed"
-	doins imgs.zip
-	popd > /dev/null || die
-
-	dodoc README.md
-	doicon -s 32 imgs/gui/pyfa.png
-	newicon -s 64 imgs/gui/pyfa64.png pyfa.png
-	domenu "${FILESDIR}/${PN}.desktop"
-}
diff --git a/games-util/pyfa/pyfa-2.37.0.ebuild b/games-util/pyfa/pyfa-2.43.0.ebuild
similarity index 92%
rename from games-util/pyfa/pyfa-2.37.0.ebuild
rename to games-util/pyfa/pyfa-2.43.0.ebuild
index b053388c505f..0487cf9afef8 100644
--- a/games-util/pyfa/pyfa-2.37.0.ebuild
+++ b/games-util/pyfa/pyfa-2.43.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
 PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="sqlite"
@@ -30,7 +30,7 @@ DEPEND="
 		>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
 		>=dev-python/logbook-1.0.0[${PYTHON_USEDEP}]
 		>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.3.23[${PYTHON_USEDEP}]
 		>=dev-python/wxpython-4.0.6[webkit,${PYTHON_USEDEP}]
 	')
 	${PYTHON_DEPS}"
@@ -41,7 +41,9 @@ RDEPEND="${DEPEND}
 		>=dev-python/numpy-1.19.2[${PYTHON_USEDEP}]
 		>=dev-python/packaging-16.8[${PYTHON_USEDEP}]
 		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		>=dev-python/python-jose-3.0.1[${PYTHON_USEDEP}]
 		>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-cache-0.8.1[${PYTHON_USEDEP}]
 		>=dev-python/roman-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/matplotlib-3.2.2[wxwidgets,${PYTHON_USEDEP}]
 	')"
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index dbe36e0f32ee..5e27b4f30e33 100644
Binary files a/gnome-base/Manifest.gz and b/gnome-base/Manifest.gz differ
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index b6c8c962aa20..15aad28df0c9 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -3,5 +3,5 @@ AUX gdm-3.30.3-logo.patch 846 BLAKE2B e99b6621191c509545bc36fe838bc467c3762f2726
 AUX gdm-40.0-meson-allow-building-with-elogind.patch 8801 BLAKE2B 358abc6b4a81523f53f6551af3c976916492c6c80fcacf8ec7c6fd90683558f1e7d898b749bdb458b2379e8a96f08293bbbebee3b8fc9126ebf249a95c514b41 SHA512 6116047fe51f0daf99de7e369028629fff88890c9627407648f2bec312df9b8b94f1ccb9b7015347258444f8193da16c6209a41de9441c848097670a13b4a7ef
 DIST gdm-42.0.tar.xz 811200 BLAKE2B 98f39fc4e80bb7160b7da57d5c606ce1fa2f66ea1ab817c82c6db7328df60b91a1e9a829f67a716c67a5e5ada9f9356e4c82e40065b2692f32aa80c545adc616 SHA512 e07a4e9233573069dd5628e7b7e6dbe462e90bd8f30267d3faf1cbe3dcb8b990afe3ad6af1edf5f0ec689c6eb245aaacd4e8565a7e4feea34cc754d43904daaa
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
-EBUILD gdm-42.0.ebuild 5651 BLAKE2B eb51963b597d368c0ee4a6637dc53c6b394b67aebf40ea19bb842fc500e1868cc37fa50991bb9e39c86ab0026b8aa887e7e79f4be09d0a422a31ce4a97c241a0 SHA512 0a8fd026ba15ee8c52a93804d4a31e8e43c398260194928844a9c03d4da178e754677bbbca9c9a67aae322f83c29c60263def0c4e25105db11142f4f1b8028af
+EBUILD gdm-42.0.ebuild 5649 BLAKE2B 6ffef32fd6113a851536fa3e8be7e8f47b246a08225ffc509f018a39686d6c26b25f5f0b8201c62a6a9d225fb3842424a358be6214337603990570325b12f655 SHA512 5b2394eddd5cfdd3841222808f6da7b9322cd4da070423022221751cd52a3402c4b7fe521ffc44b477f4bf8e71e6b1a83c85a657288d2c09f3177b4fedd32e75
 MISC metadata.xml 760 BLAKE2B ed67837e4caac485dd97f9b2b392c4aa26cb0515a5147a258e197531123f1c92b96900d073e85dca0ffc661aad3efb0d2328434e4554bf3b681ecf3a61eb797a SHA512 40979ee3950ee2cb3c3d67eff9c100f6fb1bc19215daaf4d8e65b8f300f05b71c74e542312780979d7ee31d0234be351496dd2dd7a7ebf3519da2fbb3acbc8dd
diff --git a/gnome-base/gdm/gdm-42.0.ebuild b/gnome-base/gdm/gdm-42.0.ebuild
index 7a16387075ff..d6c9b14f6f70 100644
--- a/gnome-base/gdm/gdm-42.0.ebuild
+++ b/gnome-base/gdm/gdm-42.0.ebuild
@@ -196,7 +196,7 @@ pkg_postinst() {
 
 	# bug #669146; gdm may crash if /var/lib/gdm subdirs are not owned by gdm:gdm
 	ret=0
-	ebegin "Fixing "${EROOT}"/var/lib/gdm ownership"
+	ebegin "Fixing ${EROOT}/var/lib/gdm ownership"
 	chown --no-dereference gdm:gdm "${EROOT}/var/lib/gdm" || ret=1
 	for d in "${EROOT}/var/lib/gdm/"{.cache,.color,.config,.dbus,.local}; do
 		[[ ! -e "${d}" ]] || chown --no-dereference -R gdm:gdm "${d}" || ret=1
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index e9b04fe58e52..a43fab730be1 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -1,7 +1,7 @@
 AUX 42.0-meson-Add-optionality-for-introspection.patch 3275 BLAKE2B f3629eab79b830397646ea855991daf5d61a9bb992262deb452e32a19e1564be20f98dfa49f8b08f6ca6a36b69fe44e46bee16b23533a27d089b77e2ae524a07 SHA512 9982e691e080dfa03c5ee6038b9a3a0e47521272240082d0da1ebf00c75f958d60c5d764ebae580415489e39b18ee77bb0c99587d32b4575ae0495fc88793c83
 DIST gnome-desktop-42.1.tar.xz 743032 BLAKE2B 1eda3138e50b0ded50ede12179311ab8888ab0837c650f3e6bad600a4327cdba02b3fbf7cf7ff845669075cbb56b69ca600b8b63b4f05dce93b0a71e76cedbd7 SHA512 a084f705aedf2d159da91dc54f38261760a50e51041321e6a69ee0dff499e11f0a440f5a9582a31977b0270c87e3ba7de0f5c9cc182c0631858afa1d9508ecf4
 DIST gnome-desktop-42.2.tar.xz 743268 BLAKE2B 8f8ee5ada3bf8b11f9bd6ddfa9925d50ccc22bb3b02f4cd8caefefe76b162347dbddb5de0d6200768e0bcaf6b60c6c774155dfc3767a827c575c48ddc40380a3 SHA512 6c7d90b539b80e45f729a14dd8bf553abb09f20d16e1a2cda751b81f1e2a52e2dcb98551faab3cd4ad17206300f45c9bc968d160fddab0b71a4933f0adc22e0e
-EBUILD gnome-desktop-42.1-r300.ebuild 1930 BLAKE2B 8ff065ab7b72b046349107f4b86a326500a28d64f34fb1b4e95876eb2d6261b1aaa94a2eed2f5ed7dbc863d097a4a75992334f7dd89e47162d7ad0679d994356 SHA512 3a97c4bc9211a9d362291d8dfae6811d2de4424bcfd296eeebde7087c1345d02367464636f628a8e3bb14c82d951c2ce30a7bf6280d77b220f0a8bcabbb7462f
+EBUILD gnome-desktop-42.1-r300.ebuild 1934 BLAKE2B 6920f1ce50aa1edd89676b5be034d01c8d71df6e687dddea1db296064ab63549448ebde729705710ea0a17756855261efbd5c0ee07e733e2c2181d3ba4693b7e SHA512 d16202197817d69c3280f703f287218c8af3e16ecb05a2e165a5018258009a61dfb723c6994272ee2ac67c7220f7584ec176be33d1938a589de062d283eef2d1
 EBUILD gnome-desktop-42.1-r400.ebuild 1894 BLAKE2B 3f52d48e3318f77055131351ad2d32de9c601ee9ef8227663dcc0c2f43e5aa8d3dee3ae911c3cf0efe1bd92c5044cf8de7af0a0ee036053e8de8931e479fc761 SHA512 c321c9fb0da94b23077be2362cca5d219512cf6f590cdc2f80088cc1f20163c3f81d531aff2f159e72fd7f5acb67473a9d76288a7a4a1a1b7c205fe3160300d4
 EBUILD gnome-desktop-42.2-r300.ebuild 1933 BLAKE2B bd31d5ce6639e07a12a477cda29b4187e0b47e6ee75b4a6154c555373dd7d7f551914fc2f2864e4a4c7527be84f2abba57158385941e49b3c97cc6d062971c79 SHA512 1432bd1e60983bad1c7596090d26cbe7271e4737f6057b69270b8c1d8894f15fec399683786a542bf1ab0de79688a6ed0192f9144be133534b68b610a5f4fc34
 EBUILD gnome-desktop-42.2-r400.ebuild 1897 BLAKE2B 61485a67a7b2c9b05bec3f65fe485225e27caa9405e996bd619db93fdb7b222a66f099058dba928bc2166527a0fce29eaed659e081c5ecdeb302371490e83ab6 SHA512 5e9d4528aa996af4d678dca04b0233d285cbe148926362d835b49270d9762638ed51f258728b43db491508cefee3d186f8efc3e2c2dfd9dd97cd9df0646c9648
diff --git a/gnome-base/gnome-desktop/gnome-desktop-42.1-r300.ebuild b/gnome-base/gnome-desktop/gnome-desktop-42.1-r300.ebuild
index c6eef4f66f57..213db2dcf6c5 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-42.1-r300.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-42.1-r300.ebuild
@@ -74,7 +74,7 @@ src_install() {
 	meson_src_install
 
 	rm -r \
-		${ED}/usr/share/gnome/gnome-version.xml \
-		${ED}/usr/share/locale \
+		"${ED}"/usr/share/gnome/gnome-version.xml \
+		"${ED}"/usr/share/locale \
 		|| die
 }
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index f27db2383858..2aabeba5a3c1 100644
Binary files a/gnome-extra/Manifest.gz and b/gnome-extra/Manifest.gz differ
diff --git a/gnome-extra/gnome-calendar/Manifest b/gnome-extra/gnome-calendar/Manifest
index ee17389a5d16..c424bf9b1cf6 100644
--- a/gnome-extra/gnome-calendar/Manifest
+++ b/gnome-extra/gnome-calendar/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-calendar-42.1.tar.xz 578424 BLAKE2B a9c62093eb89e198bec801aa070d9e2afed87833dce85a55775d4938cda23fc7dd166b9739e208e17d40b82e7dfcf0e76c83c09eb07786f9d79c38fed910d616 SHA512 5f50ab84f98c3ddf4c1e49f9556e47f6590c5eb8a3b598edb76d96d5c8eab48003e957d5b199a94a3955951453e3c3b783745c9b9376aee2d93d14ff95178093
+DIST gnome-calendar-42.2.tar.xz 578276 BLAKE2B 44684f7c1b6db6865bf0b9bc7096a990212b086d7c2e748cb41e4ac6ced4a1bec0e14f5ed3d6253f49006f4e736666578ded9cd6cd84533fcc03316c5a437b4d SHA512 6ab72017dc0230dc396c7c19cdeab633744b6a44ac4a5c2183389cadca1507bf696c5cdf39def1c0158fb0be5f1988f2a30a6fc2ea0090d6fc341adc45daddbe
 EBUILD gnome-calendar-42.1.ebuild 1093 BLAKE2B eaa1a3b269addf90f7b23c35586ed606b08811fa24dd0b303e88ff40871fada4d72357e2025acf52da8eda9e2eb6ffcbbc0ac777d37f4dd4b54d6e1fc1d8b6df SHA512 30409e17f23f833624e318cba0881268034f37cafe6c76ad6187df4185b02aeacb12cee6b654b53f735743c4df3aaf8a6a236912cc8bc00701d7af2366191343
+EBUILD gnome-calendar-42.2.ebuild 1096 BLAKE2B d92a32cb3cbee8723b892eac246790a6fa3f22c247dc38ec19664a8cf7b1148dc04951fdafcd7b72ad2494d241d9d396fcc5b9a058b6142f9bb0f2f33dbbd46d SHA512 c574b92de73dca21e67988dc4408f9021ab8b9305f2ace73a17992c1432dfae2cc3a4f114b0c4a13a02e3937211370918979560163e50360eec02d4cb370c727
 MISC metadata.xml 523 BLAKE2B ac729de842a6c4af26151fe8a6325fd880715ef5bdba87af11d3fa8b39673c13a32d9cfcaf8c13c246640bd63af8391eed13d775840a337b4e5cf85acc779df0 SHA512 0e87a27fdbccd8d5b71a2b0c57a0b1af281f8f4c64da1a7d091825d03ed3bc4897995f705bb2210800c549aee7d038742edcb3874db0fabe2be1e918483f91b2
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-42.2.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-42.2.ebuild
new file mode 100644
index 000000000000..4a5ef1c8dce0
--- /dev/null
+++ b/gnome-extra/gnome-calendar/gnome-calendar-42.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome.org gnome2-utils meson virtualx xdg
+
+DESCRIPTION="Manage your online calendars with simple and modern interface"
+HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+# >=libical-1.0.1 for https://bugzilla.gnome.org/show_bug.cgi?id=751244
+DEPEND="
+	>=dev-libs/libical-1.0.1:0=
+	>=gnome-base/gsettings-desktop-schemas-3.21.2
+	>=gnome-extra/evolution-data-server-3.33.2:=[gtk]
+	net-libs/libsoup:2.4
+	>=gui-libs/libadwaita-1.0.0:1=
+	>=dev-libs/glib-2.67.5:2
+	>=gui-libs/gtk-4.6.0:4
+	>=dev-libs/libgweather-4.0.0:4=
+	>=app-misc/geoclue-2.4:2.0
+	>=sci-geosciences/geocode-glib-3.23
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnustep-libs/Manifest.gz b/gnustep-libs/Manifest.gz
index dcffc4fcd1ca..228fd7a79655 100644
Binary files a/gnustep-libs/Manifest.gz and b/gnustep-libs/Manifest.gz differ
diff --git a/gnustep-libs/dbuskit/Manifest b/gnustep-libs/dbuskit/Manifest
index ad67342d64b4..307d937530aa 100644
--- a/gnustep-libs/dbuskit/Manifest
+++ b/gnustep-libs/dbuskit/Manifest
@@ -1,4 +1,4 @@
 AUX dbuskit-0.1.1-remove_gc.patch 926 BLAKE2B 16ba95a5966f4c3e666ad786dcd9d4f3a6db3aef0ebdbeab1f7882d931d4a935cd956ada3f9b2d85905bbd0a38b118e630fd4789bbf5907b925c465c12a9dc2d SHA512 37e72f44aaaa670ea61511592a899fd9573c838c93f2a7da246d8aaeceeac03454369887f5c63fdfd778cbddd78fc89440f07ebb5e0089f4035a830bdf1497a4
 DIST dbuskit-0.1.1.tar.gz 467141 BLAKE2B 7133c100771507b84893a0f91a11d32555f01e8425c3d4b9e848f05e3eff9ffab02b91f7a686cbf125ef6ad565c897056139d6ac28e8f5dffe41ee33c11ec095 SHA512 795fc5e42842d689af024754cf141822405b13a00da446eb6a0d631ed226c9a56de7d1ba3d4b9fd52921dc34f5845294cf4368a714c080fd3a335e8c8cc7319b
-EBUILD dbuskit-0.1.1-r1.ebuild 866 BLAKE2B 9f09d96dd3f4a1532395f1ab99f97b9bfcfd798c564cd29d6f680b25d36cd832b0a002432fd0d18b3877f4c7c929e07c210e7cf5fc2d1d17551ecb270def1410 SHA512 c6cc7d09ec3f149a36919dedc70e66e58f6ae6a7def750d5ea71172ee4fe642e2a604a113f922162a15ef4d26a881837d1d42abba5fdcbcf26a69fdb7db02ff1
+EBUILD dbuskit-0.1.1-r1.ebuild 868 BLAKE2B 1d8130d8219c6c79ee45863daad99873a121283f88032abf273ff054c49f5c921b05d8122e0121c2e5fa922780078de81026154c3c356743ecbb240092aa060d SHA512 82288deb823d7f3bb10b8d52bd4059d1c3dbbc7d74bb8ab64c1174f456db0d6d08f14c249b688702eb763205c3c4dcc561c58c94d33df1110e0a649447431e66
 MISC metadata.xml 705 BLAKE2B 1a1fb0b8bbf139c17de611ce1531f30d4b9d97a1bc366c0a4dbe8a9cacbe8abdd9da81b627d04e764ee2928d6258c973372671b47e150422a5411a8feb778c77 SHA512 2d76722ee5aae9d8bf9a531431fddd743edbbe241633dc556181629c13bd2df1c52abcff17e354747e18f76769e59fd924a727f4bda6efc8721f0221182291fc
diff --git a/gnustep-libs/dbuskit/dbuskit-0.1.1-r1.ebuild b/gnustep-libs/dbuskit/dbuskit-0.1.1-r1.ebuild
index e859cab8efe9..e2cb6e3fa8d5 100644
--- a/gnustep-libs/dbuskit/dbuskit-0.1.1-r1.ebuild
+++ b/gnustep-libs/dbuskit/dbuskit-0.1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ IUSE=""
 DEPEND=">=sys-apps/dbus-1.2.1"
 RDEPEND="${DEPEND}"
 
-PATCHES=( ${FILESDIR}/${P}-remove_gc.patch )
+PATCHES=( "${FILESDIR}"/${P}-remove_gc.patch )
 
 S=${WORKDIR}/libs-${P}
 
diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index 25553df1e615..cff5307af764 100644
Binary files a/gui-apps/Manifest.gz and b/gui-apps/Manifest.gz differ
diff --git a/gui-apps/wf-recorder/Manifest b/gui-apps/wf-recorder/Manifest
index 2b2d56d52f70..1dde51a7a56d 100644
--- a/gui-apps/wf-recorder/Manifest
+++ b/gui-apps/wf-recorder/Manifest
@@ -1,4 +1,6 @@
 DIST wf-recorder-0.2.1.tar.xz 19828 BLAKE2B b86fc418a2779521a44eaefcf0c6d5533be64b608c7c3a8a550156a07eb10053f31bce1693c33842e7313997b090b63f7908eb64d9705c406c5026a6cde09c4d SHA512 e232f4a13d4891863a58667dc87df113f13fabac5042c93143d652472287e84906b261b764869cd02c523f5b3d2331224e2bb71f66814d1a1c9c99a0d28aa40a
+DIST wf-recorder-0.3.0.tar.xz 19888 BLAKE2B 52b7cbe8ad77d3756f91cad0c0642548b439f3465be8152d9cc1175f55d608df8bbd9f21e82b18099fba59d39389012e023e7dc39a0ae061eed13aece99c058a SHA512 6c8a069c923a342441ab5ebce2cf8ec727b75f474c2843d0fa49b69b3e5ef4498bc0548573409203e704a84a72ebec5523f89459a144679bf1d9d5bf6e514b60
 EBUILD wf-recorder-0.2.1-r1.ebuild 864 BLAKE2B a01bcf35e231e188ae4248db6c2d1e25953fb5e3e4dc2fa9ae3e7c1e73d5da2b20e2b7b11ad2269f8413aeba10c0bbe282ed008bd925a58d7bd0e6cfa61a07ec SHA512 994b05efa0871452e5fa18bd78eca3ae07f4894faaa25b936cc168fdef17c6f42a5540d2f0471e2e62db78122ff796cff2e24ba6afaaf104a8d202931b06186d
-EBUILD wf-recorder-9999.ebuild 928 BLAKE2B dbb78423c7ed32557931bbb6b585d739f2a797bc7ebcb659c997cd321cff4ad9435383066621a995df26c8759b46c8042cf729d3aef761aeaebf34b7a0326335 SHA512 00b619b09d1b5d00ccedddcf5a171d4438eff9f454d92f7ae78998d29b5ccaa531bc583effa013240625d4a34cb0dbaf7d01e34de41e144815fb751f00b2c0e5
-MISC metadata.xml 537 BLAKE2B 8d3d246d4688ba7f21f0a17946fb870b4db8bc48a18c8da846b26d727e0a1fb938d006764dfb2f0cdb75a2de5cb880c0ba36fcda040f0413a1fb1eaefb38cc7e SHA512 83512e763f9dccf5f6555d41adee30e9a43efe57b49f3c076f913d2ae6f8ab07f471167c994aba9ed2b7ca37cb74e2a5c9f0adf83c26e7491efd7e69f1e9b56b
+EBUILD wf-recorder-0.3.0-r1.ebuild 683 BLAKE2B 7d68f71c6f0c825d13de4ccc68da2ae84563adfdcfb1a74fd5c81f6997207a9465df59290cce3dd35e6d5fe19cd1ef0a80a671622d3121c58c5afe85bda32603 SHA512 4dbe074bc80f95f4d383ff2c5d75e193a40ef22c2f4e9122b30ef80788ec30d0cafa4e9f1024f4bd542349501ff7d6a5d01fcc57035ba7ba7cb844af6731e5ca
+EBUILD wf-recorder-9999.ebuild 657 BLAKE2B 8c86280a09c0446ddc3af6121eb340c8e36a6a090ff01671c3243cb4d13e4a4014ea4978b16c883c4113f34e8251c08d0a85c3c450f7e994fd5443c3fd81bccc SHA512 af4ccf6cbb188afe7bb453b5dd883587c8a98311b1cc1b29ec9917386662e1aecf6dde144b1ef4d5d2a71cb4968239a989de0baa6211dd0f14d646cf0f50c28e
+MISC metadata.xml 308 BLAKE2B d85ee487e91763db23813dba51031793e04f9abb56235d594c4175a825d6bb3d5cb1accb84a178964bddb941960a9ce58a7399fe11bdebb0fe8b4d37a2adefca SHA512 80060470ed24e1ec256be8099ad6267b12a9fce7877a7854e9e7ae97bb7e07bea1b1620009619b9f4ccc29fce9010960dd8879b918e835ab3f3e88bab72087c1
diff --git a/gui-apps/wf-recorder/metadata.xml b/gui-apps/wf-recorder/metadata.xml
index 7515b09b9134..d0b1f575d590 100644
--- a/gui-apps/wf-recorder/metadata.xml
+++ b/gui-apps/wf-recorder/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>consus@ftml.net</email>
-		<name>Olaf Torvaldsson</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!--maintainer-needed-->
 	<use>
 		<flag name="opencl">Enable OpenCL</flag>
 	</use>
diff --git a/gui-apps/wf-recorder/wf-recorder-0.3.0-r1.ebuild b/gui-apps/wf-recorder/wf-recorder-0.3.0-r1.ebuild
new file mode 100644
index 000000000000..db2c10339ad5
--- /dev/null
+++ b/gui-apps/wf-recorder/wf-recorder-0.3.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="Screen recorder for wlroots-based compositors"
+HOMEPAGE="https://github.com/ammen99/wf-recorder"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ammen99/wf-recorder.git"
+else
+	SRC_URI="https://github.com/ammen99/wf-recorder/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+DEPEND="
+	dev-libs/wayland
+	media-sound/pulseaudio
+	media-video/ffmpeg[pulseaudio,x264]
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-libs/wayland-protocols
+	dev-util/wayland-scanner
+	virtual/pkgconfig
+"
diff --git a/gui-apps/wf-recorder/wf-recorder-9999.ebuild b/gui-apps/wf-recorder/wf-recorder-9999.ebuild
index 57cf62b69aff..a336c4834b51 100644
--- a/gui-apps/wf-recorder/wf-recorder-9999.ebuild
+++ b/gui-apps/wf-recorder/wf-recorder-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit meson
 
@@ -18,26 +18,14 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="+man pulseaudio opencl"
 
 DEPEND="
 	dev-libs/wayland
-	pulseaudio? ( media-sound/pulseaudio )
-	media-video/ffmpeg[opencl?,pulseaudio?,x264]
-	opencl? ( virtual/opencl )
+	media-sound/pulseaudio
+	media-video/ffmpeg[pulseaudio,x264]
 "
 RDEPEND="${DEPEND}"
 BDEPEND="
 	virtual/pkgconfig
 	dev-libs/wayland-protocols
-	man? ( >=app-text/scdoc-1.9.3 )
 "
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature man man-pages)
-		$(meson_feature pulseaudio pulse)
-		$(meson_feature opencl)
-	)
-	meson_src_configure
-}
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 81f7c98a0dff..0f9fddb897a6 100644
Binary files a/gui-libs/Manifest.gz and b/gui-libs/Manifest.gz differ
diff --git a/gui-libs/gtksourceview/Manifest b/gui-libs/gtksourceview/Manifest
index f40545f2ffe8..39e134430cda 100644
--- a/gui-libs/gtksourceview/Manifest
+++ b/gui-libs/gtksourceview/Manifest
@@ -1,4 +1,6 @@
 AUX 5-gentoo.lang 3898 BLAKE2B a47c411fa650a53cb9176c3b670b5189ea9ee0c268d09444e08756f49d1d73c14c9505a19d9354671254cbfe0bfdc69545c3d5b761998037ab2ec57ce58bb2d7 SHA512 fffb635074ed0de4cedb3836f37322c7b9b58b65e91a014b72bd6a41bcaf195f0b25d4031d65d60fa5abd1c7f4f5aaf19d61a77eb91ab6f59df814dacf0a0595
 DIST gtksourceview-5.4.1.tar.xz 1258668 BLAKE2B 588dc30093f9300c96aabdabd5bccc84a4fe93ebdcfab61f72a33113ec3f53826022d730a79e7b467a392d4467a0370b2fd3e6edf5cb2f31525b7c3d18e52107 SHA512 5270db969455ad29498a02a851802228575c9b4b6cf6d4f9736bff95f869f1052550034fe6cc4f0c8d29174559d147068dcd088ab09b2008399f7a717aced298
+DIST gtksourceview-5.4.2.tar.xz 1261496 BLAKE2B 3c7447de6d252c7fbccd5fb18222aeb25cd264b53847d3fb45a5b30a528d3a850d059f226a696e9d8462085910c67e318be10de89c0e7a554787fb25f27a6674 SHA512 eef5267bd473327f4e3e7b79d4a96c53067e221e9f171dde864a7866ccab8258ca9e13b5f59e40272fd7e3acd9e1e08bb4bea3674fa2864ec108b4a47220e9d3
 EBUILD gtksourceview-5.4.1.ebuild 1837 BLAKE2B 9d0e8e7e9c1c70f23fa4a084ca6ffc889852f6089a65a77b5c2f01824325eb4d46df77b0f19e5fdc3c8ae8b5b024f8550e218bddc0e383d0e8f9def708153afa SHA512 9b8046f6adbc152d196cb61da8d030fd5695780498d37a28cfafa300358a8ca81885a8d6cb42d45a683e5b9b59dcbb74b76ed9546c8d3d6b77cbb6b42226dfda
+EBUILD gtksourceview-5.4.2.ebuild 1840 BLAKE2B 5ab5cfd199a2f6643e3101cb20dd39fc80d0e2266bcfc36c21d793c8cc786abe433dea57264b53771ed58351bcf5a679314c7601f11e58d7b20066a12f4ca2dd SHA512 8403bbf1181ae2561aea804615b5680c3cab5382165c1da54b8113cc35c097477e4b0f6b5573d57010a5bb3d557b13233c0178722901029e3975aa7c7804775d
 MISC metadata.xml 372 BLAKE2B b688307985302494fc956df801d7ab8e4ac52ede6baec476031c31cabc013df8f0846ca3a0d67b613d4f3ba80edf69631f4d15bb43cadba82ecb1468b558651a SHA512 33dbeb75d42b8d42953d1db99e286baa90b0c7a2e6a93e945e2c1e2cb0287445aeef287bc41d44a53fcc243529880c237cf1acedc4962ee5ef5cc1e6424e102c
diff --git a/gui-libs/gtksourceview/gtksourceview-5.4.2.ebuild b/gui-libs/gtksourceview/gtksourceview-5.4.2.ebuild
new file mode 100644
index 000000000000..57c8b2dbb0cb
--- /dev/null
+++ b/gui-libs/gtksourceview/gtksourceview-5.4.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org meson vala virtualx xdg
+
+DESCRIPTION="A text widget implementing syntax highlighting and other features"
+HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
+
+LICENSE="LGPL-2.1+"
+SLOT="5"
+
+IUSE="gtk-doc +introspection sysprof +vala"
+REQUIRED_USE="
+	gtk-doc? ( introspection )
+	vala? ( introspection )
+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.70:2
+	>=gui-libs/gtk-4.5:4[introspection?]
+	>=dev-libs/libxml2-2.6:2
+	introspection? ( >=dev-libs/gobject-introspection-1.70.0:= )
+	>=dev-libs/fribidi-0.19.7
+	media-libs/fontconfig
+	x11-libs/pango[introspection?]
+	>=dev-libs/libpcre2-10.21:=[-recursion-limit(-)]
+	sysprof? ( dev-util/sysprof-capture:4 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	gtk-doc? ( dev-util/gi-docgen )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	default
+	use vala && vala_setup
+	xdg_environment_reset
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dinstall_tests=false
+		$(meson_feature introspection)
+		$(meson_use vala vapi)
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use sysprof)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	# Tests fail in test-regex with libpcre2[recursion-limit] - https://gitlab.gnome.org/GNOME/gtksourceview/-/issues/255
+	# Ensured OK via USE dep, as it would mean issues in real usage for syntax highlighting as well
+	virtx meson_src_test --timeout-multiplier=2
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /usr/share/${PN}-5/language-specs
+	newins "${FILESDIR}"/5-gentoo.lang gentoo.lang
+
+	if use gtk-doc ; then
+		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
+		mv "${ED}"/usr/share/doc/${PN}${SLOT} "${ED}"/usr/share/gtk-doc/html/ || die
+	fi
+}
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 38a36ad9435d..fdda89f51b79 100644
Binary files a/kde-frameworks/Manifest.gz and b/kde-frameworks/Manifest.gz differ
diff --git a/kde-frameworks/attica/Manifest b/kde-frameworks/attica/Manifest
index a86b1966b59b..478e8b2b6440 100644
--- a/kde-frameworks/attica/Manifest
+++ b/kde-frameworks/attica/Manifest
@@ -1,7 +1,5 @@
 DIST attica-5.92.0.tar.xz 69292 BLAKE2B 39ebb66e584b98d35c25b7086ade046bdc032c48978d91bdf5d60f28067c3fd3aeea307c8394aab937eb1be81e026baf4a08218e27d3ff07e14f1767d951dcda SHA512 cb82bbe7d2ba6bd093eb09c3b658af24462ba82380a93138eaec367caacbb6f89931dbcfd8a560a576c51d8f4f532a96dd3ec56fd404c92214d38705fd18fb9c
-DIST attica-5.94.0.tar.xz 69320 BLAKE2B 17824e3de7611a448f99c5562882e0e289dedda939b06a658da4e54d8278a340a74939a0f9a4405011c4153aa5c4040027d623bb67f2e69e695509d4e07bf9a1 SHA512 0c5dd2495f43b2cd4e7bd431619af249a767e5f7add913889dffcf64dc5ef8c4551e789a3a2b1850bb7c4a544144921d562e62580f0ff257b0291521dfdddf56
 DIST attica-5.95.0.tar.xz 69296 BLAKE2B e8eef2d3b207284e7417c41829b62b04b447381a6a105d355343d6806511d409331eaca208e062d0a8907a2051700f38f0724c266773a411411c33536c6aee40 SHA512 51dfb53ebcaaac03306c256e156ad79c49f0c44ee01973fe3ecf55c7f0bee50c2f6032c3b3bcde1433cbad0df98a110e5ffc30657fdb02b10101c5111efac1ee
 EBUILD attica-5.92.0.ebuild 474 BLAKE2B 01f4561366de6a2c831394cdb1642685c61ab9fc3ef434688e407735382cae2613e807de8759a629e56035b990a87d5476faf2106e5719d4d4faf3459bee085b SHA512 1502f08219f7180dcc8e4073357d766bb491448bb8051af55613e3e90819c4fdb6f0bcb2efc20b39b7c26b64235565c4d91e49cf46caaf12419196fce19113cb
-EBUILD attica-5.94.0.ebuild 477 BLAKE2B 995b8482aa5485c46cdbff003e3e73abee3f9d6a3232241a25091d75f69bdbf9d1831a0ced4c31456c795e8d7719a9188679cec7db017c7a503133df91466171 SHA512 1d76ae34da55d0c34759e6806df34a20ef831a5418221648d27bef3e201af21c4130a4a049359a455671a03f88dfe3cb1c9f218eaf9bb490cccd3f4417840f31
 EBUILD attica-5.95.0.ebuild 477 BLAKE2B 995b8482aa5485c46cdbff003e3e73abee3f9d6a3232241a25091d75f69bdbf9d1831a0ced4c31456c795e8d7719a9188679cec7db017c7a503133df91466171 SHA512 1d76ae34da55d0c34759e6806df34a20ef831a5418221648d27bef3e201af21c4130a4a049359a455671a03f88dfe3cb1c9f218eaf9bb490cccd3f4417840f31
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/attica/attica-5.94.0.ebuild b/kde-frameworks/attica/attica-5.94.0.ebuild
deleted file mode 100644
index a0eed868ad43..000000000000
--- a/kde-frameworks/attica/attica-5.94.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QTMIN=5.15.3
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing access to Open Collaboration Services"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtnetwork-${QTMIN}:5
-"
-DEPEND="${RDEPEND}"
-
-src_test() {
-	# requires network access, bug #661230
-	local myctestargs=(
-		-E "(providertest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-frameworks/baloo/Manifest b/kde-frameworks/baloo/Manifest
index c67afb0a5f10..35543a9a6c4a 100644
--- a/kde-frameworks/baloo/Manifest
+++ b/kde-frameworks/baloo/Manifest
@@ -1,7 +1,5 @@
 DIST baloo-5.92.0.tar.xz 287616 BLAKE2B 4120a298a4e4b30ac9ffd2e797e84c18252c3d69a8f5e82db1a73b6aecc4b3b1e0200eb35cece221296ff5aa2c65ea6cb385945c2b624b21b67e94da543f005b SHA512 0914420618d6c79ee370e308a2fdcb770fd276136aa8d73fa3afbc76d4a51aac7236ecc6f386ef4fb0cf9776daaf3f2056cffdadd0c948420b4fcb5c292b9d64
-DIST baloo-5.94.0.tar.xz 289452 BLAKE2B e53fd68e15d122e9fb1154c54674b4531f8ec310eca666cf492b74b5725c126dd75c00cf76c5aca9f8d884f771cf942f4839d7df4997f4e49d77ce5cce85181a SHA512 e79fa98d86daca96fd813e8778cfffa16488d0c5fc050eaa4b72b5bfc33243fcd777e8508425bf64ecd451e0f150c02dd18fb892d215fa6a05cb17e03bd349f7
 DIST baloo-5.95.0.tar.xz 290040 BLAKE2B 0674f13225ddab93da8850cc1f2b78ce3dd178d65f3e902fa322fa9a6cd28c673c606c19161d4b8d23feb14042aab198406cc2fea8b459967e0fe90d9a875bad SHA512 2da152ee9af939290d568a851aa69ca4b6ad119eb4d6ca6cd86818391d5922f34c5f556ebacc92be9ef6e9e2d6eff40275a12e4022fd649264fb80eebf8ada33
 EBUILD baloo-5.92.0.ebuild 895 BLAKE2B fa17a316589efe4f05492dd3c75652d54bfc96ce45efd14724e26b67f25a4f840493ef4680e6f7b3cc2c39ba99c0a0b63abdd5b68a671c9bb361e16dcb707f8c SHA512 a0df0efc876d11082249a49878a693f1670f8e92e1d729ca445a49440932f16b0407a80b259446ed6de3266f32bb7361d3e5227fe0584c72bac54ffcd60e62da
-EBUILD baloo-5.94.0.ebuild 898 BLAKE2B b12be3d95876abdd77a80af11955ea9cd62802cb2d4be595e67109fbd7a8b4ba900d817a350178c98bf611014603501a2c1947b72e1dc72c2d580a8af69a52e0 SHA512 379b4fa3a6cd35612c2a54be8586602a9f6ee5b253a29571ccc61ef2fef6813086cf9ba4149cda7e38d5d8a66366bf87106f3110323a27aba456d2f49283831d
 EBUILD baloo-5.95.0.ebuild 898 BLAKE2B b12be3d95876abdd77a80af11955ea9cd62802cb2d4be595e67109fbd7a8b4ba900d817a350178c98bf611014603501a2c1947b72e1dc72c2d580a8af69a52e0 SHA512 379b4fa3a6cd35612c2a54be8586602a9f6ee5b253a29571ccc61ef2fef6813086cf9ba4149cda7e38d5d8a66366bf87106f3110323a27aba456d2f49283831d
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/baloo/baloo-5.94.0.ebuild b/kde-frameworks/baloo/baloo-5.94.0.ebuild
deleted file mode 100644
index b07f4702bd3b..000000000000
--- a/kde-frameworks/baloo/baloo-5.94.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for searching and managing metadata"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-RESTRICT="test" # bug 624250
-
-DEPEND="
-	>=dev-db/lmdb-0.9.17
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kcrash-${PVCUT}*:5
-	=kde-frameworks/kdbusaddons-${PVCUT}*:5
-	=kde-frameworks/kfilemetadata-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kidletime-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/solid-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/bluez-qt/Manifest b/kde-frameworks/bluez-qt/Manifest
index 4b09ffa21f0b..59138564efdf 100644
--- a/kde-frameworks/bluez-qt/Manifest
+++ b/kde-frameworks/bluez-qt/Manifest
@@ -1,7 +1,5 @@
 DIST bluez-qt-5.92.0.tar.xz 113940 BLAKE2B b34dcd937f1f01c43935862df3dbddf09109aefb66c1e5f56790be43d2db4116ce1528177b0e9ffd8341b69867f1c09db7289de680b44575623f3ee6d77f7471 SHA512 fe258828731f6efc71b7fe83fff1613cf57fc41b27ea1c5a72063bb65df42e101cf68942aa668c39c3905ab4df9d03629d6d6b97c2cf98bea176069c11aa183b
-DIST bluez-qt-5.94.0.tar.xz 113992 BLAKE2B f9b02eab865dc83ea59ac5c4db4cb2a7e62d6874ed8a6c5c4665ccd64e5e0fa5dedb44dabd246e280e5d7ad4803c41314c874c31c4842ae38716011d73a29418 SHA512 9599376056de2711faba6e74f6259caa5d641f4c1dadd84967f184736d0437195d0789c322fd81dc3767bafc99232d0899e7728ba90a8c6bac7b8f482fad0ac9
 DIST bluez-qt-5.95.0.tar.xz 114004 BLAKE2B a69dd475ac1efecb9cb44dcd4854e577911db74460395a29fdfea0cdb6ca9d89ea2c20986d547d7a722c99ad7b8aa5c2f7bf06186796af676be1bba3fa2cb12e SHA512 35c3949dd1d7c1693c76fcd409484b6f33e54f00a421ef3a1c0e5edb0c09c3925893bdb0531d9e9e849f981daf59a6c4f6ecd8c964c9edd167232f015d091197
 EBUILD bluez-qt-5.92.0.ebuild 685 BLAKE2B ac3324ab6e189c2aba8f2cbe14567b07a0ab1d59712ff8100aaf3ba2b640688fd29d1b3e07788af363b14e3d0b7b6b10eb19659fb91a7915096faeb23b82780b SHA512 53bd2c1950af3028b3f0c4f8184e9d5b55d46d5ebaf094c33c6b01c2e28c4b5955e3fb6fbdf88cb6d83b1556a39b4c86661d4d7456d32c8fafb8c9731c8fbc78
-EBUILD bluez-qt-5.94.0.ebuild 688 BLAKE2B 7d30708cea7ec21f9afbcea97d4cb68eb40c18a14ab698abc0d52b1a9e756f489b0063e8d32576506e100e49df50eefd238f5354b841209b125c6c2867a00daa SHA512 d86f113722be688d16b6ebd9c9811fbcb129fa3cbd82eec23ecd937c370a75487d78a125baadd48c1f873b5242eb49b290a6ee71f1aa2bb1274aa7bce98503aa
-EBUILD bluez-qt-5.95.0.ebuild 688 BLAKE2B 7d30708cea7ec21f9afbcea97d4cb68eb40c18a14ab698abc0d52b1a9e756f489b0063e8d32576506e100e49df50eefd238f5354b841209b125c6c2867a00daa SHA512 d86f113722be688d16b6ebd9c9811fbcb129fa3cbd82eec23ecd937c370a75487d78a125baadd48c1f873b5242eb49b290a6ee71f1aa2bb1274aa7bce98503aa
+EBUILD bluez-qt-5.95.0-r1.ebuild 787 BLAKE2B e7a66dc4188a666bfe23c091c6bcfdf5a10ab089209044e916b72f798ededfb043567761c698afd7e06349a6c4599be461a94af218060549882fb2a469f2ad18 SHA512 d5aaa114d2276209fe61e4c3ccb408f89ebe7933fbbd15c2313996801616c9724a29f6ea15d5386efecd0e39aad29901a478bc88c5aed88cf43ab201594ccd13
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/bluez-qt/bluez-qt-5.94.0.ebuild b/kde-frameworks/bluez-qt/bluez-qt-5.94.0.ebuild
deleted file mode 100644
index bf8e1478150a..000000000000
--- a/kde-frameworks/bluez-qt/bluez-qt-5.94.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QTMIN=5.15.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org udev
-
-DESCRIPTION="Qt wrapper for Bluez 5 DBus API"
-LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUDEV_RULES_INSTALL_DIR="$(get_udevdir)/rules.d"
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# parallel tests fail, bug 609248; managertest hangs, bug 668196
-	local myctestargs=(
-		-j1
-		-E "(managertest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-frameworks/bluez-qt/bluez-qt-5.95.0.ebuild b/kde-frameworks/bluez-qt/bluez-qt-5.95.0-r1.ebuild
similarity index 87%
rename from kde-frameworks/bluez-qt/bluez-qt-5.95.0.ebuild
rename to kde-frameworks/bluez-qt/bluez-qt-5.95.0-r1.ebuild
index bf8e1478150a..eb3e0ae5744c 100644
--- a/kde-frameworks/bluez-qt/bluez-qt-5.95.0.ebuild
+++ b/kde-frameworks/bluez-qt/bluez-qt-5.95.0-r1.ebuild
@@ -8,6 +8,7 @@ VIRTUALX_REQUIRED="test"
 inherit ecm kde.org udev
 
 DESCRIPTION="Qt wrapper for Bluez 5 DBus API"
+
 LICENSE="LGPL-2"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
@@ -36,3 +37,13 @@ src_test() {
 
 	ecm_src_test
 }
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	udev_reload
+}
+
+pkg_postrm() {
+	ecm_pkg_postrm
+	udev_reload
+}
diff --git a/kde-frameworks/breeze-icons-rcc/Manifest b/kde-frameworks/breeze-icons-rcc/Manifest
index e9768d6392a8..fbba10b2fd2f 100644
--- a/kde-frameworks/breeze-icons-rcc/Manifest
+++ b/kde-frameworks/breeze-icons-rcc/Manifest
@@ -1,7 +1,5 @@
 DIST breeze-icons-5.92.0.tar.xz 2147592 BLAKE2B a4b8bb0d05c38c90d2c8170918b1ad9abe0100bf1323f8b5089d43e698d117e2959cce6d7cc39f634c8e008fdde5ae8a2acdb830356df4b07f601e9ec2ba4ebc SHA512 830309765695df290e249d6aff6685867e8a394e5a39e0df66b2566cb3d8bf5eb973a33fc61f69bf410b16ea5644f967da557a7c3d1cc349eb1fc429d997597b
-DIST breeze-icons-5.94.0.tar.xz 2151008 BLAKE2B 1aa8826c57d894d01545f344dc7e01b2db7ff0f87938ca2ed10962760912e73e5f3747457c32c2e7f17cd5739cffd84f6f9d8a5d7ac4f6ff1ce2f1b78993e541 SHA512 63f58c75864b3791c7b7ab87666c49328589cd2867f166e496553281497375d9c6054c3ddfea7c6101092d8636d35d4c263fdccd3a58b50d9dd2a14210facb5c
 DIST breeze-icons-5.95.0.tar.xz 2150968 BLAKE2B 52bf40937e5a245b86231a4ba936a329afdcd2c1eb2e72f1a07157dff1c88431a211c02bba11b07698bb56e9df8179fff74a7b7a3d2f544c4001b048ccbeb6e5 SHA512 a1a9d01d0fe78b769340b99ba83205e952a01e73a5b2b5edeefbbbc39c8819038c8b7f6d70248aafdf182eb4ccc9f00954f19482e034b0045e5f0278f56db1e2
 EBUILD breeze-icons-rcc-5.92.0.ebuild 918 BLAKE2B 035e3f978707d7998edc6ef235fdaccc883af1a427cee00c54001d432205afe61addbed6417caa393619369d75eb1ce5d2ea702acda7e2a4e70dce888cf4c68e SHA512 ad2dc084e2867a8458537f411059674a19f65d802ae113dd040f6bcb9b64bce1d3200aa53d4bf40d0614241c0e9af8589937cdadcd1b5e4d57c20efa94621f4c
-EBUILD breeze-icons-rcc-5.94.0.ebuild 921 BLAKE2B 5bcfbc6e04823a4d8719b3a118b8cd066da14c9e7f36a6553f37af2eff6d3e71caa1d2051e8487699b3cce57326887ceb94d99ec995c097177ecfe151c377a4a SHA512 274fe0fc1c855ab2685476d9fb40b2b74eddb6f23769e4d291454c057aa4dee91a6df13e3db8abb4980bf647dfe667614da99b96e6d9eda66c875113d380fa0e
 EBUILD breeze-icons-rcc-5.95.0.ebuild 921 BLAKE2B 5bcfbc6e04823a4d8719b3a118b8cd066da14c9e7f36a6553f37af2eff6d3e71caa1d2051e8487699b3cce57326887ceb94d99ec995c097177ecfe151c377a4a SHA512 274fe0fc1c855ab2685476d9fb40b2b74eddb6f23769e4d291454c057aa4dee91a6df13e3db8abb4980bf647dfe667614da99b96e6d9eda66c875113d380fa0e
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.94.0.ebuild b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.94.0.ebuild
deleted file mode 100644
index 41c19ea3eb4e..000000000000
--- a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.94.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_NAME="breeze-icons"
-PVCUT=$(ver_cut 1-2)
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake kde.org python-any-r1
-
-DESCRIPTION="Breeze SVG icon theme binary resource"
-LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
-	dev-qt/qtcore:5
-	>=kde-frameworks/extra-cmake-modules-${PVCUT}:5
-	test? ( app-misc/fdupes )
-"
-DEPEND="test? ( dev-qt/qttest:5 )"
-
-python_check_deps() {
-	has_version "dev-python/lxml[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	cmake_src_prepare
-	use test || cmake_comment_add_subdirectory autotests
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPython_EXECUTABLE="${PYTHON}"
-		-DBINARY_ICONS_RESOURCE=ON
-		-DSKIP_INSTALL_ICONS=ON
-	)
-	cmake_src_configure
-}
diff --git a/kde-frameworks/breeze-icons/Manifest b/kde-frameworks/breeze-icons/Manifest
index 531f8f61f2e4..a5a4ce4374f6 100644
--- a/kde-frameworks/breeze-icons/Manifest
+++ b/kde-frameworks/breeze-icons/Manifest
@@ -1,7 +1,5 @@
 DIST breeze-icons-5.92.0.tar.xz 2147592 BLAKE2B a4b8bb0d05c38c90d2c8170918b1ad9abe0100bf1323f8b5089d43e698d117e2959cce6d7cc39f634c8e008fdde5ae8a2acdb830356df4b07f601e9ec2ba4ebc SHA512 830309765695df290e249d6aff6685867e8a394e5a39e0df66b2566cb3d8bf5eb973a33fc61f69bf410b16ea5644f967da557a7c3d1cc349eb1fc429d997597b
-DIST breeze-icons-5.94.0.tar.xz 2151008 BLAKE2B 1aa8826c57d894d01545f344dc7e01b2db7ff0f87938ca2ed10962760912e73e5f3747457c32c2e7f17cd5739cffd84f6f9d8a5d7ac4f6ff1ce2f1b78993e541 SHA512 63f58c75864b3791c7b7ab87666c49328589cd2867f166e496553281497375d9c6054c3ddfea7c6101092d8636d35d4c263fdccd3a58b50d9dd2a14210facb5c
 DIST breeze-icons-5.95.0.tar.xz 2150968 BLAKE2B 52bf40937e5a245b86231a4ba936a329afdcd2c1eb2e72f1a07157dff1c88431a211c02bba11b07698bb56e9df8179fff74a7b7a3d2f544c4001b048ccbeb6e5 SHA512 a1a9d01d0fe78b769340b99ba83205e952a01e73a5b2b5edeefbbbc39c8819038c8b7f6d70248aafdf182eb4ccc9f00954f19482e034b0045e5f0278f56db1e2
 EBUILD breeze-icons-5.92.0.ebuild 1117 BLAKE2B d6edc6ee5bec5c55ffa0fecb1f2212f8b7726f2d1dccbab198aa6bbcb77d0fed2f7e2feec55e733f9946afadbfe0bde95e6a270d72729895a1d3fdeee176d03f SHA512 145fcdb28059147b78d60bbec838bb3a6477b03227fae9b5b634c1dc43d8df31c79bf14b7c0b46211883e8ad060113a826fab0b6d616624052d86fac18658162
-EBUILD breeze-icons-5.94.0.ebuild 1120 BLAKE2B 5358e9e8c7a8bea406ac478b7ef2e1251323494e5605446474a5ed68a8a7113d776b102c50653d0f7a0eb61c81d80887fb79622a42917c9f3a42d4a6dd43fdb5 SHA512 e275eaeb54aafa2ddece39e07e4fad45037b9815105ab1e2522788c56d0a82bfe566a9fa58063bd2cb452aa69c17de4f1e8e4a2b1f1117cc56e7dca346c4d960
 EBUILD breeze-icons-5.95.0.ebuild 1120 BLAKE2B 5358e9e8c7a8bea406ac478b7ef2e1251323494e5605446474a5ed68a8a7113d776b102c50653d0f7a0eb61c81d80887fb79622a42917c9f3a42d4a6dd43fdb5 SHA512 e275eaeb54aafa2ddece39e07e4fad45037b9815105ab1e2522788c56d0a82bfe566a9fa58063bd2cb452aa69c17de4f1e8e4a2b1f1117cc56e7dca346c4d960
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/breeze-icons/breeze-icons-5.94.0.ebuild b/kde-frameworks/breeze-icons/breeze-icons-5.94.0.ebuild
deleted file mode 100644
index 152a388fe1ee..000000000000
--- a/kde-frameworks/breeze-icons/breeze-icons-5.94.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PVCUT=$(ver_cut 1-2)
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake kde.org python-any-r1 xdg-utils
-
-DESCRIPTION="Breeze SVG icon theme"
-
-LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-qt/qttest:5 )"
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
-	dev-qt/qtcore:5
-	>=kde-frameworks/extra-cmake-modules-${PVCUT}:5
-	test? ( app-misc/fdupes )
-"
-
-python_check_deps() {
-	has_version "dev-python/lxml[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	cmake_src_prepare
-	use test || cmake_comment_add_subdirectory autotests
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPython_EXECUTABLE="${PYTHON}"
-		-DBINARY_ICONS_RESOURCE=OFF
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	# bug 770988
-	find "${ED}"/usr/share/icons/ -type d -empty -delete || die
-	find "${ED}"/usr/share/icons/ -xtype l -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/kde-frameworks/countryflags/Manifest b/kde-frameworks/countryflags/Manifest
index 121665956403..27aec71e9433 100644
--- a/kde-frameworks/countryflags/Manifest
+++ b/kde-frameworks/countryflags/Manifest
@@ -1,8 +1,6 @@
 AUX countryflags-5.90.0-standalone.patch 1953 BLAKE2B 556973d44e147efeecd3080fb8165c00e0f9cd3f37933d9761b8c5c5fb7549553208e44a7b121b78813a64937a44253446604d3a038dff7d0e59dc1fab65ac3a SHA512 13f8883f955bc49a75d05949584da05b7886bf280e70d3808e7fbcaf02f9b15779aa4b6a0e3a2c3372d6b801d415bdd7fb9a8b169bc381e541734343fa74c3e8
 DIST kdelibs4support-5.92.0.tar.xz 3649060 BLAKE2B c3989cb4a0d9365a46cd42519abf82b65238234010207e1eb00d214eae11eb27525642689c791e6140db6de481a622b07b11a5d16355388fb6182ad3d7f230d3 SHA512 ff42d5ad75c073c3f5c856b611b3235982f513c1bc1186a9c7b4ceecf2cb7561dc37485a8e5d53582546141493b6038177a72cc94ac76bd999913ea83d22297d
-DIST kdelibs4support-5.94.0.tar.xz 3651300 BLAKE2B e6ddd55693f1e233b03f80d65ebe07db54eb93456019c4a1bb18eb75281e93471e3638fd1e40da5b1c7e31e247823192d7ab748b5016f264b578a3b39de7b3ac SHA512 8b48b7d67201bc6e0fb67fa00b75dbaf8e35e21f7527b4bc79939c2b689c027bfa75eb60b13686bd8bce710a61682a27cac85481edd6e321063aefb186cdd2f2
 DIST kdelibs4support-5.95.0.tar.xz 3652484 BLAKE2B 1e79b801274ec97352e49aafae391c130e75cfb6f7c66320dc011cbb318b8739234d9bb9e0e3aa33a96e5335ae6fa99dec823552bf6124f231aa48d2a6264bd9 SHA512 28a8a78f61eda609425acc3ef76dc804774d1eba5eabf674cab9abff8fb9ef3925bb71d0a97a13eea4e578f66996660a0bf19851624ab239826dad5de2fedf14
 EBUILD countryflags-5.92.0.ebuild 555 BLAKE2B 5644bd1b907b71b8feb6773e46c69c59da5d5f655cb89c166bf14f094983f77b9272953882c6cbb89a6ed3d4dd4229d7301c2d157bfbca4cece72a1f9789b1e6 SHA512 5a8b5e153ee51f2554cb738a7af07e9393e46224f38b63ff3b0e76b3282e08979f428796a8d22c8cd6e8e5a36f3a0c9702be32625c245ed3e1007fea8ffc62da
-EBUILD countryflags-5.94.0.ebuild 558 BLAKE2B e8563cbdcb097f0efc783d75a81513a5cfe8808be4d92dc4f3407edaaf2c84acacef0e8682a45dfec6031573b60235d38ae899dd058db145cffbb5c792ffc7e2 SHA512 a37a4f7a6cb193f529bde5c5615ed9a0dcc2296a566ad14e9be3ebc8e6d248b93ae55fb87095eb475d20e45512d3f934f72e11f10f8d79bf9767c5e53a36e09c
 EBUILD countryflags-5.95.0.ebuild 558 BLAKE2B e8563cbdcb097f0efc783d75a81513a5cfe8808be4d92dc4f3407edaaf2c84acacef0e8682a45dfec6031573b60235d38ae899dd058db145cffbb5c792ffc7e2 SHA512 a37a4f7a6cb193f529bde5c5615ed9a0dcc2296a566ad14e9be3ebc8e6d248b93ae55fb87095eb475d20e45512d3f934f72e11f10f8d79bf9767c5e53a36e09c
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/countryflags/countryflags-5.94.0.ebuild b/kde-frameworks/countryflags/countryflags-5.94.0.ebuild
deleted file mode 100644
index f64b0a75fbf3..000000000000
--- a/kde-frameworks/countryflags/countryflags-5.94.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="false"
-ECM_TEST="false"
-KDE_ORG_NAME="kdelibs4support"
-inherit ecm kde.org
-
-DESCRIPTION="Icons of flags for various countries"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-CMAKE_USE_DIR="${S}/src/l10n"
-
-# https://phabricator.kde.org/T13722
-# https://invent.kde.org/frameworks/breeze-icons/-/issues/1
-PATCHES=( "${FILESDIR}/${PN}-5.90.0-standalone.patch" )
-
-RDEPEND="!<kde-frameworks/kdelibs4support-5.90.0:5"
diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index 261522b5ac81..6fbd672f14c4 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -4,9 +4,7 @@ AUX extra-cmake-modules-5.91.0-disable-qmlplugindump.patch 3155 BLAKE2B f01348be
 AUX extra-cmake-modules-5.93.0-disable-qmlplugindump.patch 3151 BLAKE2B f10ceecfbfdad60f628cf1b0c0972f8ebc8db615938b23f300f80855bcc77a6f21d35cb56130df760e3e893ee025689869023048434a3f6329f25181304b4eb6 SHA512 8f046619df65df32736a217ca94439e9c567f6a84a3c736507259b20958c1972d21ee7dcda79b11cc220713010fbfb69f516f0ea1ea2b730e5efb7c32a2fdd04
 AUX extra-cmake-modules-5.93.0-skip-ecm_add_test-early.patch 1703 BLAKE2B 71d07fcfb3a93caf5f73f818cff7f0139c4866ef3a1abaede189e171217ec9a4e6825ec6d37c344ab8d94989493647f4d7b5749d3db1767b54bb9c6e328ca571 SHA512 8b015810e455aa0a54535f594668595900b0b2d700685c952cbb9a2dd46e3c413815b33fef69f4251bb20c93e4c3a4e6b9691680b3ffcf1bac5cf48931bb5e3b
 DIST extra-cmake-modules-5.92.0.tar.xz 329884 BLAKE2B e2d6bb7ff492f916f2e276faf452c2b02adfed8133096cff17c76992d11255f93a55cfc8140dc1b577facdb03cbbcddfefcbbe5242a006aa4c5786a0c64bf329 SHA512 c4adc98a5d3ff0844165fc5f51f9a1a4ff04ef8e8d8b87b87b094d0601577c239f87f05dd461270563d5160af7248ee064984275223a48e931b1761450dcaf20
-DIST extra-cmake-modules-5.94.0.tar.xz 331500 BLAKE2B b3dd13a9ae089fd1b102fec37155fbe173511d97367ba2bf347533a2ce019bc6327a747cef2fab46daa9ec0429df49729d9f15256cd466a62bb41f7cc5b2397e SHA512 c76e27ded4d5108d756b5891c64cbfbaad8a944e2cc5ce3a1b56ef395bad9688e493a1d8a6e91c2910e156ff5ff018ed054a4b3825b093c877e6c445eb74179e
 DIST extra-cmake-modules-5.95.0.tar.xz 331364 BLAKE2B dc3398aff741ef6923ebc287bff0c2de16a0481c7e6a666f4712db55ccb71c47cdcd2a0234d9c095b352387b692c8a395355b34de581cd44a6e57c785d6bdc17 SHA512 b99cda146c4dec0c21bd558d6435996aaacf3db819f96ca16a0344d8da8dd30bb3ff37aa03f2ac78c4e5da6b0874844fba2bebd24015a804ba985c93c924064e
 EBUILD extra-cmake-modules-5.92.0.ebuild 1818 BLAKE2B bed80d21fa05b767896265d5e7648d60f5d85a4bea47c2f3c351cec09a43e84404488339e4af4b4027951540d840f4f02027e504defb070567e13938e0d498ad SHA512 c85253481df5d7edab33e4b9b979fc8ca743dec3491a53640d0ddff2de64d3c72a5436c5ec5c7377495ba3f6eeacb5249a9682478d5d274db3e5ce8361122fb5
-EBUILD extra-cmake-modules-5.94.0.ebuild 1830 BLAKE2B cad33b91032d3bb12b87939fe56deb401597a13b1bff6e2758af432154b83f5b2505481149979023c16b485939a76512446a3370de40eee8852350a7bff00612 SHA512 16f9760360c3857f77d86e1408232230ff753983d94e6aa29ca45bea3b2f90eabae697f05e6391f1147b0d1c0260785e4f3695d5979621bf02f69724ee043fb7
 EBUILD extra-cmake-modules-5.95.0.ebuild 1830 BLAKE2B cad33b91032d3bb12b87939fe56deb401597a13b1bff6e2758af432154b83f5b2505481149979023c16b485939a76512446a3370de40eee8852350a7bff00612 SHA512 16f9760360c3857f77d86e1408232230ff753983d94e6aa29ca45bea3b2f90eabae697f05e6391f1147b0d1c0260785e4f3695d5979621bf02f69724ee043fb7
 MISC metadata.xml 480 BLAKE2B ab8e3f4e0a74a0e856bba9cf47e40254738c6d545a569bf12fae38e8e6d1e5d0cfd5a0ffaf6d5266a1532ea455d5f7f5421f1b88fa09539af6e31d2e85e170ad SHA512 0161373d45e5fd9a1c3c4f47892fcf1173419481f8de3ee73cc029ac628d36551516d0b99acc8b227b336ec5ce138844fd2654555edff3a73b8c07dbd931e468
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.94.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.94.0.ebuild
deleted file mode 100644
index 6dd4ecb8e60f..000000000000
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.94.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-QTMIN=5.15.3
-inherit cmake kde.org python-any-r1
-
-DESCRIPTION="Extra modules and scripts for CMake"
-HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
-IUSE="doc test"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	doc? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
-		>=dev-qt/qthelp-${QTMIN}:5
-	)
-	test? (
-		>=dev-qt/linguist-tools-${QTMIN}:5
-		>=dev-qt/qtcore-${QTMIN}:5
-	)
-"
-RDEPEND="
-	app-arch/libarchive[bzip2]
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch"
-	"${FILESDIR}/${PN}-5.93.0-skip-ecm_add_test-early.patch"
-	"${FILESDIR}/${PN}-5.93.0-disable-qmlplugindump.patch"
-)
-
-python_check_deps() {
-	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	# Requires PyQt5, bug #680256
-	sed -i -e "/^if(NOT SIP_Qt5Core_Mod_FILE)/s/NOT SIP_Qt5Core_Mod_FILE/TRUE/" \
-		tests/CMakeLists.txt || die "failed to disable GenerateSipBindings tests"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DDOC_INSTALL_DIR=/usr/share/doc/"${PF}"
-		-DBUILD_QTHELP_DOCS=$(usex doc)
-		-DBUILD_HTML_DOCS=$(usex doc)
-		-DBUILD_MAN_DOCS=$(usex doc)
-		-DBUILD_TESTING=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	# ECMToolchainAndroidTest passes but then breaks src_install
-	# ECMPoQmToolsTest is broken, bug #627806
-	# KDEFetchTranslations can not possibly succeed in releases, bug #764953
-	# possible race condition with multiple jobs, bug #701854
-	local myctestargs=(
-		-j1
-		-E "(ECMToolchainAndroidTest|ECMPoQmToolsTest|KDEFetchTranslations)"
-	)
-
-	cmake_src_test
-}
diff --git a/kde-frameworks/frameworkintegration/Manifest b/kde-frameworks/frameworkintegration/Manifest
index 2d28d41ce100..a02dccc13ca3 100644
--- a/kde-frameworks/frameworkintegration/Manifest
+++ b/kde-frameworks/frameworkintegration/Manifest
@@ -1,7 +1,5 @@
 DIST frameworkintegration-5.92.0.tar.xz 1758268 BLAKE2B 7f72908f93158f42c2e90488aa037bb7dd9146e333b504a9034c8b5c6898fb5a6357a62fc81c237f8be9b854d05c97ce4352d28aa4f28ba1674d26b0098c7e41 SHA512 3445749f4ee10493a798433a7b5630dc22701c98c3f81c7e2236cffea9f9576ce8123006e5123698e5d648771ea77bff848453b188b1a6e791aab08184cebecc
-DIST frameworkintegration-5.94.0.tar.xz 1758292 BLAKE2B 00f4289667ff547e3064c3d18369a225825a08ec0569e5712a2c1b044d2ea1a4e9ff0a12a8e43d4c81900e5ae18f67ebbdc4b9589abb338fa2d8b6bdb2ed97ec SHA512 3900fe970d459707b634df90515e49593632e7fe1dc9ba2a54b45d5042a768997f11b0875fe5419912673d8c9166e244d27b943b83c2d4a8936b8d6e30e17eb1
 DIST frameworkintegration-5.95.0.tar.xz 1758292 BLAKE2B 54588bd57289f2b42dcadc230257d031345b0d0cbce5bf674547431b654be418e209aac2692e693e64c86175b0a08cc01ad97294cad7dfcb65c918411d47e695 SHA512 a6fbc2bdeac9a3e2aecf0b6e2bfa0169b36e02d03665758230abc2497015a1540d33e58cb0283ec8333713debb58289deb423a679f726e041ada2d325833d743
 EBUILD frameworkintegration-5.92.0.ebuild 996 BLAKE2B d2f05b2db8e364c0da4b2b4e007df850778ef1d771f5ac98b631237ea2e434347dafcac288ca9dc1872b6382bb5be54ca9a71367f35db26a0d37e287e1d880d0 SHA512 998406eadf4c6218e2984165dbcc36667b19735440f9e11e581dce33251d11e861e60328a45b1e44100b2c8e07d92e59837d54d80f452972b06694ed1bdc5113
-EBUILD frameworkintegration-5.94.0.ebuild 999 BLAKE2B 017e2ead2e59c1110ddd31b4434d5f81b22861dfb01348898213d3992a7354a1504c1ec423480fc16ee15e36d7fc00236ed83e4757df7c226e1b22299ddd675a SHA512 4625a15f5ded59d7c8c03d18c7541799aab124b6a57b7f0d10504a099c35a437dbf1eabaea11a30910b6a91fd560d15b81cdf527f6da6d54dd2168e81aa76c77
 EBUILD frameworkintegration-5.95.0.ebuild 999 BLAKE2B 017e2ead2e59c1110ddd31b4434d5f81b22861dfb01348898213d3992a7354a1504c1ec423480fc16ee15e36d7fc00236ed83e4757df7c226e1b22299ddd675a SHA512 4625a15f5ded59d7c8c03d18c7541799aab124b6a57b7f0d10504a099c35a437dbf1eabaea11a30910b6a91fd560d15b81cdf527f6da6d54dd2168e81aa76c77
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-5.94.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.94.0.ebuild
deleted file mode 100644
index 1f7f33acb63e..000000000000
--- a/kde-frameworks/frameworkintegration/frameworkintegration-5.94.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for integrating Qt applications with KDE Plasma workspaces"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-# requires running Plasma environment
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/knewstuff-${PVCUT}*:5
-	=kde-frameworks/knotifications-${PVCUT}*:5
-"
-DEPEND="${RDEPEND}
-	=kde-frameworks/kpackage-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kactivities-stats/Manifest b/kde-frameworks/kactivities-stats/Manifest
index af9be4369803..8425429bddbb 100644
--- a/kde-frameworks/kactivities-stats/Manifest
+++ b/kde-frameworks/kactivities-stats/Manifest
@@ -1,7 +1,5 @@
 DIST kactivities-stats-5.92.0.tar.xz 84280 BLAKE2B 958d9bbe6a5fecbca7e31f8bf481a198790f80c307842e8c594613d9117a583b04ecf2f6104fd20a922c6c98342bd80d88d2934141448af288a86502cc70224d SHA512 5298f2390942ee71270ba71201229de7b4e82959302abcb45b09c39d0da5f9d9edb18d9e7d6e9fcc9c3fcef0c4c02ea7f3d96bbcec1885aea899e0da9b4d6fa9
-DIST kactivities-stats-5.94.0.tar.xz 84580 BLAKE2B 196e7d2db4657eda51585ed404263790571a5cf4a1f7ddc0a2ca023f8a7e1527ba76b4e368417f6f1de0606711b350b07e7584cc044e7e6dd2729aec50713745 SHA512 0ae5d4ca81ef58b2d4857f737436eaed85bc50da910d7f1dc348e972c8511862b67869bd85a577eb43c06d8cd4e796092a90cb6ec1cb83013e76175643bc5cf5
 DIST kactivities-stats-5.95.0.tar.xz 84560 BLAKE2B 632464590d67c446d368850988029f8fc40184d80182bd396efb3d62fc5266b82d9bd2eb9d5d2599a857b13ac5934aa953cdaebc4f9e9707993945eb310b0b1d SHA512 6521afdc80df8d3d4612ca220461e750f992b6a7ce2700efba8fc9e3883736a73c6707e036c63b625585ab59c88266f1115dde3578ba5a00625bb48366e1cbac
 EBUILD kactivities-stats-5.92.0.ebuild 533 BLAKE2B c5bbd696b246abf738a75126e51d7822273cd095800493c6cb8e5b2733705b93c1d8edbbe12d12b1cc9ace957ae70e9b4f2336d2b5a27e7d09f7c5ad6cb90ab2 SHA512 6a734cbdf67780fc97d2af9d0f46ee0f22b7d064dad7788439b7c3522171084bf6065d706acb5f2e4c2809eddbad478be18479f0a074eeb4517468d6c6a28a99
-EBUILD kactivities-stats-5.94.0.ebuild 536 BLAKE2B 20d3e03f71e7520984e25554dce188239f572c873505dc345d9008aecca29823f129d71106a9c7d5a0403d5515a3bc8ee69219f44babadf6a907a7d4959596fc SHA512 ce7ebb158ef3ad5b4364e0c11d78fe4e4e3aa978849b6ea6fc3fc2a1dcf9fc5d1f47b372f7bd3eea5465b59cadab678a50ed7d787d4b4ce4d93ee5074f903ba7
 EBUILD kactivities-stats-5.95.0.ebuild 536 BLAKE2B 20d3e03f71e7520984e25554dce188239f572c873505dc345d9008aecca29823f129d71106a9c7d5a0403d5515a3bc8ee69219f44babadf6a907a7d4959596fc SHA512 ce7ebb158ef3ad5b4364e0c11d78fe4e4e3aa978849b6ea6fc3fc2a1dcf9fc5d1f47b372f7bd3eea5465b59cadab678a50ed7d787d4b4ce4d93ee5074f903ba7
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kactivities-stats/kactivities-stats-5.94.0.ebuild b/kde-frameworks/kactivities-stats/kactivities-stats-5.94.0.ebuild
deleted file mode 100644
index 94cdfbaf9825..000000000000
--- a/kde-frameworks/kactivities-stats/kactivities-stats-5.94.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.3
-inherit ecm kde.org
-
-DESCRIPTION="Framework for getting the usage statistics collected by the activities service"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	=kde-frameworks/kactivities-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-libs/boost-1.54 )
-"
diff --git a/kde-frameworks/kactivities/Manifest b/kde-frameworks/kactivities/Manifest
index 026b4ec9e7a9..22daf4db6b53 100644
--- a/kde-frameworks/kactivities/Manifest
+++ b/kde-frameworks/kactivities/Manifest
@@ -1,7 +1,5 @@
 DIST kactivities-5.92.0.tar.xz 73784 BLAKE2B 1f602226a12328de787836d3b158a5cecd792ca429f62fcdafa723576f5b6df74dcd2858cdf11c6b40dfef7f9e2dba2616a4d3e2cae1218b690961b2fceca1cd SHA512 ff560ae0554342bc6e86b556270ce87267c8ba9f01b931b8fd9012e9deb5202ef2c6ddef18edf268f0eada651c0ff6e27d83876fdcb6767d1ff9fee6155bfdae
-DIST kactivities-5.94.0.tar.xz 73788 BLAKE2B c316e8cb8d5ad54a5a850daa5597721899889075632fa1ae901f601e3c45f44fde2c400af3cd45d98a2609415e0ecf444c3bad34887d86b987e5df085451443c SHA512 59b82dfa3bec93726dc3924bc5675a970bb935823430362271599545ca80e07d73280d8b0a0af915739147f68ea6b22f7382c07d9c830497305a2dcadadcb89b
 DIST kactivities-5.95.0.tar.xz 73800 BLAKE2B 1366fd6bcff50871b27a15b2bed8a6bec9cc3dc4061a8129b644c9ae338135325c280af1caf2e4424f3897caeb03b381e1a6fdbf8f79c8dd6be1109a766563f1 SHA512 aef78d9b30bd69d592b441ff6b7e5eb19c29ad63bc0b8841b9ccca0381e3a859375ad9d87484079ec5b498db1593632b518a3860f5e4e139bf638e0738663098
 EBUILD kactivities-5.92.0.ebuild 686 BLAKE2B d1150046c70105ae0665f73fc5802690964500a9346cee24a43034e218cef079fdeb2a6d0d9ec96333bf929afdcaf1b1bf91baf1a9ee38dfcdd9508082032f06 SHA512 355f779d3ef8874528eb124cc24a5755cf51ec9f469b7f882868c071a5b6596811b51ef6c02155ad620b7971f7c941f1d434e88c765c2d9a36068b5f76c9835c
-EBUILD kactivities-5.94.0.ebuild 689 BLAKE2B bf12eba1a71dc8e9ce37d8ae281dc01a7cfe4b24d9469dbae9262f1e6cfe89346032cb1fe048022af14abfc3aa0cddb9890fd1a8b9ed8e41476324cdaca32311 SHA512 c1a8392891531cc9a2ef630641b4a4799c790bd9a921244f71688bafb1579f6b1098c7e5c3e2ef461bf127f4dd29fb7183a9c6cbce01173b398b836234ac3a8e
 EBUILD kactivities-5.95.0.ebuild 689 BLAKE2B bf12eba1a71dc8e9ce37d8ae281dc01a7cfe4b24d9469dbae9262f1e6cfe89346032cb1fe048022af14abfc3aa0cddb9890fd1a8b9ed8e41476324cdaca32311 SHA512 c1a8392891531cc9a2ef630641b4a4799c790bd9a921244f71688bafb1579f6b1098c7e5c3e2ef461bf127f4dd29fb7183a9c6cbce01173b398b836234ac3a8e
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kactivities/kactivities-5.94.0.ebuild b/kde-frameworks/kactivities/kactivities-5.94.0.ebuild
deleted file mode 100644
index 3ec4b5996a5a..000000000000
--- a/kde-frameworks/kactivities/kactivities-5.94.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PVCUT=$(ver_cut 1-2)
-PLASMA_MINIMAL=5.16.5
-QTMIN=5.15.3
-inherit ecm kde.org
-
-DESCRIPTION="Framework for working with KDE activities"
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-"
-RDEPEND="${COMMON_DEPEND}
-	>=kde-plasma/kactivitymanagerd-${PLASMA_MINIMAL}:5
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.54
-"
diff --git a/kde-frameworks/kapidox/Manifest b/kde-frameworks/kapidox/Manifest
index d5ba0b9ba006..a280c5e53b9a 100644
--- a/kde-frameworks/kapidox/Manifest
+++ b/kde-frameworks/kapidox/Manifest
@@ -1,7 +1,5 @@
 DIST kapidox-5.92.0.tar.xz 197232 BLAKE2B 08e616fb0a4bb21f0d747ab571401121e81203f81ef96cb2108da84e314c03a8e296507ec025a2431989dc443dceede146a26749e0789f4d0d2048966611f088 SHA512 876f8f5a1e7db8bdcaa1a6e206deb9630cf35ba6e8f0c3616557ac95e28b8a9b2c7d40abbc22c19abbef3e310070d61a7b71a03ad62d32d75f014d8ae7b2ce37
-DIST kapidox-5.94.0.tar.xz 197472 BLAKE2B f3ada3400028ba879d8632935544c33f05e1efbc3965831585e73e85ab97e0d44c9621219d789beb5800b394a696d6e025f589ea0e5b93497b9844c4505949ba SHA512 63e0431ac92fd8435af90ae49cf33c47b4a2291462b2e6336f1aee6bdba94d3571a4bf684b8f511d1ec656a64e80261a5fcfd112f6d86ea6d355f0e73439158b
 DIST kapidox-5.95.0.tar.xz 197452 BLAKE2B 7b17dac838dc948019125501e24fdcb10816eb0f66ce49f37612c87f48a03058f73a233c84d1dcbe685764fdf6487f8f49620537b76138ebb4c240fbbb0f739f SHA512 876cf28b88680b4b027edb6603e4de12d7554ed9b8eda40738259550e703f53bc2465e26fa84a43c68b9d4a3a98b202b4c76033b1df6c9422e96a2aa7417e994
 EBUILD kapidox-5.92.0.ebuild 587 BLAKE2B ea63c13a95102632de011791cb1f7e527412e5cadb51ce39c98c0b4e1aa79b004e92cea1a7ed0af691ce35771d56254bba3301734db416442b17fa61855f67c4 SHA512 a81c779be889d3c680a5fdbe8c8acab15f7a4ea22d0bf53bebeae0ea05b3f4db8d391f02e55fe2bb3f25ce4ee11bdfd0059a0e5e802a6adced3c09ec44cdb806
-EBUILD kapidox-5.94.0.ebuild 590 BLAKE2B afdb7be7e1928ff07a2c8c97500bb0810e4a0fd5f21081eb4938a07a56bc78bc46c79945be3106bf24ca3bda64bce549869ff7d14bfdcef1b0b5e71c24de354e SHA512 83001d034fc3370a38cf149fdb6425d5b4a012023dc10d67d3a9abc355d86b06d467172913a7c4ef96563597b2da586751835d98cd01f3aca149fe9c14effa1c
 EBUILD kapidox-5.95.0.ebuild 590 BLAKE2B afdb7be7e1928ff07a2c8c97500bb0810e4a0fd5f21081eb4938a07a56bc78bc46c79945be3106bf24ca3bda64bce549869ff7d14bfdcef1b0b5e71c24de354e SHA512 83001d034fc3370a38cf149fdb6425d5b4a012023dc10d67d3a9abc355d86b06d467172913a7c4ef96563597b2da586751835d98cd01f3aca149fe9c14effa1c
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kapidox/kapidox-5.94.0.ebuild b/kde-frameworks/kapidox/kapidox-5.94.0.ebuild
deleted file mode 100644
index b7d642f17ac4..000000000000
--- a/kde-frameworks/kapidox/kapidox-5.94.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_SINGLE_IMPL="true"
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-PYTHON_COMPAT=( python3_{8..10} )
-inherit kde.org distutils-r1
-
-DESCRIPTION="Framework for building KDE API documentation in a standard format and style"
-LICENSE="BSD-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-RDEPEND="
-	app-doc/doxygen
-	$(python_gen_cond_dep '
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	')
-	media-gfx/graphviz[python,${PYTHON_SINGLE_USEDEP}]
-"
diff --git a/kde-frameworks/karchive/Manifest b/kde-frameworks/karchive/Manifest
index 949cb1f0bb1b..c9b7d439347d 100644
--- a/kde-frameworks/karchive/Manifest
+++ b/kde-frameworks/karchive/Manifest
@@ -1,7 +1,5 @@
 DIST karchive-5.92.0.tar.xz 986308 BLAKE2B 5b549f6130b79cc76c817cae3fac6024724fdfcb207d5bd586b135351b1b07351884ddc0edb7331f595c40c964ed70ad1ee1892473e56c74d76cb636801221f8 SHA512 c6375c14805470e4d61142a97871d5255769f92e3d3e9716218d3b761c464b4e0443b1126b57ddccc33fe34e5d63c7468fba1d083dca49e2ae1dc38d583db770
-DIST karchive-5.94.0.tar.xz 986356 BLAKE2B e419f276c50f2c80eae88f6b429e70da5cea19c807ef8ddd4980441a83133592658b99930600a3be2b072329c39f83b85b4e603c1315e689a2a645eeaf76c388 SHA512 a77224ed59c0fcfd7637458bc0d165e9226e3858e632915c9f78a2d2e5725cc2595672edd3b05260b6dfc69a50a8a6f690e06ca04633df33a1b9889260d368b5
 DIST karchive-5.95.0.tar.xz 986628 BLAKE2B b3bae715012207477a4ff4a91e9d7c5ab8c0a0b76eb7baae00c3519ac36ed598cb707a3e6439c67b7975ae7850e3f12528e76d13c3db8cd61d35054ecd2a6be9 SHA512 b628e793a7684c107daaef0cb9ef57145b7efa3642c4875f028b50b0f8ba14f1d6019c55f99f38b3d786fd5d9dc671cb6fd2601975819a0959775763fdba7b15
 EBUILD karchive-5.92.0.ebuild 634 BLAKE2B 70616ba9ff196bee4cb5a7f7e523a752634b79fb0e6d9ddee31001a171186c259e174a59cfb7962b39f79a335fafca722008b957e44ac57b31b274410b96c090 SHA512 f4176e306622529fda64bfcd646a6e1e8d762c1b08c3bd5562cac8ffb4dd736bc62e6e218d503f67faa938e9dc24b88b8bb8e8fbb6dfed423cf12d323b66d630
-EBUILD karchive-5.94.0.ebuild 637 BLAKE2B 10f7457d0ce822d73b1ddef42acc6b2ea6f2471c69d9e9afe4f3665f4601079d47c4845f8a9b95781a003ced8b417ee7fdaa703af0d18a290e22d11b42674a28 SHA512 7a1d5c3eacb23ce447bbb8d7c673efb17777cc022f90ff2ad6785e1d83577c277b08229da989da9cbef4169991d31bb75233aa44e57c919fdc7c9a4735c9a68e
 EBUILD karchive-5.95.0.ebuild 637 BLAKE2B 10f7457d0ce822d73b1ddef42acc6b2ea6f2471c69d9e9afe4f3665f4601079d47c4845f8a9b95781a003ced8b417ee7fdaa703af0d18a290e22d11b42674a28 SHA512 7a1d5c3eacb23ce447bbb8d7c673efb17777cc022f90ff2ad6785e1d83577c277b08229da989da9cbef4169991d31bb75233aa44e57c919fdc7c9a4735c9a68e
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/karchive/karchive-5.94.0.ebuild b/kde-frameworks/karchive/karchive-5.94.0.ebuild
deleted file mode 100644
index 15034e1438ea..000000000000
--- a/kde-frameworks/karchive/karchive-5.94.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit ecm kde.org
-
-DESCRIPTION="Framework for reading, creation, and manipulation of various archive formats"
-LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="+zstd"
-
-DEPEND="
-	app-arch/bzip2
-	app-arch/xz-utils
-	sys-libs/zlib
-	zstd? ( app-arch/zstd:= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="zstd? ( virtual/pkgconfig )"
-
-src_prepare() {
-	ecm_src_prepare
-
-	# TODO: try to get a build switch upstreamed
-	if ! use zstd; then
-		sed -e "s/^pkg_check_modules.*LibZstd/#&/" -i CMakeLists.txt || die
-	fi
-}
diff --git a/kde-frameworks/kauth/Manifest b/kde-frameworks/kauth/Manifest
index 815f834fa8cc..f3becf7b423c 100644
--- a/kde-frameworks/kauth/Manifest
+++ b/kde-frameworks/kauth/Manifest
@@ -1,7 +1,5 @@
 DIST kauth-5.92.0.tar.xz 90132 BLAKE2B 848d5654a95006c6ea4529be4568ebc6f3f975b87ffcc778730e0f7c67c08462a3aa5e3f9443fb31e173fb61d38faa08759bdc2415cd72f77ce7743a5bf83a6d SHA512 1c89f5668193a70cc1e74d5b671584d5b2fe003d6bbf9136933a6fd93c4516766a5e2369ac80ea78a0ae3adf4a454ae4be8558e06eeb34640779a9c7b645a244
-DIST kauth-5.94.0.tar.xz 90372 BLAKE2B 656b03ef3df5300dcd9cf58d1fae234c89403ee14ef4505d3e2143ac336d648f1e999f53db17005ef9968c7b3aacf726fcb66be56af610f1256228a91d163ffc SHA512 f5466b388c5e815ca877777622aa1cd67953b11ed501ccc212f791df96d38ac55912f0e38afdf9dda5dcaca354b08ee425ccb6cf2bc689c5347af28ee7e45a8b
 DIST kauth-5.95.0.tar.xz 90856 BLAKE2B 986a7558d9aa8e718e72ece197614d7bebf0715131968c74a9a78e76141793590f6b54d8bfba0becb8cb9b3bfe7ba73f9acd563eebf31be744c9a4f9c6d03604 SHA512 d15fcfa0970e386cf34786a17eade0c2336668b192eca4ae358db45252a56714f45ba2c2baa87a1c0a51640ba695543c96df242c138f1195dbb5d5ac25352d45
 EBUILD kauth-5.92.0.ebuild 913 BLAKE2B 32484d158de6249fbd15209669fa968105b2f8ce25e501cfafcd26b07a6fb85b3f849b9a81fdd705b1a30660a15c3ab52d721727ec8edc95432311d1ed2a7463 SHA512 7a3d675716a5596c719713f8d55b4ed4b4fa42f9b4b8b83114176fb8ca238390f2bb9049b6be8c4564e6687672fa6ee29c4d1bc3dbef53d1f86367be8b9475f5
-EBUILD kauth-5.94.0.ebuild 916 BLAKE2B fa1627dcd10fac54ba15d5c6992a14e27ddd446025aad6f220d8cadfa1deea18f93992d595233b797a7b734248378129563f9c3ba8ddce13c1a9517e9bfffc5e SHA512 685a668dad0d5bfb65e9071c7b1e9f72dc77f27bf185137c72b9e1e971adaa7ea59d3031ea88d5b981d50b2e49ed0d9aa7d765ecc918454f53d2e3510e276530
 EBUILD kauth-5.95.0.ebuild 916 BLAKE2B fa1627dcd10fac54ba15d5c6992a14e27ddd446025aad6f220d8cadfa1deea18f93992d595233b797a7b734248378129563f9c3ba8ddce13c1a9517e9bfffc5e SHA512 685a668dad0d5bfb65e9071c7b1e9f72dc77f27bf185137c72b9e1e971adaa7ea59d3031ea88d5b981d50b2e49ed0d9aa7d765ecc918454f53d2e3510e276530
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kauth/kauth-5.94.0.ebuild b/kde-frameworks/kauth/kauth-5.94.0.ebuild
deleted file mode 100644
index 6f2b2595bd0d..000000000000
--- a/kde-frameworks/kauth/kauth-5.94.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=8
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework to let applications perform actions as a privileged user"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="nls +policykit"
-
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	policykit? ( >=sys-auth/polkit-qt-0.113.0 )
-"
-RDEPEND="${DEPEND}"
-PDEPEND="policykit? ( kde-plasma/polkit-kde-agent )"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package policykit PolkitQt5-1)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# KAuthHelperTest test fails, bug 654842
-	local myctestargs=(
-		-E "(KAuthHelperTest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-frameworks/kbookmarks/Manifest b/kde-frameworks/kbookmarks/Manifest
index ff1b885d76a4..417d8ee49262 100644
--- a/kde-frameworks/kbookmarks/Manifest
+++ b/kde-frameworks/kbookmarks/Manifest
@@ -1,7 +1,5 @@
 DIST kbookmarks-5.92.0.tar.xz 130288 BLAKE2B 191e916e4e9702a97ef105bd2e31ba4b2cb222d0dfd2a26742c8ec9f296c3f1a26ca7406fff8984aa90cf63270bec4348b5fbf90720287e6c2dbdd0c2f0c1323 SHA512 c5cbcdf1476b9c3f5285893469d6543e12ef3172312c12f04728b48a15d26bf7cdc5181a5db91a7aac2dba90c088db8086a25436614ca0ca04a000705b2198b1
-DIST kbookmarks-5.94.0.tar.xz 130124 BLAKE2B e0985b3508078e44cc36343ff436b82294ad0ad7b196a873c7ca61b944f280bcaf773834d2d828408001865548de602b8be0c2382d1a5c8932fd64576f425e76 SHA512 0ab54590cc2a26039804d792d8c6399257e4bfbd92b34cbe8043b1d6e02f102783c229a7e457acefd6da5876481af2558d026dd3e9d4234a6adce14c8aa6c8b3
 DIST kbookmarks-5.95.0.tar.xz 130160 BLAKE2B d6ec78bf44cae9d9c4c1364a84300e4dcbe51e3032f594d07246658b39cbd6852e2593b8ceeaac12a796c2cd5059ec19145670162e8519996ad4089744955f8f SHA512 67102385cb1ea552254fbcc5fb863eae13f938794fd21355c3e259e07a277a5ad296ca6c9d650538db8d0430e29c7524654088374aec1a73b13bd5f3a5ded4f2
 EBUILD kbookmarks-5.92.0.ebuild 823 BLAKE2B 4315f733f650f94caa565d12182d18964abcb74d1c971611307caeb6cb2804795d7bcbd06c550d9b67e882d73e611b5f660d45aa5e259dee271c6bbd73f09965 SHA512 7d441fca414d81f3b57a981579c8d4cc5c32a13a8ee389e3d2e9ef4fe12941a24985d34e5749f935435ae5e44c727ccad42b755ee8242e53456748d53abb6035
-EBUILD kbookmarks-5.94.0.ebuild 826 BLAKE2B 0e4daa29625bd0c2abcb991c03c1e16e0dce0cc739ab2e23718ecc824de91426d1fe37b16f7437b7b257f0e8ef27970a08fdc12310bbcfaf798d5a346ebe18c9 SHA512 18b578a51d5ad980951499f9516c507c5f670fae0da4c32157f9a787b60205204b1baafcc26eba5a22850f263a0b71df76556b52890b459cf181304ecf836ef0
 EBUILD kbookmarks-5.95.0.ebuild 826 BLAKE2B 0e4daa29625bd0c2abcb991c03c1e16e0dce0cc739ab2e23718ecc824de91426d1fe37b16f7437b7b257f0e8ef27970a08fdc12310bbcfaf798d5a346ebe18c9 SHA512 18b578a51d5ad980951499f9516c507c5f670fae0da4c32157f9a787b60205204b1baafcc26eba5a22850f263a0b71df76556b52890b459cf181304ecf836ef0
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kbookmarks/kbookmarks-5.94.0.ebuild b/kde-frameworks/kbookmarks/kbookmarks-5.94.0.ebuild
deleted file mode 100644
index f49515386a7f..000000000000
--- a/kde-frameworks/kbookmarks/kbookmarks-5.94.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for managing bookmarks stored in XBEL format"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="nls"
-
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	=kde-frameworks/kcodecs-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-"
-DEPEND="${RDEPEND}
-	>=kde-frameworks/kconfigwidgets-${PVCUT}:5
-"
diff --git a/kde-frameworks/kcalendarcore/Manifest b/kde-frameworks/kcalendarcore/Manifest
index b4f0cd028518..daf67fe8478d 100644
--- a/kde-frameworks/kcalendarcore/Manifest
+++ b/kde-frameworks/kcalendarcore/Manifest
@@ -1,7 +1,5 @@
 DIST kcalendarcore-5.92.0.tar.xz 263032 BLAKE2B 1b3f07a6618537bdbc7ec62522a4cd852292d8cf46670f222a0b2a978234c8bf898148cae7a64609d41daffe1f053351a35727ca3f126b76009277db4f25a3cc SHA512 4efb6fbd6a3728648a23d608af4c4732402fd133911968b103c4b34876ee469e4680992e5d5755b8a9892ad60ed53a33f6a0c4c95418122258faf5299caa5413
-DIST kcalendarcore-5.94.0.tar.xz 266328 BLAKE2B d5765bff5f121209831bc3181555a55cb0250c39b4a88d073c0c6099f1d3a1ad42a8ac764968efc7287e316bf7b5b9c304ab0294203fc72fc89c46caa143fadd SHA512 e9747a1965ca78d6112276cbd501cf00494fe7ba777a24a92e7f0f1b605770f924bca2d1b7e30b69b19051f2c823d71faa37ae4768857d6adb38d7c0dfd9a32c
 DIST kcalendarcore-5.95.0.tar.xz 264080 BLAKE2B 9f5b9321e980834d2bf723cc9f87a90eea634dd8337530e83df8a6ff3c622af56af297d37cc6036b24b8711c1bb4dc611483a1ee6db87d85eba74246b1515ed5 SHA512 327e2cc9b5f41c38b5afad359c047e3a5c4151bf7be065641ff801abfc8fabd508ecdc1ddb1124484fefe2ad9e7196c7c8a90f5e3227e3d938be78f22bb014ba
 EBUILD kcalendarcore-5.92.0.ebuild 498 BLAKE2B 8f61dd20b71aa1e3869b037ed1cc49de786561eb1ce42e68f6fec09e0f98545266bc74abb36e1c2eb69b822db5ee84a496112e28535d8a5e3914bbd7513c7858 SHA512 5c7d9b6f07183e9dca47089bf019d49667f0fed79cb0f97929e5f2e156bf1ee2baeec52b88a5d7d15f5478c0a0dd43b7f5a73c122c505fe10a25b4931d6fa256
-EBUILD kcalendarcore-5.94.0.ebuild 501 BLAKE2B d5362bc82edebefb0502e4f787fe769075166055951a89e3483ecabbe749395856c0eea7469fa77ee50d2797ff3f28d4bd70a5489131da1df0ee02e61f139348 SHA512 309f13d282b0e2cfbc0dc939be3ba36cde7ef926f0b4016e78e516cfa1c1be2de089cb638daac609fc30bee0e1d077d4eab7cf579f5a62f3cc67f267f68e6c21
 EBUILD kcalendarcore-5.95.0.ebuild 501 BLAKE2B d5362bc82edebefb0502e4f787fe769075166055951a89e3483ecabbe749395856c0eea7469fa77ee50d2797ff3f28d4bd70a5489131da1df0ee02e61f139348 SHA512 309f13d282b0e2cfbc0dc939be3ba36cde7ef926f0b4016e78e516cfa1c1be2de089cb638daac609fc30bee0e1d077d4eab7cf579f5a62f3cc67f267f68e6c21
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kcalendarcore/kcalendarcore-5.94.0.ebuild b/kde-frameworks/kcalendarcore/kcalendarcore-5.94.0.ebuild
deleted file mode 100644
index afbee1079585..000000000000
--- a/kde-frameworks/kcalendarcore/kcalendarcore-5.94.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="true"
-QTMIN=5.15.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Library for interfacing with calendars"
-LICENSE="GPL-2+ test? ( LGPL-3+ )"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-RESTRICT="test" # multiple tests fail or hang indefinitely
-
-DEPEND="
-	>=dev-libs/libical-3.0.5:=
-	>=dev-qt/qtgui-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-BDEPEND="sys-devel/bison"
diff --git a/kde-frameworks/kcmutils/Manifest b/kde-frameworks/kcmutils/Manifest
index 43d0fbd5b823..c2beab806013 100644
--- a/kde-frameworks/kcmutils/Manifest
+++ b/kde-frameworks/kcmutils/Manifest
@@ -1,8 +1,6 @@
 AUX kcmutils-5.92.0-KDEBUG-444378.patch 2490 BLAKE2B 5287389c76d78ef404d7ba5b3766a0160175be996b36bb2014cf01c28098167c057aa9ee097eb38e918c9d270c354c84dc015a0044f3badf2b87c46904c47c8d SHA512 4a7d19f8c214c914cf25119c32afbdca1939a9832a5f9eaee287084afb3aaa248ade9cae8c10bdcbdc6d4ac79a794a6c2e253c658c3f2fccf973d960b603085e
 DIST kcmutils-5.92.0.tar.xz 172120 BLAKE2B 221482f15f1c8138f60565215f5c0c2d6e9922d82d81d3a90a1685f9e7a9407e459d56dd5e91a8dfc5b6dc322ec012a15422d265ca0cfaff54a8b7effb1ba0aa SHA512 b0810f87fc7b641ff05ae8b9816434175e494786ee86201a34bd435c2177e6b8dd963e60804747cec954ca7f02d54bdc7f944b72c0a774ff4dd86b186e9e2f8f
-DIST kcmutils-5.94.0.tar.xz 185096 BLAKE2B 1a1b05536a754530cbe30e70f8f70a5d61fcc95e31b056545d9338be493c37b9d8e67ee16299bcb91b1cdb742018c4e678cd1561c38f789941dba78ab079e064 SHA512 c5ca1e1b61da4c7c96bb8e95593e4799c86345a6d4ae222284c31e31ac3c60ace81bd1f8e62c5e1956b25f2f6f32d9586912505380dce888a7e76ed86f45fdca
 DIST kcmutils-5.95.0.tar.xz 186024 BLAKE2B d0dc561588556c0b2e4314fed774c50cb87e58766c7429c9ae5f2e3c9de9a18d71e285a88ba724e3e33335d19d63849c3508db200b23525bf9f2590161bfb8c1 SHA512 655e6998206b62a642bb3cd63205e1acb3b13e39cfc122f1bc7a814964b89eb932f6fce822be6b0f9b45f28216102808bd5cac3c9e56040f68bc1afa17ba3152
 EBUILD kcmutils-5.92.0-r1.ebuild 1001 BLAKE2B 44d9f078cdaeb031ee73480439a30dde531e461de2c7bf45fb3120ca4d915f3a2561f67eeeec9231b2486c23dd01a6a98779ef07dc7f992cc59df4ae665e6c84 SHA512 72a16f791dd1070a880f2115de850aface180e85b5a857c0497ea6a3c5e7853cfef2240ac361e3db2bd4d7a864681d785d8cdda71b327c068b2ba9a5e2a34031
-EBUILD kcmutils-5.94.0.ebuild 952 BLAKE2B 9323bb000f879eaadc95958815ac003e5b837ab3fb7637a6c9f7f1b219f7d8d6f4ff87762318e51af0925fa70c3b3fd68ce3a5dad80571db126f55bc3e3d58b5 SHA512 8304ea8ec57648ff90cdc9aad9d55fbd64a903380874a95dcf972da9e39a681fb9dedadb095cf0353ad0a5590f1c71b8e48924ee740a40908f63e08b749c3030
 EBUILD kcmutils-5.95.0.ebuild 952 BLAKE2B 9323bb000f879eaadc95958815ac003e5b837ab3fb7637a6c9f7f1b219f7d8d6f4ff87762318e51af0925fa70c3b3fd68ce3a5dad80571db126f55bc3e3d58b5 SHA512 8304ea8ec57648ff90cdc9aad9d55fbd64a903380874a95dcf972da9e39a681fb9dedadb095cf0353ad0a5590f1c71b8e48924ee740a40908f63e08b749c3030
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kcmutils/kcmutils-5.94.0.ebuild b/kde-frameworks/kcmutils/kcmutils-5.94.0.ebuild
deleted file mode 100644
index eb9f164425ab..000000000000
--- a/kde-frameworks/kcmutils/kcmutils-5.94.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework to work with KDE System Settings modules"
-LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kauth-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kdeclarative-${PVCUT}*:5
-	=kde-frameworks/kguiaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kitemviews-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kcodecs/Manifest b/kde-frameworks/kcodecs/Manifest
index 1ad76038a14e..f7e8791f7a22 100644
--- a/kde-frameworks/kcodecs/Manifest
+++ b/kde-frameworks/kcodecs/Manifest
@@ -1,7 +1,5 @@
 DIST kcodecs-5.92.0.tar.xz 236760 BLAKE2B f93d7d9bd01db85206d39a36ce05ea690b51bc11cdc933aada4f346b0c934d68c96ad3c6abc18ab5fa93039c16edf6f9c1dc6ced754906f55c73862c846b06e4 SHA512 d7d89f08b6ec789afe6267c2c9d7a1b259cfd720d3b52a83eab6cea527dde414d509b44100cba9ab5727f10b02ca090cb33038748ea41d21f21aac12b65200ed
-DIST kcodecs-5.94.0.tar.xz 236892 BLAKE2B 9a142926c53c7ade47ed7fdc0423ef8b6033baa3235341df1aab717250adee41f3ab7fd82247cc9681b3f254390965f8666af55cf4c38858c271af0ced040320 SHA512 553d093d3b030552101c212d90fdd1ffdd04feb59d96e9e859ad64b6abbda8d43690c5cfbbf3383cdaa25f9bc7620a6105c839a8446f109386e08cd74504b0c9
 DIST kcodecs-5.95.0.tar.xz 236724 BLAKE2B 3303cd0b40d362c25897481c5e2b4708fdcfaaacbd97411ce8a6f5e8e7e8d5dae8f8a6909ad83fa8d00af89ccac3eb12a376070200c038d5fb809fe9fbcbecc1 SHA512 b802ba6b6ceaae8b1272d7f0f2cc33e76f62de4e35e09e841e94010da25b1acf8372d4bcf69167365f1147a2f356748ec8418bef5a2d54874cd14ff73ab5014b
 EBUILD kcodecs-5.92.0.ebuild 376 BLAKE2B 9fe8d02acf998edc3129714c91ab1b633315105ea2cbb2d0da773988462b1230e527580b3d82d6bfbdee57cac8341f421dd85915e484ee9001e6fb8074206017 SHA512 605f158f9a852ccab0ded0e2a0d826dce99199c316fdc184fdc3d090319f0b1951a75ef975c59860543338d0ab479fa656949322d6e4d69fb7bb91eaf876dc56
-EBUILD kcodecs-5.94.0.ebuild 379 BLAKE2B b094a0a1f21b07d2b0c35da3505736ab3f1a084ae01824cb8c00e52ed9a159ecdfb4dcc5ffd16aa73657153fbf01765b87d2c6d7ead6e9da1fb7fa677e177e5d SHA512 d91c32c05c548acd567c2869c4fc1e654db2b617ab822f04bb20d2d0f63cf2f3558002862fba76ccd3cb13f89b67d1b7d5f88b043953e49df6ceba97d2d8c21d
 EBUILD kcodecs-5.95.0.ebuild 379 BLAKE2B b094a0a1f21b07d2b0c35da3505736ab3f1a084ae01824cb8c00e52ed9a159ecdfb4dcc5ffd16aa73657153fbf01765b87d2c6d7ead6e9da1fb7fa677e177e5d SHA512 d91c32c05c548acd567c2869c4fc1e654db2b617ab822f04bb20d2d0f63cf2f3558002862fba76ccd3cb13f89b67d1b7d5f88b043953e49df6ceba97d2d8c21d
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kcompletion/Manifest b/kde-frameworks/kcompletion/Manifest
index 86a340c105c9..616d9b5f5c21 100644
--- a/kde-frameworks/kcompletion/Manifest
+++ b/kde-frameworks/kcompletion/Manifest
@@ -1,7 +1,5 @@
 DIST kcompletion-5.92.0.tar.xz 124500 BLAKE2B da722905cd3f1dbb7c4628ee8957899a116b8ee2f2ebaabca3aebb1330ff44f428798180726d08e9970ab3a286a831c89facc9f9fdd46405102ad13bc1a6c104 SHA512 3253a54cbef68d2b71bd457f240db40be0a590974de95aa6f0f2a5a6c095279f45f8c1b5111644f04039423ef783d0bd0e75fff7eff403c7ffc8197ee9008e03
-DIST kcompletion-5.94.0.tar.xz 124556 BLAKE2B 85bc7da96d266b6defb26fc3668dc793a5abf2605bea85504c2ded3f477e2c6ab22419c1aa571b639f0532caaa1e4cf6bb96757413f3d4233bc8948d4ef64651 SHA512 fe0adcafba6f2d72c504f900f90fe04d5c10d198ead1c43e386736df8ac97da923f34b4e623b63da9edd8455dbbf31a671c216c0f58884c6ee93a9dc5e5b7b04
 DIST kcompletion-5.95.0.tar.xz 124452 BLAKE2B 60c3004be3c5b1287132f90fbae712270a81d60c50c462834c8914d0e9fcf112e0adab5e584eafa48d82d18e141bcd996eab4f43e85b5c376618b14046106088 SHA512 718c6c5d88564e6a50758f1b1c99091d370a4ef572962b0c38446ac57ccf79899002901fb88b78f38f819a6451219a9adb79f045d1c5e5a383d8443473304730
 EBUILD kcompletion-5.92.0.ebuild 607 BLAKE2B 182fd71c6961f53755bdd8f2eb8b26ceb2d1fa4842f5cc671d6699de3c6b23b369fd1ce824e5f3ab0bfbdce5c78db519c08160e5df57fd358e63d7349596c229 SHA512 c7199a7fb38a4aae44907f01dffb72484cbddbb117a88bf52dfed54493e6fbd7113836c053aec6aa5ecb66682d44e873345ad8e143f1f18b5617673adc73140e
-EBUILD kcompletion-5.94.0.ebuild 610 BLAKE2B 8f9d4781e21df5b18d08bf1280c68a518b285d2026bfdb2a987a861d6df48284fcf6927aaf8a5046cd08de609ada1e9220dca39f12ebca46649cdab2afbdada7 SHA512 0f097be291d4bff179e4354fdf6af10e4506d0ff1f5509eeae9718a1eda1dab1cb7aff544d9fd423183e186849ca6dca2c5652402b5c272458ce4ea03b521d84
 EBUILD kcompletion-5.95.0.ebuild 610 BLAKE2B 8f9d4781e21df5b18d08bf1280c68a518b285d2026bfdb2a987a861d6df48284fcf6927aaf8a5046cd08de609ada1e9220dca39f12ebca46649cdab2afbdada7 SHA512 0f097be291d4bff179e4354fdf6af10e4506d0ff1f5509eeae9718a1eda1dab1cb7aff544d9fd423183e186849ca6dca2c5652402b5c272458ce4ea03b521d84
 MISC metadata.xml 547 BLAKE2B 127ee4110b748cd3e3c26b63248d35f78b233b00cf4466ccc0145a613062a5aa9cc2e9ebd91d0e7482c67f6e265938176b169a9c52eda30bfcddf02549ec8f06 SHA512 2d36585b1af6205dc1bfcff7c3cb24c85376716159317b5c105c866143d49e89e91e501c9a4cf2d63265c30a09e8df71bca841319bd3f2b551e79fde90b1d96e
diff --git a/kde-frameworks/kcompletion/kcompletion-5.94.0.ebuild b/kde-frameworks/kcompletion/kcompletion-5.94.0.ebuild
deleted file mode 100644
index 0e6a74cbba1d..000000000000
--- a/kde-frameworks/kcompletion/kcompletion-5.94.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_DESIGNERPLUGIN="true"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for common completion tasks such as filename or URL completion"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="nls"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}"
-BDEPEND="nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )"
diff --git a/kde-frameworks/kconfig/Manifest b/kde-frameworks/kconfig/Manifest
index f1cb7c2a5fcc..e94d05262c86 100644
--- a/kde-frameworks/kconfig/Manifest
+++ b/kde-frameworks/kconfig/Manifest
@@ -1,7 +1,5 @@
 DIST kconfig-5.92.0.tar.xz 281432 BLAKE2B 268114c759f586f305a10da2471c98b7110033646d6e02406e1659e5feb2b71c9f3d6c9aa90987e0710a82471a14129995407918ae873a1baf855b906015e0a3 SHA512 751fed42c90c8319fecaca106cbc1a8797cc1490a3732ca9071dd5ce27bf1cdf3acbc048ae14b8a7920036b47fc5f554bab4742f00c1d0391d2c130a5e0aba4d
-DIST kconfig-5.94.0.tar.xz 282028 BLAKE2B c86541a29e1f9bf14c49e666ea7abc4c57b3bfba4f7e0a6bae54d7dd4702cd697b7f539f93392c18e9a522b7c12323bc05dede3b0f28408ec2ca03deeb655413 SHA512 59d7d957313e421a332fb0a83eef6be68455c3de50cee0cd0d1b6b22f2b97ad9fdfddac282f03c4cedc5f364d4b3321c3f3fdadd7824e0523c5260446dc31ac9
 DIST kconfig-5.95.0.tar.xz 281816 BLAKE2B 919dac8a7f0fb660c37f72237543076411cf5c1baa68bd7bf6fb367b4ee76402cb122240f787cf8144c18c88eb03781c27c02bc2412c7a36f899e00f8db4791a SHA512 9e7e7895aa4007dc21dae69802521a19e65692ec4f2faf8a1925d176791bc3b9dea07eedd983c4f846b82d3f38cc82540481af34795ddc4523ae5e13cef283bb
 EBUILD kconfig-5.92.0.ebuild 807 BLAKE2B 9d958489f754a0978565e3406e544d0e9bb7e508c0140aba06512b6a4f929f9400d5986b1f846dbc0206a018a4e90133d1c4bc52e9d73fd84bffe4920092a43f SHA512 a7fdad74aad6ead3f1a6adb0f89cadde7cb81e7d1d42fcd9e0ad1aab84633561488471a3a9aa33b62f3de1d907425faaf3f4fee7c927706213d36d5f2f60e365
-EBUILD kconfig-5.94.0.ebuild 810 BLAKE2B 8f843efeea019c3274915435e0ad144effa1b9df2ba0eb43278f00cab27db9eb6b5a1d9462aabdcc7fb7e8065e995e5ae4ecd4d47f575fa0883c4e5a48c890fc SHA512 91a3f7b60a101849da77d135e998b45c035a80a5b28b3838bda4ef47ae7d843119a926e593c84be6684e0e83d06800b35ca22227bac5776a34c23a75c0697023
 EBUILD kconfig-5.95.0.ebuild 810 BLAKE2B 8f843efeea019c3274915435e0ad144effa1b9df2ba0eb43278f00cab27db9eb6b5a1d9462aabdcc7fb7e8065e995e5ae4ecd4d47f575fa0883c4e5a48c890fc SHA512 91a3f7b60a101849da77d135e998b45c035a80a5b28b3838bda4ef47ae7d843119a926e593c84be6684e0e83d06800b35ca22227bac5776a34c23a75c0697023
 MISC metadata.xml 549 BLAKE2B 174b0b0b8b74df71f930554147505471927697979ceaa9b341570869dab598fe88a531890a743f328d0bed0d24a52c1214f0177a83d04054809ca0335802024e SHA512 7ec84e7319534cf690321ca12251bdf3056228b4d413d01aa9ec239e6196ac7de976b3f431f6813676a6416dc5fce007b8e62fa27602d14426a8b8a2cb6bde4c
diff --git a/kde-frameworks/kconfig/kconfig-5.94.0.ebuild b/kde-frameworks/kconfig/kconfig-5.94.0.ebuild
deleted file mode 100644
index ceaeed44d9c5..000000000000
--- a/kde-frameworks/kconfig/kconfig-5.94.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
-
-QTMIN=5.15.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for reading and writing configuration"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="dbus nls qml"
-
-# bug 560086
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	dbus? ( >=dev-qt/qtdbus-${QTMIN}:5 )
-	qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
-"
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-
-DOCS=( DESIGN docs/{DESIGN.kconfig,options.md} )
-
-src_configure() {
-	local mycmakeargs=(
-		-DKCONFIG_USE_DBUS=$(usex dbus)
-		$(cmake_use_find_package qml Qt5Qml)
-	)
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kconfigwidgets/Manifest b/kde-frameworks/kconfigwidgets/Manifest
index 351f699010fb..d92e6b744225 100644
--- a/kde-frameworks/kconfigwidgets/Manifest
+++ b/kde-frameworks/kconfigwidgets/Manifest
@@ -1,8 +1,6 @@
 AUX kconfigwidgets-5.92.0-khamburgermenu-ensure-polished.patch 1357 BLAKE2B f4d08627592c941fd909e700982a5e7695d373baaeaa5df4027ed97d7f3d214912cecd1bfbd46fc5f84f231a53d52f64db199e62e9daad624921c2ca62ee3dd8 SHA512 1f3c653a42dbec293fafaf44e0f0ca4ab96ac018e42beb6c2527179b4c99f669e3a19b978db47caf03204055800e85c4e83cd61be60d2d01f13de7406b4ece3f
 DIST kconfigwidgets-5.92.0.tar.xz 414528 BLAKE2B 688c6c509577e67558e0d3d080c7b11dc0041a6607c9b5d10d7e057e7c38db57b49bb0e28535a4314f32906d2a9bf55a6b96dc8e064a8775d08d3faf270351aa SHA512 50d07daab3469a3ac9bea2a5ff37b9b1be13bd833a94892825d25f5cd066dc5eb8d44d37319811463e6edc94123da0255851d4f6463ed3c723c6fc69e1902a5f
-DIST kconfigwidgets-5.94.0.tar.xz 417072 BLAKE2B a84231f4224e47e00d2666ed60260e7d2027009c4519c61e49c7bc9c9cbf12858772ac3292bb401a9b44d3706232289ff461fe9abba1ecac378406cdd1cb0443 SHA512 1b99bb215d6f00204e6605cc078062d3e6d9b8c3e5b4a2166e82aaf1a50ac02bbede955908bb7c3bd04e6d1733b103f4e50850358d462d3568bd59f8cf43d02e
 DIST kconfigwidgets-5.95.0.tar.xz 417492 BLAKE2B f80dc082c88f85d25e8edd901a8964fc5d068be65dd22d3f4a0ba2523540fcf5cad2462f4ae58bb1c180ad18872ff5d983449e7b24da7da1b7d9388bae189470 SHA512 44997cca8b293f8d591aa7a6478a0f87a5e212cf7609ba8e07b1a8ee5d40852171f01db8732b5ea75088ee9fb266d21ac97a535c8d356cfbbed8cde1b962559a
 EBUILD kconfigwidgets-5.92.0-r1.ebuild 1016 BLAKE2B 921c2407a4db6b585896dc5af37d2a3e096a8653151f3aaa8041d445171fd9dfebbc0b30e3b0e0555d92910cfb67dbc61bce4460a33552158da8231dc593456b SHA512 ff5f4d8a8041a2a7f132766cd597d4bafb9b8413f09f18e0a65b1cd2f902710476665eb92dc200b1677df2a226d59338e6967d7e12464a2abbe895e3961b2b71
-EBUILD kconfigwidgets-5.94.0.ebuild 933 BLAKE2B 12cc8e579e79b8ebcca45fcf78a2715159e64c778bb1d49eb7558d32cc5e87720966b8dffbf1e44ba67f1f22d47bc90b51ba7b7f29fb918f77a367109368487f SHA512 8f10dfd246c9334cf74e009fe86fc9ebc9636047c155528507eceecd4395f9bd27d4f6b3fc8fa98e02bdf0ca807683cd37d03caceeea88915053331e30477c8b
 EBUILD kconfigwidgets-5.95.0.ebuild 933 BLAKE2B 12cc8e579e79b8ebcca45fcf78a2715159e64c778bb1d49eb7558d32cc5e87720966b8dffbf1e44ba67f1f22d47bc90b51ba7b7f29fb918f77a367109368487f SHA512 8f10dfd246c9334cf74e009fe86fc9ebc9636047c155528507eceecd4395f9bd27d4f6b3fc8fa98e02bdf0ca807683cd37d03caceeea88915053331e30477c8b
 MISC metadata.xml 547 BLAKE2B 127ee4110b748cd3e3c26b63248d35f78b233b00cf4466ccc0145a613062a5aa9cc2e9ebd91d0e7482c67f6e265938176b169a9c52eda30bfcddf02549ec8f06 SHA512 2d36585b1af6205dc1bfcff7c3cb24c85376716159317b5c105c866143d49e89e91e501c9a4cf2d63265c30a09e8df71bca841319bd3f2b551e79fde90b1d96e
diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.94.0.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.94.0.ebuild
deleted file mode 100644
index bbef910c69eb..000000000000
--- a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.94.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_DESIGNERPLUGIN="true"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing an assortment of configuration-related widgets"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="+man"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kauth-${PVCUT}*:5
-	=kde-frameworks/kcodecs-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kguiaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}"
-BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package man KF5DocTools)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kcontacts/Manifest b/kde-frameworks/kcontacts/Manifest
index 7c1e449e944a..90a4d93449dc 100644
--- a/kde-frameworks/kcontacts/Manifest
+++ b/kde-frameworks/kcontacts/Manifest
@@ -1,7 +1,5 @@
 DIST kcontacts-5.92.0.tar.xz 192640 BLAKE2B a1a91e897200cf85dc24d916dfe57cf8e04b9ef1e355fdb915b85f3763263feefa53357a7f56177ad854dac38fb5b71a2b469a4a2930a1dfbd09db4500451e70 SHA512 8d5f08afccf5b01d72a9881ef4805ec2ae8dba3afeb93efaf82b80fc60aa917302681387d77d7f104f2846958077ce7418712cccf677f9067eccda92cfb4b2db
-DIST kcontacts-5.94.0.tar.xz 193068 BLAKE2B 1d9cd692ced982a893772924b721d737e8853ac8868b39c3f726f0457711aee2ee229d9f1154e0158a84b42a0eeccc7990e80291c3ba6f7a9239d10ac1b23718 SHA512 59291b9639ecf0bf3f28cf1b6cf46239381acc4354fc6cf5d9578ab4eaa5bccfa5e1504478f1be8c435b9b57c77f3c53e41bcae12ddc12ec1fa419ed4bf8f0ec
 DIST kcontacts-5.95.0.tar.xz 193028 BLAKE2B 73768c02812dbad25f62764f621cc4c1fd512dad2ed09dee1abaef850002f4531f33e526ca6754e4563e72f95ddf7d35aa201d63d89bcecca3626cccac70b430 SHA512 da0a95270f8c0804526cc396e16aade6408fb41aee2831c57cc5a30d5c6a6eb6f9dea191617001a306984955a581c3dc87d65842ff2ec69d2f1a835b09c37fbb
 EBUILD kcontacts-5.92.0.ebuild 810 BLAKE2B 26dd07ceda4794f124e17ded59e415ab45c07a326d276d0345ada0ff0cbf831ff56afbdde89d4202a27f7dfc2252502224488cf5bf90d76442e03563df532e92 SHA512 b0111afe2db50474184d32a6fc458a71e140d92c8f1ea96d1bd38da22a8be825289bd6e231e133020b0fcd56a3ca8254357a391438377aa191326e87f2066b07
-EBUILD kcontacts-5.94.0.ebuild 813 BLAKE2B 764c12ad073ff64780913d7281211cf7f546929423b8e0c385bfed5b70f983a418cad1e5c44739e1d850fb1bfdf7d5038d3c37cb7f987d1b6ac9aced7a7528c4 SHA512 8449953697b1ca1bc0d2eeeda984269c816441d0b1817cb4c7f542d5eebdacfecbba29ef0b1ee1d4f00d37a6f784bcc5722b94092c7e1a4bcb03a58124a1446a
 EBUILD kcontacts-5.95.0.ebuild 813 BLAKE2B 764c12ad073ff64780913d7281211cf7f546929423b8e0c385bfed5b70f983a418cad1e5c44739e1d850fb1bfdf7d5038d3c37cb7f987d1b6ac9aced7a7528c4 SHA512 8449953697b1ca1bc0d2eeeda984269c816441d0b1817cb4c7f542d5eebdacfecbba29ef0b1ee1d4f00d37a6f784bcc5722b94092c7e1a4bcb03a58124a1446a
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kcontacts/kcontacts-5.94.0.ebuild b/kde-frameworks/kcontacts/kcontacts-5.94.0.ebuild
deleted file mode 100644
index 6859e2218717..000000000000
--- a/kde-frameworks/kcontacts/kcontacts-5.94.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Address book API based on KDE Frameworks"
-
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	=kde-frameworks/kcodecs-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
-"
-
-src_test() {
-	# bug #566648 (access to /dev/dri/card0 denied)
-	# bug #838502 (again some Qt translations loading related err...)
-	local myctestargs=(
-		-E "(kcontacts-addresstest|kcontacts-picturetest)"
-	)
-	ecm_src_test
-}
diff --git a/kde-frameworks/kcoreaddons/Manifest b/kde-frameworks/kcoreaddons/Manifest
index 83724cad8b37..9cc8e21c7eb8 100644
--- a/kde-frameworks/kcoreaddons/Manifest
+++ b/kde-frameworks/kcoreaddons/Manifest
@@ -1,7 +1,5 @@
 DIST kcoreaddons-5.92.0.tar.xz 454876 BLAKE2B 6c81cb1940145d21652f61e1808a07ef7bd673f54f955568cb063d9a694c4c314444ae829de6b6a8236ef91147df396e82e9dd1c73725861964b774a31a9ef88 SHA512 b46a7aab486c0ed355e8400ce4d81f7d8d7e9e134305a1251d0d92a7919d2a18bcbc24c0306f34ae3781c7e1c4b73975e009e50bbca74eea22bca44994ff6067
-DIST kcoreaddons-5.94.0.tar.xz 456556 BLAKE2B f7d70649524e4863a42fcb8f5bf63c22efd93f489f25bbb7d50ffde5d239e5096ea8cc4cb9844c42491708edcc2e6fe796364cfcd665bc1527307878a4066ce3 SHA512 b94ffa2e845dcfb481d496348969b1ec4ddba0a3c1fdcec636567a89fb6f65179a10b43add14cf5c4e720dce4459e725dca6ee5800fdf9551385ec7fffc1b462
 DIST kcoreaddons-5.95.0.tar.xz 462716 BLAKE2B fd2c03bb3ec0811a5cfe4b5b5a980a953053f9365680c7fc8ceb9207e30ca54fffd148d276f1aefac60c76251e4214d5497a9845afdc895abfc722f960e53b9c SHA512 b9b4337a09a600e808ff66a7a4c5de81149213bef7ae420cd71206577c21009539b45e2bd424314c998671e65eee9e3be0d0b7768cc16dcc39c2cd1162df53e8
 EBUILD kcoreaddons-5.92.0.ebuild 978 BLAKE2B 3379fd5b41b1abc608153fc4550a75aa3971163708b6390581d79f354abc0b431b90a534125db0d42eeaa7eaf307305c1bf251dedbe72af44f20a2f088515a13 SHA512 97a07547a412696694608e7cafd09e4decc2713726ce5191cfb5786711514473917519e0130df8ac9dbddbdb95bf0ef1c76457e7eccc61397beb0c70a8ea542a
-EBUILD kcoreaddons-5.94.0.ebuild 988 BLAKE2B caef202843a2a87894183d84313649230a7595da78f77a988d1ff1ce7084a5378ac2dae684750f26e8cd02ba97683e7d5591784a1f41e59a5bee6ec2244b6cb3 SHA512 475aa36be69a7a94eef43d10acf85e59ca3db71deb7fab897e26ed3c41703e98f864d6b481769c389b8b1e8af58c9305c91e8910f80acc242dcdfdbc938da47e
 EBUILD kcoreaddons-5.95.0.ebuild 988 BLAKE2B caef202843a2a87894183d84313649230a7595da78f77a988d1ff1ce7084a5378ac2dae684750f26e8cd02ba97683e7d5591784a1f41e59a5bee6ec2244b6cb3 SHA512 475aa36be69a7a94eef43d10acf85e59ca3db71deb7fab897e26ed3c41703e98f864d6b481769c389b8b1e8af58c9305c91e8910f80acc242dcdfdbc938da47e
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.94.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.94.0.ebuild
deleted file mode 100644
index 11705a08ca38..000000000000
--- a/kde-frameworks/kcoreaddons/kcoreaddons-5.94.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QTMIN=5.15.3
-inherit ecm kde.org xdg-utils
-
-DESCRIPTION="Framework for solving common problems such as caching, randomisation, and more"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="fam nls"
-
-DEPEND="
-	>=dev-qt/qtcore-${QTMIN}:5[icu]
-	fam? ( virtual/fam )
-"
-RDEPEND="${DEPEND}
-	nls? ( >=dev-qt/qttranslations-${QTMIN}:5 )
-"
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-D_KDE4_DEFAULT_HOME_POSTFIX=4
-		$(cmake_use_find_package fam FAM)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# bugs: 619656, 632398, 647414, 665682
-	local myctestargs=(
-		-j1
-		-E "(kautosavefiletest|kdirwatch_qfswatch_unittest|kdirwatch_stat_unittest|kformattest)"
-	)
-
-	ecm_src_test
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	ecm_pkg_postrm
-	xdg_mimeinfo_database_update
-}
diff --git a/kde-frameworks/kcrash/Manifest b/kde-frameworks/kcrash/Manifest
index 6e9515de7e91..c64b61374e68 100644
--- a/kde-frameworks/kcrash/Manifest
+++ b/kde-frameworks/kcrash/Manifest
@@ -1,7 +1,5 @@
 DIST kcrash-5.92.0.tar.xz 28376 BLAKE2B 6638906041e0e2d1af791d0c90dacd9fe5b6120d739ae6886b66e09ad51f8d327a85d75823b6269e15e82c82ce0e17a6e0d07db970e0153f35f71e2328313934 SHA512 200ac9999e235f968653141446d3203db9730abc078cbb56922f15869bbfb27a9da3384a1127bd2a79513bec97e10d67d693ce8325b53588e4fb7304abbf6f8d
-DIST kcrash-5.94.0.tar.xz 28364 BLAKE2B be0f42864590d9c4855b9cd088a87c1e8d1bc9360ded5330b1fe437cdb5964c91b2ed4ba466dea87fa2323330fbf07bed12dad5fbc7a2c4d7b342a786001b9ec SHA512 ce0b9de0f2a4816f40f2a958d101434d0940d2bc26a671d26814c02f836d2e1f3b862d38d37895b6d096091333e12bb76eff5c99ccabba21c12e485eedb6facc
 DIST kcrash-5.95.0.tar.xz 28368 BLAKE2B fc5714c48c326a7078b064888ebda7c2985fbad6cd5124dde1f0ca76c11c716cfe621ab76eea36dd5e395e9bcd68a7ff5ffbdcd71aa347759c8e664b5126e05d SHA512 704ad643a56101d514c68fadedb34657dfcb82fdf05ec787ac3679655dae7fb012aea564f430da1005fa54fb6edc442e48d4e5dc0ec24e9eb55475be986eca05
 EBUILD kcrash-5.92.0.ebuild 843 BLAKE2B 3f86cfcf9e5ccad62992d5951cc2e49a2c2e98a0f8b5c906c1599712340080cf7beaed5af114509825084617448e6fe8e0e36711093a1f59adf13c66b6e37405 SHA512 59ca3f5964dd45fb667d80d70fa41a42c2a72da6a99eb303c251c8721ea18c52177e66206d08a4faf6808e3e7d0e617f796294fa9429d62a2de8ec99cdc1fb4c
-EBUILD kcrash-5.94.0.ebuild 846 BLAKE2B 0a81146c0c39b43dcff366b9b7b6ce18df83bc854f71fd8afa8dca1bdfa35122ece511c570c78cdf081c3dad56f0dc51ee5d1a08052b9e4999e7b472acd57835 SHA512 a94384400d4e3e7b8a5c47c6709c9eeebc0d02bd4ccea67f8a36b860890e33cbe5bdc1139532d4611a6ee37a59861c5ca477f9125b683064746ee1b52b7fe390
 EBUILD kcrash-5.95.0.ebuild 846 BLAKE2B 0a81146c0c39b43dcff366b9b7b6ce18df83bc854f71fd8afa8dca1bdfa35122ece511c570c78cdf081c3dad56f0dc51ee5d1a08052b9e4999e7b472acd57835 SHA512 a94384400d4e3e7b8a5c47c6709c9eeebc0d02bd4ccea67f8a36b860890e33cbe5bdc1139532d4611a6ee37a59861c5ca477f9125b683064746ee1b52b7fe390
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kcrash/kcrash-5.94.0.ebuild b/kde-frameworks/kcrash/kcrash-5.94.0.ebuild
deleted file mode 100644
index 0a7256689d54..000000000000
--- a/kde-frameworks/kcrash/kcrash-5.94.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for intercepting and handling application crashes"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="nls X"
-
-# requires running Plasma environment
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-	test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
-"
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_X11=$(usex X)
-	)
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kdav/Manifest b/kde-frameworks/kdav/Manifest
index 58bb97f91961..6495de018188 100644
--- a/kde-frameworks/kdav/Manifest
+++ b/kde-frameworks/kdav/Manifest
@@ -1,7 +1,5 @@
 DIST kdav-5.92.0.tar.xz 63928 BLAKE2B bd08d582c3135db6ccd0f7194bb011d26b4a0e29643d0eb93ea1c126206a4b67974fdf6fdb34062c7309b119ff5e247c41562197701657dc717f2521bdb14aa1 SHA512 4e11c721c0338753810b1a02cc3850e2ce14f2760d7461cbacb7204c32e2f48dd7045d88118e6444ec5ec7a701783bcf2c6c520e822c14849593510a25d374e2
-DIST kdav-5.94.0.tar.xz 64448 BLAKE2B 5c911078abe1c5fe9fdd6ed9fc9f90b7a445f09827a4d6d471011f14012278604cc33943192c75c6b76b886a3dc8200479679aed594a7c698256a0550c6ee440 SHA512 4aaadadd74813cd5fbfa713dc96c217aee98149e3ca4e0e7ae642cf7b6e028956c118612e4700bc09966af11deb9b29ab9cc4fcd38b0f98faa2c59a77941f11e
 DIST kdav-5.95.0.tar.xz 65116 BLAKE2B b71cb6ec4ff8b56487188de6cd12efae8e74e62447c65c02843421840eb36c4859191f51b7ed99dd9fe94a1bcb42adc1ecba2e1f9ef04d8d1c654ef0df597672 SHA512 801c10381cf7115a30c66c7e4279b0da922db956c1a24c4e12654da0e99c2d12a3a7aec3a65dd538fd1c878c5a18f814bcccbebe3faaa13243e4e8f8e5afd147
 EBUILD kdav-5.92.0.ebuild 765 BLAKE2B 51702be9f163b4622fbe62dd7b97f69c57a0206f81cbcd149651bc3a77e3590ebbe5bd626ad5a88d0872030b078e0343027197a4425e1f054f3ab1be23dab223 SHA512 e1b8aee39ae09a981a4e80d203ef5ae2b7a72773cbdaea6052fb0f1fd355dc440d148ee355c5d2d563aeb62d5a84d9093038a5ecf167d3eacdb679d77718cfd3
-EBUILD kdav-5.94.0.ebuild 768 BLAKE2B c1def904a3c4ef48dbb6ff479c1d56f16dad35050bd7dbb57505f3808410909f7eeb6e30c270f8f2792fd501007235e1209a20b2f611dd90f7aee659fb9d6460 SHA512 e8a6b46c2e3a555dff658b87a8381d4070c6a0bf30769b58e4a408819d8b95b06dce3b6dc2e910ea5a537f0a5ca08eeccef4dc53a0760bcc58e85ef1a3830526
 EBUILD kdav-5.95.0.ebuild 768 BLAKE2B c1def904a3c4ef48dbb6ff479c1d56f16dad35050bd7dbb57505f3808410909f7eeb6e30c270f8f2792fd501007235e1209a20b2f611dd90f7aee659fb9d6460 SHA512 e8a6b46c2e3a555dff658b87a8381d4070c6a0bf30769b58e4a408819d8b95b06dce3b6dc2e910ea5a537f0a5ca08eeccef4dc53a0760bcc58e85ef1a3830526
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kdav/kdav-5.94.0.ebuild b/kde-frameworks/kdav/kdav-5.94.0.ebuild
deleted file mode 100644
index 8306765733fb..000000000000
--- a/kde-frameworks/kdav/kdav-5.94.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="DAV protocol implemention with KJobs"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${PVCUT}:5
-	>=kde-frameworks/ki18n-${PVCUT}:5
-	>=kde-frameworks/kio-${PVCUT}:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdav:5
-"
-
-src_test() {
-	# bug 616808 - DavItemFetchJobTest requires D-Bus
-	# bug 653602 - DavItemsListJobTest mimetypes unsupported
-	local myctestargs=(
-		-E "(kdav-davitemfetchjob|kdav-davitemslistjob)"
-	)
-	ecm_src_test
-}
diff --git a/kde-frameworks/kdbusaddons/Manifest b/kde-frameworks/kdbusaddons/Manifest
index ec6fb884a69a..76e6a42b2759 100644
--- a/kde-frameworks/kdbusaddons/Manifest
+++ b/kde-frameworks/kdbusaddons/Manifest
@@ -1,7 +1,5 @@
 DIST kdbusaddons-5.92.0.tar.xz 47688 BLAKE2B c2be6e5a10a0db32dded038b3a88e6b9ca800b2879c64c66dc721002bc5504af7a36676a7e0af9d7225aeaf82a1ee54ecd1a6dfcfdc56210c0d0f19a679f7105 SHA512 74a5b65ef760b0dff1d3ce86a32685b18e623de5330d2b3b7e089adb158871de6939f82f6f10167f0b2735b1ec0bca5411a24f4b8cfe64ec870cd9927cdc09bd
-DIST kdbusaddons-5.94.0.tar.xz 47688 BLAKE2B 0f645ad371a07db7f028bc4f23a0b42b6058dcc91177b3d712534e6f136438728f7482f8a8bc281f777d744d5bef2a36399c6fa61c49a6bce6145196cb6244c4 SHA512 8075330a54c41a94ad97b2514635ad3845128dd856510ebd4441ee3d349c125ac189cf4d3d582dd5e19cef29f07e7df8d22f4f72c8b3fe26d4ca5e262c527929
 DIST kdbusaddons-5.95.0.tar.xz 48016 BLAKE2B 37c48c1ef0dc766d21f3b370abd741fba009dff782e8b604fe7c5bea295657e0f5067e9fcfb22e2759e05cf6fb1fe0c3933063fdd0f070e9e6c865a71c5b6c49 SHA512 0d22a8bcda09e366e994370c9808d83f7b8b598cbd4c4b746f1c7953d5078ab2530a2e8372fc170475a66012c4337d5c2871e4e5e98e615500a907bdaa546aa2
 EBUILD kdbusaddons-5.92.0.ebuild 605 BLAKE2B 98be1bf84bc6f2c6b9361a149721cf3973ba45a02a238e3f1926e9b03c9c1bd79bf44a8844516a48e6281e3abbb5e8f2e91e24996afab2efa4833b5cd9ee514e SHA512 4173551ffaa033ed7e0cf8861d24c62ce5b7b5c23970cd61dbf5f10f29d475c5cbf2dfc2dc6d7e209ba9aeca3ddb1159634697e400209ce65bf516f136355139
-EBUILD kdbusaddons-5.94.0.ebuild 608 BLAKE2B d468fffaecaa98fe5e8f95a94565dadb53bff464310e0b77f6d96a6552b74798d289ae58d5528e462c9c76fd6ed66910f2b08461b8e84b3735d9eb19ad30844a SHA512 279eb469e0cee012011b661bab0af1c67d78a6d584deafd00c77acb9d1758c4db3a738aa1cece0abe3b7bcb9bfa3cee92414b450fe9891d9cf21ee9e6b649944
 EBUILD kdbusaddons-5.95.0.ebuild 608 BLAKE2B d468fffaecaa98fe5e8f95a94565dadb53bff464310e0b77f6d96a6552b74798d289ae58d5528e462c9c76fd6ed66910f2b08461b8e84b3735d9eb19ad30844a SHA512 279eb469e0cee012011b661bab0af1c67d78a6d584deafd00c77acb9d1758c4db3a738aa1cece0abe3b7bcb9bfa3cee92414b450fe9891d9cf21ee9e6b649944
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kdbusaddons/kdbusaddons-5.94.0.ebuild b/kde-frameworks/kdbusaddons/kdbusaddons-5.94.0.ebuild
deleted file mode 100644
index b32cb64cac52..000000000000
--- a/kde-frameworks/kdbusaddons/kdbusaddons-5.94.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QTMIN=5.15.3
-VIRTUALDBUS_TEST="true"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for registering services and applications per freedesktop standards"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="nls X"
-
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X Qt5X11Extras)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kdeclarative/Manifest b/kde-frameworks/kdeclarative/Manifest
index a759f746d4a9..b50ace0a4e90 100644
--- a/kde-frameworks/kdeclarative/Manifest
+++ b/kde-frameworks/kdeclarative/Manifest
@@ -1,7 +1,5 @@
 DIST kdeclarative-5.92.0.tar.xz 202924 BLAKE2B bb7d67ee68bcef340223c89f827357bbcf04cc8838c643dbbe0338ddb9fbbcd35306bd293b6a8b00dca5d76a75476b63f659b8308deeeee3b51c776290908cff SHA512 f4dee788269405607be0818593420ca7e018fc48972d38f716e9d0319a8ef6557557ca553cff3c62d4f123999e6639e106089c2a4eccd0df824cd0bbdd5cad4b
-DIST kdeclarative-5.94.0.tar.xz 204884 BLAKE2B 232305d27f3192bad376b5a24b41836b6fa0dac01ce58b2df4d269ed6751561b6363608f147c0b169101c4cc1d91b92299377d51f04c43bdcdfc55ea69477f2c SHA512 dfe5359a0dcc75e00ef0ece97903b4217e896d3427633e9dbec834cf924d921982576651139e9215b01d283213ce0d73d03ab67b9d3561763ca0596ad80067b4
 DIST kdeclarative-5.95.0.tar.xz 205716 BLAKE2B 7cff9307f5098513e65416868845fe3b892da30c97fa01b6e6eca95dc15517d8aa67423fddfb78e2695a7df47b7c9f083534ac993b5b87a0f9b692d725b22d52 SHA512 bedacd087b7215b38ec83291c853238f759532b7fd5941cc02771746002a08233985b624ac31bd926bcd18fb2eca6e703f0a7ae83439a3e63657d6aa3ea647c0
 EBUILD kdeclarative-5.92.0.ebuild 944 BLAKE2B eedca9ff52fd3d86b73ea12b8251efe7aa1136631a5eb69b118c91cc9ec506310ec9e4e62e0948089c30c4fef95373e50e95d9e87791aa034f88f70e5888ef3f SHA512 3ce5b83d7ad536f0e69d156b8ef61bc09591acbe5bd6b62815d445e2af0ad78c245d6e721638fd314ff16ec48afba355caba0bb59df1d63086dc1435a3ac584b
-EBUILD kdeclarative-5.94.0.ebuild 947 BLAKE2B f7313622f161c3bb71ba38d8fa094eee5f0aca80c3d998e24ff62fa681a8bb3abc40799d9eae0622b4a8406c3fe26f1b3eb5eccd8184ff702afda27502134bf1 SHA512 8f5763c8c795343eb56adcfa987a1dcb0daa0b9a1d81b0f619c39c5483d9e39d93c29537e717e1da6aefdda1a60b0c97be29951ecbee5cf02851b2376426436c
 EBUILD kdeclarative-5.95.0.ebuild 947 BLAKE2B f7313622f161c3bb71ba38d8fa094eee5f0aca80c3d998e24ff62fa681a8bb3abc40799d9eae0622b4a8406c3fe26f1b3eb5eccd8184ff702afda27502134bf1 SHA512 8f5763c8c795343eb56adcfa987a1dcb0daa0b9a1d81b0f619c39c5483d9e39d93c29537e717e1da6aefdda1a60b0c97be29951ecbee5cf02851b2376426436c
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kdeclarative/kdeclarative-5.94.0.ebuild b/kde-frameworks/kdeclarative/kdeclarative-5.94.0.ebuild
deleted file mode 100644
index 6333ef416a37..000000000000
--- a/kde-frameworks/kdeclarative/kdeclarative-5.94.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.3
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing integration of QML and KDE work spaces"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kglobalaccel-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/knotifications-${PVCUT}*:5
-	=kde-frameworks/kpackage-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5
-	media-libs/libepoxy
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kded/Manifest b/kde-frameworks/kded/Manifest
index 1bd934bffea5..2ec550c37ad8 100644
--- a/kde-frameworks/kded/Manifest
+++ b/kde-frameworks/kded/Manifest
@@ -1,7 +1,5 @@
 DIST kded-5.92.0.tar.xz 39260 BLAKE2B c6a1476e87faa5723a65f3ad9fc34bb817fff4f4b0fed35c46e0c77a4ebdd40d15c4ed978f9ff607d9570bbb3ba5a9c0afafd274eb1e0fd9a5c004d49a240590 SHA512 c5fb2d74a2186e4bd784f3a16df9079e7bdf84272764c62c809b3b316209b30e9de36afdf2a3ac12dcc80163cf37cade3e53dd6ded79ad93c35e3b1a4fdb3ae0
-DIST kded-5.94.0.tar.xz 39316 BLAKE2B 60f8f8aadf4f7a3ac025cb43ffbb410094851b262029eecb5c008ac1e4506c67caf80d279f4592531402372c522efa7c6cca3efc5ce0dbf467ee2f386178b1bc SHA512 35da63b63f5e595c225f30879cdff6cdc0b74b93028a7cefc71dd93447759488f6419492449c1f4c25b71b5b3ec4299a4e785b3be37c792468751a5e5c6ac32a
 DIST kded-5.95.0.tar.xz 39340 BLAKE2B 2fec068eccabef4900786a7ddbf6a39f9c0328b71869c686da52af29ed361ab0028ebed332c0919fcdf5aa3828916ae56a7dcafc54ecfa401eb42ac863db8574 SHA512 c57019d2429f0f1662b40f0a0aee0039897c9bdc1f2d7c801e2595a7aadfb686009917ea3c6179e9d0d17c2d745637d39f21deb4640fd3e07a26cd3df9dcd9ee
 EBUILD kded-5.92.0.ebuild 842 BLAKE2B 7e465a624fade9c88257aaf7b75ab3c88b97e05de7b278add285f539f3856fb256758337cdd2d8a439f96d44835d3a9267ab85e6d7e1e0bbc43bf8b8d21b2971 SHA512 e81eff012d013865878c8d5fdc65f46470aa1477a7b9c0b300d683d314b16cc42d67fac023f49cecae4b9d03a789a0da5e2f669ba2605b8815e0a27bb9dde787
-EBUILD kded-5.94.0.ebuild 845 BLAKE2B 3fac11f5f8e118b097c9c613edd2ef7b857ee95464ba9ad9d652d9702586899d054fb2b82c82c9ca75f1d5e67692e82ebf04c0555b879a7a271715f49b398798 SHA512 008b211aedcce5a7b08b23fb0287f562c9f281559315dfe25847131da8d72f9d9718bc9e5b77b45fae55c06a0ad0a21049e0aec6433c7ce57907244ad6dd45a3
 EBUILD kded-5.95.0.ebuild 845 BLAKE2B 3fac11f5f8e118b097c9c613edd2ef7b857ee95464ba9ad9d652d9702586899d054fb2b82c82c9ca75f1d5e67692e82ebf04c0555b879a7a271715f49b398798 SHA512 008b211aedcce5a7b08b23fb0287f562c9f281559315dfe25847131da8d72f9d9718bc9e5b77b45fae55c06a0ad0a21049e0aec6433c7ce57907244ad6dd45a3
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kded/kded-5.94.0.ebuild b/kde-frameworks/kded/kded-5.94.0.ebuild
deleted file mode 100644
index 167c38a871b0..000000000000
--- a/kde-frameworks/kded/kded-5.94.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="false"
-ECM_TEST="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.3
-inherit ecm kde.org
-
-DESCRIPTION="Central daemon of KDE workspaces"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="+man"
-
-BDEPEND="
-	man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
-"
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kcrash-${PVCUT}*:5
-	=kde-frameworks/kdbusaddons-${PVCUT}*:5
-	=kde-frameworks/kinit-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package man KF5DocTools)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kdelibs4support/Manifest b/kde-frameworks/kdelibs4support/Manifest
index e8478494f0fe..9e9b80ac3bd9 100644
--- a/kde-frameworks/kdelibs4support/Manifest
+++ b/kde-frameworks/kdelibs4support/Manifest
@@ -1,9 +1,7 @@
 AUX kdelibs4support-5.80.0-no-kdesignerplugin.patch 5689 BLAKE2B 74771136992074f7e39eb110d7b838ed6ff3bb34ca8b44242d57359b3efc4bebde8ae615b27df31cba42d14349697ba303b3aa20b09c1d83d044cff2cd6700f0 SHA512 2a7a1c05c6ef7f440ca84eef7b65f65f92d780fa411301e2a8554115717cbe543127e1878ae5642f07f7ddcae4a62ed075468f85e7c7cdb13992b4bada270bff
 AUX kdelibs4support-5.86.0-unused-dep.patch 1693 BLAKE2B b310444effa8bf0a2a203cdc7e427ade52caceabc77b1dce96cbc739443c9d8429c2f1186f3d1e5180a0b8ef6323ea805a040ded435b2a0a3abdcef0e4dceee9 SHA512 bf7637791517739ebfa296beb91f3873d21165c4760374df8972fa75f237dfefb24cac7ea7895f359dcf368a18f974005b83646f9ba3cd6891ba6181880a4a6a
 DIST kdelibs4support-5.92.0.tar.xz 3649060 BLAKE2B c3989cb4a0d9365a46cd42519abf82b65238234010207e1eb00d214eae11eb27525642689c791e6140db6de481a622b07b11a5d16355388fb6182ad3d7f230d3 SHA512 ff42d5ad75c073c3f5c856b611b3235982f513c1bc1186a9c7b4ceecf2cb7561dc37485a8e5d53582546141493b6038177a72cc94ac76bd999913ea83d22297d
-DIST kdelibs4support-5.94.0.tar.xz 3651300 BLAKE2B e6ddd55693f1e233b03f80d65ebe07db54eb93456019c4a1bb18eb75281e93471e3638fd1e40da5b1c7e31e247823192d7ab748b5016f264b578a3b39de7b3ac SHA512 8b48b7d67201bc6e0fb67fa00b75dbaf8e35e21f7527b4bc79939c2b689c027bfa75eb60b13686bd8bce710a61682a27cac85481edd6e321063aefb186cdd2f2
 DIST kdelibs4support-5.95.0.tar.xz 3652484 BLAKE2B 1e79b801274ec97352e49aafae391c130e75cfb6f7c66320dc011cbb318b8739234d9bb9e0e3aa33a96e5335ae6fa99dec823552bf6124f231aa48d2a6264bd9 SHA512 28a8a78f61eda609425acc3ef76dc804774d1eba5eabf674cab9abff8fb9ef3925bb71d0a97a13eea4e578f66996660a0bf19851624ab239826dad5de2fedf14
 EBUILD kdelibs4support-5.92.0.ebuild 2622 BLAKE2B 14883e4ad5d09257f9f9d38426f0f0d75c6e570566c2c67558fcde5d0e4ff2f2195085018397f7c50caae034436b9ed8381ab7af97e88efc5a1e4c2069a077ac SHA512 f1314eab4343a5526c0e57b3702703ac2d5502ca32d167a470c13eed148cbd88fa5cc6ec07102945c93ac721736cda75809f99430ad4ff0a05b664cd9f49f8ee
-EBUILD kdelibs4support-5.94.0.ebuild 2625 BLAKE2B 090729bb3e21b66a0975182cebd88f90d04eff58c21694586dbb4f74c62c3fcd3f7427a251ceb53a28deafe6757bc0e167b33ab12e16b34b06d257edb8cd0558 SHA512 6bd7a46197b132f604cb7659b49be92f5da7254a6d7fe4159eba15b014962afe243d33e8c758c94dc3ba0dbefed16f550aa0d8e4bd6227fd32c5694d08c5ab9c
 EBUILD kdelibs4support-5.95.0.ebuild 2625 BLAKE2B 090729bb3e21b66a0975182cebd88f90d04eff58c21694586dbb4f74c62c3fcd3f7427a251ceb53a28deafe6757bc0e167b33ab12e16b34b06d257edb8cd0558 SHA512 6bd7a46197b132f604cb7659b49be92f5da7254a6d7fe4159eba15b014962afe243d33e8c758c94dc3ba0dbefed16f550aa0d8e4bd6227fd32c5694d08c5ab9c
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.94.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.94.0.ebuild
deleted file mode 100644
index a9f9f2882d15..000000000000
--- a/kde-frameworks/kdelibs4support/kdelibs4support-5.94.0.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="true"
-ECM_QTHELP="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework easing the development transition from KDELibs 4 to KF 5"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="X"
-
-RESTRICT="test"
-
-COMMON_DEPEND="
-	app-text/docbook-xml-dtd:4.2
-	dev-libs/openssl:0
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qttest-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kauth-${PVCUT}*:5
-	=kde-frameworks/kcodecs-${PVCUT}*:5
-	=kde-frameworks/kcompletion-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kcrash-${PVCUT}*:5
-	=kde-frameworks/kdbusaddons-${PVCUT}*:5
-	>=kde-frameworks/kded-${PVCUT}:5
-	=kde-frameworks/kdoctools-${PVCUT}*:5
-	=kde-frameworks/kemoticons-${PVCUT}*:5
-	=kde-frameworks/kglobalaccel-${PVCUT}*:5
-	=kde-frameworks/kguiaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kitemviews-${PVCUT}*:5
-	=kde-frameworks/kjobwidgets-${PVCUT}*:5
-	=kde-frameworks/knotifications-${PVCUT}*:5[X=]
-	=kde-frameworks/kparts-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/ktextwidgets-${PVCUT}*:5
-	=kde-frameworks/kunitconversion-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5[X=]
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-	=kde-frameworks/solid-${PVCUT}*:5
-	virtual/libintl
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libxcb
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
-	X? ( x11-base/xorg-proto )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/countryflags-${PVCUT}:5
-	=kde-frameworks/kinit-${PVCUT}*:5
-	=kde-frameworks/kitemmodels-${PVCUT}*:5
-"
-BDEPEND="
-	dev-lang/perl
-	dev-perl/URI
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.80.0-no-kdesignerplugin.patch" # bug 755956
-	"${FILESDIR}/${PN}-5.86.0-unused-dep.patch" # bug 755956
-)
-
-src_prepare() {
-	ecm_src_prepare
-
-	if ! use handbook; then
-		sed -e "/kdoctools_install/ s/^/#DONT/" -i CMakeLists.txt || die
-	fi
-
-	cmake_run_in src cmake_comment_add_subdirectory l10n
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kdesu/Manifest b/kde-frameworks/kdesu/Manifest
index 81600736eeed..ecd5034121bc 100644
--- a/kde-frameworks/kdesu/Manifest
+++ b/kde-frameworks/kdesu/Manifest
@@ -1,7 +1,5 @@
 DIST kdesu-5.92.0.tar.xz 55452 BLAKE2B 6c150c1f623fe8132b23abfe2ccf4defb4c9b9bdb538da170585247d3fdca615eeb76d31050f62e28d947a0926fc4731197b25b70a59e87711136de56062cf0f SHA512 6820edaf1233dacc4e71d7cac3e38048fc4fe19df7ef45f51346b07157a57107272fff3386547f0105597b3a7da6076305d955ab0fbcafe5ab9dc4160582deee
-DIST kdesu-5.94.0.tar.xz 55500 BLAKE2B 80b1004997ff113f8ae2550e20b371a44fa6df8f4cc7294b1184c5a4217a85af30032868a39e37ce1080a998e0761354abdce5f89ec98c3e7809862979b70197 SHA512 850c35338d08c16e6fc82fe844640629e1198c1f127c286bf8e443e5b7e8b3b53529e8fc24a0ea62b824c7be4e42df933e49d6c5870562d971322574581bc664
 DIST kdesu-5.95.0.tar.xz 55852 BLAKE2B 2d185793075a4847d1886f090814fb1e4985c199fe189690f383c4d5092444719fd17d2062ace29d30bedf4b4b980cc540c6caf939f85b7f5ef74366ff18d9f9 SHA512 d088d274b433b44a3acc0a8a47c4aa15f7d9d0c9e3d3dc6f71c93df052f1a3bc0b04fb18b476d55535c750eb73638f9d6fc7ead88d3bc269139561cdd0b7d8a7
 EBUILD kdesu-5.92.0.ebuild 629 BLAKE2B 4a798c0e19ada57c274d31269cf66e419e0c3229c7d01c26c85a54b2620288595f84dc51578e7d833a9ba9a4ee146e29afa6d7686e04a04d26fb6a31040543aa SHA512 6029af52265693f8349efe9be41d139a75e65cdcba7d2b9ec5c0994243bb98236e63988f6ee08f2e5bf51efd07d5742511aa870d0e515244184e4ed6f8fe7980
-EBUILD kdesu-5.94.0.ebuild 632 BLAKE2B a9729008f80e13eeef1cc776d2e6a925eb9f1fb6c021793b735f4e3522e3de71a7a8b118ff9d22009331a5857cf6601c5793c892e31879a2468710ae0e071f63 SHA512 2b508000730610d58e3044f1f3448e61bd36f23c9c5f4081074c57e420583cb5cbca24c1d260beaee39ea2d66e41a2aacdd6f4faec5cdd9f5f16f6775e07b634
 EBUILD kdesu-5.95.0.ebuild 632 BLAKE2B a9729008f80e13eeef1cc776d2e6a925eb9f1fb6c021793b735f4e3522e3de71a7a8b118ff9d22009331a5857cf6601c5793c892e31879a2468710ae0e071f63 SHA512 2b508000730610d58e3044f1f3448e61bd36f23c9c5f4081074c57e420583cb5cbca24c1d260beaee39ea2d66e41a2aacdd6f4faec5cdd9f5f16f6775e07b634
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kdesu/kdesu-5.94.0.ebuild b/kde-frameworks/kdesu/kdesu-5.94.0.ebuild
deleted file mode 100644
index 642ef2c2ee3a..000000000000
--- a/kde-frameworks/kdesu/kdesu-5.94.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-2)
-inherit ecm kde.org
-
-DESCRIPTION="Framework to handle super user actions"
-
-LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="X"
-
-RDEPEND="
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kpty-${PVCUT}*:5
-	X? ( x11-libs/libX11 )
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kdnssd/Manifest b/kde-frameworks/kdnssd/Manifest
index 7053bff05add..5003c34a12e5 100644
--- a/kde-frameworks/kdnssd/Manifest
+++ b/kde-frameworks/kdnssd/Manifest
@@ -1,7 +1,5 @@
 DIST kdnssd-5.92.0.tar.xz 61124 BLAKE2B d6972462218e743052642d11c2aafd1ccfac92eff803e03be2f6b85eee6c19ab2269bb66b877d5e6f397f8d26c0079b3f8c309c4a585d95c71dfaa7202e8f298 SHA512 35bf07b7828a77598b6365bb3abc4f235dfe2ccafe936149360f6f3e738bca7a20f48f8f926078ae4f34c556f2da5cd505aa69949b9050550b341c4c511452b4
-DIST kdnssd-5.94.0.tar.xz 61160 BLAKE2B a809253a6f2ef2b2c3ad9e5931e9f64abb470cb30c6f96d46d4b582079bf8c4c25eb0f1c9f5ec3146d64deed8751c8e8f330386821f6fe08c64d3516dd7d0b18 SHA512 e85f6ad4eecaa2e710f8cf4c989e04b0865158a3ab3d11ff0a6bfcfeed81bccc404313aa62921011a89ff23e6840f6222a38884c0c53e621930b354a309222bf
 DIST kdnssd-5.95.0.tar.xz 61124 BLAKE2B ecb3ae7e3a6e444b7c2b633aa00c0732107d9e5929e9c49edfb185c3217855b74536a0dc8d6d4d9fe21695af26b6f20693708ecc6b51e3a46522f34df38c926c SHA512 c1982106b46ac2e3bd1b2f68ba13c88d72423a129208c2c5b361551728c6b70477dff5bbee5c763517778193a2a1db48c3823512c5a669eeed7740733e1eb870
 EBUILD kdnssd-5.92.0.ebuild 683 BLAKE2B 43d46a3300a7b366b322bf16070abd9349055f03f1d8db04da1248c702a7e37234bf3117cac42636f218160ff329e3f8d9d408b1b2b516285132e4f243f7d1cc SHA512 42744ed5479668a1197ba834dee49c37751adde9398cd7330c52e42c93a7568f33b4c0b56920810271a5ce5c30fb317f678a93635f3e2b7a16889e1f62591e0b
-EBUILD kdnssd-5.94.0.ebuild 686 BLAKE2B b9a4098e67463cecf87fbbcc272df1f3908b237161b13fe1bf5e53341bd800f59e0b54efde6b7df7a4bc7fe90b5df19d828f61058b4dc7fb839dedbe0cf6899b SHA512 93059cf6a0620100482ff3ca53a3e4d8cf773beb6b3afdc5a3fade31c01d98246f62742e08428ca206d9cda8836f6b58daecf2568483a4f7671789c0347516b9
 EBUILD kdnssd-5.95.0.ebuild 686 BLAKE2B b9a4098e67463cecf87fbbcc272df1f3908b237161b13fe1bf5e53341bd800f59e0b54efde6b7df7a4bc7fe90b5df19d828f61058b4dc7fb839dedbe0cf6899b SHA512 93059cf6a0620100482ff3ca53a3e4d8cf773beb6b3afdc5a3fade31c01d98246f62742e08428ca206d9cda8836f6b58daecf2568483a4f7671789c0347516b9
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kdnssd/kdnssd-5.94.0.ebuild b/kde-frameworks/kdnssd/kdnssd-5.94.0.ebuild
deleted file mode 100644
index 9cd1ca83e310..000000000000
--- a/kde-frameworks/kdnssd/kdnssd-5.94.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QTMIN=5.15.3
-inherit ecm kde.org
-
-DESCRIPTION="Framework for network service discovery using Zeroconf"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="nls zeroconf"
-
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	zeroconf? (
-		>=dev-qt/qtdbus-${QTMIN}:5
-		net-dns/avahi[mdnsresponder-compat]
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package zeroconf Avahi)
-	)
-	use zeroconf || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_DNSSD=ON )
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kdoctools/Manifest b/kde-frameworks/kdoctools/Manifest
index 626a2b96ccef..6464ee147590 100644
--- a/kde-frameworks/kdoctools/Manifest
+++ b/kde-frameworks/kdoctools/Manifest
@@ -1,8 +1,6 @@
 AUX kdoctools-5.54.0-gentoo-docbundledir.patch 1055 BLAKE2B 0b57d4d23fdac39a939d1355ddecb5d0ba53c1a2b2ef43fb1127834b1004b4fd63a8e32a160794a51879a103c658068a67663fe8f9e1cb99ede5154cbccf2c1d SHA512 18dcd82bfccec19eccb5993cfabf4ead9222dbf29cad3a9df4b1c225a2693ea0b882dac78f969da7bf98aa4bdf5b09ee28cef6ff28935502439ca20fad427bdb
 DIST kdoctools-5.92.0.tar.xz 440352 BLAKE2B 95a4202c31d7880ae7c6ee35877e4b156edbcc89f25ea3bc9f756359d710c296831b19943ec0704c2bc15c8d17b5aa93a01a1751719485bf4a7fe794eea77e4d SHA512 bf87ca5cf7709d634dba631564f45dc5b1bfc6d1ba688ef6534045f5946a9b5cfd3746c5f599b34b25b2b3c174e7a78cf598036e80959b3c7d47e2f08fdbdf99
-DIST kdoctools-5.94.0.tar.xz 440500 BLAKE2B 3a1fcfd7324aee5dab0c140178f58bf485a5f0bfa1a7da48020edf7410f98e7c4a4b7255b78af53d228de6c0ca2123f369bd43e142d2f22d19be38074b9b9d06 SHA512 754b1598f4db9112430de9cc559f522c66e33b773d425e3b24763ffe330a3c3f8d3a5a6eeb6d865d770c0ed85f2bb89b72a75b7053ca96bf0f730635c8524038
 DIST kdoctools-5.95.0.tar.xz 440864 BLAKE2B 0adeddc11124dd720aaad52cef887b3a54c2125fee039040f9b39cd9e84695f287836a98a8e73c932caf47b672985a75ed23c6aa867b4a082082e4f61c5681bb SHA512 74dc15087c173be6f0c98482dcc2fce456263845ea5c2293703278630459f59ab4b1a3bcdcddcf2cf37629a149363da66ef2048fd628421c83604eeaec213fa8
 EBUILD kdoctools-5.92.0.ebuild 876 BLAKE2B 35daa5b95f2564391673dfa8214fee1ed585d7c0875fd5fc4cbb9dbe6a0ba58ade22527c083ab2371046b567bc2be51ad493b8d2dbe469e38880ac85acaeb588 SHA512 7636b1b0fe7c51ac31368719b4a2d037f4719194ed5c88cbebf7b87e77e92ebe563c249ed96f4391e3be9e44b1f5d60e8b8703e65825ffb1351db238cda0318c
-EBUILD kdoctools-5.94.0.ebuild 879 BLAKE2B 7abb4c5b8274ff56b9809ce268efcfc00a784c78e65ae3c778f69425464b4c68ab2bf5b2c785be9b2289436075effbdb9016497e278eac3dfbf01330901d132d SHA512 075cbcb7af69a6dd9ef5e22c36ee2c677e1413db3dcb605be842b087dca7360f105236e77da597f51cda8443b6205c4182f3fe7b68256cf961a2d9e54b7c2084
 EBUILD kdoctools-5.95.0.ebuild 879 BLAKE2B 7abb4c5b8274ff56b9809ce268efcfc00a784c78e65ae3c778f69425464b4c68ab2bf5b2c785be9b2289436075effbdb9016497e278eac3dfbf01330901d132d SHA512 075cbcb7af69a6dd9ef5e22c36ee2c677e1413db3dcb605be842b087dca7360f105236e77da597f51cda8443b6205c4182f3fe7b68256cf961a2d9e54b7c2084
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kdoctools/kdoctools-5.94.0.ebuild b/kde-frameworks/kdoctools/kdoctools-5.94.0.ebuild
deleted file mode 100644
index 24615f4122fb..000000000000
--- a/kde-frameworks/kdoctools/kdoctools-5.94.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="false"
-PVCUT=$(ver_cut 1-2)
-inherit ecm kde.org
-
-DESCRIPTION="Tools to generate documentation in various formats from DocBook files"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="nls"
-
-BDEPEND="
-	dev-lang/perl
-	dev-perl/URI
-	nls? ( >=kde-frameworks/ki18n-${PVCUT}:5 )
-"
-DEPEND="
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	app-text/sgml-common
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	=kde-frameworks/karchive-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-5.54.0-gentoo-docbundledir.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package nls KF5I18n)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# bug 665622
-	local myctestargs=(
-		-E "(kdoctools_install)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-frameworks/kemoticons/Manifest b/kde-frameworks/kemoticons/Manifest
index df1dd43a8367..911e6eb98962 100644
--- a/kde-frameworks/kemoticons/Manifest
+++ b/kde-frameworks/kemoticons/Manifest
@@ -1,7 +1,5 @@
 DIST kemoticons-5.92.0.tar.xz 1700664 BLAKE2B 5ea44283217649b47326e03c7d64e1dcc5d1d409acfd54b64a8550662e88b25b082e97daffb8b4cea11982b35b0bf9dd1fbd762876d5f35ca29877206aa09f1e SHA512 4f04a0df71d16436db7b2c7007c183ba67f29151e9782a395bb674e6ffafe99adf255f32208304052d057c6519d3c35266e85665c7c91c061ae7ab3823fc9037
-DIST kemoticons-5.94.0.tar.xz 1700696 BLAKE2B dd193e5e7286b5e76ef147fce32a815c53ba05aea1520127fbaf1754d9d309e361978eeb6e939abdde9d87d398c9bc01ff182bc46ad726ca8b653465033168c6 SHA512 1b8d34fb58ef6b8ba83cc13eac719143606d1011b39551513773e78f660a3c7c4f3ed3402cb68bac9c216275cba7c1fdf6fdf2d905d377f9bf79a1eeac850b46
 DIST kemoticons-5.95.0.tar.xz 1700684 BLAKE2B 5ddde2e5dd164706d5476fd0be9a6b9d165a16407ef971b5546d49f30511fed0027adf93ef43ee1c10eecf3c780b4b1d7aa14eae1fbd88d1b9c4f6256665282c SHA512 e8e17cccc858217caf02141208dbca31b85ebfd463590c5a00612b7e508524491d9c8f5282f4383a6a9b7551f6c77f7c3d97a3d94a718792966e3f9d01fbcfdc
 EBUILD kemoticons-5.92.0.ebuild 670 BLAKE2B d2c21386346a023a9519047266a8f209b768161ba75fc09f657feee721911e95667c5cecf52690dc95be0ba2d427694161ffd8a0df480c05f31fb177030cae44 SHA512 0d0da804ac5cd90508cbf6d814ac15933750a103494f4c9673a2b815603a811e734f2d079ca4f46e53f9d8effe1be82da133ea37d33a7d32b8553db2a0c40afe
-EBUILD kemoticons-5.94.0.ebuild 673 BLAKE2B aca3c7c351575a679c41d4a3eb45a5ffc7286a6339ffa5362dc22dc8cf74069c468e27758ab58add7dff847225e6b352a4d80abe8ad988f3cfb41d0afd89bd2a SHA512 4800447949ea1afcd068559cf45c4b52a5589a31d196efa036262890556e7e8eef62f7d92798668b75a6da64a4d635edc94e675b45c4b41aaca344ec3810c79c
 EBUILD kemoticons-5.95.0.ebuild 673 BLAKE2B aca3c7c351575a679c41d4a3eb45a5ffc7286a6339ffa5362dc22dc8cf74069c468e27758ab58add7dff847225e6b352a4d80abe8ad988f3cfb41d0afd89bd2a SHA512 4800447949ea1afcd068559cf45c4b52a5589a31d196efa036262890556e7e8eef62f7d92798668b75a6da64a4d635edc94e675b45c4b41aaca344ec3810c79c
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kemoticons/kemoticons-5.94.0.ebuild b/kde-frameworks/kemoticons/kemoticons-5.94.0.ebuild
deleted file mode 100644
index b6f91ed363a7..000000000000
--- a/kde-frameworks/kemoticons/kemoticons-5.94.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for converting text emoticons to graphical representations"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-# requires running kde environment
-RESTRICT="test"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	=kde-frameworks/karchive-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kfilemetadata/Manifest b/kde-frameworks/kfilemetadata/Manifest
index 1515f027c3b9..554ee2d70c73 100644
--- a/kde-frameworks/kfilemetadata/Manifest
+++ b/kde-frameworks/kfilemetadata/Manifest
@@ -1,7 +1,5 @@
 DIST kfilemetadata-5.92.0.tar.xz 430260 BLAKE2B d18d8a537cea3ccddb93a04f09cb63f6bd603a446d0e79c397b1dd34f6cb33661b89a62e9687579eab28567bdf92c0ef3baf252a16a0df350c01d0869895c6e4 SHA512 62eea78ae945344badd780223a929829dde759bcf515191f7cc0ab9c0cffc6510f599cf9b7a73cce3fcbeb0bb6476df9b97fdfc1744f27439d7f743b7879e12e
-DIST kfilemetadata-5.94.0.tar.xz 435792 BLAKE2B 331518d9e6162ceee20a3218ba13875f5450eb1c29596a380b71f9feac4b999a951edbdad69bbb7697916a32bcd152ffae4140d3e4fe12ef8aa8cf09ea04b1bd SHA512 76b357c47791d352dfc34036041df6be204031260d95597967410836887f0a2e80dd1aab250e092848ceda674ab164e8e98aa811593e971a27a7aace8d2be28f
 DIST kfilemetadata-5.95.0.tar.xz 435840 BLAKE2B 181d37cb2625b73b91f4ec3cd61c6fdb24e0fc02de651e0a6609e513a2862ed72cc8756078619aa4a542af38e9e9f6e1fab8231ac9ecbbbc5f424f12a909282b SHA512 ceedf522546f9dca4de8e772a0ded8a11eeae2771a72690634fd36a3c68288af461fcf1ab901c3d54c2363f9d6b364e8139a71f030634aff3ae17794195f6e0c
 EBUILD kfilemetadata-5.92.0.ebuild 1657 BLAKE2B d6a4f9185f7baf5dc20c28a8aa69af76d6820ab8adc8f8d6a4e8461a82a06ec4660c512863d10521e08e4d0275240cf42c1c30d1de78651ccc0b7a0d40d0e36c SHA512 147686d03bd2e5d1a0c86499ae8dbaba6e1aeab3476cebffe76071129744d1980702f2414b886972092a55be768f0262f1f0d09fc0a58aa97382b630091fdaed
-EBUILD kfilemetadata-5.94.0.ebuild 1660 BLAKE2B dd59b3ca406eb26dbcae763438fbef2ab72916935d39842cc3aecdf812eb9f9bc13f21f9ee49ec02a4135d0546d6c98f1ed9322c164f1cf5d866131905d84056 SHA512 217bea0a4c12d86b2e0e73607a43833fa2795889879c57ad9dd804575df9d70da09cdd3d1dd09ee12d6aeda2211fc31598554e0bc3fa1aa5cc33b5366cffbbd7
 EBUILD kfilemetadata-5.95.0.ebuild 1660 BLAKE2B dd59b3ca406eb26dbcae763438fbef2ab72916935d39842cc3aecdf812eb9f9bc13f21f9ee49ec02a4135d0546d6c98f1ed9322c164f1cf5d866131905d84056 SHA512 217bea0a4c12d86b2e0e73607a43833fa2795889879c57ad9dd804575df9d70da09cdd3d1dd09ee12d6aeda2211fc31598554e0bc3fa1aa5cc33b5366cffbbd7
 MISC metadata.xml 724 BLAKE2B 26662ad6f30efc50657e17c79e056226389f31df126011c446dd5bc8a38449d5eb1ca4cede8ce97d4a5420b65ba0234e9d3428d34273ef9f58eda73960307a2c SHA512 5df051944e48dcd008517ad078ba39593de7ae1188eb9b1bccd429728d87240dc5b9c341b4ce706f5774f414c0c0fdd00a550a95475f427c6e1b28dde4d509ff
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.94.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.94.0.ebuild
deleted file mode 100644
index fc3f2da9df8a..000000000000
--- a/kde-frameworks/kfilemetadata/kfilemetadata-5.94.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.3
-inherit ecm kde.org optfeature python-any-r1
-
-DESCRIPTION="Library for extracting file metadata"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="epub exif ffmpeg mobi office pdf taglib"
-
-RESTRICT="test"
-
-BDEPEND="
-	test? ( ${PYTHON_DEPS} )
-"
-RDEPEND="
-	>=dev-qt/qtxml-${QTMIN}:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	epub? ( app-text/ebook-tools )
-	exif? ( media-gfx/exiv2:= )
-	ffmpeg? ( media-video/ffmpeg:0= )
-	mobi? ( kde-apps/kdegraphics-mobipocket:5 )
-	office? ( =kde-frameworks/karchive-${PVCUT}*:5 )
-	pdf? ( app-text/poppler[qt5] )
-	taglib? ( media-libs/taglib )
-"
-DEPEND="${RDEPEND}
-	kernel_linux? ( sys-apps/attr )
-"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package epub EPub)
-		$(cmake_use_find_package exif LibExiv2)
-		$(cmake_use_find_package ffmpeg FFmpeg)
-		$(cmake_use_find_package mobi QMobipocket)
-		$(cmake_use_find_package office KF5Archive)
-		$(cmake_use_find_package pdf Poppler)
-		$(cmake_use_find_package taglib Taglib)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# FIXME: bug 644650, fails on tmpfs (but not for everyone)
-	local myctestargs=( -E "(usermetadatawritertest)" )
-	ecm_src_test
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "Microsoft Word/Powerpoint file indexing" app-text/catdoc
-		optfeature "Microsoft Excel file indexing" dev-libs/libxls
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-frameworks/kglobalaccel/Manifest b/kde-frameworks/kglobalaccel/Manifest
index bc6554a93f19..795a3e2f9cce 100644
--- a/kde-frameworks/kglobalaccel/Manifest
+++ b/kde-frameworks/kglobalaccel/Manifest
@@ -1,7 +1,5 @@
 DIST kglobalaccel-5.92.0.tar.xz 93704 BLAKE2B a7b38b1c7b6bd0a7d20de7dd1893ae42d70888262fff6e196b8c64b5dd16d0c1ec5f8aaa44e1a0cbd39cc675df957e3e86c509ea7418105ef4df1071502d3c41 SHA512 b839dff3fcf191b2bdd99d6ba2e66169e86e73bef06bfaf990a30ad2d4a89d9150c798297f9cd98407a4ff390252b5d15fed8e51fc76a01199498099aa45f9cc
-DIST kglobalaccel-5.94.0.tar.xz 95840 BLAKE2B 2be9ab5c74e0ad9510edbc7c749f44bd8d80e78246d3681e8ba172ff7ce94738179309e64903a829eac1c76d26def265f22c017a09f73a72b2d01892e108ca1b SHA512 9e0b81716acaf27a5a6f6f64e7bafca96a3820eaec5627193f45cd95122f46b3a02d2bd18791c23bf74b3c84eba7eef9b331bd2ae093f7590e56c65bee66f78f
 DIST kglobalaccel-5.95.0.tar.xz 96196 BLAKE2B 7cf871861f243908f58bf0692305cc4a29e18e40a70547175d8a6c725f5c5843fe7bfbea05d308ae75e4e8e0ea2791f8cf77e23ddd72e3eb2e4bbd1bf9c4666a SHA512 defb559a87eb32afdec48f22ad0b28a5b8bfcc8cbdffb9babe9e00e5ebf4a530841261632b37d0e6df04c46c102a1a16e4301d5ef6b2c59d0978e2f6b5857b10
 EBUILD kglobalaccel-5.92.0.ebuild 886 BLAKE2B eab826dd3ab025d67739d127a98a77b2a5e0808ab15c1d6a80bf42505fbb567ac9f4b71d20c8fdf5b9bfa6a4c9980a4ed629752245f5a1f21017b9662c46a61c SHA512 e2a107a207a8223845884cc9166cd65da0b6a667ec8fc6054cc32173d2bedae3651bb90e8a3ad156d3c86c995dcacae3031725d16ae7b6ee78e3340aeddead53
-EBUILD kglobalaccel-5.94.0.ebuild 1021 BLAKE2B c9377445f42a861a483e6b2fab1fded2df9b871783daadede3e59fc4368e1c0fb307730c7e2d5cee55d4d600cd41e7fac845ad588cd5d6a9465c606c1f130eb1 SHA512 4eb1de275995af3809c6b98968dc290ff10d84c4b0741cc41e58eeeb7736d85e213b973d833bd237d39125248cae9cf0f32a3266537596d8c1258a783d8b3ecf
 EBUILD kglobalaccel-5.95.0.ebuild 1021 BLAKE2B c9377445f42a861a483e6b2fab1fded2df9b871783daadede3e59fc4368e1c0fb307730c7e2d5cee55d4d600cd41e7fac845ad588cd5d6a9465c606c1f130eb1 SHA512 4eb1de275995af3809c6b98968dc290ff10d84c4b0741cc41e58eeeb7736d85e213b973d833bd237d39125248cae9cf0f32a3266537596d8c1258a783d8b3ecf
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.94.0.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.94.0.ebuild
deleted file mode 100644
index c909200d6fdc..000000000000
--- a/kde-frameworks/kglobalaccel/kglobalaccel-5.94.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=8
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework to handle global shortcuts"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="nls"
-
-# requires installed instance
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kcrash-${PVCUT}*:5
-	=kde-frameworks/kdbusaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5[X]
-	x11-libs/libxcb
-	x11-libs/xcb-util-keysyms
-"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-qt/qtdeclarative-${QTMIN}:5
-		>=dev-qt/qtquickcontrols2-${QTMIN}:5
-		=kde-frameworks/kdeclarative-${PVCUT}*:5
-	)
-"
-BDEPEND="nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )"
-
-src_test() {
-	XDG_CURRENT_DESKTOP="KDE" ecm_src_test # bug 789342
-}
diff --git a/kde-frameworks/kguiaddons/Manifest b/kde-frameworks/kguiaddons/Manifest
index e5206998b80e..ef3879055b74 100644
--- a/kde-frameworks/kguiaddons/Manifest
+++ b/kde-frameworks/kguiaddons/Manifest
@@ -1,7 +1,5 @@
 DIST kguiaddons-5.92.0.tar.xz 72424 BLAKE2B cbeedd3a0668edca5cbf712dcfa1264a6449b80ade73555fde11b4410f0c9ce403ca6a884429cab8e87ac4b933b2f03fb24a7f5138c23cb1d6cdedb98e076af6 SHA512 8a5e7db33938a43151b3c1e2bdd3f4b273abfc8f35ab24bc9f8ef99e541ffd92350e4f6d4be5c5123e98b1db73ef00b687c7bac9ed950dfeb041c0ecab074acf
-DIST kguiaddons-5.94.0.tar.xz 73120 BLAKE2B f0dcd7e0da3722c68fc3446809206b0103d9bf66e92aab7c36cb20a144661470d16808e877cc673d05d41ceb855f787afc854eb38be333b9464265d630eb3ae9 SHA512 b8fe5c809035f194c2118ed9a4cd4bae29c610447b67c9cca5b02365fe4111b35252ea6c898d9df717ca9867ccd96faf2845404b0158acee7854c8407218f7e5
 DIST kguiaddons-5.95.0.tar.xz 73412 BLAKE2B 36a380218471d4441ef48489d0b77a21f64df8720f23fca37addffa5f6e682a603747a51801f73f4d94c012cfa76b17b470e66c92456179a08c84247ca212c98 SHA512 e542611c1d5b329be9f4b4e436bb5c7d6c5a79042375a05816e07f03f658e0ed8b026048293c6b6251cd6cf48e1ed82ba280457b88e491efb0fe975c47cceb5f
 EBUILD kguiaddons-5.92.0.ebuild 854 BLAKE2B bfcdffd2f12257541aacd5fd88de7515a91dd0c90b151f982d6b623cd90fa3722651c0e8279b6665df9f635e3c4803d28da43009bd9196cfc743090c9b4075c6 SHA512 cc1cffc2105c6c4c46a1f5e6a7506ab1d7ffb1e0ad4ac83545b825f85d56de4a792fd0e8480fd0f856c4bdf7fb4cb3e54ba9261fa414251dde0d68ecf19384c7
-EBUILD kguiaddons-5.94.0.ebuild 913 BLAKE2B 750eff20413abc3045178ce0a810be00b88b685788f7b97fbfef5e76f210f19d0e97225be2e185c83c5f80395069e22a02da5e3ce676dd4af2c1b415fd2fccd7 SHA512 30b5d46975da3c1f8b3654b50059ad85a571207d93ef4b090dceff4a619be6d4b261559b0d92c2c051552c63cae01c6143763b334e4abb5a9a2a66c556093996
 EBUILD kguiaddons-5.95.0.ebuild 913 BLAKE2B 750eff20413abc3045178ce0a810be00b88b685788f7b97fbfef5e76f210f19d0e97225be2e185c83c5f80395069e22a02da5e3ce676dd4af2c1b415fd2fccd7 SHA512 30b5d46975da3c1f8b3654b50059ad85a571207d93ef4b090dceff4a619be6d4b261559b0d92c2c051552c63cae01c6143763b334e4abb5a9a2a66c556093996
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kguiaddons/kguiaddons-5.94.0.ebuild b/kde-frameworks/kguiaddons/kguiaddons-5.94.0.ebuild
deleted file mode 100644
index c091872463af..000000000000
--- a/kde-frameworks/kguiaddons/kguiaddons-5.94.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_NONGUI="false"
-QTMIN=5.15.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing assorted high-level user interface components"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="wayland X"
-
-# slot op: includes qpa/qplatformnativeinterface.h
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	wayland? (
-		dev-libs/wayland
-		>=dev-qt/qtgui-${QTMIN}:5=[wayland]
-		>=dev-qt/qtwayland-${QTMIN}:5
-	)
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	wayland? ( >=dev-libs/plasma-wayland-protocols-1.7.0 )
-	X? ( x11-libs/libxcb )
-"
-BDEPEND="wayland? ( >=dev-qt/qtwaylandscanner-${QTMIN}:5 )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_WAYLAND=$(usex wayland)
-		-DWITH_X11=$(usex X)
-	)
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kholidays/Manifest b/kde-frameworks/kholidays/Manifest
index cc3b24ae0359..86214aad3159 100644
--- a/kde-frameworks/kholidays/Manifest
+++ b/kde-frameworks/kholidays/Manifest
@@ -1,7 +1,5 @@
 DIST kholidays-5.92.0.tar.xz 235388 BLAKE2B 3ce0840c458522a8d4d407d620ef7f69fea8f0da5f42d33ec896147e436355aeeabc028b823a2e23a339ac31eeece61e381ca8eaa59e9fff5fb2801344766ff3 SHA512 1ec4c5bc513685e7f8834621ce464a003876b4c26ee4ff84db5f13e1cb253fb7e1c04fc7ed1b9ad92dc7990498e8d5d10fe4b3799f33762eabe155296093a3f7
-DIST kholidays-5.94.0.tar.xz 238860 BLAKE2B 5fa67d8104a3fc6a7039101baee63107e3f33dff3d25e1d31c4bce893dbc5156253421280bdf7c170caad395d47380923a73d8f05d6ec81fd91508548823ec0a SHA512 7c362a8ba852258c95c6eceb9f7dbd82fd3bdfdeab5c844c5efd772244c823f772616e68e67f40f3c641278eec65126b9ee599942b8393103600b24d97e9e77e
 DIST kholidays-5.95.0.tar.xz 239132 BLAKE2B ded0f9ba4c1d7b86b5f1bebc9519c691a71922c4fd0d146ab4237a0099921fadc56d8e339861f2ea2dccf9f2062c4c0bc35d42a077b69f3a39a3eeba7805ee29 SHA512 a1c4d08e7c4af94b45fa89865dba11aa4ef8c2be610eef93d1f97951670771c77ea88e236b7c891d3a7b7c5531b73277bce24ccf0c5900f5a18962fc9f2cc653
 EBUILD kholidays-5.92.0.ebuild 656 BLAKE2B 4f29338c5b9ab7d8df9078dd52d997c01f99286a7615f97b63ba8ec312fbad406245db32d8f0f65b87b787cfbacb83dc374fabf31331b06c50a81f71565c57a1 SHA512 a1a8778a75050d53c6ed2476771c4c2504c81b8efc9c9e0359d6d8799b802ad41fa5845ee1ff2179cc7a8819d04a02e8f94e06e2c1bb66fe0c5a5172f47c92fd
-EBUILD kholidays-5.94.0.ebuild 659 BLAKE2B c1dbd43eb5d3a9037b081744183c32a645d1b827b6a220413eb835112e28118719cd1f55f94baffc83bfa1f52cf1bdfc8da1bfd88edd2e34ea0f473fa94fa8c4 SHA512 4ea3d95e7d216f1383f8a2b530207f262938df97ff59a1a209adca1e6b1bc54e015a9cfee8843d5bdc2ae0f918b97b22276eabe6a04a3fbecad832e579be4ee8
 EBUILD kholidays-5.95.0.ebuild 659 BLAKE2B c1dbd43eb5d3a9037b081744183c32a645d1b827b6a220413eb835112e28118719cd1f55f94baffc83bfa1f52cf1bdfc8da1bfd88edd2e34ea0f473fa94fa8c4 SHA512 4ea3d95e7d216f1383f8a2b530207f262938df97ff59a1a209adca1e6b1bc54e015a9cfee8843d5bdc2ae0f918b97b22276eabe6a04a3fbecad832e579be4ee8
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kholidays/kholidays-5.94.0.ebuild b/kde-frameworks/kholidays/kholidays-5.94.0.ebuild
deleted file mode 100644
index 40ec321b429c..000000000000
--- a/kde-frameworks/kholidays/kholidays-5.94.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="false"
-ECM_TEST="true"
-QTMIN=5.15.3
-inherit ecm kde.org
-
-DESCRIPTION="Library to determine holidays and other special events for a geographical region"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="nls"
-
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_test() {
-	# bug 624214
-	mkdir -p "${HOME}/.local/share/kf5/libkholidays" || die
-	cp -r "${S}/holidays/plan2" "${HOME}/.local/share/kf5/libkholidays/" || die
-	ecm_src_test
-}
diff --git a/kde-frameworks/khtml/Manifest b/kde-frameworks/khtml/Manifest
index 062d49e25d29..26d4fa1e8746 100644
--- a/kde-frameworks/khtml/Manifest
+++ b/kde-frameworks/khtml/Manifest
@@ -1,7 +1,5 @@
 DIST khtml-5.92.0.tar.xz 2093568 BLAKE2B 1c94b1ee041fe69d173798ade211feada3c9f123fd9a6f6775cf3453ab677f8001053f7785dd492acb81c6908286bebb592eded670771c2dab42a8a9aa58c300 SHA512 270d3ba357ed5c031b41564a56e0d91df87702cd05ea810434a8e2cafd87fbdc0be8984ed535745edf592c318107464f0aaada0c2ef42fbde7a6f87228edfcef
-DIST khtml-5.94.0.tar.xz 2094048 BLAKE2B 71bd3e0320fd0a6ea20f1ec27ece7ec7fb6e63e40bfdfe213c79b241285e57985e7ab00ead9571f2341ffdc56344b73e0f350fd362d6ea3c60fe26bf71f0d954 SHA512 46ba7aa0f29868773db54e632aeeefdd6a92f9b6ac55f9bebb5d903f04f7a41fe9afae52fe43cd23c9f512382042e8c709f5b7897d8ed98e73e710188d1be568
 DIST khtml-5.95.0.tar.xz 1965944 BLAKE2B cdc3e4cf44ab3bd8dc7de581c6b73c9bb7d5711eaed4ff5804eaeb236e17eaf59ae4a3e5fd1e3816ba101817f049ecdf9117f9db032c1f26baf20042c535e314 SHA512 749a9caee2d848100715f643c18e34e13bd544be71e7816bf769876232f1693c424cce0743ecbdc0218551207c9616df648d8ba9bb3524a56fa757928b0bb3a9
 EBUILD khtml-5.92.0.ebuild 1760 BLAKE2B 47b708acdf2d2ff1741766b9722ca919e07d7ef599249338a3746d2f7e540a63dd986b5b2659373e17b9cc7fd92fa2ad96f73b7797e60f5cad048642be1a8b08 SHA512 4cb28a80ebe665343d3d3eec94b22fecc90bcc8242b74e12b871ba91c1d4bc2fef8924fc900fa53d8137825ba275e55cf5a2d59f20ff8ff8252ce1e0d4059244
-EBUILD khtml-5.94.0.ebuild 1775 BLAKE2B 0fbedcf15ec9f79361a2244bd36dd6a420d5f49880195f2e2ad836f645e1c12857e763b6b50e9c1c197674c9f2d14c7f0e2a651ecda830785441d17df79fc454 SHA512 f7c84e645a01aa51c56cb46c731b8d1c44ade4e8db05d413c92c1fda33675a494f41e266e12b7a07eef9e2004acaa01f202c28d7cc4c2d24ec7ea7781b64ddda
 EBUILD khtml-5.95.0.ebuild 1775 BLAKE2B 0fbedcf15ec9f79361a2244bd36dd6a420d5f49880195f2e2ad836f645e1c12857e763b6b50e9c1c197674c9f2d14c7f0e2a651ecda830785441d17df79fc454 SHA512 f7c84e645a01aa51c56cb46c731b8d1c44ade4e8db05d413c92c1fda33675a494f41e266e12b7a07eef9e2004acaa01f202c28d7cc4c2d24ec7ea7781b64ddda
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/khtml/khtml-5.94.0.ebuild b/kde-frameworks/khtml/khtml-5.94.0.ebuild
deleted file mode 100644
index 7fbeec406be4..000000000000
--- a/kde-frameworks/khtml/khtml-5.94.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KHTML web rendering engine"
-LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="X"
-
-RDEPEND="
-	dev-libs/openssl:0
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	=kde-frameworks/karchive-${PVCUT}*:5
-	=kde-frameworks/kcodecs-${PVCUT}*:5
-	=kde-frameworks/kcompletion-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kglobalaccel-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kjobwidgets-${PVCUT}*:5
-	=kde-frameworks/kjs-${PVCUT}*:5
-	=kde-frameworks/knotifications-${PVCUT}*:5
-	=kde-frameworks/kparts-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/ktextwidgets-${PVCUT}*:5
-	=kde-frameworks/kwallet-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-	=kde-frameworks/sonnet-${PVCUT}*:5
-	media-libs/giflib:=
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:0=
-	>=media-libs/phonon-4.11.0
-	sys-libs/zlib
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
-	X? ( x11-base/xorg-proto )
-"
-BDEPEND="
-	dev-lang/perl
-	dev-util/gperf
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/ki18n/Manifest b/kde-frameworks/ki18n/Manifest
index 181149f6f4b2..1be936159fe4 100644
--- a/kde-frameworks/ki18n/Manifest
+++ b/kde-frameworks/ki18n/Manifest
@@ -1,8 +1,6 @@
 AUX ki18n-5.57.0-python.patch 512 BLAKE2B 9feb6bd88fbf7ed853be777320d5d4821320da91308866d1afa08f3e7ee1631f3f59e2b096c8aa6f2b2562ead934ab11a03633fa3b09cdccd1e292adee7adfaa SHA512 51462a06c232b9ee1eb1f0e290ba286f7f7702676e5b8c86626dfcaa0ed11b3d15744573643960ead459f9366e21d859e54e344abf7108f084e84dcf0765b596
 DIST ki18n-5.92.0.tar.xz 956048 BLAKE2B 451f091aa44c6845a7aae509c8e13ca3c707ad1858330ad97edbe94ded6646a02dcaa6d2d852686633f62539c332dab6189502ebedfd40b8374144c43930c946 SHA512 0eba368abe4ff385594e22e808d30b5d4a9af95e8bb2a3f4379518b374aab8ddabef18ebdfc2afd121ebb5f8865a427a49c8abf9c59b126cecf78a48640439e7
-DIST ki18n-5.94.0.tar.xz 955304 BLAKE2B 75c5cb3e26648cc20ff9bcf957103c787f19b02a6e5c3e8a804a211a2c184fb59d38d3920d316009321695a607e8c3e8366b7b70d4c35191fae8b0dbc0166515 SHA512 ff00a56f1d6e5a425d025320be6f6e1559e329f56e68975df9d7c1ecdc0108f2118af37373db583d7760f34877bd0f18bef47080a70dfca628d958f35e8f9e15
 DIST ki18n-5.95.0.tar.xz 956820 BLAKE2B 6e9da54dfe18a14f6193cbd01d76bf0b0080a2afd83b55d3f15676a3e57ccddb2489ac299e4c7fcda0605de827a56ec9879935ad0159fa328ee7b02cd67cf08d SHA512 13cb83fb3d4171f3f51eefb65cad0b73380b2aa7936b0d7aea227a74f95c9e759efe3097ceadbe6f7a08ff8a9ae3bf8708ae3a57c4ef095f82b9e96740f37881
 EBUILD ki18n-5.92.0.ebuild 959 BLAKE2B 13c63da713b4a80dbda85181ed6612f1c85336f947e3ebb24a510ccf201318e5e62e49101815146c4f08a638293dba80458dcc6c55fe66d3ffc83244c8ea8208 SHA512 bba70fe0983397432e548ad023ce75299527abe0d26d38440a1ac437e290a93ba50149f4a7e4fc7a95cffcbff3658b2308276b634eb1235861d05624a9891694
-EBUILD ki18n-5.94.0.ebuild 962 BLAKE2B 358c059bed0d9c3d58d98ca71e1758fd88a2e6fa14cdae7551031978d76aba97a57f0dc85e2a5d39956eab048adff2ca59da49f7d661ae6ef76e8562ca3a7070 SHA512 1c52337e6150a3647c02bed0ee48623f1e9f33f2d8064899bc153810531703a7cc4a3be22b01014c17e18a16a3062ab577b45c0219d4532614c8b218f2664f2e
 EBUILD ki18n-5.95.0.ebuild 962 BLAKE2B 358c059bed0d9c3d58d98ca71e1758fd88a2e6fa14cdae7551031978d76aba97a57f0dc85e2a5d39956eab048adff2ca59da49f7d661ae6ef76e8562ca3a7070 SHA512 1c52337e6150a3647c02bed0ee48623f1e9f33f2d8064899bc153810531703a7cc4a3be22b01014c17e18a16a3062ab577b45c0219d4532614c8b218f2664f2e
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/ki18n/ki18n-5.94.0.ebuild b/kde-frameworks/ki18n/ki18n-5.94.0.ebuild
deleted file mode 100644
index da8b02fe7d75..000000000000
--- a/kde-frameworks/ki18n/ki18n-5.94.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-QTMIN=5.15.3
-inherit ecm kde.org python-single-r1
-
-DESCRIPTION="Framework based on Gettext for internationalizing user interface text"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	sys-devel/gettext
-	virtual/libintl
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	app-text/iso-codes
-"
-
-PATCHES=( "${FILESDIR}/${PN}-5.57.0-python.patch" )
-
-pkg_setup() {
-	ecm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-	)
-	ecm_src_configure
-}
-
-src_test() {
-	# requires LANG fr_CH. bug 823816
-	local myctestargs=( -E "(kcountrytest|kcountrysubdivisiontest)" )
-	ecm_src_test
-}
diff --git a/kde-frameworks/kiconthemes/Manifest b/kde-frameworks/kiconthemes/Manifest
index f2d5791792e5..565de2ecb80e 100644
--- a/kde-frameworks/kiconthemes/Manifest
+++ b/kde-frameworks/kiconthemes/Manifest
@@ -1,7 +1,5 @@
 DIST kiconthemes-5.92.0.tar.xz 226260 BLAKE2B d05388c112934827d5257ea03f20d6936194ea9b8a9d3390a6d34d001efb254e9bcd3a8a8dc3d91edec683f060d73d27c1a8ab21e966994bb939bb4e81d1266f SHA512 b05d414690c0d1c304145c57f8a594879580423efb121cd6597eae5afbcb28e1cfc87bf9e44ef8f9722554e6b8135d299ba90c49a4d50e2ecbe64440806bb199
-DIST kiconthemes-5.94.0.tar.xz 226420 BLAKE2B d7796a675074942ece8e47f6c6c38b22d795a87720fc508c5b80f46747773cfd876e999b64e66ac215b2ade04b7d67786a0eb9af91cb7cc9fe368eb9616de1d5 SHA512 3cd2c0302a94656322dff1e79083ee4f8fbf29d2acfbfaa4a22cdaec9a7df6fc997c8c00ee98dee2fac1a499795bdb0a4b178b8b9b97b5fe40509661d6e5acaf
 DIST kiconthemes-5.95.0.tar.xz 226748 BLAKE2B c54cd4f28f59dab81395e53cce2a2f3089d35087bc21fc12fbcaf20f4542153a3074678409e2474a094a30d1f39d404aff9e3b27d07da0e1ffc9709a4555d8a1 SHA512 e1814d57d8c8003b35b91b68aadaa8bbdf794543148201bb8a9b87e88a94df3acef587b69300d164a778c47951181d313f1068f36cfbd0ebaae1b16d6a4a54c7
 EBUILD kiconthemes-5.92.0.ebuild 804 BLAKE2B 4c88a8726459b935943c733977825f2b6e332115ed7245bffb2e3ded7b52f82457a435638715e484f8c24d79f225a80cb02ec653c02a2a11554e2ad85a224f87 SHA512 553dc2e8fddad18c42296ca1a1974f00e61de5b4797313e5fb6af8a1ded0c0f02230cd1f705a98d93e1175ab65c55c27b800d5134abba89aded73dd49af4d9ac
-EBUILD kiconthemes-5.94.0.ebuild 807 BLAKE2B e2c786bdbca87192b56feeaa822be6be3a94b42b00a551a61a833d6a4369507b2bb99ceb50037bf19ea5ee83ac11a986169e760afa753164ae9cec041e1d7d60 SHA512 483d62e7dcc2548ad97a1f4c6e88a8c0f2712dab5299537a831f2edc72fd86eed9133f660ce2e60b5542456b19e13862a4ab781b0eeb2259173e05a3fa281181
 EBUILD kiconthemes-5.95.0.ebuild 807 BLAKE2B e2c786bdbca87192b56feeaa822be6be3a94b42b00a551a61a833d6a4369507b2bb99ceb50037bf19ea5ee83ac11a986169e760afa753164ae9cec041e1d7d60 SHA512 483d62e7dcc2548ad97a1f4c6e88a8c0f2712dab5299537a831f2edc72fd86eed9133f660ce2e60b5542456b19e13862a4ab781b0eeb2259173e05a3fa281181
 MISC metadata.xml 547 BLAKE2B 127ee4110b748cd3e3c26b63248d35f78b233b00cf4466ccc0145a613062a5aa9cc2e9ebd91d0e7482c67f6e265938176b169a9c52eda30bfcddf02549ec8f06 SHA512 2d36585b1af6205dc1bfcff7c3cb24c85376716159317b5c105c866143d49e89e91e501c9a4cf2d63265c30a09e8df71bca841319bd3f2b551e79fde90b1d96e
diff --git a/kde-frameworks/kiconthemes/kiconthemes-5.94.0.ebuild b/kde-frameworks/kiconthemes/kiconthemes-5.94.0.ebuild
deleted file mode 100644
index 9b87db7e2a42..000000000000
--- a/kde-frameworks/kiconthemes/kiconthemes-5.94.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_DESIGNERPLUGIN="true"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for icon theming and configuration"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-RESTRICT="test" # bug 574770
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/karchive-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kitemviews-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kidletime/Manifest b/kde-frameworks/kidletime/Manifest
index 38c19eff64e0..bac8f289ea1d 100644
--- a/kde-frameworks/kidletime/Manifest
+++ b/kde-frameworks/kidletime/Manifest
@@ -1,8 +1,6 @@
 AUX kidletime-5.92.0-crashfix.patch 1315 BLAKE2B 1b931ea07a39978b3921356134af97fa864970e055bb32bc29257763d355b00de2062ae96e5e98512f3d068cd2e5d022096aae8afc77ab64f90cf8267c01c9e2 SHA512 7d46e337eeeb44a32cfae0a7b83cbfd5d31b79b6b3e6b1f0b99209ca5c082e81eace354875a9662c5eea674e98a2a47f5156d7f83f1649bafadd8173968b6e0f
 DIST kidletime-5.92.0.tar.xz 29072 BLAKE2B 7c1ab01005400b9034693c0099df980b20806a8ee5c225fcd9e3a761ea587cbfa98c52f9efdd5762ba93c9999deb5026ed189c3267369c8a04ec9a36fd20c763 SHA512 58d9c2ef675d0e3092cda43f14ea0cc51105412a0b19828659f0e4eb386870675bf9f8765327777aa7829ae29c878a63cfe7a00954c09315c0d4840eca8313ec
-DIST kidletime-5.94.0.tar.xz 29104 BLAKE2B 7af9960da627b9fcd8b7d963b58eae8df1aeebafd212bc221662c850023ad243f10ec4c30b63653787400e3899fa1266e3784fb87bd6931e4545f8a03b06665d SHA512 121d6684b699f1319979d4736e45d20a66f2e21211d66c35f9dfec32487cc1eb50d9704725ea7016023966375d45911f5417eecd3c9f3c970ee86e4ca5aa9ef1
 DIST kidletime-5.95.0.tar.xz 29088 BLAKE2B 9aa7289b1e39fbb3a2d4480c02e107148cd293f85e51556bdfa9d03aba8a31501da4a6ee2e516b8b82bd34ee559fd5d669fd6219a159f43baf34f1fc079c85ed SHA512 f7445c1d929b5e993731f64ad735aac22272b6cf4ffb6486879000392d8d00024d1c6c83937d1898a43d7f09bb4f547bf7e0332d2b3ea939e8978bdd9260778d
 EBUILD kidletime-5.92.0-r1.ebuild 926 BLAKE2B 24acd13051911ef419083221c5c8b3832f02a21acd32d630e2f0df6ff9893e2324206dac3bb4a00eea74fe8836b4f9434e84fdbac8510954ac98b3ee31b18304 SHA512 920d8210a3d22f339df54b8cbb9c0c912e5cd5957b318f206e4b726b77d255cbd401974b8f943409977a337b3ed5dcce92ef1f0f5a8ce6829d2194eacccb6f73
-EBUILD kidletime-5.94.0.ebuild 865 BLAKE2B ff45844c1790da6528c0d90b164790d58a46efa4c5376dc7b52fe1e7bb778d36f901ec88afeed31d44b1782a0cbbe4cb4e6f7fa84fe6da77c21fae078696adc9 SHA512 9c9aa2908b18313e6ed639c2a9e60be2d617b253cd78460c44d1de3f2ffcdca113a90efdc0af4804865c8ba0228e5079fcc7475ba236d45688d6d29163328bf5
 EBUILD kidletime-5.95.0.ebuild 865 BLAKE2B ff45844c1790da6528c0d90b164790d58a46efa4c5376dc7b52fe1e7bb778d36f901ec88afeed31d44b1782a0cbbe4cb4e6f7fa84fe6da77c21fae078696adc9 SHA512 9c9aa2908b18313e6ed639c2a9e60be2d617b253cd78460c44d1de3f2ffcdca113a90efdc0af4804865c8ba0228e5079fcc7475ba236d45688d6d29163328bf5
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kidletime/kidletime-5.94.0.ebuild b/kde-frameworks/kidletime/kidletime-5.94.0.ebuild
deleted file mode 100644
index bc446672bd4d..000000000000
--- a/kde-frameworks/kidletime/kidletime-5.94.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="false"
-QTMIN=5.15.3
-inherit ecm kde.org
-
-DESCRIPTION="Framework for detection and notification of device idle time"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="X xscreensaver"
-
-REQUIRED_USE="xscreensaver? ( X )"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-		x11-libs/libxcb
-		x11-libs/libXext
-	)
-	xscreensaver? (
-		>=dev-qt/qtdbus-${QTMIN}:5
-		x11-libs/libXScrnSaver
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	ecm_src_prepare
-	if ! use xscreensaver; then
-		sed -i -e "s/\${X11_Xscreensaver_FOUND}/0/" CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X X11)
-		$(cmake_use_find_package X XCB)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kimageformats/Manifest b/kde-frameworks/kimageformats/Manifest
index 3fd3c4d86d6b..63eb14c9f86f 100644
--- a/kde-frameworks/kimageformats/Manifest
+++ b/kde-frameworks/kimageformats/Manifest
@@ -1,7 +1,5 @@
 DIST kimageformats-5.92.0.tar.xz 1223892 BLAKE2B e7ac90e29715560237d0458946f1b135b84c9b8869ca3003e80b7655d7c5c9c872400e4e102015f054a26423babc7fa334b237012b88c4771f95bc7aeaa24f80 SHA512 e07521fa2b566df38baeaad2ab213c683c4fb36b5218dc63302d8e9b52ce7e0d4341b59339b3181d6b1157fda1060e645e0f043d2a187d0662f8f8a43a2e7447
-DIST kimageformats-5.94.0.tar.xz 2926996 BLAKE2B 20a1b5cc3717c00e810a3cdeee0fb40b35c338304a48d98a6e4b300d719896017a24a32ea196bb1d95f99edefe9954fef596da9e27b41169688416025bb05164 SHA512 864606a0cdf11edc19ff70835e7ce8556d91ee892137f48f3e568c42f1971e7161b83c89caa6a8a4719fe6796259061b4063dccea7c592eb906c51e2dec27bcf
 DIST kimageformats-5.95.0.tar.xz 2926576 BLAKE2B 4da4a8ce9348291445dc18ee01fe42d313aec1dab76b2126d749cfcda72e7b8710452d412f2faf45aa3fc9434d22f838fd442d4ae07c9115157d704252cad8fc SHA512 a1f119cf18998aa08c22de7880bc16a32539ccdb17f4a95b6363fa1c57c899982a0c399362e8ead5d33015b6e05604408eee73d1517d72d314563de3db23d76c
 EBUILD kimageformats-5.92.0-r2.ebuild 997 BLAKE2B 7a8100737ec39152b982747c0fd8af52a7e0661abee11ab7d206b6d4aa36bc178c6e70187844f6542a3f03ee48f868688e3dcf74b0d8cdf32688e8b83a98cbf6 SHA512 c62a13db352f70ce60a069bfe3e1e0df1fd4918d27a989ae6ff50000505dfe21ff19dc364f6c37f73a711b04e27c6f220e9acf8f4fb334d9c4f93b652069541c
-EBUILD kimageformats-5.94.0.ebuild 1000 BLAKE2B 314086a3829a66beab07804a259f54e23e0586b2d867b1bdcecb97db6be81c1dabca647b75d74f3f6e1e85dddbc739619c0d559cc1acaa94bf9899bad837e29a SHA512 df574afa7761a0a4b6a34ebad38995bc654107106e1a62fe12b0c96f80b1d928f03f357255a314dad4ff40715353137f329633cf7338b61741224fff67d2d69c
 EBUILD kimageformats-5.95.0.ebuild 1000 BLAKE2B 314086a3829a66beab07804a259f54e23e0586b2d867b1bdcecb97db6be81c1dabca647b75d74f3f6e1e85dddbc739619c0d559cc1acaa94bf9899bad837e29a SHA512 df574afa7761a0a4b6a34ebad38995bc654107106e1a62fe12b0c96f80b1d928f03f357255a314dad4ff40715353137f329633cf7338b61741224fff67d2d69c
 MISC metadata.xml 714 BLAKE2B 2b4fd4b370285820e2c7966aa910cf57ec94ae4c7daa7f44d9421554d57149d696e751db8020b128321494027d1e4142b42b1b9ce1538d3c8cf93a6e72c93892 SHA512 0a44aa8d3dd4cc2fe1d73938792daec37af80c72d70da0a3ec8a1d6f610a54f5fea85008dcb9187b0a77671467eef52547e8bdb61bcfcfb4742df61f9da921d3
diff --git a/kde-frameworks/kimageformats/kimageformats-5.94.0.ebuild b/kde-frameworks/kimageformats/kimageformats-5.94.0.ebuild
deleted file mode 100644
index 49ed65ace9b9..000000000000
--- a/kde-frameworks/kimageformats/kimageformats-5.94.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
-
-ECM_QTHELP="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing additional format plugins for Qt's image I/O system"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="avif eps heif jpegxl openexr"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	=kde-frameworks/karchive-${PVCUT}*:5
-	avif? ( >=media-libs/libavif-0.8.2:= )
-	eps? ( >=dev-qt/qtprintsupport-${QTMIN}:5 )
-	heif? ( >=media-libs/libheif-1.10.0:= )
-	jpegxl? ( media-libs/libjxl )
-	openexr? ( >=media-libs/openexr-3:= )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( src/imageformats/AUTHORS )
-
-src_configure() {
-	local mycmakeargs=(
-		-DKIMAGEFORMATS_JXL=$(usex jpegxl)
-		$(cmake_use_find_package avif libavif)
-		$(cmake_use_find_package eps Qt5PrintSupport)
-		-DKIMAGEFORMATS_HEIF=$(usex heif)
-		$(cmake_use_find_package openexr OpenEXR)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kinit/Manifest b/kde-frameworks/kinit/Manifest
index af32c81bde9a..a0136cafeff6 100644
--- a/kde-frameworks/kinit/Manifest
+++ b/kde-frameworks/kinit/Manifest
@@ -1,7 +1,5 @@
 DIST kinit-5.92.0.tar.xz 119244 BLAKE2B 0ed7937e1ce6b8a21e632708f5e3e02b3b1b6bf481d488902fe8033ed9d84c1a54a64243e59d77e4bd9ec4fffad6a549ca5b15aec71b1d70d3005f50984c7bb1 SHA512 3ab7e47e714c661bd375d36c5f64ec4fc2e445caa20d783e3affec314228096bde75ef8b9577590c72bfcbb2f6748525ad0593c2f4c3c1f0646173d58e225b37
-DIST kinit-5.94.0.tar.xz 119280 BLAKE2B 5c0311c33ed48e10f1ced3948412c499ab8dc0d634860ac33f385df23b59c5cde081117dfbe8f606e373f958098e1138a93ac72ba01c1d1f42b794074491fbc4 SHA512 82c4d6500ee7108348c91bdf5fcf34b1e5188ef26ec0a3063f761dfb196dbd01cc53223b5b7f0e7167587c56892f3cbfaa8aa63610404dfd771d4237cbe445e5
 DIST kinit-5.95.0.tar.xz 119288 BLAKE2B 7b0119a6ec59a8a6c51ee37a4169191164138899b02faf776fbfd98e94e5a981f7b2f89832fcfb3a8aed3d15b072775d45db3391e1e9922fd2d22db13578b31d SHA512 90296988ccc7e6d5c20eaeb60eea541068e50bc92caabdf0fdc3ca9bb947c20563e4b78a3897ad4da94d37cb6becf7606c332037fa99674f7896e7e4dcb4972f
 EBUILD kinit-5.92.0.ebuild 1141 BLAKE2B 7c60d4ebfd7848aae4df049d1ad05182f60a8b67a438ac815b04b1b39285b2a4cb08f5b6fa2d5a12c6fb00fa98fc9878b16cb56afaf0d0094dbfda58a792a79a SHA512 1727efdabdbb6b05316adc5dfcfca903be142ba45d1b4780826c611c95cd477742b3518ef2176bb1d4391cf317df19a30cdf657244d20544274aa81b36351d4a
-EBUILD kinit-5.94.0.ebuild 1144 BLAKE2B 36840aa6aea97b1ef7b0f36351fc03e1d7f99052d94e234052b60f35baefd76405c83c4686a4acfe3e02d4d229f3b6f80b662cd3565a5b8e2bfb9954335608aa SHA512 5ffe0dec0d3983e07e875eaadb70a2a60b4c86e5b5071a54b3d15588489de4cbcac365a17e70e48e1700b64ffdd7794fbf92d825b3a19dbffe162b35ce7a782a
 EBUILD kinit-5.95.0.ebuild 1144 BLAKE2B 36840aa6aea97b1ef7b0f36351fc03e1d7f99052d94e234052b60f35baefd76405c83c4686a4acfe3e02d4d229f3b6f80b662cd3565a5b8e2bfb9954335608aa SHA512 5ffe0dec0d3983e07e875eaadb70a2a60b4c86e5b5071a54b3d15588489de4cbcac365a17e70e48e1700b64ffdd7794fbf92d825b3a19dbffe162b35ce7a782a
 MISC metadata.xml 565 BLAKE2B 8e740127ae95b251e2e5cdf63fc19fb605cf5ef42e631b54e0ef300e8f21f04e288527c4628500c076e884da4b3017d041b1b45ff9a6680e72585a43caa452a4 SHA512 0efe6998f185b5a5aca504a041b3e5fc1ef8da0a4f9eaf2398ef9533054d9de27ae50c9e940001b24e69958d2ead67ab829304d8e322404cb19fda0c904e952d
diff --git a/kde-frameworks/kinit/kinit-5.94.0.ebuild b/kde-frameworks/kinit/kinit-5.94.0.ebuild
deleted file mode 100644
index c5b8ff4ba1ba..000000000000
--- a/kde-frameworks/kinit/kinit-5.94.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="false"
-ECM_TEST="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.3
-inherit ecm kde.org
-
-DESCRIPTION="Helper library to speed up start of applications on KDE work spaces"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="+caps +man X"
-
-BDEPEND="
-	man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
-"
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kcrash-${PVCUT}*:5
-	=kde-frameworks/kdbusaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5
-	caps? ( sys-libs/libcap )
-	X? (
-		x11-libs/libX11
-		x11-libs/libxcb
-	)
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package caps Libcap)
-		$(cmake_use_find_package man KF5DocTools)
-		$(cmake_use_find_package X X11)
-		$(cmake_use_find_package X XCB)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index f9ef42d3f681..e1f688f28372 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,7 +1,5 @@
 DIST kio-5.92.0.tar.xz 3304432 BLAKE2B 31b78c2cc5a543126d8494935e9956ce169f9bf6b863c0be562775ba3d5a30cf1fadc7bc48e818530eb51a5726bb528f15c51f89dfb9a7511bd6865d6f7092d9 SHA512 5064db660c5b6207eff2bb12261198118c89014f4d71a09531e72bc6185fd070fa262ef617cbbbacc1f334f69f65cc831fa91fd641d59d89303813ec5ef620b6
-DIST kio-5.94.0.tar.xz 3331696 BLAKE2B b2b86a2c470571b5e9e1c36d264efeeece335679f21da80756083af9737525407db828f7643ebe12b316fbf1a357ba8d02471c3330af9c9b0d886f343e4587e1 SHA512 acf7456ab0a3d122d8bbf6e7dbff51f958b1c6bf29f7295c21c78c5c707d5fee05b76d30e51832f35220cd08bf06a2e27c11153559b25f74b7c8f5f532f50955
 DIST kio-5.95.0.tar.xz 3335684 BLAKE2B 5f5aa12c15a3801a5a6faa741b9cf8431d319852470a6ab730a633455eb81fab6678d236f0567e1e8a6411f090148776b6280dfbb228f907a74e7df7da6ab3c4 SHA512 33006041ba6ef74af7f3d2fdaf35aef3059d4439676bc0bfb44053e2deeff7e3cd85a88428406096b8498918d5b793cdd30f74c8d2ddf1af7ac306fe4ddd74b8
 EBUILD kio-5.92.0.ebuild 2408 BLAKE2B dbf6929b37fc23ecedb5452e67a6a063bddd276476f70a8c04ff18d0662dd851af960a4f83b64348c2e6ad5782bfb387ebdb4f0849a4e5dcad733b76e937997c SHA512 fda5731b4c8ccf515100b97a029c7b635e0918ab703c62b001d3096669c93de7cf717048691ec557db49bee13cbc9bab0d4104bba7f3685e6e0656b5383f3efd
-EBUILD kio-5.94.0.ebuild 2411 BLAKE2B f939a4e4be9bd9014c575a86f12174cd8c86579cf4a5a2c68db76b5cb95a8f0be075bb4b8bec46a7219cff3101fbf2a7e4a260d4097f421fc12cef261d1a2d11 SHA512 ff75a6419f995c350cd4d4caac36b7cd6febe10ad3ebf524c5679423be632014066c900ea5404e4e034ac86b01ef4be23df7268c6db21863014e808fe5b8d6bc
 EBUILD kio-5.95.0.ebuild 2411 BLAKE2B f939a4e4be9bd9014c575a86f12174cd8c86579cf4a5a2c68db76b5cb95a8f0be075bb4b8bec46a7219cff3101fbf2a7e4a260d4097f421fc12cef261d1a2d11 SHA512 ff75a6419f995c350cd4d4caac36b7cd6febe10ad3ebf524c5679423be632014066c900ea5404e4e034ac86b01ef4be23df7268c6db21863014e808fe5b8d6bc
 MISC metadata.xml 672 BLAKE2B ed652f6e5751355ab96a5206da0184e37745e4b675e7f235648536931563b53c4f71112e81f809c88d02d01f9c77a20e9f41a2f6eb988b104636c8d450c50a18 SHA512 1fa6b33c8f146152015b0c8dbd70165022ceee580253850545c79eb3a74dbf44539e562014606a4ef4ea283a42f3946b1d3a79c0953a38fe10689137a53207ce
diff --git a/kde-frameworks/kio/kio-5.94.0.ebuild b/kde-frameworks/kio/kio-5.94.0.ebuild
deleted file mode 100644
index d279d7e8c4b4..000000000000
--- a/kde-frameworks/kio/kio-5.94.0.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org xdg-utils
-
-DESCRIPTION="Framework providing transparent file and data management"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="acl +handbook kerberos +kwallet X"
-
-# tests hang
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	=kde-frameworks/kauth-${PVCUT}*:5
-	=kde-frameworks/karchive-${PVCUT}*:5
-	=kde-frameworks/kbookmarks-${PVCUT}*:5
-	=kde-frameworks/kcodecs-${PVCUT}*:5
-	=kde-frameworks/kcompletion-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kcrash-${PVCUT}*:5
-	=kde-frameworks/kdbusaddons-${PVCUT}*:5
-	=kde-frameworks/kguiaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kitemviews-${PVCUT}*:5
-	=kde-frameworks/kjobwidgets-${PVCUT}*:5
-	=kde-frameworks/knotifications-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/ktextwidgets-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-	=kde-frameworks/solid-${PVCUT}*:5
-	acl? (
-		sys-apps/attr
-		virtual/acl
-	)
-	handbook? ( =kde-frameworks/kdoctools-${PVCUT}*:5 )
-	kerberos? ( virtual/krb5 )
-	kwallet? ( =kde-frameworks/kwallet-${PVCUT}*:5 )
-	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	test? ( sys-libs/zlib )
-	X? (
-		x11-base/xorg-proto
-		x11-libs/libX11
-		x11-libs/libXrender
-	)
-"
-PDEPEND=">=kde-frameworks/kded-${PVCUT}:5"
-
-src_configure() {
-	local mycmakeargs=(
-		-DKIO_NO_PUBLIC_QTCONCURRENT=ON
-		$(cmake_use_find_package acl ACL)
-		$(cmake_use_find_package handbook KF5DocTools)
-		$(cmake_use_find_package kerberos GSSAPI)
-		$(cmake_use_find_package kwallet KF5Wallet)
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	ecm_pkg_postrm
-	xdg_desktop_database_update
-}
diff --git a/kde-frameworks/kirigami/Manifest b/kde-frameworks/kirigami/Manifest
index f19d610d3e79..0c94ab51a71c 100644
--- a/kde-frameworks/kirigami/Manifest
+++ b/kde-frameworks/kirigami/Manifest
@@ -1,8 +1,6 @@
 AUX kirigami-5.92.0-ListItemDragHandle-emit-moveRequest.patch 1029 BLAKE2B 4e625a0336aa9ff3734cddaa6ffc4708a4555a365f1a69e79c10cb13300d07707faa63d7efb24cd6c2b747005f4bd7ac7f7ac907d9ecd81876c152a41826a5c2 SHA512 e6f1d125b54a9f5d1af758172cfd06e4801225a5ef1c38a3daad5f6ac8cb41d23fd96fa636c646df8428a268988626236e424d9f8a9a7f70a5ffd7ea536fc5cf
 DIST kirigami2-5.92.0.tar.xz 354848 BLAKE2B 7aab1579693f7cf57a61f45eb3d7bc7431bee01ed1ede918e0068d3b4d41abe2f5b5f97cae9538068ae6ebe27a5abce3797c7ade7ff225a40ac49cf46c61a742 SHA512 42d75b8931f28ce2fa200c19acfc9194518b856dd33d9bbeb490f24ddb0ae03ba7c01443a5bc2a07088de69a9300245434460ddcd28cb2b1caa2f2288e45405a
-DIST kirigami2-5.94.0.tar.xz 356500 BLAKE2B 56890b68fddf8bc4431cd75372de9a1bf4186c80e2c888114bd612449d1c163cc175f2b58e7d523e68e8a710ad774ce6fc1e7192278303d364fae68dd41ec335 SHA512 e836f45729f54a5c83c7dd5bb5def3e36f73cd6367456953bab8e3bdd87c6bf9845ff3f4f0458f289c0450a4ac02a8fe1984458a591172e9e87b782ac59f9a6f
 DIST kirigami2-5.95.0.tar.xz 357640 BLAKE2B 083f6f1c9a005c939b707ec851402f26e9f32db9784e8554d22d884da80bcfd3e621decdfd1f7a732c0ddfc0e8a66c76934540a6e0a14d6f05ba1a1b7229ab1c SHA512 99bfbadfc805e7e41d7814992b6ddeb8c67a9d41ff7ed764baad30c028a9587c50e2c6bf368cae5db9f11306b4a245ec6510ea6690eb20ea3e51390c00e31788
 EBUILD kirigami-5.92.0-r1.ebuild 1071 BLAKE2B c7f454c207320b6eab18a81ef5ea08127e27660ecf8961335796919eccbc2761f3b2a6d1a3f5479f3f3a09b41e3393d19062851fa63ea580a96fa6ee2da5cfa5 SHA512 5da52aef003d143b266668241acc5c573c710168e92db8699c4aefecbe00fd0838d6059d7109dc55124ecc08e0582766508bd0c034e085868b1bfbcd5829bf88
-EBUILD kirigami-5.94.0.ebuild 983 BLAKE2B 53144603e5b0019c1a0bd82634d70019174454f874417bf6d010c05930a7f917a6a9aa67b84557f2d5b00808d5996e6187b3f1f6b01c1ab4e4ea1fc7fc17d2e6 SHA512 f1f22bb6daf09f47e869e210f8c7369741e75c368ed6edc07fc6147907fb8fed141a84d0c2c5eccf5b7a8a28222cd76d6842311dd219da522da463a49b3303ec
 EBUILD kirigami-5.95.0.ebuild 983 BLAKE2B 53144603e5b0019c1a0bd82634d70019174454f874417bf6d010c05930a7f917a6a9aa67b84557f2d5b00808d5996e6187b3f1f6b01c1ab4e4ea1fc7fc17d2e6 SHA512 f1f22bb6daf09f47e869e210f8c7369741e75c368ed6edc07fc6147907fb8fed141a84d0c2c5eccf5b7a8a28222cd76d6842311dd219da522da463a49b3303ec
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kirigami/kirigami-5.94.0.ebuild b/kde-frameworks/kirigami/kirigami-5.94.0.ebuild
deleted file mode 100644
index 0d3ced80050d..000000000000
--- a/kde-frameworks/kirigami/kirigami-5.94.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_EXAMPLES="true"
-ECM_QTHELP="false"
-ECM_TEST="true"
-KDE_ORG_NAME="${PN}2"
-QTMIN=5.15.3
-inherit ecm kde.org
-
-DESCRIPTION="Lightweight user interface framework for mobile and convergent applications"
-HOMEPAGE="https://techbase.kde.org/Kirigami"
-EGIT_REPO_URI="${EGIT_REPO_URI/${PN}2/${PN}}"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-# requires package to already be installed
-RESTRICT="test"
-
-BDEPEND="
-	>=dev-qt/linguist-tools-${QTMIN}:5
-"
-DEPEND="
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_EXAMPLES=$(usex examples)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kitemmodels/Manifest b/kde-frameworks/kitemmodels/Manifest
index 05bad538569b..0041a67ec9fe 100644
--- a/kde-frameworks/kitemmodels/Manifest
+++ b/kde-frameworks/kitemmodels/Manifest
@@ -1,7 +1,5 @@
 DIST kitemmodels-5.92.0.tar.xz 407008 BLAKE2B 5a5da7ad73b7eb63b64b1fa04032e85c300b936757d11fc2573d025db85007ec46083a98037f3eff193f4078c763ef53aec585cdd7f7018c71bee8e8f415b47b SHA512 cede4a959abc66aeb58902630f66c48fda7ffcffa6bd43682cb17699b58bc2a955a7b86d9e40cc627470fc52db33906c6ae74973fec440fcea5e862715afcda7
-DIST kitemmodels-5.94.0.tar.xz 407248 BLAKE2B 82488520d4c9479cdc22cd791fddf95c44f34db55bdfbc6162a3ddb3818ef4550bad979144bf43d437475dce3b3a717fa7d50da248e1d4c6b478b0bbba8e2561 SHA512 ae284ed3811044a13c4d2fcbfae36822e1eed012395eb1ab58758f084319411796a15ae99b65dd4ca25b6d8aba59c2af5a65179db524582a8388ce77e2edb955
 DIST kitemmodels-5.95.0.tar.xz 407252 BLAKE2B 06c8774db4f11072455ce967c65a6fe0b6c1375db84dc7ec76c733eee83d4c848f2758bbb817aa49434c4214cd50c010cc462e0273c4db540d4bd2d4fdfdb60e SHA512 36e43dc0dc2edbffc936f75232423ec6319d0fda9bdb8652aa555d4f0599f796219be777241fe2654a1737fe8f29bafbb9fbb80bd47e77c060ddc5b805b88085
 EBUILD kitemmodels-5.92.0.ebuild 623 BLAKE2B ac8881df36ad959cd3763260eea5a360997a824f92793be7f088bb9e134738168f57ed804eee8bab692e9a1be9d696d52aefbfc845812df2a836096edab2b595 SHA512 44cac7ca8fcc28c34181ded7ed9dafbc277da772a2fd14da46a4e6ca2747cf5f3779130341cc81619bd80dfb9a1dd00c68de70808f9c5bf566c0317e8f3d79d4
-EBUILD kitemmodels-5.94.0.ebuild 626 BLAKE2B f485f3f030f4d1087f483bf7a0a59c6b1b33b7fa7102063b02e5b4f076e1e32cca0cda1abba9fcddb3d30a342697873c8c93941856ab393ffd81a48af469f2dd SHA512 23c2fbeac5cfb07a9393b2c337a8d1ce6e8226310801fabd0140e1ba42a45eae7059f49c64d475cdda91ab4fb30e2c3d3eec05bded6a31dd7309f4425d6cceaa
 EBUILD kitemmodels-5.95.0.ebuild 626 BLAKE2B f485f3f030f4d1087f483bf7a0a59c6b1b33b7fa7102063b02e5b4f076e1e32cca0cda1abba9fcddb3d30a342697873c8c93941856ab393ffd81a48af469f2dd SHA512 23c2fbeac5cfb07a9393b2c337a8d1ce6e8226310801fabd0140e1ba42a45eae7059f49c64d475cdda91ab4fb30e2c3d3eec05bded6a31dd7309f4425d6cceaa
 MISC metadata.xml 552 BLAKE2B 5cdc5875ea809e9597a8510b6c427afadb94c1f5673c2787d8d825ab1b1609be3f0ddfaaccd64b717f188c7eaeb44cba90ad8beef3653844bcd6c1567b598a90 SHA512 ea592f4380f95578d9c15487498f8600540e3f41d4702d63b13a34ef6f722dcefe70677e5026f507ae04b1a97d29d91851e0e06dfb48a63c3dac98618f08ddf6
diff --git a/kde-frameworks/kitemmodels/kitemmodels-5.94.0.ebuild b/kde-frameworks/kitemmodels/kitemmodels-5.94.0.ebuild
deleted file mode 100644
index 70a95c34b115..000000000000
--- a/kde-frameworks/kitemmodels/kitemmodels-5.94.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QTMIN=5.15.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing data models to help with tasks such as sorting and filtering"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="qml"
-
-RDEPEND="
-	qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package qml Qt5Qml)
-	)
-	ecm_src_configure
-}
-
-src_test() {
-	LC_NUMERIC="C" ecm_src_test # bug 708820
-}
diff --git a/kde-frameworks/kitemviews/Manifest b/kde-frameworks/kitemviews/Manifest
index 8fdb7b2ee7cf..a1ae2e855ee6 100644
--- a/kde-frameworks/kitemviews/Manifest
+++ b/kde-frameworks/kitemviews/Manifest
@@ -1,7 +1,5 @@
 DIST kitemviews-5.92.0.tar.xz 77260 BLAKE2B 85aee7a8ccadc939bde8eae618aa8ad26199e4f50f1e51c65bb4f1a87908587eba4ae553574153337ed24075f7043e2dd315566b4d11e12029bf157d83158611 SHA512 3eb1737285f560efcdca52ec8c02478cfd8151852ed9e4e931cd019617bb21dff61f2cb65642a278b1aff60afbecfed2edf867bb80d332de98394152bf072324
-DIST kitemviews-5.94.0.tar.xz 77360 BLAKE2B d844437525103bd829e71f8675f58a745fd34458addee68f4cf6da80834aa61a542177094c5a404ff794791e15c55175790c93daec4672ef1da55c8a3a031c6d SHA512 c94157fb034c1e8b3787b37d873808d9c19da520b5c85483149bfd47fa6d4b5d93429ee21a3d7b5cb5e27d759d01c009ab6c3a6cce8a55a490a063a728916003
 DIST kitemviews-5.95.0.tar.xz 77332 BLAKE2B e4617c8e2a0042c0e784b36f62a47e8d9cdb76be179ae31ce4c8fa9dcf3079f2c71833cf7604ea3ad771efdef48257d4bff24665722783f2dea8f57a4ea43dd1 SHA512 12e2b0b52e322518ce3e9fd93ae11aa19962a6a06d45339a7578f2cd250090fe2fe4b0fe7366c5f2dffcf0a35996ad2f0ee69ad949a77b3dcb92b93c1029cd73
 EBUILD kitemviews-5.92.0.ebuild 487 BLAKE2B 4fed237e97a3b928882e4160e3ce07de32755d2592a2e3cc7520bcac7d4a5424264897a09bd8e44a8bfea9cfe52505bd5154d8613c9c4b0ac2c5794e375413da SHA512 4bf30cd69a68e188a7389c7c59b7f16d88499a57b5d1afada41221ce66a4872de0f09d00decdc088dc8d7fd7860a5dcef8176e8653dcdefb57237990877fad2d
-EBUILD kitemviews-5.94.0.ebuild 490 BLAKE2B ef320081fd3e4a3055465f7213b05998cf8eb5fc2c3aac85cbf1db6bfeefb5e155968a3cb1706df7a4212f9162aa23efd5186321d7af8ac9f5f8c0a5b9f03f63 SHA512 4b16b4ad5baaec9864ad4121a3cfc77ac687fb15aaffe38ce6e0276245069aa5fa1717652214dd6803f486c449c04674af9297ab5122a29984e85d5dbd545cf2
 EBUILD kitemviews-5.95.0.ebuild 490 BLAKE2B ef320081fd3e4a3055465f7213b05998cf8eb5fc2c3aac85cbf1db6bfeefb5e155968a3cb1706df7a4212f9162aa23efd5186321d7af8ac9f5f8c0a5b9f03f63 SHA512 4b16b4ad5baaec9864ad4121a3cfc77ac687fb15aaffe38ce6e0276245069aa5fa1717652214dd6803f486c449c04674af9297ab5122a29984e85d5dbd545cf2
 MISC metadata.xml 547 BLAKE2B 127ee4110b748cd3e3c26b63248d35f78b233b00cf4466ccc0145a613062a5aa9cc2e9ebd91d0e7482c67f6e265938176b169a9c52eda30bfcddf02549ec8f06 SHA512 2d36585b1af6205dc1bfcff7c3cb24c85376716159317b5c105c866143d49e89e91e501c9a4cf2d63265c30a09e8df71bca841319bd3f2b551e79fde90b1d96e
diff --git a/kde-frameworks/kitemviews/kitemviews-5.94.0.ebuild b/kde-frameworks/kitemviews/kitemviews-5.94.0.ebuild
deleted file mode 100644
index 34eacc038495..000000000000
--- a/kde-frameworks/kitemviews/kitemviews-5.94.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_DESIGNERPLUGIN="true"
-QTMIN=5.15.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing additional widgets for item models"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="nls"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-BDEPEND="nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )"
diff --git a/kde-frameworks/kjobwidgets/Manifest b/kde-frameworks/kjobwidgets/Manifest
index 5303a52426d5..4918a23607ac 100644
--- a/kde-frameworks/kjobwidgets/Manifest
+++ b/kde-frameworks/kjobwidgets/Manifest
@@ -1,7 +1,5 @@
 DIST kjobwidgets-5.92.0.tar.xz 101620 BLAKE2B 29eb6b131ca2c858ee416afab137ed84b1f1e00039673794418bb352ed656df13e91e2b47a98d1b6dd933034e0fb5dad44fa021aaa6ac0c84913f8cd733cde1f SHA512 6bd21dc93146ded88981bf61c1365c333c9ba369ac358ef4b5b06c2d26f0e6cac7880ecad27cd7cd950cf1b502c9202ced6c66fcdb78b7cacec1da6a92558976
-DIST kjobwidgets-5.94.0.tar.xz 101632 BLAKE2B dc916757c23a637696da67846ec1900a5aea61c57be95f7d431e52d651c8f6cbbd059c09fc9c70b2db710e4c65016c28c4b3f0d4a10138dab576ad1235a305bf SHA512 9b038faed6c9174cdcdd21db85d078be6ae02e9091a3d30e3fcda290a130a6c3ec5ee2a9d96df895e6d5c123c979ca584cb487bc637f437cfa3fbe55bc9deb33
 DIST kjobwidgets-5.95.0.tar.xz 101616 BLAKE2B a5ac8a7e11f0b79b1aba45bcccf23a80f6eec846ec87681203816663fba66006383bd8922d2222b65d9399245ae59282b055d54da50cf833c3c061eb6c6d4190 SHA512 6768bb076762a7e7cf223e0e73a9db10fb81bc3d48aebc095521a4dc18e74783468cba07a95b693f98011c22d1eac81d1bd0483d282347bc4978959718c15d76
 EBUILD kjobwidgets-5.92.0.ebuild 779 BLAKE2B 799eb93717845cf4301b8fbf639c69f3e064bfc4d9689ae6683c76ac336d25812d9f2f658202b8f7cb413c99cf19a0f4d041766a00e092eaf4e0a7c189f3d7cf SHA512 ecb9ad26a6feca68ac8fecee6a7873fb103f3a83ed35b82c3004917c2431b357ccf363a7ec2293d913810ab8d0c0f52e024a8f3015b5f3fe24465f6a88b68afc
-EBUILD kjobwidgets-5.94.0.ebuild 782 BLAKE2B 66e0499b2b4915fe7449e7d229a1402144ccf314b01da13c3095372aa5161b0ee0bcd5246689c2c4d39648ad7409a72073d85ec6e106d29a0d3bc3a368649010 SHA512 42abd0ab10b00c30ad3a626a3264f651f5fc8f3420069f60e6794143633bd610f7457bfd40c8fc3949d75e65075de4b8d9dd73083b01f7f3259e59f5d744867e
 EBUILD kjobwidgets-5.95.0.ebuild 782 BLAKE2B 66e0499b2b4915fe7449e7d229a1402144ccf314b01da13c3095372aa5161b0ee0bcd5246689c2c4d39648ad7409a72073d85ec6e106d29a0d3bc3a368649010 SHA512 42abd0ab10b00c30ad3a626a3264f651f5fc8f3420069f60e6794143633bd610f7457bfd40c8fc3949d75e65075de4b8d9dd73083b01f7f3259e59f5d744867e
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-5.94.0.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-5.94.0.ebuild
deleted file mode 100644
index fe3225c78db7..000000000000
--- a/kde-frameworks/kjobwidgets/kjobwidgets-5.94.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.3
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing assorted widgets for showing the progress of jobs"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="nls X"
-
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
-"
-DEPEND="${RDEPEND}
-	X? (
-		x11-base/xorg-proto
-		x11-libs/libX11
-	)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kjs/Manifest b/kde-frameworks/kjs/Manifest
index b326f7843402..8207462acaad 100644
--- a/kde-frameworks/kjs/Manifest
+++ b/kde-frameworks/kjs/Manifest
@@ -1,7 +1,5 @@
 DIST kjs-5.92.0.tar.xz 339164 BLAKE2B 6b62d94204d99edda3143dd13762deebb3322502bf5743b3464dc03c4881d77b813116c4dc5da8da0a98cab6058a35752c18499d67e68ac1ee8db2ca029dc164 SHA512 80cd1ef0ddc4fa1616ed992a1891603ae3588b4c09adebf2bd59609f6cfe203894f11eff8351aac679a27f3e98b370bbeff4e3155e0bd308e7af5f9e4bc757c2
-DIST kjs-5.94.0.tar.xz 339168 BLAKE2B 10b139a3a836aef994e7a1f86f0403a9c4bdd40b05c50ffd375354a951ab191da85572f7fc8763d29441741025db9d5f34dc0ab23cef5edbe23369518c0ea52e SHA512 38e1d4d73e6ccf48d01d7c48315b1a69f5a008c91f7fb4df9a4f0dc80447a022701cb90af19b8e18785016895186d6e035583424326017ab79d50bc5aab9fcea
 DIST kjs-5.95.0.tar.xz 339068 BLAKE2B ab9f6ee9bc18098c15aa95e4be4ade54fa29afcf9838dd90e04cd2e190ceb0e2574a9f958431dbd819e655e0b08c1937637499d3832abe107d59f85570267840 SHA512 3992b9ea1f8a4b59e549d1345d04b3c1c04462d86d2e5635deed8882fd63b690f63d02909f0400bb4e101f7df1d289b1efc030cf265a712a4f39962e018792a3
 EBUILD kjs-5.92.0.ebuild 406 BLAKE2B 7273c1ce87c89d000021a835d590664133d7b0c0e9ba5aa095d2f2c769998c92ca0fb90e276b2d607d3a559b9e258ecea9b86171acb47c264a2a6ec04d6dcaa0 SHA512 c8c771722df62e25796be5121d99bf38d840c7d9cbe3b9272ac02dfb9482ca3efa2766dd74f2c18fba58c647345fd909fdb0e389b3f145ce99065c923dc67055
-EBUILD kjs-5.94.0.ebuild 409 BLAKE2B 106e0097bd9f2469f36cc26c493cc62d7ea265d4c054b50faa9e1a67e074385fe71caec7457fa77b3d28f2be631efdc116291c0aca99266e22bca7bf03dc80f0 SHA512 faddf1453503bc4c49341ea3a7c26d34852f1a44f54c362b74eb7edb1960dfda74e9ad8d9755c12941007b8c7df222a248fe525795c0822ca6568ec134bf75f4
 EBUILD kjs-5.95.0.ebuild 409 BLAKE2B 106e0097bd9f2469f36cc26c493cc62d7ea265d4c054b50faa9e1a67e074385fe71caec7457fa77b3d28f2be631efdc116291c0aca99266e22bca7bf03dc80f0 SHA512 faddf1453503bc4c49341ea3a7c26d34852f1a44f54c362b74eb7edb1960dfda74e9ad8d9755c12941007b8c7df222a248fe525795c0822ca6568ec134bf75f4
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kjs/kjs-5.94.0.ebuild b/kde-frameworks/kjs/kjs-5.94.0.ebuild
deleted file mode 100644
index 13a06718a470..000000000000
--- a/kde-frameworks/kjs/kjs-5.94.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_QTHELP="false"
-inherit ecm kde.org
-
-DESCRIPTION="ECMAScipt compatible parser and engine"
-LICENSE="BSD-2 LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-BDEPEND="
-	dev-lang/perl
-"
-DEPEND="
-	dev-libs/libpcre
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( src/README )
diff --git a/kde-frameworks/knewstuff/Manifest b/kde-frameworks/knewstuff/Manifest
index e1f46221d6cb..bbc9e40637eb 100644
--- a/kde-frameworks/knewstuff/Manifest
+++ b/kde-frameworks/knewstuff/Manifest
@@ -1,10 +1,7 @@
 AUX knewstuff-5.92.0-KDEBUG-451165.patch 2700 BLAKE2B 0478eb83efc569151a0ecc043ce28f26e14a3803019e71039634fbac095204882c45a43d4f0520d8199c037a4cb291e543ec61c5667e84f52044a50877996f3d SHA512 170f6155f78b1386b4a807bcec1765c9bc8c7aec589a7ed364159597e324eacca390cef63152ddcb9f6d81b175089ece8628c6f861a4e3089cad2978188729b6
 AUX knewstuff-5.92.0-fix-valid-tar-recognition.patch 1123 BLAKE2B 6febe01e614eafc88b1c29c327d0c5906347d8d3db518126c0950134e8764b31d5145501c2068489fa0435b6263bdfc6899a567bfa6f82317b50b56e312cfa13 SHA512 4a216fc24709fb602ed2a7d7ed6d9e9bce66dedd9eb64f41f2d5e3a6363f916602c8adb4588cd3781c0383cb3f4732c332fd82adce8abac76ad2507b8c7be0f0
-AUX knewstuff-5.94.0-fix-QtQuickDialogWrapper-for-konsole.patch 1752 BLAKE2B 97b1966520d301111d8f40c5b8497a4d4574ae8cc6b4465b095d1f1f41b3965953e8c34c0eb12a50b447821315fdd4e13d43fc5694ceb68dbe093065aca874db SHA512 5c73d39a78658899f4e7b2526608498ff63bf4e6f9b730b0f20f3205017e77fe4a9a96e3ab9e42f0789234a3e0658a89f646bc040488465f07689bc9629105fc
 DIST knewstuff-5.92.0.tar.xz 1155052 BLAKE2B ee3485c1e3371c139019bb1889aedb112f40c0bb0ee1c92c159b3a6b8a84208d53de10fb1d368852927b7a65e6e1cee3afcf99aa821e8468c67f8b0ac49db79d SHA512 689089724f53ecd59bc79e046bb0b3f64e7a3bd7c8d9a5cd8be15d13bdc045e0484e05a2e0a87ab0134744da829becf8fc669a9e17b7668dafec3fff8e62a2a8
-DIST knewstuff-5.94.0.tar.xz 1154916 BLAKE2B 668ed799cb34470e5f8132a49d47261b1e571c30106e7a4b623513f16c0ddcbeea5a7011bb637438326758b5b54019004c6a81ff66d1b7155eda4b47ad19888f SHA512 6269614a0df2616bd5bd1a8e9c3f8dc16920bbd4cf8fd18a5ccc1e818c292d90533de3dc77ce8fbbb183388ad6fed72a30b78177eddd87624499b3c75d55a226
 DIST knewstuff-5.95.0.tar.xz 1155724 BLAKE2B a4b52c3ec3c3975fdceaf56b01eb8c243bc5de305cf14a081ab3a5691711aae24500fc7212282b37cc6a2ab9bd205c375307100506c1b0252e89649f0efed10e SHA512 d1ef25a32f1b534d46e3ce4141046c6d23585d851e14998fe55012f889ff390ac1b10655b2a1918f8f6c8689409e62147c0a85de7be85c93d602bf57c2a8078c
 EBUILD knewstuff-5.92.0-r2.ebuild 1391 BLAKE2B 013cb64dc992bfe6ffe2f2746acfe5e393a545f84ea4cd7996c1deb68924e1546029102141bb23893e8fd50d139643bd1c81d96337eb140e787a27d1046bc4bb SHA512 4c0a9a07e57946f26aebc7f2125cf28ba18b55ab63a0f326115082df3d223635b292d870c5da1c14c6f9b91f36ee0e20bf0e779ef87f8e0a9192752c12272834
-EBUILD knewstuff-5.94.0-r1.ebuild 1364 BLAKE2B 123e9c9be9e4ba087d01d181a6cfa1a9291e90278d131c14cf7043f71f7f4897df84f36698a76ae8aba824103f6abdea0ef387dc0a345eb6801e594d1e3d68f1 SHA512 16b119487a6cfedb5920dcf4372202bed7590fedd0ce0205cb432e1330ebb98c0fef55d9385bb6db08edb11e917c60d452ec4a263467107d08c8048753d6330e
 EBUILD knewstuff-5.95.0.ebuild 1272 BLAKE2B cf40d389f151bb8e07b2cce100d668c3bbe5da4ff07333f1c464b7efe892e263953a836c9e0888061f70c9bbc922699880cafd4b5f908510893a13f3da1f42a2 SHA512 a520b24f121aae2d4b561c1751b9913775f12ac6538ecc6e8f0fefef4f6e03d4ed0831f4a99257186d293543bd03a35bd27240deda74ffe0ad4dc7272f2dd464
 MISC metadata.xml 600 BLAKE2B b9dafdddae4fb5f9969ca845f02690b096f81f6b3c1f76fe877f2886697c0636b8a3b4498aa5cbf903f1b6ee14f3de51c10ce88b37a9780f91ce23bd841f5fbe SHA512 5f3710e9d14cb62c66fa6b21f70691f276fb1fe030b3b2eb92f206a55bbc10dd998dd522e478c883c36d7f811d7f163602e3a2af7ff92e6dd79fa28a1fa32b85
diff --git a/kde-frameworks/knewstuff/files/knewstuff-5.94.0-fix-QtQuickDialogWrapper-for-konsole.patch b/kde-frameworks/knewstuff/files/knewstuff-5.94.0-fix-QtQuickDialogWrapper-for-konsole.patch
deleted file mode 100644
index 002d4c182b28..000000000000
--- a/kde-frameworks/knewstuff/files/knewstuff-5.94.0-fix-QtQuickDialogWrapper-for-konsole.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From b634b65dd081746ccb8bdfa9bf2d878d13e2c0fb Mon Sep 17 00:00:00 2001
-From: Alexander Lohnau <alexander.lohnau@gmx.de>
-Date: Tue, 24 May 2022 12:58:54 +0200
-Subject: [PATCH] Fix QtQuickDialogWrapper dialog not being usable in konsole
-
-Patch provided by David Edmundson.
-
-```
-Issue is  QGuiApplicationPrivate::showModalWindow
-
-it marks every other non-modal window as blocked, including new windows.
-
-when we focus the new dialog at a wayland/X level Qt gets it, but in it's own internal dispatching ignores that and sends it to the modal window
-
-Qt is smart enough to handle child windows appropriately, but only if it knows about them. Having a transient parent should take care of this. We should have this anyway as that will fix some window placement bugs.
-```
-
-BUG: 452593
----
- src/qtquickdialogwrapper.cpp | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/qtquickdialogwrapper.cpp b/src/qtquickdialogwrapper.cpp
-index 4f22b650..e31e8d80 100644
---- a/src/qtquickdialogwrapper.cpp
-+++ b/src/qtquickdialogwrapper.cpp
-@@ -7,10 +7,12 @@
- #include "qtquickdialogwrapper.h"
- 
- #include <QEventLoop>
-+#include <QGuiApplication>
- #include <QQmlComponent>
- #include <QQmlContext>
- #include <QQmlEngine>
- #include <QTimer>
-+#include <QWindow>
- 
- #include <KLocalizedContext>
- 
-@@ -70,6 +72,11 @@ QtQuickDialogWrapper::QtQuickDialogWrapper(const QString &configFile, QObject *p
- 
-         // Forward relevant signals
-         connect(d->item, SIGNAL(closed()), this, SIGNAL(closed()));
-+
-+        // Otherwise, the dialog is not in front of other popups, BUG: 452593
-+        auto window = qobject_cast<QWindow *>(d->item);
-+        Q_ASSERT(window);
-+        window->setTransientParent(QGuiApplication::focusWindow());
-     }
- }
- 
--- 
-GitLab
-
diff --git a/kde-frameworks/knewstuff/knewstuff-5.94.0-r1.ebuild b/kde-frameworks/knewstuff/knewstuff-5.94.0-r1.ebuild
deleted file mode 100644
index 73336dd92ec0..000000000000
--- a/kde-frameworks/knewstuff/knewstuff-5.94.0-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.3
-inherit ecm kde.org
-
-DESCRIPTION="Framework for downloading and sharing additional application data"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="opds"
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	=kde-frameworks/attica-${PVCUT}*:5
-	=kde-frameworks/karchive-${PVCUT}*:5
-	=kde-frameworks/kcompletion-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kitemviews-${PVCUT}*:5
-	=kde-frameworks/kpackage-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/ktextwidgets-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-	opds? ( =kde-frameworks/syndication-${PVCUT}*:5 )
-"
-RDEPEND="${DEPEND}
-	>=kde-frameworks/kirigami-${PVCUT}:5
-"
-
-PATCHES=( "${FILESDIR}/${P}-fix-QtQuickDialogWrapper-for-konsole.patch" ) # KDE-bug 452593
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package opds KF5Syndication)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/knotifications/Manifest b/kde-frameworks/knotifications/Manifest
index 4735d8d0ec5a..3736909f3bf0 100644
--- a/kde-frameworks/knotifications/Manifest
+++ b/kde-frameworks/knotifications/Manifest
@@ -1,7 +1,5 @@
 DIST knotifications-5.92.0.tar.xz 131784 BLAKE2B 9c31e8f3870e1ae440d813bdeefdc87b48ddb5fd5176664f49dd8d31c429c717a8b146fa00875cb2f2d218428339dcfbee883ddeb127647e5618d0aa89650ffc SHA512 7dd5f6b798ebe5741284a5334b9056ce47f0b2a8a44b7d7e8e13de674fe77ddac85447491ece9a0ad6924f1a4dd7be72d80c39225fa1e674715ca103b48d10fd
-DIST knotifications-5.94.0.tar.xz 131712 BLAKE2B 187ceb73bb83244b124a7b400af14b7d8718de2fd4d72413dd84c4c28b87bda3a61cdb19ce14ba8bb3e26d40f983e8ab6753bd13dc4b0590a5f97447a9552610 SHA512 e77886ae03b1a59d9da74a83b7945cb9e7a60992f31607d0ed545418cb384641fac8b8a6ce431c8ad5c0c57d939dab66a52a48febf2624602d4e3a6eaa3475cc
 DIST knotifications-5.95.0.tar.xz 132192 BLAKE2B d083821d94b05c0f0e504afec1b590cd28f72a823e6b6bc373472071da88eb63130e0bd6d03331530a2676796b41f035d46b4ad2b9b588bb6cba9e32f6aaceab SHA512 1c2e297c46f4580443bc1ae285f00ec10949d467d381b9cb32f03f90f931ba6fa01044bc440a431f4577c242ec961f40be2a7fd61e6a27cb142b49dcd2ffb19b
 EBUILD knotifications-5.92.0.ebuild 1242 BLAKE2B d25aa79649963990b680e55c73d55f72d37d37902ff2b0aa50532191bfd602175292e803201c44bed80e0c7f5c7067a5a5a2fd1ad5534c757f74e175c9999aae SHA512 e1d6bb7982afb75313d0f340d98ddc5f29681ec07ec091b7ab970bb06a337592c1534bf07673314d1711b77ece35e4b8cf2185b1c7d8d5e2b51db60cb506a3b4
-EBUILD knotifications-5.94.0.ebuild 1245 BLAKE2B 6a4c32d45836366999077a07e6d7bbfc4d546a092795fbb8cb70a8c92460e678312f16c8fdac4ac8de49952014b558034636ded5df5d96a14527e0ff5ce509a7 SHA512 226df10dfc7b8a738c02838d3071c02b7d440dd969849a324a0da58d644ae84d5e739f8362e03cadaecaf3359a37211f1cafe68db1a4705231f045fd3bf55c97
 EBUILD knotifications-5.95.0.ebuild 1245 BLAKE2B 6a4c32d45836366999077a07e6d7bbfc4d546a092795fbb8cb70a8c92460e678312f16c8fdac4ac8de49952014b558034636ded5df5d96a14527e0ff5ce509a7 SHA512 226df10dfc7b8a738c02838d3071c02b7d440dd969849a324a0da58d644ae84d5e739f8362e03cadaecaf3359a37211f1cafe68db1a4705231f045fd3bf55c97
 MISC metadata.xml 745 BLAKE2B fe1817a1a42cd10fbbfd20a9ffe0764ea24ea14e78b9a2f1bf9094dc0ce205da471aa1dacc058a86b1840da374c985953da09636a3ee01fe1a87c623e25dd368 SHA512 56bdda99f5a96d9f615d341134508ddc6edeedf043a44b6419b8ac6c745c7acb24c9a13c3001978b7eec97199f00ba9747f4f9b0a0c5e149580e75cc07a9766b
diff --git a/kde-frameworks/knotifications/knotifications-5.94.0.ebuild b/kde-frameworks/knotifications/knotifications-5.94.0.ebuild
deleted file mode 100644
index 2b0b9cdb62d7..000000000000
--- a/kde-frameworks/knotifications/knotifications-5.94.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.3
-inherit ecm kde.org
-
-DESCRIPTION="Framework for notifying the user of an event"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="dbus nls phonon qml speech X"
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5[X=]
-	dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] )
-	!phonon? ( media-libs/libcanberra )
-	phonon? ( >=media-libs/phonon-4.11.0 )
-	qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
-	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-		x11-libs/libXtst
-	)
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-"
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package dbus dbusmenu-qt5)
-		$(cmake_use_find_package !phonon Canberra)
-		$(cmake_use_find_package qml Qt5Qml)
-		$(cmake_use_find_package speech Qt5TextToSpeech)
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/knotifyconfig/Manifest b/kde-frameworks/knotifyconfig/Manifest
index ad29bb57075b..b4d79bad184c 100644
--- a/kde-frameworks/knotifyconfig/Manifest
+++ b/kde-frameworks/knotifyconfig/Manifest
@@ -1,7 +1,5 @@
 DIST knotifyconfig-5.92.0.tar.xz 87380 BLAKE2B 835eddbe305e0a048dd1ebdf6f5419e23f3b1c6ca900a176df64da99de091c5f31586b4a3db54927670d41e11cd1e0dae84499147be304e0a4c9232aacec20b7 SHA512 1abfb1097dbeee31bb6ff9e6843002d020020196fce3b6cb1ab43e3fe4e3ddb9ca6565c9da9aa13ae8e205ec097b186f1c7d628870597b0f76f8a41dcaf1807e
-DIST knotifyconfig-5.94.0.tar.xz 87372 BLAKE2B 40b9569a5a1e56a2d96139fcd99ca881d67200d0b689cdc458bc5ab50f98ed587d8ff51e7436e7100d429c0401d435e422f3b59a6f5bd6823973d6055b83b887 SHA512 0a36b39f003ee89f8b041408bd54fa3ae95619367d19fe99e757176222dc6b1cf20f76092e24bb5dc0ff09862558c4a34e7e2a40c89af0795a0ead123e4825c1
 DIST knotifyconfig-5.95.0.tar.xz 87416 BLAKE2B 9105bfe6c862ee9710b2e49fa545f37ed58b87316a07251a2ab9edebd6a74e090974adfc4fc16831027c473b0ed4f949fe570466985dde7b1919117b85f80175 SHA512 f6d6c4bc9486c279ca22c76ebb6b333296afffd4658045d05b59d85ac4bef3215b6807e3bcac3890929f20520be82abf63d6b72757248736b99c7865688d194b
 EBUILD knotifyconfig-5.92.0.ebuild 775 BLAKE2B b9f986764e87a226253459fbff017f2a25f98123d4ad9c57f39809efae0a19d379f368ad48433affaf83cebca60c881b2c7924fa326ca33b7481b269f3dc6f9e SHA512 bcb48231825568aafa164ece935ef4e285dc321828b478b951aa8868620e9c72d88cbe3b13b91bc5753d9cd2b83adadde70b4cd0fd4e2f0eb65601899555b812
-EBUILD knotifyconfig-5.94.0.ebuild 778 BLAKE2B b262dd62a3cb7859cecf4f96ea87f286984780e29d39e86219909d2e7dcaa15c699f9cda314a2301bce9cecb4b2193ada752e43d3d0ec1112c93facf7d206869 SHA512 54a6a103174a27212c5ce5ccca838e9cfc0c5a6be73d213cdaa1c0f7f98f74cdbba3aeeaadb26b8eae4a9fa0aeba794997aa65c74b4f413a22755832c5faac48
 EBUILD knotifyconfig-5.95.0.ebuild 778 BLAKE2B b262dd62a3cb7859cecf4f96ea87f286984780e29d39e86219909d2e7dcaa15c699f9cda314a2301bce9cecb4b2193ada752e43d3d0ec1112c93facf7d206869 SHA512 54a6a103174a27212c5ce5ccca838e9cfc0c5a6be73d213cdaa1c0f7f98f74cdbba3aeeaadb26b8eae4a9fa0aeba794997aa65c74b4f413a22755832c5faac48
 MISC metadata.xml 603 BLAKE2B de97624d3f4f43eeffef1385a40736073d352f17204b1667850dd033193b66f15a32ad7d743ec6c27c0717a315c1372805d800263226308d4f099e580cfc4a5a SHA512 39deeac37b8b1e6533852619ccdd245d2d9cc7c6a36fbb8393412cb161ed0dfb6ab711bdd7fb38ab515fc6c7972659b4faeb2cef11da979d798b0a1f43c8ed29
diff --git a/kde-frameworks/knotifyconfig/knotifyconfig-5.94.0.ebuild b/kde-frameworks/knotifyconfig/knotifyconfig-5.94.0.ebuild
deleted file mode 100644
index 1bcc3816c267..000000000000
--- a/kde-frameworks/knotifyconfig/knotifyconfig-5.94.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.3
-inherit ecm kde.org
-
-DESCRIPTION="Framework for configuring desktop notifications"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="phonon"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kcompletion-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	!phonon? ( media-libs/libcanberra )
-	phonon? ( >=media-libs/phonon-4.11.0 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package !phonon Canberra)
-	)
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kpackage/Manifest b/kde-frameworks/kpackage/Manifest
index 8b27a82597eb..bd211572d099 100644
--- a/kde-frameworks/kpackage/Manifest
+++ b/kde-frameworks/kpackage/Manifest
@@ -1,7 +1,5 @@
 DIST kpackage-5.92.0.tar.xz 141300 BLAKE2B ad7990fc56067e093aee2bc04bf42175bdd6fba5abeb513697f0114e751da33a310687a880f3690c05a557e9e1a340e01e04092907aa50e57b418fd346977920 SHA512 f0979289b94108708d21ad3a6bb574903d376d09f84d60d5cbaef10a315f9157fd750edecc8106ccb81297156965222455d82f70ad9a4f750d898e29f86d42b5
-DIST kpackage-5.94.0.tar.xz 141252 BLAKE2B 384b273d1d3c4a4617438d9877cb792f97b945b74d2c2b3cd184ef9a28ce87b63bb02578dcb90a98f9068a47e5904e2f6c26fdc8717753943f04454f310d171a SHA512 65c58a01c302e3f5ad89fab1bec3b9bf1f17a9a94408b565137a1cfb4f083436c39e41b57c11449d5f764252df86eb7e9b4a08b86d65492f0f7eb1899b8d2cc7
 DIST kpackage-5.95.0.tar.xz 141428 BLAKE2B e5c934c49320aba8c724caede6af4e2e4d8d7dd1d8087e9a8919c66a11419b71c4e9e5927ffbd8123ebbc3a9d9386ffe06fcfa03ba422c5d265da7d02187ef11 SHA512 cebc839d92003592434463c9c20937f894aa1d29e9385468b5e2f2312fc44f293157765bee9aa7d9e788220f95c6b4b6de5ed97c701332cda0dfc5065625f119
 EBUILD kpackage-5.92.0.ebuild 861 BLAKE2B 27cf8308e8274103cfa88e77e4f2a590adb8c5572b40e73d63fb40de2e8cfa43524690ac2ecd5c8041be84766cc9aee733cbfed68ce517ad8dd2e233a4efb242 SHA512 412dc85cf28c36101c8ca8dac0f15e1df5ff8b24097074c9083f16509e415ce14d471cb89591435a0375e2c7ade137a1869ceac9d3d6f4f14aa9bc99a6ceaafb
-EBUILD kpackage-5.94.0.ebuild 864 BLAKE2B 7438be3e3a332a25da1918f80df10bd1aabe0fef176bee812651b56ff53278e71eafd7e0aa69955c21dab620cc749c666d7bf71a40af3e776ccf33052fd042c8 SHA512 ea87ed427e8bcab424dee30281fbebd1d81c839c6675ded99b89e809999ef0c7bc592707a933359131496746d7af46f680318669619a8a5951b67d7744d04641
 EBUILD kpackage-5.95.0.ebuild 864 BLAKE2B 7438be3e3a332a25da1918f80df10bd1aabe0fef176bee812651b56ff53278e71eafd7e0aa69955c21dab620cc749c666d7bf71a40af3e776ccf33052fd042c8 SHA512 ea87ed427e8bcab424dee30281fbebd1d81c839c6675ded99b89e809999ef0c7bc592707a933359131496746d7af46f680318669619a8a5951b67d7744d04641
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kpackage/kpackage-5.94.0.ebuild b/kde-frameworks/kpackage/kpackage-5.94.0.ebuild
deleted file mode 100644
index f663f6596444..000000000000
--- a/kde-frameworks/kpackage/kpackage-5.94.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
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.3
-inherit ecm kde.org
-
-DESCRIPTION="Framework to install and load packages of non binary content"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="man"
-
-BDEPEND="
-	man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
-"
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	=kde-frameworks/karchive-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package man KF5DocTools)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# plasma-plasmoidpackagetest bug 650214
-	# testpackage-appstream requires network access
-	local myctestargs=( -E "(plasma-plasmoidpackagetest|testpackage-appstream)" )
-	ecm_src_test
-}
diff --git a/kde-frameworks/kparts/Manifest b/kde-frameworks/kparts/Manifest
index 3872c10644b2..47143fdc3ae9 100644
--- a/kde-frameworks/kparts/Manifest
+++ b/kde-frameworks/kparts/Manifest
@@ -1,7 +1,5 @@
 DIST kparts-5.92.0.tar.xz 196644 BLAKE2B f6c19779b94c9d83eac72b7edaad9895e8027747c93aaf5a07f24ccf3af90538e4ede6204c0eb605579982f63e5dbb0ead8aef404c4de235d58468bac3ddfb97 SHA512 6c7db8d4975856d3c0822e86650c31a222b6b7ff8a660eeedbd3fc952eb2f94e36bd5f9b6ec844f9310603cf69bb333447a75ed7a2cefac66987ff5e5676d1ec
-DIST kparts-5.94.0.tar.xz 196720 BLAKE2B fe72f1bec690cb28200422d66c2ce6c6b87e18c00d87ea5d3bb7a4b4d2925ec4875f6dffd4c3bc903fda513bb79152e0c5ebbf3bdee902051a28c5c40696ccf4 SHA512 1046617d69c9e67c02a1924d5a20a7e64ee69cb93477d28a8686b4658bdcba8765d9ec7b5f27e4926feaab34db459bbaac9e8f25eb4ee674a7ff622882bec4e8
 DIST kparts-5.95.0.tar.xz 196920 BLAKE2B 6934c6a00ff8b3c467be3bac4e60fd1798957f98475e56f7feb150d55e0b184e161d8e50c299575b2babb7f1ffd8ca8444bbf8018c2cf6e3b204e4fab929e151 SHA512 6d388afe676cdb07d47261ad394820c948f37314b4d7745e9ae621f13a65f9d4bc2516f05538b90cfeb40d5c06ed699262c091d30dcdd669c66bce53633e12f8
 EBUILD kparts-5.92.0.ebuild 844 BLAKE2B 8158762f82cdf310e46c2d7d51ed76d090967a8b48c694929d188963b426e04ed919c99fe7cbc616ef2ce361151b43bcc7b5b374a8cf111de19cfb2468449612 SHA512 712158700215907134852195c6003609688463d9827ea985ccdad6db10234f0da03700d70819b3782a63f3688fb945f1d8054d8d4e830f7c4c3f81fb5b14b976
-EBUILD kparts-5.94.0.ebuild 847 BLAKE2B 418332a213eed4d2edfe2c4b44bdfc6a78780113e8577e2e1c9e416825705c75db8233d99b32713f092476ed19b1a8684754d0d726fc229112b4670fe3cdd895 SHA512 e761e189400cc9c79acf222f6773f3de800ed11aafea71bd6927a48f7e368688507eade5264e15dd993462dbc7ba9bbc1d702850fb74827179623c50863990bf
 EBUILD kparts-5.95.0.ebuild 847 BLAKE2B 418332a213eed4d2edfe2c4b44bdfc6a78780113e8577e2e1c9e416825705c75db8233d99b32713f092476ed19b1a8684754d0d726fc229112b4670fe3cdd895 SHA512 e761e189400cc9c79acf222f6773f3de800ed11aafea71bd6927a48f7e368688507eade5264e15dd993462dbc7ba9bbc1d702850fb74827179623c50863990bf
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kparts/kparts-5.94.0.ebuild b/kde-frameworks/kparts/kparts-5.94.0.ebuild
deleted file mode 100644
index bbfe9dd2f857..000000000000
--- a/kde-frameworks/kparts/kparts-5.94.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing elaborate user-interface components"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kjobwidgets-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-"
-DEPEND="${RDEPEND}
-	>=kde-frameworks/ktextwidgets-${PVCUT}:5
-"
diff --git a/kde-frameworks/kpeople/Manifest b/kde-frameworks/kpeople/Manifest
index 53f7de21b26b..56f02bbb90ec 100644
--- a/kde-frameworks/kpeople/Manifest
+++ b/kde-frameworks/kpeople/Manifest
@@ -1,7 +1,5 @@
 DIST kpeople-5.92.0.tar.xz 59164 BLAKE2B cf3da54a9380e4f05945f58e6c4d8cf8c38d50c7b6b951362ffcee7029558437918935a6657ad352a9bfa0980248027c876571eb0601ca5223412c5c0c908596 SHA512 63131e26ee0efaad30d5375677f7b5a323cc7e05f8b5d575534357fe2b848a1122f2e864621d2954c766cb7c6f9daadfb5da700c0e91afab703bd7864145dfb8
-DIST kpeople-5.94.0.tar.xz 60212 BLAKE2B 3b65f617af6b48fa4a51f35284f48363603d926b23ab118f8cf818caa02436ae977d25c646364f544c942f06c20a2df0d83dcbd1cea3d399a97bd8eec13257be SHA512 257765a7591759118a5b76e66c67e7eb5bd2b2eaef9dce1eb7694824081ea830a87cce90465d1920961dac969fc33a8763afe1ea6080ee9f4b907fb3000a8be3
 DIST kpeople-5.95.0.tar.xz 60440 BLAKE2B 420d77be7136634a4b4c75cd21e9b76ef18e3562a34b6e44ccd8875e5ed51d2118f991381dbd66659f572b9dc81eff30b2ed0fae773fa9f9d0d07c10093417af SHA512 501fddcce188536113556688fea0a17bd0151ca825bde6fc59ee5d21cf8dc6af55ee418c03dae8b8e9b45fc8df4742d715fbae3747134e56bf7f1da28aef554b
 EBUILD kpeople-5.92.0.ebuild 877 BLAKE2B c79d27ac34ab7f84b37d7f3681114f8b4e223422d874a3aec85b4e3d7a305217e9392ee6ada23c3c5963fc61829277d0b1d23e998503b9662db3996530bb459c SHA512 9b6d8f89802c1cc63c21343173fd5fd7599856b27c444d83610b87a1894acde691c7fc14ea5baf4a561a919595db440aba031fe6bd4f05bfaa99a8ad4f5b1e43
-EBUILD kpeople-5.94.0.ebuild 880 BLAKE2B 6f22805756bb5248e7bef27ca6600f0f2675afba9fa128df4403188161c596a8a6f4e3fddc360413faae5244a7fdb0992757674b725f358eee2ea29eeab5ef68 SHA512 3fe8530c5dafd3faf0438e14865dc774daa93ba2664bfe4e810a2f57c0feafc53127d2fd65db7f537b4231f29918d8210ec6e9c916f7b8b3303a85534f794f06
 EBUILD kpeople-5.95.0.ebuild 880 BLAKE2B 6f22805756bb5248e7bef27ca6600f0f2675afba9fa128df4403188161c596a8a6f4e3fddc360413faae5244a7fdb0992757674b725f358eee2ea29eeab5ef68 SHA512 3fe8530c5dafd3faf0438e14865dc774daa93ba2664bfe4e810a2f57c0feafc53127d2fd65db7f537b4231f29918d8210ec6e9c916f7b8b3303a85534f794f06
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kpeople/kpeople-5.94.0.ebuild b/kde-frameworks/kpeople/kpeople-5.94.0.ebuild
deleted file mode 100644
index 2e5de7657908..000000000000
--- a/kde-frameworks/kpeople/kpeople-5.94.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
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE contact person abstraction library"
-HOMEPAGE="https://invent.kde.org/frameworks/kpeople"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kitemviews-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}"
-
-src_test() {
-	# personsmodeltest segfaults, bug 668192
-	local myctestargs=(
-		-j1
-		-E "(persondatatest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-frameworks/kplotting/Manifest b/kde-frameworks/kplotting/Manifest
index 39e372cefdd5..12bdf88fa268 100644
--- a/kde-frameworks/kplotting/Manifest
+++ b/kde-frameworks/kplotting/Manifest
@@ -1,7 +1,5 @@
 DIST kplotting-5.92.0.tar.xz 33684 BLAKE2B c71109a70dbd5a79bc5e0416d0677ee4de55fc51db4617ec0224bd65141fa0783c095a39847e16f95ae785d8792dc26067635e223cc27eef8c5121a85a0d26ad SHA512 e2f7507caef50f1227461fdb4be8a6ac9dcebe0f25d35357bb0c13f2dfb0f7cc33c885bbb7c143e4c61ee157570e907b9c51764c4c2d51d2831281d16b1603d7
-DIST kplotting-5.94.0.tar.xz 33704 BLAKE2B e6fdedc39981e619071d8c8677a1863249d60fc6a97c36b4d83966adc5fc97106ea21ad19f913498bb2bbe5afd06976690680f5dbd55681bd101530c2d95f809 SHA512 a4472b15bcdfc71f538193e95b8065f18717a85259b033823b31f48b2dcc73eddf5d380459b00ec27ae8922add16176bdaf78adf958be6226845a5cf5d72a653
 DIST kplotting-5.95.0.tar.xz 33724 BLAKE2B f2662c9df311a930285df0b48bf8140ee6694c5f6d3f1eef946106f9d9a673c152fb4c58715affd62ee73f161afe6afbf70d861cde01347c7acac92b503deb0c SHA512 612feaf9860a8a1a73897a5d4dd4468c72b9b347b0aea6acf48041ec067d79f8d504d9d8ca5207984c8c18a4989c8af776b91fb28cddf7a5618b06b54ad206f3
 EBUILD kplotting-5.92.0.ebuild 444 BLAKE2B 77506bb22bc5020c4b708c4a6e64fe7408a2ec5bea54263b196a550f824ce2190f200323a2b730ed92f21d42108e5fe612d804897b85049a996bd32582d80330 SHA512 b1baa6a2887c65aa4964ed0e6dbcbbb25bca02d8c0708725936875c8ffa4b4f48813c3e176377b3de499c49e0655beed6ed812e7f27fc51bd3459bea1139e4cf
-EBUILD kplotting-5.94.0.ebuild 447 BLAKE2B ed0c8c76d695cbe0d643a622a3110beeebd92475865407539cf7dc786aa071c0512fe1c9718710b7365961daeac0e6be60d90aa43f7b887a1ee7c54f5ca94426 SHA512 68e8a70d44a36387bb21280ac8c5ee7d4da3ab824f7343fce694d38e353bc5a77f239d00041d255125afa10ded8044322b77361d86387262bc8454c95442fe30
 EBUILD kplotting-5.95.0.ebuild 447 BLAKE2B ed0c8c76d695cbe0d643a622a3110beeebd92475865407539cf7dc786aa071c0512fe1c9718710b7365961daeac0e6be60d90aa43f7b887a1ee7c54f5ca94426 SHA512 68e8a70d44a36387bb21280ac8c5ee7d4da3ab824f7343fce694d38e353bc5a77f239d00041d255125afa10ded8044322b77361d86387262bc8454c95442fe30
 MISC metadata.xml 547 BLAKE2B 127ee4110b748cd3e3c26b63248d35f78b233b00cf4466ccc0145a613062a5aa9cc2e9ebd91d0e7482c67f6e265938176b169a9c52eda30bfcddf02549ec8f06 SHA512 2d36585b1af6205dc1bfcff7c3cb24c85376716159317b5c105c866143d49e89e91e501c9a4cf2d63265c30a09e8df71bca841319bd3f2b551e79fde90b1d96e
diff --git a/kde-frameworks/kpty/Manifest b/kde-frameworks/kpty/Manifest
index be245e8ce85b..9e3565f024d8 100644
--- a/kde-frameworks/kpty/Manifest
+++ b/kde-frameworks/kpty/Manifest
@@ -1,7 +1,5 @@
 DIST kpty-5.92.0.tar.xz 59040 BLAKE2B 3aacaa70e7b3c0afec1ce84120d48beb93dbe5f36ab3902a77a4138ffa4e0a95046b3cf3417eb28fab0e07dcfb1036ec25968a54b36a86b04082e14ef385a870 SHA512 b59826079f3bdbd6ca7d500c5dfe14fa8ef9841661763df5830134cdc729bc4568d0fa48910e5084d50c34cfa900ed409fbf9d5da0e6a35940c14a93fb1eb457
-DIST kpty-5.94.0.tar.xz 59392 BLAKE2B 74af3c118b8f4f7266936fe30740d94ce6f79049bfd8cd587c69a328aa95a4eff5851853926ddbe2342d8be1f56d61095eb79be09f4bb08afaa7d26cf0d8e444 SHA512 d3f5f2c1bf73fed79e1dc9735635b4241f4e3ef113bde76c997f26a0471ee483457fd694a2a2861838f6240ec9831c9c391aff8d69490a90a73b021a2c506562
 DIST kpty-5.95.0.tar.xz 59408 BLAKE2B 2aca588e22c9b66f650c2a3789f23ee2b1b1d61092752b9179b42f43d4c36c6aa5d643957713df614f04194477e3a536fbcb56ee2b04dabc163aaec0878c9c39 SHA512 ce668d4cb0a99af3ec176e2583308d95c7bd253ce2ce251a7f98fc316f6cf9a745dce29ccf8659df587cbec4a86045e0206c770575440d7cf78406926d182407
 EBUILD kpty-5.92.0.ebuild 557 BLAKE2B 41c87cd6ec78afe592b1fd40a0a3b07fdddc02658fd11a0904bb743d2fd1db7cb9576343a37a1e4bf94c4c1e686036370d035fc115b61e5555e7ccda252993f1 SHA512 fd33a3e8ceea6a1782c03bc0167e3cf364ecb2551cca61775122c7bdc49ecf68c7d8bed1861ebbf9e392f85aadde6c87a29c012a607a0f3b20c4cd8a631740b8
-EBUILD kpty-5.94.0.ebuild 560 BLAKE2B da07c96ebfaaa880e38766cc912a8a713fe564a53238c70b5c5490e492bcd385f28faeaad0cc2b996aace827adda1f0cd37be572333ff0fd7bbf4c795b29a0b9 SHA512 55cab3ee6ab6336def1604d5f561ea73401986c95bf375065201c21e23f3a25d39b94a129611cfbf01e439c1fd21b38ef91ff313ed357df119f97b29cd90b741
 EBUILD kpty-5.95.0.ebuild 560 BLAKE2B da07c96ebfaaa880e38766cc912a8a713fe564a53238c70b5c5490e492bcd385f28faeaad0cc2b996aace827adda1f0cd37be572333ff0fd7bbf4c795b29a0b9 SHA512 55cab3ee6ab6336def1604d5f561ea73401986c95bf375065201c21e23f3a25d39b94a129611cfbf01e439c1fd21b38ef91ff313ed357df119f97b29cd90b741
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kpty/kpty-5.94.0.ebuild b/kde-frameworks/kpty/kpty-5.94.0.ebuild
deleted file mode 100644
index 7287577f7e70..000000000000
--- a/kde-frameworks/kpty/kpty-5.94.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PVCUT=$(ver_cut 1-2)
-inherit ecm kde.org
-
-DESCRIPTION="Framework for pseudo terminal devices and running child processes"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	sys-libs/libutempter
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUTEMPTER_EXECUTABLE="${EPREFIX}/usr/sbin/utempter"
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kquickcharts/Manifest b/kde-frameworks/kquickcharts/Manifest
index a23fb681e7a3..94ffc4776f4a 100644
--- a/kde-frameworks/kquickcharts/Manifest
+++ b/kde-frameworks/kquickcharts/Manifest
@@ -1,7 +1,5 @@
 DIST kquickcharts-5.92.0.tar.xz 108900 BLAKE2B 36e2fef1a5a9d32a4680a2f4c8bba55508e6212050d4209be1589a962380ab03ec84d8688a61ae4dc5dbe75aca5e901f7e2fd42416e4c13bafdb369854d81135 SHA512 0e5ce7bd97e9654856066ce44068c7573370d4e33fc708d38a4350d15ec35d2a078b6891d6cfb22321e082b979301f5a03e82bb9268a5aab6b3958bb0a0a54af
-DIST kquickcharts-5.94.0.tar.xz 108824 BLAKE2B f5ae356b6715b8985618d1e638eccef8334bcb2a6c4b07327b2ec60717ea47b0dc696d98833dbaa39297f000adcc3b98630533c4120c2aeaa7ddf0dcb7998b96 SHA512 5877118f4d088a256eab6dbff6efcd88b25b7117d6be4f0debc6af5fe9244836fe683658a5593ee53e94d33ff08b48a31631605c5eae63827864432fd4c4d88b
 DIST kquickcharts-5.95.0.tar.xz 108876 BLAKE2B 6a5f8d0e8924f0f1ba51ba3162d654683802a6ad52a139f0b389f52dc7b281dec89f0ecbe99df8b4d722aba42817c56ec919a625730a057294645fab93b91782 SHA512 a02f862e46d26563f9247b6b98c665065983be7efda62ac7c19bb634406a12400b5b2ff090db74157933546deed8a16c53edce56753989a95e7ef0ead8364693
 EBUILD kquickcharts-5.92.0.ebuild 805 BLAKE2B 4c6e999ad6067cde0d127d7c62ce490772c0df862caaf53d4caec414246cbe109f49b44fa6fc234ff743dec303f58256f2e99804d168c336e22f527c8b64c1aa SHA512 daf8d46243c2b5de0f99525b5dfb90f89418cf4dda28bb471fcb8086ea9ec9fd987d035708e04a3cb02a602bd7db607cf34e718368ba7b1261824d06559223ed
-EBUILD kquickcharts-5.94.0.ebuild 808 BLAKE2B 8066e98ff53957c246b5be63977c5e1d66f0f676fc222e80fda061a9fd863dba04dd2ed8e1eeb1509596766404519ae4e5c01d02591876204ed5a026a2a8df90 SHA512 077a62fcfd5246b95284b198b651ca489ea5b3aee4f1f7c14f3ffe78d123045d1b0b14bcab3b03a883899da29bf994cf76f5594e329976120f5ab57ba85e444d
 EBUILD kquickcharts-5.95.0.ebuild 808 BLAKE2B 8066e98ff53957c246b5be63977c5e1d66f0f676fc222e80fda061a9fd863dba04dd2ed8e1eeb1509596766404519ae4e5c01d02591876204ed5a026a2a8df90 SHA512 077a62fcfd5246b95284b198b651ca489ea5b3aee4f1f7c14f3ffe78d123045d1b0b14bcab3b03a883899da29bf994cf76f5594e329976120f5ab57ba85e444d
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kquickcharts/kquickcharts-5.94.0.ebuild b/kde-frameworks/kquickcharts/kquickcharts-5.94.0.ebuild
deleted file mode 100644
index 991e00d3f543..000000000000
--- a/kde-frameworks/kquickcharts/kquickcharts-5.94.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_EXAMPLES="true"
-ECM_QTHELP="false"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="QtQuick plugin providing high-performance charts"
-HOMEPAGE="https://invent.kde.org/frameworks/kquickcharts"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	examples? (
-		>=dev-qt/qtwidgets-${QTMIN}:5
-		=kde-frameworks/kdeclarative-${PVCUT}*:5
-		=kde-frameworks/kirigami-${PVCUT}*:5
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_EXAMPLES=$(usex examples)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kross/Manifest b/kde-frameworks/kross/Manifest
index e8e2d0c3c126..366adafcad39 100644
--- a/kde-frameworks/kross/Manifest
+++ b/kde-frameworks/kross/Manifest
@@ -1,7 +1,5 @@
 DIST kross-5.92.0.tar.xz 129416 BLAKE2B d32c595cbaffdf93ccdfe0ad656b738ebdccecc4fefc559fd9dbf19837d2d9b659637e9dfde52e25634e3dea74f409fe7369b773fa964cfbfe4b07aa9eced6eb SHA512 f899ac754c8d75ac7b406d996ad5a5deb560cd6215b9e5038fab3d51229fb89409f5b09b6ecad1ede7c0a456c152e7fc9e58eefa6ce9109c8359a1bb30703e7d
-DIST kross-5.94.0.tar.xz 129388 BLAKE2B a6e2defc6d4920462516e6779c40dadc48ee13499f6d5d3ae3af70b28602b4c2cf6db35f0f5a25a77ef158fe93bd904de752567e55ef749218a79a435b0fdab2 SHA512 51000c2ff7f951230a32965e317865c583ecd174fac9a531c5503ed1aac713f309cb6b7472c2232b9d63de1d3a4e756c9b5483f2c45e71c86639318ae78c60d7
 DIST kross-5.95.0.tar.xz 129420 BLAKE2B 46df6e3246244b1aff1ddee4044d63c8e6c80e9dbe88d840d391aaf1c7d6981989b1fbd55100af98261edb58bb4f1bd58b17926cb97c02b519f8a4a643cd01dc SHA512 42a527a9b4197b02161a4d67e14d6e85ee29568681f0e5302ce68f6faa242bd8c10ae6b10a208add8363f40008841df534784cf1fb97357ec61356e4261e6bc3
 EBUILD kross-5.92.0.ebuild 866 BLAKE2B d5843b27620609ddb2deb68dd9a42e7145126933a085d6f1d391f4ea88f267c2c4be88898ea54b6a88f63b527d8ed14ba75323391cb804e02ab7b0ae6af14490 SHA512 b98277cdf84810d668efb8ee2bd1f3fcf1eac136b95733ea28f69857ebb4d1fa26be44fcdf501476ff91deb8520716704164a3c370ca85ed3c48523e203d8021
-EBUILD kross-5.94.0.ebuild 869 BLAKE2B 6d52945b24ba8b2c6dfcb93d6eeb73db735d1f90cf84515bda3d0849c64dfbcc7d1129b69077305650484ea13651a49887ee45a18833cfe381a6d862bca4a176 SHA512 18974866f7832729b85df6ba3334c5f22db19c1b67352e411dc02ce7247d9075808f0b7681345ca8daf602557b4bbf615152f46cb9c642052e379ff9d822cb7e
 EBUILD kross-5.95.0.ebuild 869 BLAKE2B 6d52945b24ba8b2c6dfcb93d6eeb73db735d1f90cf84515bda3d0849c64dfbcc7d1129b69077305650484ea13651a49887ee45a18833cfe381a6d862bca4a176 SHA512 18974866f7832729b85df6ba3334c5f22db19c1b67352e411dc02ce7247d9075808f0b7681345ca8daf602557b4bbf615152f46cb9c642052e379ff9d822cb7e
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kross/kross-5.94.0.ebuild b/kde-frameworks/kross/kross-5.94.0.ebuild
deleted file mode 100644
index 151ad697e32c..000000000000
--- a/kde-frameworks/kross/kross-5.94.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_QTHELP="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for embedding scripting into applications"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtscript-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	=kde-frameworks/kcompletion-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kparts-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/designer-${QTMIN}:5
-"
diff --git a/kde-frameworks/krunner/Manifest b/kde-frameworks/krunner/Manifest
index 6c585b6d91f2..25389a5ee400 100644
--- a/kde-frameworks/krunner/Manifest
+++ b/kde-frameworks/krunner/Manifest
@@ -1,9 +1,7 @@
 AUX krunner-5.92.0-drop-runnermanagertest-timeouts.patch 3358 BLAKE2B daadf28ea4a1163f4585b96341535219a2e816688b390f7bcdb949528ee2209448a750469cddac96692c032ad49c122c304642bec207e101415c1931fdd89b1d SHA512 202361b35b0ef0bb365c73417a8026e59b5f4126fce0289f8c4a9bfee39b3035a14fe1df9be631c9033ed561d9fb11ec416cb2cca604d3e4a303751afc5451de
 AUX krunner-5.92.0-increase-runnermanagertest-timeout.patch 1080 BLAKE2B c81f86dfdf44a4a3f54caddf87bd3eaa802549e3d53c19284b5910d73036b2f4f66f3023665d62cd4a0b8831b4725023c07d4b8c5479ea1674bfedd181baf605 SHA512 50d17e56d2a34dda95e3505318678fd83db6f7ebf1d3d00ddf153b134d8bf3473d2127f81232e44d235fc43da5afbd575998571b627142646011334b3a6cae7b
 DIST krunner-5.92.0.tar.xz 86108 BLAKE2B 570e67bac19646d7107c55dd607fda359334e3fe4cb72c6c80235b03f91e238f814b93486d9d3668880a2aed9d3a8bc2b6e518ac71e29943b0fd476235360052 SHA512 7959d1a7f55b6c2d55f2e4e65aef11d5a5cdf5e7b7bf5b702d1da4ed02c8e05a3c36dc5e70bfa443303863d98dc0cc7c418ebc46cbf68fad5baed4f2389bce35
-DIST krunner-5.94.0.tar.xz 86244 BLAKE2B a2803701c2971304d3abcf842e24c271323118b771258343c7e68022768eba9277d2576fdc7b622161b80770e7786cb294be24f72ff44acd44a75e419c3cd263 SHA512 86f2d81e4dbb0d1c716b4d8fc4d0dbda8494fa81bfb305ddc19d7278250fca48c3bc441e7773a27330d8f9888b81e293b5f585921e99ce252541db3ac0467b30
 DIST krunner-5.95.0.tar.xz 87344 BLAKE2B 4eb3539fd6664829e114c63bdeec9dac41eb1a374531a3c9dfd16671f8bb7f4bca7a97b57d35fb2df788b68b48fb9196ec778418dbac069b0e3971759a3dfa83 SHA512 f8be80109af811c9c2c30c1751d9e126c99d36a44821a498de4ff69ab035caaabdd3273940594a7a576e6f5532aa039824d7599d3106224bca01440a1bc94c41
 EBUILD krunner-5.92.0.ebuild 1313 BLAKE2B f9d32bcdc233a61145c4e9968c765cb3290afcacd6a6156da8f56c384b334e7016b1ceb327bb498d95be63d83624643bcbb8e712e0cbb0c8d5ba42c40a3a8f68 SHA512 8903d3d7386c793154825de5fb19be2ffbbd22c34719e699936c8875909a22b38bbbafa0ab6edcc8b4790ade115534a29b573d2ae8dcdd3194f22158e10baadc
-EBUILD krunner-5.94.0.ebuild 1157 BLAKE2B c4671194f470fd49804ff25ee0e873ec5d818219b6c30e8b00491f2540dd6b101d8040788698a5505f79ce023d97ee7ea984db2f351c41563eb38cef544fd4b7 SHA512 91e1f92e8dc3384dec6e4bd117dfc275b3ca6cd03e7601e8f020f90ae9ca71cfd070ced8142456f7119356eb0ffdb606b1d1105f606fe1cc8e3369ef97217ff2
 EBUILD krunner-5.95.0.ebuild 1184 BLAKE2B eb9510f443ab50d41b974ba72153d10c879fc724ca5d61be63075d4700901248ea9001df228143515204dc41baf2217f18e446822f3b2f3b054c6ac457075e8b SHA512 50d6b586bb75f0e2339edb396ed2f7c86e194d960d75e5f05b3812e21473c191a372fbd691a3baa23ad71c9ca458d60b2cc21e761bf181d7a769693b03d5a6c0
 MISC metadata.xml 552 BLAKE2B 6fc263110547ce6552754eceb08fa408b798642c8525e975ef326a154776129839872f1f66d72b499070b18af12f0dd5a84a8dc06287648c5fd00602c1a72ab1 SHA512 ab8b303f3c07000e126031e092019f3226cf59b191c221e1de39ce32bf44fede7918516be74bafda1886154026d1504c0ad3652b8ae9efe65831f09fbe8d52a8
diff --git a/kde-frameworks/krunner/krunner-5.94.0.ebuild b/kde-frameworks/krunner/krunner-5.94.0.ebuild
deleted file mode 100644
index 40103e8868b4..000000000000
--- a/kde-frameworks/krunner/krunner-5.94.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for providing different actions given a string query"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="activities"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/plasma-${PVCUT}*:5
-	=kde-frameworks/solid-${PVCUT}*:5
-	=kde-frameworks/threadweaver-${PVCUT}*:5
-	activities? ( =kde-frameworks/kactivities-${PVCUT}*:5 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package activities KF5Activities)
-	)
-	ecm_src_configure
-}
-
-src_test() {
-	# requires virtual dbus, otherwise hangs; bugs #630672, #789351
-	local myctestargs=(
-		-E "(dbusrunnertest|runnermanagersinglerunnermodetest)"
-	)
-	ecm_src_test
-}
diff --git a/kde-frameworks/kservice/Manifest b/kde-frameworks/kservice/Manifest
index 59c376badce0..8e76e14523a9 100644
--- a/kde-frameworks/kservice/Manifest
+++ b/kde-frameworks/kservice/Manifest
@@ -1,7 +1,5 @@
 DIST kservice-5.92.0.tar.xz 267336 BLAKE2B 9ab32695b8a32e8d56463cc0dd31d6f1c15380c75c502d9e5482ec6dcfa9ddb20b3dd795d327babb73186b47958fa10d9e5f25433456a9368210d90de5afd6d3 SHA512 e8673d2a3770557ef421f5ac37358066903f7c5624d1ced317b29e5cc34b759da4ae4bc1cc90f195427a0f0257283a804dc606afdcecb494946b2f3c8541ebc6
-DIST kservice-5.94.0.tar.xz 267700 BLAKE2B 05809bed20cfd13b15a5306c059e4a3011780b954cd145ab21b677b15111b577ff39574015f8b0765e9301f7dcbc58d7962a590eac803bc8cd7773ddbcbcb093 SHA512 d8c93e14821bc103a375e86f99fdf19f966596f7acb37eb5209ac0fbef045b5e56e3c725bfada4b47d00ea8119a00de3e8f246fcb4cb7b390578f48945ae1e15
 DIST kservice-5.95.0.tar.xz 267660 BLAKE2B 8a6db2efbd0f92a0e37b00b48ec79fb0d7de8fa5b0f53c3a773cb1acee0f6578009ee7f58f553ea6caedbd84ef1e699bd7457909a9100fb3752b04d0b27d830f SHA512 ce88817238bb8a671b5dc94d934a7dd4df8ce794452968836e60d6ad3781b1d3a25908f82c997a918ed99243579d394fad4a40955653881ac03484e054e8a763
 EBUILD kservice-5.92.0.ebuild 1013 BLAKE2B 70426a3f3696c14c492bf3c3f35502aedbcc439b6d816601e9606c8cfcc43c4c01e86c52d975d32b3eb98fb4f7ba732ab3820bb7d6584e2d75999002601e3a1b SHA512 05483b6d55983947fbcaf4a7183afcf32164923da4f99a1668f0c39092b0ee505cd324d3aa635a2d28d304973f333d4e0aa7efdfde5cc0a63bbb8f87e3497b26
-EBUILD kservice-5.94.0.ebuild 1016 BLAKE2B 3d0177f47a4aaf509bcc4661bd967c472d48093885264b47870e1e2c34ad99b9073283f7e5d9928a5da3db2479076677742cbfc952d61cf5584857883eceee9b SHA512 e4cdd6191dac1f6a3fb3adb6509ebe8a845ebc40fe3c136b9326f8408f3dc7770b9211178ed82e172256b7e43f797174194e7196d996b4a8fa9f280ec337bfc8
 EBUILD kservice-5.95.0.ebuild 1016 BLAKE2B 3d0177f47a4aaf509bcc4661bd967c472d48093885264b47870e1e2c34ad99b9073283f7e5d9928a5da3db2479076677742cbfc952d61cf5584857883eceee9b SHA512 e4cdd6191dac1f6a3fb3adb6509ebe8a845ebc40fe3c136b9326f8408f3dc7770b9211178ed82e172256b7e43f797174194e7196d996b4a8fa9f280ec337bfc8
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kservice/kservice-5.94.0.ebuild b/kde-frameworks/kservice/kservice-5.94.0.ebuild
deleted file mode 100644
index d65ead95a89b..000000000000
--- a/kde-frameworks/kservice/kservice-5.94.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.3
-inherit ecm kde.org
-
-DESCRIPTION="Advanced plugin and service introspection"
-
-LICENSE="LGPL-2 LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="+man"
-
-# requires running kde environment
-RESTRICT="test"
-
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
-"
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kdbusaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DAPPLICATIONS_MENU_NAME=kf5-applications.menu
-		$(cmake_use_find_package man KF5DocTools)
-	)
-
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-
-	# bug 596316
-	dosym kf5-applications.menu /etc/xdg/menus/applications.menu
-}
diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest
index 2375a8e42fd2..65d8f098d2de 100644
--- a/kde-frameworks/ktexteditor/Manifest
+++ b/kde-frameworks/ktexteditor/Manifest
@@ -1,9 +1,7 @@
 AUX ktexteditor-5.92.0-fix-crash-w-stale-indexes.patch 1094 BLAKE2B 803b7094d6dd25034e1d5d9ab7d33d06fd1527700f8ae49b57e7d345ff93acea37cda10e4cc3f5bae936fbd66ef44d7e6109912f04ff76b9ee7594cb94889706 SHA512 df3401f4f415a24038b8394e7053dd260e0dd6ea9b2accf857daedb95bf34f5a48e96795cd90488f51db09bc865590fca9e0f8fbe5b81eba2acaf9df521e20f3
 AUX ktexteditor-5.92.0-fix-toggle-comment.patch 4843 BLAKE2B 7723bd5bc04bcc97779c04b34fa2403bbd0084fa26e2f92d83719216e36b4162660153eabda30bb1616240fc164dfef27118ece97633096ff1d711037dcbe3ee SHA512 170277709bc93ab650085f7bed3930cb391a5926da31cd030a0eb0565d645a7a028db93a12ed09ae88119730bfb5364f282b41a82557616878d04a8c0259986e
 DIST ktexteditor-5.92.0.tar.xz 2347752 BLAKE2B c4e2356132f535dccbea1bae2355f3455b91d98c1cd99735db0ec39f0b2bc68f062e60e85f085e3614420d673487ea436243be485b321576022243736dec9f57 SHA512 5455fd579047db0010036afe0490620089687e206440ff77af270d9dcc25c1d48b3b8d763144f416cc539038c29e0e70703a1300b7ad78d0db59320a0712c402
-DIST ktexteditor-5.94.0.tar.xz 2388448 BLAKE2B 054114bafd06e041cc844ac3a579e475430a23bfa77efb97a74f6fbe2606336e42e137ac575b45de77be48d2dbe27d09a46743f6793a40505c84c4cef01e285e SHA512 cb42219ca4e2009c7df3adc85f45814e04da65e40490a37928b43623dd19c3567451c50b31d909fb08fa508c5e043016ec2f9789524ff248a27850c536fd9016
 DIST ktexteditor-5.95.0.tar.xz 2392068 BLAKE2B e8f8c8445b086aa24e9d74650ca2c896f65ed04f1c1618c1d6e8f9e4c04f0454a79cfb01ef66bb4364b323e846169fe83b7fe9d695a67de4a6b4bb6f75d1a320 SHA512 5c85a280aed0100c55716fed657bd6ab5d75674262d15cef8a71d169d50fa0fcbdb46d3c1602f9ff21545ab73dbf93a951f1333c6fe5e05d729de8c16cb1eaa5
 EBUILD ktexteditor-5.92.0-r1.ebuild 1662 BLAKE2B b0cf93eabd029c5831da8dfbc1c1dfd042687c05473a42417279665cabfb121ff80614b5e0066698185d2ea09e65a9d3757e475935052f9c9378f9b6aba15e2d SHA512 f19e21b3b1e2116ee64143eb2a79ba79670ea449cc152ddb964b0ded9abfa4184ea099440ad53aa54c2df3624567e1c8d270a8970dcab5a3eccfc00136e7c108
-EBUILD ktexteditor-5.94.0.ebuild 1521 BLAKE2B 55b37442857ea10397f364fa4651ce6562cca2b7a6c54f46a5928a5c87362fc67fd017573fcdcae5a6f887578b7d1d0c5294d598ce758e59dfc10c372373c18c SHA512 d2031fb3f489c7226a7b314d75aadad560281697820debb469740b5aa56c37429c63bded7f6ad350c56a9983e0a07212a603623b1dfead51c19d30455e8ef94e
 EBUILD ktexteditor-5.95.0.ebuild 1521 BLAKE2B 55b37442857ea10397f364fa4651ce6562cca2b7a6c54f46a5928a5c87362fc67fd017573fcdcae5a6f887578b7d1d0c5294d598ce758e59dfc10c372373c18c SHA512 d2031fb3f489c7226a7b314d75aadad560281697820debb469740b5aa56c37429c63bded7f6ad350c56a9983e0a07212a603623b1dfead51c19d30455e8ef94e
 MISC metadata.xml 558 BLAKE2B 4f17698120e7bb1f131519e4a43f33e99916d3690a548412572a43cc060a115eeed44d0ca0cab43f7c3fea8c098f4c495ce571ea1cb6ce78a25e7ef0fb49f1e5 SHA512 441d42f0f301c60e77f90d40cf57f76addaf455225a99e63ea95ed3b7a08d944fe80260c7188a989d830277006da96f271fb6a02bad41ead3bea7358621ae04a
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.94.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.94.0.ebuild
deleted file mode 100644
index da79d7e161e9..000000000000
--- a/kde-frameworks/ktexteditor/ktexteditor-5.94.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing a full text editor component"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="+editorconfig"
-
-RESTRICT="test"
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	=kde-frameworks/karchive-${PVCUT}*:5
-	=kde-frameworks/kauth-${PVCUT}*:5
-	=kde-frameworks/kcodecs-${PVCUT}*:5
-	=kde-frameworks/kcompletion-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kguiaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kitemviews-${PVCUT}*:5
-	=kde-frameworks/kjobwidgets-${PVCUT}*:5
-	=kde-frameworks/kparts-${PVCUT}*:5
-	=kde-frameworks/ktextwidgets-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-	=kde-frameworks/sonnet-${PVCUT}*:5
-	=kde-frameworks/syntax-highlighting-${PVCUT}*:5
-	editorconfig? ( app-text/editorconfig-core-c )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="test? ( >=kde-frameworks/kservice-${PVCUT}:5 )"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package editorconfig EditorConfig)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/ktextwidgets/Manifest b/kde-frameworks/ktextwidgets/Manifest
index c29805966a90..92e4cfd6fa29 100644
--- a/kde-frameworks/ktextwidgets/Manifest
+++ b/kde-frameworks/ktextwidgets/Manifest
@@ -1,7 +1,5 @@
 DIST ktextwidgets-5.92.0.tar.xz 329168 BLAKE2B ee0991f12d7e3a54b4e79b77327378e9c61544f5c5133f9bf838b3995ff828f2b35fa7489c6407efa08770911e47883587d519e78ef5d8e112483c744c9875d2 SHA512 7fd02eebb10b2929a6d82acdccba07a906692cdcc92f824b360e4be5643412b7bbb34772b8e6762e95c769d2528bdc873ce4fd03c8dbd5b5fd26b341ffce9e9d
-DIST ktextwidgets-5.94.0.tar.xz 329296 BLAKE2B 13bd0a3b1ccc232e85ab855617eca9dd186c523cdb641d2ed55afc8bfba250771942a57ccaee99ac54cf98551af8e9ded0eeacd848070794d1f12dc42e435f9a SHA512 8b25e0ac4a84fc0f763a3450fa520c551f83b4e2d26e99bc5e1830f4c36c1fe9de2bae7aa9608630a24b73239948cd6b4b22fa6b24e21c5ab218d99c0cce2cee
 DIST ktextwidgets-5.95.0.tar.xz 329372 BLAKE2B 09750ed4e2f6488ce4a1d2899cef6ce561d70dcbd284de7c2602b32cc4d9b504ac56c56bd5612342b2c4fc673aca8fdf9cddf956fe25c2c9468ec9a17d1d9eec SHA512 63f45cd542d81de8591668922c63ca023f637fea0374f6ba15cd2481c6c42ab7748419c18f65c14b05d1801cc725827d2436622f5d40ee2ff00cca5b463eae04
 EBUILD ktextwidgets-5.92.0.ebuild 962 BLAKE2B 78fdddc9da064897c001d9fd7b122f4504565f0e345ebe95e3ac40126686e616286b64b9b5f7f44f2dfa2e05382f26d65250fb050f21da5489cd1f253288a790 SHA512 49d46347f55d9f10a3dcf3d0ac4ef88c59d8b681ed40f409bbd2415af8c624c91cd42a8c8cc6277122911475c211f17c0a559876db4cd5041b9e0acc37b9856d
-EBUILD ktextwidgets-5.94.0.ebuild 965 BLAKE2B 87abdd8fe9c6c0d3ce734cc8f4cd17ca86b1fc81b21e48f27c0778ae010feeb904fd47e9dbfe276d4806c595bdf93749edcb3678a2b318a097781f33797c661c SHA512 4db80cd5c13163c6b93f5d1c431d3319ec90e6db39194759c2a07949cdac060fa145a66b2ea90cf35d915c211cc0d9af1b31759d4825b5300118ac7290686c1d
 EBUILD ktextwidgets-5.95.0.ebuild 965 BLAKE2B 87abdd8fe9c6c0d3ce734cc8f4cd17ca86b1fc81b21e48f27c0778ae010feeb904fd47e9dbfe276d4806c595bdf93749edcb3678a2b318a097781f33797c661c SHA512 4db80cd5c13163c6b93f5d1c431d3319ec90e6db39194759c2a07949cdac060fa145a66b2ea90cf35d915c211cc0d9af1b31759d4825b5300118ac7290686c1d
 MISC metadata.xml 606 BLAKE2B b0657b12dfbcb381fbc777811260f4904059890473e420a0f5bcc82c9e785c0611f61355b665c57042cbacbf0d397f0ef190a152b9dced6c7ada3c7b024f4bca SHA512 b7d8f946e5fdbe0ba748f6236ea9273c95687909bd6d6306d722dffbfece7233aa1b5345f9b3033471f5772540a166439602dca828df8d7262c0035908552076
diff --git a/kde-frameworks/ktextwidgets/ktextwidgets-5.94.0.ebuild b/kde-frameworks/ktextwidgets/ktextwidgets-5.94.0.ebuild
deleted file mode 100644
index 0513262164ec..000000000000
--- a/kde-frameworks/ktextwidgets/ktextwidgets-5.94.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_DESIGNERPLUGIN="true"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing an assortment of widgets for displaying and editing text"
-LICENSE="LGPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="speech"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kcompletion-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/sonnet-${PVCUT}*:5
-	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package speech Qt5TextToSpeech)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kunitconversion/Manifest b/kde-frameworks/kunitconversion/Manifest
index 85590d7bc3db..c074c089a0d9 100644
--- a/kde-frameworks/kunitconversion/Manifest
+++ b/kde-frameworks/kunitconversion/Manifest
@@ -1,7 +1,5 @@
 DIST kunitconversion-5.92.0.tar.xz 893192 BLAKE2B 7f6df447e8a61ab193bc14e56aef065106a55622f750f760b0b77b36f18f29677bd79e92536904d3d93511d69c13e8d46cd88840529b453f89241c37c427c7e6 SHA512 4d1d2028f392d35ca90bb79a2f1102e14807c28f87bc1031eb502122e9b9d7d69ba0bb2ab04581a2a378299cb3831b73b1457e4d25a49b29be55d25f48cb001f
-DIST kunitconversion-5.94.0.tar.xz 892292 BLAKE2B 62401211af40ef51415d508752906a0582efa808f2fdb8ac136c8abae4bfefeff347767fcb0e18c0ee0e0604c362e3eb2067988727ce874911aba9d7b5816d5c SHA512 28435650c81835728c3dd44b60ac21467b52595613413c9ebffc66b5f970dfec31af8a491893a6d699b323bd763f3d440a22540c59bfdbdd2a5dfb97dac89f04
 DIST kunitconversion-5.95.0.tar.xz 893812 BLAKE2B c05c258c1e4056d602d8fe8558e20b533076af0c47d371ecddd3cc2ed9f0992c1686bf229ed228b143c92f5363f4c5e873b198c4d36f1163350623d76c49aab4 SHA512 3f2969c97995f95ede02b697a348ab9e58ef7f012385be6ee980255594f6b257bbe5ff33877ada9a81f7fad05231620d82c8c4492cca5277afb47cf4131edfba
 EBUILD kunitconversion-5.92.0.ebuild 706 BLAKE2B 6210cbff5bbcd0ddbfa1c168ea18cf97bfc1fd7023a79d7164c826624482573e996b372f60786c19d96ee0d8127f425f800106cd78bc19e16291308beb07e002 SHA512 3de084dd973ce240743eb5f764580d496046a9d2b3bfbf6e6a34f1e3580d62c1f59624b110e46523f4aecf632bbac3c45f766142ef7f91e7743237ea46abc125
-EBUILD kunitconversion-5.94.0.ebuild 709 BLAKE2B d09b546a61fd993312403c60e787ed1c794f2e44363b54a4160f62227f6b17231f3ebd7f058d50dcab63047de49828bbca5da3b89fac90e72fb0fd782a5561f3 SHA512 a545e9c8ccb3ca6a5f3dfba140743b4b49654a8704c1028f6a112b0decea7327087b4e4cd19492803900687cda6d4a0c137c061ff70dd79a0af7681d2b2bc216
 EBUILD kunitconversion-5.95.0.ebuild 709 BLAKE2B d09b546a61fd993312403c60e787ed1c794f2e44363b54a4160f62227f6b17231f3ebd7f058d50dcab63047de49828bbca5da3b89fac90e72fb0fd782a5561f3 SHA512 a545e9c8ccb3ca6a5f3dfba140743b4b49654a8704c1028f6a112b0decea7327087b4e4cd19492803900687cda6d4a0c137c061ff70dd79a0af7681d2b2bc216
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kunitconversion/kunitconversion-5.94.0.ebuild b/kde-frameworks/kunitconversion/kunitconversion-5.94.0.ebuild
deleted file mode 100644
index 3c95772ed6b5..000000000000
--- a/kde-frameworks/kunitconversion/kunitconversion-5.94.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.3
-inherit ecm kde.org
-
-DESCRIPTION="Framework for converting units"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}"
-
-src_test() {
-	local myctestargs=(
-		# convertertest: bug 623938 - needs internet connection
-		# categorytest: bug 808216 - needs internet connection
-		# currencytableinittest: bug 808216 - unknown, reported upstream
-		-E "(convertertest|categorytest|currencytableinittest)"
-	)
-
-	LC_NUMERIC="C" ecm_src_test # bug 694804
-}
diff --git a/kde-frameworks/kwallet/Manifest b/kde-frameworks/kwallet/Manifest
index d211886faf12..4eedaa27670b 100644
--- a/kde-frameworks/kwallet/Manifest
+++ b/kde-frameworks/kwallet/Manifest
@@ -1,7 +1,5 @@
 DIST kwallet-5.92.0.tar.xz 305528 BLAKE2B adf94a05ad064a02c5c8cf291014e554f9e432aa07977b08c97b5b61babff53e2e973c16b10ad5ab48cbd7a48b4b3afecabd576070db8076a0cfa2608d7588f1 SHA512 db65cf0e40a758129122e8320b1971e35de5e7a9b65248937e5b3c65063515ce3520ea2f32eb363d138d9c53afae39e2f86618ac318fb19d099a5fa38ac18c6a
-DIST kwallet-5.94.0.tar.xz 307240 BLAKE2B 5a5e7a7b13583bcec24f2fbb18891c632e500bc07385a435674a995967593914e282b95644b1e349cb31e6ebb3e917cc8a2e6094bbd01e3670d45618250c2eeb SHA512 9cb0105413d983bf89819f60fc36182cbb59737be316ce52262fe68f388dc1262dfb404ef0703af48ec75bd869985829f67b58f433f6b366ef780ad553ee9638
 DIST kwallet-5.95.0.tar.xz 307480 BLAKE2B aed7ce43e92b2fb9d7494faca43b6c3ce807eb717dc0a4693ee8c512db9d42fd288104f214402d3ef183f34791f4dc0caefb77380d77b7f04d69be3484375b16 SHA512 c31ed480acc367ff7db25da0115769ae4e0ff329718be343a9b7565ef17adea1590af611c6f04086fe5ecc050e66d9eb6f6611aee71284422a86c2f5c7df85a1
 EBUILD kwallet-5.92.0.ebuild 1386 BLAKE2B 9d346ef6a142876e06379a67e49a9b10776f71ed9a55545bfe77a6586c1963f90323a7da91914632e105520f6d245e0cc7d7069aab42a55862da4fc745404a28 SHA512 c88833f8c73663b7bf9da0feae8684bc8789845643fc697da712468feb619f3e6011083890316627f2441ca67366cf2887d6aaf408a25a572c5dcf4259be618f
-EBUILD kwallet-5.94.0.ebuild 1389 BLAKE2B 525efe96b827e33ffb5120a799d22842eb7928ec760cfb8ff0fd370990f7ba0104e9a88367304acf00ad9fd6673910e59b0901b00dda78817ff97412af030f30 SHA512 6816528ad58fe2a30af4145aa5ac2422e6b585aa7eca234de096e994fe4efe2e25e4f5ed605c21f14f7db4035aa4c6b8fd132703fe0196e37c0a162769d68142
 EBUILD kwallet-5.95.0.ebuild 1389 BLAKE2B 525efe96b827e33ffb5120a799d22842eb7928ec760cfb8ff0fd370990f7ba0104e9a88367304acf00ad9fd6673910e59b0901b00dda78817ff97412af030f30 SHA512 6816528ad58fe2a30af4145aa5ac2422e6b585aa7eca234de096e994fe4efe2e25e4f5ed605c21f14f7db4035aa4c6b8fd132703fe0196e37c0a162769d68142
 MISC metadata.xml 586 BLAKE2B 7ab7b780f8861068d289d9563a6a81ee660265764db00a7be316a1242fc56689af895248783ee8814b95f46ce35bfa7533d511b2c47b1170b46ae0ba96aa92e5 SHA512 f0d5748631151406a2baf5401386cf644a8d373651e44858f336741a8eecffe1b3c2967b10925fdd9490a050740b3f9eba781f2aacee13fcd211c3145c625a3c
diff --git a/kde-frameworks/kwallet/kwallet-5.94.0.ebuild b/kde-frameworks/kwallet/kwallet-5.94.0.ebuild
deleted file mode 100644
index 4f2b363ed354..000000000000
--- a/kde-frameworks/kwallet/kwallet-5.94.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.3
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Framework providing desktop-wide storage for passwords"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="gpg +man"
-
-BDEPEND="
-	man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
-"
-DEPEND="
-	dev-libs/libgcrypt:0=
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kdbusaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/knotifications-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5
-	gpg? ( >=app-crypt/gpgme-1.7.1:=[cxx,qt5] )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package gpg Gpgmepp)
-		$(cmake_use_find_package man KF5DocTools)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "Auto-unlocking after account login" kde-plasma/kwallet-pam
-		optfeature "KWallet management" kde-apps/kwalletmanager:5
-		elog "For more information, read https://wiki.gentoo.org/wiki/KDE#KWallet"
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-frameworks/kwayland/Manifest b/kde-frameworks/kwayland/Manifest
index 8710dc8b6ee0..b64437e27092 100644
--- a/kde-frameworks/kwayland/Manifest
+++ b/kde-frameworks/kwayland/Manifest
@@ -1,7 +1,5 @@
 DIST kwayland-5.92.0.tar.xz 335360 BLAKE2B 57d42694c46b090fd62d1886f4818134f9d5e19f78665d4a8bf9f05572d5523c3580ce4c4f8da869371c2bf1de9bbac4d3a0d7fa40993b94291e12af2e4c9472 SHA512 982140987c5cb561c25afc2d8e573db37764fde1b87d395af0c21d8d63e9a6a70dd4fdac3b70881588acca28b4c45a2af470fd9ca260fbd9bd14ed4e299fa2ed
-DIST kwayland-5.94.0.tar.xz 335524 BLAKE2B ded4dba214b12872bb2d07861b051944eac409003b0268463c62c48f35420307495e2287ac502222d35ef893f1282765e48b824149ca951da0cc5fd494fe44d6 SHA512 56d10d1048967d0c54ba88339b31ddef4b5cf3a3aa743f8fac56f5c97292112d7fa998107a854e999a54ac4ab4659e7dbf6d6c496856de4e91c45df9fafdf399
 DIST kwayland-5.95.0.tar.xz 335624 BLAKE2B c6e31c762187584ca567c890276319bfc0c23ccce4fca4f302a58291a8c1e4cff8179d2f720a3f115ab8db6f835cd1e3e79102da679e87925c6806f38c821f43 SHA512 8a10bdfe610ca9b0512e887637a8472bf650a6cb4d2a80fb102d7691cd6a85d6512bdb3feb52bc42ca7ee5d9d627c947b0a47e31d3a9852cf5a25eb7223c1681
 EBUILD kwayland-5.92.0.ebuild 884 BLAKE2B 6354d55621540c294d19496bfb9f484ccd4a52b9c9603c379b8db1535b4e99e393490ce45143eafc4781e4f57b47f64b1e1dbf839ff12bf0f41ae02e4e03b224 SHA512 8997a29c9c5c46f060b4bac0c596032087bc7187a7843d6c9667801fbfa49afc101e984d90196d320b13aab832fa5caa355cc3bf225810057abcc80bc1ca577e
-EBUILD kwayland-5.94.0.ebuild 894 BLAKE2B d3e9bc26eb9f4d8d069514820b083b184dddfe0958276569726c42606e62c9224397698c4742cf9108796eda2fe4aebc894a31fe7b8cc7d6227d5209072fd1c3 SHA512 513d7776ebf460866a70b756e999c194fb51955a753758eb1618bc1c29b27a55f899511f815a0335323bcf3baff807ebec482dfe19f5e1500be92837faf7b0e4
 EBUILD kwayland-5.95.0.ebuild 894 BLAKE2B d3e9bc26eb9f4d8d069514820b083b184dddfe0958276569726c42606e62c9224397698c4742cf9108796eda2fe4aebc894a31fe7b8cc7d6227d5209072fd1c3 SHA512 513d7776ebf460866a70b756e999c194fb51955a753758eb1618bc1c29b27a55f899511f815a0335323bcf3baff807ebec482dfe19f5e1500be92837faf7b0e4
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kwayland/kwayland-5.94.0.ebuild b/kde-frameworks/kwayland/kwayland-5.94.0.ebuild
deleted file mode 100644
index 8d11ec295b6c..000000000000
--- a/kde-frameworks/kwayland/kwayland-5.94.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.3
-inherit ecm kde.org
-
-DESCRIPTION="Qt-style client and server library wrapper for Wayland libraries"
-HOMEPAGE="https://invent.kde.org/frameworks/kwayland"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE=""
-
-# All failing, I guess we need a virtual wayland server
-RESTRICT="test"
-
-# slot op: includes qpa/qplatformnativeinterface.h
-RDEPEND="
-	>=dev-libs/wayland-1.15.0
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5=[egl]
-	>=dev-qt/qtwayland-${QTMIN}:5
-	media-libs/libglvnd
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/plasma-wayland-protocols-1.7.0
-	>=dev-libs/wayland-protocols-1.15
-	sys-kernel/linux-headers
-"
-BDEPEND="
-	>=dev-qt/qtwaylandscanner-${QTMIN}:5
-	>=dev-util/wayland-scanner-1.19.0
-"
diff --git a/kde-frameworks/kwidgetsaddons/Manifest b/kde-frameworks/kwidgetsaddons/Manifest
index 498f04b8e034..182d5a6b27cc 100644
--- a/kde-frameworks/kwidgetsaddons/Manifest
+++ b/kde-frameworks/kwidgetsaddons/Manifest
@@ -1,7 +1,5 @@
 DIST kwidgetsaddons-5.92.0.tar.xz 2313060 BLAKE2B d48d1be09dc65d79eb5961394ac5bd1f26c0613128c10faab45f5011131f7a2233733aaa844705f7905f3aede240ef6734ad4a68eb044af7531203252e2e8ca9 SHA512 a983eb8c8b186c0fade674516b6a99a6455d512c0ee243af5cfcdfb5733adfd9ca2b2e674959312350dfcd4faae8bc62a57cc356bd30b0420f9ed54db7bafd9f
-DIST kwidgetsaddons-5.94.0.tar.xz 2317872 BLAKE2B 1662ccb820f66a778e4e77a3ce1d4c08505e1bccc70327e05a3d1b47ac75dd3b879e99e0f8471475ea4a6420ab621d71dc92636ec05646655522694f3ed37ea0 SHA512 321c742465d911fe7358e77aef6f73175387eb906b9247a2e81880efb5c4d335bb2045186eb73a6425869d1372792785cd1165077eaa7414acb10384ea45ee4d
 DIST kwidgetsaddons-5.95.0.tar.xz 2312580 BLAKE2B c0d187889f858e38838190ff29ae3121507df4c041e07d251aa20feb6c4c6d245cc2c629b1ad7e922f6cfd753fdba3804e57678f220d138320c968b37f2eac5f SHA512 1f79aa0f810574213c83c26ee454a50e52c08167c029be239d83f089858a28dcdd31720cc2fed606f319b8d7fef05743ca06424a1249b4fdcfebbf043688cbc3
 EBUILD kwidgetsaddons-5.92.0.ebuild 668 BLAKE2B 320d59f9ce005d27faad771fd748c0f5b54a7a6a27d4e5f40c7ed84843c4327b5e08ac13ed8d6d6e817dc0f8d96e9bc84643ee79a00afde156e016f9ee5a6690 SHA512 4e44dde14ba8b38a626075f043e0390ab9d39640286c1be4d52f01c51cac6b33455fe214eff7f7395769dd07fd7ff913e70f0df6e394ac2ef6052c66b295d5c2
-EBUILD kwidgetsaddons-5.94.0.ebuild 671 BLAKE2B 781849fd9afec3a4e4011665c5206507a95d0a1d7c4cc2e9c2065364410d7b0da343af610f6f1bc3708306c4112b2aa8dea7bd23cd61321285e2a95cfb4142b7 SHA512 30abfaa4593b081ac346c1c5a168ffb75378e96a34b44325f239b1aa0a3053f107b3db6d3c8dc1ed5b880f6fa2ea1ac7ea4d8d410d3d90633cd928e75b1c2062
 EBUILD kwidgetsaddons-5.95.0.ebuild 671 BLAKE2B 781849fd9afec3a4e4011665c5206507a95d0a1d7c4cc2e9c2065364410d7b0da343af610f6f1bc3708306c4112b2aa8dea7bd23cd61321285e2a95cfb4142b7 SHA512 30abfaa4593b081ac346c1c5a168ffb75378e96a34b44325f239b1aa0a3053f107b3db6d3c8dc1ed5b880f6fa2ea1ac7ea4d8d410d3d90633cd928e75b1c2062
 MISC metadata.xml 547 BLAKE2B 127ee4110b748cd3e3c26b63248d35f78b233b00cf4466ccc0145a613062a5aa9cc2e9ebd91d0e7482c67f6e265938176b169a9c52eda30bfcddf02549ec8f06 SHA512 2d36585b1af6205dc1bfcff7c3cb24c85376716159317b5c105c866143d49e89e91e501c9a4cf2d63265c30a09e8df71bca841319bd3f2b551e79fde90b1d96e
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.94.0.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.94.0.ebuild
deleted file mode 100644
index a4f93caa581c..000000000000
--- a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.94.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_DESIGNERPLUGIN="true"
-QTMIN=5.15.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="An assortment of high-level widgets for common tasks"
-
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="nls"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-BDEPEND="nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )"
-
-src_test() {
-	# bug 650216, 653186, 697866, 808216
-	local myctestargs=( -E "(kdatecomboboxtest|ksqueezedtextlabelautotest|ktwofingertaptest|ktwofingerswipetest)" )
-	ecm_src_test
-}
diff --git a/kde-frameworks/kwindowsystem/Manifest b/kde-frameworks/kwindowsystem/Manifest
index 269b831dda9a..7f465ddbe750 100644
--- a/kde-frameworks/kwindowsystem/Manifest
+++ b/kde-frameworks/kwindowsystem/Manifest
@@ -1,7 +1,5 @@
 DIST kwindowsystem-5.92.0.tar.xz 182136 BLAKE2B 0324dfbf0480bf91ab10cd35adf4b38a85decd463a7e14f94ef9b50ec34344c0119599c45c3148613caae22e5be6af6bf4d5cecf8d2674fad25a4d573d6c0146 SHA512 022f0a26ddd19b10d1f3365218030e148123ade4324c60f028a01f8ae96426a53de09d2eb60aa46534447da9125ef01b856d4efcd45d56ee5bb26ce784e927e7
-DIST kwindowsystem-5.94.0.tar.xz 182240 BLAKE2B 12570a98c2f140c8dd1c0f35e90a16285cd60ae0e58014ea2d967cc939e1ce62f3e83009b7f0633335135b01b393f1f094553ba0729f5ae3cadfbe1b761854e5 SHA512 908f8bffdfbcc17a605a3e46c652508859b34d2990a171509af8c3b886f62a0c9724697f82e08949625e407c4daa6b4bd5ed80d949b6365060c17bc01e8a5944
 DIST kwindowsystem-5.95.0.tar.xz 182340 BLAKE2B 0823a17a7b6183c728943cfc502bb6e0c46f9cdfcd298b48f0fc2fa892b6606cfdb399f4a39bd4b0d982f15595a7c2ea56dd1e5f41c2bdfcec8dd13f862a042f SHA512 ed1df6fcc3dad2f8a318e7402c7e72f620523bc39ad54dbf032c6c11384c788b59ec075c83631caa473c6450504fa0564f66770b54a873aa04d8e2c059a03c5a
 EBUILD kwindowsystem-5.92.0.ebuild 856 BLAKE2B 838e64f173bf54dd7df36a8fbae3b5769c54cb2e770696d5bdb0b18f08982b4445809698f37af39a8b06e564c068d34143fafc836613bf6a0bf906b26e59db66 SHA512 f99396c7c297b43044ba5b9278bd3eac72260597420e29b85b07f7052129dc8a1947e8b2badb4d1e6b22571b28b4d291b899245d63ff75b96d8f093ab18102e9
-EBUILD kwindowsystem-5.94.0.ebuild 866 BLAKE2B afffd0e601defa6eadab8675fe0af66a89e49b6bb722f1d1d3341489cdf350cb6f0e2279879a5f13e677a7ceb66382cf0beaf04fa80241edb1f3b8a534dc09dd SHA512 a64f18a9e94c7143fa287c3b4a913f06df210a1185ab593d6e757486a65415673adb31423115f19527733f342416440b5e859fffd248aa056697e12f9450a764
 EBUILD kwindowsystem-5.95.0.ebuild 866 BLAKE2B afffd0e601defa6eadab8675fe0af66a89e49b6bb722f1d1d3341489cdf350cb6f0e2279879a5f13e677a7ceb66382cf0beaf04fa80241edb1f3b8a534dc09dd SHA512 a64f18a9e94c7143fa287c3b4a913f06df210a1185ab593d6e757486a65415673adb31423115f19527733f342416440b5e859fffd248aa056697e12f9450a764
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-5.94.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.94.0.ebuild
deleted file mode 100644
index d0296907bcd4..000000000000
--- a/kde-frameworks/kwindowsystem/kwindowsystem-5.94.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=8
-
-QTMIN=5.15.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing access to properties and features of the window manager"
-LICENSE="|| ( LGPL-2.1 LGPL-3 ) MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="nls X"
-
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-		x11-libs/libXfixes
-		x11-libs/libxcb
-		x11-libs/xcb-util-keysyms
-	)
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-	test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
-"
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-
-DOCS=( docs/README.kstartupinfo )
-
-src_configure() {
-	local mycmakeargs=(
-		-DKWINDOWSYSTEM_NO_WIDGETS=ON
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kxmlgui/Manifest b/kde-frameworks/kxmlgui/Manifest
index 482b21f020d2..d7afa1917c06 100644
--- a/kde-frameworks/kxmlgui/Manifest
+++ b/kde-frameworks/kxmlgui/Manifest
@@ -1,7 +1,5 @@
 DIST kxmlgui-5.92.0.tar.xz 895672 BLAKE2B dc1e6e59d367b830447049a69b8b1d41d9b5e1bacb88c7e229a37c507dd4ad17b8888dd5f5456099a30076c95b6ed8bf8f0b44a333226c939bfc755410bd02f8 SHA512 5c8d68aa59259e4048f32224ef0672984d6edbffb38476d2bbe9466b72a14aaf318cdba4a1eebb4209879e9cf880e736b9647491eca8e3ec8f4c03d50cf222e9
-DIST kxmlgui-5.94.0.tar.xz 898380 BLAKE2B 60399835046d09c0373d64ed94db31d2cc0f0d93fb9395771c00c1888efcb849c709308b6ea4039044ef188abdd2320472a8fb31b38c9b8b24245168bab6a140 SHA512 6f220a270263a97d4e6965360d0e8c908a0a99ae29cced7fd8a971d1f2ed9a6b180697ebb6fc93012ac3ea3f7b22c25539cd35c70ddf840ab2c0f63cd21e6bc5
 DIST kxmlgui-5.95.0.tar.xz 897948 BLAKE2B 55e646a2088245652c9139ee20659e3e1d66986bc7266311484d3173d29a949a7733bc8d5528dcfcacf7eac18a8746b67eb7765571b3d92db025397825a4caf8 SHA512 6aaf99420523d9bf22e5e7427f7dba90bd3b60c9dc718293ec5fdd489d910bd72973da03cbe4a04b202710ee3eedb2a99cc21aff9f97edbec39a4f47be5e2acb
 EBUILD kxmlgui-5.92.0.ebuild 1213 BLAKE2B 559149dcedd5d69d44dd72c18866e2c0285b263aafa0ae450c2e5bfe13ff77d0a8585974886e76817fdfc16de1138a9daee6d4f7cf9dfb5f7e8e467dd010056d SHA512 8d8ac4dcdf658f4e270847a130a138708033de30578d4fb66d9f72325f87fee9cce5f0002d13e432547a1338db7b83717b6ad74760de26f2d2addb526e15d1e5
-EBUILD kxmlgui-5.94.0.ebuild 1216 BLAKE2B 7c68547168879ec49da78df2ee6c219aec626ac922be335569e4bffb7cda138e329e6421f18c49be264c728d60ccac50f00c7b962b80f095cbea473421b725f1 SHA512 8dd8abda4fea719a9777ad7f4241123caf39adf1a2caf7c499856a91a56e7d68557725e03a6ed1530d344e3cb7acfc8993fb6af6c7a9d720522a05068257698e
 EBUILD kxmlgui-5.95.0.ebuild 1216 BLAKE2B 7c68547168879ec49da78df2ee6c219aec626ac922be335569e4bffb7cda138e329e6421f18c49be264c728d60ccac50f00c7b962b80f095cbea473421b725f1 SHA512 8dd8abda4fea719a9777ad7f4241123caf39adf1a2caf7c499856a91a56e7d68557725e03a6ed1530d344e3cb7acfc8993fb6af6c7a9d720522a05068257698e
 MISC metadata.xml 547 BLAKE2B 127ee4110b748cd3e3c26b63248d35f78b233b00cf4466ccc0145a613062a5aa9cc2e9ebd91d0e7482c67f6e265938176b169a9c52eda30bfcddf02549ec8f06 SHA512 2d36585b1af6205dc1bfcff7c3cb24c85376716159317b5c105c866143d49e89e91e501c9a4cf2d63265c30a09e8df71bca841319bd3f2b551e79fde90b1d96e
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.94.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.94.0.ebuild
deleted file mode 100644
index f01e70382272..000000000000
--- a/kde-frameworks/kxmlgui/kxmlgui-5.94.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_DESIGNERPLUGIN="true"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for managing menu and toolbar actions in an abstract way"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-LICENSE="LGPL-2+"
-IUSE=""
-
-# slot op: includes QtCore/private/qlocale_p.h
-DEPEND="
-	>=dev-qt/qtcore-${QTMIN}:5=
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kglobalaccel-${PVCUT}*:5
-	=kde-frameworks/kguiaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kitemviews-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}"
-
-src_test() {
-	# Files are missing; whatever. Bugs 650290, 668198, 808216
-	local myctestargs=(
-		-E "(ktoolbar_unittest|kxmlgui_unittest|ktooltiphelper_unittest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-frameworks/modemmanager-qt/Manifest b/kde-frameworks/modemmanager-qt/Manifest
index 20eb1ec91a26..724adefe3e35 100644
--- a/kde-frameworks/modemmanager-qt/Manifest
+++ b/kde-frameworks/modemmanager-qt/Manifest
@@ -1,7 +1,5 @@
 DIST modemmanager-qt-5.92.0.tar.xz 120976 BLAKE2B 7100a59fb6b281b81b9c1c168ba3fb31e163c2e4dc86b641160af3ee994e38686e4ac5d2933b723b31e3a9230735c56500b8b2e4338fd4c7ef13d2bd27a42505 SHA512 56dc47ecb0bf04fb9f7d99d067f10b9efb65a82dd8929f0aa2d6d3c9d708cdaea810a1ba7b1a708f00cefc513c23f6fc2fd25ec004bb071bf42ad0b17edc6ddc
-DIST modemmanager-qt-5.94.0.tar.xz 121056 BLAKE2B b1ba94992f3dffa614fc6131c6ddc84f8acf473bb280a1184406c79f7466aa3f241c4ae8cf1650e2179a0fab978e6b90aeac936088858b8877b53ae94e240383 SHA512 3867d8ed2b000e51a2782ad0300e2a49b89bad429409b4d36f9d1798f992980b4dc6c38edceb8e33456bb5fb0d11b3007f01ca8c3bbaae6f239b0260885fdf9e
 DIST modemmanager-qt-5.95.0.tar.xz 121092 BLAKE2B f7ed8749dbb50ff6633f5d3cf6f264c22622db5cf0c0b2f243edf16f7200847b7de0dd70fb03fd5f25fec07ad51094ab66b7529f487ea2a119a858280020b80c SHA512 9f7e48dc3748b5dd8624178d76c36c9ff081ad5b1425f74aa12fe3df46e89878daa9ae7c1c126d886af0f29fbf6ed33f24de9e8b39438ba3dd7cb72508a53d08
 EBUILD modemmanager-qt-5.92.0.ebuild 471 BLAKE2B 7c8de5deffe87973fdc694ebab34a44a0353ef447722b0d5cd7c97bf8add43cd7ba55cc617d00551d0db8649acf90a126ac04783ef6d288e64e1af0e6b386962 SHA512 e269f4deefc97e358783f0c885403b891aa0dd29088fa2c86bb931c7d2fe7b847b6e81f168f853bc3f79c884b6c72ffa26995a814b48fcbe2d844d1cbceb6622
-EBUILD modemmanager-qt-5.94.0.ebuild 474 BLAKE2B 473c71fdd84e5515dd7e9bbee9b73593809a5a9d2840cb4c9823d0bb9971d73c62bf609a49a626a9e2ca27b4a8e77fc35d15fc21d34eaa6adbaed713add57399 SHA512 5cb3407377f76ad449ec7454d025bd4cc21493205681eaa472d7e49915399a7f83fb84d10360f794fa44dd764a942d69acbfd2e7bd29c890cff9d6a4f500deae
 EBUILD modemmanager-qt-5.95.0.ebuild 474 BLAKE2B 473c71fdd84e5515dd7e9bbee9b73593809a5a9d2840cb4c9823d0bb9971d73c62bf609a49a626a9e2ca27b4a8e77fc35d15fc21d34eaa6adbaed713add57399 SHA512 5cb3407377f76ad449ec7454d025bd4cc21493205681eaa472d7e49915399a7f83fb84d10360f794fa44dd764a942d69acbfd2e7bd29c890cff9d6a4f500deae
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.94.0.ebuild b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.94.0.ebuild
deleted file mode 100644
index 438f0357a75d..000000000000
--- a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.94.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.3
-inherit ecm kde.org
-
-DESCRIPTION="ModemManager bindings for Qt"
-LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-# requires running environment
-RESTRICT="test"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	net-misc/modemmanager
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/networkmanager-qt/Manifest b/kde-frameworks/networkmanager-qt/Manifest
index 92422dbf0828..70ad41705578 100644
--- a/kde-frameworks/networkmanager-qt/Manifest
+++ b/kde-frameworks/networkmanager-qt/Manifest
@@ -1,7 +1,5 @@
 DIST networkmanager-qt-5.92.0.tar.xz 198060 BLAKE2B 04de04321f5fa41abf3bd5b521ebd06dcf70e3abd59091c78de6a9d99a104896276f61929ff55ed2ab5ea0eabd5e50dca7a15268706a58c34f3a9189ae00d9c8 SHA512 30a59f28eb28e6877fe9db162e2c3fc32ce1bd84e3e4091b10c63906a24ba6cb56955bff980320b55e6b883f4a1ac249bb11396f633834182f20726442518372
-DIST networkmanager-qt-5.94.0.tar.xz 197676 BLAKE2B 15465106e549de21aa67f7d77dc67b8ea8bb72dc67c4baf9ac12b222d03e70525567a4887348402111482c2b403047d8d78bcd8cd5e42d2e2e221e7de423e6d4 SHA512 0e97577e53b440df2c25d2afaa2171443b9c2806c8164a84db5053e071fb9ac27dda8952947efd0e9ad57f25625cf8447f45606278a61d45c45ec0a1db956d61
 DIST networkmanager-qt-5.95.0.tar.xz 197624 BLAKE2B de594b97c2295086f44e4599982aa8189b858763be28270b1186ceda848a1fe7c71e0e5eb29dc047450a3a8843e600c858b31806e8811eed6fe1cf25e73f513e SHA512 d193f700b9646f8d82934bb792c8b85f728b638d96e42169d73f2c70de73f5571764ed50d767f85f75224cb63e2db93aa77f1c0f64a034a09480b5fc4b31ef62
 EBUILD networkmanager-qt-5.92.0.ebuild 676 BLAKE2B 67ea439bb86338a7a5c7030763b29d5ba33685cf212da9324e9179f4940ce3457fef94ffdeb3c7dfc1e4bb476386ce07cf5e0b02c600a14f30396e90a928f9b2 SHA512 a957eb1fc61a3fe7b75b1a38881b675bff9d4521b2a076417844e57418d922df926ef11a2fc6ed9782b6e72808477899f92d32006dfe7a2cfa471d3baf79c271
-EBUILD networkmanager-qt-5.94.0.ebuild 679 BLAKE2B 2eded56b89544dfcfdef1162ea32386ab93fc9066a91cc8a083f7c236a379cf23c74cd6958172ae556effd6a335e25b0c72231052a03801579538f4e77620ec2 SHA512 8383ecf07764f27f9b9e904a4ac26916938a64b49732b1e266b0c8457eae0e8d81c09600efc756062c9007c72906d3e076b25bef714a506a1cf5bdc8e8c883d3
 EBUILD networkmanager-qt-5.95.0.ebuild 679 BLAKE2B 2eded56b89544dfcfdef1162ea32386ab93fc9066a91cc8a083f7c236a379cf23c74cd6958172ae556effd6a335e25b0c72231052a03801579538f4e77620ec2 SHA512 8383ecf07764f27f9b9e904a4ac26916938a64b49732b1e266b0c8457eae0e8d81c09600efc756062c9007c72906d3e076b25bef714a506a1cf5bdc8e8c883d3
 MISC metadata.xml 528 BLAKE2B 8e547c097f06ce6bc78746988171989fd5f71384b62d582c6b7cb8c99e30ab06f5e139fd1892ae10dbf4ffb389d9cd42aaf83455b90f7cbdf54e14da469a9783 SHA512 ec5a831fec9baf40d8298ca6f825d2c20d2b221f83eec4f2439a5e9aab8ab07b2ed4e114bc73f37ee55a15174c94fc7f271a587de9d2e8d34bcd76ace8565d19
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.94.0.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.94.0.ebuild
deleted file mode 100644
index 440afa260ef3..000000000000
--- a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.94.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QTMIN=5.15.3
-inherit ecm kde.org
-
-DESCRIPTION="NetworkManager bindings for Qt"
-
-LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="teamd"
-
-DEPEND="
-	dev-libs/glib:2
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=net-misc/networkmanager-1.4.0-r1[teamd=]
-"
-RDEPEND="${DEPEND}
-	|| (
-		>=net-misc/networkmanager-1.4.0-r1[elogind]
-		>=net-misc/networkmanager-1.4.0-r1[systemd]
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_test() {
-	# bug: 625276
-	local myctestargs=( -E "(managertest|settingstest|activeconnectiontest)" )
-
-	ecm_src_test
-}
diff --git a/kde-frameworks/oxygen-icons/Manifest b/kde-frameworks/oxygen-icons/Manifest
index 34e860b03a2e..3e2b2703bb47 100644
--- a/kde-frameworks/oxygen-icons/Manifest
+++ b/kde-frameworks/oxygen-icons/Manifest
@@ -1,7 +1,5 @@
 DIST oxygen-icons5-5.92.0.tar.xz 238636220 BLAKE2B ce9a843c7ac19c69504c92d3118488390a3adf1c25381d920e5ad096518c72089e1e99c08ff3dcba340a8ba9083b04505004fa3f76be53fd12a26e88f81a5395 SHA512 af336e9996abacf7f7c9f221caa4ada64d2b043a398f757fabd547ba311ed390eeecf621f1f3a7b38d67d688b8e1926a7c17de03d96cfca72158107a02d91834
-DIST oxygen-icons5-5.94.0.tar.xz 238635124 BLAKE2B 1d7d8d75d94d3129fca8d287b33a05df8bb627bb88fc7579e0b57cb93fe535027fd9a487bab1b2e4c2daa11f932a4fcad1f4d3886d8ca42a0f3c53293df86841 SHA512 b9906927ec15c422aefaa2e0f287121c51ec16386f60371a8e773c9c4f0530cc1bad99849079cbfff16d78432ac30867ad58d42e9fc6c0b1b07dff810481274d
 DIST oxygen-icons5-5.95.0.tar.xz 238634168 BLAKE2B df3f769732f7eb238c01c7726cf24a957ebb7c57d690cd33c3f8a3c714a87fa30775ccf17177de1e02a22401d7a3838aa4f41b35b953a4f1a330d5f1832ff6e1 SHA512 b1b8dbf7dabea5212fb7c3385a9b5fe8faa8d288b21490ee8e57091af7b75568be180799308e8584addd248cba5dfc8e7305f2887abe22edf565e864bd773077
 EBUILD oxygen-icons-5.92.0.ebuild 693 BLAKE2B 8cc6973ffca7feb6747de4755dcb443b52edc311cbcd5afb167b81b251cdc289a6efa8c4a4620a6691dc0e0afdc0bbfaa6950a3fed550bc89de32baaa7ce754e SHA512 8067c03c06527ebff470337398655dfb8643dc932c65fb79cc837e186897939087fbc426169219b9e336dfd4887f41b43dba51842139a475d4bb87915af276f6
-EBUILD oxygen-icons-5.94.0.ebuild 703 BLAKE2B 41b6fd197cf18c98df18b7d11ef26456bd29bf4da4a13d64febd19e6d2f48d98582bd97ea476133d0b1a80e9bcee48f4bade676c290e86283a8633cf67934b60 SHA512 d3f1085883c248347b582e8b6f194c69e5aba126ef1e3b6c7ae5ee30b5856132b8bfda2e5e6d2e1f03222731fa7cebe84359c0ea5c0f5d25e4384a2ed8c23f1f
 EBUILD oxygen-icons-5.95.0.ebuild 703 BLAKE2B 41b6fd197cf18c98df18b7d11ef26456bd29bf4da4a13d64febd19e6d2f48d98582bd97ea476133d0b1a80e9bcee48f4bade676c290e86283a8633cf67934b60 SHA512 d3f1085883c248347b582e8b6f194c69e5aba126ef1e3b6c7ae5ee30b5856132b8bfda2e5e6d2e1f03222731fa7cebe84359c0ea5c0f5d25e4384a2ed8c23f1f
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/oxygen-icons/oxygen-icons-5.94.0.ebuild b/kde-frameworks/oxygen-icons/oxygen-icons-5.94.0.ebuild
deleted file mode 100644
index 06db10d073d4..000000000000
--- a/kde-frameworks/oxygen-icons/oxygen-icons-5.94.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_NAME="oxygen-icons5"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.3
-inherit cmake kde.org xdg-utils
-
-DESCRIPTION="Oxygen SVG icon theme"
-
-LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	>=dev-qt/qtcore-${QTMIN}:5
-	>=kde-frameworks/extra-cmake-modules-${PVCUT}:5
-	test? ( app-misc/fdupes )
-"
-DEPEND="test? ( >=dev-qt/qttest-${QTMIN}:5 )"
-
-src_prepare() {
-	cmake_src_prepare
-	use test || cmake_comment_add_subdirectory autotests
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index 1ae21d619b6c..df3177011780 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1,9 +1,8 @@
 AUX plasma-5.92.0-breeze-light-dark-visual-fix.patch 1689 BLAKE2B 8c15834e53bdb2dfe4707a2173bdf19fd1a98652f644256f050ce55cc57e3268f1d33a1d67901d68301749bf7458137092c71e68d50454bd8db88d962c2bcd01 SHA512 d490f815b11bbf6af35266fab33392cfd5562b2011970b433b2c3952e1e9638af56175e10258596dd863c8fff49d448f141c22bfa3d688c9194a31ca0ed2f1ee
 AUX plasma-5.92.0-fix-blurry-buttons.patch 5410 BLAKE2B 689bf20c1848fd5ac299991f6dcc1e6ee81ef2fecd68d87952967dbb2367326aee8d464588824b059f7162a1cc6092c84cce7d254ac20dbbef3da639a5eaa4e0 SHA512 facb4d4ca36f5edaad918253f8d79442d350a12d611d833d0c48684abd2160527813d7186614fc54d3d5f67171400bbaf56f64c0ffb98c2433e062ee024b180d
+AUX plasma-5.95.0-revert-QT_FEATURE_foo.patch 1515 BLAKE2B bbaeef7f8c4d7110f27371a2f1417a2ad47e9b562d0250df4c917a5aec71426307aadb6d33e67ec85c6c8a3623483eff5b01bdae38ade37820b4c7861ab2d910 SHA512 87b73e53ed0b36a43fe973e96f05280692531a0d2c445bda11b712bf3987102e8f1522ef5a4026ef55f2434c1b793f5e3d1204be87afacf47d376312b6db1af0
 DIST plasma-framework-5.92.0.tar.xz 3145504 BLAKE2B 4c9c4a6c585fae629d94666d312af9a2dc74242d59f93cf6b63e206f7b4656982e1969cee7e1543b5c32b4f0815d602cfa8d0b56c3416f92bd5d2d2048ee6ef4 SHA512 6efbb9f03ec11804b12cda209dc665468cf6f56ecf712a136a5cf1ea2cb1deb1d427896770b12c18094a2d7f0ef69da9dcbe52b16ae2126e8382ade74d8ce54c
-DIST plasma-framework-5.94.0.tar.xz 3137928 BLAKE2B c171e434db41d6b03d97db14aa5abb1ba11e5508a9428d0d16a25c223170f5310b30e36c5681bf67ac9b849c1df744c1c70914efbd664c7c8d4b5b9550b7bd7e SHA512 071e0ce261516e4a7ab1105f86304e5dae7c16a9663980222cf60922ae6bf785cd2b0447b7a2f2a57e2a2396c1de15655c8a7c02568d81652da946a6384b9eb7
 DIST plasma-framework-5.95.0.tar.xz 3139008 BLAKE2B 55d3e32402a424e9362fec0dc06c80ac0d1754faeb0f60b6f0b447e4fef996e3c8f695300440f763ba911e02efe92d1d0a34e8cd5fd4458c4d1fe31000477097 SHA512 f5b109477b437cac9a54903ee2198df8f38bde4499f1a75288cbb299ca6b0d7b02b624bd5d741bd8e62136201811167f5406d4d98ceed2c86fa23842cd7f36af
 EBUILD plasma-5.92.0-r2.ebuild 2070 BLAKE2B 6e234e85ddc2694560bcdd46a9b12df6a9ab7ee1a3fb2f29e2a9c835a0255a981af7d73f12caf4bd4a7ef90320cb7f23d3906b083b2346e289c6e8bd092f1acb SHA512 3d9389f095b09c330f552f52fa2d7c624c968abc658f6c447bbed066e864d205573314878f8b47f207dcdf3e7273beaecf62de39984bc763a494b26e29bceac9
-EBUILD plasma-5.94.0.ebuild 1943 BLAKE2B 02baa1fef49889e47e08703160b2f401b37e094385300d1fa9c7a9f5f16afb5dd18dfcae0703b8d54e01f46c1fac51252b88c25647ffd394246c9928ef869efd SHA512 82b652ac7029155786a263701e2f7539941dceb232238da7e272ec9957b917710d1f50325c5eeeda0a6445c12054193d7541695ffd93b3bb21502a70843bae75
-EBUILD plasma-5.95.0-r2.ebuild 1948 BLAKE2B 4e6dd06ff849e0a076e84d62234e0a62e6b31bc26ce9e2890e8c22986c571b70ffc9d7667af028e8732d03d57abc5a428aa382ae6f73debc5da03c4769c90f89 SHA512 141a10df0b7240590eac74faf7b5663902d91dbab434fa58744c2b0022d48b4d412816ccfe3a30d99e03d6c969d7d9e554a5630e5b07ef8f765029c77392399c
+EBUILD plasma-5.95.0-r3.ebuild 2008 BLAKE2B 2d12378de572be51b61bf134d5cdded60bbabc77f25fdb6bcaac05d4fd761f8f09e7b924e7d17205e04215eed46eb1f2c85420ae0bc91fcd1ec982bfca3409f0 SHA512 aeba81f9d0eb66239fc2a6d94a2d241ac5e98deded6753fd8fb7cd169b555e701a079b5d623a71e47a206cd05e09009568207b8e7ba12360bd8490f78e3d0c49
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/plasma/files/plasma-5.95.0-revert-QT_FEATURE_foo.patch b/kde-frameworks/plasma/files/plasma-5.95.0-revert-QT_FEATURE_foo.patch
new file mode 100644
index 000000000000..300612763336
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.95.0-revert-QT_FEATURE_foo.patch
@@ -0,0 +1,42 @@
+From dff1b034c1162062aa2292099d3d01fc53dafdf6 Mon Sep 17 00:00:00 2001
+From: Ahmad Samir <a.samirh78@gmail.com>
+Date: Tue, 14 Jun 2022 14:05:32 +0200
+Subject: [PATCH] Revert "Use QT_FEATURE_foo to detect opengl* support, and
+ TARGET for glesv2"
+
+This reverts commit 31884dc195c815054bfa6b15a90753d2d0ae1ea9.
+---
+ CMakeLists.txt                             | 3 ++-
+ src/declarativeimports/core/CMakeLists.txt | 2 +-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6698a2091..63229cdfb 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -118,7 +118,8 @@ set_package_properties(EGL PROPERTIES
+                        TYPE OPTIONAL
+                       )
+ 
+-if(OpenGL_GLX_FOUND AND X11_FOUND AND QT_FEATURE_opengl)
++get_target_property(QtGui_Enabled_Features Qt${QT_MAJOR_VERSION}::Gui QT_ENABLED_PUBLIC_FEATURES)
++if(OpenGL_GLX_FOUND AND X11_FOUND AND (QtGui_Enabled_Features MATCHES "opengl"))
+     add_feature_info(GLX OpenGL_GLX_FOUND "OpenGL GLX libraries.")
+     set(HAVE_GLX 1)
+ else()
+diff --git a/src/declarativeimports/core/CMakeLists.txt b/src/declarativeimports/core/CMakeLists.txt
+index d08b4c619..2136bb985 100644
+--- a/src/declarativeimports/core/CMakeLists.txt
++++ b/src/declarativeimports/core/CMakeLists.txt
+@@ -70,7 +70,7 @@ else()
+ 
+ endif()
+ 
+-if(TARGET Qt${QT_MAJOR_VERSION}::Gui_GLESv2)
++if(QtGui_Enabled_Features MATCHES "opengles2")
+     target_link_libraries(corebindingsplugin Qt${QT_MAJOR_VERSION}::Gui_GLESv2)
+ endif()
+ 
+-- 
+GitLab
+
diff --git a/kde-frameworks/plasma/plasma-5.94.0.ebuild b/kde-frameworks/plasma/plasma-5.94.0.ebuild
deleted file mode 100644
index 143e61839c1e..000000000000
--- a/kde-frameworks/plasma/plasma-5.94.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_NAME="${PN}-framework"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Plasma framework"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="gles2-only man wayland X"
-
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=,X=]
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kactivities-${PVCUT}*:5
-	=kde-frameworks/karchive-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kdeclarative-${PVCUT}*:5
-	=kde-frameworks/kglobalaccel-${PVCUT}*:5
-	=kde-frameworks/kguiaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kirigami-${PVCUT}*:5
-	=kde-frameworks/knotifications-${PVCUT}*:5
-	=kde-frameworks/kpackage-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-	!gles2-only? ( media-libs/libglvnd[X?] )
-	wayland? (
-		=kde-frameworks/kwayland-${PVCUT}*:5
-		media-libs/libglvnd
-	)
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-		x11-libs/libxcb
-	)
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-"
-BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package !gles2-only OpenGL)
-		$(cmake_use_find_package man KF5DocTools)
-		$(cmake_use_find_package wayland EGL)
-		$(cmake_use_find_package wayland KF5Wayland)
-		$(cmake_use_find_package X X11)
-		$(cmake_use_find_package X XCB)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/plasma/plasma-5.95.0-r2.ebuild b/kde-frameworks/plasma/plasma-5.95.0-r3.ebuild
similarity index 97%
rename from kde-frameworks/plasma/plasma-5.95.0-r2.ebuild
rename to kde-frameworks/plasma/plasma-5.95.0-r3.ebuild
index 648c6c572553..056fcf5e2152 100644
--- a/kde-frameworks/plasma/plasma-5.95.0-r2.ebuild
+++ b/kde-frameworks/plasma/plasma-5.95.0-r3.ebuild
@@ -59,6 +59,8 @@ DEPEND="${RDEPEND}
 "
 BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
 
+PATCHES=( "${FILESDIR}/${P}-revert-QT_FEATURE_foo.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package !gles2-only OpenGL)
diff --git a/kde-frameworks/prison/Manifest b/kde-frameworks/prison/Manifest
index bcbd1abe8abd..b641bd7e816b 100644
--- a/kde-frameworks/prison/Manifest
+++ b/kde-frameworks/prison/Manifest
@@ -1,7 +1,5 @@
 DIST prison-5.92.0.tar.xz 47936 BLAKE2B 72b919e042d471dbcd87faa081b00abdcdb9b708b4cfdeba4ba09c0d013b3b8cbf35220768b821e198b2fefc916472117e50be320268707ff1a5e44ff31074dd SHA512 18bb9f5a804cc80cf3770c1d4149ef075650357e81642a230810a08b780c35c563a3c629839bf8a0ca39d9b1ea01d24862a6cf1992dc5577fd1d853c8ab87b5f
-DIST prison-5.94.0.tar.xz 55184 BLAKE2B 26ca6bcd0989b6669ef0f82d5ee2492599a1c65bb9b5b225eef31b8ab95058ab8fea33203954b18c3543b61b59e62091697bc5a21d38c37aa3af5f81183a4cae SHA512 7de7f528d686ddcf1ff987786ca06d431944deed49f89075a0438982408843249882fc931003f91b4646513ff4515df9104d97ba662a87eeee6394cc93bd3969
 DIST prison-5.95.0.tar.xz 55364 BLAKE2B 1ac147e0967080ca3fa920f83da42f72edddddeea52dbbfb08f85575b48bd95573e046187c8ce505ea02d44adbecc7ad9a91b91c1222316cbbeb1aa644e2a5c3 SHA512 83369da86f9b7ddd813f7a90367943ffc4eb066260ad9999545aa77cab0f6783531d2cf2081715e3ffd70fac377cdea221b79b626127c8773bf96c249536f990
 EBUILD prison-5.92.0.ebuild 642 BLAKE2B deb3edce82f6ae3a545505bda1530f6d6ed0d90f3816647d2f020ff8cd7cc6fd4ab4c9500f59c5cd458f7bbde2af0c6c5e0b09c3d99bd42ec25eef33187cad75 SHA512 1980afcfb4b1e46884c2600bafb046f7dc7adad522f0e11563edec60d6cf92874e98e5a992b0a0160c8a73e24de44f1165f9c10fb4a57e1217d1e0da18c3a51d
-EBUILD prison-5.94.0.ebuild 679 BLAKE2B 8e06e63138e14c94d02df99ef4c644b8767100d53cb80514218fb20539f39945814a882b60da340af145ade50572965fc81cf2ca9a21ec9e4f909f4d5e76285c SHA512 f42c7bfb8b662b1804f3488b64cf1d45bbadc585dd12ea5259aad161807c1ada0f398e0c456f26b659e18271e9d87cd5c2edaf3d411eec2dd525e47b5c3bc340
 EBUILD prison-5.95.0.ebuild 679 BLAKE2B 8e06e63138e14c94d02df99ef4c644b8767100d53cb80514218fb20539f39945814a882b60da340af145ade50572965fc81cf2ca9a21ec9e4f909f4d5e76285c SHA512 f42c7bfb8b662b1804f3488b64cf1d45bbadc585dd12ea5259aad161807c1ada0f398e0c456f26b659e18271e9d87cd5c2edaf3d411eec2dd525e47b5c3bc340
 MISC metadata.xml 560 BLAKE2B 3c60b8b8f04fb43ee27b250985d080758dfb521e4ed3ec0ee94dc36c57db90701504490a0b56bfad2ea9bfc7c6d3e76a4f68995c1b7d9213104d13a8de622259 SHA512 7c3c097098192485a17926575bc5d9a008c480ad01fbd89f94b218f709a2d8b7d913f067548cd51579a65e43c3d0847b0567e37ce9bf1b8ada53f212650f0144
diff --git a/kde-frameworks/prison/prison-5.94.0.ebuild b/kde-frameworks/prison/prison-5.94.0.ebuild
deleted file mode 100644
index 63948280e1a6..000000000000
--- a/kde-frameworks/prison/prison-5.94.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QTMIN=5.15.3
-inherit ecm kde.org
-
-DESCRIPTION="QRCode and data matrix barcode library"
-HOMEPAGE="https://invent.kde.org/frameworks/prison"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="qml"
-
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtmultimedia-${QTMIN}:5
-	media-gfx/qrencode:=
-	media-libs/libdmtx
-	media-libs/zxing-cpp
-	qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package qml Qt5Quick)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/purpose/Manifest b/kde-frameworks/purpose/Manifest
index 7882a8b847de..78d10c8e8988 100644
--- a/kde-frameworks/purpose/Manifest
+++ b/kde-frameworks/purpose/Manifest
@@ -1,7 +1,5 @@
 DIST purpose-5.92.0.tar.xz 173280 BLAKE2B 4cbed1b8b9b8a443fdb9ecbaf6495918c1f21f641184827a5e6af4084b5b2beb5b5f4a0a8c4d8e593ac4a4222dfc702e5b2ac5330625a3d26962f986d0ff07f1 SHA512 e466b836d4628f8773247cb952621d9c33127c26ae73c27b9f8015239997b0f7241a0f556c8c683a2a580c3977f448b1e9742965d9133e2c569d42b2d6cf2009
-DIST purpose-5.94.0.tar.xz 172680 BLAKE2B 44564faf3656eec617f41fab17312733aa592fb0c6c8a194aabe4cf2b0c7dcfe634afc2b3037499e13f6d3cb776fb043e11d5f07d2862841e8f7383280220962 SHA512 04bb9c29b9084e2d13f5463874aec8dca5942d6f7f25a63766451e9e4141ce5dc314afda56ab24a9621861052973245a264ebea06d864c0714c3d9829593c522
 DIST purpose-5.95.0.tar.xz 172852 BLAKE2B d90ec7b12f683d4bb8e2c22ab72ef7582a392ce69521be8e9df8fe173cf99c0bfed7ea6abc9817e4b6ab43ed27c989fd92605d58480977ca6ce06e2b6e4c4d75 SHA512 b0ea8e506d9d8f4162ee61cd6f946620d20e9d39c3d750952aac1d328164d5d3364cf8d605a28af78833cd75c654462d62c0dcd7425d237623ddc0f19a69679f
 EBUILD purpose-5.92.0.ebuild 1588 BLAKE2B 8298d0748acb5af86abe5fc6602c27c2f4ca33917102b49408e54d4595792cecf2cee70db792222bb50bbebd274d5524bd8d83d98a135cb914b4719374fb8395 SHA512 d983ee88215d8a5a226e54fc2844732b1194a7dfde030cdcfbbc83ab25ae34638a26466485831484248d0542c51c3fd451b494810f660a6e2ece642b4c279208
-EBUILD purpose-5.94.0.ebuild 1591 BLAKE2B 6a175b845a4cd2915adc7c45b4367ae77f7d418f0dcebf5e25599ae420fc87e586a85e2b80104024e4824b6123604b69bdf7e066c87169cbc8b734ea0cd3b981 SHA512 83ec9bf144a44cca863514019a676465bfd5a5b60d1bdef96d35260a96bd69cf5ae58000f65580022d3ff1676495390eb2579a15aaea9f8e58af98a313e62f2c
 EBUILD purpose-5.95.0.ebuild 1591 BLAKE2B 6a175b845a4cd2915adc7c45b4367ae77f7d418f0dcebf5e25599ae420fc87e586a85e2b80104024e4824b6123604b69bdf7e066c87169cbc8b734ea0cd3b981 SHA512 83ec9bf144a44cca863514019a676465bfd5a5b60d1bdef96d35260a96bd69cf5ae58000f65580022d3ff1676495390eb2579a15aaea9f8e58af98a313e62f2c
 MISC metadata.xml 552 BLAKE2B b690292da1dd33f95eee7c08e13912efa3c683278c494d666eed7b29ebfff7852986009fc93ef86cea1e0c1a2e3f477810caf8c1fbffe6160da187630a9a9197 SHA512 5552139f71158888ea3d87b07a13492f12a502314fc03d7ef9ac9ea827aa2ae650bcbec7d872e2fa1473f830cc18ce630bf459e449e5cba44a6f8aa436e49a1e
diff --git a/kde-frameworks/purpose/purpose-5.94.0.ebuild b/kde-frameworks/purpose/purpose-5.94.0.ebuild
deleted file mode 100644
index 8751c96220dd..000000000000
--- a/kde-frameworks/purpose/purpose-5.94.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="false"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.3
-inherit ecm kde.org optfeature xdg-utils
-
-DESCRIPTION="Library for providing abstractions to get the developer's purposes fulfilled"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="bluetooth +kaccounts"
-
-# requires running environment
-RESTRICT="test"
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kirigami-${PVCUT}*:5
-	=kde-frameworks/knotifications-${PVCUT}*:5
-	=kde-frameworks/prison-${PVCUT}*:5
-	kaccounts? (
-		>=kde-apps/kaccounts-integration-19.04.3:5
-		net-libs/accounts-qt
-	)
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kdeclarative-${PVCUT}:5
-	bluetooth? ( =kde-frameworks/bluez-qt-${PVCUT}*:5 )
-	kaccounts? ( net-libs/accounts-qml )
-"
-
-src_prepare() {
-	ecm_src_prepare
-
-	use bluetooth ||
-		cmake_run_in src/plugins cmake_comment_add_subdirectory bluetooth
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package kaccounts KAccounts)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "Send through KDE Connect" kde-misc/kdeconnect
-	fi
-	ecm_pkg_postinst
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/kde-frameworks/qqc2-desktop-style/Manifest b/kde-frameworks/qqc2-desktop-style/Manifest
index 47f46c9edd57..2e12a0a26f2f 100644
--- a/kde-frameworks/qqc2-desktop-style/Manifest
+++ b/kde-frameworks/qqc2-desktop-style/Manifest
@@ -1,7 +1,5 @@
 DIST qqc2-desktop-style-5.92.0.tar.xz 65396 BLAKE2B 1cf4e6d27c7db8f518f5c9e46f77373a72b30a3060bac3e46d94473bcf6c6fa17c26a90d9589550bee2974b3c541963ed614a6422690b32d97a80b7dbfbc5434 SHA512 698675c526f8c1174c617045113c613a1eb4684db30bf6d88600b9863273c814c4ebe0bcf45b60f24023d7b3d8ef59dab4ab1b704add55131431cc3e701b3549
-DIST qqc2-desktop-style-5.94.0.tar.xz 65616 BLAKE2B 911244cc69eee30fe25298cd74bdbc772630e33119d5e22ca65418b384822d8c5622e9ab1e6dfb3cec64657528b4a8a4ec98fafcb43aca85282132872d7e81ce SHA512 8f68423603d7de0a286dbf78441b077fc48197d9bc6863e7b13be358f68697f1ad95559e0e0705edb034c54df75ff74ca41f5b2fe70ba94e55e7c30b13c6989f
 DIST qqc2-desktop-style-5.95.0.tar.xz 64240 BLAKE2B 6b1cf50a6266b931f3eaf8f39b4fd0e97888e02da8952e070720a02a7ac9b0a7f6f1ba21cede5da4f7b493864d1f9cc5a8c978a12715632b9ab2f411af4080b1 SHA512 0bfe525eda2148753e85ea65d21e8139245e8d485ff3f50c79213028ab942d098cf5a238d6b3dd5964ddcf3fabf611af6863bd93714d40802b3288c4e6b6154b
 EBUILD qqc2-desktop-style-5.92.0.ebuild 725 BLAKE2B 519eeacecba5a7692f868ab520f9aaf407250943f0c9a7ae50b861be49f3555fe8c1ae6ab84fe779486b93d5649e040ea0a0893982f452f3195eca6f4c2d7611 SHA512 5b969c02b61b9381c6992fdb512082042c7abd6ccbef1453cda96316f73123119ccb9b6b9f118d5a2a2732a9f0af0f8ba6c3d31bdc23f0b98a476ce0e6264a35
-EBUILD qqc2-desktop-style-5.94.0.ebuild 728 BLAKE2B ca9b461ef611bb790e91abed6ef376b6431e67e61e54600097ebd840661d3700d150086d80b98080a77494d2df67f251f0b45c46a4c705af0655534e33545559 SHA512 e5708a15665cb0c361e3101250495e073d477297547af08ec8249bd2271f3b105fba1478f8537ca6e0bce96670e9b90e9f5ce6e8ea52c9dc492ab4046a9c9328
 EBUILD qqc2-desktop-style-5.95.0.ebuild 728 BLAKE2B ca9b461ef611bb790e91abed6ef376b6431e67e61e54600097ebd840661d3700d150086d80b98080a77494d2df67f251f0b45c46a4c705af0655534e33545559 SHA512 e5708a15665cb0c361e3101250495e073d477297547af08ec8249bd2271f3b105fba1478f8537ca6e0bce96670e9b90e9f5ce6e8ea52c9dc492ab4046a9c9328
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.94.0.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.94.0.ebuild
deleted file mode 100644
index 8590bb402882..000000000000
--- a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.94.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.3
-inherit ecm kde.org
-
-DESCRIPTION="Style for QtQuickControls 2 that uses QWidget's QStyle for painting"
-
-LICENSE="|| ( GPL-2+ LGPL-3+ )"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5=
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kirigami-${PVCUT}*:5
-	=kde-frameworks/sonnet-${PVCUT}*:5[qml]
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-"
diff --git a/kde-frameworks/solid/Manifest b/kde-frameworks/solid/Manifest
index 479327285723..a32f8c8899c2 100644
--- a/kde-frameworks/solid/Manifest
+++ b/kde-frameworks/solid/Manifest
@@ -1,7 +1,5 @@
 DIST solid-5.92.0.tar.xz 257716 BLAKE2B 3ea7f377a38ed982535d7de6c881b2758f7ac9abdaf581e6dfdada2594435fe2851b5dbb6b5fb88f7a8c6a5126589a602efc4009a07d8e90286506fff0aa65ad SHA512 14be0e88e261dde525a227129a371c63de1a173a4dddd403fc191864ecf83468c20bad43c3ac06a751234a1dfb09d4371c574293bf1de9fb719d52730ec3643b
-DIST solid-5.94.0.tar.xz 258160 BLAKE2B 67d24dac6fc7f35eb542a8344588cba956b3a234ff42a461cbc9cd07db0d4f5937822b74825acb018e844a9163173ee1323280edeab286de863e05ca95f33480 SHA512 c72da5c52512c97a4ff164e34d06d572a7747f9f434ad574bc3bd106574bef617db48a1b00b2cca6b944f9ab5bf74563e36d25fa7618fd56782506d61ebfea37
 DIST solid-5.95.0.tar.xz 258356 BLAKE2B 154bab82349e72aa5eb689dcc8ac2011eaf15ddb068ce95160c99d8981cfef0ad1ee2f99a1bf7b756f9161a03064ee478a889c3fe42b3ce6beca6f9724df62a1 SHA512 fdd4a4d4863099aced5a8b13c959d9d5da2e5ec55afdcb905676c63dcd9b75e7d3289ef4223fc3dcac1fffb9a004af82f01aba7d0d6a87c7d8b4c3be703ca2d0
 EBUILD solid-5.92.0.ebuild 1067 BLAKE2B 40e6fbd7c7b3a6e4b9b4e10cef6b5fc384259f2c7beb348e396f13263e2e5480e9a02fb0169f9b74663d5030a15154220bfd1e7f3e896962aa9ba5a9ac7d2fdd SHA512 03bc1ade51016dbad2307884b0a7d3e4cec10da2b2b487026780316b794e2a9d54ce15093c285918906afd2fa0e821e92ca7cc7e357b7a28853ce01e22060f17
-EBUILD solid-5.94.0.ebuild 1077 BLAKE2B ea21812da90729c4c40509e5cdc9a0f535f30a977ae02d8ac3a0b7d0d67e6173f2e2a42699c9cdd391c49e20b1796671d0e983627ef94a439c0017f537136d20 SHA512 6ab48d3368999f7f0ea0a2c841545f0bd92673b78929f499be784b6f1200579ef10246856ea3e5080de5ae09c47811413c8797684e318050e2d616aed7101a6b
 EBUILD solid-5.95.0.ebuild 1077 BLAKE2B ea21812da90729c4c40509e5cdc9a0f535f30a977ae02d8ac3a0b7d0d67e6173f2e2a42699c9cdd391c49e20b1796671d0e983627ef94a439c0017f537136d20 SHA512 6ab48d3368999f7f0ea0a2c841545f0bd92673b78929f499be784b6f1200579ef10246856ea3e5080de5ae09c47811413c8797684e318050e2d616aed7101a6b
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/solid/solid-5.94.0.ebuild b/kde-frameworks/solid/solid-5.94.0.ebuild
deleted file mode 100644
index c4f2e04d826d..000000000000
--- a/kde-frameworks/solid/solid-5.94.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QTMIN=5.15.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Provider for platform independent hardware discovery, abstraction and management"
-
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="ios nls"
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	sys-apps/util-linux
-	sys-fs/udisks:2
-	virtual/libudev:=
-	ios? (
-		app-pda/libimobiledevice:=
-		app-pda/libplist:=
-	)
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
-"
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package ios IMobileDevice)
-		$(cmake_use_find_package ios PList)
-	)
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "media player devices support" app-misc/media-player-info
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-frameworks/sonnet/Manifest b/kde-frameworks/sonnet/Manifest
index a6ec550985aa..dde6269fcce4 100644
--- a/kde-frameworks/sonnet/Manifest
+++ b/kde-frameworks/sonnet/Manifest
@@ -1,7 +1,5 @@
 DIST sonnet-5.92.0.tar.xz 308336 BLAKE2B 7c75b962e3fec264a00bce96f8fd98641a8b5f4870daaf49ec77d204aaa2d977e097771e580bcc25ce3eb233d9e7b3e800ece698b9473e9acf6f3c676ff5cf33 SHA512 7e6fedd0c244daf6e1b94eba2dfa7124fc6496a89ca5ed8931c9527603d1fcaabd834207bcffc8abded1e9db53ee0a737eca2ba455de705f821a944d08e931b0
-DIST sonnet-5.94.0.tar.xz 308140 BLAKE2B ba2c824a4b3e6268ea1eb7ddea8bb8846f8ea244c93bb3c4d92153b348ae9c5a8f35509054a0ff8aff7b729ddf45df84b502c0f564844d936870d0eca559098f SHA512 4904361fa8b941181c1e18fc39fb614cd9b1177a4d49c6b16ae8c5941e6328f3b803d558d44500ce002a9da92597eecb1a295e956dada994934c4cfe89c62055
 DIST sonnet-5.95.0.tar.xz 308368 BLAKE2B e882368e510b4467b3d31e02b7f69b4ed239a2a1d955d9dbc980ce5804ae079a16c884b722d23193703225f76e42fe118eba0fc06ae38569a968887378be8190 SHA512 cbdd03307e6325a1bd08cb967b04e0f498c72eaccf179d1c39968a69f90903bc95f16e95ce3eef16789404ce84ad49194d53d18eecec3da8f8f9cf0948c2e5ac
 EBUILD sonnet-5.92.0.ebuild 1048 BLAKE2B d0459acdf353df19fdcd0effc7a2cb2eec0b4e2507382e8a92537d6d0795455d192c114366223a3851fcc451ffba2f162d42c9714ee60755b713ea4571ca72da SHA512 0c0096aa5bf68a3c55deb7ad8963e937c29ae7c4d08136128487be6d27786f770e80a55d460b35c029586ef8c86651fe73343d10c6e2a81ffceb5900d136fe9f
-EBUILD sonnet-5.94.0.ebuild 1051 BLAKE2B 7e2b2b521a19f4419438ea5bd400a6732388e9b9f857e11757d619092d0a9fbf73794e7b6c8eb4ed93880a46315d5fcabbc0ae671bffb8b078beb8684a7ccd86 SHA512 97057d20ec7ef73deb4e353250f8db3bf16d8eda463e1fe5c270e543c512772b14d3d8bd4ac9636167d9831e992088394a96245b9fd4475a31ca00f95eb3addc
 EBUILD sonnet-5.95.0.ebuild 1051 BLAKE2B 7e2b2b521a19f4419438ea5bd400a6732388e9b9f857e11757d619092d0a9fbf73794e7b6c8eb4ed93880a46315d5fcabbc0ae671bffb8b078beb8684a7ccd86 SHA512 97057d20ec7ef73deb4e353250f8db3bf16d8eda463e1fe5c270e543c512772b14d3d8bd4ac9636167d9831e992088394a96245b9fd4475a31ca00f95eb3addc
 MISC metadata.xml 787 BLAKE2B e63406afd42c6ac2d69065083913fce007407ea82119f10243748b73011dce25e0ef289e9e42f7573aec339be6811cb2cea2e195452a4a0911f8e195c3ea17d8 SHA512 5b70ed9a1c5475b8200cc8b59c5488525023c33ee997c81efbd362b45b35dff43b22fa6a8e9a440be2ca5f65ad1b51c2f1846f2e96e44a1ea27ba23966d76c02
diff --git a/kde-frameworks/sonnet/sonnet-5.94.0.ebuild b/kde-frameworks/sonnet/sonnet-5.94.0.ebuild
deleted file mode 100644
index 3a422a5c1e4e..000000000000
--- a/kde-frameworks/sonnet/sonnet-5.94.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_DESIGNERPLUGIN="true"
-QTMIN=5.15.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for providing spell-checking through abstraction of popular backends"
-
-LICENSE="LGPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="aspell +hunspell nls qml"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	aspell? ( app-text/aspell )
-	hunspell? ( app-text/hunspell:= )
-	qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package aspell ASPELL)
-		$(cmake_use_find_package hunspell HUNSPELL)
-		-DSONNET_USE_QML=$(usex qml)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# sonnet-test_settings: bug 680032
-	# sonnet-test_autodetect: bug 779994
-	local myctestargs=(
-		-E "(sonnet-test_autodetect|sonnet-test_settings|sonnet-test_highlighter)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-frameworks/syndication/Manifest b/kde-frameworks/syndication/Manifest
index aa97a3ba7490..822b641d6584 100644
--- a/kde-frameworks/syndication/Manifest
+++ b/kde-frameworks/syndication/Manifest
@@ -1,7 +1,5 @@
 DIST syndication-5.92.0.tar.xz 510388 BLAKE2B a7272d08610ba30f2f2249d2ecafe1dbe54c232cdc5f851d6c6acf33cf60103d08b18a666b2e570b10644e9f8a205121a6bd2df6b6c024c4b7478b2208c41ad6 SHA512 4b83c4d5d3cebc362fdbf2e5041887c713c680ddf5e5294e393de96259322399c4745c1ad87ee0aeb3fa8aa17514e2f2c98e204b43f1ae8df9ba2447a64e87b9
-DIST syndication-5.94.0.tar.xz 510540 BLAKE2B 079fdcfa871ecf8f5bf0e9904300c8ca5b91cfbe8cef4bee193ffef4663d5a517b0401bb69995d7be3927f9af69fd950dd58b7b62c39789d0802b531e1aa9a8a SHA512 8b33ca8eddd59d4461822b51a536fce53b86ec2e6b9a26d3c7e66b0317d13b2a6a271e2c011e5e9298d8d328abc961f58566caa5f1a2caf6f825b6eb5fdc1a7c
 DIST syndication-5.95.0.tar.xz 510448 BLAKE2B 161972b1cc75e501b66db1014a278b622dca536c45b93be8eabeb32b10369f9b8c0adfc0991e71129173a629365992f5ea3eff870ff224f292d8686ec7d1364e SHA512 8b11074e6eed1d4025d4966c118cd0dbf2cc7a3400cbf10412dd16e8f0437564a1b8294ec26ab74caac6d8c3845aba2ec8743d60ca8633486f14167d6b3b684c
 EBUILD syndication-5.92.0.ebuild 449 BLAKE2B eb1deda6bce9eb5c344227f3ddb6a94a07658037924f0a29c3acf0c1baec19242d0c4579eb75ccf4ce081ef22385907b617df2da809d8f33b18ba1751915aaef SHA512 6946a11ad30b8923ebce8be374c3fd2c2f869600e599eb3bbd58f13fce402be644491b32d2ae010b7eb605dd864e3fbc730ad79ceb471db100472b068eb39c73
-EBUILD syndication-5.94.0.ebuild 452 BLAKE2B 315d1de6063fce44b4634e76d9281e5aa663e93926f12e488e3a93806c027bbcf7da89bb538507d72b6d9d682d11b60a59bfac87e1e5c3ff2233ae19744a04a4 SHA512 ec2eecd4d965c4d25b572696be9dcad0f7583f29e88b3eb1ade06b64d14861253093ec28412b822306c89d3c151e024a452e75e8e0a178c8182a3d0d07b78a1c
 EBUILD syndication-5.95.0.ebuild 452 BLAKE2B 315d1de6063fce44b4634e76d9281e5aa663e93926f12e488e3a93806c027bbcf7da89bb538507d72b6d9d682d11b60a59bfac87e1e5c3ff2233ae19744a04a4 SHA512 ec2eecd4d965c4d25b572696be9dcad0f7583f29e88b3eb1ade06b64d14861253093ec28412b822306c89d3c151e024a452e75e8e0a178c8182a3d0d07b78a1c
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/syndication/syndication-5.94.0.ebuild b/kde-frameworks/syndication/syndication-5.94.0.ebuild
deleted file mode 100644
index 5153327615ff..000000000000
--- a/kde-frameworks/syndication/syndication-5.94.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.3
-inherit ecm kde.org
-
-DESCRIPTION="Library for parsing RSS and Atom feeds"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtxml-${QTMIN}:5
-	=kde-frameworks/kcodecs-${PVCUT}*:5
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtnetwork-${QTMIN}:5 )
-"
diff --git a/kde-frameworks/syntax-highlighting/Manifest b/kde-frameworks/syntax-highlighting/Manifest
index cb203e7ba17e..b4de7e1be7cf 100644
--- a/kde-frameworks/syntax-highlighting/Manifest
+++ b/kde-frameworks/syntax-highlighting/Manifest
@@ -1,8 +1,6 @@
 DIST syntax-highlighting-5.92.0-fix-bash.patch.xz 3048 BLAKE2B c342f0e01930d9a8577a2d36588deeab767e6730a721e5462af202284ba0d96837479b6e880401749390ecadb877d379c1b1ce38588198178e7e22e2f133ee0d SHA512 9bace711c744c0041fadb3bffc530ff3f8c2d0739792999e0de48b66fd4802943c77b24342489f2db26b0f92f9eafab96edb0170083eb95c7c26e62e2e44beb4
 DIST syntax-highlighting-5.92.0.tar.xz 2394744 BLAKE2B b445efecf6c5be17efac2c8247a901f3be1ce576fdb1100fe5da22aceb67ee1161c798de222f08ed611c82a35cba34b6167fd2ad3b150d91a9c46ab8fb299cc1 SHA512 bec8064f041fa6b57e57eb33eeed457ccf4e329f9b9b2ae494e000c26e54d4e966d1368b9772a638e7c8318192e701dfa06f5b3b508e13f32a8ff130582e5d96
-DIST syntax-highlighting-5.94.0.tar.xz 2397668 BLAKE2B 29a1694c8c0f0a6735266ac08c720861994d7f6b3a67124384f4b5e71bf681ebb5eb9ea1e989c766fb5c3d2dd454dd5ef3e128ad4a90adf8943fdb0cad1927da SHA512 34e3ec926ae576e0366216c67ee73ef62c538e38369d664ca104951cf08a52848fd7b4d75e29ef23650259b113af727bf71837b6b6ced0f63d4264c0c903acb2
 DIST syntax-highlighting-5.95.0.tar.xz 2398196 BLAKE2B 03f2e5084f605a6d7a62f78e08ffcc2ff5f36a17b67cf6c5ed24be27980c0cfeacc198037104814256e2386d8bae956a5fbeb426f986a88592cc834bdb1344a2 SHA512 efe392439eb93567235f2cce35c228eb45038b11b430486eb65065f7f31959d4c98d7a2eb71aec79eeb4db70d12ad3f1f0850be65e0833c89276e8e9dfe4bfe5
 EBUILD syntax-highlighting-5.92.0-r1.ebuild 750 BLAKE2B b7c7f6f511046e46d07fc5021179bef6cc7d80088030c685ef9f67ea201490aafddabd0ed438c0532fddca59bb442930771c42bc799939214df71fbf5ed1c918 SHA512 e2af3d591a7e59b8731f858d1fbe12b4a7bada3fa82a52563a661c8f9ed897dcd5b78bfc94c72b8365ba08878551ecd2ec80178c6f2752d112aa33d49bbdaa1e
-EBUILD syntax-highlighting-5.94.0.ebuild 612 BLAKE2B 178ba5101652b99cffb3722f845d8330c77e2a9f315d3865539d603bca24642f25d6209af72f266daf6cb1c8abae07fc18ab42f5029dfae6f1a2bf44c0a0f72c SHA512 613a8c92d9307e3a4f7fdf14cf7f3146e3e5db0aec780e0485eba62835cbd0f08df4dfde64fdcb46eb6d0d7bf379872339a4428739bd13de85de3f5563248185
 EBUILD syntax-highlighting-5.95.0.ebuild 612 BLAKE2B 178ba5101652b99cffb3722f845d8330c77e2a9f315d3865539d603bca24642f25d6209af72f266daf6cb1c8abae07fc18ab42f5029dfae6f1a2bf44c0a0f72c SHA512 613a8c92d9307e3a4f7fdf14cf7f3146e3e5db0aec780e0485eba62835cbd0f08df4dfde64fdcb46eb6d0d7bf379872339a4428739bd13de85de3f5563248185
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.94.0.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.94.0.ebuild
deleted file mode 100644
index 751d494339f9..000000000000
--- a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.94.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-QTMIN=5.15.3
-inherit ecm kde.org
-
-DESCRIPTION="Framework for syntax highlighting"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="nls"
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtxmlpatterns-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-lang/perl
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-
-src_install() {
-	ecm_src_install
-	dobin "${BUILD_DIR}"/bin/katehighlightingindexer
-}
diff --git a/kde-frameworks/threadweaver/Manifest b/kde-frameworks/threadweaver/Manifest
index 4a6e6c28f79d..a6817ebcba86 100644
--- a/kde-frameworks/threadweaver/Manifest
+++ b/kde-frameworks/threadweaver/Manifest
@@ -1,7 +1,5 @@
 DIST threadweaver-5.92.0.tar.xz 1413000 BLAKE2B 2659e54bbdfe559f52288d71cc2f43aa41e3773c88a8b2d3ffce21def930c4dc615da89ffa0a15a77bce280bbdfc6430bb5a862dcdb25b071522afd79630d7d0 SHA512 7262e9c88e4a7eaa9d53e70f572e906d48340afcf63c057b92fea8c648755b48683a570d7745efc8f13134ad061fbdaad1c919764d96e804d60a659a5c28e340
-DIST threadweaver-5.94.0.tar.xz 1412996 BLAKE2B 8d827e507a6d521e3ff962593cb37d13497651ecf6c35076fb657ecc13845844bc271670d9f138f8370f8af68fa48cf2820f6fccd3744204aa75b61ec89cdfd8 SHA512 3ca7c63ec47a6c11182304bec96b9de6ca2e5a370de1e93350d00861a5d8d842e55e8e32390befa77d880e69ba763a0d576e17856bae650326dd9f1cb48a0fdc
 DIST threadweaver-5.95.0.tar.xz 1412572 BLAKE2B a4d640a13a0a63ec53297dae8443dea6ffd7b14a46c9ff380188432cbf694b1b3a586d62959d17fd3d2b9f6e641a37cd8b5ed8829ca366c74a6c61d445ee370a SHA512 d83f3850cf8cfe0fa3e49595bdca85d86f2ea83c30d465e88b84caca3cb8086c2ee66cf5aa39c5f6e0b6536d6f57fa224b807b8ace7169a7bfba51317fa9223f
 EBUILD threadweaver-5.92.0.ebuild 367 BLAKE2B c1bae25dcc03ba96f308d6f8d0c5186369b9d5b5dbaf01f34f60de67e0aef9c3dea9ef6126fe7bf0b97e4e7c3a48daef4695ca13cea8cb63b778cbc3703a064a SHA512 0f9f4351d44efc14a1bb0a646c5af2ca409ea629c745a256f41d39567ece816b9fba01e876540949eba7fe53203024d914fe460dc9489a23026ab7eb904425d5
-EBUILD threadweaver-5.94.0.ebuild 370 BLAKE2B 2147cd22d7aa887627c02884cd46d7120e328102e7a83a166f5d0d21d0d22d598d2164949bc1daa8ee1750897694a9c7fa52ebdd2ad92d5e5c6178bd36b4e865 SHA512 0442e8c989b570cab7df661528734577c3e9276f7572fd2714ab4050683a06c366cde8cc8ba9fdf8d3477acaa3cf189f465c2b058b632de3582b35e7819d0732
 EBUILD threadweaver-5.95.0.ebuild 370 BLAKE2B 2147cd22d7aa887627c02884cd46d7120e328102e7a83a166f5d0d21d0d22d598d2164949bc1daa8ee1750897694a9c7fa52ebdd2ad92d5e5c6178bd36b4e865 SHA512 0442e8c989b570cab7df661528734577c3e9276f7572fd2714ab4050683a06c366cde8cc8ba9fdf8d3477acaa3cf189f465c2b058b632de3582b35e7819d0732
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/threadweaver/threadweaver-5.94.0.ebuild b/kde-frameworks/threadweaver/threadweaver-5.94.0.ebuild
deleted file mode 100644
index a1a62f1f539c..000000000000
--- a/kde-frameworks/threadweaver/threadweaver-5.94.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit ecm kde.org
-
-DESCRIPTION="Framework for managing threads using job and queue-based interfaces"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-src_prepare() {
-	cmake_comment_add_subdirectory benchmarks
-	ecm_src_prepare
-}
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 78c1e7e3a439..45d596af8b57 100644
Binary files a/kde-plasma/Manifest.gz and b/kde-plasma/Manifest.gz differ
diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index 99bc2dbf6d8b..62d7ac57a48c 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,3 +1,5 @@
 DIST bluedevil-5.24.5.tar.xz 173184 BLAKE2B dfd62b0b9310be5e3389fc0059a1c2c3b5e62fe15f50c4b6bd0515cd36b697e63995f0cdfc0682f785dd42f9a6c23b453cc115a07bd2a96ad56d24d03fabd8ba SHA512 02b24ba96169d733166ac6b906d995414bcf31b4a459d695ec018e7120b6e69ba01ec0f8bfa6e73d1fc8c965fc6fc285bbcefaea86a9dc230cd6a0247e566757
+DIST bluedevil-5.25.0.tar.xz 172560 BLAKE2B 8afb1cc66af08a0270ad9067837709f03c3a86a32cbf07b424c7055a43889c63e05508d88be860998897c6957aecd9354b377dbed854f75aea86346a909b9f62 SHA512 f24efccf5555b010adb00e0fede7c960b3d448161de56295916a5db46bbdc868023f01ee927487808a62ba5a3d9c702aa66a26ac5197bd155882a50ad769193d
 EBUILD bluedevil-5.24.5.ebuild 1118 BLAKE2B d26804c3b4b6843bd9e3c1cc2aa579bbbfe6fa502c07bffcc08dcda60c4513c296fb7dd079b946972c305e9d4ca5c06aa48c7a9cbddecc16fd03137d0ca1b54f SHA512 9b451976eb958bc7b8a26fad822ff7d14b9ee85ab6144ca7ce529693fb53b427f8b13a92478c71d487f85ee709f30b83e3982c260bcb416b0f1488d1eeec0e25
+EBUILD bluedevil-5.25.0.ebuild 1121 BLAKE2B 182bd295c19ee8a0d993d646cdbcc44904ef3be1a841f9cc715d375fcb305676a02b371f6248a51352701edb797310eb95e8c52a181b4655121d2d9d2ea51da0 SHA512 35074d70bc41645158801a7589e7541599d138fd9dc9a711ae173206cd35751199e4727dd7ff3d0e01cd3841224404f7532f0cb61cd1f3b2e3b492f7957992d0
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/bluedevil/bluedevil-5.25.0.ebuild b/kde-plasma/bluedevil/bluedevil-5.25.0.ebuild
new file mode 100644
index 000000000000..b198ca9a834e
--- /dev/null
+++ b/kde-plasma/bluedevil/bluedevil-5.25.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.94.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.3
+inherit ecm kde.org
+
+DESCRIPTION="Bluetooth stack for KDE Plasma"
+HOMEPAGE="https://invent.kde.org/plasma/bluedevil"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/bluez-qt-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
diff --git a/kde-plasma/breeze-grub/Manifest b/kde-plasma/breeze-grub/Manifest
index 749bca006df4..c13aa826a5fd 100644
--- a/kde-plasma/breeze-grub/Manifest
+++ b/kde-plasma/breeze-grub/Manifest
@@ -1,3 +1,5 @@
 DIST breeze-grub-5.24.5.tar.xz 3144676 BLAKE2B 078525e002b90569ed8cba208a11ed5392898851f8fade092ababe3ec59ac950751f084dc5f251385d1f5c5f64513343013d63bcd9bd41d32238eb309f74947b SHA512 5ffba2c633f0442c6bb109df6f6ce73d527788c93487818f4c93f6140935eaeae76b7d1efb00d570a766054e2aac5bfea17f6ae7439b04c9dc0f6d8e02d10355
+DIST breeze-grub-5.25.0.tar.xz 3148396 BLAKE2B fc0c7fe4c892c7ad3575263e4eced89f95a21b86a18764b10aca236fd4799db62530999c7a4cac01f2c3b54195558975086377a2aa4aa37880c06161ee8ea7e9 SHA512 129a0e7f535e0d950ccdc695686c1f48c3f43afe88b80778825cc60cda1a4204f2644ebbff39f2b5e9acb1d73267d806845b5d8a8aabd21645849af684e116aa
 EBUILD breeze-grub-5.24.5.ebuild 408 BLAKE2B dc72176e505ec1930f82e9385ff72d0fe7baf572566f839a17410ab96279febcec0fe22ba820856ff4b6b8650153a8ad9033ad79b4eb0b4cb618176442bf5c2f SHA512 0dc9f121b7a0fa74bbea82a80352dfb47bfc4cf72f05f7055a8fd514238c9138417b55ea7f66fc13a6b8ab48c98233780f138a5d7fa199ddadbec8999445b93b
+EBUILD breeze-grub-5.25.0.ebuild 411 BLAKE2B ea43466aaae3bcb2955cf29f9f3d44cc7dc88294c02ec4753642f0fbf5da2fde580432e153d58176d7e3eda51cd97592c9fd640e95343b4ec592d482925c519e SHA512 a35717f5c22e7883401d37b496680a5add848033e1ae936f0f03d5d85fa015b02437b563318f00deec77100022a76539852fe7d72b4b0314dd9b3fe45247aa14
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.25.0.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.25.0.ebuild
new file mode 100644
index 000000000000..af842b702646
--- /dev/null
+++ b/kde-plasma/breeze-grub/breeze-grub-5.25.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PVCUT=$(ver_cut 1-3)
+inherit kde.org
+
+DESCRIPTION="Breeze theme for GRUB"
+
+LICENSE="GPL-3+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+src_prepare() { default; }
+src_configure() { :; }
+src_compile() { :; }
+
+src_install() {
+	insinto /usr/share/grub/themes
+	doins -r breeze
+}
diff --git a/kde-plasma/breeze-gtk/Manifest b/kde-plasma/breeze-gtk/Manifest
index 23a6d604ac03..d243f0f8e341 100644
--- a/kde-plasma/breeze-gtk/Manifest
+++ b/kde-plasma/breeze-gtk/Manifest
@@ -1,3 +1,5 @@
 DIST breeze-gtk-5.24.5.tar.xz 43816 BLAKE2B ef24e2f3116dc21e8877cbe5d08f727c546c18f94b1b0ab91c789fd421884b2a02c6f2c24b48efee2ba4e8d65458e0e351ce9faa5192aae1af25e7b5a828aad3 SHA512 6bf656a94a1c4f708ad83c9d2c23b15d29387975558494502613df07dbd298580b372a83dd16c1077d8c91057c92d74b47f279e1f92eb53fa9c8783fe98c3c29
+DIST breeze-gtk-5.25.0.tar.xz 45600 BLAKE2B a2f2d06aba3ebea13b1593194ba069a721d06d310a197ede85d40f35ee3a61d173ea560bb2d463c85bca11659758e95827ead6c8fcbbc973312f9006b89d9235 SHA512 a774493b7eb93b7f3a0775d3238ef0de634ec41ac1ed4a2ea28f8d18a34e63e7e49776965db6e1d5fac3746c5631196439f119f881f8851af75cb84ed8a31d75
 EBUILD breeze-gtk-5.24.5.ebuild 774 BLAKE2B f7317ba951ef51433cad9874538628861268178de42f5cbd3419ce9c5f2e6fe3761205a9f98070e0b7ccc3f1c746cbf3fed711f076410c14b5b715bf43d3a466 SHA512 27c4710882b5839a6b97fc9e56719e934c7564f08808dd0f112dad0389c13f66eaba9cf25a0d66d36fbe864710fad12fcf8c31bed995d06eced65834c2611bec
+EBUILD breeze-gtk-5.25.0.ebuild 777 BLAKE2B 3811af6687eb8faa098dbd17796da00bcdebe2d2b9adcdf5cbdede1ba00924c0c1f3de9190b7a937dfaf673d5c49f15b54e1398afb09ee50ed3899deb10d2f51 SHA512 0b817f0a309129d39eb7c2fc7a8c3ba503ff98d95f69fd469e7982c1afffef60d3c6f8ee38b58e44666a894e885baef132f87775b824d77ca6ca82f839166291
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.25.0.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.25.0.ebuild
new file mode 100644
index 000000000000..325c2a0fc59f
--- /dev/null
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.25.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PVCUT=$(ver_cut 1-3)
+PYTHON_COMPAT=( python3_{8..10} )
+inherit ecm kde.org python-any-r1
+
+DESCRIPTION="Official GTK+ port of Plasma's Breeze widget style"
+HOMEPAGE="https://invent.kde.org/plasma/breeze-gtk"
+
+LICENSE="LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+BDEPEND="${PYTHON_DEPS}
+	dev-lang/sassc
+	$(python_gen_any_dep 'dev-python/pycairo[${PYTHON_USEDEP}]')
+	>=kde-plasma/breeze-${PVCUT}:5
+"
+
+python_check_deps() {
+	has_version "dev-python/pycairo[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	ecm_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	ecm_src_configure
+}
diff --git a/kde-plasma/breeze-plymouth/Manifest b/kde-plasma/breeze-plymouth/Manifest
index 4f8424b90b41..93fb965b7dbb 100644
--- a/kde-plasma/breeze-plymouth/Manifest
+++ b/kde-plasma/breeze-plymouth/Manifest
@@ -1,3 +1,5 @@
 DIST breeze-plymouth-5.24.5.tar.xz 110824 BLAKE2B 76642ca51c025aada9062287a75ca07f5d5a50678cb62ae8188d78d7dbc0654e3d9028b977af4a514702e55546c66f68ed44d5c223154d94ad8f4854ee491d16 SHA512 d34813e6d039228c98bf8c4203ed33c84fac65d4204f08dc04eb93811d2602b2721cb2f60144f9f1aa8e91f4f5d18fa55f6ba8077e124be742cf13e29a54532f
+DIST breeze-plymouth-5.25.0.tar.xz 110712 BLAKE2B 7b3007b00abe89828011d116bcf3e8444294e5625a62f3dec17027b0f9fe41dd0745d4097be834c6e82c87f33913ce1e81be4203a358428e78ab32a48f5b06b3 SHA512 4cfbe99ac2350d79b2d003234722ed98419aa64022aac9b1659808510a9cd70cc9382073980bba92f697e06588ab5e4c6302a60fde269734f3bbd72ce166c55e
 EBUILD breeze-plymouth-5.24.5.ebuild 515 BLAKE2B 01f3115eab8ab511646798d04b5a52c2bb1f0156298b5aef542c7aa92e49cbd285eca4cd704e2f9081faea5c692f6bb975dbf41db1a27fec56433301e2374c70 SHA512 9723eeb675d4376c47a03a5bdbb1a9b0edb535bf5da6f138bcf1e5a1dea88fd83f629aaf4f345e6744438a811f370ad4af3cd5d2f50c2b7d3ee720cfe972fdf1
+EBUILD breeze-plymouth-5.25.0.ebuild 518 BLAKE2B e6834cf78d05899c5450da6cdf9551a591b2f40d7af75ba327904df73f5364638a07c209b3f54278d5b8f13d7d4ec1921b0b6dcde8054aeab995ef19f9002283 SHA512 9bab986bdb929ad658bdd569d683c0739e3d2ea8166476b0c5a4d225c3d4e1c31ccfe4b40d8ab83bb8bc3f29870a26685852a85b7862ae56b7f06bdc8d6d12c7
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.25.0.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.25.0.ebuild
new file mode 100644
index 000000000000..cc1ed57083be
--- /dev/null
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.25.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.94.0
+PVCUT=$(ver_cut 1-3)
+inherit cmake kde.org
+
+DESCRIPTION="Breeze theme for Plymouth"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+BDEPEND=">=kde-frameworks/extra-cmake-modules-${KFMIN}:5"
+DEPEND="sys-boot/plymouth"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISTRO_NAME="Gentoo Linux"
+		-DDISTRO_VERSION=
+	)
+
+	cmake_src_configure
+}
diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index 3b01d537eb2d..309a73a5b98d 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1,3 +1,5 @@
 DIST breeze-5.24.5.tar.xz 43037308 BLAKE2B 68fce5bac9abc097a1c91db68fa97a2215ea4e43d91e5ac9e86f803c64229f2d9e96c318417450acea0ef79316c0f2596d6bc9c0cd5513aa3249a616bc3f8007 SHA512 25e5744589130f7d339c727e17e662a28bdecc3f0598b9683735ccdfd2dcdeada46a49baa5564a7cf7d59a3f6ac34802ae2172857e704941d64cf879b3583df0
+DIST breeze-5.25.0.tar.xz 31153976 BLAKE2B ed7a225e03d3f7f2a0ed32e120d1b7fa3aebb8719218aace9355f62ef5d0b412c154010f4cca8e19ccae9bc11f8fec686b1d064367681ec7f64ccb06b48b1a01 SHA512 db447400ee2967a38d4f792dd053563d3174dba151bf6263cf5469010138420fd74a720d5d7bd4edbda3a38e1fca932794392de6d82753213910ba53410835c9
 EBUILD breeze-5.24.5.ebuild 1233 BLAKE2B b78a0cbfd6149999b9defd19e5730d5d3350e17ec5517f9bbd8feff0781003c3b353cd676fa847bc84a4542a083a2e1108201ee691d34a7044d630259f78a70c SHA512 d369d733f9cfc2b4b3ef0ef52920f3094dae7bb428a12bef4634f5e606debbda9b5356b70b927a63b3d083a8dc45edb9332282965a2c2aa9ddbc80f4aed2d7c8
+EBUILD breeze-5.25.0.ebuild 1236 BLAKE2B a3f9dda299950b3b68a326f66e8305070789eb42dc3a1c88e3956eb2d9c443ca2ed406626e04a076de189a3f158c959ff745e85144ec80579e4266231b27a721 SHA512 3951baeb66b33287060bb152726006348ae1e9a0a752121c1b2a12a10186169f795fe96a796bb1c31af6d61f98f01b6d88edcf2c632e49913cab0f990b995fbd
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/breeze/breeze-5.25.0.ebuild b/kde-plasma/breeze/breeze-5.25.0.ebuild
new file mode 100644
index 000000000000..b91895e595e3
--- /dev/null
+++ b/kde-plasma/breeze/breeze-5.25.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.94.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.3
+inherit ecm kde.org
+
+DESCRIPTION="Breeze visual style for the Plasma desktop"
+HOMEPAGE="https://invent.kde.org/plasma/breeze"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="X"
+
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/frameworkintegration-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-plasma/kdecoration-${PVCUT}:5
+	X? ( x11-libs/libxcb )
+"
+DEPEND="${RDEPEND}"
+PDEPEND="
+	>=kde-frameworks/breeze-icons-${KFMIN}:5
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package X XCB)
+	)
+	ecm_src_configure
+}
diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest
index 51ffb91ba3d8..1983bf9f7327 100644
--- a/kde-plasma/discover/Manifest
+++ b/kde-plasma/discover/Manifest
@@ -1,4 +1,7 @@
 AUX discover-5.21.90-tests-optional.patch 3372 BLAKE2B 9c1ee887d31b48b730350cb599f3f8e7ca4b802ba2d68dce72cede96b7a6d0e83451697b9e9e3da67c611514a3d808affb9616a515b80cc3788365fc3ca01997 SHA512 43a7152fb04224f52e417f2684fda6561cfd26888ff6493899e70b313f725066be1aefe9a0350c1aa260d799c44bdd5643a79e4a84dd6cfa34511dbc098ff93d
+AUX discover-5.24.90-tests-optional.patch 3440 BLAKE2B 597d128c9942999e0530610c6e42f7ef0439c79203493274a09e9f3ded20d96a4759a40a0931cdf88fc02c4323f9bb8c419a666ba6bb5c43afe4a492e9b33b1d SHA512 cbf977bfdd34e8d5e6fe88e21bf75ad490d2faef26f1f3cfda68060a7b36f666810a70f1c568d8ca1f5b162ea9eceaa8dd732049111976bfa3529e3dacb6d615
 DIST discover-5.24.5.tar.xz 8261960 BLAKE2B 0123ef536559ec9a739f1ffd1d04174f7e845eccdc481caac822294ebc39bc299bc831e741e8355d444df9e018bc457e0de7f591ca095da1c7b55f4d6976f8d1 SHA512 bfef0e3b0f3911d5ad2247abb0dcec6dc284bdfaa69472d35af1a28ddb6f14fedf1697269e35c1c29bd8b7017317b1ec69fb67cf55a32320d30e22445e354518
+DIST discover-5.25.0.tar.xz 8298804 BLAKE2B 771719bcba9ce27daa6d361aee7e8b680ead6bb0bedef95d8bfb5ee785e5e99be1f1d195d09f1b80ecf0fd3999a0d57694073720949044513cd82ffc807f439a SHA512 c63aa636df86fe2946a0d62f79eb279b96153d1844646d5ca79017a7a9a529580b7bbfb65d06fc86a5a71186bbe214ff62b11a3224923b6e895e95ea29879f39
 EBUILD discover-5.24.5.ebuild 2441 BLAKE2B e574eb16382569c5104c9ce2ef40cd1a38272433a9f217216f1d18224a8faec2d129952e95d220de0b18a2aaf76ba95bd8791ce0ba056c9c24da3006ea0e5d09 SHA512 97da5345edd4c4725bd2918e2b399491c79f7ba2194eebb9585c077547023b78dbf661548a4a007147ffbc96dd616fb8c609110aa74533555902fe050a05ed28
+EBUILD discover-5.25.0.ebuild 2444 BLAKE2B 3da84be3bd425483e358f0191f47304503b40df2a7b089444fc7c2b556c6960c29d0e1d292990b65d8a513f5ff09fc821a8d420f591e59ebb42444f60e812977 SHA512 2c6a9d1261d6a27d956c5a9dc3d088421b339f9db7c7b464db77c915c10a5c8d7cac5d04d5680554932c4d25bd68ac9d62abf3cf8c0188a60a06e724916b6a8a
 MISC metadata.xml 537 BLAKE2B 3f8ef5cff5aba41680b677214f13254460b589b01380bb7c569f0f4cd011d046f76efaab48eb3f36bd0f13ace05845e670223e34b12519c3add4f0412443c792 SHA512 68b34b02c8f1b9a4c41f4aa5b2c2ced838bf65854b7cf15286ee426290f80fff4065ed8fe86db1aec62329778f425b0f9dc0e69c08db029910cd43136aca1d9b
diff --git a/kde-plasma/discover/discover-5.25.0.ebuild b/kde-plasma/discover/discover-5.25.0.ebuild
new file mode 100644
index 000000000000..ff5587503359
--- /dev/null
+++ b/kde-plasma/discover/discover-5.25.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+KFMIN=5.94.0
+QTMIN=5.15.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma resources management GUI"
+HOMEPAGE="https://userbase.kde.org/Discover"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+firmware flatpak telemetry"
+
+# libmarkdown (app-text/discount) only used in PackageKitBackend
+DEPEND="
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/attica-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	firmware? ( >=sys-apps/fwupd-1.5.0 )
+	flatpak? (
+		>=dev-libs/appstream-0.14.4:=
+		sys-apps/flatpak
+	)
+	telemetry? ( dev-libs/kuserfeedback:5 )
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.24.90-tests-optional.patch" )
+
+src_prepare() {
+	ecm_src_prepare
+	# we don't need it with PackageKitBackend off
+	ecm_punt_kf_module Archive
+	# we don't do anything with this
+	sed -e "s/^pkg_check_modules.*RpmOstree/#&/" \
+		-e "s/^pkg_check_modules.*Ostree/#&/" \
+		-i CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Snapd=ON
+		-DWITH_KCM=OFF
+		-DBUILD_FlatpakBackend=$(usex flatpak)
+		$(cmake_use_find_package flatpak AppStreamQt)
+		-DBUILD_FwupdBackend=$(usex firmware)
+		$(cmake_use_find_package telemetry KUserFeedback)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# bug 686392: needs network connection
+	local myctestargs=(
+		-E "(knsbackendtest)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-plasma/discover/files/discover-5.24.90-tests-optional.patch b/kde-plasma/discover/files/discover-5.24.90-tests-optional.patch
new file mode 100644
index 000000000000..f90f81abf5fa
--- /dev/null
+++ b/kde-plasma/discover/files/discover-5.24.90-tests-optional.patch
@@ -0,0 +1,94 @@
+From 608e1dc8232002bc4cff600eae7571a100856334 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 14 May 2021 12:38:57 +0200
+Subject: [PATCH] Use BUILD_TESTING to make tests optional
+
+Variable is provided by KDECMakeSettings and default enabled.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt                                     | 6 +++++-
+ libdiscover/CMakeLists.txt                         | 4 +++-
+ libdiscover/backends/DummyBackend/CMakeLists.txt   | 4 +++-
+ libdiscover/backends/FlatpakBackend/CMakeLists.txt | 4 +++-
+ libdiscover/backends/KNSBackend/CMakeLists.txt     | 4 +++-
+ 5 files changed, 17 insertions(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cd8c61aa..8ce3fa8c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -22,7 +22,7 @@ include(GenerateExportHeader)
+ include(ECMQtDeclareLoggingCategory)
+ include(KDEClangFormat)
+ include(KDEGitCommitHooks)
+-find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED CONFIG COMPONENTS Widgets Test Network Xml Concurrent DBus Quick)
++find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED CONFIG COMPONENTS Widgets Network Xml Concurrent DBus Quick)
+ 
+ if (QT_MAJOR_VERSION STREQUAL "5")
+         find_package(Qt5X11Extras REQUIRED)
+@@ -30,6 +30,10 @@ elseif (QT_MAJOR_VERSION STREQUAL "6")
+         find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui) # qtx11extras_p.h
+ endif()
+ 
++if(BUILD_TESTING)
++    find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED)
++endif()
++
+ find_package(PkgConfig REQUIRED)
+ 
+ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED CoreAddons Config Crash DBusAddons I18n Archive XmlGui ItemModels KIO Declarative KCMUtils IdleTime)
+diff --git a/libdiscover/CMakeLists.txt b/libdiscover/CMakeLists.txt
+index a26d6934..ca827f3b 100644
+--- a/libdiscover/CMakeLists.txt
++++ b/libdiscover/CMakeLists.txt
+@@ -4,7 +4,9 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-paths.h.cmake ${CMAKE_CURRENT_
+ 
+ add_subdirectory(backends)
+ add_subdirectory(notifiers)
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++endif()
+ 
+ set(discovercommon_SRCS
+     Category/Category.cpp
+diff --git a/libdiscover/backends/DummyBackend/CMakeLists.txt b/libdiscover/backends/DummyBackend/CMakeLists.txt
+index 5b4aef10..38377d80 100644
+--- a/libdiscover/backends/DummyBackend/CMakeLists.txt
++++ b/libdiscover/backends/DummyBackend/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++endif()
+ 
+ set(dummy-backend_SRCS
+     DummyResource.cpp
+diff --git a/libdiscover/backends/FlatpakBackend/CMakeLists.txt b/libdiscover/backends/FlatpakBackend/CMakeLists.txt
+index 55e6b38e..e2d11b93 100644
+--- a/libdiscover/backends/FlatpakBackend/CMakeLists.txt
++++ b/libdiscover/backends/FlatpakBackend/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++endif()
+ 
+ set(flatpak-backend_SRCS
+     FlatpakResource.cpp
+diff --git a/libdiscover/backends/KNSBackend/CMakeLists.txt b/libdiscover/backends/KNSBackend/CMakeLists.txt
+index 54f19e1f..ec3443e9 100644
+--- a/libdiscover/backends/KNSBackend/CMakeLists.txt
++++ b/libdiscover/backends/KNSBackend/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++endif()
+ 
+ add_library(kns-backend MODULE
+     KNSBackend.cpp
+-- 
+2.35.1
+
diff --git a/kde-plasma/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest
index 48a6367d7ad6..84256826201c 100644
--- a/kde-plasma/drkonqi/Manifest
+++ b/kde-plasma/drkonqi/Manifest
@@ -1,3 +1,5 @@
 DIST drkonqi-5.24.5.tar.xz 795452 BLAKE2B 80a52ca807f2879640ac75581984789e60c8e41af3ed7c697c68fd2c1729248e96fc0c48d31f86fc9f970991cf266a798adc6bb4c1c04f3a06cde76d1be6c6fd SHA512 e1b5986f687da629d5e5f3e9034f551db4fec26870ff6801922da64cb7cff6d3089ae171ede47a6a733bb383cbb6dd54a691db962829027ad1449e71f2c45405
+DIST drkonqi-5.25.0.tar.xz 483400 BLAKE2B e548fcc1277e35bef45c6864121b4079f5d7f843a5cfd0d96732faafaa57fa2c1032bd4c1dbb7277b979bac555cdf6b27db9d38b80f565aedafc01973f793499 SHA512 e5717a270fb6a475308f375eba783a69e1d67305b926c579e1023542725266c169e0290aeb5642c7bf389e3069faf43f456dde8bc70b82237304dc7bb2cd4f63
 EBUILD drkonqi-5.24.5.ebuild 1335 BLAKE2B 6d59f4354ae7e37e3bfcdcfb675c4593dc6ae407c48a0a05e30a51cdfad2c6315c3af98d868d7dcb6fbd9bfb8ad1275c8453c1629675a9c6f56c9d7cb82de61b SHA512 65dc548bfc61bdbf5ae1e72c72e89c3333e9ac8be2a8ab98349a9275de172f2008fe5969cf72d7cfd2153a103a37a2106bcfe3cb57bc9e0043975bbae3dd51e2
+EBUILD drkonqi-5.25.0.ebuild 1499 BLAKE2B b677c200d60d6ebf0c9e85336b7454ece304143699d22dfa81c4f784050a82c4cf39e57f6166fea19b00afe4df8cc1524bc00aa2898da45ecf68e7b4a7bcbb1e SHA512 fe56c17b163ec677c8a7aefd907e7f732406993ebb16c1c285bdfd566668678b83a0bd3332b5ce926674f63516fb7db3090c1de68d37d40919c522ed911837cc
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/drkonqi/drkonqi-5.25.0.ebuild b/kde-plasma/drkonqi/drkonqi-5.25.0.ebuild
new file mode 100644
index 000000000000..7206a67f6f82
--- /dev/null
+++ b/kde-plasma/drkonqi/drkonqi-5.25.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.94.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.3
+inherit ecm kde.org
+
+DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
+	|| (
+		sys-devel/gdb
+		dev-util/lldb
+	)
+"
+
+src_test() {
+	# needs network access, bug #698510
+	local myctestargs=(
+		-E "(connectiontest)"
+	)
+	ecm_src_test
+}
diff --git a/kde-plasma/kactivitymanagerd/Manifest b/kde-plasma/kactivitymanagerd/Manifest
index 71e3c8b153aa..73de9b7a00fc 100644
--- a/kde-plasma/kactivitymanagerd/Manifest
+++ b/kde-plasma/kactivitymanagerd/Manifest
@@ -1,3 +1,5 @@
 DIST kactivitymanagerd-5.24.5.tar.xz 105216 BLAKE2B be8c117f6b4030a38d10d5abb6c5c090b70aa2368dc821d87168e2e3e9990f08d557e277bb488c94c74245153b4e3c733d7e93afb27903ba233c41236536cf95 SHA512 971105d22e7058b4c62ae00bef160b629cdef59e84cfc1d5fe6f7d9e43d12e71f8c93a56ef933f58729f71ead1d6b5c2247828a5a99bbe8300e0312888421b9c
+DIST kactivitymanagerd-5.25.0.tar.xz 106644 BLAKE2B dc1ed0e1080197a138ac1d1d492339319879ec14defe91da4bc4e1a35dbc6b8838b135a454793e834bf08f69f3c656f9258df78dee2a31a935d4ace713048a43 SHA512 f4c580682e070b10f5daa246b59154f806c6019d7d26aa0320c9626f72a576ac09723e587a6681d7ead31b1c4fa760ac3e1d37b677810742e93f855fada464c6
 EBUILD kactivitymanagerd-5.24.5.ebuild 916 BLAKE2B 9760098563a4ae6c5241618e29c24908fd33afd8afb83cf7b3f2ca692a10c802ff975aedc93eedbf363e79bbf5ea47c5407f22c7435421f87b4ceb3465fc17a8 SHA512 ef63d5a7a6387a808fe4b91f31bc5eb2ee586a66f80e1f00fafb7f731deaadbf9e5faf23599befd36670be86361824092c0967298d84c46b7589caa561d672e5
+EBUILD kactivitymanagerd-5.25.0.ebuild 919 BLAKE2B ed95067a40326dc2e705ffd127fc7ba77ad6baf2ebdaac0b5487d5e5b6fd9d8d64c18d7a83442a4dec7f6c64c9301a1f689f42cf8c89092ce5a4ffbb00ba41a2 SHA512 ab81d6e797226f0f78c51e525952186c21e0fe097ab7c84e47e622afba12a6a45852458723a4068f2803dd9552b161d9effe5e106cb85edde937bbe07ec93047
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.25.0.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.25.0.ebuild
new file mode 100644
index 000000000000..c02b3464f6f8
--- /dev/null
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.25.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.94.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.3
+inherit ecm kde.org
+
+DESCRIPTION="System service to manage user's activities, track the usage patterns etc."
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5[sqlite]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+"
diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index 8864dc253f13..811af4fa530a 100644
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -1,4 +1,6 @@
 AUX kde-cli-tools-5.12.80-tests-optional.patch 345 BLAKE2B 19415ec444e631602193daf715a94481a672447f0e262a78787a23d7c352bb18cb775e5054986019e5b21796ae24ace44ab92f337160a11500330fb03c3c75c6 SHA512 bb15a8b6e65298cab07e5a7ea9e834b2d565b2689a0c8d06c0b257fae9bc8a18f7af3922404ae4c13518c6be63fcb7581f0d50ec93d3ba9a64310fd901e2f461
 DIST kde-cli-tools-5.24.5.tar.xz 632976 BLAKE2B b5fb19eb0ed76f0217a066357744cfb1aa341a6220e79d32db96147c152b8d73e7b1807d8fb6a94d76b9d97b88f0988dbe0b1639321f88bbce07e8bf7140afcd SHA512 db89474ea3c88978123012430249677405b245628b0b12fda917b70fca9ea36e060f351420d0dd94f64e3a479a04a768064df27830884e2a8883db9104b90844
+DIST kde-cli-tools-5.25.0.tar.xz 630736 BLAKE2B c2669bba374772c8aacda174e11c577a0e04b22fea7acf39be0eb3c0f62dacc1dc1accaef5f9eedc76299d93386fbafbb7023b78a40b3a892574ec64507a5e9e SHA512 9143a73b7d077a55c9297de8fa09ddc3eea35fa781177187be6592b4518dc23e9b6852112b2c15e01f59aa2058e3f3a440fbeac48033ac40bfcbbf37c4e61804
 EBUILD kde-cli-tools-5.24.5.ebuild 1727 BLAKE2B a25e3f88cd5e607c9ed97860460790750dd420a6a947337a274791ac3b3c16347e83f2be2a15ff3bd26a192adc40563d5dc5dab7c41e17acf207c931da10ad52 SHA512 0a55eb213afc4f3ba1a68a527c8acba99debdd383a5f12ca5cd1a8a2204a6dde6d035298bc41d0d7ecc5764878c8d53a29574423de6a5f1826251aa5c83889d0
+EBUILD kde-cli-tools-5.25.0.ebuild 1724 BLAKE2B 6ba558c9bc4cb3ae2e652d2c1fe09dc49fc0f60d83c82c7c2ac6120dde22c57bee0a04d5f397c77feed66e175e4791469d781e4fbe6756665f0d6139a9f128e2 SHA512 1ac5fda68845cfd8708e66ab6cb26ec4e5f68e33a6f6a2c2c9915a916ad71dd6de800d93ebe68f89aa0157231c92ebae02810b56aef2a72fc5d30459b6119bd7
 MISC metadata.xml 422 BLAKE2B 6c7e36778e4ecaafce86d11fa6e70a86c064c654de467a57f9b5d181d720bf0a90c02655131be794fc271f6664764fe79fb7e29df622cdad67cd69bf67c3d39c SHA512 41cfaa9753dba1b53c1a2fe0cba54c1bde6982180d96841c057f2a56ecbbe4000d702141ecef493ab3d1a80c53520363a28d0024ad2619b5642e740927c7e4f1
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.25.0.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.25.0.ebuild
new file mode 100644
index 000000000000..b3e3f2ddf1f1
--- /dev/null
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.25.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="optional"
+KFMIN=5.94.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the system"
+HOMEPAGE="https://invent.kde.org/plasma/kde-cli-tools"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="kdesu X"
+
+REQUIRED_USE="kdesu? ( X )"
+# requires running kde environment
+RESTRICT="test"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-plasma/libkworkspace-${PVCUT}:5
+	kdesu? ( >=kde-frameworks/kdesu-${KFMIN}:5 )
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+	)
+"
+RDEPEND="${DEPEND}
+	kdesu? ( sys-apps/dbus[X] )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.12.80-tests-optional.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package kdesu KF5Su)
+		$(cmake_use_find_package X Qt5X11Extras)
+	)
+
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+	use kdesu && dosym ../$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu
+}
diff --git a/kde-plasma/kde-gtk-config/Manifest b/kde-plasma/kde-gtk-config/Manifest
index fc10b77962ce..9880cef09624 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1,3 +1,5 @@
 DIST kde-gtk-config-5.24.5.tar.xz 71564 BLAKE2B fbfdaac7a4ff1cd18e39b7b0602c0b1c643a96c4658bbd96af210f7da1c3de764b9ad43e23f1e632fee268dfe38469fbf4c37b6a88feb9ca189baf769cab9c42 SHA512 0cc7a76aca458ec093b55ea148637a82fa53467f3944d4192f4138f7eb93c88a2a65cd64e7438814f11182a390d39629982850b6939902738fd1d2a2af65319d
+DIST kde-gtk-config-5.25.0.tar.xz 72168 BLAKE2B 523b0cc1a29ef55235188e78f57c74fb19f6549185a535722a7a224d24d53c7c29e5cd8b3e0e043a622d1fa73429ada4ca9169f3c601d9ff63b136f654c54df0 SHA512 7e96b5a71c96ad86f25b3dcf22ad9a0bf0aa86ab5600af364936b149473242c916d1a98bdf7c82ad84efadaf0c46c8c4c146202436ea5212a16e86868413c3eb
 EBUILD kde-gtk-config-5.24.5.ebuild 1281 BLAKE2B ecb8a58774aaa1baa902ae1843603600b10096044452b160a30f8efd3deea29b475ca460969350020f3bda2dccf6650edb7eb282ed9923bca60ff9c5dd430f0f SHA512 bfe3a4fe3c3718d8d215c4e7bbd0ff78f082a738f50c15e65b43e4e8ac17b13e820cd5352c1db5b37ebe72148600446e80f035d1fddf5f09a4e0956cd762e387
+EBUILD kde-gtk-config-5.25.0.ebuild 1284 BLAKE2B 1dae074b616c5a861adc707e1ea98719b06a3eab925cbf8dc4dcd4f7dbacbe89f5201820a6329683baefe2da2ccc7ca0a24f81d5e58c1a86e04d90d8553f60db SHA512 5f6d7b9fb519b08828c099478d41b8d1ee8847e7f9ca7b19c600f960b026a997fdd24e0b192b4e8cbd20807644fc31e1e31a234ba299ad3b18d43b0d4d377dfe
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.25.0.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.25.0.ebuild
new file mode 100644
index 000000000000..6e874367eae2
--- /dev/null
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.25.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.94.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Syncs KDE Plasma theme settings to GTK applications"
+HOMEPAGE="https://invent.kde.org/plasma/kde-gtk-config"
+
+LICENSE="GPL-3"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	dev-cpp/glibmm:2
+	dev-libs/glib:2
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	gnome-base/gsettings-desktop-schemas
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-plasma/kdecoration-${PVCUT}:5
+	x11-libs/gtk+:3
+"
+RDEPEND="${DEPEND}
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+	x11-misc/xsettingsd
+"
+BDEPEND="
+	dev-lang/sassc
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDATA_INSTALL_DIR="${EPREFIX}/usr/share"
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	elog "If you notice missing icons in your GTK applications, you may have to install"
+	elog "the corresponding themes for GTK. A good guess would be x11-themes/oxygen-gtk"
+	elog "for example."
+}
diff --git a/kde-plasma/kdecoration/Manifest b/kde-plasma/kdecoration/Manifest
index c74338fd5bc7..b688ce611fd0 100644
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@@ -1,3 +1,5 @@
 DIST kdecoration-5.24.5.tar.xz 48772 BLAKE2B 79ae2d1001e771388161917882206971fdae13461278ddc2ff1094b3a1f6e5666fa1fb18c18d51f1a97166b4d7cd0553b2c19983a6cd6c365586394e4aab0b69 SHA512 d523e8515868685a15c20deead4ece798369736b117b1c29b14fa4849d6fc0a409a5b2a3eaa2756694e12ae0e22440a670ed6b79aecef7197b67d591b384d11a
+DIST kdecoration-5.25.0.tar.xz 49156 BLAKE2B 8cb438472cccdabb479484d64a827e4cb4c708b2b8cdbad7ffc18edd50fe0f1002836e16c71d778ba5b6ac26ec19ce390279f11b25e5d7c9f6505150b64430d0 SHA512 2d3a2efd099d77ca5d3b763c59f4fc4fa704124e79b768e3c4934ea7459e91b7e91f49cff61c240a3a53cf9b138f5ea1411a160f1fce7c185b3b52f442670658
 EBUILD kdecoration-5.24.5.ebuild 527 BLAKE2B 2e728e99de475fe9a8d711be620bffaa5c54d5143433b66cd4a74bf337e76a2979b78311245e3fac6babcac5040088ca2f2e30bb512b99e8116cc159b3cb73ca SHA512 bbea4118f9acb752fc40d918c8e26577eb718bddb7437ac4ed8ad41e4a4a3af87919436bd8b1b8a1245a50237c564dc2729a73bc4b4429223935bfc8d44c5064
+EBUILD kdecoration-5.25.0.ebuild 530 BLAKE2B b28cbd47d99e2d27e52c47846d6a84d49d52de78ed39c73445e7a26771192d39fef08137ad016a8cb0064c38da339fb6c00a7ac9011fbc8982346bf6af9fb937 SHA512 3591229bd3ab6d2a0a8b123ffd210a30e7c7ddeb076334d4e7b5c4d4d2c5d902675bcb55f5b11508c79152e7927050704986fc3e400f95cedd5919b8de87389c
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-frameworks/kplotting/kplotting-5.94.0.ebuild b/kde-plasma/kdecoration/kdecoration-5.25.0.ebuild
similarity index 54%
rename from kde-frameworks/kplotting/kplotting-5.94.0.ebuild
rename to kde-plasma/kdecoration/kdecoration-5.25.0.ebuild
index f48799ad0c79..eb23ab877706 100644
--- a/kde-frameworks/kplotting/kplotting-5.94.0.ebuild
+++ b/kde-plasma/kdecoration/kdecoration-5.25.0.ebuild
@@ -3,19 +3,23 @@
 
 EAPI=8
 
-ECM_DESIGNERPLUGIN="true"
-PVCUT=$(ver_cut 1-2)
+ECM_TEST="forceoptional"
+KFMIN=5.94.0
+PVCUT=$(ver_cut 1-3)
 QTMIN=5.15.3
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
-DESCRIPTION="Framework providing easy data-plotting functions"
-LICENSE="LGPL-2+"
+DESCRIPTION="Plugin based library to create window decorations"
+
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
 "
 RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index 0396f42ee885..2f3ddc1069ef 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,5 +1,7 @@
 AUX kdeplasma-addons-5.24.5-fix-potd-wallpapers-change-freq-1.patch 1452 BLAKE2B 99ac3c730ce06f5aceca01440c8b6afc5bf5bacd51bca500c424b95aebd74be2d21ec64b2d182815daa58310ebf62eb18686b792d630627250b374ff0174486e SHA512 0f95e4a4849e4c42407fa4400aaf52c64ddc39b66d77565727d50b37416a571ce0e2ce70844bda820a20e45e7c20a6c791255df00bb78ac06bd747d96d83b2a9
 AUX kdeplasma-addons-5.24.5-fix-potd-wallpapers-change-freq-2.patch 1511 BLAKE2B 6d7cb8b130028aaf32a961bb442e9fd9c2a215904f3a801a16283b35afc84b2ca9f9eb87a04193f5d511f687c6a8117409dac9c496875eb0e85dec25e46be4d9 SHA512 3ea620b46fe851ff055b6847c8e91881a7c5fb88a0c013bdd72b7f4649e005e4871fee9a3855e9f00be8b003ddbc6c8479ee49111970b5272ed9984a8fdb8d7d
 DIST kdeplasma-addons-5.24.5.tar.xz 635292 BLAKE2B baadba07cc223ae0dd87718202177c284a8db4efd8538297c456a2623df2b28449bcb0e55aec346a7aa76fe148c72bdf6ba354f1ccd897b8639153e5c31ceaa7 SHA512 de69d14ef6ffb23824bc646c1582cddfcac7334e7543a1414075f3debd8aab46d51d01983617ffec371ad1df703756b5f8d6c38eebb80ad10b6fe4d320747669
+DIST kdeplasma-addons-5.25.0.tar.xz 654532 BLAKE2B 2c4dab8abb9baa2491d99c72c0e5a0aa262e2092233c37cd0afe2f53e4d98282fa9e3b62f4e394590b1c1fc0fb02f4dedb1e8b6e753b2d71dfb0643e48cd4ce5 SHA512 9105e9862f2dd890d39c3ad5bb9e62e7b9907e67359ef65e97d98675cd816487e4e455ee3faf43b0de2269faab917f921795ec143fa22f96ccfa97540a133857
 EBUILD kdeplasma-addons-5.24.5-r1.ebuild 2003 BLAKE2B b6d3e843ddcea8bfb1164056f5ccb8e687c188ece4f4b103687ec683f9b69935cca482ed3eb98269b3223788b4e87a5e55322e8ad98687dfe76a7cec8395310d SHA512 3cb6cac24611101a47a0dab6d7d3f35700142b261fb67f4584375d2fd423ab35121d836f1973af4121e3a574eb780ff316b6822ea71fc1fcaa48c31c783f8c0b
+EBUILD kdeplasma-addons-5.25.0.ebuild 1912 BLAKE2B 995038c41765fe611413491da7081231733b22cf9ab896eb1f6753c3886323fb93a13b5665a503fd7c70d90d7ce562d0634762c6ac917de357811100d9f6b957 SHA512 4f9c9fb6c8f0015ced5a0436af7d9b4eb9bdf31758cb7b0d143b9b697abb2da5c87a24bcb2b7bec0e6b5da70ffa98cb59b76fb1e293a89daa01642ddb3eee1b5
 MISC metadata.xml 534 BLAKE2B 333ea162901ad4e28de1fd55b40d5080a4d3383fa9af09a46363835e312a8ead0fde01ab762b9ab6930263e61ffb56dad2d53ee6167568cf683da48eaf3ad0a2 SHA512 9eb20a5a87713c865d782c8a1e009098e6db4dddf2ac8cdafbce407da995ee258274645445901f1a5c883202faf46dfca0f1dde5edbe45bd89e7509b22bfa0f5
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.25.0.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.25.0.ebuild
new file mode 100644
index 000000000000..e87e6b4227ac
--- /dev/null
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.25.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.94.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Extra Plasma applets and engines"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="share webengine"
+
+RESTRICT="test" # bug 727846
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kholidays-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/krunner-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kunitconversion-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
+	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-plasma/plasma-workspace-${PVCUT}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package share KF5Purpose)
+		$(cmake_use_find_package webengine Qt5WebEngine)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "Disk quota applet" sys-fs/quota
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-plasma/kgamma/Manifest b/kde-plasma/kgamma/Manifest
index 99899910c9d0..6da32f9fcc7c 100644
--- a/kde-plasma/kgamma/Manifest
+++ b/kde-plasma/kgamma/Manifest
@@ -1,3 +1,5 @@
 DIST kgamma5-5.24.5.tar.xz 83552 BLAKE2B ea89b6eb7ac288a75ab417716541e8997bc3927abf6312b944949e2ae03b3fca7ea88fd121ecd3681da57b794e8706b00fe55e432c9bdc9ac886f7347b49180f SHA512 a7f4c9fbc370c69ba9df2aa0ae2c75b896cc90adafd97c5ae214a05e8ae0261e94050e0acd1924c16f94b632209fe4803ed475555d882ee6e57d5271691ddc2f
+DIST kgamma5-5.25.0.tar.xz 84264 BLAKE2B 65797533f5b97865aa685b0da175be3796ee2ce528a566761957c50fbea8fff6026b932ae87aefaf51e626ced2b56187397ff4dadf719628584ca3af615131ae SHA512 923e2e23fc5b179af97bbed396c2dbd9620a5ae1e5eed4261fbd5f78b41529be02712bf1177d94d4c82cc1c0a72ab84964cebfd5003ba866d0f460f1d69549b5
 EBUILD kgamma-5.24.5.ebuild 684 BLAKE2B cfe49bf4b44237355e1b242ec27bd09bc10798fc6b3d9091385ff8b44bf2a7f5985b40425d4ce6b3fd622436614182d686f724e514afbc6c4f5a474d84ac4b2d SHA512 e543d54fe2afbb76164a775031776e435289c7e458c1f07f4959f7d8c9676bee8159d72a1aa086e580bd1bc9f17f4a10dafb05bf667941fa61db9f85fca738f6
+EBUILD kgamma-5.25.0.ebuild 687 BLAKE2B b94db8e1648656201f83567b73bc6e67ba1f9975d9e8660cbf17b1f528428ebc49d840063dbab77a6f5a7f622fa38db0b8007eb6ec128be408136281eef62909 SHA512 f5e6c835fe888c39e80fe4a1dc0f6463eb59028117addc7dd963a09ed0f2e6f72b9a52668145a8383fbff25cdd54b7d213a9d92143c3d1deafb769cdf3058015
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kgamma/kgamma-5.25.0.ebuild b/kde-plasma/kgamma/kgamma-5.25.0.ebuild
new file mode 100644
index 000000000000..3caa3f371c10
--- /dev/null
+++ b/kde-plasma/kgamma/kgamma-5.25.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KDE_ORG_NAME="${PN}5"
+KFMIN=5.94.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.3
+inherit ecm kde.org
+
+DESCRIPTION="Screen gamma values kcontrol module"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	x11-libs/libX11
+	x11-libs/libXxf86vm
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+"
diff --git a/kde-plasma/khotkeys/Manifest b/kde-plasma/khotkeys/Manifest
index fa18bbae8324..f77bcfc84482 100644
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@@ -1,3 +1,5 @@
 DIST khotkeys-5.24.5.tar.xz 1853496 BLAKE2B f06865ced3dd0e97b6dae96cc96aed105192cb6055aedebd991955bd4a473ff085acac0f35fd509fc7465cb100bb43860f2bb23f618d7fc994eb115c2b0ce38d SHA512 b12373b8295cf8e7909a72a07fab8847d8cf26053814b02acf215e912156b797c3a7c3cd459f04e9b6b47cd09d5941d1f3433ee4e8b128e49d3dc9832fbb3876
+DIST khotkeys-5.25.0.tar.xz 1831980 BLAKE2B 79b40c5524ba60f01c236edb3926711435443be19000dd09c0fed5c3cc68dad6999ecbc505600f199bcdf7c9990c1ee9133303e4fa07929c99fb95a75dfdbe6a SHA512 5c11c72da6d02fba2c724ccd2e0dacf9e00c5b15d7192526dd801ddd24c033eca1c097e9daa374e5ae473c7e4458e427effc0495be95d9142c80ca9873a2a2d1
 EBUILD khotkeys-5.24.5.ebuild 1353 BLAKE2B adb5048ae592e5f7f04c6c092ab5182258e796dc49f3c5029e9f2ca421e7cba243ae3031d8c66a42f8e505081a372faccbd4b2a2b8961a304c912dbc9b84a46d SHA512 db1736e70d720c54a1e4513d48349745568aca0e8b60a6fe75bb674a9489b54e295843793054b7b8764bf808d6fff43a9146472c64d3644cc2d9e7f6854f5778
+EBUILD khotkeys-5.25.0.ebuild 1356 BLAKE2B b4124e4ed01532103cfa6d02e56e04663e4cd8a5d529bd3c4971d654a86903177f3dcc860992f118e316114efdcdcb686d67e574d0360d3e8e402da94606098d SHA512 57f1cad0d6703a1c7f14c6f43e9ff9e5276fa5620ded1463a843a587b9a1cb5989c53ce820d3f0b044d9c5728f7084ad74d4b61d708dd149c788fbbe571dacf9
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/khotkeys/khotkeys-5.25.0.ebuild b/kde-plasma/khotkeys/khotkeys-5.25.0.ebuild
new file mode 100644
index 000000000000..f712ab68874b
--- /dev/null
+++ b/kde-plasma/khotkeys/khotkeys-5.25.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional" # not optional until !kdelibs4support
+KFMIN=5.94.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma workspace hotkey module"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdelibs4support-${KFMIN}:5[X]
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-plasma/libkworkspace-${PVCUT}:5
+	x11-libs/libX11
+	x11-libs/libXtst
+"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+	x11-libs/libxcb
+	x11-libs/libXtst
+"
+RDEPEND="${COMMON_DEPEND}
+	>=kde-frameworks/kded-${KFMIN}:5
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index 413f7a9c81bc..bcce2df8c198 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -1,5 +1,7 @@
 AUX kcm-about-distrorc 108 BLAKE2B 9324829040a699d8858a739b228b14035f8a33d4cc5e19af30545a6eb9780808b3350ca12c82a44a1868c32acddd76dcdb4e7b25e5792694b55fbb38ed23db8a SHA512 72f1dcaa04bfe435e64c8e584914eb56a15b63f7c6086f5e025f0c497b4fd5b9592d54aafd335f55d303790af274c9cbfa29c6c7ff87875da648ee16d7717467
 DIST glogo-small.png 24583 BLAKE2B 0af2ceae708e56f217120e5d8b880fb71401e3761ab26c4af5e74c0622368aa4e34b05160fae15fbfbbc832077810ab5c1e424826632748299fd22997cbe665c SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48
 DIST kinfocenter-5.24.5.tar.xz 719404 BLAKE2B 49ac1db6f1e98fdd2575f43891ebb27448f211d61d811496f4a54170806ed2df80211f7248bec093e45855625b3ba6f768ec66b070b196de9452205b632fbbcf SHA512 598d7993808ac6f32ae89c2a50624caf81c4d7a355ae155469d79fda923d3bcd4256077863186a42d594ddd36c06ffb5c3fd02987cf638b2bc88dffdb9b47883
+DIST kinfocenter-5.25.0.tar.xz 731260 BLAKE2B 81aefdf8d89738c1d4c4eaba59ffe581651e7abb3fce62a850c10655da9c09333937c43222ad4afefd1f870031ef66eb21783c90295016f8398d85967cce3520 SHA512 bbde3af28343f9915791cdd7122a8c4e3e759edbcdf34bfcfb1054319020f9f6b5a8595b58360675bdcedb5fbdeda8b9dd16e3c537002bc28d95175aac53a099
 EBUILD kinfocenter-5.24.5.ebuild 2256 BLAKE2B 173f95f1b91d4d31be1e1ddb0d48a0fb0026bdc4d63159b5e7aae5e76bfc7f6bd5e48603f4854d7e7307940f7a8d71eceb4c12a0bf86c31def7ba3f453f77c7b SHA512 96ca6c69890ef04c3af536f66c3570c9616ff402cf348b98ced451315ad26c8c27f0efc027cb0a7e8c5592a5b0ef63758b8cf35f344e6eabda62ec5a617d6cbf
+EBUILD kinfocenter-5.25.0.ebuild 2259 BLAKE2B 2d446e74682bc74844d40a0e7f7851fa3a7c85c46b05b46633bfe7a9b6f0b08a0836cea47a2a842375e87cd72d516ef8f1921db9d38b1509e6ad6065d65bcfc4 SHA512 8144dc7668429a27ccda1dc0c7ceed2577d93fddfb31433f659ab690bf42ee38511caa3a1d2eee5a0e1fe9a1c913b43c7de2de486314ba2ec702839799bab3f5
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.25.0.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.25.0.ebuild
new file mode 100644
index 000000000000..462cff966d56
--- /dev/null
+++ b/kde-plasma/kinfocenter/kinfocenter-5.25.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.94.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.3
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Utility providing information about the computer hardware"
+HOMEPAGE="https://userbase.kde.org/KInfoCenter"
+SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="gles2-only usb"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	gles2-only? ( media-libs/mesa[gles2] )
+	usb? ( virtual/libusb:1 )
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+	>=kde-plasma/systemsettings-${PVCUT}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package usb USB1)
+	)
+
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+
+	# TODO: Make this fully obsolete by /etc/os-release
+	insinto /etc/xdg
+	doins "${FILESDIR}"/kcm-about-distrorc
+
+	insinto /usr/share/${PN}
+	doins "${DISTDIR}"/glogo-small.png
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "NFS information module" net-fs/nfs-utils
+		optfeature "Samba status information module" net-fs/samba
+		optfeature "Vulkan graphics API information module" dev-util/vulkan-tools
+		optfeature "advanced CPU information module" sys-apps/util-linux
+	fi
+	optfeature "Wayland information module" app-misc/wayland-utils
+	optfeature "OpenGL information module" x11-apps/mesa-progs
+	optfeature "PCI devices information module" sys-apps/pciutils
+	optfeature "X Server information module" x11-apps/xdpyinfo
+	ecm_pkg_postinst
+}
diff --git a/kde-plasma/kmenuedit/Manifest b/kde-plasma/kmenuedit/Manifest
index ae1d29b0f6eb..f607efffb590 100644
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1,3 +1,5 @@
 DIST kmenuedit-5.24.5.tar.xz 901504 BLAKE2B da12126c44a5094433ac14665ca35fed6ff9e9f11daa6d9ad399b07e3c2e08df64bed95b92df42aa621a3513a8bb63df0f29ab0fab53afe2b6840856c540e6c6 SHA512 c637b662b366691a179d8ea67a91062a10a6d40467a72b3858f6f43f20ea6e03bfa65e1861e4cafd329098a8fd1b7976c565c355496df7f5199d8316e930b759
+DIST kmenuedit-5.25.0.tar.xz 902756 BLAKE2B ca2899d4bc2fd8ba9e0b941b45676ef71d57d5b877fa0bb3b70ef2c133c625a9ef3a50c684bcd81d33a0d5c04d7867bf7008f7ca4fe8d41e1c7ffb4bdb02df0a SHA512 e8b146889a2179177c5acfeced50f3a2e25318893eec7a700015ea550ffa9158e09be5d9c45c1b60d4c24534029570b79d417b69821cc7635123544d18921058
 EBUILD kmenuedit-5.24.5.ebuild 1067 BLAKE2B a397c3bd5c1a3eacf48e352583cb8393681f14d71c0cb96a97a771f67c27f4aa99b558276700b181117c98d4010c19691789b3f492397e4344e6f4e0a000d515 SHA512 a0221f6252ebf7b2daf09e89b83dd0d665410d4cf66e4188d2f630e3ae9bb9c430b413bfb7e25cc125f0e0210548c79f00f02940b41371f5b259d4a516c733b7
+EBUILD kmenuedit-5.25.0.ebuild 1113 BLAKE2B 4f2db2a84216e6f117b873bc6fc4153b34473fd4ff822028e818c62054e4ba6fc89422b700a36f57beb7378d99180df9c9a546e0e7be8b5daaac0ac4ccc3de7c SHA512 67078c2e1638137c1d45a861221670e8c88dbb04745e63ef15de4dca74c64b2c5e4e3ab7c7c278419213d7e3c6b6a5d01d6d0331fb4fd6fcb903a48d50150712
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.25.0.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.25.0.ebuild
new file mode 100644
index 000000000000..d3c23c696a4b
--- /dev/null
+++ b/kde-plasma/kmenuedit/kmenuedit-5.25.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.94.0
+QTMIN=5.15.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma menu editor"
+HOMEPAGE="https://invent.kde.org/plasma/kmenuedit"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index 9a925b034b2c..3af3bb2bb1d1 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -3,6 +3,8 @@ AUX kscreen-5.24.5-fix-kded-xcb-resources-leak.patch 1907 BLAKE2B 3d35c3f3b0bf5d
 AUX kscreen-5.24.5-kcm-fix-choosing-refresh-rate.patch 903 BLAKE2B 73e08bf9843f51be102eb4f3057641fde12df955aab01c9997a34a66e6bb673277f1fe0fcdd21fa6d7b3a83faa6e2c12288c06e659f82482190c8552ec3f761f SHA512 67aeb93bafb4a13bd7d19356338c86fd5e1df07cb1ac030d6b1f81d9d683f52ff036c5c4eba0c9ce1599c9273c0ea769b2add3516ced4b2128dbdd4b7c07fb7b
 AUX kscreen-5.24.5-kcm-fix-refresh-rate-list-not-updated.patch 1080 BLAKE2B 7ff3fc46e9644635f59541ebf063cdc153010f09c1fa7b90ca92140fba1e0805e9991042c788454662d7ae9917ecf3f10a25e6c2dcdc704945f91071d24adf66 SHA512 61aee0523a65f2ef448c7998df0fce82f1dd91d241c4c922c86468873ff69873852b31682cd2c531285312316cb25ad21da318c0cfe78ab07e7bc60cf9b4be08
 DIST kscreen-5.24.5.tar.xz 137332 BLAKE2B ef48b057356ed1df376cd5a64384ea1f184b78e8da1d0712287342cba41eb9bad99216bc8e9f8d52d5e080798436124bd39f2bff71c4a25ba28c8d8e10fd0a59 SHA512 770dfb968f8f8bf96b6ad3bf71f18f5baca35b2a4daa72b8806957ad1e050003158319edba84ebf999134e106ef916d829d391c33d79c58edb1000f503f67c97
+DIST kscreen-5.25.0.tar.xz 143020 BLAKE2B dc0d9613f23c5ff90e3f1ab17d559f7fdd4105fb25c83c87b93b320135242346ffbe698dcc212ec12b6e850b2d8fc84e32ab021c4e274aea605873a28429ae3d SHA512 27e44e15e82dacf81f94f35ca6cc99511e9f3036268c0b76a0cf4bd18a250d9675486ee830462f57879072cdbcc16932a9d022b12d7c049b0088187131f0b952
 EBUILD kscreen-5.24.5-r1.ebuild 1457 BLAKE2B 1f6d645be9f5c890956b1004b35c1662604303bba9b28a92ba20ec7ee74e8986a0e3e3eb91ecb6591ffca63ce493235fa9014e0d25027867eb0ed0f50bb32c90 SHA512 8dac356cb6a6da83864b677a792038aade000b71a7bb16d14529a7d7066e799d4dbf7897f2bcd7ebf54c714231a17b6b14dc89093063159dd22ef1e03ee7f5a4
-EBUILD kscreen-5.24.5-r2.ebuild 1529 BLAKE2B 3e4ff370d33e7bac789ad8c9b2d64c750d016e13d2ae3c23f2c2a005afe0b06ebb28c8795405d10da2b83db03bcf2a509c33ded3018678b64d882da4872fd81e SHA512 50ca234de6902c797e6067a682833c7fbfa6ae771635092a907b5e03be0ebc3e5f2c5d6d97dd1339445730a1698653c93210eeb5f5295370cde0b211b052fbf9
+EBUILD kscreen-5.24.5-r2.ebuild 1528 BLAKE2B ace7d67710871e63c9d083479390739a3876ddeaafacda2c63ba3ba6858e9274e52c72ed572e00070b3c17107e15f47bc693be02dffd808831843f78c2396db3 SHA512 9cfc8ef539b65894036df188c969c15dd1ab26fc50fa59951c79b0ee4b2d62a386b067192d5a3b367e3cecf4384acfe2deaa83d52a6b771af2a9a6dd20bc72cb
+EBUILD kscreen-5.25.0.ebuild 1250 BLAKE2B a6dbdc11f14286e2e4a1646ee334883c11789af2fa2ed245447f4c1c4e233d15e62c41985292a421dfddf180b7e8032fed92df5d25b6ba128e491998e6907480 SHA512 2829331eb29ea1febe76479f55d9e92e19625067b572453fe8014081baaf03361069fb53753307e0ebd50044ba1a471faa1d6be8c43efc647d7605920e02c647
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kscreen/kscreen-5.24.5-r2.ebuild b/kde-plasma/kscreen/kscreen-5.24.5-r2.ebuild
index 10200425c5f2..f4e86614ad8d 100644
--- a/kde-plasma/kscreen/kscreen-5.24.5-r2.ebuild
+++ b/kde-plasma/kscreen/kscreen-5.24.5-r2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kscreen"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 # bug #580440, last checked 5.6.3
diff --git a/kde-plasma/kscreen/kscreen-5.25.0.ebuild b/kde-plasma/kscreen/kscreen-5.25.0.ebuild
new file mode 100644
index 000000000000..76f9ab30e560
--- /dev/null
+++ b/kde-plasma/kscreen/kscreen-5.25.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+KFMIN=5.94.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma screen management"
+HOMEPAGE="https://invent.kde.org/plasma/kscreen"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+# bug #580440, last checked 5.6.3
+RESTRICT="test"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsensors-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-plasma/libkscreen-${PVCUT}:5
+	x11-libs/libX11
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index 2b465e762b75..dc2244959c7f 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -1,5 +1,7 @@
 AUX kde-np.pam 217 BLAKE2B 47e599ef678a81bd12a3e2a04b662c284136f13d5e0aeab06961e9d57007c51a93af1132239f97421cc6f9c47e8622d698d0eb2235e99820efbb8523b227c2de SHA512 88cae39981916a1d4ad115bcac6f4c7db92fa2eef606217ce270cf7ffeb422c18dbabc9f3f4c4581fc1a99b814f51c34b4ccb1dbc8fe255e64a63a31f80c91cb
 AUX kde.pam 226 BLAKE2B b281adb40b654aa616af66818613f6446b1bfd2025c0819130ae684f61f6683689d1facd3a4b248849bbfda0975603094988b809d01dcab501f69e1f4ef8825f SHA512 a44c3325ea4c56e1b3c8c2953a68e5c7eaea5e2f059c0eea4b4dfde2b2e056e5223574c967d991c6427117ce4db0c4fb00fb6a241f29bf2eaac37b1195496776
 DIST kscreenlocker-5.24.5.tar.xz 119436 BLAKE2B 9a9885e683d474308feb82be9e33047f37ba1e9d127ce435e205d44311c5edc9ca1fae391858409058226a80e80a783852ca53e03800c0ddd74867681182a072 SHA512 c3252ead5f6cedece82ea94d88324b968938d0218ec05182f07fea85ead5ec451bc04bf417fc4f7a0f37aa56358caeb893175eae8cbb74ea748f843de9aaab83
+DIST kscreenlocker-5.25.0.tar.xz 112560 BLAKE2B f70f0b48891efdfab3b32fbf5e691971034da06188aab949e14ffb49b78e623aa8893a52fd5060ca4878da7e5f673bca71be1625d6ee61b861896be724a67e72 SHA512 9994f028d8e5c51b8fa9ec9621a0e59b1aa7a2223fe3ee0bc3fbc0954bc4fd2aa4ee97a6540efa77bc2f5170ef3c96d421d96b9beb5012ff0acdbfd203ae5d32
 EBUILD kscreenlocker-5.24.5.ebuild 2261 BLAKE2B b35db06005d91b2e1a191cdad60c4b169a23d534563912ecdd6d37ccaf07d282e7779fe9ae1a30e0b079d83884d01835c23aebac92d17383afa432e0c9d86f4a SHA512 2a39d85a8c3988989afb4afe77143ec932f89b019b962f1220577ee075eb6c2f497dab452db28abf39e24201e84897b3c2fa0692fc743b051a0af0c8fa6abcd3
+EBUILD kscreenlocker-5.25.0.ebuild 2269 BLAKE2B 204940550e06776bc1e6f23528a2f79fb63ba792846c1f9a39d8810f6e98a9421e521b5fe792181c97ee0671e0eb2d896bc7fe63340ced7afd02d5c9264df6fc SHA512 47bbe092761cb9b8715a8afb004a102f0e3fadec8297c631e4b37feb10f6f313bbcf270453b1d18d39f61a63bf269d32d18cd296cf84aed9050af505967eecd4
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.25.0.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.25.0.ebuild
new file mode 100644
index 000000000000..27071fa62a14
--- /dev/null
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.25.0.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+KFMIN=5.94.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org pam
+
+DESCRIPTION="Library and components for secure lock screen architecture"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+pam"
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+	dev-libs/wayland
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5[qml]
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	>=kde-plasma/layer-shell-qt-${PVCUT}:5
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libxcb
+	x11-libs/xcb-util-keysyms
+	pam? ( sys-libs/pam )
+"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+"
+PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
+BDEPEND="dev-util/wayland-scanner"
+
+src_prepare() {
+	ecm_src_prepare
+	use test || cmake_run_in greeter cmake_comment_add_subdirectory autotests
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DPAM_REQUIRED=$(usex pam)
+		$(cmake_use_find_package pam PAM)
+	)
+	ecm_src_configure
+}
+
+src_test() {
+	# requires running environment
+	local myctestargs=(
+		-E x11LockerTest
+	)
+	ecm_src_test
+}
+
+src_install() {
+	ecm_src_install
+
+	if use pam; then
+		newpamd "${FILESDIR}/kde.pam" kde
+		newpamd "${FILESDIR}/kde-np.pam" kde-np
+	else
+		chown root "${ED}"/usr/$(get_libdir)/libexec/kcheckpass || die
+		chmod +s "${ED}"/usr/$(get_libdir)/libexec/kcheckpass || die
+	fi
+}
diff --git a/kde-plasma/ksshaskpass/Manifest b/kde-plasma/ksshaskpass/Manifest
index 0ce3df3a2183..36eb58b39f18 100644
--- a/kde-plasma/ksshaskpass/Manifest
+++ b/kde-plasma/ksshaskpass/Manifest
@@ -1,4 +1,6 @@
 AUX 05-ksshaskpass.sh 42 BLAKE2B 2fcef93ed56ab90d98078017924ccfcf3892914e0fc45c6733b538634743a79ae1603da4aabed1c9641750ceae24e167591989290427f6efa4a03b4d69008362 SHA512 780f4d0467bab82295f894f0547ea59c36e8f05cff51c4e64db8a7e8e4215e2d6363550fed16a4336019b2102e5c5bdcfe73524761ba04db3704ddec6efec669
 DIST ksshaskpass-5.24.5.tar.xz 24708 BLAKE2B e6937ec76b6cadff437c77eaceb075d7050e6d3581e64b66c1a07491352e335e63dc58b6655da6f5532919295bfad0e13da6855370b4c0a3c1eacb9698dc1759 SHA512 e4d7358eb213105a4e479eb3c9d229a87d86c4ebda199f486f9952f81dc1e91b43ba30d834907586f9badbb7e2933e44af5713119caa2e3bc060f16936e9a457
+DIST ksshaskpass-5.25.0.tar.xz 24884 BLAKE2B 1904644eed923daad440e3b9cb254d74b9dda42fb0783947d902686c343dd6c2bf5b9caeb1ff1b528b6f0f99ffd70332dcb7a3d9a12721e1b62b266a685720cc SHA512 1f2666a14ae252e9943a3a97bf642145598378cd0a9db4c3008e466a4f937a742a7cdeec5757c0fcebda7a9bcf23f0924f900eba5286d2bd321f4148db906f4e
 EBUILD ksshaskpass-5.24.5.ebuild 1440 BLAKE2B e5d18938737f9db2569b7176315a1070f16bc314c57fbb9e53a793c914569ab2a0e5b1db663b4f3b008e8d2f2f5005443cb9543ba8dba6921c9943206acc7cd5 SHA512 15a2d3b0d818212d114f8b3f9778f4d040abd54440b07811a2ba55c58220acf1f4212cccc3a048242b242692620c4e377d779830d3703f0bff34876f57204642
+EBUILD ksshaskpass-5.25.0.ebuild 1443 BLAKE2B 34b158552b937a9897ea7fe2053bab7c485aa85034e0cfa61520d5d5e49f02878b1b24063c0c92b93852d30b0ef879cd644aa739e4871dede890045a80bc10ed SHA512 9477085985ded5f52249e1cfac0a23191073d395075e4b77a40e765668cfa970f0587c32079370b9a9cf2479e22e6a7fed746462700946ccebf608fec398c443
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.25.0.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.25.0.ebuild
new file mode 100644
index 000000000000..ca8f351f499a
--- /dev/null
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.25.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.94.0
+QTMIN=5.15.3
+inherit ecm kde.org
+
+DESCRIPTION="Implementation of ssh-askpass with KDE Wallet integration"
+HOMEPAGE+=" https://invent.kde.org/plasma/ksshaskpass"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	ecm_src_install
+
+	insinto /etc/xdg/plasma-workspace/env/
+	doins "${FILESDIR}/05-ksshaskpass.sh"
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+
+	elog "In order to have ssh-agent start with Plasma 5,"
+	elog "edit /etc/xdg/plasma-workspace/env/10-agent-startup.sh"
+	elog "and uncomment the lines enabling ssh-agent."
+	elog
+	elog "If you do so, do not forget to uncomment the respective"
+	elog "lines in /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh"
+	elog "to properly kill the agent when the session ends."
+	elog
+	elog "${PN} has been installed as your default askpass application"
+	elog "for Plasma 5 sessions."
+	elog "If that's not desired, select the one you want to use in"
+	elog "/etc/xdg/plasma-workspace/env/05-ksshaskpass.sh"
+
+	# Clean up pre-5.17.4 dirs
+	rmdir -v "${EROOT}"/etc/plasma{/startup,} 2> /dev/null
+}
diff --git a/kde-plasma/ksystemstats/Manifest b/kde-plasma/ksystemstats/Manifest
index 61ec18559d01..2dc5341478aa 100644
--- a/kde-plasma/ksystemstats/Manifest
+++ b/kde-plasma/ksystemstats/Manifest
@@ -1,3 +1,5 @@
 DIST ksystemstats-5.24.5.tar.xz 94604 BLAKE2B e0cbdf1b51a34ae8471c6ea795535930a6a6dc53b2e47a730c4a846d4113611d9866ca24bfb7be3c95ac730df397fb0fecb6ad347bb9b919c9172a3128e7a7a1 SHA512 6bbcf6512c223fc97203c02baca5bb230ef86c8012318307e32bc030160f31fc2797a28d95af442826b5f48656673213f6cdde487e1782a50300a9bc96e22969
+DIST ksystemstats-5.25.0.tar.xz 99044 BLAKE2B 032b281d806b1986bf38fee518d65ee40c664364ccb4fd3b71c2b1ce7aaeb4da63acb9cb550b9d7dcf9b6412f5cfe15119c5dfed7bbe7ef5d657e1027249d09c SHA512 d399724dc01a13df31c3cb166745858943297bec233bd5c0ec4c374c5f4539eff087a8492813101a0ffb67cfa14e13270ff1206b94c7e7e4b8f56355ae7d69cb
 EBUILD ksystemstats-5.24.5.ebuild 1045 BLAKE2B 2423236465275cfdbe00ca854f91200f20070ccc1b99b40f236fcdbc8c0735872b578550cd45ff94271a08a420cb5bfd4612ad914c2471250449d938223dff72 SHA512 e1b2a526edd2ed6dd985722fa045082a2e9f7a295451e7f25346bd0122df656f069211543e9f78318c98e8c617e6476d15c3cba8c02f42b5eecb156cb09b372c
+EBUILD ksystemstats-5.25.0.ebuild 1048 BLAKE2B 3a34ae55002587f9b860bfc4cb4bbca7081c30e3674c64c4ccda5678e5769c5537292faf797d610d2b6c143f4d377861d8ef103c907a3f42cf93c0eeddc46ca4 SHA512 2db1b703be377e866c5c51ed3b3da4a2f3058c125b250798c35ce7ff5ce3eb49d45752f6aaf7e2723b9be26a162210fca0d53ce0245f7ebe8ae0b45fa2eb9f20
 MISC metadata.xml 467 BLAKE2B 61ac6047a4cb3d54d26f963b75c94022a501fd1b1b9ee227cce16023fb40b101ba40c6ff99e02c5913137b191bd9c516249387b0310f6558c9800b10f52e780a SHA512 0ad261d9d2e7a45d01b06a15270346bf169a3a8d827b409616e3801e4357910fe196813dd87ff4bea34e61cce3931443d9b617ef532230448f54048d1ed84f4a
diff --git a/kde-plasma/ksystemstats/ksystemstats-5.25.0.ebuild b/kde-plasma/ksystemstats/ksystemstats-5.25.0.ebuild
new file mode 100644
index 000000000000..031136042df5
--- /dev/null
+++ b/kde-plasma/ksystemstats/ksystemstats-5.25.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.94.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Plugin-based system monitoring daemon"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="networkmanager"
+
+DEPEND="
+	dev-libs/libnl:3
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	>=kde-plasma/libksysguard-${PVCUT}:5
+	net-libs/libpcap
+	sys-apps/lm-sensors:=
+	sys-libs/libcap
+	virtual/libudev:=
+	networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
+"
+RDEPEND="${DEPEND}
+	!<kde-plasma/ksysguard-5.21.90:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package networkmanager KF5NetworkManagerQt)
+	)
+	ecm_src_configure
+}
diff --git a/kde-plasma/kwallet-pam/Manifest b/kde-plasma/kwallet-pam/Manifest
index b8383bd9f063..2f6ebead112f 100644
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -1,3 +1,5 @@
 DIST kwallet-pam-5.24.5.tar.xz 20480 BLAKE2B 10597c6fd3905ace5a64a28585b051cee0325a63b184b171a3b8a066bc3cd8891be7fbcfccd054acc6627bbee282c1ae5553f65d902e754a9cd51bd2d38fa1c2 SHA512 9ce9862b5cc6525b183911cd9d96edeae585cd0d54055fc38a7f2f41febfeb388d31b4aa18f1c36a7068898457af53f560e22a2f5a8a4a015910d56fa70aa740
+DIST kwallet-pam-5.25.0.tar.xz 20476 BLAKE2B 8508c7c0e1cf084e16758eff5eb2da0c7dd9006882675b0e7303196042d01a24dfd456270707e63f93c4797ccc3e1db7d1eba816c0d6a4b6fcc4de2a4ab786e5 SHA512 9d4690a78cc6d17ba2baf56164c0761d6b6038d3c19628e8104503df36d6d513ffc26b79c1771d6749d16d934b7d0bf31ab9d54c2ac41d41e6d279048cbccbef
 EBUILD kwallet-pam-5.24.5.ebuild 738 BLAKE2B f283cb8eca9cddd6e6b460a51dec6d4f3d141f711cdca53510ded606cf24079f56bae785a9c1b04e6b921694d54df49e88727e2e37ac8a8c44b22f6808e2d40f SHA512 6c1b13dc54699116d043afa65210f3b317d289f233a88f380e1bb2e03d29a3e8abae1783be444981ad8be797e53d61800bec9abf76f72a6c1cd1f2e9041e12c8
+EBUILD kwallet-pam-5.25.0.ebuild 741 BLAKE2B 3e9aaa942f8a8e6e4734286b6fe662387f4292d77c90b9d71de1c47f1810fa29dead9b93cba4c90f690e3c3b729aa7a0a601bc86bfe8ccd1a2e049627a675c92 SHA512 a2a0a1005b2d8a23dfa622e04c582cc7156056e4ca9b0d3f870cf9b72efaee955495b532fa7ecc9570299416033a04ec3196e60d74a47ef2a6580bffa4960fbc
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.25.0.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.25.0.ebuild
new file mode 100644
index 000000000000..668e83ba641d
--- /dev/null
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.25.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.94.0
+PVCUT=$(ver_cut 1-3)
+inherit ecm kde.org
+
+DESCRIPTION="PAM module to not enter KWallet password again after login"
+
+LICENSE="LGPL-2.1"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	dev-libs/libgcrypt:0=
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	sys-libs/pam
+"
+RDEPEND="${DEPEND}
+	net-misc/socat
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
+	)
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	elog "This package enables auto-unlocking of kde-frameworks/kwallet:5."
+	elog "See also: https://wiki.gentoo.org/wiki/KDE#KWallet_auto-unlocking"
+}
diff --git a/kde-plasma/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest
index 8e43892485c9..f12cf7be4a56 100644
--- a/kde-plasma/kwayland-integration/Manifest
+++ b/kde-plasma/kwayland-integration/Manifest
@@ -1,3 +1,5 @@
 DIST kwayland-integration-5.24.5.tar.xz 24844 BLAKE2B 99fedecea63c3b3792b6c275143b7e32283f32c38d098f039ec09a2b98facbd79c89753bf32fdd82c39115d2fd603626f67328a0c2a0dcac7cb3cec5f914c580 SHA512 ebdfb1cef57e82081c22394b6d4309e5662a91aaf925df1186a17765bf49a2d07a810be7767f5d9de18cae942584fbbdef42dc6bb59dc0c4896e7ff8abf117ac
+DIST kwayland-integration-5.25.0.tar.xz 24300 BLAKE2B 71aca37d9521a0b63f88b71238b5a33af0eef2f3fa99c892850328e192c2b0981cd7623e14f33fa7bb86f22b9f9c4f9b72f0a8e154d70b0ad17713659b790308 SHA512 c2cedb8bb42cdc01b5a9eacba49f86069ae3d465beb6c8567df827ca803c0ba315e9fc5a34af284cce1cc58b7d109b682bee3e7788a4e52134fdd0b5821b3784
 EBUILD kwayland-integration-5.24.5.ebuild 1194 BLAKE2B c3c252ed8f0d9b5da751851f7a10cc572d3b82932c82d8467c11a33f3b8e1c49be65c223707bfb034255b43c92e9f4f1890dfe168b21dce52e6cd7c96fa2783a SHA512 a6a691080c65e4f4c5f83e588b55e454116d6471e60cae16f4f468f90e1860f82825b54bd96624c2634dd5e7bc81419601a4b8c6135cd135b90afdaf457ea7db
+EBUILD kwayland-integration-5.25.0.ebuild 1157 BLAKE2B 344b33cb97713f9eae1918846c481c956b76a9b3ffa53119e55d8fc3b8029d518e0d1d783b771030c593efb4d943fba4c90b53d2e2423f4a4f67de5a7c491242 SHA512 97339a1bc24412eccdd847cf35f598660d8b20904e38165574624502251009ccc02092b412701a1aa5bfe59ce8b2da219761ba06f646f283564db747623746ae
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.25.0.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.25.0.ebuild
new file mode 100644
index 000000000000..0d5e85ad2d4c
--- /dev/null
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.25.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+KFMIN=5.94.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.3
+inherit ecm kde.org
+
+DESCRIPTION="Provides integration plugins for various KDE frameworks for Wayland"
+HOMEPAGE="https://invent.kde.org/plasma/kwayland-integration"
+
+LICENSE="LGPL-2.1"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RESTRICT="test" # bug 668872
+
+# dev-qt/qtgui: QtXkbCommonSupport is provided by either IUSE libinput or X
+# slot ops:
+# dev-qt/qtwayland: Qt::WaylandClientPrivate (private/qwayland*_p.h) stuff
+# kde-frameworks/kidletime: KIdleTime/private/abstractsystempoller.h
+# kde-frameworks/kwindowsystem: Various private headers
+DEPEND="
+	>=dev-libs/wayland-1.15
+	|| (
+		>=dev-qt/qtgui-${QTMIN}:5[libinput]
+		>=dev-qt/qtgui-${QTMIN}:5[X]
+	)
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtwayland-${QTMIN}:5=
+	>=kde-frameworks/kidletime-${KFMIN}:5=
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5=
+	x11-libs/libxkbcommon
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	>=dev-qt/qtwaylandscanner-${QTMIN}:5
+	virtual/pkgconfig
+"
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index ca6343bf7d4f..6b463f395816 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -7,5 +7,7 @@ AUX kwin-5.24.5-fix-plasmashell-crash-2.patch 982 BLAKE2B dbb3bc31d65384ec14164f
 AUX kwin-5.24.5-tabbox-dont-dismiss-popups.patch 1111 BLAKE2B 017199e01456961ece0335f54d42e18162c703868e7a7f95e84ea1440014ceaaed798e7668dbba4e7392492d82171e29d5453a554f669a789eb8b52a15f47c88 SHA512 538b79201b70eaf162ec75a37dcc40c264b5f1021c6a940ab67274c9e33566962053867f11b45f309d1dfe35d30573139419f666333e06bfd4a5d1c08ca97e6a
 AUX kwin-5.24.5-update-device-outputName.patch 959 BLAKE2B c39d0a94210ea82fa4c7292cb29d5fd93aa793d74e3743f23b3a86462a898594e17798a7beb272cd8462e557875560a05ae642463cee78d7d2a35ee0cd11e576 SHA512 fc4ec093ea882b9d73ef11024d4279d566faeee1979a7fb0f8f29c5e89c658f32b89a3f40faee286c428ac95297dde684ceefcc5e0d3276cdd8d512084f02a19
 DIST kwin-5.24.5.tar.xz 6453932 BLAKE2B cd042dd8c9168e11bc39d15969c57a97fd5c47b1af3e3a6235cabad166c4925c51541d52f7bf96f3132b3ecfeb91547845d6af3893ab5f31b41df4a926e83993 SHA512 4fad8b39a588a44f89e2640358d8e563047fa889a9bdaf246c1c87d320aa5f5b9d3d6bef702314fb06d2bfe16d0445efe736de60d94b4409f9b5efcdac48d089
+DIST kwin-5.25.0.tar.xz 6617068 BLAKE2B b38700e55fc2c9d6dbd88beea302f1273079eaba75701321294771eacedd59857d061ef85817d1eec6de49c7ee834904edc8e29dbbaad755e90655301271298a SHA512 0e618e80a6f2fb1853057ee3c8104a7c4fa13197b8a163b8cef01fbdb3c42e15fca7b2da0470f4834b2011dffb70e6a07669b768707874f6674ad18cbbbdb23a
 EBUILD kwin-5.24.5-r2.ebuild 4421 BLAKE2B f9a50bba822c9da8867b4a5cb3fab9c9bab2ab75d93f20f3cfd467672c425fcb6cc9da401f49c444726f7bb3fed7de636c3bc696fffa949c02c133125a4f4311 SHA512 32eec4d57c7525e27ef2c1cd5b0aed37a6eafaf459146ed6170763773f31805a89b9b7d7d8cc9e22230236c9936a21624cf089a0b0f9923c148a73f16cc8359f
-MISC metadata.xml 512 BLAKE2B 3e81119dbc98181573e294885c52623e4799b55c238ca9513e33547e718ec0f1762371d6391a4291c54159f31cd510cd8d9c192aa16ef0fc16672a3d0ef25dbe SHA512 a9a28562cb0f25abf24cb89c48fea816bfaf701c889ee08e66b80b3afe434af68e5ddb0fa21d313d68418c81a1e73eefcabf75e8e3878f55a1292039dde6ecdb
+EBUILD kwin-5.25.0.ebuild 4167 BLAKE2B 1016067302820896e2650d1e23961721a26f4acc6a7609d7b8d03c979245049ac1f0af983671935086e60cec8abf3064638c48e3a9d6da2aae6d3e7bab4a668f SHA512 48dbdd49f97bd7d9f7b6dbc7c4a49a7095276e31109c564e9e04d43d841d0ef55d9f48ef92a5f87ddf89ded67193c1fdbd6eff4296ab8b22f47e850d2a158a5b
+MISC metadata.xml 601 BLAKE2B 7c0bd77ee6f0b2622a67856a1da9257577cb55f5675e065f0e00dbb22d77d639ba7efdb9af06c6676152f168f26f854dc9dfe1107897ed87f8eafa73e2bdf169 SHA512 ee62735bef06e510b0f4961465bc86aff1cece881b7370cbe3b10bcf0457a4ac2fae8ff41953787ad47fef1917dbf1c2d568eec1cdff3bc0f09f60955cfca4d2
diff --git a/kde-plasma/kwin/kwin-5.25.0.ebuild b/kde-plasma/kwin/kwin-5.25.0.ebuild
new file mode 100644
index 000000000000..c14a3ee7c44f
--- /dev/null
+++ b/kde-plasma/kwin/kwin-5.25.0.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="optional"
+KFMIN=5.94.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="accessibility caps gles2-only lock multimedia plasma screencast"
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=dev-libs/libinput-1.19
+	>=dev-libs/wayland-1.20.0
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5=[egl,gles2-only=,libinput]
+	>=dev-qt/qtwayland-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5[qml]
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5=
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5=
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5=[X]
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-plasma/breeze-${PVCUT}:5
+	>=kde-plasma/kdecoration-${PVCUT}:5
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/lcms:2
+	media-libs/libepoxy
+	media-libs/libglvnd
+	>=media-libs/mesa-21.1[egl(+),gbm(+),wayland,X]
+	virtual/libudev:=
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libdrm
+	>=x11-libs/libxcb-1.10
+	>=x11-libs/libxcvt-0.1.1
+	>=x11-libs/libxkbcommon-0.7.0
+	x11-libs/xcb-util-cursor
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-keysyms
+	x11-libs/xcb-util-wm
+	accessibility? ( media-libs/libqaccessibilityclient:5 )
+	caps? ( sys-libs/libcap )
+	gles2-only? ( media-libs/mesa[gles2] )
+	lock? ( >=kde-plasma/kscreenlocker-${PVCUT}:5 )
+	plasma? ( >=kde-frameworks/krunner-${KFMIN}:5 )
+	screencast? ( >=media-video/pipewire-0.3:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-plasma/kwayland-server
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=dev-qt/qtvirtualkeyboard-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
+	sys-apps/hwdata
+	x11-base/xwayland
+	multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/plasma-wayland-protocols
+	>=dev-libs/wayland-protocols-1.25
+	>=dev-qt/designer-${QTMIN}:5
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	x11-base/xorg-proto
+"
+BDEPEND="
+	>=dev-qt/qtwaylandscanner-${QTMIN}:5
+	dev-util/wayland-scanner
+"
+PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
+
+src_prepare() {
+	ecm_src_prepare
+	use multimedia || eapply "${FILESDIR}/${PN}-5.21.80-gstreamer-optional.patch"
+
+	# TODO: try to get a build switch upstreamed
+	if ! use screencast; then
+		sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# KWIN_BUILD_NOTIFICATIONS exists, but kdeclarative still hard-depends on it
+		$(cmake_use_find_package accessibility QAccessibilityClient)
+		$(cmake_use_find_package caps Libcap)
+		-DKWIN_BUILD_SCREENLOCKER=$(usex lock)
+		$(cmake_use_find_package plasma KF5Runner)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	optfeature "color management support" x11-misc/colord
+	elog
+	elog "In Plasma 5.20, default behavior of the Task Switcher to move minimised"
+	elog "windows to the end of the list was changed so that it remains in the"
+	elog "original order. To revert to the well established behavior:"
+	elog
+	elog " - Edit ~/.config/kwinrc"
+	elog " - Find [TabBox] section"
+	elog " - Add \"MoveMinimizedWindowsToEndOfTabBoxFocusChain=true\""
+}
diff --git a/kde-plasma/kwin/metadata.xml b/kde-plasma/kwin/metadata.xml
index 5c6a9ef157a9..d71da9e2cb08 100644
--- a/kde-plasma/kwin/metadata.xml
+++ b/kde-plasma/kwin/metadata.xml
@@ -9,6 +9,7 @@
 		<bugs-to>https://bugs.kde.org/</bugs-to>
 	</upstream>
 	<use>
+		<flag name="lock">Enable screen locking via <pkg>kde-plasma/kscreenlocker</pkg></flag>
 		<flag name="multimedia">Enable effect video button in desktop effects KCM</flag>
 		<flag name="screencast">Enable screencast portal using <pkg>media-video/pipewire</pkg></flag>
 	</use>
diff --git a/kde-plasma/kwrited/Manifest b/kde-plasma/kwrited/Manifest
index 71054532c6df..e9e849599af8 100644
--- a/kde-plasma/kwrited/Manifest
+++ b/kde-plasma/kwrited/Manifest
@@ -1,3 +1,5 @@
 DIST kwrited-5.24.5.tar.xz 20904 BLAKE2B 84068117f8c2c890df1f3ebc4d305a7e417eddc6670340f653b9378118d07c666a16c96376868d6f6f6765e5c42a842161343856563e553b3146c0a140839323 SHA512 3fd38606fd81017f54df910e47f62bdc82758205fdeacae80a5bca6c5fe7ce9413a4f3f7c3ce2735107c6cd6ebecbc5a929b809eef52a593cc69c358c7c38af4
+DIST kwrited-5.25.0.tar.xz 20928 BLAKE2B 540b81db0bac3a3e971e6c378212af24a08001b1a8bf4fc2d2797128578ab5005d09e3f79973f2e313766c679305b25f643d93c93ccce8526643c3057be9daaf SHA512 4c4650508e2de464a488e8ed8d6bf6f49e6b1ad4c2f05fc93a6b4d40f970cf1fb7cb2c9e13f7d54f61c8f73107f541b6a0bd6f310a4c6633f21b1d7e0513900a
 EBUILD kwrited-5.24.5.ebuild 599 BLAKE2B 5b6f58ac95a6469c9a67af2e7994132974f772daba7a6be62b400463caa2309a63c2b068e02456c3331b8f5034fefb940c5f7293bf25cbe7f78749ec7e26148c SHA512 9e56dc5f66cca76e2f8349a31bc924327e18317d64c94397cc30beefdc3b6c548138c37a4fdbcf1bd635102637f5e7185b5493b96398421ee056ffc87bab9667
+EBUILD kwrited-5.25.0.ebuild 602 BLAKE2B 531feb87194f22eebc09fdafd4ba09edff56759d3d1300ff65bb9a659e16c1997e630479d347cb2555aa612c99f77c414055b745764235756304183754dd2df6 SHA512 fb33e9f2ddd77a3ff3f2e0f85001a4f4cee88ef61bbe368d9674bd6b42e34d62b20c4e4e3dbea67e0c87d1aa37504e2bd49c5272755ac8a36e2ceacf85ebeb13
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kwrited/kwrited-5.25.0.ebuild b/kde-plasma/kwrited/kwrited-5.25.0.ebuild
new file mode 100644
index 000000000000..ce9b87478921
--- /dev/null
+++ b/kde-plasma/kwrited/kwrited-5.25.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.94.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma daemon listening for wall and write messages"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kpty-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/layer-shell-qt/Manifest b/kde-plasma/layer-shell-qt/Manifest
index 3c0726a16d43..eef1bba1fad0 100644
--- a/kde-plasma/layer-shell-qt/Manifest
+++ b/kde-plasma/layer-shell-qt/Manifest
@@ -1,3 +1,5 @@
 DIST layer-shell-qt-5.24.5.tar.xz 17892 BLAKE2B c6874b199bb72fad4923cd7a36f5605483f19e12c71d65bd67a074c23ccee9de398fdf4c314b2eb69a0dc758122489dac759d1d0fbf22203a80f982c1dea9cfd SHA512 e9aeb94d7200543eef03950f6e3ccf3a60faf66bcf048760ea35d27c621bbced712411501f9d48fdaf98a36708a1a202c0531bbc94df0ccf99278ffd106b7abc
+DIST layer-shell-qt-5.25.0.tar.xz 18396 BLAKE2B 87d129d03e6575448c64799c6a92aa86558f936488a408d6dbea940fd13bd85022c2ee2dc3afb942678a000ac5463bb712b811606d09c01cdbe141054b9e1844 SHA512 606da32b4549296364871cc8c8f66aeb7180f58dd3bdfb69d1b4ef1e759824b6e2d52ae4cad3981d75d382c3d99d47e78607ec932e260def65a0274475876c7c
 EBUILD layer-shell-qt-5.24.5.ebuild 812 BLAKE2B 3f15abb0714bbd956e3f8f40badf24c2bc751001b3303e3e129b834d2bebb04c6e8a442e0417ae5c83fd521100ffd808e78ac75912f5e6b1345456fd49a947a7 SHA512 be655b51a95c9188c365633fee1920ca0a3c3d83c95fe63d8271592125934f4a7b2563cb9833ef7128057ca06cdf25f86540441a3b833ac9a16cfad593144a48
+EBUILD layer-shell-qt-5.25.0.ebuild 815 BLAKE2B 0f36b3d0180f72726e383aaae38f9a0bb3a235473b8d12d6b82f70ca5b5474c1f344e75055f1ecd8c41bc81384a2c69345c0e6812684a8c7fcfabeb204f4e10e SHA512 c5c0194cab4a3b67e4881798b92a94a539bca46f597b7eb154d424dde9b89e616ad8710b0074a4776b1250e3afc389c274f254b2eaa4eb3610ce9e7f9cb0c8fc
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/layer-shell-qt/layer-shell-qt-5.25.0.ebuild b/kde-plasma/layer-shell-qt/layer-shell-qt-5.25.0.ebuild
new file mode 100644
index 000000000000..5d07ded64650
--- /dev/null
+++ b/kde-plasma/layer-shell-qt/layer-shell-qt-5.25.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.94.0
+QTMIN=5.15.3
+inherit ecm kde.org
+
+DESCRIPTION="Qt component to allow applications make use of Wayland wl-layer-shell protocol"
+
+LICENSE="LGPL-3+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+# dev-qt/qtgui: QtXkbCommonSupport is provided by either IUSE libinput or X
+# slot op: various private QtWaylandClient headers
+RDEPEND="
+	>=dev-libs/wayland-1.15
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	|| (
+		>=dev-qt/qtgui-${QTMIN}:5[libinput]
+		>=dev-qt/qtgui-${QTMIN}:5[X]
+	)
+	>=dev-qt/qtwayland-${QTMIN}:5=
+	x11-libs/libxkbcommon
+"
+DEPEND="${RDEPEND}
+	dev-libs/wayland-protocols
+"
+BDEPEND="
+	>=dev-qt/qtwaylandscanner-${QTMIN}:5
+	dev-util/wayland-scanner
+	virtual/pkgconfig
+"
diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index ff49fdd43ac9..d1b6c11f7088 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,3 +1,5 @@
 DIST libkscreen-5.24.5.tar.xz 99464 BLAKE2B 544a2a6def8fc58c839247bb080c2650bae73dc6850a5436b5d9ed1666d8d8744af75f213f32008e3c331db90d151f5dd567f6fcc919b61dbe1d3c8d14d2fff5 SHA512 780abc702ee6bd53703dc5671e56dc59e10e62ce33c3714454c3c8b5a7a5cf43d4402906f9b1c7c1c19e9dc36cb323c07eb20603a0fb44c73281844c879c8370
+DIST libkscreen-5.25.0.tar.xz 100040 BLAKE2B d86219ff71e6d19d89466188bcf8f6574970d8ca3dbaea50e3aef0ae84a71a442ee26c402606cb711856552b21640c67518e61a47dbd5dd4c7cbba5ffd28be2d SHA512 84675f2d1c1a55aaa23777f28ba4c22fb7ac9a1136613d729e7c6e56c1cac36851c525b005a332b59e9416ec5c9ab32d287af96d7c05e18d0accd7bcddea1a60
 EBUILD libkscreen-5.24.5.ebuild 798 BLAKE2B 4dd13c972dce968f4d628bac5016e1c820793fc4f39789146a35c7064903ca2904149f7426c22c38be506a2acaa9c7e5f639a99d71ff70ba5b0e41780eeafd50 SHA512 2378cab9a98a257417c5c6fd4df65bea78db5a550590dc236e703247a1919866b51b84e9b49c545c0381de07e70baa17e2a81400a07691a4ce698603427bca93
+EBUILD libkscreen-5.25.0.ebuild 801 BLAKE2B 6ca289bcc8377788ff6113137466e4909a250a9510dacaee1f1cfbc57ed5f0d53a06c41699bc04b309bc58e2809b429128088bc4318dba936c37268c83641219 SHA512 28bc2e6d6b33f6ff646701884fc108b9c0dcb136e5e3107f612f84442db934f9b7d2cf0213db4bf2e73f73e46338cf51f9406b567305a81f5f99a0719af339e9
 MISC metadata.xml 406 BLAKE2B f47c4d7eab804ce88be47f9723f0610045c62b51883ad7877b00388cff9c2a6cd1e72afa24076c1c9affae154d6cc881f33eab04b862c4e40f708fde341a4883 SHA512 47370335bdf14118dacfa8189bcafd2089a2ec131c62d2c07a21ea4db32d837de1f5765be2907fd709b263f5fd3c3b2c5f12da1646ad5d9ff6d2b9ea9f99ebf7
diff --git a/kde-plasma/libkscreen/libkscreen-5.25.0.ebuild b/kde-plasma/libkscreen/libkscreen-5.25.0.ebuild
new file mode 100644
index 000000000000..10d626e360b6
--- /dev/null
+++ b/kde-plasma/libkscreen/libkscreen-5.25.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="forceoptional"
+KFMIN=5.94.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Plasma screen management library"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5/7"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+# requires running session
+RESTRICT="test"
+
+RDEPEND="
+	dev-libs/wayland
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	x11-libs/libxcb
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/plasma-wayland-protocols-1.6.0
+"
+BDEPEND="
+	>=dev-qt/qtwaylandscanner-${QTMIN}:5
+	dev-util/wayland-scanner
+"
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index 845edcd8014e..3281e5859c0c 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -3,5 +3,7 @@ AUX libksysguard-5.24.5-fix-missing-gpu-sensors.patch 1276 BLAKE2B 530cef6db80e2
 AUX libksysguard-5.24.5-fix-missing-selfmade-presets-1.patch 1363 BLAKE2B e2d793bd5ee679a8ae28bb80570381d598db3c8d9b20b2198a3391c844b0f0e27f3863596bb2b08db715e5cd58ea5e02a50f470eefd0de55ffef43cb875095f7 SHA512 c00f77cab757a6fb7c8d09e0aea0b295370ef2b0ba7568f9945144e593a46e57811dfc4ae406479d8cf040e64419ae88ea21e24efd074eb02f2a2f1b2158f6a0
 AUX libksysguard-5.24.5-fix-missing-selfmade-presets-2.patch 2454 BLAKE2B 7c0913db01d4e10491688a5b4ec5ccb26130781f7dd140aed0b6dbd356c52456b0e919f2441df91573a9b1153350c3a5abd38b0f05356d5df227289c5fd4cfa3 SHA512 f8054ca9558dad76c2c125ffb6237c1c492fbe2a4eb08b25a822f96b7abb50105954e7b627a662552941a8a6b97d2eb1b01166938848bbe86a6279ae67edac19
 DIST libksysguard-5.24.5.tar.xz 768040 BLAKE2B 1b4defe6a174db5258a4d85c12d469a78dd1b709f5df07b8d3076076da1b72d6446307b5d1ab360c91ee6e2bddc0f5bcb837db994e16ab2a9e49450e19e63c58 SHA512 133c5923ee616515b1934c4e2c30509d407f40b7afc3914ac2417d7c961f3a1921bd3b5bfd1ca73942ddb17777fbf4d96950c130129135eae2b8d1b8daac9fa5
+DIST libksysguard-5.25.0.tar.xz 772892 BLAKE2B 729c74c24bf5f553258b7087ab73b04114b67eb6c1e51f1c436b7419d155c3a6255f4e368bba0473f53941f459891d220c3ebe7025af1fc569a1c1324c956d60 SHA512 572dd7ae60ca49a2f8acc01a295f6d76ae3f8dba2cad8ccd3f6e9f0d17e2cc39519e76f377dc77f58f71945fb1a125d08c7b01454e6de8c8460de7f7cd33c188
 EBUILD libksysguard-5.24.5-r1.ebuild 1973 BLAKE2B 709a4f85d07feecfd53109205d4aa660fc923bbd41ebf5c24dc08808037b365147574d91db7089f2dcfc6b591bc32c496c34b9a7e88548944cdb4985cf6d6aea SHA512 08f5cbae335dbb86bd979f2b9d99cea20b17f3d4325ed6db89b87914179c7a26c6030456327226fe1d39a585d7ee0177f4c8175c1566a231a658497f48a79c54
+EBUILD libksysguard-5.25.0.ebuild 1793 BLAKE2B 1b376b9bd5a6d2939f76e74d3ccc74bfc6a21346da9c5163138a4d0cb6631af34334adce8ed23770f959b3aad6aa6f58b9115f53a05bb682857a1cc422017fea SHA512 2b53eaeb595978b5238ad6ddd7cb4a9af4d110185cce752fd981be041d91204e8ffef6f26a38c4583cf6d5f35d4885b85e27405c07e6aab5e45f6b36644b4cc4
 MISC metadata.xml 611 BLAKE2B 7e821b5bc0966b855561677eb598ec5eca351955c79f40e2f8622981eb02a206a07b47aec23db6efea5e08edfa2546a01f7f953ed7c7c3dae46ac1fa3f8cfeaa SHA512 ebdb86fa4d523efa0fd614acd9b2275284fb8298a75532d6afb272fe92cd927486044074121811f34ec8096d6de331934413347d1ca6f0f137e5beda0cdfc302
diff --git a/kde-plasma/libksysguard/libksysguard-5.25.0.ebuild b/kde-plasma/libksysguard/libksysguard-5.25.0.ebuild
new file mode 100644
index 000000000000..cabea1ce0f1f
--- /dev/null
+++ b/kde-plasma/libksysguard/libksysguard-5.25.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+ECM_TEST="true"
+KFMIN=5.94.0
+QTMIN=5.15.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Task management and system monitoring library"
+
+LICENSE="LGPL-2+"
+SLOT="5/9"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="webengine X"
+
+COMMON_DEPEND="
+	dev-libs/libnl:3
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5[qml]
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	net-libs/libpcap
+	sys-apps/lm-sensors:=
+	sys-libs/libcap
+	sys-libs/zlib
+	webengine? (
+		>=dev-qt/qtwebchannel-${QTMIN}:5
+		>=dev-qt/qtwebengine-${QTMIN}:5
+	)
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+		x11-libs/libXres
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	X? ( x11-base/xorg-proto )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-plasma/ksysguard-5.21.90:5
+	!<kde-plasma/plasma-workspace-5.18.80:5
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.22.80-no-detailed-mem-message.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package webengine Qt5WebChannel)
+		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	LC_NUMERIC="C" ecm_src_test # bug 695514
+}
diff --git a/kde-plasma/libkworkspace/Manifest b/kde-plasma/libkworkspace/Manifest
index b66a51237e38..312830afd8c5 100644
--- a/kde-plasma/libkworkspace/Manifest
+++ b/kde-plasma/libkworkspace/Manifest
@@ -1,4 +1,6 @@
 AUX libkworkspace-5.22.80-standalone.patch 4984 BLAKE2B e0f5c36ab657600326d0cbd29fe51c5ac6cf264caa7ec4c04473a2c5bf88113d8496b45618db103dd2e078efc1350b9fc613b25aeaa58bf0957d22ca4d37e5a0 SHA512 20c790d4860aec20b415c5c236537a5d8caf5666432c513adda0782694548320dc918c0d093ee0b716943df1fdab56c03a56f18ec691b0fc517443c35d0335ff
 DIST plasma-workspace-5.24.5.tar.xz 18490588 BLAKE2B 5a9681620f40604f631cd7ef0c9d6256cc490436dc5e29ef9434d0f129324c2d405c5647da12778c208976c0cb0b4da698a90a22b70c1cb2723cbc58f69bda1d SHA512 ae40fe545b03e42e9f8fe2e8885d3853f4b52d4fd2ed3ecf7d24fa59b4924b8f8b389e8713ec6a3a875bc66df3952de9157d4a5631b283105a9329a1a1825996
+DIST plasma-workspace-5.25.0.tar.xz 18568884 BLAKE2B 5390a62d336a6cfc6179bc20b546966a11ce583e0737d4a131a993056d0e9987648046e8d5f6664a38689525b61be73deb55dac1fb2b22c36cbac3c50a097800 SHA512 0d52ab01752421e8056db666640e4c8fc31070a6a7704f78e8087f6b32fe22290da54ff830bb59870dcd7e007bd6798859358e163e4ed334d4f31041a3b743c8
 EBUILD libkworkspace-5.24.5.ebuild 1323 BLAKE2B d9ab9b5cfc16e0bf7cd166e397a8d2cc7943da467bcca451ca51575a9615c028fe29ca8c2ecc340c5a7b364addc7e26749da9434e919a9e21cc9f818885e7108 SHA512 c3b583cabc1e62bee0f9c4cd8476d3ab523f4566ec3412035eb429a54b91479b953287e65f1d0203c4d77b2feb2400697d0f7b5333e2f2e7231a72dc652c16f4
+EBUILD libkworkspace-5.25.0.ebuild 1326 BLAKE2B 395c1ec85248e6e5f665c18774da2ec0f7f47a7587c9594397b18038a4888fd3fdc0076f27ef89d0e25482f59ab25c85746ff5ad28326a86f5487e20064db801 SHA512 527e02101e4576827695a0cfa07ba82214a52a74b228d94eb5406eb679ffe466cec532635e3559369eb4ae9944f9561b4f7b7b8f00f177859d125d2aed0954d4
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.25.0.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.25.0.ebuild
new file mode 100644
index 000000000000..8b0a9703edea
--- /dev/null
+++ b/kde-plasma/libkworkspace/libkworkspace-5.25.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+KDE_ORG_NAME="plasma-workspace"
+KFMIN=5.94.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.3
+inherit ecm kde.org
+
+DESCRIPTION="Workspace library to interact with the Plasma session manager"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-plasma/kscreenlocker-${PVCUT}:5
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+"
+DEPEND="${RDEPEND}
+	>=kde-frameworks/kinit-${KFMIN}:5
+	>=kde-plasma/kwin-${PVCUT}:5
+"
+
+S="${S}/${PN}"
+
+src_prepare() {
+	# delete colliding libkworkspace translations, let ecm_src_prepare do its magic
+	if [[ ${KDE_BUILD_TYPE} = release ]]; then
+		find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die
+		rm -rf po/*/docs || die
+		cp -a ../po ./ || die
+	fi
+
+	eapply "${FILESDIR}/${PN}-5.22.80-standalone.patch"
+	sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" -i CMakeLists.txt || die
+	cat >> CMakeLists.txt <<- _EOF_ || die
+		ki18n_install(po)
+	_EOF_
+
+	ecm_src_prepare
+}
diff --git a/kde-plasma/milou/Manifest b/kde-plasma/milou/Manifest
index 0b1becdaeb56..b33484110920 100644
--- a/kde-plasma/milou/Manifest
+++ b/kde-plasma/milou/Manifest
@@ -1,3 +1,5 @@
 DIST milou-5.24.5.tar.xz 48264 BLAKE2B 00ee42f530a73038198f0abbd04e54c54bb60fc449129a634dfdaefc56331ad0a55cfa7ccd4ae0fc60643b4ec5f8d89bc27382b27a23f36172fcc1956376b026 SHA512 b6a2979b6ab4717d53e0f58605ba43a08f78836a287c0988aeb9461f6d4cb42f71d1081ec1261dcb957ee97b67f8eba42f3c6861e96d6a2e796142edac74ea7c
+DIST milou-5.25.0.tar.xz 48676 BLAKE2B 2c75e1e1bb99327a86c3aebc10c5ed5b1ed1b14de771feebc9baaa473fa8d6d210f279bba7f5b76bf329a22d53dfdc6bbd805cd37deea822c0efc70677807d2e SHA512 f0c72177f9adae284ed28cbeb918a279b82dbec1d4090501c8a3cbe7b294275dc400abdb211b1d31ba947c2ba3319628405f30e79765d83dc0f51377c335c097
 EBUILD milou-5.24.5.ebuild 830 BLAKE2B 3de1fe469638e9e1f85c24fd74267e1833236dc76049c643142c97e27537b236e5b62f437ec060048128cda39b5f6ec20051644c76c21ae7c1f8b82760b8bd13 SHA512 585c8a8364c845a66112cbb6285d5b34e6f271da84275861b51423345fdf392121c16e9d2da76f8e7bccb260d05026f29d3f26a880ad3229c252946f4117a8ca
+EBUILD milou-5.25.0.ebuild 833 BLAKE2B 7574464f60fdbf28450c87e53f6d3c2672aac591af3a62cf0da9697b172d1ecf73a6d622290de7130efdabef9c8b7e667d8cd8dccfb6bfeeda55420dcd62bc9b SHA512 9e42111114cad4bbe16a25ec00ecc87e8d9f1a2ea0147c062bf6ef17e37f7589447e890c26ad0485f247df43d5027ebd3b16cdbcc6ea9d52ef224c902c3850c5
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/milou/milou-5.25.0.ebuild b/kde-plasma/milou/milou-5.25.0.ebuild
new file mode 100644
index 000000000000..4c2a855c1a4e
--- /dev/null
+++ b/kde-plasma/milou/milou-5.25.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+KFMIN=5.94.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.3
+inherit ecm kde.org
+
+DESCRIPTION="Dedicated search application built on top of Baloo"
+HOMEPAGE="https://invent.kde.org/plasma/milou"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/krunner-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/oxygen-sounds/Manifest b/kde-plasma/oxygen-sounds/Manifest
new file mode 100644
index 000000000000..db2eda10a473
--- /dev/null
+++ b/kde-plasma/oxygen-sounds/Manifest
@@ -0,0 +1,3 @@
+DIST oxygen-sounds-5.25.0.tar.xz 1896576 BLAKE2B c2319cf486c0a48ee25d74f8e93a43b829fc374bbb4d330801341c94d3e72ab6088df3e46ec49d74ad28e90a067f5319e920fef46d6694752154d79ca2d04845 SHA512 12c412376d40d5eb408e67100801ca006ebc7d5f0b711e5fe7f21dd1906637651285751f3b811109ea5f116189c665e51e7f77f7fe2e5a3b9f95d8ec5a9d5cdd
+EBUILD oxygen-sounds-5.25.0.ebuild 386 BLAKE2B 3aeab120c82c05753c19d86034ec52856ac0b02212a99b0e07d9b16ace1012f48a0081c21623ffd1742586daae114cb98c0276a24174d20dbfe261a6c944caac SHA512 bc57e912a77e29101ea37f09484f65926b88d0907e30d4e864e0122191b33578b39559211189476944496a12d94951fc4513e9875839d18ff5b56f5aa301729c
+MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/oxygen-sounds/metadata.xml b/kde-plasma/oxygen-sounds/metadata.xml
new file mode 100644
index 000000000000..d925f2439758
--- /dev/null
+++ b/kde-plasma/oxygen-sounds/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugs.kde.org/</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/kde-frameworks/kcodecs/kcodecs-5.94.0.ebuild b/kde-plasma/oxygen-sounds/oxygen-sounds-5.25.0.ebuild
similarity index 51%
rename from kde-frameworks/kcodecs/kcodecs-5.94.0.ebuild
rename to kde-plasma/oxygen-sounds/oxygen-sounds-5.25.0.ebuild
index 1b6a92ebf2a5..294656904512 100644
--- a/kde-frameworks/kcodecs/kcodecs-5.94.0.ebuild
+++ b/kde-plasma/oxygen-sounds/oxygen-sounds-5.25.0.ebuild
@@ -3,15 +3,15 @@
 
 EAPI=8
 
+KFMIN=5.94.0
 QTMIN=5.15.3
 inherit ecm kde.org
 
-DESCRIPTION="Framework for manipulating strings using various encodings"
-LICENSE="GPL-2+ LGPL-2+"
+DESCRIPTION="Oxygen sound theme for the Plasma desktop"
+HOMEPAGE="https://invent.kde.org/plasma/oxygen-sounds"
+
+LICENSE="GPL-2+"
+SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="nls"
 
-BDEPEND="
-	dev-util/gperf
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
+RDEPEND="!<kde-plasma/oxygen-5.24.80"
diff --git a/kde-plasma/oxygen/Manifest b/kde-plasma/oxygen/Manifest
index 50374d9c9856..8b46dad02c97 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1,3 +1,5 @@
 DIST oxygen-5.24.5.tar.xz 4615504 BLAKE2B d937770d2919f2318cfce3fc0b90f9c8009aa1c80ce9f491d3c9863c383fd3d8b0ff61582a454d7bb7cc066183ac514c4058d48b523aec68b635ffd1b3e93606 SHA512 90df776e36014b07849c9454632bb73a3b75d5d146eeec8d9de88b63d0bdbd68fabd9f1eaac0166f47057a61c48f7b531630f48d6b037d1a266e18e36febbaa2
+DIST oxygen-5.25.0.tar.xz 2722468 BLAKE2B a86afc93a548ca6493fff61a3b1b0e50ba12f1d3601535b251c953b75995094333404af7c1b8132503b14d98c5150dec5a5b89614b30bd5441d4d8ccbabbb940 SHA512 b8bc0a8c50be6a99a2d18214143260e8425b97193b0e82dbed438bf6c13a59a284bbae635bbe424f947db4ac4997d33df6e31d41bf76066f38bede72a79dfede
 EBUILD oxygen-5.24.5.ebuild 1293 BLAKE2B 79bead91acf50c8451155d876ad12d1d93beb449992fe9ab127f28ef5803905d615a3c072052459f01ad22905603f80a339050c62896842dea62523ef38a2c31 SHA512 b779933fff22ea74877be1228ef8bfc51cc0d5ccc3dc582759fe252aea60883fdbdc96b0b6b201c9a05b4ecdb69c9e3fa831158d35f1d24d508404cb917edd00
+EBUILD oxygen-5.25.0.ebuild 1296 BLAKE2B 8f30b3ecd75396997a145b10b39a4f821a93bb84158323a0aa2bf03fba8ad394a0cf2acd3a014fde7575d9a997a4384ae51f2448fefb6d1e44d372a807c2ea19 SHA512 920c108d8219b3cd26c5167df87871e79c2f5051c27caeffde9ab5ddc18a3b26cd26be1acb3615cb809c72602c4f13ff78c66f83b7ad79f2744454900b99c5b7
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/oxygen/oxygen-5.25.0.ebuild b/kde-plasma/oxygen/oxygen-5.25.0.ebuild
new file mode 100644
index 000000000000..8696339f5b8c
--- /dev/null
+++ b/kde-plasma/oxygen/oxygen-5.25.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.94.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.3
+inherit ecm kde.org
+
+DESCRIPTION="Oxygen visual style for the Plasma desktop"
+HOMEPAGE="https://invent.kde.org/plasma/oxygen"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="wayland"
+
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/frameworkintegration-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-plasma/kdecoration-${PVCUT}:5
+	x11-libs/libxcb
+	wayland? ( >=kde-frameworks/kwayland-${KFMIN}:5 )
+"
+DEPEND="${RDEPEND}
+	>=kde-frameworks/kservice-${KFMIN}:5
+"
+PDEPEND="
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package wayland KF5Wayland)
+	)
+	ecm_src_configure
+}
diff --git a/kde-plasma/plasma-browser-integration/Manifest b/kde-plasma/plasma-browser-integration/Manifest
index 74b43fe8b7dc..f10ebedc5cb5 100644
--- a/kde-plasma/plasma-browser-integration/Manifest
+++ b/kde-plasma/plasma-browser-integration/Manifest
@@ -1,3 +1,5 @@
 DIST plasma-browser-integration-5.24.5.tar.xz 222452 BLAKE2B 6caca77f50f401a230e5936b36b7babdf6186d6a11a7fb1bda2a0423a7bea5b3f7a66d12e7d569b406e93636b980bb9308c20452a8a9b62197b4170988361aab SHA512 f34885920f1d4859d57ce3c96523c46d392f5835bce6b7d73afb30ea60827e5d520c168ccf45d2d46cec8027b0d9abe2bfc0c5b4ecfbf3b4433bb3ed0b405497
+DIST plasma-browser-integration-5.25.0.tar.xz 222460 BLAKE2B 2e1a57b735abcbe9012c76b1908604471e12df897b60e706e6f84aac7d12784b8fcd346d70f6609180e36672f831125450d03890640b79c38ce0693ec42da792 SHA512 21eeaeb663c9374dbdba2e78800cc52898341b3784c034f91c0e61c118d4814d3e014a2b12d7d27f732c56e256be7019f1a9efbffb2732d250221263038351ed
 EBUILD plasma-browser-integration-5.24.5.ebuild 1159 BLAKE2B ec63dfd969d63f1b50be64e4a45de9c181fbbe5993f738eb9ce791c450edf4d7823dc9ad4863cb474b3e22eb685e5c06affc61890663116953139c9f9a60c831 SHA512 a1ff238f6724d44b38344dcabffcb15148b8e2f15d7466d823f30e4dc5f2fb88df6293cad009bf9605c1c9c20915aabb1506e338a2e220ac0d882c56bb6e3ed2
+EBUILD plasma-browser-integration-5.25.0.ebuild 1162 BLAKE2B 60c974972076a631623426a15d0afee8ff60549a2a917e9528750f3138f94478682fc7e62309ce31e4a9bb3fe856875b838a557dea529088c28ef8b9acac7c16 SHA512 24a3699d51d6395d5e45822f19596f27c50cf26caebdc3cdc0496e593995657a44d6643d7a4d7efc9821a59c88bd0055480253f89743cac99f103203274ca9ec
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.25.0.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.25.0.ebuild
new file mode 100644
index 000000000000..b10d06cbbd99
--- /dev/null
+++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.25.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.94.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.3
+inherit ecm kde.org
+
+DESCRIPTION="Integrate Chrome/Firefox better into Plasma through browser extensions"
+HOMEPAGE+=" https://community.kde.org/Plasma/Browser_Integration"
+
+LICENSE="GPL-3+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kfilemetadata-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/krunner-${KFMIN}:5
+	>=kde-frameworks/purpose-${KFMIN}:5
+	>=kde-plasma/plasma-workspace-${PVCUT}:5
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DMOZILLA_DIR="${EPREFIX}/usr/$(get_libdir)/mozilla"
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 987628947428..a5ad9cb81139 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,4 +1,6 @@
 DIST plasma-desktop-5.24.5.tar.xz 6241532 BLAKE2B 20bec56fbd0c3f68b3eaf75cb18a01888c63a8d49e2761c83858125ef82dfe225137e9ba704eaddc43405fe6f9818f879f0105eff03d06aa74d93800e4891693 SHA512 3bb770023b47dcc3c51dbdacfe9cb93adc2f514d8d19f54fed10023d9440bed956ec3beb18d9979cb408ab2e6e960ca383d215fd072ba2df34e4e0b5f6c55270
+DIST plasma-desktop-5.25.0.tar.xz 6278500 BLAKE2B 40cc39d7b61204e6a43a74b29b1964ba8eabdba536a6a013e592253d5e6d87345efe59aceb09dc3f46287f4ed098c45a40100b7c78a71f469da38e369d9829d9 SHA512 2a96a4b1f754905d3ebc82432be9deb36b359ba609c0b4739f59c1244c050f4dc4cbf6d6012790ddf0e68a5fb43ba2d9d59635f15541a1c03a296126b03bbe1c
 DIST plasma-desktop-override-include-dirs-1.tar.xz 7888 BLAKE2B f1e416fa0ed27cfe6e049cafc66d1603bb4f76f0cec16dc47339a238cbb485b202adf08ececbb8933a5e1a54954cbd21653d2c9dfec27baa49fdf583acf0d75f SHA512 aa26b4966a5d00c378128ee8ee56025d637f139fcd315bf0aabefa080caecadf8cd3176dee3df87d4f8bdc48446df535260cf64a65055857fb895fa8988e1a20
 EBUILD plasma-desktop-5.24.5.ebuild 5185 BLAKE2B 1cbc7280829c1b8f7de67dae950d14cf0eda465d255e952f1121bc8fd5116d44bfdc2e5849079346152a6c8fbfc3988ea785df0844b5d02bdf86aa9615e83e7d SHA512 e323a68fde0cfef29cdfc5b6cc8a64f7a8bca9ca224b895ead0eb620ae1c163b292717df0ba3359cb84fb77dfc5316f520bd43aa4013b31cafdb5caec8f884b3
+EBUILD plasma-desktop-5.25.0.ebuild 5188 BLAKE2B 47fbae4314b0a4239065331c3ae799d6209de0147732cad6ed53a38bc4ea4f8dd798b4a15b9a41c9c6571346a6efffc3c59aeb2823cbce4ab3348dd9ab264888 SHA512 967b6c8fef22767e6349c29d8ecc5fe3b67abb9e36b63032699a8826db63f50bcba36dd45e5ecdb72217035e50133cdc457865155740520ce4d2b2aa1eecb53e
 MISC metadata.xml 682 BLAKE2B fbd378484f259e8b85c9c8776c5ce7eb034432f9a4e547453e0b810b22273bc8c494fdcc5f435c1b660c9660fc68b4860fc40987b0c6b8ee82764cc7fd15e771 SHA512 dff0c23d15a172b901fb0d0b9e383b8cfbc47b2123cf06545c3f9064db492987043695305de4af66fedc8d1900fcfb266b120f4883e2384303c9e4f2a208bee5
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.25.0.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.25.0.ebuild
new file mode 100644
index 000000000000..1d6571bc31d6
--- /dev/null
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.25.0.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KFMIN=5.94.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org optfeature
+
+DESCRIPTION="KDE Plasma desktop"
+XORGHDRS="${PN}-override-include-dirs-1"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="emoji ibus +kaccounts scim +semantic-desktop telemetry"
+
+COMMON_DEPEND="
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/attica-${KFMIN}:5
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/kactivities-stats-${KFMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kded-${KFMIN}:5
+	>=kde-frameworks/kdelibs4support-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/krunner-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	>=kde-plasma/kwin-${PVCUT}:5
+	>=kde-plasma/libksysguard-${PVCUT}:5
+	>=kde-plasma/libkworkspace-${PVCUT}:5
+	>=kde-plasma/plasma-workspace-${PVCUT}:5
+	>=media-libs/phonon-4.11.0
+	x11-libs/libX11
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libxcb[xkb]
+	x11-libs/libxkbfile
+	emoji? (
+		app-i18n/ibus[emoji]
+		dev-libs/glib:2
+		media-fonts/noto-emoji
+	)
+	ibus? (
+		app-i18n/ibus
+		dev-libs/glib:2
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libxcb
+		x11-libs/xcb-util-keysyms
+	)
+	kaccounts? (
+		kde-apps/kaccounts-integration:5
+		net-libs/accounts-qt
+	)
+	scim? ( app-i18n/scim )
+	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
+	telemetry? ( dev-libs/kuserfeedback:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	x11-base/xorg-proto
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-plasma/user-manager
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+	>=kde-plasma/oxygen-${PVCUT}:5
+	sys-apps/util-linux
+	x11-apps/setxkbmap
+	x11-misc/xdg-user-dirs
+	kaccounts? ( net-libs/signon-oauth2 )
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
+)
+
+src_prepare() {
+	ecm_src_prepare
+
+	if ! use ibus; then
+		sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \
+			-i applets/kimpanel/backend/ibus/CMakeLists.txt || die
+	fi
+
+	use emoji || cmake_run_in applets/kimpanel/backend/ibus \
+		cmake_comment_add_subdirectory emojier
+
+	# TODO: try to get a build switch upstreamed
+	if ! use scim; then
+		sed -e "s/^pkg_check_modules.*SCIM/#&/" -i CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON # not packaged
+		-DEVDEV_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+		-DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+		-DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+		-DSYNAPTICS_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+		$(cmake_use_find_package kaccounts AccountsQt5)
+		$(cmake_use_find_package kaccounts KAccounts)
+		$(cmake_use_find_package semantic-desktop KF5Baloo)
+		$(cmake_use_find_package telemetry KUserFeedback)
+	)
+	if ! use emoji && ! use ibus; then
+		mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=ON )
+	fi
+
+	ecm_src_configure
+}
+
+src_test() {
+	# parallel tests fail, foldermodeltest,positionertest hang, bug #646890
+	# test_kio_fonts needs D-Bus, bug #634166
+	# lookandfeel-kcmTest is unreliable for a long time, bug #607918
+	local myctestargs=(
+		-j1
+		-E "(foldermodeltest|positionertest|test_kio_fonts|lookandfeel-kcmTest)"
+	)
+
+	ecm_src_test
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "screen reader support" app-accessibility/orca
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-plasma/plasma-disks/Manifest b/kde-plasma/plasma-disks/Manifest
index bcd3dccfc6fb..9f3c5b8b211b 100644
--- a/kde-plasma/plasma-disks/Manifest
+++ b/kde-plasma/plasma-disks/Manifest
@@ -1,3 +1,5 @@
 DIST plasma-disks-5.24.5.tar.xz 88304 BLAKE2B 649bb10a09333cc49f34731188a66cea6017702e5d5d5f7dc1aa100c6cf7b274153a5570ce20aa3c05737a9f5c8041dd73e0707b91b1198ff3d4e456081497b9 SHA512 fc13922a8961a0581eb5c67f23a00c7898e0700604785573c677ceae3391d784fd44944acbfae501a620ce9e86c21694a03b4613a60284488c1cf5450c5de6fe
+DIST plasma-disks-5.25.0.tar.xz 90600 BLAKE2B 1b62b8ffd3079a00a20504b699862c856f79331cebe0ee451113cc865841f4a045de842cdb5436715af965cd8696475d13f8f3769236f09001f7c9e0fb809810 SHA512 99b05c4d5b64eefb6fb44096785df17a6e093c8bbb01a472b8881e9ea97caff680b55f4664a69e485580ed9a63cc5391a53c2c304affcc2d7ba0e989d765a1ac
 EBUILD plasma-disks-5.24.5.ebuild 1037 BLAKE2B 30fddeded7e8210e906c063c2c3aa4c48d5db4c3d2a335efb03c37b8ed6534f1fc4c347922729a6ccb6279dd16b8a7208d66af12feb4d183a105e10cf03153f0 SHA512 ed5de773284167c2fc7e6b0f9d628126596480e831d9d7bd5be5a30f6972d71b19e7ad945660be20c0152ab25e5586dec69d7fce0ea837af571da13410670a3a
+EBUILD plasma-disks-5.25.0.ebuild 1040 BLAKE2B 781ee511b40031305820a98a36f265a1981df5121b7a5e1c1ed1b149c92f2b84cb9b4b27f840fc7fe476850d68f957b4b10901c493b73fd24ad86c432f68de52 SHA512 2ab779bf515a8b5686f59d2d5fbfe9408c5b8e98013138733018eee727feaaaad9df17e4ffdc760811736997d760d769c39d2cc86c214e99f690b5256e0aa7eb
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plasma-disks/plasma-disks-5.25.0.ebuild b/kde-plasma/plasma-disks/plasma-disks-5.25.0.ebuild
new file mode 100644
index 000000000000..5523da8c6da8
--- /dev/null
+++ b/kde-plasma/plasma-disks/plasma-disks-5.25.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="true"
+KFMIN=5.94.0
+QTMIN=5.15.3
+inherit ecm kde.org
+
+DESCRIPTION="Monitors S.M.A.R.T. capable devices for imminent failure"
+HOMEPAGE="https://invent.kde.org/plasma/plasma-disks"
+
+LICENSE="|| ( GPL-3 GPL-2 )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	sys-apps/smartmontools
+"
+RDEPEND="${DEPEND}
+	kde-plasma/kinfocenter:5
+"
diff --git a/kde-plasma/plasma-firewall/Manifest b/kde-plasma/plasma-firewall/Manifest
index a6ddf8557e44..997160b3bfb2 100644
--- a/kde-plasma/plasma-firewall/Manifest
+++ b/kde-plasma/plasma-firewall/Manifest
@@ -1,3 +1,5 @@
 DIST plasma-firewall-5.24.5.tar.xz 346660 BLAKE2B 767cd4722325e8035735b744afdccfe4114e68756919f3904fcbd2aa25879b09b7bb4fcaffcaf0a2687f5744e1177fb177658b6af0ed3fef7838498c99f583a3 SHA512 4c774b10c32929399a8b01007e3c34ab702803a0aa80ea812bbcc4d4ead02d0e64136f575454fdc2f0e938740afbf6d48025c654831aa5485b86253418bf13d1
+DIST plasma-firewall-5.25.0.tar.xz 355996 BLAKE2B 63e06d8d47c5e88cf2a57e1084a728d6bdbe5d444107cfd6bc579e65e76530fd48a1d1cf645a8b363e22d8dc086533ff870ad39c9839a31af0d417454c88d98f SHA512 d658278ae9c66380ea16e03598a789ec4f5ce120b41cc21f635e058aa672d08c94cc3bdb94ff9b60a91e42cc07ba7827c29fdf71197f2f2ef394c6a1661de0d8
 EBUILD plasma-firewall-5.24.5.ebuild 1591 BLAKE2B f7098d219faab90a6df6fbd3011c9a976f9d8133df55f2c97899afd2bbb690872bd2388139dcb1ce43427088eed3f4aea231d5139b35bfc955205544595fda89 SHA512 34fd88f2f9f59473dc0545e176ecc405ac8a82435af488a79d1cda0bdeeab6a712703c36a3057a1bf660d5bbdca59624fc7d196f77c8e1080e1d3234d318ef4c
+EBUILD plasma-firewall-5.25.0.ebuild 1558 BLAKE2B c0259781636a5c418e7bd3eaed8c673cde54ac7b5bbc36062989b5e8deb71b2bd708dc2997654fc4e9ccdb761a49030adb7166834ed88f222b42ee96df8c5bec SHA512 ba56e034ed5726ebfd7f5071a61c25ad85598d0424e0e5037175b61b620f3185cfd778f876a423184cdf7f8403c4c4ab80f84996984985e053132bc73c12bbba
 MISC metadata.xml 481 BLAKE2B dccce364cb3100483c9d5932a250f05575badc6c66a0868a706817c3da4be16fabfdc584fea5d6fe45284da282b2123b1b7985e7813264d27a0338dcb76428ec SHA512 f3925caf241daf159b2b19ea70c4a177f023487ba3fef866e7fc529563b045664debaafb0a9978d05882b69457d9dada314c3109803eaf2e8bb244ac5f9b8f3d
diff --git a/kde-plasma/plasma-firewall/plasma-firewall-5.25.0.ebuild b/kde-plasma/plasma-firewall/plasma-firewall-5.25.0.ebuild
new file mode 100644
index 000000000000..152c543860af
--- /dev/null
+++ b/kde-plasma/plasma-firewall/plasma-firewall-5.25.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+KFMIN=5.94.0
+QTMIN=5.15.3
+inherit ecm kde.org python-single-r1
+
+DESCRIPTION="Plasma frontend for Firewalld or UFW"
+HOMEPAGE="https://invent.kde.org/network/plasma-firewall"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="firewalld +ufw"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} || ( firewalld ufw )"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+	${PYTHON_DEPS}
+	firewalld? ( net-firewall/firewalld )
+	ufw? ( net-firewall/ufw )
+"
+
+src_prepare() {
+	ecm_src_prepare
+	# this kind of cmake magic doesn't work for us at all.
+	sed -e "1 s:^.*$:\#\!/usr/bin/env ${EPYTHON}:" \
+		-i kcm/backends/ufw/helper/kcm_ufw_helper.py.cmake || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_FIREWALLD_BACKEND=$(usex firewalld)
+		-DBUILD_UFW_BACKEND=$(usex ufw)
+	)
+	ecm_src_configure
+}
+
+pkg_postinst () {
+	ecm_pkg_postinst
+
+	if ! has_version sys-apps/systemd; then
+		ewarn "${PN} is not functional without sys-apps/systemd at this point."
+		ewarn "See also: https://bugs.gentoo.org/778527"
+	fi
+}
diff --git a/kde-plasma/plasma-integration/Manifest b/kde-plasma/plasma-integration/Manifest
index 43384daaa621..e1d765da13f2 100644
--- a/kde-plasma/plasma-integration/Manifest
+++ b/kde-plasma/plasma-integration/Manifest
@@ -1,3 +1,5 @@
 DIST plasma-integration-5.24.5.tar.xz 83772 BLAKE2B a399ee55271799855195ad77ec96f25f37d9b2d49f88f0e54d536067a8aef728be3de35ca4d9da105f51382a57ff30733dea79fe2b4d91174d90989e9b9b4cc1 SHA512 6c60eff349d6b60fd8f781e162768d7cfb45d042687c1206f3f2c9e7af0c5719ff70555eff181782607ac53755844b0968ee7b9a75c87d6bd65b489a3a9dc348
+DIST plasma-integration-5.25.0.tar.xz 86088 BLAKE2B 794901b180f6bdcc387ffda09cd08ba20d7f64860068b7ad55574f2fb1301a64c83f3b16312208903093322edd9f0f82ea093ae48c51234c7c28e1942c131328 SHA512 df3d04c90c07b648bbb470a9b99ee5b5f2861207212e42ec10db760430e99adc9ab6488ddafd4483a4136c424ddb3e498d8467a5e01b874982421fc2b0580e39
 EBUILD plasma-integration-5.24.5.ebuild 1240 BLAKE2B d6cfe8f198ecbe44950e298c352f51950624edae46835690e1bd435b8eff08507031dccd0a85bf2f9370e52de4a81d819e1764c3db81b0a78100953caf4ab5bd SHA512 1e5e77fd4c53ddead9558a6845d9eac6f3d22bdfd3c3d713a07b3dea57da8e5d4a797254310ebe7db9bdda6f059fd3974df34955ee464475c2cda65a01c2768f
+EBUILD plasma-integration-5.25.0.ebuild 1388 BLAKE2B 809a440832ee43a3ab693b05d2d42ce3d2793a7f11501c6d5efe02ffe0e455f2ce5901f92f5d4a5503b258e6d31f724b616b682fa37e20db956d2544f4139514 SHA512 171ab9cc8f010c3927ba24501ec250519995167035d9ebfc9624207bebfd111223472657c268e95acc687ba417f4dca1d0e2ec5c480624611515c16e68510e82
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.25.0.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.25.0.ebuild
new file mode 100644
index 000000000000..dc82d8e50c1e
--- /dev/null
+++ b/kde-plasma/plasma-integration/plasma-integration-5.25.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.94.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces"
+
+LICENSE="LGPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+# requires running kde environment
+RESTRICT="test"
+
+COMMON_DEPEND="
+	dev-libs/wayland
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5=[dbus]
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=dev-qt/qtwayland-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-plasma/breeze-${PVCUT}:5
+	x11-libs/libXcursor
+	x11-libs/libxcb
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/plasma-wayland-protocols-1.6.0
+"
+RDEPEND="${COMMON_DEPEND}
+	media-fonts/hack
+	media-fonts/noto
+"
+BDEPEND="
+	>=dev-qt/qtwaylandscanner-${QTMIN}:5
+"
diff --git a/kde-plasma/plasma-meta/Manifest b/kde-plasma/plasma-meta/Manifest
index 400d80d59698..24db92bfd044 100644
--- a/kde-plasma/plasma-meta/Manifest
+++ b/kde-plasma/plasma-meta/Manifest
@@ -1,2 +1,3 @@
 EBUILD plasma-meta-5.24.5.ebuild 4036 BLAKE2B 7b64ff63cef53f7b5618c9268d65eb6209aeeb65996cd886e35401bfc83a6097d261bce9cfc3f4229615628583260623b877feb69883839fcf8701544fba441c SHA512 91b8220e579867a7b7ddf3e4d2c358998e00cf8ffce9bab260f2a12ef3764d50c4b54c6300dfea84a0735feed6e1a84d94b4eb162486ce0ada030ce64e264074
+EBUILD plasma-meta-5.25.0.ebuild 4043 BLAKE2B 6c6d9d3f4ee6ca4fe7ab46036ca8cbd34c9b3875a173e00ffae61521ea93220eff6cfa6fc71880bc8ba3324ac986b4bc44a22755d406d7278fcd40694774e3c0 SHA512 2d6aa07dcd1da44dac5f65dcb0ec61b3b8ea00aa74bcb5e0da1cbadd836e5aa57874c88f8332cb5d055a014e0714d3e1e44fa793388fc13d95518713d6bce545
 MISC metadata.xml 2254 BLAKE2B 77d3bf75c22304a0b40847f1e7057d800ad92ddbfd5950f3c1fa5354b803d23c108333f07e2e5ffe552a951ae598d6d750e5060b0a05d9245b8518c7a0179f8d SHA512 fdcb3f598bd4cec4d67b9be27ae6cca4fb49ac9292eb3e74a0990654ec74f1aa180f83ae0682049bda231c1ffd4d62e8390f15cf33e78b24116e84237bce8932
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.25.0.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.25.0.ebuild
new file mode 100644
index 000000000000..d496c9e6fc65
--- /dev/null
+++ b/kde-plasma/plasma-meta/plasma-meta-5.25.0.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Merge this to pull in all Plasma 5 packages"
+HOMEPAGE="https://kde.org/plasma-desktop/"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="accessibility bluetooth +browser-integration colord +crash-handler crypt
++desktop-portal discover +display-manager +elogind +firewall grub gtk +handbook
++kwallet +legacy-systray +networkmanager plymouth pulseaudio +sddm sdk +smart
+systemd thunderbolt +wallpapers"
+
+REQUIRED_USE="^^ ( elogind systemd )"
+
+RDEPEND="
+	>=kde-plasma/breeze-${PV}:${SLOT}
+	>=kde-plasma/kactivitymanagerd-${PV}:${SLOT}
+	>=kde-plasma/kde-cli-tools-${PV}:${SLOT}
+	>=kde-plasma/kdecoration-${PV}:${SLOT}
+	>=kde-plasma/kdeplasma-addons-${PV}:${SLOT}
+	>=kde-plasma/kgamma-${PV}:${SLOT}
+	>=kde-plasma/khotkeys-${PV}:${SLOT}
+	>=kde-plasma/kinfocenter-${PV}:${SLOT}
+	>=kde-plasma/kmenuedit-${PV}:${SLOT}
+	>=kde-plasma/kscreen-${PV}:${SLOT}
+	>=kde-plasma/kscreenlocker-${PV}:${SLOT}
+	>=kde-plasma/ksshaskpass-${PV}:${SLOT}
+	>=kde-plasma/ksystemstats-${PV}:${SLOT}
+	>=kde-plasma/kwayland-integration-${PV}:${SLOT}
+	>=kde-plasma/kwin-${PV}:${SLOT}[lock]
+	>=kde-plasma/kwrited-${PV}:${SLOT}
+	>=kde-plasma/layer-shell-qt-${PV}:${SLOT}
+	>=kde-plasma/libkscreen-${PV}:${SLOT}
+	>=kde-plasma/libksysguard-${PV}:${SLOT}
+	>=kde-plasma/milou-${PV}:${SLOT}
+	>=kde-plasma/oxygen-${PV}:${SLOT}
+	>=kde-plasma/oxygen-sounds-${PV}:${SLOT}
+	>=kde-plasma/plasma-desktop-${PV}:${SLOT}
+	>=kde-plasma/plasma-integration-${PV}:${SLOT}
+	>=kde-plasma/plasma-systemmonitor-${PV}:${SLOT}
+	>=kde-plasma/plasma-workspace-${PV}:${SLOT}
+	>=kde-plasma/polkit-kde-agent-${PV}:${SLOT}
+	>=kde-plasma/powerdevil-${PV}:${SLOT}
+	>=kde-plasma/systemsettings-${PV}:${SLOT}
+	sys-apps/dbus[elogind?,systemd?]
+	sys-auth/polkit[systemd?]
+	sys-fs/udisks:2[elogind?,systemd?]
+	bluetooth? ( >=kde-plasma/bluedevil-${PV}:${SLOT} )
+	browser-integration? ( >=kde-plasma/plasma-browser-integration-${PV}:${SLOT} )
+	colord? ( x11-misc/colord )
+	crash-handler? ( >=kde-plasma/drkonqi-${PV}:${SLOT} )
+	crypt? ( >=kde-plasma/plasma-vault-${PV}:${SLOT} )
+	desktop-portal? ( >=kde-plasma/xdg-desktop-portal-kde-${PV}:${SLOT} )
+	discover? ( >=kde-plasma/discover-${PV}:${SLOT} )
+	display-manager? (
+		sddm? (
+			>=kde-plasma/sddm-kcm-${PV}:${SLOT}
+			x11-misc/sddm[elogind?,systemd?]
+		)
+		!sddm? ( x11-misc/lightdm )
+	)
+	elogind? ( sys-auth/elogind[pam] )
+	grub? ( >=kde-plasma/breeze-grub-${PV}:${SLOT} )
+	gtk? (
+		>=kde-plasma/breeze-gtk-${PV}:${SLOT}
+		>=kde-plasma/kde-gtk-config-${PV}:${SLOT}
+		x11-misc/appmenu-gtk-module
+	)
+	handbook? ( kde-apps/khelpcenter:5 )
+	kwallet? ( >=kde-plasma/kwallet-pam-${PV}:${SLOT} )
+	legacy-systray? ( >=kde-plasma/xembed-sni-proxy-${PV}:${SLOT} )
+	networkmanager? (
+		>=kde-plasma/plasma-nm-${PV}:${SLOT}
+		net-misc/networkmanager[elogind?,systemd?]
+	)
+	plymouth? (
+		>=kde-plasma/breeze-plymouth-${PV}:${SLOT}
+		>=kde-plasma/plymouth-kcm-${PV}:${SLOT}
+	)
+	pulseaudio? ( >=kde-plasma/plasma-pa-${PV}:${SLOT} )
+	sdk? ( >=kde-plasma/plasma-sdk-${PV}:${SLOT} )
+	smart? ( >=kde-plasma/plasma-disks-${PV}:${SLOT} )
+	systemd? (
+		sys-apps/systemd[pam]
+		firewall? ( >=kde-plasma/plasma-firewall-${PV}:${SLOT} )
+	)
+	thunderbolt? ( >=kde-plasma/plasma-thunderbolt-${PV}:${SLOT} )
+	wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-${PV}:${SLOT} )
+"
+# Optional runtime deps: kde-plasma/plasma-desktop
+RDEPEND="${RDEPEND}
+	accessibility? ( app-accessibility/orca )
+"
+
+pkg_postinst() {
+	has_version sys-auth/consolekit || return
+	ewarn "An existing installation of sys-auth/consolekit was detected even though"
+	ewarn "${PN} was configured with USE $(usex elogind elogind systemd)."
+	ewarn "There can only be one session manager at runtime, otherwise random issues"
+	ewarn "may occur. Please make sure USE consolekit is nowhere enabled in make.conf"
+	ewarn "or package.use and remove sys-auth/consolekit before raising bugs."
+	ewarn "For more information, visit https://wiki.gentoo.org/wiki/KDE"
+}
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index 38dd7937203c..2db8e04170af 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,3 +1,5 @@
 DIST plasma-nm-5.24.5.tar.xz 926128 BLAKE2B 43abf81b433291432cc8d5a576ac7579c7a68f196afab106b832a8851846eebdf1562654f7186efae65f3e0942b88aa12f778eb9e5a3972cbafc62f165d07b02 SHA512 0b64b2f231d7e97f901251e274bebd53b22c19ddcfa67cc66947f48adebe61c6bde21f339896f267af22f4112b9a392d331345999000c43cb5b1e51680668ec8
+DIST plasma-nm-5.25.0.tar.xz 937500 BLAKE2B 503ada7327d19ebb4620fe137159b32b6def7e6008166f2ae39042170bd624ef6c5cdd94ffc22464a3b4605a4d7c95355b2d48cf8d7fc92e7c39bf2957fb80a6 SHA512 64ce5a8ff99c38c7ddad35a7cca420a163b8f8364caa2d8fb5635b6df8d19b057d7d6b81c5df4fcfa3e008fbf6f8fb0dbca06d3fdb636a6b57ef7501e878a7af
 EBUILD plasma-nm-5.24.5.ebuild 2451 BLAKE2B 339674e0e06b01cc8a8358675de8182f43aec19f01f1752280e8a9ef2ec055aa21819820259c7b456c930889f75af7043be95513deb613b1678fefe44da6d88e SHA512 a613a33b4ab8ab782fcc2ecfef7e8b9d40f8637edcb4256f245fb270d2c54064997ddc10e490c2d97a9970588b69ac596cc344084716acbb8ca77db0bcc8f782
+EBUILD plasma-nm-5.25.0.ebuild 2454 BLAKE2B 3fb34957d8451aec34233d269e38e49bdddb16172f241b413df52272fd747ae867efca3b3ce0cb90dda7ea55da0e74b75c6cdce6ef3ddb3a3383ed1ebe70bd81 SHA512 5769f4faa9eea452952cd4a9a20c1740fbb48ac5e7fb22271a7837d317daba369a86d2d5c60807245b0118091680157c784ba2295be77d5a7454eae8f08eeb47
 MISC metadata.xml 548 BLAKE2B 72ae60901cd45e2b312418553d64dbed59ed4b9d3fd8b71f0e6eaa1782dd997d08f28fd7fb2668303a6dfa290eee1cbde6397580091730b3c5f65c85c111435a SHA512 f4cd7aa6532a5816a111cc088db3a712462bce395aa792c0ba6869981d70bec7f56040038e3dce6a7b0496f423a5be8f0e0081ab45ee51451a384f3cd8c4ade5
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.25.0.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.25.0.ebuild
new file mode 100644
index 000000000000..a11276b5883d
--- /dev/null
+++ b/kde-plasma/plasma-nm/plasma-nm-5.25.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+KFMIN=5.94.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma applet for NetworkManager"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="modemmanager openconnect teamd"
+
+DEPEND="
+	>=app-crypt/qca-2.3.0:2
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/networkmanager-qt-${KFMIN}:5[teamd=]
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	net-misc/networkmanager[teamd=]
+	modemmanager? (
+		>=dev-qt/qtxml-${QTMIN}:5
+		>=kde-frameworks/modemmanager-qt-${KFMIN}:5
+		net-misc/mobile-broadband-provider-info
+	)
+	openconnect? (
+		>=dev-qt/qtxml-${QTMIN}:5
+		net-vpn/networkmanager-openconnect
+		net-vpn/openconnect:=
+	)
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	ecm_src_prepare
+
+	# TODO: try to get a build switch upstreamed
+	if ! use openconnect; then
+		sed -e "s/^pkg_check_modules.*openconnect/#&/" -i CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager)
+		$(cmake_use_find_package modemmanager KF5ModemManagerQt)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+
+	if ! has_version "kde-plasma/plasma-workspace:5"; then
+		elog "${PN} is not terribly useful without kde-plasma/plasma-workspace:5."
+		elog "However, the networkmanagement KCM can be called from either systemsettings"
+		elog "or manually: $ kcmshell5 kcm_networkmanagement"
+	fi
+}
diff --git a/kde-plasma/plasma-pa/Manifest b/kde-plasma/plasma-pa/Manifest
index e70e91e993ba..fd904603a954 100644
--- a/kde-plasma/plasma-pa/Manifest
+++ b/kde-plasma/plasma-pa/Manifest
@@ -1,3 +1,5 @@
 DIST plasma-pa-5.24.5.tar.xz 132952 BLAKE2B f877a23a07420c27cc55760a870bf45d887b0787c0e25dea2e37b79d04b56db8d4ebace9505934fb370cda4adf0d992033b3ed72fda4b73497acdbacb551fc10 SHA512 fdf18b0baa1fb43a8d576d454ba6625bf7d376eb30fcbe8e09df388441a04d1b373b6d53a56b4f14552fc06cbdddea193248044d0cc5e3b71fb90651708afaa1
+DIST plasma-pa-5.25.0.tar.xz 134780 BLAKE2B a0f24793943f3b8e47c8aa8f83f89e3f1b991478f04aa351d058a188b75895580c5d648fe92bacc061af18162bd518087b631cb90cfd143c114ad36c40e6ad37 SHA512 8521f41bb273e7766bf11e263aa86527a52c91f348c1e8f0a74e0276878934e00e769174a5b85c70ec08ecad90e72405fd38abae55f3b41fee004834cb467249
 EBUILD plasma-pa-5.24.5.ebuild 952 BLAKE2B eef87ad07adfabadd99ff8cec30c6e7aa5201cc6e599b1e4f833c42523914ea40b21562cc996a55504fa94f69650e84985a222c4a19f309aad12d07fcf9a9ce5 SHA512 b11a42155850d9b4642fc861e8e8cfd3046b5d4fd926c6d93ca163a9eed7bb6083a50e173743176c99bdc0e8cdb07f01832c93a8a5013d241dd22d1d6ae33e04
+EBUILD plasma-pa-5.25.0.ebuild 955 BLAKE2B 60d350d7ba950d8912a7d10e51a5c761721f133b5e148477ee554607b68e4ffe27145dfd27c317bafdcef5c0ec62e445d2f26b30e4550449e6dfb120a9692c9c SHA512 33c7eb4423be8daf7039230c33e4d79d3064bb04a9629dba04c24545d482b7f4114bb772acb9f3fe0126da807e441e13b88f6aa27b98750bf590a591436e0a42
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.25.0.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.25.0.ebuild
new file mode 100644
index 000000000000..3e55bf0e225c
--- /dev/null
+++ b/kde-plasma/plasma-pa/plasma-pa-5.25.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.94.0
+QTMIN=5.15.3
+inherit ecm kde.org
+
+DESCRIPTION="Plasma applet for audio volume management using PulseAudio"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	dev-libs/glib:2
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	media-libs/libcanberra
+	media-sound/pulseaudio
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	|| (
+		media-video/pipewire
+		media-sound/pulseaudio-daemon
+		media-sound/pulseaudio[daemon(+)]
+	)
+	x11-themes/sound-theme-freedesktop
+"
diff --git a/kde-plasma/plasma-sdk/Manifest b/kde-plasma/plasma-sdk/Manifest
index eb609950235c..4e1b293412d1 100644
--- a/kde-plasma/plasma-sdk/Manifest
+++ b/kde-plasma/plasma-sdk/Manifest
@@ -1,3 +1,5 @@
 DIST plasma-sdk-5.24.5.tar.xz 261552 BLAKE2B 6a52464135d73119b53b3a5ce73e5a58f8797e6e8357010809e623bca5797199fb76aac5c3c0f18269d5584303b207e9ac21b03415e80d041f73154aa8b31aaa SHA512 9dff5a3088fb92296e4bb53d8839dade53dc71595c62e85bf5431ce85b686fec9197adf09177f1aa6ab488d0ededc063121f074f1c77b8b281950eb5cea0caf8
+DIST plasma-sdk-5.25.0.tar.xz 264120 BLAKE2B 5325f76ebc6ab334e633c63c568aa57b0d002abe9afe4ca9ca58ad89d4d6ae5a7c09dc76d005212a214c12a70f7bf1e962c9212c17ce02a7e23a8e34174c5312 SHA512 0d8d2eb65dc8ea12623a32b859620d8abbb3498ac9b843d4e645c0721a2ceb9918d284e7aa8d3f1f02291004dca34b531c1b7003ad3155914d8ff6760234a70c
 EBUILD plasma-sdk-5.24.5.ebuild 1261 BLAKE2B 7474b8271aea4e5639335a0d09d8bef2c86d52f845a9bae5f19149c0ddb3d300b71c5f5311c684e6ff0759ca93cce939272f42eee4775da65c02e95a96222a3b SHA512 ab98f400066bfb76c8c315fbd346fecb27ec60995e47559c62f8ef03960df59aa9f3025d430b1d041d00a2401f337fcca5a5c18ea6b6efc260e1b4466bb4b5fb
+EBUILD plasma-sdk-5.25.0.ebuild 1264 BLAKE2B 3d37b971cd852214326ebca10cfdcaed282cc2edb981330ace9c1969ec296c499cad5be1fe3df9d368c644025c326056969cf0301a4dddfe29f4a189f6e15101 SHA512 51fdb44ef580bb05c9821dd02e615a0a1cd92b0bdfd15cddc2ec19c4df34a8dfe1705ab0ed274003d414cc14c4fba1695eb4cdba94fa0363bf3bf97de6f03c7e
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.25.0.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.25.0.ebuild
new file mode 100644
index 000000000000..b39a8ec3618b
--- /dev/null
+++ b/kde-plasma/plasma-sdk/plasma-sdk-5.25.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="optional"
+KFMIN=5.94.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Useful applications for Plasma development"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+"
diff --git a/kde-plasma/plasma-systemmonitor/Manifest b/kde-plasma/plasma-systemmonitor/Manifest
index eb44406fd3a1..68847b70b8a3 100644
--- a/kde-plasma/plasma-systemmonitor/Manifest
+++ b/kde-plasma/plasma-systemmonitor/Manifest
@@ -1,3 +1,5 @@
 DIST plasma-systemmonitor-5.24.5.tar.xz 151824 BLAKE2B dfc6bc0dfe6815879eaed6686f52f108ce3e9a84f76899afffac255c97e36dd8afb4521d2dd8abad157306b1e0e02c874935e40e88aa2c187ce22f668c05b760 SHA512 b8c4a959eb587b25d8d503b3b2d05e6c8ced3b0cb146e08f0351f424962d059b70c8dd323d55b31ef903157b71bad6f20f969840a860ed25ebdafeb3db18489d
+DIST plasma-systemmonitor-5.25.0.tar.xz 156308 BLAKE2B 7dd4d92ed2fa6dcbfb85291265de7063118546b0b79d53f670f8e9189dae9576fc55fbc18290fde85ce1b7f81e867276733e4c7488a197b27c90c9ab23991689 SHA512 1f9273c1e3dfda52d6fc09266e54cd53fbca8fe0e37ca32fad5dfe0c96e8d9b5a4186037d83b6d4ff5bf8e52618d8eec2cb21e4c366676b01b639ed58951263d
 EBUILD plasma-systemmonitor-5.24.5.ebuild 1196 BLAKE2B fa7acad855f435430411030c3faf6998ac54e1e963c2af47f501a5126a5fa6730f6ce2de8017604f8a723c57fe9fcade6c9c703c3b2b7e0d997b3be1e9f3be0b SHA512 6976406a77aa2e2d21c4377ea4fb2fd0d41cee25f50ff8b13257eaa5ac4c05d792cb35a0dbd892ca7db0f651c72d299932241064b044fd6b53d887996ce2402c
+EBUILD plasma-systemmonitor-5.25.0.ebuild 1199 BLAKE2B a52ae8927b3b230337932eec01e81a5b13385803cd7089b23b87cf0dea84d65f170f5620e0fff02dea87d863136cdd54a5776c3c00a6d2e9c373950872b97b82 SHA512 e3f47aba2fc0044cb7585ceac4247604ff1df24a8eaa37bd71d93401df3411d003edddf56aa9bc05121038e0cff1bc0887620c337aa8331d8be64020a3891f30
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.25.0.ebuild b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.25.0.ebuild
new file mode 100644
index 000000000000..18c5b88a3ae4
--- /dev/null
+++ b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.25.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.94.0
+QTMIN=5.15.3
+inherit ecm kde.org
+
+DESCRIPTION="Monitor system sensors, process information and other system resources"
+HOMEPAGE="https://apps.kde.org/plasma-systemmonitor/"
+
+LICENSE="|| ( GPL-3 GPL-2 )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-plasma/libksysguard-${PVCUT}:5
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
+	>=kde-frameworks/kquickcharts-${KFMIN}:5
+	>=kde-plasma/ksystemstats-${PVCUT}:5
+"
diff --git a/kde-plasma/plasma-thunderbolt/Manifest b/kde-plasma/plasma-thunderbolt/Manifest
index 654cbe62ed68..e6a39c1c4edb 100644
--- a/kde-plasma/plasma-thunderbolt/Manifest
+++ b/kde-plasma/plasma-thunderbolt/Manifest
@@ -1,3 +1,5 @@
 DIST plasma-thunderbolt-5.24.5.tar.xz 66752 BLAKE2B 38fe4132da08afe71a26751307d9ecd77cf0462323b4dc452ae2355cedf25f41c1de4e6f6dfe50b24fd2f1650383434aea4ec775e194b219d27a09387a8453e4 SHA512 b1096fac09800e33b87e79a2e774eaf19afa063263e71f772ec0081fda714c63dd07a0000489c36c3f7deead3ee563880bc12f336b8ea599b396613d28cc08f5
+DIST plasma-thunderbolt-5.25.0.tar.xz 67960 BLAKE2B 3e371c87b95012e34434aba1e4e9075bff145d9e09681fb5fe186477b220cff6f9736a0a00265e799dc6f024b9e960d010366f1ccfcd30209d70a6d6fbb7b607 SHA512 5dc3124afcf8cfde598d36eccb57bfe4a2646f6841769d400fc57cdfaf241f2acca9711531407c67622da35a71128e91df09913cd52a6677dddbad115c3aa3c8
 EBUILD plasma-thunderbolt-5.24.5.ebuild 895 BLAKE2B 71a3848daf0e97d27451b609147470a73b4763c13f7fa42e78226da6b585879050acaa02b057df5ac2d0d14183c467c370d055431571e9f2adc1f8619927abe9 SHA512 6d7592a1a68819f75cbe87b1bafbc2b162eb4a4095b7107c43a5387573e036e48686b16279c983acfa082f9b4cd669c880d674634edf52612cca227f22120e10
+EBUILD plasma-thunderbolt-5.25.0.ebuild 897 BLAKE2B a86feb26fcf4eaedb7a67df2448067ceba1e40b2e4e586ab906aeffdcbe3b31529e5fb55a3ef0bd83aefa85fd98a32d242a1352c33a01a0e2aabe4145a647854 SHA512 370c548f77aa65080c800ff31d49dbcd22495ce20a71d035609ccbd9c956087364ffadaa9d8c89e674e6f4d70268d6485bce13ea4dfae0f3a7a422548b4314ce
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.25.0.ebuild b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.25.0.ebuild
new file mode 100644
index 000000000000..75f4ae660177
--- /dev/null
+++ b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.25.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+KFMIN=5.94.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.3
+inherit ecm kde.org
+
+DESCRIPTION="Plasma integration for controlling Thunderbolt devices"
+HOMEPAGE="https://invent.kde.org/plasma/plasma-thunderbolt"
+
+LICENSE="|| ( GPL-2 GPL-3+ )"
+SLOT="5"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE=""
+
+# tests require DBus
+RESTRICT="test"
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	sys-apps/bolt
+"
diff --git a/kde-plasma/plasma-vault/Manifest b/kde-plasma/plasma-vault/Manifest
index b4572d243ece..41267d76c0f2 100644
--- a/kde-plasma/plasma-vault/Manifest
+++ b/kde-plasma/plasma-vault/Manifest
@@ -1,3 +1,5 @@
 DIST plasma-vault-5.24.5.tar.xz 178032 BLAKE2B a9e93f71a627c0426e881b1e48e3a6cb32c3744db7986a09c33c36cf04be275dffd22c45369bfdcf1ca0f05b31d0d30129e7af54f6d425bb28e96f586a5453c3 SHA512 6495f94f060f139e91a25cbecf432d5bf9ee5ae949438278966c11cd7e725feb63aee6955dce5b46b816b0c57f5253b2cf215ad70efd592bf6e579ad6acb4cd2
+DIST plasma-vault-5.25.0.tar.xz 178100 BLAKE2B 9067442209d7bdf8ac89e60b497a78059af1d39bf57c57ef2b0dd5edc150b0ba86be2d038c5a81313c35b4cf0e18c7f728779510902f9366f2648af4da199bca SHA512 3e068fdd0c66693de5f79380fcbea498264e7533fa121c0f4ed938fba0b1d6b6333b7b76f8456887ffa6f2f056cb5b57fb4b5d85f2fdc0f7aa5e4147ccfa560e
 EBUILD plasma-vault-5.24.5.ebuild 1281 BLAKE2B 6956ed7e6c77aef87bc60b112b694d2b060b08ffe29baffebcd47767f0fe23ff5b356dbc769a6631e07bc327ab9f56006fa7077b38b7ad27a4153dc2359d4aa3 SHA512 362946fee322fa680cbbad96f5bc153f68d24461a6b7066d63c29b790b0f02378be9fed326ab45d4baf00c626b13afac6fdd1ea5b6aa226829aab7ad57bb5112
+EBUILD plasma-vault-5.25.0.ebuild 1284 BLAKE2B 3b7f348cb228c29bf00e7b5e947ac35352efaf03e2548c6b78ab217623d46d8a1ca144579dbc8355e77d6aad49a4d02b315a6d7bd7f1a7682e737eb108f3f382 SHA512 9869c21138a541f546e4c060dfee68625eaebea24b9d65a19cf86b364f23476df622c4d1b20e1a70126f87bb98e8191f45c9863faf818c6b10fadf86956a3c54
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.25.0.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.25.0.ebuild
new file mode 100644
index 000000000000..7f1af017b610
--- /dev/null
+++ b/kde-plasma/plasma-vault/plasma-vault-5.25.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.94.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.3
+inherit ecm kde.org
+
+DESCRIPTION="Plasma applet and services for creating encrypted vaults"
+HOMEPAGE+=" https://cukic.co/2017/02/03/vaults-encryption-in-plasma/"
+
+LICENSE="LGPL-3"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="networkmanager"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-plasma/libksysguard-${PVCUT}:5
+	networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	|| ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package networkmanager KF5NetworkManagerQt)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-plasma/plasma-workspace-wallpapers/Manifest b/kde-plasma/plasma-workspace-wallpapers/Manifest
index 2b295a162225..d2c07028cdb0 100644
--- a/kde-plasma/plasma-workspace-wallpapers/Manifest
+++ b/kde-plasma/plasma-workspace-wallpapers/Manifest
@@ -1,3 +1,5 @@
 DIST plasma-workspace-wallpapers-5.24.5.tar.xz 72711796 BLAKE2B 0740e3ac16db5274505358a096997e36f72bd2e58fe60cc7fec914a7a9cfe8a5480fc3e5317cef9a6e4a75d05b58ecb9918b433a61e522a5c605b503cdf785d1 SHA512 8b22bb8a2c093f3f7b7da8b0db55c688fa6d602326429db3e32960d7596c0f79e79d1a724bdb914d55caeffa36f422eea6678afdd62e2bb89f3afa479d056873
+DIST plasma-workspace-wallpapers-5.25.0.tar.xz 74707300 BLAKE2B 273892c978ba57a68f5fd077f0914595aec39646af9ea87f9b3d00bde48e31776f97bda7cd2b11737d844782476176ff5ddb99d7368282d80d9357eed61a9919 SHA512 c646dd2494526e6d155e0bab1c528fb36fc7b4d8ba88593625f8abeb24961c4513351d5595d9c07e42ea62d58bee23d53fe1c7a603ed1ee7d237671ceaf9de99
 EBUILD plasma-workspace-wallpapers-5.24.5.ebuild 355 BLAKE2B 81afbc936fe285344c48e2bb0381dfd9ebe4982ef70e344f82dc16c29c2920281141137221bd55c410154ef23089b192be7b7d37ea3dfa7d1bfd0a6b7f1a4211 SHA512 5c86d1a046ceaf78f2201d54710325306e591095ce1058d0fa12ff04c159f92daf329763a38ee9b315d036d02a6c29713f88ff27fcadc14628fae8617a6627e4
+EBUILD plasma-workspace-wallpapers-5.25.0.ebuild 358 BLAKE2B dc52584491e99a1df8c1d6e9adba03dde84a63626cfd0522d49d88a0c3788486ea19521aa7de4e4037cd26143c540f5c2e800807466bfd0b9497ef61d91a2a4d SHA512 011b37788ce689db7db1857df23f484dab23f6b9c857ae8b92dec1c0fe353441ce69861dee3a3d0c2b64e420edc62ad9b3a35e078d69bb19949622317a9f755b
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.25.0.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.25.0.ebuild
new file mode 100644
index 000000000000..bceff041c2fa
--- /dev/null
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.25.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PVCUT=$(ver_cut 1-3)
+inherit cmake kde.org
+
+DESCRIPTION="Wallpapers for the Plasma workspace"
+
+LICENSE="GPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+BDEPEND="
+	dev-qt/qtcore:5
+	kde-frameworks/extra-cmake-modules:5
+"
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index fac8e0d7ec9b..77195a4768b2 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -10,6 +10,9 @@ AUX plasma-workspace-5.24.5-kcms-desktoptheme-detect-installed-styles-1.patch 16
 AUX plasma-workspace-5.24.5-kcms-desktoptheme-detect-installed-styles-2.patch 2366 BLAKE2B c14bfdd37480b6e501990daa77b0cafb8ed09ad63d96ce08be34c9c2f6dd08442195a566549eefbdbc69f8065c4221ed94b5cd0f12e25f479a8b82d2d08162e5 SHA512 83307de2dd31b3393e0d12f3204427c1f0c4a87bd2d69554e7fb7fd773a34ec71dc8d28055ceaae52d85bb9b04bf8f84b4c8c0f16ca1d775073c722cc0aeca6a
 AUX plasma-workspace-5.24.5-sddm-theme-KeyboardButton-fix-layout-name.patch 1544 BLAKE2B 8f27cb884f5780a8714f376ccdfee67623b1c71fb6f14f8ec0d58f050bd652cd7de54e459edd0f5072aa818bd5fa946f4251e464cdd48e3b2dc2fddc408511b6 SHA512 e85a3504250f79c439590303d542842da71cdbc8cb72fd4a9b010b11cc2bedd282c5debf40cbf0afdbec9545e4ce1c99842e17669386f97b0844dc77d57f4c15
 AUX plasma-workspace-5.24.5-wallpapers-image-fix-missing-folder-action-buttons.patch 1404 BLAKE2B 356c4f481c899c4f7e313f68496c65936eb693c9ec40e893fc02958c9446b06a914370d52b5c5f4c2e45901fb375ff7b1dc79a1505f43ee43c022728be005563 SHA512 3ad0e83b7f236da90694919cd9978d64ceb1c934f8e293a646907c58c6756bcb9d300c806647e907ea36a74a7ab77e223d9b420ba74db6664910fedf8c744232
+AUX plasma-workspace-5.24.80-split-libkworkspace.patch 1175 BLAKE2B 74dabcc26da223fb46bd97c2d07b5913ad51ab85a20062835dbb80b2a555129029996f99129ea9d99af76399722a404cf9baabbea48de4ab4392f068539f3c9f SHA512 95a63a106242449cdf605f943e794e07834b5d1e8fff2ad4e6a025fd68cc20fc6725ec0f0389898c4fe8c87587c7a51381b343cf116b2ff812236f0fe95ed314
 DIST plasma-workspace-5.24.5.tar.xz 18490588 BLAKE2B 5a9681620f40604f631cd7ef0c9d6256cc490436dc5e29ef9434d0f129324c2d405c5647da12778c208976c0cb0b4da698a90a22b70c1cb2723cbc58f69bda1d SHA512 ae40fe545b03e42e9f8fe2e8885d3853f4b52d4fd2ed3ecf7d24fa59b4924b8f8b389e8713ec6a3a875bc66df3952de9157d4a5631b283105a9329a1a1825996
+DIST plasma-workspace-5.25.0.tar.xz 18568884 BLAKE2B 5390a62d336a6cfc6179bc20b546966a11ce583e0737d4a131a993056d0e9987648046e8d5f6664a38689525b61be73deb55dac1fb2b22c36cbac3c50a097800 SHA512 0d52ab01752421e8056db666640e4c8fc31070a6a7704f78e8087f6b32fe22290da54ff830bb59870dcd7e007bd6798859358e163e4ed334d4f31041a3b743c8
 EBUILD plasma-workspace-5.24.5-r1.ebuild 7100 BLAKE2B 9de41f9fa22bc2e66757a88e070be31d2e6b7b19c248ea5f4696e1bcc7b1bf78da4d9f7ed4de2397ef273aad77bb4e9925e8afa90a1cf1b2872d3c2ccf9c5daf SHA512 d43471c2412fea78398c24a916f6d23ed9ecd7e5ce80263e5f2e09678af97b3e63acb7b662051c60e6744e7abeb332d8e6a87581e1bc20b36941dce937d98bda
+EBUILD plasma-workspace-5.25.0.ebuild 6510 BLAKE2B bb2f931b5a488a9b7c53c885c46e704e3fb3581b84bfd83a2151905e3a0327f6db351b4d35b038ce087bb4bac57eff6a8e3d77d625cd3a839f0fb94bf3b6e70f SHA512 3a6b817e2e069989a7afbd28d7a62600c1ffbb93062df8f70fb3477ec895813b805b4e299516fb53cc25bea9e686bd9c5f965a09f15db976b859e7ddf3da5f0e
 MISC metadata.xml 822 BLAKE2B 653f8e3e3987d950746b0a5f423664302f1a59feefcf3704a6d89000748134ee26cb88262ef2fb1e6d79213b1d82c16ac4d8bcaa09a40bef987d7dc7d8a5c82c SHA512 638282cdb40c2386d56f8b20434ffd78a610e8bd4ce5212118d398ba482799de27b7eae3e7874099362e8b841da96c6c819d6e5e52f6ba97679f153425cbe55b
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.80-split-libkworkspace.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.80-split-libkworkspace.patch
new file mode 100644
index 000000000000..e605473e3546
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.80-split-libkworkspace.patch
@@ -0,0 +1,37 @@
+From 19bbdcf391ea51c4798c770e87c7eada24f252b8 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 21 Feb 2022 12:24:56 +0100
+Subject: [PATCH] libkworkspace: Allow standalone build
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3ec5f0893..b022a20b3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -78,6 +78,7 @@ set_package_properties(Qalculate PROPERTIES DESCRIPTION "Qalculate Library"
+                       )
+ 
+ find_package(KWinDBusInterface CONFIG REQUIRED)
++find_package(LibKWorkspace 5.21.5)
+ 
+ find_package(KF5Screen CONFIG REQUIRED)
+ find_package(KScreenLocker 5.13.80 REQUIRED)
+@@ -233,7 +234,10 @@ option(PLASMA_WAYLAND_DEFAULT_SESSION "Use Wayland session by default for Plasma
+ if(KF5DocTools_FOUND)
+   add_subdirectory(doc)
+ endif()
+-add_subdirectory(libkworkspace)
++if(NOT LibKWorkspace_FOUND)
++    message(STATUS "System LibKWorkspace not found, using bundled.")
++    add_subdirectory(libkworkspace)
++endif()
+ add_subdirectory(libdbusmenuqt)
+ add_subdirectory(appmenu)
+ 
+-- 
+2.35.1
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.25.0.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.25.0.ebuild
new file mode 100644
index 000000000000..1852deaa7514
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.25.0.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+KFMIN=5.94.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma workspace"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="appstream +calendar +fontconfig geolocation gps +policykit
+screencast +semantic-desktop telemetry"
+
+REQUIRED_USE="gps? ( geolocation )"
+RESTRICT="test"
+
+# slot op: various private QtWaylandClient headers
+COMMON_DEPEND="
+	>=dev-libs/wayland-1.15
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5=[jpeg,libinput]
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwayland-${QTMIN}:5=
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/kactivities-stats-${KFMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kded-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5
+	>=kde-frameworks/kinit-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/kpeople-${KFMIN}:5
+	>=kde-frameworks/krunner-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kunitconversion-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-frameworks/prison-${KFMIN}:5[qml]
+	>=kde-frameworks/solid-${KFMIN}:5
+	>=kde-plasma/breeze-${PVCUT}:5
+	>=kde-plasma/kscreenlocker-${PVCUT}:5
+	>=kde-plasma/kwin-${PVCUT}:5
+	>=kde-plasma/layer-shell-qt-${PVCUT}:5
+	>=kde-plasma/libkscreen-${PVCUT}:5
+	>=kde-plasma/libksysguard-${PVCUT}:5
+	>=kde-plasma/libkworkspace-${PVCUT}:5
+	>=media-libs/phonon-4.11.0
+	sci-libs/libqalculate:=
+	sys-libs/zlib
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libxcb
+	x11-libs/libXcursor
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/xcb-util
+	x11-libs/xcb-util-image
+	appstream? ( dev-libs/appstream[qt5] )
+	calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
+	fontconfig? (
+		>=dev-qt/qtprintsupport-${QTMIN}:5
+		media-libs/fontconfig
+		x11-libs/libXft
+		x11-libs/xcb-util-image
+	)
+	geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
+	gps? ( sci-geosciences/gpsd )
+	policykit? ( virtual/libcrypt:= )
+	screencast? (
+		>=dev-qt/qtgui-${QTMIN}:5=[egl]
+		media-libs/libglvnd
+		>=media-video/pipewire-0.3:=
+		x11-libs/libdrm
+	)
+	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
+	telemetry? ( dev-libs/kuserfeedback:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/plasma-wayland-protocols-1.6.0
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-util/wayland-scanner-1.19.0
+	x11-base/xorg-proto
+	fontconfig? ( x11-libs/libXrender )
+	test? ( >=dev-libs/wayland-protocols-1.24 )
+"
+RDEPEND="${COMMON_DEPEND}
+	app-text/iso-codes
+	>=dev-qt/qdbus-${QTMIN}:*
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+	>=dev-qt/qtpaths-${QTMIN}:5
+	>=dev-qt/qtquickcontrols-${QTMIN}:5[widgets]
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	kde-apps/kio-extras:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/kquickcharts-${KFMIN}:5
+	>=kde-plasma/milou-${PVCUT}:5
+	>=kde-plasma/plasma-integration-${PVCUT}:5
+	sys-apps/dbus
+	x11-apps/xmessage
+	x11-apps/xprop
+	x11-apps/xrdb
+	x11-apps/xsetroot
+	!<kde-plasma/breeze-5.22.90:5
+	!<kde-plasma/plasma-desktop-5.23.90:5
+	policykit? ( sys-apps/accountsservice )
+"
+BDEPEND="
+	>=dev-qt/qtwaylandscanner-${QTMIN}:5
+	virtual/pkgconfig
+"
+PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.24.80-split-libkworkspace.patch" # downstream
+	"${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478
+)
+
+src_prepare() {
+	ecm_src_prepare
+
+	cmake_comment_add_subdirectory libkworkspace
+	# delete colliding libkworkspace translations
+	if [[ ${KDE_BUILD_TYPE} = release ]]; then
+		find po -type f -name "*po" -and -name "libkworkspace*" -delete || die
+	fi
+
+	# TODO: try to get a build switch upstreamed
+	if ! use screencast; then
+		sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
+	fi
+
+	# TODO: try to get a build switch upstreamed
+	if use geolocation; then
+		use gps || sed -e "s/^pkg_check_modules.*LIBGPS/#&/" \
+			-i dataengines/geolocation/CMakeLists.txt || die
+	fi
+
+	if ! use policykit; then
+		cmake_run_in kcms cmake_comment_add_subdirectory users
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_xembed-sni-proxy=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON
+		$(cmake_use_find_package appstream AppStreamQt)
+		$(cmake_use_find_package calendar KF5Holidays)
+		$(cmake_use_find_package fontconfig Fontconfig)
+		$(cmake_use_find_package geolocation KF5NetworkManagerQt)
+		$(cmake_use_find_package semantic-desktop KF5Baloo)
+		$(cmake_use_find_package telemetry KUserFeedback)
+	)
+
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+
+	# default startup and shutdown scripts
+	insinto /etc/xdg/plasma-workspace/env
+	doins "${FILESDIR}"/10-agent-startup.sh
+
+	insinto /etc/xdg/plasma-workspace/shutdown
+	doins "${FILESDIR}"/10-agent-shutdown.sh
+	fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh
+}
+
+pkg_postinst () {
+	ecm_pkg_postinst
+
+	elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
+	elog "edit ${EPREFIX}/etc/xdg/plasma-workspace/env/10-agent-startup.sh"
+	elog "and ${EPREFIX}/etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh"
+}
diff --git a/kde-plasma/plymouth-kcm/Manifest b/kde-plasma/plymouth-kcm/Manifest
index 7dead5900193..9a4767db1dde 100644
--- a/kde-plasma/plymouth-kcm/Manifest
+++ b/kde-plasma/plymouth-kcm/Manifest
@@ -1,3 +1,5 @@
 DIST plymouth-kcm-5.24.5.tar.xz 39964 BLAKE2B ba1e54afb9a19b4e3858caa31c8c729feb338412368c8b91a197ee87351397f6c54f62753862982f6f2a3bbcbb74c39946bfcc9e90085ec22179676672ebb229 SHA512 7bc78c3b3d2639de00f428bda606b4f822c99f4c3dc0c2f1fe3f422208e05273701a1871fc573c36b8e14cc1a8bc02e07e4389a40b3fee3a6b79c44a561c2cf8
+DIST plymouth-kcm-5.25.0.tar.xz 40000 BLAKE2B 81c78bbe1c567314635e6e430fbfb1f39e5be441a004bb8a29ec07457ae1a642102ac20c4ac8eb59ed3d226679404d4c9b8062d93e69d243129c5da7cf4f9a8e SHA512 992c1509e45ada15334044bdccd725d78a82e0f65e988c9728e8f7d81de4ae059f19909e0d1f526aeebcabb9c3b16244ea1a4b25ed3a09814af3a525127d852b
 EBUILD plymouth-kcm-5.24.5.ebuild 927 BLAKE2B 9121a1195cad566bdace0e697db94fc1392bd978031a3b6953d8db234df4f95307023efcf1dca7631bd4c7587bddbcbc1bdc80c8677b564c276dbd5b4e611876 SHA512 e8f8860d428bacd642e75443e89ef727fd38fcdaf5a2fb494647dc246c3c70574cd3d7f34853f1c89451dcd782f2176cc8748a74fc0161f491b295b8e324ab51
+EBUILD plymouth-kcm-5.25.0.ebuild 930 BLAKE2B 39659fa8471c1973a97d724b732744b2fab68447de865f80fc91efc74d0e7d0a4d76b3b4fa805977b02eaafddafec846dc9a616653a8d1597bbdf0a5d1ec89a7 SHA512 3b643fc8631acc0e54982742139512f2e48b2d56c7602d374a6f12f833dd1a73be21eb3f1bf60ff5e90187869cc02605a1e0cf514f17c705b5ccf617ff1aade3
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.25.0.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.25.0.ebuild
new file mode 100644
index 000000000000..1088de8c64e9
--- /dev/null
+++ b/kde-plasma/plymouth-kcm/plymouth-kcm-5.25.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.94.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma control module for Plymouth"
+HOMEPAGE="https://invent.kde.org/plasma/plymouth-kcm"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	sys-boot/plymouth
+"
+RDEPEND="${DEPEND}
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
diff --git a/kde-plasma/polkit-kde-agent/Manifest b/kde-plasma/polkit-kde-agent/Manifest
index c29ba6b65163..087993d40c75 100644
--- a/kde-plasma/polkit-kde-agent/Manifest
+++ b/kde-plasma/polkit-kde-agent/Manifest
@@ -1,3 +1,5 @@
 DIST polkit-kde-agent-1-5.24.5.tar.xz 48444 BLAKE2B 4e39fe9e23d474e79a0e2611669065e05180f9e2e514cd0aba23b950c19357ac8d56d1a3fbaa85516b3eff86ebe2fbfb8e96d1dcda2cca9333ce0d9b7e7f7f8e SHA512 8182271a4463e28001c5806156afffa8436c9fce0ead257c60b413bf54565d8271e8356f5670e8eb2aea5c3d2a308e31f14f6eff4c6903e1936e6395d8502a93
+DIST polkit-kde-agent-1-5.25.0.tar.xz 48568 BLAKE2B ee0dde74a47061f8d34049e2912fa94d574654682dae774197a4f0c6402f7c62a70b2f5c39ae4dd9efad5a17bfe6aec75a40388d71a52633c148c0c2e886de48 SHA512 b61a61c1ebfe852c87717462d85948a1cfb8488407715cb42a9dadef19fd1640e5fc93fe8fd3683b577387e77077ce885b9b2075112de93f4e1f7efe7e4bb329
 EBUILD polkit-kde-agent-5.24.5.ebuild 804 BLAKE2B 66a36e5a23884b96e7a550c8fd2186f81d3d4c0a1f3241f98ddc806e59d9d12cda40a5ab9fba14c8354302115d91553f00369a909dcc238fcf47fc3d75215fe6 SHA512 8aec98bdd1ff62a0956b4ebae37339507e8cdd6fb9a729087087cb65ff4be55a2b28664d3b3a1166d856db3d2f61daaca2c1dd7f421c68cee9a9b255bb48353e
+EBUILD polkit-kde-agent-5.25.0.ebuild 807 BLAKE2B 08335a7064bfab0079026566039819834ddcbfa967aaf411baafe4f5ce76e45ce2a8757817d385f5b0432a40c35300b7b585040e902b6c015265d302e37514d6 SHA512 b10388e8a854ebc3417d970288cab2d54821159d0f72d41479be37fd16fc07ad0c15670e565361b410598df0a1ffdb6822cc43759dc1e9302e2fde8a9f0c293d
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.25.0.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.25.0.ebuild
new file mode 100644
index 000000000000..933004237fbb
--- /dev/null
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.25.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="${PN}-1"
+KFMIN=5.94.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.3
+inherit ecm kde.org
+
+DESCRIPTION="PolKit agent module for KDE Plasma"
+HOMEPAGE="https://kde.org/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=sys-auth/polkit-qt-0.113.0
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index 17c38f9a63e2..94ffa38f5aab 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1,3 +1,5 @@
 DIST powerdevil-5.24.5.tar.xz 632800 BLAKE2B 657e68359664bdf4d6ac782a53148400b430ae786d5551763b45d28690d1a3481d913e47618aea015c1753389c779f7e028c03f21a328d08edc6fa5bb3ab21d1 SHA512 2f3e6888be7039bf7beb754ef117d09e79ceb4e5ef73d74f982d37785adbd7a489fc86641c9df9ea4a34fabd2ccac737f5e7ee08958d2dd03b5a676f22aa4c15
+DIST powerdevil-5.25.0.tar.xz 635828 BLAKE2B 671b8a1d1a0ba7befbca51447f28b1e687ca2d6af7195d165818fb7b3c5c5ac15a452ef5f8bdeeca160af8f1e4e55471c717b2403bc5bd3145ea9bdbf28d6cba SHA512 dde9c33f915968abc543f93c01f4975c278b314ad73ec3c70edd95357dffdb41cbef3b43bb4ca737f8aeeb3ef9e9bdfeedd9fba1252180e27d025d38b7f5ea5b
 EBUILD powerdevil-5.24.5.ebuild 1991 BLAKE2B 56f223cd0fc21b91890590a857ba4f43317afd11bb287708db6d1351d58cdf83e70739d4c53b5ae295444df0915c1399afba95d6f48a0ec913f8ee3c4a4a50f6 SHA512 25dbb8e291a1829f2f516f40ce386aaf864336c19fb981b6ecfbf8c95ce8f704e7a93f43a01c8f0f8657df5388fc246678794c125fbd36c5b88b48d5fa8f87a9
+EBUILD powerdevil-5.25.0.ebuild 1994 BLAKE2B c119054e8fc4e720fbb47511d358817d398c7eab69c49b96a57db12f328994a179d86fe8beca8f6660ce0227989b435d3e00bd9bd684d73e3364f55493cec484 SHA512 363f839c1f7c5674e4216f13d1b6937644989f82e30ce95a7ba74c083a8881fe5134a09a8d0e3b89ce4c76c7d33cd52049bc23d10e2927ca7cf2f6a99c404d35
 MISC metadata.xml 597 BLAKE2B 4e436cb067ff3c936a6e497de75b03947f4ccd1103f45237a8a7fe738f67c5a718bf17bbb7aa0a9eff068ce18ce4f0b73bb8f737badc63971e3edabcdd09bff8 SHA512 f4652971683109791e796a57de30efaf603566ad5f9e3e1d16ca54b1212b4cd3ebe1d9a934959fcb51d2722aafe3d57af708f45722534f225ea4b2889a492dc6
diff --git a/kde-plasma/powerdevil/powerdevil-5.25.0.ebuild b/kde-plasma/powerdevil/powerdevil-5.25.0.ebuild
new file mode 100644
index 000000000000..4264974e6011
--- /dev/null
+++ b/kde-plasma/powerdevil/powerdevil-5.25.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.94.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.3
+inherit ecm kde.org
+
+DESCRIPTION="Power management for KDE Plasma Shell"
+HOMEPAGE="https://invent.kde.org/plasma/powerdevil"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="brightness-control caps +wireless"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5[policykit]
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	>=kde-plasma/libkscreen-${PVCUT}:5
+	>=kde-plasma/libkworkspace-${PVCUT}:5
+	virtual/libudev:=
+	x11-libs/libxcb
+	brightness-control? ( app-misc/ddcutil:= )
+	caps? ( sys-libs/libcap )
+	wireless? (
+		>=kde-frameworks/bluez-qt-${KFMIN}:5
+		>=kde-frameworks/networkmanager-qt-${KFMIN}:5
+	)
+"
+RDEPEND="${DEPEND}
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+	>=sys-power/upower-0.9.23
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DHAVE_DDCUTIL=$(usex brightness-control)
+		$(cmake_use_find_package caps Libcap)
+		$(cmake_use_find_package wireless KF5BluezQt)
+		$(cmake_use_find_package wireless KF5NetworkManagerQt)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-plasma/sddm-kcm/Manifest b/kde-plasma/sddm-kcm/Manifest
index 7ee1c89f0531..30b81c134d29 100644
--- a/kde-plasma/sddm-kcm/Manifest
+++ b/kde-plasma/sddm-kcm/Manifest
@@ -1,3 +1,5 @@
 DIST sddm-kcm-5.24.5.tar.xz 81280 BLAKE2B d944d898b84dd9da0849c5a81586365d0cae06a1c116587807329e8b029cf26f3faa31e0dcce5382d42d7416b601f10e4110850d643f5f7b0a83a5f4d7f906b3 SHA512 1fbc050e70dde74bcaa0a97ac982f017146ca65f180ea07e57190bd13ea653789fb369b83bc0b2583b73d37e4cd3db087eebe2cdaa3346b81c1d7d11730fad15
+DIST sddm-kcm-5.25.0.tar.xz 81904 BLAKE2B 3ccc03ec4452314a8bb00b3f9a5b6bd6840d0f14d5ea8958d42a44ad8a3c00614996cca5dd97ed012d0062e0df515cd69b134dd0b1b6c2f935df40332fc84195 SHA512 f6ce9fc5ead73097ea80ef1aaa12cc4b25a66d6d2bb32ea535180a177c840e9b6b08627cb641211358ec2a0fcba131d84126cf04230466d030763c1a0e15cc58
 EBUILD sddm-kcm-5.24.5.ebuild 1121 BLAKE2B 6f8903410d042d1a02522c707b5c7216f2ffa94ac8488ad388fc61d0022f6a699aae7d91de8d9c3d20937c4af12c3b16b5e0615485b6abcf9d1d73493b8f3f88 SHA512 847d677d60265519bd46ce8cd85245d8231129ed0067928f0adddb793febdf5a34ac7d3d98ffda9e6f384b157f862b68c60515997c4bfce991d83bc69076db94
+EBUILD sddm-kcm-5.25.0.ebuild 1124 BLAKE2B 74416b6af8e2f4c41e92b8dc9283407e899242aabe59d9470126ac8f64120d4b9e99a5357625e4faaedb42e468c74cbdd3c6dc5923155df20f5171d4d0fc0c0f SHA512 b3980ce6174699142550128613df33cee69fa69c5ecba6d122104e46037d12d06ab1418ee9479dafce968c66d2be288411fedaf1ba55be2997336660fa66249f
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.25.0.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.25.0.ebuild
new file mode 100644
index 000000000000..67f8d6eaca9a
--- /dev/null
+++ b/kde-plasma/sddm-kcm/sddm-kcm-5.25.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.94.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma control module for SDDM"
+HOMEPAGE="https://invent.kde.org/plasma/sddm-kcm"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+	x11-misc/sddm
+"
+
+DOCS=( CONTRIBUTORS )
diff --git a/kde-plasma/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest
index cb682a6c8ba6..35ce70415ae0 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1,5 +1,7 @@
 AUX systemsettings-5.24.5-fix-activating-running-instance-on-wayland.patch 843 BLAKE2B 38a18ca89336b9a4abc3af3c466762095c4c28ca7e6711232546a7b7a16cb0163f77bc4872971483c429a836e40ed34cbbf42b052cd9ab840a5b2b4ad7da5d18 SHA512 944b2695a18c88fee6b77ffbd597cd1fbc9a2283d4f448bee927dfe2c660a58e511abd91928686725ffb6809bfcbf2bb9d8f7358c3f1d357dffe2c384c8e2d85
 AUX systemsettings-5.24.5-fix-kcm-highlighting.patch 1253 BLAKE2B b62c3c1927f09b267d7368faf3d2aae5a0101a628c6e1b11aaa4f1ece0a13ba306ba52cec228833b8ec4cb5929b4f936ffece8df9ba90960834fd7afa4452355 SHA512 44d21933fe20e280fb6f89b9515d7ed8701dbd078a11b3e93bf97a594ffbfc485699b3ff16d78c7ae5225f6f9f36aacfaf94b22ae1b9cf74c0eb9b5d590783e7
 DIST systemsettings-5.24.5.tar.xz 205532 BLAKE2B ddde588074ab761fc41e6fb0715fa1af45904d223c060234170062a25b86d58d807b8fed003543785f50e9227161b167f4889bd817fe87c8b711da9f07bf361d SHA512 7dd2aa3d2b0ad821569eaa6e17d064a2216d35a525baf82621a1fb31867a340372ec0349488cc6bf344156f9d9052b589be5d01ed82a1c18fcedaa64fb4986b1
+DIST systemsettings-5.25.0.tar.xz 206572 BLAKE2B 5aec1ff48fda4ec24c560210267c2d2dda203878c2cc6f2c724136d74d83a49faff5c10489f045682059bcf55b5028b3ca8496883980e056e156384a173c6dc8 SHA512 0af820ef3987e344be3934dc96c9b8e42417704ad5b87f78909909605af105abc6976df6a8092c448eaa78d19e1b2f82e0d0cc7b80319de7a8811d0f13dc32c1
 EBUILD systemsettings-5.24.5-r1.ebuild 1900 BLAKE2B 2602d0578a1c3a2ca774c6fc8c589df82b7c90de7154e40866cce60ff75d85f23442c5ac2fb4c38bde0b2c32d16249de1f3664a05a3cbbf939a054dccf1eb34a SHA512 14eb6addb666372fccf5b1e03a5983f79e26f6c687ff2525fc776575abcd2767eed5527ac2edd3f6c22897a5436a2a77d122b2607b7401e20c22fcbc7998527c
+EBUILD systemsettings-5.25.0.ebuild 1715 BLAKE2B b1aadea5913fc1e7e8fca6104b27b9a8a3e551417dd151904d9cf5a0f0ad7629d40954f0fde5561f61d3daa35abc85389f8fb8966709a408bb4500ebf30effb5 SHA512 123e9567c699b30cfff668dfec18ea0d944ed63654945922b8b7aad5f1b244a278540867b897fb4ccb7bc4e0ae4d2a903c6e2aa75325f0998ea331baa507cbcc
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/systemsettings/systemsettings-5.25.0.ebuild b/kde-plasma/systemsettings/systemsettings-5.25.0.ebuild
new file mode 100644
index 000000000000..8e8f946737ba
--- /dev/null
+++ b/kde-plasma/systemsettings/systemsettings-5.25.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+KFMIN=5.94.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.3
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Control Center to configure KDE Plasma desktop"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/kactivities-stats-${KFMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/krunner-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-plasma/libkworkspace-${PVCUT}:5
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+"
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "Configure looks for GTK+" kde-plasma/kde-gtk-config
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-plasma/xdg-desktop-portal-kde/Manifest b/kde-plasma/xdg-desktop-portal-kde/Manifest
index 6febafb1016d..e2953b5a30be 100644
--- a/kde-plasma/xdg-desktop-portal-kde/Manifest
+++ b/kde-plasma/xdg-desktop-portal-kde/Manifest
@@ -3,6 +3,8 @@ AUX xdg-desktop-portal-kde-5.24.5-screencast-dont-provide-every-running-stream.p
 AUX xdg-desktop-portal-kde-5.24.5-screencast-stop-stream-actively.patch 882 BLAKE2B 5f5efbf3ae00cf7555c9d8d7d167ab5e2ec7c5318c27ea533204e4e4590272258e62266d4ebd69aaaa30cdcbcfeaa7b995d92cd73e7a13bfcac35e0c16a1b577 SHA512 a3273bddccd3f0a6cb51d66661e88545292298427f42a797a9590abd24e7e99ca50971f8e27859d5e578cdca3257849a8fd72c57be3eda0d4fe938d787577d9d
 AUX xdg-desktop-portal-kde-5.24.5-show-screenshare-notifier-more-prominently.patch 1097 BLAKE2B bf2fab8ddc7d79f4759a5aec9de7c93ff13c0e249eee6eef689db59d034aa39a06b93db1260d3e3c96f567633dac07c762828815a9785e8bdf7de6a12eae324c SHA512 cc36b2e04ca0b88982a370a5b0b5b4ba77dbc503af970016be87b0a0c54417302f76f1febcd75b2736008523fd942d78431e706c200a73c1ebf64a8f61c2742a
 DIST xdg-desktop-portal-kde-5.24.5.tar.xz 88904 BLAKE2B b7ab407132ce8dfdae58854dc29af270c411e1d2c7c8631c6209ff0fb44c80b8287dbe13a6ed60d2e8926f4b23ed3209242bd2836906a44ee06a936d56a91131 SHA512 6314fa4f679700224c6de44726f1fbf513249cebcb9c0fae212bde3de98cb0cc040f671e2435d8e53f379ad907bde4022a6ecfe5f95424a9414ce7471c0fe401
+DIST xdg-desktop-portal-kde-5.25.0.tar.xz 103536 BLAKE2B 87d6d28be3b97fc0340787ea150e6e60c6445804d4402cff7ca85510c142eaaf3758d25edd1fe947290d204cd6c787833d5da2afcec673b488e31fff16f1cda0 SHA512 c6450c46977ff66003a5382964268e0ad9344d575692eb93c96877e6b11848078e7b4b5ef8e2eeaeefd5cf296f08ac0c0dd714e3fd22bad122897fcd752b30a5
 EBUILD xdg-desktop-portal-kde-5.24.5-r1.ebuild 1300 BLAKE2B 4e167f9cd12ae68cfab313c4f8e83036041f61214ad04a85fd75b9fdaee679d2ae057135c5db8af2568f41b8221a655ff3701c2214697d70e47de440357384f8 SHA512 84c3baef8009b45fd09c2f76d606eb71274f52fd1e67e4b91c9c175d1f6362a55b56c374e6d1a055ddd223ce7e3ccafdde742fb14b6755fbb1544105a81d338c
-EBUILD xdg-desktop-portal-kde-5.24.5-r2.ebuild 1505 BLAKE2B 18acf78d464fea564a636e34bdaa7976d9e7ae3bea0eb4e2e2e10d13f0c3c0b2de05357d78fb51c94eb12cbe787756de2bf72f544ed4f920d29299c79ade8d6d SHA512 8b8e786e60304b81f3a14894736241ecc21081a60440783e246765caf908f75b207aed8afa2d08f6ce16015ed46304801ed8557a06209620927881ef3993d68f
+EBUILD xdg-desktop-portal-kde-5.24.5-r2.ebuild 1504 BLAKE2B 976ad92f56a0f80722652fb1290f4b2eff5b77221f85fa741462afdc8b8653ab8883b2e58078b3f9097c2352140477244225c547ba0c4db8e48d55410a30bec3 SHA512 a5af973840c2b9530f1ce6ebb427e2b129c146685dbd236af9de778c7d524302cde8800b1920e4cb4eb1c205e63352b332f9f791266896094aa56becf512dac7
+EBUILD xdg-desktop-portal-kde-5.25.0.ebuild 1266 BLAKE2B 33ee7eba212c45ff6db40cbb1443fe324ac88e1b1b20f4e21d36ce27fa6bf2824862350b72ba442c3a79d972408650cfff6ae733c89602448c2b50abc93655ff SHA512 7fcfffad7d63a6ffabc200a2dd6b89bcc60d3d2fcbac5c38948b7e6d9ec7512b344441248bb9cc91a95a8a2eafccf86d2e703fd9ee866b751c12e5047d32d07a
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.5-r2.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.5-r2.ebuild
index 4f3f3b51b540..0eb9b4578030 100644
--- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.5-r2.ebuild
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.5-r2.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Backend implementation for xdg-desktop-portal that is using Qt/KDE
 
 LICENSE="LGPL-2+"
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.25.0.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.25.0.ebuild
new file mode 100644
index 000000000000..1509dd762428
--- /dev/null
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.25.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.94.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.3
+inherit ecm kde.org
+
+DESCRIPTION="Backend implementation for xdg-desktop-portal that is using Qt/KDE Frameworks"
+
+LICENSE="LGPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	>=dev-libs/wayland-1.15
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5[cups]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/plasma-wayland-protocols-1.7.0
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
+	kde-misc/kio-fuse:5
+	sys-apps/xdg-desktop-portal
+"
+BDEPEND=">=dev-qt/qtwaylandscanner-${QTMIN}:5"
diff --git a/kde-plasma/xembed-sni-proxy/Manifest b/kde-plasma/xembed-sni-proxy/Manifest
index 2ff89f5be9b5..b06b126402ed 100644
--- a/kde-plasma/xembed-sni-proxy/Manifest
+++ b/kde-plasma/xembed-sni-proxy/Manifest
@@ -1,4 +1,7 @@
 AUX xembed-sni-proxy-5.20.80-standalone.patch 2090 BLAKE2B d56e29d6bdf62bd4fea74c963e6af642c956b2907a2995335845d730b11ab09b81bf535edceecca2bbc7fa44552bc1659e5e59e95415470fe77a7bece759ba4a SHA512 8eb77b1a97715d549164cff12dd4d1b63af2d0f8bbcb447d47b4ec82f539e37dad5395e0a7f8fd5c700fc82e06569313a36cf1f7e6eca09ad6d18bb890dbb9fe
+AUX xembed-sni-proxy-5.24.80-standalone.patch 2177 BLAKE2B 9b10237e4108a312d2896cba4fa45dd24bec0cf5e6559845a4dc9cb9adb3786e210ebc5a9e6620285024250ad9af810ca22f205262fe98ef471d2711661aff09 SHA512 2320578033606c958ceeb7891a9d71e9fd6c788e1752d7a3293214fe54c72f4be8bf31fe131754b7b5561b7f5d5be2da66f4a29294cb0ff5732df5587ee465f6
 DIST plasma-workspace-5.24.5.tar.xz 18490588 BLAKE2B 5a9681620f40604f631cd7ef0c9d6256cc490436dc5e29ef9434d0f129324c2d405c5647da12778c208976c0cb0b4da698a90a22b70c1cb2723cbc58f69bda1d SHA512 ae40fe545b03e42e9f8fe2e8885d3853f4b52d4fd2ed3ecf7d24fa59b4924b8f8b389e8713ec6a3a875bc66df3952de9157d4a5631b283105a9329a1a1825996
+DIST plasma-workspace-5.25.0.tar.xz 18568884 BLAKE2B 5390a62d336a6cfc6179bc20b546966a11ce583e0737d4a131a993056d0e9987648046e8d5f6664a38689525b61be73deb55dac1fb2b22c36cbac3c50a097800 SHA512 0d52ab01752421e8056db666640e4c8fc31070a6a7704f78e8087f6b32fe22290da54ff830bb59870dcd7e007bd6798859358e163e4ed334d4f31041a3b743c8
 EBUILD xembed-sni-proxy-5.24.5.ebuild 1015 BLAKE2B db108b3c849fba5b6b1e2dfa0e66fdd730c9b983b7c53ae54d5123678e43d0dc9153cc016a30fe08316035a779c8c4e9b83e569b5097d26470a25e2c0dc58a3a SHA512 b09744ad6078ba7b097b14047d92f7e447647c99caf489bb74d9eb4ed89a7d69e46c851284e401bd937df43cc28324b69419ea4e7a8ffca6431b03f95d9505cb
+EBUILD xembed-sni-proxy-5.25.0.ebuild 1035 BLAKE2B 88f7a06f053115720280574152ae207b11642b352d4c34b9ebc244bb2466937f201b1f4d57900eebcd4e6e498a5b0071a62b8c0fc4f725a9f6732470a1fe80dc SHA512 7c1bfbc46268682cb47f83fb3bcbf4b2abc04b041f27a5310f8c9203037558e2f02dfb1fec30f39b7afa949b03fad52ad5be9994d27532686a776f14ab49ee6d
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.24.80-standalone.patch b/kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.24.80-standalone.patch
new file mode 100644
index 000000000000..f6e8413e3763
--- /dev/null
+++ b/kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.24.80-standalone.patch
@@ -0,0 +1,60 @@
+From a381c7441140e77208c0ed3a8dd45cb61197afd9 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 24 Sep 2020 22:34:28 +0200
+Subject: [PATCH] xembed-sni-proxy: Allow standalone build
+
+---
+ xembed-sni-proxy/CMakeLists.txt | 36 +++++++++++++++++++++++++++++++++
+ 1 file changed, 36 insertions(+)
+
+diff --git a/xembed-sni-proxy/CMakeLists.txt b/xembed-sni-proxy/CMakeLists.txt
+index bcc583bfa..41d50d112 100644
+--- a/xembed-sni-proxy/CMakeLists.txt
++++ b/xembed-sni-proxy/CMakeLists.txt
+@@ -1,3 +1,35 @@
++project(xembed-sni-proxy)
++
++if(${CMAKE_SOURCE_DIR} STREQUAL ${xembed-sni-proxy_SOURCE_DIR})
++    set(PROJECT_VERSION "GENTOO_PV")
++    set(PROJECT_VERSION_MAJOR 5)
++
++    cmake_minimum_required(VERSION 3.16)
++
++    set(QT_MIN_VERSION "5.15.0")
++    set(KF5_MIN_VERSION "5.89")
++    find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus X11Extras)
++    find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
++    set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
++
++    include(KDEInstallDirs)
++    include(KDECMakeSettings)
++    include(KDECompilerSettings NO_POLICY_SCOPE)
++    include(FeatureSummary)
++    include(ECMQtDeclareLoggingCategory)
++    include(ECMConfiguredInstall)
++
++    find_package(KF5WindowSystem ${KF5_MIN_VERSION} REQUIRED)
++    find_package(X11 REQUIRED)
++    find_package(XCB MODULE REQUIRED COMPONENTS XCB RANDR)
++    set_package_properties(XCB PROPERTIES TYPE REQUIRED)
++
++    configure_file(../config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h)
++else()
++    set(PROJECT_VERSION "5.24.80")
++    set(PROJECT_VERSION_MAJOR 5)
++endif()
++
+ add_definitions(-DQT_NO_CAST_TO_ASCII
+ -DQT_NO_CAST_FROM_ASCII
+ -DQT_NO_CAST_FROM_BYTEARRAY)
+@@ -64,3 +96,7 @@ install(TARGETS xembedsniproxy ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
+ install(FILES xembedsniproxy.desktop DESTINATION ${KDE_INSTALL_AUTOSTARTDIR})
+ 
+ ecm_install_configured_files(INPUT plasma-xembedsniproxy.service.in @ONLY DESTINATION  ${KDE_INSTALL_SYSTEMDUSERUNITDIR})
++
++if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
++    feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
++endif()
+-- 
+2.34.1
+
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.25.0.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.25.0.ebuild
new file mode 100644
index 000000000000..591db2ed4650
--- /dev/null
+++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.25.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="plasma-workspace"
+KFMIN=5.94.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.3
+inherit cmake kde.org
+
+DESCRIPTION="Legacy xembed tray icons support for SNI-only system trays"
+HOMEPAGE="https://invent.kde.org/plasma/plasma-workspace/-/blob/master/xembed-sni-proxy/Readme.md"
+CMAKE_USE_DIR="${S}/${PN}"
+
+LICENSE="GPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+DEPEND="
+	>=dev-qt/qtcore-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/extra-cmake-modules-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
+	x11-libs/libxcb
+	x11-libs/libXtst
+	x11-libs/xcb-util-image
+"
+RDEPEND="${DEPEND}
+	!kde-plasma/xembed-sni-proxy:0
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.24.80-standalone.patch" )
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \
+		-i ${PN}/CMakeLists.txt || die "Failed to prepare CMakeLists.txt"
+}
diff --git a/licenses/Manifest.gz b/licenses/Manifest.gz
index 0466eb3cf88c..6fe9c9350d3a 100644
Binary files a/licenses/Manifest.gz and b/licenses/Manifest.gz differ
diff --git a/licenses/jpeg2ps b/licenses/jpeg2ps
new file mode 100644
index 000000000000..55430de5b841
--- /dev/null
+++ b/licenses/jpeg2ps
@@ -0,0 +1,9 @@
+This software is free. You are granted the right to use and copy it. This
+software may not be sold or bundled with any commercial package without
+express written permission of the author.
+
+The author accepts no responsibility for damages resulting from the use of
+this software and makes no warranty, either express or implied, including but
+not limited to, any implied warranty of merchantability or fitness for a
+particular purpose. This software is provided as is, and you assume all risks
+when using it.
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index c949d7ab270e..9d45468e62c6 100644
Binary files a/mail-client/Manifest.gz and b/mail-client/Manifest.gz differ
diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 3bc4901f8396..07a2248e1aab 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -3,10 +3,10 @@ DIST neomutt-20220408.tar.gz 3764512 BLAKE2B a2f4d86960d6c47f91654af1752cf1d64df
 DIST neomutt-20220415.tar.gz 3770700 BLAKE2B 610632a8de6f407b2a33156890f33b64a7cfc80eef84cda4c5e18d1da87669c8a4cf2b4a0b269d6c338f546e83a349dc33608b9f21d1f6889efaa89d669f80e4 SHA512 8723416fe0ed325d8f0e49f6a77f2724e23e0e81c5786f15005cb05b47c0fc7f722f61a58fe0250dd5a2dac6f40b155b6bac202e6316662a1855265670affc92
 DIST neomutt-20220429.tar.gz 3774374 BLAKE2B a67ae009bc24335693bb7abc2b1de5a957a4d912755f460ae205050963dc4556896a6f94971a7d113a5af8202d8a6ecff4cfff16c157725d4792eb31f5402a64 SHA512 ce151cabe9fe0c45f379dd7a71790f600faa9283c79a486c1421b5fe3b19b7f12d71dc36ec330e1b28b26ed83bf4c47b656ca823c484105ea3f80ef9166e7f0b
 DIST neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz 3673 BLAKE2B 50354f19aedc5fc07d59ecb5b38fa65de16119bc0929f47014bd35dab4d3a4e5953c8b35670f3440003cf0cbccc2d0d2b3a869dc929cdc3cd60b02790270fb54 SHA512 3d4962210bc558234d818801dcaa7851a0aef011c96d91c054af535186ffda42059fc61fb148c48e1b076999fe3159b31589a69a29ed1897f8928f52fcc157d3
-EBUILD neomutt-20211029-r1.ebuild 4435 BLAKE2B 5ab23ff25ed3bc162e889d75471dcc59a2597d6105d2770d88443bb6d535d2ae984b285f2c23e194d7d4b8c77935c30c028fe147ebaac2c54e09521df2c98937 SHA512 75fd831dba3cf7dc8d9b99f503aceb3836ed88521c05ded9f068f56fe60aa6f6200edceaf1251136e6f23185153cb74ebe6940dc2d22ab2b1b0c9667964729e3
-EBUILD neomutt-20211029.ebuild 4318 BLAKE2B 076853dfda2e7447e08fc503db1b1613726f5a48f4cda625052cfb1068f45f900b2f2c9d6ab142b24fdb198f2bb72a2b474fb1b39ffcbfa0e03934ad725df4f7 SHA512 26d24dc2d5daebca9a40283fb1f902b5703586b35c6a98195bc186f7c488bd0c1b7169bd88856fccb52290f82931b97c5d015c3f2d7eeeb4fafb3c169fd49dab
-EBUILD neomutt-20220408.ebuild 4437 BLAKE2B 20cb0c414add7304f7d6936fb795e259b01ec4197cf1c0aaa9979234d09bdf2b94fa69c39635cf630d4246009b2fb3ea1186eb58993df1f50a33e854fecf485f SHA512 29dd8b8cf88541f7a25866b926f4128afc8e8573edab7712b87fca30ea1ee2adb2c3545736c1c21f8f092f39849900cfd1d9363b925895992580ecfb8afd48e7
-EBUILD neomutt-20220415.ebuild 4437 BLAKE2B 20cb0c414add7304f7d6936fb795e259b01ec4197cf1c0aaa9979234d09bdf2b94fa69c39635cf630d4246009b2fb3ea1186eb58993df1f50a33e854fecf485f SHA512 29dd8b8cf88541f7a25866b926f4128afc8e8573edab7712b87fca30ea1ee2adb2c3545736c1c21f8f092f39849900cfd1d9363b925895992580ecfb8afd48e7
-EBUILD neomutt-20220429.ebuild 4437 BLAKE2B 20cb0c414add7304f7d6936fb795e259b01ec4197cf1c0aaa9979234d09bdf2b94fa69c39635cf630d4246009b2fb3ea1186eb58993df1f50a33e854fecf485f SHA512 29dd8b8cf88541f7a25866b926f4128afc8e8573edab7712b87fca30ea1ee2adb2c3545736c1c21f8f092f39849900cfd1d9363b925895992580ecfb8afd48e7
-EBUILD neomutt-99999999.ebuild 4437 BLAKE2B 20cb0c414add7304f7d6936fb795e259b01ec4197cf1c0aaa9979234d09bdf2b94fa69c39635cf630d4246009b2fb3ea1186eb58993df1f50a33e854fecf485f SHA512 29dd8b8cf88541f7a25866b926f4128afc8e8573edab7712b87fca30ea1ee2adb2c3545736c1c21f8f092f39849900cfd1d9363b925895992580ecfb8afd48e7
+EBUILD neomutt-20211029-r1.ebuild 4437 BLAKE2B 36a9217bfa9f8f38709460c0cdec4f2f6efc48d0f8ec1546c341113b2f9be12673de2f4dc39bc691266f7505a6a3077410b78bba69162f9f2e5a84a54b469f87 SHA512 6d5a9ad5d5e32d94aecb11462e4b34b3ef9c4dc7250ea6b860d7c467a8be743a843ef0f9dbf182b62ecc2f3054fc247f6fd029771835452eecb2e19d94405575
+EBUILD neomutt-20211029.ebuild 4320 BLAKE2B b1cb42df56d3622dcb365395ede53c038f4cee2816aa5e9fa8c7f2dcd6f3ec8a69e4e6f34e09c5b019de856265e03e6b73cac93cb5490f42663cd54a472862b5 SHA512 ea6a69c001059372ff0508538a352143d2874c3c2fbe855c8926da479d06fe7ab765d9e55828a3fe7ea2a5cfced2700e00ea6736f87086e644dd3cac45085b4c
+EBUILD neomutt-20220408.ebuild 4439 BLAKE2B a0e3de1f2af04fa23485d748c0b44de026c61403e7aaa231fdccb8af7973be9353140e7fa01c521d4efeacf6bea76c30aa893128f76e8c4370d165094364f5f6 SHA512 a88e822780c5cd00ebb53963f9a9bff1eaa8d47c8ac9ef12bf9cd945b3c91d0b97308addc1e37854e090cc4efa5bebcc0a4f66c0b1f32b3d551a2093ca4131cc
+EBUILD neomutt-20220415.ebuild 4439 BLAKE2B a0e3de1f2af04fa23485d748c0b44de026c61403e7aaa231fdccb8af7973be9353140e7fa01c521d4efeacf6bea76c30aa893128f76e8c4370d165094364f5f6 SHA512 a88e822780c5cd00ebb53963f9a9bff1eaa8d47c8ac9ef12bf9cd945b3c91d0b97308addc1e37854e090cc4efa5bebcc0a4f66c0b1f32b3d551a2093ca4131cc
+EBUILD neomutt-20220429.ebuild 4439 BLAKE2B a0e3de1f2af04fa23485d748c0b44de026c61403e7aaa231fdccb8af7973be9353140e7fa01c521d4efeacf6bea76c30aa893128f76e8c4370d165094364f5f6 SHA512 a88e822780c5cd00ebb53963f9a9bff1eaa8d47c8ac9ef12bf9cd945b3c91d0b97308addc1e37854e090cc4efa5bebcc0a4f66c0b1f32b3d551a2093ca4131cc
+EBUILD neomutt-99999999.ebuild 4439 BLAKE2B a0e3de1f2af04fa23485d748c0b44de026c61403e7aaa231fdccb8af7973be9353140e7fa01c521d4efeacf6bea76c30aa893128f76e8c4370d165094364f5f6 SHA512 a88e822780c5cd00ebb53963f9a9bff1eaa8d47c8ac9ef12bf9cd945b3c91d0b97308addc1e37854e090cc4efa5bebcc0a4f66c0b1f32b3d551a2093ca4131cc
 MISC metadata.xml 1566 BLAKE2B 79d3e2c7123d2ca85fef6660f181923555694a76ce484ce07ab236dc97107e3f6d59bd398823194ec9d00a044dd42b8924e45010cfd6a71f5ef715733b094953 SHA512 4548b2bcca9d03ae8ee772f0837c670840771673f0e3e545ed5dd3a6ceebe851025f916f16c461b6c05b822ea50d819688c1ac71d6e5a99375072e66a76db184
diff --git a/mail-client/neomutt/neomutt-20211029-r1.ebuild b/mail-client/neomutt/neomutt-20211029-r1.ebuild
index b8a28e2720eb..21f921b4b59e 100644
--- a/mail-client/neomutt/neomutt-20211029-r1.ebuild
+++ b/mail-client/neomutt/neomutt-20211029-r1.ebuild
@@ -125,7 +125,7 @@ src_configure() {
 }
 
 src_test() {
-	local test_dir="$(readlink --canonicalize ${S}/../neomutt-test-files-${TEST_FILES_COMMIT})"
+	local test_dir="$(readlink --canonicalize "${S}"/../neomutt-test-files-${TEST_FILES_COMMIT})"
 	pushd ${test_dir} || die "Could not cd into test_dir"
 	NEOMUTT_TEST_DIR="${test_dir}" ./setup.sh \
 		|| die "Failed to run the setup.sh script"
diff --git a/mail-client/neomutt/neomutt-20211029.ebuild b/mail-client/neomutt/neomutt-20211029.ebuild
index 6c5d607b8a48..57bee1ffc254 100644
--- a/mail-client/neomutt/neomutt-20211029.ebuild
+++ b/mail-client/neomutt/neomutt-20211029.ebuild
@@ -116,7 +116,7 @@ src_configure() {
 }
 
 src_test() {
-	local test_dir="$(readlink --canonicalize ${S}/../neomutt-test-files-${TEST_FILES_COMMIT})"
+	local test_dir="$(readlink --canonicalize "${S}"/../neomutt-test-files-${TEST_FILES_COMMIT})"
 	pushd ${test_dir} || die "Could not cd into test_dir"
 	NEOMUTT_TEST_DIR="${test_dir}" ./setup.sh \
 		|| die "Failed to run the setup.sh script"
diff --git a/mail-client/neomutt/neomutt-20220408.ebuild b/mail-client/neomutt/neomutt-20220408.ebuild
index b3f780bca0ac..f149b539eac9 100644
--- a/mail-client/neomutt/neomutt-20220408.ebuild
+++ b/mail-client/neomutt/neomutt-20220408.ebuild
@@ -125,7 +125,7 @@ src_configure() {
 }
 
 src_test() {
-	local test_dir="$(readlink --canonicalize ${S}/../neomutt-test-files-${TEST_FILES_COMMIT})"
+	local test_dir="$(readlink --canonicalize "${S}"/../neomutt-test-files-${TEST_FILES_COMMIT})"
 	pushd ${test_dir} || die "Could not cd into test_dir"
 	NEOMUTT_TEST_DIR="${test_dir}" ./setup.sh \
 		|| die "Failed to run the setup.sh script"
diff --git a/mail-client/neomutt/neomutt-20220415.ebuild b/mail-client/neomutt/neomutt-20220415.ebuild
index b3f780bca0ac..f149b539eac9 100644
--- a/mail-client/neomutt/neomutt-20220415.ebuild
+++ b/mail-client/neomutt/neomutt-20220415.ebuild
@@ -125,7 +125,7 @@ src_configure() {
 }
 
 src_test() {
-	local test_dir="$(readlink --canonicalize ${S}/../neomutt-test-files-${TEST_FILES_COMMIT})"
+	local test_dir="$(readlink --canonicalize "${S}"/../neomutt-test-files-${TEST_FILES_COMMIT})"
 	pushd ${test_dir} || die "Could not cd into test_dir"
 	NEOMUTT_TEST_DIR="${test_dir}" ./setup.sh \
 		|| die "Failed to run the setup.sh script"
diff --git a/mail-client/neomutt/neomutt-20220429.ebuild b/mail-client/neomutt/neomutt-20220429.ebuild
index b3f780bca0ac..f149b539eac9 100644
--- a/mail-client/neomutt/neomutt-20220429.ebuild
+++ b/mail-client/neomutt/neomutt-20220429.ebuild
@@ -125,7 +125,7 @@ src_configure() {
 }
 
 src_test() {
-	local test_dir="$(readlink --canonicalize ${S}/../neomutt-test-files-${TEST_FILES_COMMIT})"
+	local test_dir="$(readlink --canonicalize "${S}"/../neomutt-test-files-${TEST_FILES_COMMIT})"
 	pushd ${test_dir} || die "Could not cd into test_dir"
 	NEOMUTT_TEST_DIR="${test_dir}" ./setup.sh \
 		|| die "Failed to run the setup.sh script"
diff --git a/mail-client/neomutt/neomutt-99999999.ebuild b/mail-client/neomutt/neomutt-99999999.ebuild
index b3f780bca0ac..f149b539eac9 100644
--- a/mail-client/neomutt/neomutt-99999999.ebuild
+++ b/mail-client/neomutt/neomutt-99999999.ebuild
@@ -125,7 +125,7 @@ src_configure() {
 }
 
 src_test() {
-	local test_dir="$(readlink --canonicalize ${S}/../neomutt-test-files-${TEST_FILES_COMMIT})"
+	local test_dir="$(readlink --canonicalize "${S}"/../neomutt-test-files-${TEST_FILES_COMMIT})"
 	pushd ${test_dir} || die "Could not cd into test_dir"
 	NEOMUTT_TEST_DIR="${test_dir}" ./setup.sh \
 		|| die "Failed to run the setup.sh script"
diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest
index 703cd4cdf500..425851db6d6f 100644
--- a/mail-client/roundcube/Manifest
+++ b/mail-client/roundcube/Manifest
@@ -4,10 +4,12 @@ DIST roundcubemail-1.5.0-complete.tar.gz 7802014 BLAKE2B d81a521c264b47b55b7f868
 DIST roundcubemail-1.5.1-complete.tar.gz 7827081 BLAKE2B 1547ba369ef8e5f2b99ed72d562de3f76ff973d9617f4394bb89e281917264c9304aeb2b44cffd16952c2295111707215fe0426ce0f3f1d4a5c94df5f0811235 SHA512 bcea37859fbbee2f474cda024e5648b823a2da44ae69e5036a5b7e6add1d73dbfc1cd1cc32a3e01e59b0a3ba2ea03d1b028eec8e8f139fc4fb3eea8b52e28203
 DIST roundcubemail-1.5.2-complete.tar.gz 7852981 BLAKE2B 36920aa30301b96e1157a586508f3d460c26cfd692919b803bc8cecb31d99ebec5f93a62c725dd5d1dbd1ff68d59c97278b07eaabec42c5fb02c320c72fac8bf SHA512 96faa8c95c23b538ebfa91f58fb918b37185dbd1c09f2d128c9f8c800a0e3d6a2abbfa52753fb6a7ee47b633f35e2b31c92623107116dc760dfa9a22a4b2a23c
 DIST roundcubemail-1.6-beta-complete.tar.gz 5941128 BLAKE2B 2114a683cbf0c4ec6f5ba0b4d5eebb0a1f96121724861c1b1b5ce30f6b3a8fae02693878cae168af3d7f906a705814233aef024ddbc24d807ccd089f24b63fe1 SHA512 8a8bc9749203980d33ede7b221b96e0990b4afbe41db65fca74f0a49334adcae717306d4fe8fe1a5c938bf9fbcb5c4745d4d67bc5a587503aa3a2e9cb8f6384b
+DIST roundcubemail-1.6-rc-complete.tar.gz 5961003 BLAKE2B a21a42f69c223eb50b38f6d02ab69ebe3cf55cc2848fc49cc0e238eead5f19751801654c0b5fb6954022d9b24562c04ba085bf668591a5b7ff7b306d3a950d1c SHA512 f12f7858b19ce16613ed02a8b4cf7b4fe16753454b7c4cf4e92bbb2d11de4ba1e00b09ba70b387133613967654aadaaf09167ed16c54809885eb48adcf54de5f
 EBUILD roundcube-1.4.11.ebuild 2289 BLAKE2B 3e24731cb8fa44a45ff7c34aeaf0f2766849d1cec59e6c5ae26fb639443e9288889e435a976686328860fdd6bc64b98369d0ad585f879b57202cdbf6dbdd6d06 SHA512 858450c270914701ad910de943f35985c538a817cc325cef345ed6d582507fc365b3df11df2d1f800c107cebd3cd8ed0251e5d055dcb568f91423c5c62017bc6
 EBUILD roundcube-1.5.0.ebuild 2358 BLAKE2B e44b1329bb7d68f7d328c5b8a2b4adb394b81781e0245dd709d1a0827e813a44b59f4f934dbcf157fc236159ad735b6dfdcb2b894f7f6710d40f522476270924 SHA512 b207366b024710c60da353129ca2316009d256060164198a6a374d6cec9eeb733b89b81acf6f2256b0e996b716d3caa9ec9905e77569b758e25997662564b483
 EBUILD roundcube-1.5.1.ebuild 2358 BLAKE2B e44b1329bb7d68f7d328c5b8a2b4adb394b81781e0245dd709d1a0827e813a44b59f4f934dbcf157fc236159ad735b6dfdcb2b894f7f6710d40f522476270924 SHA512 b207366b024710c60da353129ca2316009d256060164198a6a374d6cec9eeb733b89b81acf6f2256b0e996b716d3caa9ec9905e77569b758e25997662564b483
 EBUILD roundcube-1.5.2.ebuild 2358 BLAKE2B e44b1329bb7d68f7d328c5b8a2b4adb394b81781e0245dd709d1a0827e813a44b59f4f934dbcf157fc236159ad735b6dfdcb2b894f7f6710d40f522476270924 SHA512 b207366b024710c60da353129ca2316009d256060164198a6a374d6cec9eeb733b89b81acf6f2256b0e996b716d3caa9ec9905e77569b758e25997662564b483
 EBUILD roundcube-1.6_beta.ebuild 2358 BLAKE2B 2ec8dcf67cbceffad488687cf6fd206e479aa317136843eae599b2dc489e4c91bdc9e8e6e1e8e2be15ed2187abb532da1fdb842c9b0529d87fe503ff206084c9 SHA512 6ef49096ec40fe9ae94731a19aa9d49d60f0868e14c9513e4a42599bd51cc15fe2cac895eae15740385a9271f1cd81bb68aa4460ddb0fac26ba38ba5b63703eb
+EBUILD roundcube-1.6_rc.ebuild 2358 BLAKE2B 2ec8dcf67cbceffad488687cf6fd206e479aa317136843eae599b2dc489e4c91bdc9e8e6e1e8e2be15ed2187abb532da1fdb842c9b0529d87fe503ff206084c9 SHA512 6ef49096ec40fe9ae94731a19aa9d49d60f0868e14c9513e4a42599bd51cc15fe2cac895eae15740385a9271f1cd81bb68aa4460ddb0fac26ba38ba5b63703eb
 EBUILD roundcube-9999.ebuild 2358 BLAKE2B 2ec8dcf67cbceffad488687cf6fd206e479aa317136843eae599b2dc489e4c91bdc9e8e6e1e8e2be15ed2187abb532da1fdb842c9b0529d87fe503ff206084c9 SHA512 6ef49096ec40fe9ae94731a19aa9d49d60f0868e14c9513e4a42599bd51cc15fe2cac895eae15740385a9271f1cd81bb68aa4460ddb0fac26ba38ba5b63703eb
 MISC metadata.xml 1118 BLAKE2B 2872ed8444c98f6c9f96642089c879225e14ee2b53ad2dc70b307a82b8a1e0988e19c24fc9da8f98c63bacd6cfb105941ee5a5bc8e4ee756e216e0dd6d970e84 SHA512 3bb6ac4d95aaa94e0a23f1382b79220de90a45f45e1c98dac00c91e4bf12d35646c95b633713896062c729777e0ec57a6ebcc5d4d1b416105dc63378b50afb47
diff --git a/mail-client/roundcube/roundcube-1.6_rc.ebuild b/mail-client/roundcube/roundcube-1.6_rc.ebuild
new file mode 100644
index 000000000000..44d89c9d3634
--- /dev/null
+++ b/mail-client/roundcube/roundcube-1.6_rc.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit webapp
+
+MY_PN=${PN}mail
+MY_PV=${PV/_/-}
+MY_P=${MY_PN}-${MY_PV}
+
+DESCRIPTION="A browser-based multilingual IMAP client with an application-like user interface"
+HOMEPAGE="https://roundcube.net"
+
+# roundcube is GPL-licensed, the rest of the licenses here are
+# for bundled PEAR components, googiespell and utf8.class.php
+LICENSE="GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain"
+
+IUSE="change-password enigma exif fileinfo ldap mysql postgres sqlite ssl spell zip"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+# this function only sets DEPEND so we need to include that in RDEPEND
+need_httpd_cgi
+
+RDEPEND="
+	${DEPEND}
+	>=dev-lang/php-7.3.0[exif?,fileinfo?,filter,gd,iconv,intl,json(+),ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml,zip?]
+	virtual/httpd-php
+	change-password? (
+		dev-lang/php[sockets]
+	)
+	enigma? (
+		app-crypt/gnupg
+	)
+	mysql? (
+		|| (
+			dev-lang/php[mysql]
+			dev-lang/php[mysqli]
+		)
+	)
+	spell? ( dev-lang/php[curl,spell] )
+"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/roundcube/roundcubemail"
+	EGIT_BRANCH="master"
+	BDEPEND="${BDEPEND}
+		app-arch/unzip
+		dev-php/composer
+		net-misc/curl"
+else
+	SRC_URI="https://github.com/${PN}/${MY_PN}/releases/download/${MY_PV}/${MY_P}-complete.tar.gz"
+	S="${WORKDIR}/${MY_P}"
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+src_unpack() {
+	if [[ "${PV}" == *9999* ]]; then
+		git-r3_src_unpack
+		pushd "${S}" > /dev/null || die
+		rm Makefile || die
+		mv composer.json-dist composer.json || die
+		composer install --no-dev || die
+		./bin/install-jsdeps.sh || die
+		popd > /dev/null || die
+	else
+		default
+	fi
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc CHANGELOG.md INSTALL README.md UPGRADING SECURITY.md
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r [[:lower:]]* SQL
+	doins .htaccess
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/logs
+	webapp_serverowned "${MY_HTDOCSDIR}"/temp
+
+	webapp_configfile "${MY_HTDOCSDIR}"/config/defaults.inc.php
+	webapp_postupgrade_txt en "${FILESDIR}/POST-UPGRADE_complete.txt"
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		elog "You can review the post-upgrade instructions at:"
+		elog "${EROOT}/usr/share/webapps/${PN}/${PV}/postupgrade-en.txt"
+	fi
+}
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 618954e9b44a..e14c74aa51e8 100644
Binary files a/media-fonts/Manifest.gz and b/media-fonts/Manifest.gz differ
diff --git a/media-fonts/monafont/Manifest b/media-fonts/monafont/Manifest
index 26b7f0e48111..cbcd39e32b58 100644
--- a/media-fonts/monafont/Manifest
+++ b/media-fonts/monafont/Manifest
@@ -1,4 +1,4 @@
 DIST monafont-2.90.tar.bz2 808897 BLAKE2B 844b056c9aed06799bed115fb0ef3280dd5182f97b0207c411b568951ea0fa727e1498a94dfa114d725011c226716fb488831cf2dacb0e320fdf70297ca7b639 SHA512 187cc4d7245c2a730a02d5a60d6db92f2bab5a3a36ba56a9e7a767391587e5cb136a9e0c0143308936d1d214e6ae2e0ffd2dc9374d931ba52c81aaab7740d6c1
 DIST monafont-ttf-2.90.zip 1712768 BLAKE2B 3847a71bd9ec17743dcf25fad3c49dcf597bcc59f20f5fba4704a05d182e69b0e0721d7768bf1d0c7b08ac019e2008640f4110487b47da34e963d5d4689952ed SHA512 0cb0ddf13f398f8504d387e590748c8bf44f01f672eb1f1bffac7c3e027f730ea0e7db41d10727beaf42d26e10e2e518c686669bcdc33a7113343863e49a0a55
-EBUILD monafont-2.90-r2.ebuild 1466 BLAKE2B 75cce550109b72ceba74004682c429213e2db24798bbd3f1a6958c3c8fd20e23d5598194e5448175fc7d258e4d4199f8167ff63477fdf5c8a521d9ca5aebf476 SHA512 dcd87c702a5f35c6c9bdd4df361744daa5f15c1d4b507f88ecec186101eca24fe459e4d839265254d5c38368f0308f431b20680d1f0fbff9accf88add8c3c76c
+EBUILD monafont-2.90-r2.ebuild 1468 BLAKE2B f850aa070b67d75fc8bf125622b7c4316312d7a0f319162709d9083009cd51b68ad8dea93899ac0cfcaca24f009ee4608f14d3e32ef19a8610e6be40f7811b2e SHA512 8071c459a72f3016cdb6130de97d5a324d9eb4283c4479b5eed17fb9781bd3bbd9b332918eb0f4d0719e6fb044bd1ee015dd01939a0bc567d364f2615ef594d1
 MISC metadata.xml 412 BLAKE2B 6baa9331236b096c3742fe257fd00e9e5b294348c20e7990a8d76e2bbf1aac8b9c9db0329929b8392908f0c41522eba29c4a4b1a62395f6b5420441a0504dcb0 SHA512 18cd89d9bf935890246339c4b3ccc96b8469870d9724acc5db6d588b52a1db4002508572c7cda9e828d8809ea5f1e49c4fd22f14b868efa875ca03a28edeb200
diff --git a/media-fonts/monafont/monafont-2.90-r2.ebuild b/media-fonts/monafont/monafont-2.90-r2.ebuild
index cd1f0edcde6a..413f643c582a 100644
--- a/media-fonts/monafont/monafont-2.90-r2.ebuild
+++ b/media-fonts/monafont/monafont-2.90-r2.ebuild
@@ -52,7 +52,7 @@ src_install() {
 	dodoc README.{ascii,euc}
 
 	if use truetype; then
-		local DOCS=( ${WORKDIR}/README-ttf.txt )
+		local DOCS=( "${WORKDIR}"/README-ttf.txt )
 		font_src_install
 	fi
 }
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 972380c205b3..2f05ef00f942 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest
index 66d5d75838c5..5c6421541444 100644
--- a/media-gfx/asymptote/Manifest
+++ b/media-gfx/asymptote/Manifest
@@ -1,12 +1,8 @@
 AUX 64asymptote-gentoo.el 337 BLAKE2B 56b028184573dd8db6babd90ae45838b9788671134d625df5960744b71b377db3cacf1dd4fc78d9800ffdf4e83a2413b7e87680ab0fcf45c31ecad9dc538388a SHA512 c8c74d5464f500e9bc3ca2fd89065e4f68a834c1b82a444820efd70abf9d2bd7c52ecbecd7ea5fad916259512acf4aedf8aed803a707733121211e59ef300c86
 AUX asymptote-2.70-info.patch 436 BLAKE2B 70eac7625341e21f9cf03cf1ea08e4864fe102627349f2411680b9c18f4df508f5cd6972f9e6dc719795f0323c51b6a5d096e9e3cae81cc1ee497f3f9325fafd SHA512 5b7494351bef5240bd4dba531a3eb68d3a6025990f32fe4064df31e351df9cfb27be29c69b16309929a63ec8d164eb4f2b14315406e546c7dba9dc416ae6b8d4
 AUX asymptote-2.70-xdg-utils.patch 791 BLAKE2B 971b2f1c6a4db7e39cc2d4bac0e3e6cc951733fb0718ace6e6807f63585fe8f4aa6f8519c6e03ed75f0176dca87e705d1b7175e0c1c7a1e79eb6c15dc4f2df76 SHA512 f78359aa71adfcea4ba31e3cae4c30aca47e39337b647f6fb2ad5264bd318a45071fcc47b1bbe5cc4c59c6b707b7b17461af62add2ee2477027d95d369f29994
-DIST asymptote-2.70.src.tgz 4674495 BLAKE2B 126b2e99222e6ae438aaef89df00b8eae19118c3ef42d2fab0b0117f343911939e680d22e903b784213186a5d2eeeecb112afba1467562e7127c34de4bc66773 SHA512 24d60af361e3f0309a896ce8163da6fc0a9d6587efe726c5acf874dcb74f4d51b4bad8146a615ff54173ef06dac53117fd1cc09c77940271adc9f64cac6bcfe6
-DIST asymptote-2.77.src.tgz 12519133 BLAKE2B afbd80b076348a12314a14511db4b369d8382b8da49b64b05e3d0c1c3f2546aa042a307b5f3eacbc3ecd7fd1b34d9aa34f83fd67c4d0bc240e44c49b058c9786 SHA512 1597543429a906927e20a2903c1a687ec19ef9467f6893760eed1896139379a964601ff057c8d3fd20b7bfbf0364827f53e768cc1d82498d078e3a69f88addec
 DIST asymptote-2.78.src.tgz 15274780 BLAKE2B 0c99aff54df79eabdf059cc0bb2cdd0832d7cc7ae83a2e3ab08116aa6bc75de44f7adfa096b7ed832fc96cd9db0bb41a490a8c5fd29716ad9a7852e52a98ad2b SHA512 dcc27ce608cb72b3979a87bd6e312774008a225b0936027c11bf1862e21dce5db6de9bf5db14c85ba1f7ed25ec77c3a57e2ecf58a73b46315daca11777910c24
 DIST asymptote-2.80.src.tgz 15054879 BLAKE2B bf1a569b1d752775630d6b775eed3119fba3327cd87af3963c13ec98269980a0d856cfedfe6271bea6a4e33ce58cbb0ae7aaafb0993351dbaa521d362ef41289 SHA512 cf79951c10fa327bf827c244ed9eed63c1229affe34786f5d397ec9f78df789c63f321ad548fa68fe9980c968262c16bcac4be5cef8898aaa9b89fde8a67d68d
-EBUILD asymptote-2.70-r1.ebuild 5403 BLAKE2B 0f0b33d281fb4c971ecd93b87ed42089892f070de136dc433b368eb9e0602844e09618b2290b112c16392668f5ae8724aa81bf0ab2115a38e79dda2e64098ea4 SHA512 9a6037b44a252dab2c24f0febd6089e87b4a023819485ba9506fd129d24c86b95a93fb82b007c8ce6f0ee4ca08194115ca6bce2295f8e86ae94ec1e98c10b13b
-EBUILD asymptote-2.77.ebuild 5511 BLAKE2B b5020deb432c51da20f3f2c29625619e89917476ba8faaed1be0ab7ce591e0b060e5ad99c96b75acd3168739966a5eaad2dda4023add7a95b611f084b8051c7c SHA512 a0e6bc5dcecb63f383e8b6264cbcf8083dde2938c90455a3b196a93bbe320fd7e50076c451d74c98f35e22dc11f4cdd01c923acaf1591959f7a93974b5d1881e
 EBUILD asymptote-2.78.ebuild 5509 BLAKE2B 6471ecce59f1337426c50c7a0663ec24a84a65649cd98ed123122d600121168ea5bb0a1bf81b4a5213b5e4ffdec9741b347501894a86c5f70f53785e41aa6f63 SHA512 cc03d9be579252e87cca572eb73bab92be059d9ae76da2316bd419423abee353aaf3c4e1aa1b8e8c06e892b72b3e522cad2e672ae5b4c2c1a0f44b328fd9bad9
 EBUILD asymptote-2.80.ebuild 5511 BLAKE2B 5b9663e6375dd0bb195e85f34829a9b314e18bab509f26b4ee7e872bddb13f79ae09421f665b90e07ff25fa76f0ff2f7a11faf7ffd7154c8015b33365c136ec8 SHA512 d82a688f5d095e6414bc6957d5c8ecff283ccdd0c4b256fa37c520711c0b47870f333dffa423b5511fe86a557c76faddc8634c2c31f6f96eef5200aa27c339f2
 MISC metadata.xml 1423 BLAKE2B 64dd5d6c928a11d4a47297362223164cb19d91f6a08a0582b66831e2e8e2d7594389c2244fa1527dfe945da0e67985f5c639e3dae2482f57b510bf828a4605ed SHA512 1561e416e56bca130a72f90886981f63224c21e2a077a7b93e6fdd877f38dd12dfa9e0b747840e7f459e2df16c5b08e0177d26c526eb21bebe00fa8c91326bc9
diff --git a/media-gfx/asymptote/asymptote-2.70-r1.ebuild b/media-gfx/asymptote/asymptote-2.70-r1.ebuild
deleted file mode 100644
index f4fbcf92ed4e..000000000000
--- a/media-gfx/asymptote/asymptote-2.70-r1.ebuild
+++ /dev/null
@@ -1,236 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit autotools elisp-common latex-package python-r1
-
-DESCRIPTION="A vector graphics language that provides a framework for technical drawing"
-HOMEPAGE="https://asymptote.sourceforge.io/"
-SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="+boehm-gc context curl doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax X"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	offscreen? ( opengl )
-	doc? ( boehm-gc )"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.4-r5:0=
-	>=sys-libs/readline-4.3-r5:0=
-	net-libs/libtirpc:=
-	imagemagick? ( media-gfx/imagemagick[png] )
-	opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm )
-	offscreen? ( media-libs/mesa[osmesa] )
-	svg? ( app-text/dvisvgm )
-	sigsegv? ( dev-libs/libsigsegv )
-	boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] )
-	fftw? ( >=sci-libs/fftw-3.0.1:= )
-	gsl? ( sci-libs/gsl:= )
-	python? ( ${PYTHON_DEPS} )
-	curl? ( net-misc/curl )
-	X? (
-		${PYTHON_DEPS}
-		dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets,svg]
-		dev-python/numpy
-		dev-python/pycson
-		>=gnome-base/librsvg-2.40
-	)
-	latex? (
-		virtual/latex-base
-		>=dev-texlive/texlive-latexextra-2013
-	)
-	context? ( dev-texlive/texlive-context )
-	emacs? ( >=app-editors/emacs-23.1:* )
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	doc? (
-		media-gfx/imagemagick[png]
-		virtual/texi2dvi
-		virtual/latex-base
-		app-text/ghostscript-gpl )
-	test? ( app-text/ghostscript-gpl )"
-
-TEXMF=/usr/share/texmf-site
-
-PATCHES=(
-	# Changing pdf, ps, image viewers to xdg-open
-	"${FILESDIR}/${P}-xdg-utils.patch"
-
-	# Bug #322473
-	"${FILESDIR}/${P}-info.patch"
-)
-
-src_prepare() {
-	sed -e "s:Datadir/doc/asymptote:Datadir/doc/${PF}:" \
-		-i configure.ac \
-		|| die "sed configure.ac failed"
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# for the CPPFLAGS see
-	# https://sourceforge.net/forum/forum.php?thread_id=1683277&forum_id=409349
-	econf \
-		CPPFLAGS=-DHAVE_SYS_TYPES_H \
-		CFLAGS="${CXXFLAGS}" \
-		--disable-gc-debug \
-		--disable-gc-full-debug \
-		--with-latex=/usr/share/texmf-site/tex/latex \
-		--with-context=/usr/share/texmf-site/tex/context \
-		$(use_enable boehm-gc gc system) \
-		$(use_enable curl) \
-		$(use_enable fftw) \
-		$(use_enable gsl) \
-		$(use_enable opengl gl) \
-		$(use_enable offscreen) \
-		$(use_enable sigsegv)
-}
-
-src_compile() {
-	default
-
-	cd doc || die
-	emake asy.1
-	einfo "Making info"
-	cd png || die
-	emake ${PN}.info
-	cd .. || die
-	if use doc; then
-		cd FAQ || die
-		emake
-		cd .. || die
-		# pdf
-		einfo "Making pdf docs"
-		export VARTEXFONTS="${T}"/fonts
-		# see bug #260606
-		emake -j1 asymptote.pdf
-		emake CAD.pdf asy-latex.pdf asyRefCard.pdf
-	fi
-	cd .. || die
-
-	if use emacs; then
-		einfo "Compiling emacs lisp files"
-		elisp-compile base/*.el
-	fi
-}
-
-src_install() {
-	# the program
-	dobin asy
-
-	# .asy files
-	insinto /usr/share/${PN}
-	doins -r base/*.asy base/*.js base/*.sh base/*.ps base/shaders base/webgl
-	chmod 755 "${D}"/usr/share/${PN}/shaders/*
-
-	# documentation
-	dodoc README ReleaseNotes ChangeLog
-	cd doc || die
-	doman asy.1
-	doinfo png/${PN}.info
-	if use doc; then
-		dodoc FAQ/asy-faq.ascii
-		dodoc CAD.pdf asy-latex.pdf asyRefCard.pdf asymptote.pdf
-	fi
-	cd .. || die
-
-	# asymptote.py
-	if use python; then
-		python_moduleinto ${PN}
-		python_foreach_impl python_domodule aspy.py
-		python_foreach_impl python_domodule base/${PN}.py
-	fi
-
-	# X GUI
-	if use X; then
-		cd GUI || die
-		python_setup
-		sed -e 1d -i xasy.py
-		echo "#!/usr/bin/env ${EPYTHON}" > xasy1
-		cat xasy1 xasy.py > xasy
-		rm xasy1 xasy.py
-		mv xasy xasy.py
-		cd .. || die
-		python_domodule GUI
-		chmod 755 "${D}/$(python_get_sitedir)/${PN}/GUI/xasy.py"
-		dosym "$(python_get_sitedir)/${PN}/GUI/xasy.py" /usr/bin/xasy
-		doman doc/xasy.1x
-	fi
-
-	# examples
-	if use examples; then
-		docinto examples
-		dodoc \
-			examples/*.asy \
-			examples/*.views \
-			examples/*.dat \
-			examples/*.bib \
-			examples/*.png \
-			examples/*.pdb1 \
-			doc/*.asy \
-			doc/*.csv \
-			doc/*.dat \
-			doc/pixel.pdf \
-			doc/extra/*.asy
-		docinto examples/animations
-		dodoc examples/animations/*.asy
-	fi
-
-	# LaTeX style
-	if use latex; then
-		cd doc || die
-		insinto "${TEXMF}"/tex/latex/${PN}
-		doins *.sty latexmkrc
-		if use examples; then
-			docinto examples
-			dodoc latexusage.tex externalprc.tex
-			docinto examples/animations
-			dodoc ../examples/animations/*.tex
-		fi
-		cd .. || die
-	fi
-
-	# ConTeXt
-	if use context; then
-		insinto /usr/share/texmf-site/tex/context
-		doins doc/colo-asy.tex
-	fi
-
-	# emacs mode
-	if use emacs; then
-		elisp-install ${PN} base/*.el base/*.elc asy-keywords.el
-		elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el
-	fi
-
-	# vim syntax
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins base/asy.vim
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins base/asy_filetype.vim
-	fi
-}
-
-pkg_postinst() {
-	use latex && latex-package_rehash
-	use emacs && elisp-site-regen
-
-	elog 'Use the variable ASYMPTOTE_PSVIEWER to set the postscript viewer'
-	elog 'Use the variable ASYMPTOTE_PDFVIEWER to set the PDF viewer'
-}
-
-pkg_postrm() {
-	use latex && latex-package_rehash
-	use emacs && elisp-site-regen
-}
diff --git a/media-gfx/asymptote/asymptote-2.77.ebuild b/media-gfx/asymptote/asymptote-2.77.ebuild
deleted file mode 100644
index f36cb494507d..000000000000
--- a/media-gfx/asymptote/asymptote-2.77.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit autotools elisp-common latex-package python-r1
-
-DESCRIPTION="A vector graphics language that provides a framework for technical drawing"
-HOMEPAGE="https://asymptote.sourceforge.io/"
-SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="+boehm-gc context curl doc emacs examples fftw gsl +imagemagick latex lsp offscreen +opengl python sigsegv svg test vim-syntax X"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	offscreen? ( opengl )
-	doc? ( boehm-gc )"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.4-r5:0=
-	>=sys-libs/readline-4.3-r5:0=
-	net-libs/libtirpc:=
-	imagemagick? ( media-gfx/imagemagick[png] )
-	opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm )
-	offscreen? ( media-libs/mesa[osmesa] )
-	svg? ( app-text/dvisvgm )
-	sigsegv? ( dev-libs/libsigsegv )
-	boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] )
-	fftw? ( >=sci-libs/fftw-3.0.1:= )
-	gsl? ( sci-libs/gsl:= )
-	python? ( ${PYTHON_DEPS} )
-	curl? ( net-misc/curl )
-	lsp? (
-		dev-libs/boost
-		dev-libs/rapidjson
-		dev-libs/utfcpp
-	)
-	X? (
-		${PYTHON_DEPS}
-		dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets,svg]
-		dev-python/numpy
-		dev-python/pycson
-		>=gnome-base/librsvg-2.40
-	)
-	latex? (
-		virtual/latex-base
-		>=dev-texlive/texlive-latexextra-2013
-	)
-	context? ( dev-texlive/texlive-context )
-	emacs? ( >=app-editors/emacs-23.1:* )
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	doc? (
-		media-gfx/imagemagick[png]
-		virtual/texi2dvi
-		virtual/latex-base
-		app-text/ghostscript-gpl )
-	test? ( app-text/ghostscript-gpl )"
-
-TEXMF=/usr/share/texmf-site
-
-PATCHES=(
-	# Changing pdf, ps, image viewers to xdg-open
-	"${FILESDIR}/${PN}-2.70-xdg-utils.patch"
-
-	# Bug #322473
-	"${FILESDIR}/${PN}-2.70-info.patch"
-)
-
-src_prepare() {
-	sed -e "s:Datadir/doc/asymptote:Datadir/doc/${PF}:" \
-		-i configure.ac \
-		|| die "sed configure.ac failed"
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# for the CPPFLAGS see
-	# https://sourceforge.net/forum/forum.php?thread_id=1683277&forum_id=409349
-	econf \
-		CPPFLAGS=-DHAVE_SYS_TYPES_H \
-		CFLAGS="${CXXFLAGS}" \
-		--disable-gc-debug \
-		--disable-gc-full-debug \
-		--with-latex=/usr/share/texmf-site/tex/latex \
-		--with-context=/usr/share/texmf-site/tex/context \
-		$(use_enable boehm-gc gc system) \
-		$(use_enable curl) \
-		$(use_enable lsp) \
-		$(use_enable fftw) \
-		$(use_enable gsl) \
-		$(use_enable opengl gl) \
-		$(use_enable offscreen) \
-		$(use_enable sigsegv)
-}
-
-src_compile() {
-	default
-
-	cd doc || die
-	emake asy.1
-	einfo "Making info"
-	cd png || die
-	emake ${PN}.info
-	cd .. || die
-	if use doc; then
-		cd FAQ || die
-		emake
-		cd .. || die
-		# pdf
-		einfo "Making pdf docs"
-		export VARTEXFONTS="${T}"/fonts
-		# see bug #260606
-		emake -j1 asymptote.pdf
-		emake CAD.pdf asy-latex.pdf asyRefCard.pdf
-	fi
-	cd .. || die
-
-	if use emacs; then
-		einfo "Compiling emacs lisp files"
-		elisp-compile base/*.el
-	fi
-}
-
-src_install() {
-	# the program
-	dobin asy
-
-	# .asy files
-	insinto /usr/share/${PN}
-	doins -r base/*.asy base/*.js base/*.sh base/*.ps base/shaders base/webgl
-	chmod 755 "${D}"/usr/share/${PN}/shaders/*
-
-	# documentation
-	dodoc README ReleaseNotes ChangeLog
-	cd doc || die
-	doman asy.1
-	doinfo png/${PN}.info
-	if use doc; then
-		dodoc FAQ/asy-faq.ascii
-		dodoc CAD.pdf asy-latex.pdf asyRefCard.pdf asymptote.pdf
-	fi
-	cd .. || die
-
-	# asymptote.py
-	if use python; then
-		python_moduleinto ${PN}
-		python_foreach_impl python_domodule aspy.py
-		python_foreach_impl python_domodule base/${PN}.py
-	fi
-
-	# X GUI
-	if use X; then
-		cd GUI || die
-		python_setup
-		sed -e 1d -i xasy.py
-		echo "#!/usr/bin/env ${EPYTHON}" > xasy1
-		cat xasy1 xasy.py > xasy
-		rm xasy1 xasy.py
-		mv xasy xasy.py
-		cd .. || die
-		python_domodule GUI
-		chmod 755 "${D}/$(python_get_sitedir)/${PN}/GUI/xasy.py"
-		dosym "$(python_get_sitedir)/${PN}/GUI/xasy.py" /usr/bin/xasy
-		doman doc/xasy.1x
-	fi
-
-	# examples
-	if use examples; then
-		docinto examples
-		dodoc \
-			examples/*.asy \
-			examples/*.views \
-			examples/*.dat \
-			examples/*.bib \
-			examples/*.png \
-			examples/*.pdb1 \
-			doc/*.asy \
-			doc/*.csv \
-			doc/*.dat \
-			doc/pixel.pdf \
-			doc/extra/*.asy
-		docinto examples/animations
-		dodoc examples/animations/*.asy
-	fi
-
-	# LaTeX style
-	if use latex; then
-		cd doc || die
-		insinto "${TEXMF}"/tex/latex/${PN}
-		doins *.sty latexmkrc
-		if use examples; then
-			docinto examples
-			dodoc latexusage.tex externalprc.tex
-			docinto examples/animations
-			dodoc ../examples/animations/*.tex
-		fi
-		cd .. || die
-	fi
-
-	# ConTeXt
-	if use context; then
-		insinto /usr/share/texmf-site/tex/context
-		doins doc/colo-asy.tex
-	fi
-
-	# emacs mode
-	if use emacs; then
-		elisp-install ${PN} base/*.el base/*.elc asy-keywords.el
-		elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el
-	fi
-
-	# vim syntax
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins base/asy.vim
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins base/asy_filetype.vim
-	fi
-}
-
-pkg_postinst() {
-	use latex && latex-package_rehash
-	use emacs && elisp-site-regen
-
-	elog 'Use the variable ASYMPTOTE_PSVIEWER to set the postscript viewer'
-	elog 'Use the variable ASYMPTOTE_PDFVIEWER to set the PDF viewer'
-}
-
-pkg_postrm() {
-	use latex && latex-package_rehash
-	use emacs && elisp-site-regen
-}
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 3c0953a05e6e..3dc96d964d40 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -14,16 +14,19 @@ DIST blender-3.1.0-tests.tar.bz2 643279044 BLAKE2B acbf0800c384f881c215ea22140b0
 DIST blender-3.1.0.tar.xz 41017620 BLAKE2B f626266a41f9d72b03690fe8d7fe1f183ffdef01501ff6a458e5760eea66c959ca297d70dc541b27aa85466a7b8d65306e293c84487c1ff1467cd31cfdba0203 SHA512 354d4e7c92233e610d0e938c10d966aff7ee34fd21993b65b645b4d01e37f90f741206190817a7ab6932c5321d698827a09ec0e1d966c28596d130b4af2ce6bb
 DIST blender-3.1.1.tar.xz 41029004 BLAKE2B ca133349bfae52b36123da489ef7e50b30666b91d7961e9938932f5375a4d1129f3b15de59170ccf55723a08cbd0089bb7d73792c15221d91f2f83c40a2ebdb4 SHA512 88c339540a7b621b1771e1f17ecf7d4c21d86e05b83e395e15cd90b1347a50dda74ebaedd5ca178cabe6981b45244a64110ab855efdf74fe42f5bf45ffe811b1
 DIST blender-3.1.2.tar.xz 41014760 BLAKE2B 1e1476b7185005616fe3a647d5beea2c6cf975a418471d4632dc6f0367aea9505d0abfed79b063e81b090fe8f8e92d60840767e476534a5629def77a71495604 SHA512 e92aefbc020268e7347008e02d7fe2ef8670a568fab0ae2072ee82520ca67645e665e81ec2829b67a4de069ce1c0578bf2f7f4f783929e7574a8c9aef2f82a02
-EBUILD blender-2.93.0-r1.ebuild 11832 BLAKE2B 0054acfc65f0fd17f9a7eb190f4c65941ea72f73f9ee24b57ab98cd99a5842c1ad5694a11083d6b6ce3dc70c669f9ddddad05e609c774d39a2b186ef2b8818a9 SHA512 456c40233086a52b7c557bd187ab7821df0f2986c0edd21ca8e4b882c1744b21a08aad0ad0ff6e02162fefad66c259e280a0399e49cecb0b8a6bebff2542e3fb
-EBUILD blender-2.93.6.ebuild 12144 BLAKE2B aeea405155758ce88a20fb355719907aa70db1ea76bf93c69150e6cba7d392cdcfd68187f49589697b39b08ee9b6f29246b54618b3f7d26b89eedcbd7b7172eb SHA512 c4dd1d809777873d16dcda92ac3df7bf75a9ba915d2922abf371b5e62046870bba0bee4ddd90a9f9739c87794bf02fdfcbafb0cb6324bfc26e5f8981e81d3219
-EBUILD blender-2.93.8-r4.ebuild 12628 BLAKE2B 76dfd4e51521cf9f1736967742909813364bdccd6722fa1f74296cf6fe48e9dd3248dfe34a304d11b3d6353c4dfcc70b33e62853153984531a89d44e3af0fae6 SHA512 0c975b286150e3c70c7872d021b979a0ccd93d6264d581a39fb0067fd8a309310370bd49f16eb418276e169be02e3157883b05c55a0ffec4dbc2ada606cbe713
-EBUILD blender-2.93.8-r5.ebuild 12769 BLAKE2B fb57feb959ccff16de6ca9cc582e7e1edbab02c365de48316eac49e4e059db4ac51785337d7555ecfa41fed30539b28b88a1edc8cef02d43e9aea8b333d55d9d SHA512 264fb3ecd41cc93ee057cc995e9891ea0010b4332af041fb6b256ca7759f74f6d24e03e15143ad0b65b8d681e883325542df41e8a596e95cf7d9c7780a9f3696
-EBUILD blender-2.93.9.ebuild 12580 BLAKE2B 708eb3aa5e590e8758c71116d80d5e13c64f3413b61096fc2c192c05cb29e111ae680fe3bf9acffbc9a9022eb9759c1a07da259a3f43f3c2038eeb54144be31f SHA512 1d522f4ea8113a01d8e3778b93dc4a3fabc47ccf749a794c1a6612af32a2b9b64e7b6010fe3d91aaf5b1d5bab4134409675616d1ad17bbeac8d9a3e30f3a8e40
-EBUILD blender-3.0.0-r1.ebuild 12858 BLAKE2B 07e9471b1c144a085af7a75f7926a4e5532df9ba03a04afdf9ea23fb3413e543f319ddfe000fb667203d70bf47818a7feb54cb357e0a45c65ecb91978825e3d6 SHA512 36bb0b89eb50d99c172d32aab23f189bb593873150eac6172f3576a94697eef85e519e455ae5784395fe96ebd9dd468ac995793539d050392be6e7f858d08aa4
-EBUILD blender-3.0.1-r4.ebuild 13050 BLAKE2B 7a3233d91abe7ec48a4bd8508fd58d32c2ae447a40ac31125a3dcc69a97cf9b0792e97e5d5e0173388c64de0fbe58ffb4455f513bb44b2ecc0e4d27288c24b97 SHA512 645be8c2520e6eaa8b9dafa4bdfd866c08a8ae1f07317c172b22ab7f7f7b6feedaa5491b71e0c89d9bbe175dd75419acd654f3fd3770a07472e65a3d36e0944a
-EBUILD blender-3.0.1-r5.ebuild 13002 BLAKE2B 691442fbcdb0b827aa2a1f4d480f4da22e81706e8f0f19a24ede993dbd8c2fbe1a9cf99e0c8224c27e90efde93c1897d21a5b6a270f73d99c814ca1bb591b876 SHA512 8e7f7b2de53d19967afbac82bc57bd68a1dd3e91fb905ead4b3914d34d3c5db6918aa98dea6a6bfd07649d13a502c0591e6767f6f62c64306f22302f165a12e5
-EBUILD blender-3.1.0.ebuild 12862 BLAKE2B 6f70bcd89149fddd1918d9f17c1246e618bb62115d3e4aa437031ea3060f8e5ce5103b28f9e18e96d8268144e6b37719d0f8aece47c7152c6d30841ad513c33e SHA512 0eb804e9361b489c1c63d1d973fbc8921729d77a2fae1bc88b1d71cda7760929dda85a3476a852a7ec4e9b7395a106a89977553134a2f0100f59ff67f768bcab
-EBUILD blender-3.1.1.ebuild 12862 BLAKE2B 6f70bcd89149fddd1918d9f17c1246e618bb62115d3e4aa437031ea3060f8e5ce5103b28f9e18e96d8268144e6b37719d0f8aece47c7152c6d30841ad513c33e SHA512 0eb804e9361b489c1c63d1d973fbc8921729d77a2fae1bc88b1d71cda7760929dda85a3476a852a7ec4e9b7395a106a89977553134a2f0100f59ff67f768bcab
-EBUILD blender-3.1.2.ebuild 12673 BLAKE2B b4d02cd9b3e26d094e72cfe005de73f99b52df0ebcb30e9851927b436fc4f8349629bf1aaf0af8f00d89861486a74210e0ed3b014886f994f6726d2089b5ed1e SHA512 5628672a144e96c01d536fa72f8c605d001852f3c454357eaa2f0cf38585e63f436a42bcec0478628e9825fd6fb5047df0b4d1e1317247eeffe08c1dba90f9be
-EBUILD blender-9999.ebuild 12664 BLAKE2B c24a5d3b9922692907524ad4b2619cba11fcbd3aae13181093e14c8716c8e40cf30b8921acd0bbe905dbd2da90d09cf19e659e9c20ed2f9f793deb6718f1a8ff SHA512 a274ce9e2b558aabd57303c82ca0d8d2b7c88a249cdaf49446825a49bbc3ab76845a6e6455e1da205c296813909f472f64c2721a4803d009cb28a7d78353b72d
+DIST blender-3.2.0-tests.tar.xz 213772908 BLAKE2B 7a4713a3c1bb9f6bfe80b154b913a525b620bb389c2e6b4cf2d1d9bfc74d0c3703b439d77186d18b43766d1db219eb64d22ac84a08fdc859dac074025afdd49f SHA512 4d6e9ed3b646e77737f625ca1beae9b531a528c32d81c9d06749aa8f87126ef4a2a0893d0ecf2a2cce7b7dbe508dbc9568e353b7213842cfa85ea27ebcc0a2d8
+DIST blender-3.2.0.tar.xz 41520000 BLAKE2B ff68c18bfef1ca6a989e46c8c9d3afa1cc13d6d70dfb6311d9d0742829af0a525531077f48c6a390667e266963e1e8671e370c475a9a8a21bc936d4feb04d248 SHA512 2e9c502fad6bbad7618caad393dfd21d2adc6df0a2de8581cea904cfe3588d783564f2d7ec5600d99d10307a81eb6bb56b31209bf34aae072fbc9a0d8ce54f81
+EBUILD blender-2.93.0-r1.ebuild 11834 BLAKE2B f1d2b3ee78aa8daa078de572c7a975f94619bec082eb8bcbb3984c52951b54acfa1eea83ebf2017d815e725051d890e6426a41c368119fc8836e03dec2c38d49 SHA512 1b0d635ab81111570233c9eb5d96cb1828e589eb180ef6f43d898321549c3b79fcd7b5f41c3feccc35093da28b668f42d95a72176137f3c470762aaae2afeb90
+EBUILD blender-2.93.6.ebuild 12146 BLAKE2B 83170c87ff080c46c424002dc1b3938f20abad7e3ed87846ef4356ca35f0baf471236693cce0e15542af10cc14dd6cbf8a642d855c7f22c9e5a7991686e3b635 SHA512 00138a3cfe8498823001363b1ccbefb2964d4c1c48e50154d84bd332f7f2f65628641c8abb05fac8c0fb1f7d6ff316296a2412091912db24dd6007b1b30bc701
+EBUILD blender-2.93.8-r4.ebuild 12630 BLAKE2B 70e89d90a2d6da1860a3777fb822e75d788de9cff5307592b312927f5822ce6e172359050bd01c9987a50e58c4b37365f8acbf7fab594f1962bb8d4d004312ad SHA512 c22dc7213b0406d99e3a61e7aa6e2af83c8c6514167f5488bb95a34faf701daf776853e8ff77637e101152780e97b5b62f34c6cf0ee55f0d15973c37a023de76
+EBUILD blender-2.93.8-r5.ebuild 12771 BLAKE2B d2536a1698543cf03e056c826bb599221e3c6514b1d95fc01c9ef9abbda4fcca23cc48a6add64c6304dda748b0fb870a701a65952a1db82606abacc7ebca3c29 SHA512 d0b39970ffad4a39a70e4fa53f85a540bda09b6f73ffdd72c8c57443e7500bb716c675da322f4c1d3253024333353cd1134ab0de3803287fab7f25d8c817d7c4
+EBUILD blender-2.93.9.ebuild 12582 BLAKE2B b51cec0e76435bf0ba2ae5f4b7a1833ca186b43edd0200f25eeceb55eeb8a4ccd7936a02ba0332da2cbdf2c3368723630221ecd40fb2e94e2074b45c9bc3ead6 SHA512 402d4770d041dba7ff7de64c8d06cfcc2308525ab7ca5bd0e361d51911af82a1e43d25171b2c69f101600628dbb41343d4585adf3dae0d847ee4384dd15f11ef
+EBUILD blender-3.0.0-r1.ebuild 12860 BLAKE2B b9d0ecd6cabc483a02c9242cdf9f5ec9f86bc2f5418f53debfd6d81104b96e39b389ca8ed1ae84ffc0b44f0e9937c17bf6b549cfccd8f159a3af5728a7a6921b SHA512 8b62aed3c74d2ee3e10ac0390f449618d53e4c180f7647bd06fed13f6104fb93e09ac218b486a94af726e21fa97c5881042b4795e7818d78b424484238188dbc
+EBUILD blender-3.0.1-r4.ebuild 13052 BLAKE2B 625a61bcd33542e14437591fff56367fab4613fb63823685d452cfcb731ebe7558a9c72bad33e9e596eb6517539cb505b2543ddb8d7adeea6c4b4f1c481cfb4b SHA512 fa4a4057cce39c93059cfae47e9c4ff1a412674d172a0e3f8b82abb6eccdacfeb602948445455ccef51c8fa954acf92f16637d69e0bc06646f327992cae86398
+EBUILD blender-3.0.1-r5.ebuild 13004 BLAKE2B e195d2b71bbd71b84e57b12933be8319c29476a79e16cbab471cf34bf6ce662b465f9e0b5a2bb856df4ca33215b7019a23fd24b63ef8115247ddfc8408289b11 SHA512 df1789f8b89073cac08b3d9ced2abbf451dead5cf0dcf494a3d0bd59f7ade2c873e7b8092a2d3c8a7f7c51a5a65d75238355d0e0db6957319a9854ab5e45f6d4
+EBUILD blender-3.1.0.ebuild 12864 BLAKE2B a340ed8cf5564190c2083bdf733080d70130c85272961841296976e97333e5ff844cfb884934581abd1fe236dcc8bbd7e3ba738a45268e7f334507939ddf9f52 SHA512 b63615e9e0bac566dc6bac56b74c45552de3746748ca5e89b5a3900043b10249bcb60d403ea03c85784a477400f8d3bc6b4a15fc905f4c3de6fc4d16efb69665
+EBUILD blender-3.1.1.ebuild 12864 BLAKE2B a340ed8cf5564190c2083bdf733080d70130c85272961841296976e97333e5ff844cfb884934581abd1fe236dcc8bbd7e3ba738a45268e7f334507939ddf9f52 SHA512 b63615e9e0bac566dc6bac56b74c45552de3746748ca5e89b5a3900043b10249bcb60d403ea03c85784a477400f8d3bc6b4a15fc905f4c3de6fc4d16efb69665
+EBUILD blender-3.1.2.ebuild 12675 BLAKE2B 66f32f101bb4776aaa3bbe3655ba95c9bb3756202c145222ed00e769ed0ec2b2079b3d0d08ec61b9d3d40cad87313263ed95c8ade3ab7f9b7dd1534c796bb261 SHA512 1a99e8b98e443e24e346bb2ca052386f9b1274be139821fb90c3a9385e9f7d48f0138186fbab7b249e01fbd3a1a7101c317b78472885588c5382cc4e3ee5109c
+EBUILD blender-3.2.0.ebuild 12672 BLAKE2B d5920d6a57f92f375ce876f8f08dbb28414780495d81fc6f7a316cd4d21af0dc698482c01274d1d25b3ab792994233f0f4c08784324c32349db72ac1c08479c4 SHA512 267a2c5b5dd147a23366671086f0ea915f1051e1336ab67b891257068404e316b4463fcd7c3e3a7c0c983510ab0b876c2696b7f92bb5f358c31a702ac665ce4c
+EBUILD blender-9999.ebuild 12674 BLAKE2B a127ee0c38aa45df907330631f502c4547ec5acb1d1510aba15251f855539ab4a7508360addface1af45f9c31c2e03dd6c18a7a29dfafa111400e77daaf211e2 SHA512 9eb67fd27ae89be064e30c3f9d0e32ff683c1ee10e2fc0c753fd1d2ba753aef7a188131153d860121b754f37829ccfea9964847358a99829737893b5de6b4b46
 MISC metadata.xml 3288 BLAKE2B e1e1647de2fab3364578645599041b212214c726f4aeda5bee0423e09ef7895f627ea2cfb1118f474b148ba986a2d1b37186c25e5d069f3dbd000a1c3dc9b89f SHA512 9e64d1f6c1dff94a1cc20c97e26d4d43c694e9331e80334d85ddfbb6a76a8d39d1007d802dbce0f46f82f4d4fc3de871af3af8cfb7fd69a5aca31d4fd59bed44
diff --git a/media-gfx/blender/blender-2.93.0-r1.ebuild b/media-gfx/blender/blender-2.93.0-r1.ebuild
index 5759d72da06c..a2c3cd347215 100644
--- a/media-gfx/blender/blender-2.93.0-r1.ebuild
+++ b/media-gfx/blender/blender-2.93.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -306,7 +306,7 @@ src_test() {
 	cmake_src_test
 
 	# Clean up the image directory for src_install
-	rm -fr ${ED}/* || die
+	rm -fr "${ED}"/* || die
 }
 
 src_install() {
diff --git a/media-gfx/blender/blender-2.93.6.ebuild b/media-gfx/blender/blender-2.93.6.ebuild
index 712f73eaf47a..8012e6736954 100644
--- a/media-gfx/blender/blender-2.93.6.ebuild
+++ b/media-gfx/blender/blender-2.93.6.ebuild
@@ -280,7 +280,7 @@ src_test() {
 	cmake_src_test
 
 	# Clean up the image directory for src_install
-	rm -fr ${ED}/* || die
+	rm -fr "${ED}"/* || die
 }
 
 src_install() {
diff --git a/media-gfx/blender/blender-2.93.8-r4.ebuild b/media-gfx/blender/blender-2.93.8-r4.ebuild
index 3e09ff2028a8..5a028d74bdda 100644
--- a/media-gfx/blender/blender-2.93.8-r4.ebuild
+++ b/media-gfx/blender/blender-2.93.8-r4.ebuild
@@ -296,7 +296,7 @@ src_test() {
 	cmake_src_test
 
 	# Clean up the image directory for src_install
-	rm -fr ${ED}/* || die
+	rm -fr "${ED}"/* || die
 }
 
 src_install() {
diff --git a/media-gfx/blender/blender-2.93.8-r5.ebuild b/media-gfx/blender/blender-2.93.8-r5.ebuild
index 7112d2413a97..94dd0db42cc6 100644
--- a/media-gfx/blender/blender-2.93.8-r5.ebuild
+++ b/media-gfx/blender/blender-2.93.8-r5.ebuild
@@ -299,7 +299,7 @@ src_test() {
 	cmake_src_test
 
 	# Clean up the image directory for src_install
-	rm -fr ${ED}/* || die
+	rm -fr "${ED}"/* || die
 }
 
 src_install() {
diff --git a/media-gfx/blender/blender-2.93.9.ebuild b/media-gfx/blender/blender-2.93.9.ebuild
index d46d6b301f28..1587ab1f1a50 100644
--- a/media-gfx/blender/blender-2.93.9.ebuild
+++ b/media-gfx/blender/blender-2.93.9.ebuild
@@ -298,7 +298,7 @@ src_test() {
 	cmake_src_test
 
 	# Clean up the image directory for src_install
-	rm -fr ${ED}/* || die
+	rm -fr "${ED}"/* || die
 }
 
 src_install() {
diff --git a/media-gfx/blender/blender-3.0.0-r1.ebuild b/media-gfx/blender/blender-3.0.0-r1.ebuild
index f5bf0d9e9916..a6a4b23c68d6 100644
--- a/media-gfx/blender/blender-3.0.0-r1.ebuild
+++ b/media-gfx/blender/blender-3.0.0-r1.ebuild
@@ -301,7 +301,7 @@ src_test() {
 	cmake_src_test
 
 	# Clean up the image directory for src_install
-	rm -fr ${ED}/* || die
+	rm -fr "${ED}"/* || die
 }
 
 src_install() {
diff --git a/media-gfx/blender/blender-3.0.1-r4.ebuild b/media-gfx/blender/blender-3.0.1-r4.ebuild
index c053c88dd0f4..91fcea55c1b4 100644
--- a/media-gfx/blender/blender-3.0.1-r4.ebuild
+++ b/media-gfx/blender/blender-3.0.1-r4.ebuild
@@ -304,7 +304,7 @@ src_test() {
 	cmake_src_test
 
 	# Clean up the image directory for src_install
-	rm -fr ${ED}/* || die
+	rm -fr "${ED}"/* || die
 }
 
 src_install() {
diff --git a/media-gfx/blender/blender-3.0.1-r5.ebuild b/media-gfx/blender/blender-3.0.1-r5.ebuild
index 9ed2565bb8b7..b5491d774983 100644
--- a/media-gfx/blender/blender-3.0.1-r5.ebuild
+++ b/media-gfx/blender/blender-3.0.1-r5.ebuild
@@ -306,7 +306,7 @@ src_test() {
 	cmake_src_test
 
 	# Clean up the image directory for src_install
-	rm -fr ${ED}/* || die
+	rm -fr "${ED}"/* || die
 }
 
 src_install() {
diff --git a/media-gfx/blender/blender-3.1.0.ebuild b/media-gfx/blender/blender-3.1.0.ebuild
index 50be45a07af8..40188686d779 100644
--- a/media-gfx/blender/blender-3.1.0.ebuild
+++ b/media-gfx/blender/blender-3.1.0.ebuild
@@ -298,7 +298,7 @@ src_test() {
 	cmake_src_test
 
 	# Clean up the image directory for src_install
-	rm -fr ${ED}/* || die
+	rm -fr "${ED}"/* || die
 }
 
 src_install() {
diff --git a/media-gfx/blender/blender-3.1.1.ebuild b/media-gfx/blender/blender-3.1.1.ebuild
index 50be45a07af8..40188686d779 100644
--- a/media-gfx/blender/blender-3.1.1.ebuild
+++ b/media-gfx/blender/blender-3.1.1.ebuild
@@ -298,7 +298,7 @@ src_test() {
 	cmake_src_test
 
 	# Clean up the image directory for src_install
-	rm -fr ${ED}/* || die
+	rm -fr "${ED}"/* || die
 }
 
 src_install() {
diff --git a/media-gfx/blender/blender-3.1.2.ebuild b/media-gfx/blender/blender-3.1.2.ebuild
index 59c402ad800b..ea2bbb13c8a5 100644
--- a/media-gfx/blender/blender-3.1.2.ebuild
+++ b/media-gfx/blender/blender-3.1.2.ebuild
@@ -297,7 +297,7 @@ src_test() {
 	cmake_src_test
 
 	# Clean up the image directory for src_install
-	rm -fr ${ED}/* || die
+	rm -fr "${ED}"/* || die
 }
 
 src_install() {
diff --git a/media-gfx/blender/blender-3.2.0.ebuild b/media-gfx/blender/blender-3.2.0.ebuild
new file mode 100644
index 000000000000..9fcc16b94ddf
--- /dev/null
+++ b/media-gfx/blender/blender-3.2.0.ebuild
@@ -0,0 +1,399 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_10 )
+
+inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="https://www.blender.org"
+
+if [[ ${PV} = *9999* ]] ; then
+	# Subversion is needed for downloading unit test files
+	inherit git-r3 subversion
+	EGIT_REPO_URI="https://git.blender.org/blender.git"
+else
+	SRC_URI="https://download.blender.org/source/${P}.tar.xz"
+	# Update these between major releases.
+	TEST_TARBALL_VERSION="$(ver_cut 1-2).0"
+	SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz )"
+	KEYWORDS="~amd64 ~arm ~arm64"
+fi
+
+SLOT="${PV%.*}"
+LICENSE="|| ( GPL-3 BL )"
+IUSE="+bullet +dds +fluid +openexr +tbb \
+	alembic collada +color-management cuda +cycles \
+	debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \
+	man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \
+	+openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile test +tiff valgrind"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	alembic? ( openexr )
+	cuda? ( cycles )
+	cycles? ( openexr tiff openimageio )
+	fluid? ( tbb )
+	openvdb? ( tbb )
+	osl? ( cycles )
+	test? ( color-management )"
+
+# Library versions for official builds can be found in the blender source directory in:
+# build_files/build_environment/install_deps.sh
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/boost:=[nls?,threads(+)]
+	dev-libs/lzo:2=
+	$(python_gen_cond_dep '
+		dev-python/cython[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/zstandard[${PYTHON_USEDEP}]
+	')
+	media-libs/freetype:=
+	media-libs/glew:*
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/libsamplerate
+	sys-libs/zlib:=
+	virtual/glu
+	virtual/libintl
+	virtual/opengl
+	alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] )
+	collada? ( >=media-libs/opencollada-1.6.68 )
+	color-management? ( >=media-libs/opencolorio-2.1.1-r7:= )
+	cuda? ( dev-util/nvidia-cuda-toolkit:= )
+	embree? ( >=media-libs/embree-3.10.0[raymask] )
+	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
+	fftw? ( sci-libs/fftw:3.0= )
+	gmp? ( dev-libs/gmp )
+	!headless? (
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXxf86vm
+	)
+	jack? ( virtual/jack )
+	jemalloc? ( dev-libs/jemalloc:= )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	ndof? (
+		app-misc/spacenavd
+		dev-libs/libspnav
+	)
+	nls? ( virtual/libiconv )
+	openal? ( media-libs/openal )
+	oidn? ( >=media-libs/oidn-1.4.1 )
+	openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= )
+	openexr? (
+		>=dev-libs/imath-3.1.4-r2:=
+		>=media-libs/openexr-3:0=
+	)
+	opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=] )
+	openvdb? (
+		>=media-gfx/openvdb-9.0.0:=[nanovdb?]
+		dev-libs/c-blosc:=
+	)
+	osl? ( >=media-libs/osl-1.11.16.0-r3:= )
+	pdf? ( media-libs/libharu )
+	potrace? ( media-gfx/potrace )
+	pugixml? ( dev-libs/pugixml )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdl? ( media-libs/libsdl2[sound,joystick] )
+	sndfile? ( media-libs/libsndfile )
+	tbb? ( dev-cpp/tbb:= )
+	tiff? ( media-libs/tiff )
+	valgrind? ( dev-util/valgrind )
+"
+
+DEPEND="${RDEPEND}
+	dev-cpp/eigen:=
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[dot]
+		dev-python/sphinx[latex]
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+	nls? ( sys-devel/gettext )
+"
+
+blender_check_requirements() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+	if use doc; then
+		CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
+	fi
+}
+
+blender_get_version() {
+	# Get blender version from blender itself.
+	BV=$(grep "BLENDER_VERSION " source/blender/blenkernel/BKE_blender_version.h | cut -d " " -f 3; assert)
+	if ((${BV:0:1} < 3)) ; then
+		# Add period (290 -> 2.90).
+		BV=${BV:0:1}.${BV:1}
+	else
+		# Add period and skip the middle number (301 -> 3.1)
+		BV=${BV:0:1}.${BV:2}
+	fi
+}
+
+pkg_pretend() {
+	blender_check_requirements
+}
+
+pkg_setup() {
+	blender_check_requirements
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} = *9999* ]] ; then
+		git-r3_src_unpack
+		if use test; then
+			TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/tests
+			subversion_fetch ${TESTS_SVN_URL} ../lib/tests
+		fi
+	else
+		default
+		if use test; then
+			#The tests are downloaded from: https://svn.blender.org/svnroot/bf-blender/tags/blender-${SLOT}-release/lib/tests
+			mkdir -p lib || die
+			mv "${WORKDIR}"/blender-${TEST_TARBALL_VERSION}-tests/tests lib || die
+		fi
+	fi
+
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	blender_get_version
+
+	# Disable MS Windows help generation. The variable doesn't do what it
+	# it sounds like.
+	sed -e "s|GENERATE_HTMLHELP      = YES|GENERATE_HTMLHELP      = NO|" \
+		-i doc/doxygen/Doxyfile || die
+
+	# Prepare icons and .desktop files for slotting.
+	sed -e "s|blender.svg|blender-${BV}.svg|" -i source/creator/CMakeLists.txt || die
+	sed -e "s|blender-symbolic.svg|blender-${BV}-symbolic.svg|" -i source/creator/CMakeLists.txt || die
+	sed -e "s|blender.desktop|blender-${BV}.desktop|" -i source/creator/CMakeLists.txt || die
+
+	sed -e "s|Name=Blender|Name=Blender ${PV}|" -i release/freedesktop/blender.desktop || die
+	sed -e "s|Exec=blender|Exec=blender-${BV}|" -i release/freedesktop/blender.desktop || die
+	sed -e "s|Icon=blender|Icon=blender-${BV}|" -i release/freedesktop/blender.desktop || die
+
+	mv release/freedesktop/icons/scalable/apps/blender.svg release/freedesktop/icons/scalable/apps/blender-${BV}.svg || die
+	mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg || die
+	mv release/freedesktop/blender.desktop release/freedesktop/blender-${BV}.desktop || die
+
+	if use test; then
+		# Without this the tests will try to use /usr/bin/blender and /usr/share/blender/ to run the tests.
+		sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${ED}/usr/)|g" -i tests/CMakeLists.txt || die
+		sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${ED}/usr/)|g" -i build_files/cmake/Modules/GTestTesting.cmake || die
+	fi
+}
+
+src_configure() {
+	append-lfs-flags
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=OFF
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+		-DPYTHON_VERSION="${EPYTHON/python/}"
+		-DWITH_ALEMBIC=$(usex alembic)
+		-DWITH_ASSERT_ABORT=$(usex debug)
+		-DWITH_BOOST=ON
+		-DWITH_BULLET=$(usex bullet)
+		-DWITH_CODEC_FFMPEG=$(usex ffmpeg)
+		-DWITH_CODEC_SNDFILE=$(usex sndfile)
+		-DWITH_CXX_GUARDEDALLOC=$(usex debug)
+		-DWITH_CYCLES=$(usex cycles)
+		-DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE)
+		-DWITH_CYCLES_EMBREE=$(usex embree)
+		-DWITH_CYCLES_OSL=$(usex osl)
+		-DWITH_CYCLES_STANDALONE=OFF
+		-DWITH_CYCLES_STANDALONE_GUI=OFF
+		-DWITH_DOC_MANPAGE=$(usex man)
+		-DWITH_FFTW3=$(usex fftw)
+		-DWITH_GMP=$(usex gmp)
+		-DWITH_GTESTS=$(usex test)
+		-DWITH_HARU=$(usex pdf)
+		-DWITH_HEADLESS=$(usex headless)
+		-DWITH_INSTALL_PORTABLE=OFF
+		-DWITH_IMAGE_DDS=$(usex dds)
+		-DWITH_IMAGE_OPENEXR=$(usex openexr)
+		-DWITH_IMAGE_OPENJPEG=$(usex jpeg2k)
+		-DWITH_IMAGE_TIFF=$(usex tiff)
+		-DWITH_INPUT_NDOF=$(usex ndof)
+		-DWITH_INTERNATIONAL=$(usex nls)
+		-DWITH_JACK=$(usex jack)
+		-DWITH_MEM_JEMALLOC=$(usex jemalloc)
+		-DWITH_MEM_VALGRIND=$(usex valgrind)
+		-DWITH_MOD_FLUID=$(usex fluid)
+		-DWITH_MOD_OCEANSIM=$(usex fftw)
+		-DWITH_NANOVDB=$(usex nanovdb)
+		-DWITH_OPENAL=$(usex openal)
+		-DWITH_OPENCOLLADA=$(usex collada)
+		-DWITH_OPENCOLORIO=$(usex color-management)
+		-DWITH_OPENIMAGEDENOISE=$(usex oidn)
+		-DWITH_OPENIMAGEIO=$(usex openimageio)
+		-DWITH_OPENMP=$(usex openmp)
+		-DWITH_OPENSUBDIV=$(usex opensubdiv)
+		-DWITH_OPENVDB=$(usex openvdb)
+		-DWITH_OPENVDB_BLOSC=$(usex openvdb)
+		-DWITH_POTRACE=$(usex potrace)
+		-DWITH_PUGIXML=$(usex pugixml)
+		-DWITH_PULSEAUDIO=$(usex pulseaudio)
+		-DWITH_PYTHON_INSTALL=OFF
+		-DWITH_SDL=$(usex sdl)
+		-DWITH_STATIC_LIBS=OFF
+		-DWITH_SYSTEM_EIGEN3=ON
+		-DWITH_SYSTEM_FREETYPE=ON
+		-DWITH_SYSTEM_GLEW=ON
+		-DWITH_SYSTEM_LZO=ON
+		-DWITH_TBB=$(usex tbb)
+		-DWITH_USD=OFF
+		-DWITH_XR_OPENXR=OFF
+	)
+
+	append-flags $(usex debug '-DDEBUG' '-DNDEBUG')
+
+	if tc-is-gcc ; then
+		# These options only exist when GCC is detected.
+		# We disable these to respect the user's choice of linker.
+		mycmakeargs+=(
+			-DWITH_LINKER_GOLD=OFF
+			-DWITH_LINKER_LLD=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	# A lot of tests needs to have access to the installed data files.
+	# So install them into the image directory now.
+	cmake_src_install
+
+	blender_get_version
+	# Define custom blender data/script file paths not be able to find them otherwise during testing.
+	# (Because the data is in the image directory and it will default to look in /usr/share)
+	export BLENDER_SYSTEM_SCRIPTS=${ED}/usr/share/blender/${BV}/scripts
+	export BLENDER_SYSTEM_DATAFILES=${ED}/usr/share/blender/${BV}/datafiles
+
+	# Sanity check that the script and datafile path is valid.
+	# If they are not vaild, blender will fallback to the default path which is not what we want.
+	[ -d "$BLENDER_SYSTEM_SCRIPTS" ] || die "The custom script path is invalid, fix the ebuild!"
+	[ -d "$BLENDER_SYSTEM_DATAFILES" ] || die "The custom datafiles path is invalid, fix the ebuild!"
+
+	cmake_src_test
+
+	# Clean up the image directory for src_install
+	rm -fr ${ED}/* || die
+}
+
+src_install() {
+	blender_get_version
+
+	# Pax mark blender for hardened support.
+	pax-mark m "${BUILD_DIR}"/bin/blender
+
+	cmake_src_install
+
+	if use man; then
+		# Slot the man page
+		mv "${ED}/usr/share/man/man1/blender.1" "${ED}/usr/share/man/man1/blender-${BV}.1" || die
+	fi
+
+	if use doc; then
+		# Define custom blender data/script file paths. Otherwise Blender will not be able to find them during doc building.
+		# (Because the data is in the image directory and it will default to look in /usr/share)
+		export BLENDER_SYSTEM_SCRIPTS=${ED}/usr/share/blender/${BV}/scripts
+		export BLENDER_SYSTEM_DATAFILES=${ED}/usr/share/blender/${BV}/datafiles
+
+		# Workaround for binary drivers.
+		addpredict /dev/ati
+		addpredict /dev/dri
+		addpredict /dev/nvidiactl
+
+		einfo "Generating Blender C/C++ API docs ..."
+		cd "${CMAKE_USE_DIR}"/doc/doxygen || die
+		doxygen -u Doxyfile || die
+		doxygen || die "doxygen failed to build API docs."
+
+		cd "${CMAKE_USE_DIR}" || die
+		einfo "Generating (BPY) Blender Python API docs ..."
+		"${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed."
+
+		cd "${CMAKE_USE_DIR}"/doc/python_api || die
+		sphinx-build sphinx-in BPY_API || die "sphinx failed."
+
+		docinto "html/API/python"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/.
+
+		docinto "html/API/blender"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/.
+	fi
+
+	# Fix doc installdir
+	docinto html
+	dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
+	rm -r "${ED}"/usr/share/doc/blender || die
+
+	python_optimize "${ED}/usr/share/blender/${BV}/scripts"
+
+	mv "${ED}/usr/bin/blender-thumbnailer" "${ED}/usr/bin/blender-${BV}-thumbnailer" || die
+	mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}" || die
+}
+
+pkg_postinst() {
+	elog
+	elog "Blender uses python integration. As such, may have some"
+	elog "inherent risks with running unknown python scripts."
+	elog
+	elog "It is recommended to change your blender temp directory"
+	elog "from /tmp to /home/user/tmp or another tmp file under your"
+	elog "home directory. This can be done by starting blender, then"
+	elog "changing the 'Temporary Files' directory in Blender preferences."
+	elog
+	ewarn
+	ewarn "This ebuild does not unbundle the massive amount of 3rd party"
+	ewarn "libraries which are shipped with blender. Note that"
+	ewarn "these have caused security issues in the past."
+	ewarn "If you are concerned about security, file a bug upstream:"
+	ewarn "  https://developer.blender.org/"
+	ewarn
+
+	if ! use python_single_target_python3_10; then
+		elog "You are building Blender with a newer python version than"
+		elog "supported by this version upstream."
+		elog "If you experience breakages with e.g. plugins, please switch to"
+		elog "python_single_target_python3_10 instead."
+		elog "Bug: https://bugs.gentoo.org/737388"
+		elog
+	fi
+
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+
+	ewarn ""
+	ewarn "You may want to remove the following directory."
+	ewarn "~/.config/${PN}/${SLOT}/cache/"
+	ewarn "It may contain extra render kernels not tracked by portage"
+	ewarn ""
+}
diff --git a/media-gfx/blender/blender-9999.ebuild b/media-gfx/blender/blender-9999.ebuild
index 88c413e69eca..bbdce08e2010 100644
--- a/media-gfx/blender/blender-9999.ebuild
+++ b/media-gfx/blender/blender-9999.ebuild
@@ -17,8 +17,8 @@ if [[ ${PV} = *9999* ]] ; then
 else
 	SRC_URI="https://download.blender.org/source/${P}.tar.xz"
 	# Update these between major releases.
-	#TEST_TARBALL_VERSION="3.0.0"
-	#SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2 )"
+	TEST_TARBALL_VERSION="$(ver_cut 1-2).0"
+	SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz )"
 	KEYWORDS="~amd64 ~arm ~arm64"
 fi
 
@@ -297,7 +297,7 @@ src_test() {
 	cmake_src_test
 
 	# Clean up the image directory for src_install
-	rm -fr ${ED}/* || die
+	rm -fr "${ED}"/* || die
 }
 
 src_install() {
diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest
index 70c22fb23901..f1cf6203a479 100644
--- a/media-gfx/feh/Manifest
+++ b/media-gfx/feh/Manifest
@@ -1,16 +1,6 @@
 AUX feh-3.2-debug-cflags.patch 193 BLAKE2B 298f65a8f9142167d1cd2cfce0bc61ad9d7d4a5519ab8e78d1259ea60b5566376f8d9ddba660db65ef5e229bdc0ff254d9aab2284d8929ea0ac171da44f8c44d SHA512 336d23b767c5c3da9b94a1e6759129c242caf70a611b2410816a562d90720e3abab6a3444ce06975d62b4ebbe8e54c70942800516c7575cc6d5e13ce69679884
-DIST feh-3.6.1.tar.bz2 2116064 BLAKE2B cae12f9475a2678c2f521baac9deb6668eae07811ae0904bbefef873fd54182b94532bf811394964e725f0e45890f65fcfc3dc988135d388ddcf625adbeca4e0 SHA512 b4350f1c5f66a450b2f088affea973abab9e184df110b693e46e1fc532d213d62a52bf08029f345daf92d45c828ff3bd380dcd7b167f319f1ff3b1d04150cd75
-DIST feh-3.6.2.tar.bz2 2116515 BLAKE2B c813f1bcee2170b509c4579472f2106ed01bcba49a91eaec2f48b2f41b10f43de59ab0d114ee9a04faa9b8d73c13636e49bac4730ff2275bec55cff56379e1fc SHA512 d3a14d7880387575a224bc5cdf1b63bfc5bd793c52fdc07620ddd80e1309a6b9a0c93f3f66ad08a0221f04eabb226372fcb14849a8682c4a2b4691981bb80c40
-DIST feh-3.6.3.tar.bz2 2116771 BLAKE2B 062381cc744617f0c8e0a4a7aac7e0841ef78993d3f65e9853dce6b81d6ce36caf4c72ce35785b96c8e0644da41a6ad12706e6a740740fb27cddf281d780e749 SHA512 53e9e1903f256fee9d49af2f8ce4bf153317e7d5de6b396448f16fd54ae1a13217edb44566cd0433e25675a25175cc412a726f058856136f19629661e2f62ce2
-DIST feh-3.6.tar.bz2 2116101 BLAKE2B 8ad47c6b456746d951728fd8a0ba1a2fed4ceb4a7e15554f68b4de071da7b3f4e9e16a10b1a05e51291b8b4127bab98f2b96231298fd181d8dc544bc089a772f SHA512 1df017adcf0650ff2cdc26556cbea5a6b8c9dad1dd44128cccc79312334d0140ab9e5c9c8bac7249dcfbdd7985ae75d847752eadad14216102d8ab7bcb2c42c7
-DIST feh-3.7.1.tar.bz2 2119324 BLAKE2B 203c557ec40590a19cacf4de1e192907608a6d3a7b09890f6196a99560d02220fbe619e02ffb74e8e7a4c12f725e2baf866f2882e32c3aa1a8c3274a66b71791 SHA512 7e6d4c4ccee5a0aadc0b535350da4d515ba7f75bbd5e95eb6a6e5e553a352f764bd91e39d3a59168d749bcf1528a7db75f40016885273c0bedd814eef0a0acd7
 DIST feh-3.7.2.tar.bz2 2121677 BLAKE2B ce9acf27dc312ef46bcfbbdb5bf982d3a5c5a32ea56e716982c0e3dfaa3a66643bc9471353cca4dde9e28fcb8d002d38bfbafab699d952b81c59bababfafb82f SHA512 e74c4a4ce655711dc3c777f83c9376d54aa82aa7e38e07837b8593ed19ba813217f99d5768c8f8d0b6c1a0f6475a5e36cf404f4bc024674214568715a931b9e3
-DIST feh-3.7.tar.bz2 2118355 BLAKE2B 40cd0e53249d474cb8ff8e236bdaf8be322253600f2233a5748379fefe8592a22a43ccc47d44380b2c84038272c1c194e50fb8ad4892a61e48d54ac18c6ba143 SHA512 687d0863bb6bf99bc88ca22760ab670525e6d8ee4c984fa00d686adabd39b7bee2449d93beeb8863a161d2b1dfabed3cff035911711eb445b358ff5a4b77da3f
-EBUILD feh-3.6.1.ebuild 1469 BLAKE2B a4e68a319f63055c4997c72abf39c49c0373b47465873539edf872ed282c5012ae40ddc7cac10968d757b6f9e775bd754a069aac2e42945650e50c6d7be968e1 SHA512 3bca9ab073f234d23d2609e755bc6741742150ac3d3df22e3c831b674d79f7d893ce2b3bcf3b86399b051fe754f8de9e349d5884564bed1cd6b7a1cf1c24c1a5
-EBUILD feh-3.6.2.ebuild 1510 BLAKE2B 4f025973871e4f60fd467603e58df078db0cd93ab240a8ce320b3c50034c907cf6729f5c36185c376581236d4bce6913224e842ba711e6c481409e7691a307c4 SHA512 54677a9d00d4135041ed124893bb9fe7e36af5f2afe8d9baca2e52deb8a5bf1a6347a1b597ce938873d2caa54f3ed9c5ef1428760e10fe566ebe65edacc5ccc2
-EBUILD feh-3.6.3.ebuild 1510 BLAKE2B 4f025973871e4f60fd467603e58df078db0cd93ab240a8ce320b3c50034c907cf6729f5c36185c376581236d4bce6913224e842ba711e6c481409e7691a307c4 SHA512 54677a9d00d4135041ed124893bb9fe7e36af5f2afe8d9baca2e52deb8a5bf1a6347a1b597ce938873d2caa54f3ed9c5ef1428760e10fe566ebe65edacc5ccc2
-EBUILD feh-3.6.ebuild 1469 BLAKE2B a4e68a319f63055c4997c72abf39c49c0373b47465873539edf872ed282c5012ae40ddc7cac10968d757b6f9e775bd754a069aac2e42945650e50c6d7be968e1 SHA512 3bca9ab073f234d23d2609e755bc6741742150ac3d3df22e3c831b674d79f7d893ce2b3bcf3b86399b051fe754f8de9e349d5884564bed1cd6b7a1cf1c24c1a5
-EBUILD feh-3.7.1.ebuild 1508 BLAKE2B 5a9c85a66b898188667ff222c686abf8002548c20e0b642471d6ce3a7fff6426c580a8b7bc0c103267b73ec12515767772b02e7784170b4428df57382528c990 SHA512 35bc572448d0738dd19500d2c1a1d2e9597a25767ee963c05caa34f1c0ff9c759f70ddf02c5161628d4ef8cb3b24141fa17cc3b7d2eba5ab59f926b79454471d
+DIST feh-3.9.tar.bz2 2111997 BLAKE2B 853812e580eda808acbe4bc38325ac387b66eaf90b54da7e94980bd785d0001fa3f8d2507e2a435d5f533cc215bf8e28419b57b436d85c32b8e609b12c3a191a SHA512 0d217bdc9f78c8a4a40684ccc798986465c46282eef39a6792791763a5683ddc9a2ca277dc10c23bfe55aa11b415f5ff66b4ded2fe2a7a946660ccd07a4edc50
 EBUILD feh-3.7.2.ebuild 1511 BLAKE2B 4ea7b87f2abf97391df8d688bea31fa816725c716e8060c100fb3409eec59d5249ed6388b45eea434e348d75f66398ef644aef039a6fc59e211b63b427eda8a0 SHA512 c0a276d82a9f51eafcab4152091d4eee0daade48c0b18c4317e88d9de97cc295e18ed01bac02e29690d754d15efacc011d7b6a13ed6837a12f9d2066060fa800
-EBUILD feh-3.7.ebuild 1508 BLAKE2B 5a9c85a66b898188667ff222c686abf8002548c20e0b642471d6ce3a7fff6426c580a8b7bc0c103267b73ec12515767772b02e7784170b4428df57382528c990 SHA512 35bc572448d0738dd19500d2c1a1d2e9597a25767ee963c05caa34f1c0ff9c759f70ddf02c5161628d4ef8cb3b24141fa17cc3b7d2eba5ab59f926b79454471d
+EBUILD feh-3.9-r1.ebuild 1527 BLAKE2B 03523723113bd743eb4094e5180e7d7f72b541db7e9dc5e5e8ff2ca0562aa2afb25883b8b307aedf42802decc3fa75dc2620e57dddb46b7c8b86d01bffb5dcf1 SHA512 79b7a6459a575b395b6a733737e982e26f0aba1278254836417c0001cbb898d2f298963bacacc563c130793717c43899098337578281530de6215eb1ace89bbe
 MISC metadata.xml 253 BLAKE2B ac07d0a4457abddec76b322a6e7f175661559091067a6f3d92658d4e6c2f1f90a57f5d0c139de0a91a19a5a797fed39fc66fd90ca25bfd0c66497ee8e4088810 SHA512 40abc637528fae614d2eb151b5834c323cb151d5c9ebbee415d70efb4603df0fa7483e0d689ea1658a424ac1e54fb944d8eca37a4bd80bbc15222ed9259096df
diff --git a/media-gfx/feh/feh-3.6.1.ebuild b/media-gfx/feh/feh-3.6.1.ebuild
deleted file mode 100644
index d0173f659d38..000000000000
--- a/media-gfx/feh/feh-3.6.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs xdg-utils
-
-DESCRIPTION="A fast, lightweight imageviewer using imlib2"
-HOMEPAGE="https://feh.finalrewind.org/"
-SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2"
-
-LICENSE="feh"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ppc64 x86"
-IUSE="debug curl exif test xinerama"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="media-libs/imlib2[X]
-	>=media-libs/libpng-1.2:0=
-	x11-libs/libX11
-	curl? ( net-misc/curl )
-	exif? ( media-libs/libexif )
-	xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${COMMON_DEPEND}
-	virtual/jpeg:0"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-	x11-libs/libXt
-	test? (
-		>=dev-lang/perl-5.10
-		dev-perl/Test-Command
-		media-libs/imlib2[gif,jpeg,png]
-	)"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.2-debug-cflags.patch )
-
-pkg_setup() {
-	use_feh() { usex $1 1 0; }
-
-	fehopts=(
-		DESTDIR="${D}"
-		PREFIX="${EPREFIX}"/usr
-		doc_dir='${main_dir}'/share/doc/${PF}
-		example_dir='${main_dir}'/share/doc/${PF}/examples
-		curl=$(use_feh curl)
-		debug=$(use_feh debug)
-		xinerama=$(use_feh xinerama)
-		exif=$(use_feh exif)
-	)
-}
-
-src_compile() {
-	tc-export CC
-	emake "${fehopts[@]}"
-}
-
-src_install() {
-	emake "${fehopts[@]}" install
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/feh/feh-3.6.2.ebuild b/media-gfx/feh/feh-3.6.2.ebuild
deleted file mode 100644
index 2010a07aeadf..000000000000
--- a/media-gfx/feh/feh-3.6.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=7
-inherit toolchain-funcs xdg-utils
-
-DESCRIPTION="A fast, lightweight imageviewer using imlib2"
-HOMEPAGE="https://feh.finalrewind.org/"
-SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2"
-
-LICENSE="feh"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
-IUSE="debug curl exif test xinerama inotify"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="media-libs/imlib2[X]
-	>=media-libs/libpng-1.2:0=
-	x11-libs/libX11
-	curl? ( net-misc/curl )
-	exif? ( media-libs/libexif )
-	xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${COMMON_DEPEND}
-	virtual/jpeg:0"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-	x11-libs/libXt
-	test? (
-		>=dev-lang/perl-5.10
-		dev-perl/Test-Command
-		media-libs/imlib2[gif,jpeg,png]
-	)"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.2-debug-cflags.patch )
-
-pkg_setup() {
-	use_feh() { usex $1 1 0; }
-
-	fehopts=(
-		DESTDIR="${D}"
-		PREFIX="${EPREFIX}"/usr
-		doc_dir='${main_dir}'/share/doc/${PF}
-		example_dir='${main_dir}'/share/doc/${PF}/examples
-		curl=$(use_feh curl)
-		debug=$(use_feh debug)
-		xinerama=$(use_feh xinerama)
-		exif=$(use_feh exif)
-		inotify=$(use_feh inotify)
-	)
-}
-
-src_compile() {
-	tc-export CC
-	emake "${fehopts[@]}"
-}
-
-src_install() {
-	emake "${fehopts[@]}" install
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/feh/feh-3.6.3.ebuild b/media-gfx/feh/feh-3.6.3.ebuild
deleted file mode 100644
index 2010a07aeadf..000000000000
--- a/media-gfx/feh/feh-3.6.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs xdg-utils
-
-DESCRIPTION="A fast, lightweight imageviewer using imlib2"
-HOMEPAGE="https://feh.finalrewind.org/"
-SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2"
-
-LICENSE="feh"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
-IUSE="debug curl exif test xinerama inotify"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="media-libs/imlib2[X]
-	>=media-libs/libpng-1.2:0=
-	x11-libs/libX11
-	curl? ( net-misc/curl )
-	exif? ( media-libs/libexif )
-	xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${COMMON_DEPEND}
-	virtual/jpeg:0"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-	x11-libs/libXt
-	test? (
-		>=dev-lang/perl-5.10
-		dev-perl/Test-Command
-		media-libs/imlib2[gif,jpeg,png]
-	)"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.2-debug-cflags.patch )
-
-pkg_setup() {
-	use_feh() { usex $1 1 0; }
-
-	fehopts=(
-		DESTDIR="${D}"
-		PREFIX="${EPREFIX}"/usr
-		doc_dir='${main_dir}'/share/doc/${PF}
-		example_dir='${main_dir}'/share/doc/${PF}/examples
-		curl=$(use_feh curl)
-		debug=$(use_feh debug)
-		xinerama=$(use_feh xinerama)
-		exif=$(use_feh exif)
-		inotify=$(use_feh inotify)
-	)
-}
-
-src_compile() {
-	tc-export CC
-	emake "${fehopts[@]}"
-}
-
-src_install() {
-	emake "${fehopts[@]}" install
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/feh/feh-3.6.ebuild b/media-gfx/feh/feh-3.6.ebuild
deleted file mode 100644
index d0173f659d38..000000000000
--- a/media-gfx/feh/feh-3.6.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs xdg-utils
-
-DESCRIPTION="A fast, lightweight imageviewer using imlib2"
-HOMEPAGE="https://feh.finalrewind.org/"
-SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2"
-
-LICENSE="feh"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ppc64 x86"
-IUSE="debug curl exif test xinerama"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="media-libs/imlib2[X]
-	>=media-libs/libpng-1.2:0=
-	x11-libs/libX11
-	curl? ( net-misc/curl )
-	exif? ( media-libs/libexif )
-	xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${COMMON_DEPEND}
-	virtual/jpeg:0"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-	x11-libs/libXt
-	test? (
-		>=dev-lang/perl-5.10
-		dev-perl/Test-Command
-		media-libs/imlib2[gif,jpeg,png]
-	)"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.2-debug-cflags.patch )
-
-pkg_setup() {
-	use_feh() { usex $1 1 0; }
-
-	fehopts=(
-		DESTDIR="${D}"
-		PREFIX="${EPREFIX}"/usr
-		doc_dir='${main_dir}'/share/doc/${PF}
-		example_dir='${main_dir}'/share/doc/${PF}/examples
-		curl=$(use_feh curl)
-		debug=$(use_feh debug)
-		xinerama=$(use_feh xinerama)
-		exif=$(use_feh exif)
-	)
-}
-
-src_compile() {
-	tc-export CC
-	emake "${fehopts[@]}"
-}
-
-src_install() {
-	emake "${fehopts[@]}" install
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/feh/feh-3.7.ebuild b/media-gfx/feh/feh-3.7.ebuild
deleted file mode 100644
index 9ccef7a27f03..000000000000
--- a/media-gfx/feh/feh-3.7.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs xdg-utils
-
-DESCRIPTION="A fast, lightweight imageviewer using imlib2"
-HOMEPAGE="https://feh.finalrewind.org/"
-SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2"
-
-LICENSE="feh"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
-IUSE="debug curl exif test xinerama inotify"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="media-libs/imlib2[X]
-	>=media-libs/libpng-1.2:0=
-	x11-libs/libX11
-	curl? ( net-misc/curl )
-	exif? ( media-libs/libexif )
-	xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${COMMON_DEPEND}
-	virtual/jpeg:0"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-	x11-libs/libXt
-	test? (
-		>=dev-lang/perl-5.10
-		dev-perl/Test-Command
-		media-libs/imlib2[gif,jpeg,png]
-	)"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.2-debug-cflags.patch )
-
-pkg_setup() {
-	use_feh() { usex $1 1 0; }
-
-	fehopts=(
-		PREFIX="${EPREFIX}"/usr
-		doc_dir='${main_dir}'/share/doc/${PF}
-		example_dir='${main_dir}'/share/doc/${PF}/examples
-		curl=$(use_feh curl)
-		debug=$(use_feh debug)
-		xinerama=$(use_feh xinerama)
-		exif=$(use_feh exif)
-		inotify=$(use_feh inotify)
-	)
-}
-
-src_compile() {
-	tc-export CC
-	emake "${fehopts[@]}"
-}
-
-src_install() {
-	emake "${fehopts[@]}" DESTDIR="${D}" install
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/feh/feh-3.7.1.ebuild b/media-gfx/feh/feh-3.9-r1.ebuild
similarity index 91%
rename from media-gfx/feh/feh-3.7.1.ebuild
rename to media-gfx/feh/feh-3.9-r1.ebuild
index 9ccef7a27f03..b05cfb8585a7 100644
--- a/media-gfx/feh/feh-3.7.1.ebuild
+++ b/media-gfx/feh/feh-3.9-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 inherit toolchain-funcs xdg-utils
 
 DESCRIPTION="A fast, lightweight imageviewer using imlib2"
@@ -10,7 +10,7 @@ SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2"
 
 LICENSE="feh"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86"
 IUSE="debug curl exif test xinerama inotify"
 RESTRICT="!test? ( test )"
 
@@ -21,7 +21,7 @@ COMMON_DEPEND="media-libs/imlib2[X]
 	exif? ( media-libs/libexif )
 	xinerama? ( x11-libs/libXinerama )"
 RDEPEND="${COMMON_DEPEND}
-	virtual/jpeg:0"
+	media-libs/libjpeg-turbo:0"
 DEPEND="${COMMON_DEPEND}
 	x11-base/xorg-proto
 	x11-libs/libXt
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 90916bc41111..7cc01ba9cc79 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,9 +1,11 @@
 AUX gimp-2.10_fix_test-appdata.patch 902 BLAKE2B 2b1a131d874d65422d8bdd44732b9843d89a570a1ea3c058cdb2a424a7791c686aa0e2ae2a0b472f333f2465f6e1a26750a532e9003933c5dffa1af32343c1dc SHA512 2983e8572f5e8113c9e2f564d31c1a5fe7e11ef273c50d2be739089124c6ec1a457da28222020bbd6015b2cbbcbf403b88d8660b9b35241800deb4fb3ad79067
 DIST gimp-2.10.28.tar.bz2 31675862 BLAKE2B b491b55d5adf08221feb7cee8b3adc1d8b090901e8f43b93a4d2c3d935ce1ca45072b0ccd6840e06b329fbfafc8fe5e3d6056381c5129203fa3c5e781cab0453 SHA512 587f6f46741672f0700fd642a5b779694d2d8bc8ad70e7677ccdbfc2266dc62203ed347d6aaffaa4b8e7d84a84a25f7d5a51507dfd64b21b4c05970856d3ab94
 DIST gimp-2.10.30.tar.bz2 31731327 BLAKE2B 6d948e16fbf7bae7b514a60a44fc5eaac32bebb915de0dcb5120d10739501a01973cb1f5821699d94c4d4cc7ef86d0e5456674a87623b6996d9b276d83a6eb74 SHA512 02ca9e8846dc2ae856f720b92f3c6af69984cf0b3ce85ba5a67479e5c3c813315a0551b7d011dcf7a6c83dc771e550cc31041126bbea0be3fd483176e0eb2851
+DIST gimp-2.10.32.tar.bz2 31397425 BLAKE2B 3887e2e29ebfd5dcfa671a9d1549180d11bd5e3656c6854ff4130c6c6e6ca9479df075981e09b9b6b97e47dd1fcd939fea726ca09c08c040ebd1998d80e61771 SHA512 aa999c1ec388154965f84d995a9b5517e9c38608d03a0d0bb6ec9fa55de946f9da106e7d6f7c02052b61d2b6806e7a378e786539f0de5b5ffaa2fcd1bbd9c7f1
 DIST gimp-2.99.10.tar.bz2 26782056 BLAKE2B 103e7fa2d04b1989e59fb03964a122891831d122cdc6dd3b7637f06cff28310e12d9a79678ac477b56728f4ceb53292001c53f026e94be417db76dd7e14740ab SHA512 898c1e1ffd2270ccc965db9a8263e04d95455535361b47f92256b4028808e1e91eb1924cf6cef7ff9e988194ebbc67535bd9cfbf0243159824e58551a2b91ba3
 EBUILD gimp-2.10.28-r1.ebuild 5568 BLAKE2B aba790ec8b864d40b7f9956311e014bad49ac08e4738644a1baf93590fc844149d1dfe85c005b09599cf18bab343187945df6feda207ed19c48558c2aef0adfa SHA512 193d3db7d3db3876e2b57401ec567b9599e8af1d0e2436ec9b648f5134f62bca47e5d41dda6ae07976ed3bdf466a966510daba6a5dd22ee7412d4f01bf8c63ab
 EBUILD gimp-2.10.30.ebuild 5568 BLAKE2B 6c3e731d5b5f952f5d902aae14bc0a3691e1d4f9b715e9aa2cae3993f1b7a477c6935bbda84851a0b823f43731e8a0046a5f76c950580bd2a6cb67be1e369381 SHA512 e9f38a509ae7d88979f64fb5f06c813350927f88ad03f94539e931bab8f397c39ffdebad207012c4adb5966ee0c0a12424e836a5c0a7a06de6d8179a68600712
+EBUILD gimp-2.10.32.ebuild 5584 BLAKE2B 080a856e0368b78267c0ee604a87de6b0aea24d448e987d5cbda9594589b5e04cb7623014eb1bb9b39b9abc5f4ee2854cc735e62843d0021e87ce25e82b464d5 SHA512 808f28c1f37c52785b6999d313ab2e6b6ef1c2c6370f122f2e0fae7b15e8747cccc74201c65a6572050c21802ba4689226592991d33948e6d58f8d6dd004e3a5
 EBUILD gimp-2.99.10-r1.ebuild 6613 BLAKE2B 2883d26916fa9a54d5037c7524f141b47faeba5816dcf086e549f0c5eadcd607e591c655bce0ae8322ba9d69f14f20a7f816ad732fc7cc0ba063715e3286e1d0 SHA512 17e79ffad687a53ce0da2280c628b2309245aff2935997a6817e2297435291992216b934ece01bdbef69633744740849faf1115e6230e92053ef6c19621835f9
 EBUILD gimp-9999.ebuild 6672 BLAKE2B 979fb403f70b4cf2c52926e3e878503f4cd44af0ff00c3459a1f21f08396e6bf1198e2cb7bd0ff92ad4a72bab2b4ff74762c7566f74fd941ca169999e0a9a3b2 SHA512 6ba28b3d4eb3a4a116924b4f3c79b374a32ee7a990086fd6b018339e9817228edd7468dcf64dcc87d95f05ff8a0442126a94e390cdb934a50228b199ba948182
 MISC metadata.xml 646 BLAKE2B 167cb95fb064b2470cdbb6b625f7d6e24aacac57081a1177fdc9e878b4cf1a20c6b86a7e621530b45bc7db5f07e173a47829fd5be9dde6f9b9fcf54a39f24236 SHA512 9f6501b6a14f860be69e29baaace61fe4c964413b8c43882bf06144406333f4d69d6adaa315503dc83fbdb467cd47e3d752ed6abe4b78bd5cb32fb9f3be1ac1d
diff --git a/media-gfx/gimp/gimp-2.10.32.ebuild b/media-gfx/gimp/gimp-2.10.32.ebuild
new file mode 100644
index 000000000000..93ceeab6ac4e
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.10.32.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GNOME2_EAUTORECONF=yes
+WANT_AUTOMAKE=
+
+inherit autotools gnome2 toolchain-funcs virtualx
+
+DESCRIPTION="GNU Image Manipulation Program"
+HOMEPAGE="https://www.gimp.org/"
+SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
+LICENSE="GPL-3 LGPL-3"
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86"
+
+IUSE="aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	>=app-text/poppler-0.50[cairo]
+	>=app-text/poppler-data-0.4.7
+	>=dev-libs/atk-2.2.0
+	>=dev-libs/glib-2.56.2:2
+	>=dev-libs/json-glib-1.2.6
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	>=gnome-base/librsvg-2.40.6:2
+	>=media-gfx/mypaint-brushes-2.0.2:=
+	>=media-libs/babl-0.1.88
+	>=media-libs/fontconfig-2.12.4
+	>=media-libs/freetype-2.1.7
+	>=media-libs/gegl-0.4.34:0.4[cairo]
+	>=media-libs/gexiv2-0.10.6
+	>=media-libs/harfbuzz-0.9.19:=
+	>=media-libs/lcms-2.8:2
+	media-libs/libjpeg-turbo
+	>=media-libs/libmypaint-1.6.1:=
+	>=media-libs/libpng-1.6.25:0=
+	>=media-libs/tiff-3.5.7:0
+	net-libs/glib-networking[ssl]
+	sys-libs/zlib
+	>=x11-libs/cairo-1.12.2
+	>=x11-libs/gdk-pixbuf-2.31:2
+	>=x11-libs/gtk+-2.24.32:2
+	x11-libs/libXcursor
+	>=x11-libs/pango-1.29.4
+	aalib? ( media-libs/aalib )
+	alsa? ( >=media-libs/alsa-lib-1.0.0 )
+	aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
+	heif? ( >=media-libs/libheif-1.9.1:= )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
+	mng? ( media-libs/libmng:= )
+	openexr? ( >=media-libs/openexr-1.6.1:= )
+	postscript? ( app-text/ghostscript-gpl )
+	udev? ( dev-libs/libgudev:= )
+	unwind? ( >=sys-libs/libunwind-1.1.0:= )
+	webp? ( >=media-libs/libwebp-0.6.0:= )
+	wmf? ( >=media-libs/libwmf-0.2.8 )
+	xpm? ( x11-libs/libXpm )
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-themes/hicolor-icon-theme
+	gnome? ( gnome-base/gvfs )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	>=dev-lang/perl-5.10.0
+	dev-libs/appstream-glib
+	dev-util/gtk-update-icon-cache
+	>=dev-util/intltool-0.40.1
+	>=sys-devel/gettext-0.19
+	>=sys-devel/libtool-2.2
+	virtual/pkgconfig
+"
+
+DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.10_fix_test-appdata.patch" # Bugs 685210 (and duplicate 691070)
+)
+
+src_prepare() {
+	sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794
+
+	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
+	sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
+
+	gnome2_src_prepare  # calls eautoreconf
+
+	sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
+	grep -F -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
+
+	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+_adjust_sandbox() {
+	# Bugs #569738 and #591214
+	local nv
+	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
+		# We do not check for existence as they may show up later
+		# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
+		addwrite "${nv}"
+	done
+
+	addwrite /dev/dri/  # bugs #574038 and #684886
+	addwrite /dev/ati/  # bug #589198
+	addwrite /proc/mtrr  # bug #589198
+}
+
+src_configure() {
+	_adjust_sandbox
+
+	local myconf=(
+		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
+		GDBUS_CODEGEN="${EPREFIX}"/bin/false
+
+		--enable-default-binary
+
+		--disable-check-update
+		--disable-python
+		--enable-mp
+		--with-appdata-test
+		--with-bug-report-url=https://bugs.gentoo.org/
+		--with-xmc
+		--without-libbacktrace
+		--without-webkit
+		--without-xvfb-run
+		$(use_enable cpu_flags_ppc_altivec altivec)
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable debug)
+		$(use_enable vector-icons)
+		$(use_with aalib aa)
+		$(use_with alsa)
+		$(use_with !aqua x)
+		$(use_with heif libheif)
+		$(use_with jpeg2k jpeg2000)
+		$(use_with mng libmng)
+		$(use_with openexr)
+		$(use_with postscript gs)
+		$(use_with udev gudev)
+		$(use_with unwind libunwind)
+		$(use_with webp)
+		$(use_with wmf)
+		$(use_with xpm libxpm)
+	)
+
+	gnome2_src_configure "${myconf[@]}"
+}
+
+src_compile() {
+	export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
+	gnome2_src_compile
+}
+
+# for https://bugs.gentoo.org/664938
+_rename_plugins() {
+	einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
+	local prename=gimp-org-
+	(
+		cd "${ED}"/usr/$(get_libdir)/gimp/2.0/plug-ins || die
+		for plugin_slash in $(ls -d1 */); do
+		    plugin=${plugin_slash%/}
+		    if [[ -f ${plugin}/${plugin} ]]; then
+			# NOTE: Folder and file name need to match for Gimp to load that plug-in
+			#       so "file-svg/file-svg" becomes "${prename}file-svg/${prename}file-svg"
+			mv ${plugin}/{,${prename}}${plugin} || die
+			mv {,${prename}}${plugin} || die
+		    fi
+		done
+	)
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Workaround for bug #321111 to give GIMP the least
+	# precedence on PDF documents by default
+	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
+
+	find "${D}" -name '*.la' -type f -delete || die
+
+	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
+	local gimp_app_version=$(ver_cut 1-2)
+	mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
+
+	# Remove gimp devel-docs html files if user doesn't need it
+	if ! use doc; then
+		rm -r "${ED}"/usr/share/gtk-doc || die
+	fi
+
+	_rename_plugins || die
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+}
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 893a5709f7dd..0d26d9146707 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -4,6 +4,6 @@ DIST GraphicsMagick-1.3.37.tar.xz 5623688 BLAKE2B d6d5c8a07ec2aa2e60399887fa7887
 DIST GraphicsMagick-1.3.38.tar.xz 5958352 BLAKE2B 132c8b2303690dbe84b0e9ab33db0c0861845ef0260915e33197912dbcae02ae70c27bce634cfe0ab6b739ef6f3e828cbea9043fc90be993fb2c4a5e33e20ee9 SHA512 478f9e2907d4cb1099b0cbd1a73e4ab58aef94edf6cb1636ce48a378084ec1671599fd4f369455e5af898e94d1386f7149f6933b7c668027a6f6952bc763ec3a
 DIST GraphicsMagick-1.3.38.tar.xz.sig 119 BLAKE2B 166b7bb6de30af22d1f2317812f76dee43dd69c5557613deea35de3767624466c07001fe029ec9d33d0c61ed2fe5ca3f48bf435853374c722963a1293bfaa7a1 SHA512 c6dfee7e4b63b646460f9045ca5c8f3105d1a761ec3cd3471b53293178ed9a963884539c8026d934ce1915654d517a9b30232d7260a13f6d7dbeb5a592485b09
 EBUILD graphicsmagick-1.3.37.ebuild 3284 BLAKE2B a961ae6eeac3513f8b9055e1c896858d8ff2bdd001c98c400c71d39bd93301e38cad2d0df90f90523720dcd7272f3a4b78eba76c29aa182bc97e31ef6f6362ee SHA512 5ea8bb429f5a918aa6e1e7d83357b225014ba04573202cd23026f5dc09681e9cb7684248a706b1133c0cbf2d061ec2b5e3e4c6b902685f62590cdc13cfe2c3ee
-EBUILD graphicsmagick-1.3.38.ebuild 3648 BLAKE2B da1cf7a0a5c0e0561260966299e75b50524e926de039e59da23d3eee2d7bb23a35949965e271f3bb93933dbe287a616f4cc51dc4f9b24504d57d839b8b514447 SHA512 b288f52e832ee509c626af387ff6d754e0c3e42df6149ab5acc2a60465707a9dbc4d829db0da339c0595ff4ed5a880bf3b2a7b3cd76473dbcef21299aa463372
+EBUILD graphicsmagick-1.3.38.ebuild 3641 BLAKE2B 8e18031c113bc50d90bdf32f539f736a692430496576c48ebc6573cd4d5343e403af36b8ffb7bb1a22de94c5515330a479ae18b56cabab00f797065a4c7d0140 SHA512 38fea7dfdae7ad89a6047ca9552701f311293b24900cb7c0b618fcd7cb06065c2c0bf42f8a34610af354acd9c1d8c560d2e5fb3520e057db36ed7de10d71446d
 EBUILD graphicsmagick-9999.ebuild 3648 BLAKE2B da1cf7a0a5c0e0561260966299e75b50524e926de039e59da23d3eee2d7bb23a35949965e271f3bb93933dbe287a616f4cc51dc4f9b24504d57d839b8b514447 SHA512 b288f52e832ee509c626af387ff6d754e0c3e42df6149ab5acc2a60465707a9dbc4d829db0da339c0595ff4ed5a880bf3b2a7b3cd76473dbcef21299aa463372
 MISC metadata.xml 1405 BLAKE2B 450ce6e18c6debd66f923847912746cc3f522f923b2290e7815326cc9a8e4dfa9f57e0ed0d66ade4b09d71f6ecb2da810665530ae4876abcfd77dbbf0696829c SHA512 88d109fb876d4fef9dc7b9270c6418e8cc9820d6a085b0faabe647225ae4e5fa731335d7b45bb022a531eaf0ab4c9302be5a802603dd8ecc8ef484ba3bbf74ba
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.38.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.38.ebuild
index bd91b4160147..926fa312e060 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.38.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.38.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI+=" verify-sig? ( mirror://sourceforge/${PN}/${MY_P}.tar.xz.sig )"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bobfriesenhahn )"
 fi
diff --git a/media-gfx/jpeg2ps/Manifest b/media-gfx/jpeg2ps/Manifest
index 65b0681f5aa7..fcdfb9b3f39e 100644
--- a/media-gfx/jpeg2ps/Manifest
+++ b/media-gfx/jpeg2ps/Manifest
@@ -1,4 +1,4 @@
 AUX jpeg2ps-1.9-include.diff 226 BLAKE2B c290c4810d6cdb5c5ac577e1e55f15bf7a07c74198ee56cc05b43fa70a8d574b02c0fe476b94e079c93529140e6854136070031705a3cf92f3757badd21aee38 SHA512 fe60dfb3c79f3a513d07e3af17c7050cdbe0983e1887317f5ef2d2c7eb3c54431d6d9fec1469b918ac3461ca09cb4c73373b9affa00b43fb8412f464f4d5c3f4
 DIST jpeg2ps-1.9.tar.gz 67105 BLAKE2B 68df39df75525db872c683de7b0ed3e64317ea18a54d51fb478c3e51b26522a97081e6953e5ad92f7a6023829dc5fbc5e1e288f2041e76bdecf0b6ef035d1234 SHA512 babc6183db2c95d0bcfba3d34f924bd2a37d0a566bf684f3af3955b8b3978cd4b94b10e94f366aec641988258476f84ce730e4da43f2bb0a836e81da4892ad3c
-EBUILD jpeg2ps-1.9-r2.ebuild 1266 BLAKE2B c4db33c2e4545c6bfcf895230bceb9de3c3fd73be366900d9eed4d329433bdc8db36100b6a526b0c75060104f333d3a42d621310e236b23aceca4befa768066d SHA512 dccd7d490226819202ab3afbe763ca2f1b05e9e7eb760a46747de2b32394fc319a63c377c580eecbc0b60ab79a096b08f6878411c8aeb1a24b847d7e57fe3e60
+EBUILD jpeg2ps-1.9-r3.ebuild 1085 BLAKE2B 575b2e31506bd704c3ff9c0eb818c20de017ff848b29ac56ae726e317f14862cd0bf301b19ea628236bef9c6febc502d52a403405f4a507f5ee9fd755de8953e SHA512 f6735c73ad661716f8aa95f36d6e44d29c80996ba4ec54b5a289acbe1894331715efa5a073aea71c4e6e8a8afcbfb76daf79ad90656598e1c8a55b626e85a4e9
 MISC metadata.xml 284 BLAKE2B 4f3ebef5d4f1b4d77e8143a11d3c27313235279131a22882b223f6f03244ef60fba56df603f3e494853cfcfb95347e7e25450ababf4162df311b70de5bb4065e SHA512 b8cf447484032e9d62d706eb1507490ef65eb22e61125b003dbd4dd2bc19d7829edfe048ed28f049c44f584644bd938919461b72cb6a415f02214827db24fe8d
diff --git a/media-gfx/jpeg2ps/jpeg2ps-1.9-r2.ebuild b/media-gfx/jpeg2ps/jpeg2ps-1.9-r3.ebuild
similarity index 52%
rename from media-gfx/jpeg2ps/jpeg2ps-1.9-r2.ebuild
rename to media-gfx/jpeg2ps/jpeg2ps-1.9-r3.ebuild
index 9a25a5e30b7d..430fe4f17edc 100644
--- a/media-gfx/jpeg2ps/jpeg2ps-1.9-r2.ebuild
+++ b/media-gfx/jpeg2ps/jpeg2ps-1.9-r3.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs readme.gentoo-r1
 
 DESCRIPTION="Convert JPEG images to Postscript using a wrapper"
 HOMEPAGE="https://web.archive.org/web/20131003144811/http://www.pdflib.com/download/free-software/jpeg2ps/"
-SRC_URI="https://web.archive.org/web/20131003165952/http://www.pdflib.com/fileadmin/pdflib/products/more/${PN}/${P}.tar.gz"
+SRC_URI="https://distfiles.macports.org/${PN}/${P}.tar.gz"
 
-LICENSE="free-noncomm"
+LICENSE="jpeg2ps"
 SLOT="0"
 KEYWORDS="amd64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="metric"
+RESTRICT="mirror"
 
 PATCHES=("${FILESDIR}"/${P}-include.diff)
 
@@ -20,7 +21,7 @@ src_compile() {
 	emake \
 		CC="$(tc-getCC)" \
 		LD="$(tc-getCC)" \
-		CFLAGS="-c ${CFLAGS} $(usex metric "-DA4" "")" \
+		CFLAGS="-c ${CFLAGS} $(usev metric -DA4)" \
 		LDFLAGS="${LDFLAGS}"
 }
 
@@ -29,15 +30,11 @@ src_install() {
 	doman jpeg2ps.1
 	dodoc jpeg2ps.txt
 
-	if use metric; then
-		DOC_CONTENTS="By default, this installation of jpeg2ps will generate
-			A4 size output.  You can force letter output with
-			\n\tjpeg2ps -p letter file.jpg > file.ps"
-	else
-		DOC_CONTENTS="By default, this installation of jpeg2ps will generate
-			letter size output.  You can force A4 output with
-			\n\tjpeg2ps -p a4 file.jpg > file.ps"
-	fi
+	local size1=letter size2=A4
+	use metric && size1=A4 size2=letter
+	DOC_CONTENTS="By default, this installation of jpeg2ps will generate
+		${size1} size output. You can force ${size2} output with
+		\n\tjpeg2ps -p ${size2} file.jpg > file.ps"
 	readme.gentoo_create_doc
 }
 
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 7a89c71a1c6b..2352561d63f2 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,7 +1,4 @@
 AUX krita-4.3.1-tests-optional.patch 2583 BLAKE2B 0b5e577bc17ef6b6487ce82ff4b4bc34064c659a3cf48d12a539c3029dd70f17b0b48a7398b68de6a937adff3af0c2d4a47d0f84fdc7746ec612fb05272d963f SHA512 f16885a72cd5f8f250b03903062c70190367ed409c2582d579bfb1e6ab09514df7f96214ce236e33bb8eec2f3872d887f9c3152f4e524b1719250a9064bf719c
-AUX krita-5.0.0-clang.patch 1645 BLAKE2B 9f02317b40b2408cab46acbe73797c2fea9b71ca543e0c7787b2f66a088a79d121e80ee7f4d57cef125e7f73de438c60f6e24dfe00b179a1e4452058b12391e7 SHA512 b5ce85eb346e518f51c4b5c8a18056801839deeb9826e02625171e123e3d46bf8503c4d1ac49477d44231efc14e6fe8c85c79cc8cf262326cf10c364e89d1ebd
-DIST krita-5.0.2.tar.xz 179049488 BLAKE2B a58ee0e7d654f18509f970d32a680a9a993c7172a3818517ddf0a41f500c2d1f9102a432b728b9d9254f39f1be0c926602e3b1806ae19b6efc49f99becdffcdd SHA512 5dd2d6961feabf20dbcef49f3499281e34b409e96d379b0247eec70449f82c05ed3cf3ca09014535adb7ce66659d58e988f1f054364637c9851181fa8ee926a5
 DIST krita-5.0.8.tar.xz 179344256 BLAKE2B f8a020b726c2b4f7776b3a31d18028d19f274243fa085ca49e46cd06c2d9e4f8f166e4d77018b1bef7ef2820962759f362e3d00274b3bbb33ac1544ce17d5682 SHA512 652a24206f955739dbd188f4c35d10fdfe42bb660f4e046f15a31ee90647786b501e4ad8760c0656b24aa5fbdeda0c009b744dfc16a92cf545c2147a5ad1c777
-EBUILD krita-5.0.2.ebuild 3456 BLAKE2B 03fa9d1f87eea0812835aa88912f84ed9d25c738b71f0dc65f9075f2797d4d2e60824728347884dd69c23bce15666c30e6fd7e2dcdf967bc532f7df83494f3a8 SHA512 a0f4c50826a39e04cf87ace6eddd4a5ab37fdeea3d7c8f8bf53750abf69f1ba73b5c73b5fa0241f6d44ad6c4c2b504fec4a87831ac0c1be9e2045207be0da7a0
-EBUILD krita-5.0.8.ebuild 3417 BLAKE2B a070340934c3359d0391cc9efe8a237a76324ba6bb0018fb2b8c3421cafc985b4492f713d5453cb1fe961683aebfda82c93daf8f8fdc1ce430e8bdb8ce89343c SHA512 2d9013ef45be7f4404e46c725ed711ef482dd4921acf7182553dc280b3884171883e4d3c0e87275a22ed706f5f8e2e6bde91d8aecb812271d21d508317f786dd
+EBUILD krita-5.0.8.ebuild 3416 BLAKE2B 4891ca77953967c57d6ee6c4bdfa58473e67241b45d1985512791aa47e859e894d2a10eebd03f533fbe2a79ca8d4993950db1158a2be9f5c446c8afeaa4c8ef3 SHA512 c03f5fbf97d72a5efac3abe004e533458c3debec2fa05e821354b1de6da759c82ce31e9a343b06a85e5e3a4a905d6e2125cda90e728c72837178353f44b59f0d
 MISC metadata.xml 877 BLAKE2B 529639e044480796204d2338601d4d10ccac0aa83565469b37d838446b4e924b8440c1c3d1eac1473a1220fedea2c49c392c5c99495c27ab7899ed7909666c32 SHA512 6f826baa1918ed944b22944f85304452d34b3a326c615ba8416589facc0208351b25d6eed9a3f8b0f3614db6c3ddd26b0b54554da95aee8ed332f1645d6fda0d
diff --git a/media-gfx/krita/files/krita-5.0.0-clang.patch b/media-gfx/krita/files/krita-5.0.0-clang.patch
deleted file mode 100644
index 6c9c71d4fca2..000000000000
--- a/media-gfx/krita/files/krita-5.0.0-clang.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 0b755beaa1fdba03d38f887b93a15a58fc0830c7 Mon Sep 17 00:00:00 2001
-From: Sharaf Zaman <shzam@sdf.org>
-Date: Wed, 27 Oct 2021 22:19:07 +0000
-Subject: [PATCH] Fix build on linux clang targets
-
-In CheckAtomic.cmake we include is_lock_free because these routines
-don't seem to be included in the compiler's "simple atomics". This
-triggers a failure in clang toolchain, forcing it to link libatomic.
-
-Resulting in error: ld.lld: error: undefined symbol: __atomic_is_lock_free
-
-CCBUG:444247
-CCBUG:444547
----
- cmake/modules/CheckAtomic.cmake | 1 +
- libs/image/CMakeLists.txt       | 6 ++----
- 2 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/cmake/modules/CheckAtomic.cmake b/cmake/modules/CheckAtomic.cmake
-index b061e2d65b..df6b70504c 100644
---- a/cmake/modules/CheckAtomic.cmake
-+++ b/cmake/modules/CheckAtomic.cmake
-@@ -46,6 +46,7 @@ function(check_working_cxx_atomics64 varname)
- 	std::atomic<uint64_t> x (0);
- 	int main() {
- 		uint64_t i = x.load(std::memory_order_relaxed);
-+		x.is_lock_free();
- 		return 0;
- 	}
- 	" ${varname})
-diff --git a/libs/image/CMakeLists.txt b/libs/image/CMakeLists.txt
-index e883c7f1c8..43c945fad3 100644
---- a/libs/image/CMakeLists.txt
-+++ b/libs/image/CMakeLists.txt
-@@ -372,10 +372,8 @@ target_link_libraries(kritaimage
- 
- target_link_libraries(kritaimage PUBLIC ${Boost_SYSTEM_LIBRARY})
- 
--if(NOT HAVE_CXX_ATOMICS_WITHOUT_LIB)
--    if(NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB)
--        target_link_libraries(kritaimage PUBLIC atomic)
--    endif()
-+if(HAVE_CXX_ATOMICS_WITH_LIB OR HAVE_CXX_ATOMICS64_WITH_LIB)
-+   target_link_libraries(kritaimage PUBLIC atomic)
- endif()
- 
- if(OpenEXR_FOUND)
--- 
-GitLab
-
diff --git a/media-gfx/krita/krita-5.0.2.ebuild b/media-gfx/krita/krita-5.0.2.ebuild
deleted file mode 100644
index 0c5864b918f4..000000000000
--- a/media-gfx/krita/krita-5.0.2.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{8..10} )
-KFMIN=5.82.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
-fi
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
-HOMEPAGE="https://apps.kde.org/krita/ https://krita.org/en/"
-
-LICENSE="GPL-3"
-SLOT="5"
-IUSE="color-management fftw gif +gsl heif +jpeg +mypaint-brush-engine openexr pdf qtmedia +raw vc webp"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# bug 630508
-RESTRICT="test"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/boost:=
-	dev-libs/quazip:0=
-	$(python_gen_cond_dep '
-		dev-python/PyQt5[declarative,gui,widgets,${PYTHON_USEDEP}]
-		dev-python/sip:=[${PYTHON_USEDEP}]
-	')
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5=[-gles2-only]
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	media-gfx/exiv2:=
-	media-libs/lcms
-	media-libs/libpng:0=
-	media-libs/tiff:0
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXi
-	color-management? ( >=media-libs/opencolorio-2.0.0 )
-	fftw? ( sci-libs/fftw:3.0= )
-	gif? ( media-libs/giflib )
-	gsl? ( sci-libs/gsl:= )
-	jpeg? ( virtual/jpeg:0 )
-	heif? ( >=media-libs/libheif-1.11:= )
-	mypaint-brush-engine? ( media-libs/libmypaint:= )
-	openexr? ( media-libs/openexr:= )
-	pdf? ( app-text/poppler[qt5] )
-	qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 )
-	raw? ( media-libs/libraw:= )
-	webp? ( >=media-libs/libwebp-1.2.0:= )
-"
-DEPEND="${RDEPEND}
-	vc? ( >=dev-libs/vc-1.1.0 )
-"
-BDEPEND="
-	dev-cpp/eigen:3
-	dev-lang/perl
-	sys-devel/gettext
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.3.1-tests-optional.patch
-	"${FILESDIR}"/${PN}-5.0.0-clang.patch # bug 830225
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_configure() {
-	# Prevent sandbox violation from FindPyQt5.py module
-	# See Gentoo-bug 655918
-	addpredict /dev/dri
-
-	local mycmakeargs=(
-		-DENABLE_UPDATERS=OFF
-		-DFETCH_TRANSLATIONS=OFF
-		-DCMAKE_DISABLE_FIND_PACKAGE_KSeExpr=ON # not packaged
-		$(cmake_use_find_package color-management OpenColorIO)
-		$(cmake_use_find_package fftw FFTW3)
-		$(cmake_use_find_package gif GIF)
-		$(cmake_use_find_package gsl GSL)
-		$(cmake_use_find_package heif HEIF)
-		$(cmake_use_find_package jpeg JPEG)
-		$(cmake_use_find_package mypaint-brush-engine LibMyPaint)
-		$(cmake_use_find_package openexr OpenEXR)
-		$(cmake_use_find_package pdf Poppler)
-		$(cmake_use_find_package qtmedia Qt5Multimedia)
-		$(cmake_use_find_package raw LibRaw)
-		$(cmake_use_find_package vc Vc)
-		$(cmake_use_find_package webp WebP)
-	)
-
-	ecm_src_configure
-}
diff --git a/media-gfx/krita/krita-5.0.8.ebuild b/media-gfx/krita/krita-5.0.8.ebuild
index dd01742d3d40..4f7f33b41aa6 100644
--- a/media-gfx/krita/krita-5.0.8.ebuild
+++ b/media-gfx/krita/krita-5.0.8.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org python-single-r1
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
diff --git a/media-gfx/povray/Manifest b/media-gfx/povray/Manifest
index 7acdb5ce1d4e..1eba2cc9f80a 100644
--- a/media-gfx/povray/Manifest
+++ b/media-gfx/povray/Manifest
@@ -5,6 +5,6 @@ AUX povray-3.7.0.0-user-conf.patch 1491 BLAKE2B ee99672c70a5d7e12048acbfc50a3ef4
 AUX povray-3.7.0_rc6-darwin-defaults.patch 920 BLAKE2B 9cffcda18626cfdbea9a6b00ae99ee300d6b29a79e22229e35d116070b4a1ac1fbb4869242a043155a4fa189f701e6bc318cd3ba8fbc743d497db26c763926c8 SHA512 17ae635430f0d57157c9915ce5b25a88afcb34f6dd9552b27a42b32d638fdfbcb8b4e41ec89b52048db9d054812535b7b41f328ffe4554e719e4a3de21cbfdee
 DIST povray-3.7.0.0.tar.gz 38191521 BLAKE2B 5d936bdcdf9910ede2247cfa5e3881211da00762ac4bc08225dc6b53addc9e09546de9493e642b5d41228d81a50a4bcfbb5e606eb8bd9a224bb1afc5fc82db6e SHA512 82e3dbcd58b7ae921fe3b953815ca4dbbfb22eda434554baee4accabd1455b18cb511061f1cf9cf93128fab0a042df374fe2f68186d78c19853a465bd4bcbe10
 DIST povray-3.7.0.0_p20160914-fix-c++14.patch.bz2 12876 BLAKE2B b1c458764f04a57420a4562e9faacae4ae955c3d9ce4343ffd49176bb575f63830fcd58d0777dea22b975df118aa14e2bdd91509758d33d659daa3fbbaba5880 SHA512 3329da12a822762559445e208a746ff208c39f7b63e27ba84a390074bb52a105c9a2f66180e58c5157795bb16346e11b5b05efaf077ee0d8246179975a692b04
-EBUILD povray-3.7.0.0-r1.ebuild 4577 BLAKE2B c5edb1f915f7c15ffb8bebde40871f211cb45afc7b94e38f1ec4cfbee40eb6089d28513f5d82e123185c73703a329b0533f0e7605cbeb15e1a1f6d85ab4f14fe SHA512 4246b7b86fa1cb2807b5899580935055380b82ef861405f70700d1be90ba802ddc295424e6a9a16109d2bc90b28864b3ee56247097fc2c22f786039842dc0fd1
-EBUILD povray-3.7.0.0-r2.ebuild 4532 BLAKE2B 3d0da25887bedd5c518fda764a63b45798f3ee542d81261d0c06a79bc557e8bcfa0d59bd44c837403a1285a0833eb3ce17544bd32015693452dc25e6c305cb60 SHA512 8ba3beef14efab23e60afd31947f98a22d7624ae9ff0742ea074041e599c16c76da3d8c2f22fb2139203a376ffdf995cc6277ae4c5e124c8efa17a588fa44988
+EBUILD povray-3.7.0.0-r1.ebuild 4579 BLAKE2B ec03365137273c92b56ace4e11f89bfb7df4acc55f7f8529f72c31938a1a69a65e5356119e8e6162542c1b744b89a9f061b0a84622059526b04c5c9f245facc9 SHA512 7a0c909d8edf0348a8dcdf306e3bef4f43de005b0218f9364797d62c7c2c3c30fd340386c0856aacbded7e3ed1171cd6822574c2d6f01a3ed8aa249c50d1de9d
+EBUILD povray-3.7.0.0-r2.ebuild 4538 BLAKE2B d694fd6c2f06fb94d77266540684252878cf9779ed2e8f5f6e33aab84ae3b70cf58b189fe8fff810bbda2a0c913c640f528f0a70d26e0bdd9d268cf895b3f18a SHA512 d5d1001aa7aa44a26daa4598a45ac5b5e2619b69b44f5323800f32f2e039cc44826123d824a0474885ba9627568323ce460baea301da665b4f698b68a938385c
 MISC metadata.xml 410 BLAKE2B e2d166cc7ed5872c7e0bdcf69c7856bd8218b059e9b0444a68930216c423ef7c8922ad963cfc3dc56f0d997c1a6372a04058815eb2b36487d07dbc6752908e2d SHA512 c159e2c730bba95d7c65525d62af05bd5b9d873a519e734010a8e5bc597590147accfe02e23946f0349c0be31a10b3e578d035bc3ff8d11a11274c1957a834be
diff --git a/media-gfx/povray/povray-3.7.0.0-r1.ebuild b/media-gfx/povray/povray-3.7.0.0-r1.ebuild
index ff38982430aa..1bca37a88528 100644
--- a/media-gfx/povray/povray-3.7.0.0-r1.ebuild
+++ b/media-gfx/povray/povray-3.7.0.0-r1.ebuild
@@ -73,8 +73,8 @@ src_prepare() {
 		-e 's:${povdatadir}/$PACKAGE-$VERSION_BASE:${povdatadir}/'${PN}':g' \
 		-e 's:${povdatadir}/doc/$PACKAGE-$VERSION_BASE:${povdatadir}/doc/'${PF}':g' \
 		-e 's:BOOST_THREAD_LIBS $LIBS:BOOST_THREAD_LIBS $LIBS -lboost_date_time:g' \
-		-e 's:"/usr/include":"'${EPREFIX}'/usr/include":' \
-		-e 's:"/usr/lib":"'${EPREFIX}'/usr/'$(get_libdir)'":' \
+		-e "s:\"/usr/include\":\"${EPREFIX}/usr/include\":" \
+		-e "s:\"/usr/lib\":\"${EPREFIX}/usr/$(get_libdir)\":" \
 		-i configure.ac || die
 
 	sed \
diff --git a/media-gfx/povray/povray-3.7.0.0-r2.ebuild b/media-gfx/povray/povray-3.7.0.0-r2.ebuild
index a06a580bf170..d9ac74594419 100644
--- a/media-gfx/povray/povray-3.7.0.0-r2.ebuild
+++ b/media-gfx/povray/povray-3.7.0.0-r2.ebuild
@@ -70,8 +70,8 @@ src_prepare() {
 		-e 's:${povdatadir}/$PACKAGE-$VERSION_BASE:${povdatadir}/'${PN}':g' \
 		-e 's:${povdatadir}/doc/$PACKAGE-$VERSION_BASE:${povdatadir}/doc/'${PF}':g' \
 		-e 's:BOOST_THREAD_LIBS $LIBS:BOOST_THREAD_LIBS $LIBS -lboost_date_time:g' \
-		-e 's:"/usr/include":"'${EPREFIX}'/usr/include":' \
-		-e 's:"/usr/lib":"'${EPREFIX}'/usr/'$(get_libdir)'":' \
+		-e "s:\"/usr/include\":\"${EPREFIX}/usr/include\":" \
+		-e "s:\"/usr/lib\":\"${EPREFIX}/usr/$(get_libdir)\":" \
 		-i configure.ac || die
 
 	sed \
@@ -99,7 +99,7 @@ src_configure() {
 	# but the code compiles using incorrect [default] paths
 	# (based on /usr/local...), so povray will not find the system
 	# config files without the following fix:
-	append-cppflags -DPOVLIBDIR=\\\"${EROOT}usr/share/${PN}\\\" -DPOVCONFDIR=\\\"${EROOT}etc/${PN}\\\"
+	append-cppflags -DPOVLIBDIR=\\\""${EROOT}"usr/share/${PN}\\\" -DPOVCONFDIR=\\\""${EROOT}"etc/${PN}\\\"
 
 	# TODO: Restore OpenEXR if upstream start to support OpenEXR 3/imath
 	econf \
diff --git a/media-gfx/tuxpaint/Manifest b/media-gfx/tuxpaint/Manifest
index 05e2ec2bf9c6..bf5e7ca69542 100644
--- a/media-gfx/tuxpaint/Manifest
+++ b/media-gfx/tuxpaint/Manifest
@@ -2,5 +2,5 @@ AUX tuxpaint-0.9.27-Makefile.patch 7328 BLAKE2B 87a63107058b61387c9e9e9555e106ee
 DIST tuxpaint-0.9.24.tar.gz 15561675 BLAKE2B 971baec8b7728cbb54a2a45b604c152a9620d0f6a1856cca99482ad0fd76f2a4493aab81f54e10e5da4d81800b0e3506cb73dda0e00510ef966b0c98f8aa5cb4 SHA512 a4ee9eea833f9a6313701a4686f9f276570df84436c68d9a3d04e9448a8ea00833207e1034965e15145be744194c7b9a7d3c91bdfa3489d06a61de84b64cc723
 DIST tuxpaint-0.9.27.tar.gz 14292992 BLAKE2B f1337b828604bac968325437eba21046f871a0e07e049f2d3568f44adac400e729f4c6d46bcba9eddf9078089aaf55aab7d0774fb5ab126b96d317b59e37ee00 SHA512 197c6e23fb772edd57614e34dec23e160ece528b58e4a17d67fe4100c58cbcd6c4b5efccfbb24ca760b3a20755230b47f4e3e49969e75ba04ce722102a7f2dd9
 EBUILD tuxpaint-0.9.24-r1.ebuild 1646 BLAKE2B 9c716616a56836e366dde79a3a944387a3dea15f54a20e95623234dbc9c75873166fcca9df3293cc5b3106618abbc09bb5ad8170433cceaaa5cdcf8babe05520 SHA512 aae79850b1e031edad079010423963491c4b2eacc0fa0a5e734a9ccdd318c667b8f5102ae626f994d7c9c1ce4c63680806690a5a77c31c1a87dae4163618f235
-EBUILD tuxpaint-0.9.27.ebuild 1346 BLAKE2B 950329a51d3409e6950f500206cfa753f6a1893b8cec32e2d5501f8e0605f5a1f11a66d0f6e05ea177ca1615f60d9bbde9c93d5d7e597743a90506084a8a39ea SHA512 4b488c3739b21bfe29cb2b2d834e6b81425b5118b23313bb7e55ce24a9eba616935e3b7f0d030cb54820acd09dda6e0910274c8f2d9638f712b96a0e48d6495e
+EBUILD tuxpaint-0.9.27.ebuild 1346 BLAKE2B 4d7da71f66a651c344c7fad01bd2f4d5c96500213f8a7cb8f2e70e2a939637fb90e5c474c186c90f430760b731c990b732ee7047d2c42c9ad34efe1376b78f50 SHA512 88630426d6692dc70e12e6eb765b48f122f913b9175225ab18bc300299af607626fef4b8da9172ceddd22a56631ce0987ec49522488695533844a7eba20f355d
 MISC metadata.xml 846 BLAKE2B 41e02607ee8987a7663ba72e7459a1845b73d9992e4939322db2b4ce654d06efb0d5acc935decb776aa50a20990244d0e422e4c32532fa0f17a76a9a637ac734 SHA512 59465c99f8f91e4def6ffd37f7bcfd22cb208c1f9dcbdd11c764e4f55d1e9db75169254b9ca3ed7642f57d45d4d10e9f97c80d5139cb0b80ccd20dc540185ade
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild
index e66114bec40f..b9d1e8f71b96 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild
@@ -36,7 +36,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	${FILESDIR}"/${P}-Makefile.patch"
+	"${FILESDIR}"/${P}-Makefile.patch
 )
 
 src_compile() {
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 5ee5d57770db..63df23a9031a 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/fcft/Manifest b/media-libs/fcft/Manifest
index abdd61e0f321..a3fe29c2143e 100644
--- a/media-libs/fcft/Manifest
+++ b/media-libs/fcft/Manifest
@@ -1,9 +1,3 @@
-DIST fcft-3.0.0.tar.gz 441458 BLAKE2B 9ff83691435953285f1b3f8b51dac7b17453a457eeb910f035e39c6fa3bb39098d3adbb7179f734261a4034e9ea8b034dd03a20ba0c364b7de2efe9b781dfdaa SHA512 fbf7ac7d777bdb530b90b79a0bd8b90d3f7ae8b099c2733304dbe89fbcc1a1a3493d1eac0478bcdee291d8c804da21461737fc3e34164637e86ff737023622b1
-DIST fcft-3.0.1.tar.gz 441493 BLAKE2B 79fe864edf04b21fe88fa167e3390836e5c7254710082312068ff4c39624508e086f4eed2ea5706b52421b2276a6f2d1f2211ff0b256112d989764e667c44fe2 SHA512 856bec504a253678a2962c0a7c5029e5fd3d26e305ca3fcae8d9df398bcc84a03e9d67522673d1f1bb0ec91606c0627d6ab4bf2780cbb5965a01c91e6f0aac89
-DIST fcft-3.1.1.tar.gz 741229 BLAKE2B ef3fdca8f88893f0c69ed48181dce2a185d5e67ba6fc94d2f782b64f3078700c6be909560448f2625d43517f94aac2d82f58df29804b0fae5a72372a5b4a4004 SHA512 0344fc55906dee2588162f805ad703fe0efd26f3a8ce794273721d6111dd29bdb3589bd863f24998346018932f78b4c2dc04c4e2c8b49286db1efa9ecbc5521f
 DIST fcft-3.1.2.tar.gz 741659 BLAKE2B d4c3b9ef444771f255b7b19e9645d53558caed2022a59759418fe0b9961f74833da2b760c0c961ce5fbbf91f3e0291dd87590fe00ab300ee194a497accba392e SHA512 b3874819ef90a4f1d1975cae72b925c928bc9758629e63b2083dab807166133bc68308ba4f9481c34c9e0b5262a1d2558e47cccf6ce9d34516583e48d03a5bf9
-EBUILD fcft-3.0.0.ebuild 1906 BLAKE2B 4a2c567813b6947cbc89f205c22a76417fb19ef4bbf713fd7f61c09844e3695c240127dfbc90ccfaeabb896ed57f4b5fc5845cea852c375f564688c2bb7a7b29 SHA512 a9d243893214558c2880dc88b22bc4b067443260dde458e65f522393cc25b62161a998ca5538b36e809a6f9bc85a2c24475681503dc0acba6b1433698e572aa6
-EBUILD fcft-3.0.1.ebuild 1913 BLAKE2B 36c71794b51cb292b37414e3e6eb28dc4cf23059d05e93a3687e942041f3be559ebc10043582b70e72f650fd293fef294a8232dc38a28d65c8d5a3c7135cceab SHA512 4ea3339610d70a4b2ef89299bc07078e2b315ecece7dc0a52e5a956ab457124244dfd4b9cb89ad6d61286296bf6742fc2b4585a5728a641fe92a2f6f7cd5ddff
-EBUILD fcft-3.1.1.ebuild 2044 BLAKE2B daf9be8f94f76b295acada65b45281c348ab4811100b1971425cad04bbfbf7ad01d14ede331c90b456a5c78d434e78c0e575ae7a1ba1208fbcb7c7b03f7ffa99 SHA512 ba13cfec251ad817b6143bc866d24cea3867dec75692cdba9acf21e26306a6f86cad4208212e93e082cca86eb1ef19d577aef0fc42806bcb64d8b4c9a6faea8c
-EBUILD fcft-3.1.2.ebuild 2044 BLAKE2B daf9be8f94f76b295acada65b45281c348ab4811100b1971425cad04bbfbf7ad01d14ede331c90b456a5c78d434e78c0e575ae7a1ba1208fbcb7c7b03f7ffa99 SHA512 ba13cfec251ad817b6143bc866d24cea3867dec75692cdba9acf21e26306a6f86cad4208212e93e082cca86eb1ef19d577aef0fc42806bcb64d8b4c9a6faea8c
+EBUILD fcft-3.1.2-r1.ebuild 2073 BLAKE2B cb0345c7f705f89bd909f784af5b92ec01fd5ae1f76f58036274bb1970c155dc18fe7654bc61abe9ecebfbb29f847c5b01278bfb36965829ba3a1bce157da596 SHA512 038dedc345cda97558e4cfb78d27d5615fdccdbf70219b056a8a3d9116fb264cdea95854c8b5b9ce77393a60196dd5a847204e05b91b2c9cbe6d3aabf369d7cf
 MISC metadata.xml 631 BLAKE2B 464952a9c2b5959cbcb732323c54d57c4e67cb65efe87b4fe63b8369568531b0c6a0988990ea1756ee6012f81e6226600d638f2008fcdf452da36adeb5e204c0 SHA512 c2d704df7eeb25403bdbb7bd39c58c20d3c95dcf1c00051b8b558389344f9176fd4027349337ac7bb29249feefc997d0ef38e4ddc611d13a0c04a7880c048164
diff --git a/media-libs/fcft/fcft-3.0.0.ebuild b/media-libs/fcft/fcft-3.0.0.ebuild
deleted file mode 100644
index 32aafcd56690..000000000000
--- a/media-libs/fcft/fcft-3.0.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit meson python-any-r1
-
-DESCRIPTION="Simple library for font loading and glyph rasterization"
-HOMEPAGE="https://codeberg.org/dnkl/fcft"
-SRC_URI="https://codeberg.org/dnkl/fcft/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="examples +harfbuzz +libutf8proc test"
-REQUIRED_USE="
-	libutf8proc? ( harfbuzz )
-	examples? ( libutf8proc )
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	media-libs/fontconfig
-	media-libs/freetype
-	x11-libs/pixman
-	examples? (
-		dev-libs/libutf8proc:=
-		dev-libs/wayland
-	)
-	harfbuzz? (
-		media-libs/harfbuzz:=
-	)
-	libutf8proc? (
-		dev-libs/libutf8proc:=
-	)
-"
-DEPEND="
-	${RDEPEND}
-	app-i18n/unicode-data
-	dev-libs/tllist
-	examples? (
-		dev-libs/wayland-protocols
-	)
-	test? (
-		dev-libs/check
-		harfbuzz? ( media-fonts/noto-emoji )
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	app-text/scdoc
-	examples? (
-		dev-util/wayland-scanner
-	)
-"
-
-src_prepare() {
-	default
-
-	rm -r unicode || die "Failed removing vendored unicode-data"
-
-	sed -i "s;unicode/UnicodeData.txt;${EPREFIX}/usr/share/unicode-data/UnicodeData.txt;" \
-		meson.build || die "Failed changing UnicodeData.txt to system's copy"
-	sed -i "s;unicode/emoji-data.txt;${EPREFIX}/usr/share/unicode-data/emoji/emoji-data.txt;" \
-		meson.build || die "Failed changing emoji-data.txt to system's copy"
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature harfbuzz grapheme-shaping)
-		$(meson_feature libutf8proc run-shaping)
-		$(meson_use examples)
-		$(use test && meson_use harfbuzz test-text-shaping)
-		-Ddocs=enabled
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	local DOCS=( CHANGELOG.md README.md )
-	meson_src_install
-
-	rm -r "${ED}"/usr/share/doc/${PN} || die
-
-	use examples && newbin "${BUILD_DIR}/example/example" fcft-example
-}
diff --git a/media-libs/fcft/fcft-3.0.1.ebuild b/media-libs/fcft/fcft-3.0.1.ebuild
deleted file mode 100644
index 075480c9464a..000000000000
--- a/media-libs/fcft/fcft-3.0.1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit meson python-any-r1
-
-DESCRIPTION="Simple library for font loading and glyph rasterization"
-HOMEPAGE="https://codeberg.org/dnkl/fcft"
-SRC_URI="https://codeberg.org/dnkl/fcft/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="examples +harfbuzz +libutf8proc test"
-REQUIRED_USE="
-	libutf8proc? ( harfbuzz )
-	examples? ( libutf8proc )
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	media-libs/fontconfig
-	media-libs/freetype
-	x11-libs/pixman
-	examples? (
-		dev-libs/libutf8proc:=
-		dev-libs/wayland
-	)
-	harfbuzz? (
-		media-libs/harfbuzz:=
-	)
-	libutf8proc? (
-		dev-libs/libutf8proc:=
-	)
-"
-DEPEND="
-	${RDEPEND}
-	app-i18n/unicode-data
-	dev-libs/tllist
-	examples? (
-		dev-libs/wayland-protocols
-	)
-	test? (
-		dev-libs/check
-		harfbuzz? ( media-fonts/noto-emoji )
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	app-text/scdoc
-	examples? (
-		dev-util/wayland-scanner
-	)
-"
-
-src_prepare() {
-	default
-
-	rm -r unicode || die "Failed removing vendored unicode-data"
-
-	sed -i "s;unicode/UnicodeData.txt;${EPREFIX}/usr/share/unicode-data/UnicodeData.txt;" \
-		meson.build || die "Failed changing UnicodeData.txt to system's copy"
-	sed -i "s;unicode/emoji-data.txt;${EPREFIX}/usr/share/unicode-data/emoji/emoji-data.txt;" \
-		meson.build || die "Failed changing emoji-data.txt to system's copy"
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature harfbuzz grapheme-shaping)
-		$(meson_feature libutf8proc run-shaping)
-		$(meson_use examples)
-		$(use test && meson_use harfbuzz test-text-shaping)
-		-Ddocs=enabled
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	local DOCS=( CHANGELOG.md README.md )
-	meson_src_install
-
-	rm -r "${ED}"/usr/share/doc/${PN} || die
-
-	use examples && newbin "${BUILD_DIR}/example/example" fcft-example
-}
diff --git a/media-libs/fcft/fcft-3.1.1.ebuild b/media-libs/fcft/fcft-3.1.1.ebuild
deleted file mode 100644
index bedcbca8b1f5..000000000000
--- a/media-libs/fcft/fcft-3.1.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit meson python-any-r1
-
-DESCRIPTION="Simple library for font loading and glyph rasterization"
-HOMEPAGE="https://codeberg.org/dnkl/fcft"
-SRC_URI="https://codeberg.org/dnkl/fcft/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}"
-
-# MIT for fcft
-# ZLIB for nanosvg
-LICENSE="MIT ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="examples +harfbuzz +libutf8proc test"
-REQUIRED_USE="
-	libutf8proc? ( harfbuzz )
-	examples? ( libutf8proc )
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	media-libs/fontconfig
-	media-libs/freetype
-	x11-libs/pixman
-	examples? (
-		dev-libs/libutf8proc:=
-		dev-libs/wayland
-	)
-	harfbuzz? (
-		media-libs/harfbuzz:=
-	)
-	libutf8proc? (
-		dev-libs/libutf8proc:=
-	)
-"
-DEPEND="
-	${RDEPEND}
-	app-i18n/unicode-data
-	dev-libs/tllist
-	examples? (
-		dev-libs/wayland-protocols
-	)
-	test? (
-		dev-libs/check
-		harfbuzz? ( media-fonts/noto-emoji )
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	app-text/scdoc
-	examples? (
-		dev-util/wayland-scanner
-	)
-"
-
-src_prepare() {
-	default
-
-	rm -r unicode || die "Failed removing vendored unicode-data"
-
-	sed -i "s;unicode/UnicodeData.txt;${EPREFIX}/usr/share/unicode-data/UnicodeData.txt;" \
-		meson.build || die "Failed changing UnicodeData.txt to system's copy"
-	sed -i "s;unicode/emoji-data.txt;${EPREFIX}/usr/share/unicode-data/emoji/emoji-data.txt;" \
-		meson.build || die "Failed changing emoji-data.txt to system's copy"
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature harfbuzz grapheme-shaping)
-		$(meson_feature libutf8proc run-shaping)
-		$(meson_use examples)
-		$(use test && meson_use harfbuzz test-text-shaping)
-		# bundled, tiny, I believe this means we should always include it
-		-Dsvg-backend=nanosvg
-		-Ddocs=enabled
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	local DOCS=( CHANGELOG.md README.md )
-	meson_src_install
-
-	rm -r "${ED}"/usr/share/doc/${PN} || die
-
-	use examples && newbin "${BUILD_DIR}/example/example" fcft-example
-}
diff --git a/media-libs/fcft/fcft-3.1.2.ebuild b/media-libs/fcft/fcft-3.1.2-r1.ebuild
similarity index 95%
rename from media-libs/fcft/fcft-3.1.2.ebuild
rename to media-libs/fcft/fcft-3.1.2-r1.ebuild
index bedcbca8b1f5..9ecda1e5c4a3 100644
--- a/media-libs/fcft/fcft-3.1.2.ebuild
+++ b/media-libs/fcft/fcft-3.1.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit meson python-any-r1
 
 DESCRIPTION="Simple library for font loading and glyph rasterization"
@@ -32,7 +32,7 @@ RDEPEND="
 		dev-libs/wayland
 	)
 	harfbuzz? (
-		media-libs/harfbuzz:=
+		media-libs/harfbuzz:=[truetype]
 	)
 	libutf8proc? (
 		dev-libs/libutf8proc:=
@@ -53,6 +53,7 @@ DEPEND="
 BDEPEND="
 	${PYTHON_DEPS}
 	app-text/scdoc
+	virtual/pkgconfig
 	examples? (
 		dev-util/wayland-scanner
 	)
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index d3e0ebd86baf..64f13e8d2106 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -3,7 +3,7 @@ DIST harfbuzz-3.4.0.tar.gz 29043149 BLAKE2B 7b779149b34353ebb85143f74e9efdd8f8ba
 DIST harfbuzz-4.2.1.tar.gz 29096419 BLAKE2B eb523c2e3c956559e2445bd12719b14c244cfdedd239041afec71a17912e489adb94c0b6fe148c60ae9e908cc3e740752de2a33a255c123ef937debe6008d78b SHA512 de14b673f6bd03d561c45f94e9bda44ee41897a643ab8837493260a83b1eb1f1ca0fe105c1bee241f2ecd6ab869dbccf3ffba8e2c4ee9a3a1fca4e1c6c7ca4f3
 DIST harfbuzz-4.3.0.tar.gz 29200217 BLAKE2B dfe5e3b47e3d89a5ad7c6eaf6d274027a0eb05d1994b922d3124c97270f34353384c0161d8815fb2e379e82c8bdf046843902ba53db38daa4348e99d99255900 SHA512 bccf7cfb06ac18a9a9bf465c30dbfb51d73762a6667b3a069a85f9f597e6d27858e9e39a36cce12e23ec5b002b9e572638bf00c76bdea66545ae67a2bb7915f4
 EBUILD harfbuzz-3.4.0-r1.ebuild 2626 BLAKE2B 7b50e89680cea5a8eb4dd83428747639d57f8c5978f40504ef28250626c8409fd0b7a3794ba511e02049d14931b93f65215fdfa19c5a9ab6bfca08fe88c2bca9 SHA512 493089edcfdea0f074e83b34c5fd54c1beeddd2762bc5874877081833c0ba74d431f428c2fe1e18cd8436fabedbb39bf9f1f46c8d276e22c2efd61c0b6b43006
-EBUILD harfbuzz-4.2.1.ebuild 2575 BLAKE2B a596a284cac83406c48a9005edccaee46dfaa8cfb5485e353c7122955ed9f27b75dfac3e66ab76e85e9b50f824d08d5c601d0497b6fecdc9f98972e7c2f6438a SHA512 c613f3da31807784500cc321d5aea1f999700a325ad92fe7547870cb5d4facd8a99bdf337b2959171bb48ab3361fd4208a4bd70e8532bf5ab0b89d7531d8fd5e
+EBUILD harfbuzz-4.2.1.ebuild 2571 BLAKE2B 4c2223e4eb9571d27760a50f7387fdb284dc3d5861a599771773e553b5e3bf46a840de1af1e2ee198629d4dfded9f8b53d5ba5a091607f4fe2d091f0258413dd SHA512 82ad48700f3b8c86e6c7ab4350c6872a64f6cccd36c61135e8c5ceaf00022e0cc335a4819bbd2a3072a3866b36e6d26f6e5b509f5db8bb9b82928c13c34b65cc
 EBUILD harfbuzz-4.3.0.ebuild 2576 BLAKE2B 3921b398fb8bc79f565017c58c0dfa65b719fd973416a28a58e012decab39367c23145b4ee11a00d563e02c9fdb8ea94e4cbbbf423861902760f7a8446500f28 SHA512 1d922c3524ac2ee0ce98e72c2d333ab575d7971b3cf5a5fa60187e433083fe69d826dc614e9ee9a1f98212a27aa3445f4a06bd294e455cdec73d13bde5e33066
 EBUILD harfbuzz-9999.ebuild 2569 BLAKE2B f434eeadafaceda6b51cbf3a47bb1bfdb930950fc5976064744c285708a04f2484d2f2bb85310dd36a177ff3e129c65cd7a09c5417d1cddf699f65c4dc2e22fe SHA512 e62ee2c1623a8a321462ae119aa2485b9e479a66c224961905e2958e9c4cb036a3de399f15ddff9d09619dd6ee8b7d84c295c3d5e15c91af778e04edf969e866
 MISC metadata.xml 818 BLAKE2B 6165990c46a33076cbcb991aa9417b1b1725886c03748d1fbb3f299408d6b56895b66cd723be06f0c72ded731698ca8d16d00cbf7247fafd1291b031aa784cf6 SHA512 141b1399bb3bdb6a5ade1bef685f99e60195edac718b93ec2350ab9e2dad3cc138a3d599c3a2b662a76579309a4f4cff259ef12a194d6a8dfffc4ef74c9102b6
diff --git a/media-libs/harfbuzz/harfbuzz-4.2.1.ebuild b/media-libs/harfbuzz/harfbuzz-4.2.1.ebuild
index ce2eb2a05e8c..0a7284a92e28 100644
--- a/media-libs/harfbuzz/harfbuzz-4.2.1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-4.2.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/libjxl/Manifest b/media-libs/libjxl/Manifest
index cc967254cc85..7e9183939915 100644
--- a/media-libs/libjxl/Manifest
+++ b/media-libs/libjxl/Manifest
@@ -1,6 +1,6 @@
 DIST libjxl-0.7.0_pre20220329.tar.gz 21282311 BLAKE2B 8ced9811adba47e5ccac4d55cb7133a863bedceebeb51e649fa79ecb17b785e747532f1f36fd39e3627d0a29406f5f403dee8fa42a9958c713c1296c2f83260a SHA512 deb17dd2eb3e2c39d624d97c6959940aee5beafcb009f6cb2ac14dd83c73d2601df8c81f6cec5d8032d9e66d1fdabfe620dcbf9bfa5e90eb9978265896816242
 DIST libjxl-0.7.0_pre20220511.tar.gz 1488860 BLAKE2B 63cc0d8161eb83efbae9c4ef238ec7300a8354ee7e030fafb96efca9c50216edfaf45bf276403df41a1bf4add533cb7031074c62faafc2f8d2e499290525f332 SHA512 605299cd4294c524b703bd163c083cb04c1f247aab5a6756d2e68482dab98c8d9585f248c03290e67c6cadf8692ead0c00abce7162d8dd7bf26b2cd4bfd1f736
-EBUILD libjxl-0.7.0_pre20220329.ebuild 1970 BLAKE2B e6f15860545873a4c47a62ba249338ebc50cf8a51ff7e1bf7ab25b8cf71d9224d74e4e33d8754099f7146978ded5416fea71b7eaa785aa1628c248098e523606 SHA512 aac2677f9a25fc42ee474ef130a7c5bacb439c1c609cbb0dd5df8538d0dec451514142c5093de0a2a1f9cb85eaf3515bc1998c1edb9a745f8cf43dfdec570d86
+EBUILD libjxl-0.7.0_pre20220329.ebuild 1966 BLAKE2B 471819d39ffda2fde94c3e9567df095a60fde5c6bd7fe8da6c7f37f5a187abf2da900c2def6560049d8728d375aef98708c1ae53725fd45f5e0531a60cf68fa0 SHA512 e5b77fe41bfe6ae7063fcbe2cba6b2cde3147e9ebc266a597df9807af47dc5afb2ff9821fb0235a2e1f423a48c1013e2b29b2a4366c3231cd0c54b4c495ac276
 EBUILD libjxl-0.7.0_pre20220511.ebuild 1821 BLAKE2B 91b88f7519a2940d60d65b2ae57517d8b90ecddc95d3a0b10d3b2400c52beaaf742c5bd7bb199b54ec63f7109ffd84779c44a92e857790d463ca380d62a3a6c6 SHA512 229b948a34919e924944ed70b944e5e332e509e7c8536fff0a5f3bc61c15fee9053cb994484653ed205c9e84e7c8344992cda367fc655c55a45b3e06509950fc
 EBUILD libjxl-9999.ebuild 1826 BLAKE2B 1a0f9655b2fe44f61c8bb277dc96b4412855051dd53284815f04a577bb73c5c106b004d69648cb370c7bbb179da82df63f788317624656f76c91a0bc7443e556 SHA512 19af8aef31c90e326162425509b652be0c0f1be81750d090dff2ce1407dcf302cfcae2034ff6bf57d4f1d9b50330d97ff7c87cc1fc14254c20bae70342e69130
 MISC metadata.xml 737 BLAKE2B c6d720ad6e51168ebab6cc33b8c3af44149f19a8331f1b834fcf4e33f9b90050fae96bdd03202a83960ec7d01d9427e6eaf0be51d47efa736533b8bb5affaac5 SHA512 6b461b43818da3626a59c7d040c7f3cf470624b6205001445a0ede4ceffa4f1ad6233ea85cf3616dd4bfd7cbbd50ce28e0f509e13ec06b64ba4b724e2a90d602
diff --git a/media-libs/libjxl/libjxl-0.7.0_pre20220329.ebuild b/media-libs/libjxl/libjxl-0.7.0_pre20220329.ebuild
index 8b0cf58831f0..35d770126395 100644
--- a/media-libs/libjxl/libjxl-0.7.0_pre20220329.ebuild
+++ b/media-libs/libjxl/libjxl-0.7.0_pre20220329.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="JPEG XL image format reference implementation"
 HOMEPAGE="https://github.com/libjxl/libjxl"
 
 SRC_URI="https://api.github.com/repos/libjxl/libjxl/tarball/fde214c5f4dc5ffd0360401a68df33182edf9226 -> ${P}.tar.gz"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/media-libs/libpulse/Manifest b/media-libs/libpulse/Manifest
index 6144d03cc64d..e7530eff952a 100644
--- a/media-libs/libpulse/Manifest
+++ b/media-libs/libpulse/Manifest
@@ -1,3 +1,3 @@
 DIST pulseaudio-16.0.tar.xz 1551276 BLAKE2B 54ba5d446bc02246bf842280f577851eb66ff9fed1e1b0d2d03e238796d9d04bc1fc27215b02fdded37441da1747be23d1e03d5a00b79ee3b91eb35c0f76a470 SHA512 42d4968c2dc88f5e39a5358d124e399e40a5abdf815eff387087141bc9dddd217012acb35649a8e0e24a44e8a402d90eb193ce2eef186f7d59550f757a6cc26d
-EBUILD libpulse-16.0.ebuild 5726 BLAKE2B cd0365cfc3638ca75c56e4219f1ad7457be4cbae121bc44a19b1979a6b3821c039502c661c82e6557a3af7bf2ea5c0c4f313f31d43847416370fff035f32aa95 SHA512 94e4e3929287e97d1f4c426069b1823fa40b00b07654219b2bd99eed00e8519d97219dd4d07e55553668b6423f148e60aa44eb0fbe2e9e4ccb06fb5e17d807c1
+EBUILD libpulse-16.0.ebuild 5666 BLAKE2B 54aebcba30972a1bdfebde9be49f695a19122d3b95bd1285435a0f787800ca03086692ae94dccf855b36ecf7deeec8e24f1fcf7fc12040fd11d2e25507674c50 SHA512 8cb2bf0bb4e0cf81bc820c6da95a0743b79aa3379b6955e093ba07aa22e5d27e40634d0b1228dc931b7fb0268a5bdf438c6b2d860e1f1525ee3568e2d78c4137
 MISC metadata.xml 925 BLAKE2B 00eb044359e5cbbaa5fdd085a76be9582c1142dc7334ebcfca531975961bbe35bd4d7a3b1f06e760126b0422614103480c1199128a908567dbe477af017f5ae7 SHA512 9c244a9725fa5acf9d1c3e869cd794d0d70dbe29126af877ea5918adf12c9ebfe87576c074db8126d168368ca93bb0e5577912780eb467377ef58d4cf44895bb
diff --git a/media-libs/libpulse/libpulse-16.0.ebuild b/media-libs/libpulse/libpulse-16.0.ebuild
index 9ab4bd86da9c..f1409d9fdd36 100644
--- a/media-libs/libpulse/libpulse-16.0.ebuild
+++ b/media-libs/libpulse/libpulse-16.0.ebuild
@@ -24,7 +24,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="LGPL-2.1+"
 
 SLOT="0"
-IUSE="+asyncns dbus doc +glib gtk selinux systemd tcpd test valgrind X"
+IUSE="+asyncns dbus doc +glib gtk selinux systemd test valgrind X"
 RESTRICT="!test? ( test )"
 
 # NOTE: libpcre needed in some cases, bug #472228
@@ -39,7 +39,6 @@ RDEPEND="
 	gtk? ( x11-libs/gtk+:3 )
 	selinux? ( sec-policy/selinux-pulseaudio )
 	systemd? ( sys-apps/systemd:= )
-	tcpd? ( sys-apps/tcp-wrappers )
 	valgrind? ( dev-util/valgrind )
 	X? (
 		x11-libs/libX11[${MULTILIB_USEDEP}]
@@ -130,7 +129,7 @@ multilib_src_configure() {
 		-Dsoxr=disabled
 		-Dspeex=disabled
 		$(meson_native_use_feature systemd)
-		$(meson_native_use_feature tcpd tcpwrap)
+		-Dtcpwrap=disabled
 		-Dudev=disabled
 		$(meson_native_use_feature valgrind)
 		$(meson_feature X x11)
diff --git a/media-libs/libvmaf/Manifest b/media-libs/libvmaf/Manifest
index 1e7dd8bff60c..5567282d8f9a 100644
--- a/media-libs/libvmaf/Manifest
+++ b/media-libs/libvmaf/Manifest
@@ -1,3 +1,3 @@
 DIST libvmaf-2.3.0.tar.gz 18373659 BLAKE2B a08f18cabf99bf421c61c1fa60b946ee62027f06d5ec2a1b78c7d14ef7541a850b83216eed815f586711365ac2e31bdc6b5be811ae4fd6882717bf030d9ffc0f SHA512 10f0af2b1e868d9780a2766c6c06451ea79f4a8cd8f6c546473382587011f9a7c8c5bf80952021980ede62e2188bcb388337c8903a906d50c739be7cdbb8f61b
-EBUILD libvmaf-2.3.0-r2.ebuild 1319 BLAKE2B d99bc252e6bb10444a3725176dcfe757845b9aea1d91afbfa2e92484d391b6e9e7671cb3b4b3168e4e45aacabb2517659818ad77816ab17dbc7e2b0b27ce7afa SHA512 bbe11bebb308c9a16978070cee3f367de2e31b98e633711f890e8a25951d0610b8c114034114d2189aa809f4b1445421bd2a8b9f43be2bf3d78bc2b84d32d7ea
+EBUILD libvmaf-2.3.0-r2.ebuild 1321 BLAKE2B 267f685ace9a8738d1a5a11b78fe426254eb6fb641fc665e9f4884dd7456d33e1139ad4c0e61c751ab2202c83c7db97c275d9f1086edd01f3772823328610523 SHA512 207751d27eca4a2b6ce0de2dbb5473756f9e4a2ed50470120f755ebfae41a7e0525f0a5b98481b86e06d0f6d841221b7a269d4d44b0fca4525281bcc2e1845b0
 MISC metadata.xml 857 BLAKE2B 418ddef5fe12e5d06e978bedb739e26e119939d056c03761a3493851a69c7bfd110fe7cb31505fa3bd52104ec11045b05eae84fd2f5558007779b7bf776ef16a SHA512 52fd19cf32b9b24ae427ff9a1254ac0b514de79df6e7a47f638c304bbaab799294a29d9e7e8467c2fdb1ab0a208e3704f95c8a276fde9ad176c38e2786a962b3
diff --git a/media-libs/libvmaf/libvmaf-2.3.0-r2.ebuild b/media-libs/libvmaf/libvmaf-2.3.0-r2.ebuild
index 02175276a196..587000084144 100644
--- a/media-libs/libvmaf/libvmaf-2.3.0-r2.ebuild
+++ b/media-libs/libvmaf/libvmaf-2.3.0-r2.ebuild
@@ -38,7 +38,7 @@ src_prepare() {
 
 	# Workaround for https://bugs.gentoo.org/837221
 	# The paths in the tests are hard coded to look for the model folder as "../../model"
-	sed -i "s|\"../../model|\"../vmaf-${PV}/model|g" ${S}/libvmaf/test/* || die
+	sed -i "s|\"../../model|\"../vmaf-${PV}/model|g" "${S}"/libvmaf/test/* || die
 }
 
 multilib_src_configure() {
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index c7b88b173815..6f5f630fbeb9 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -7,7 +7,7 @@ DIST mesa-22.1.1.tar.xz 15959680 BLAKE2B 135ca4b51511350ecd53cb0ff993ffe488c1c02
 EBUILD mesa-21.3.8.ebuild 15208 BLAKE2B e383920612d00be64c1f03c445c0e02ebe59fdd03aad6dd6df2d7498f9168ae292e9356ff109bb1c9843b0ecd3c1dfef4b213d54a2b84104779a5759bb410169 SHA512 fe018844f36039c46d1d7a0f85c7756d7b90ea43aa60acb0ae6e728455998e4120ed410ce184161d89cd2e7467166d483d03cf0bd5b31033f4971d53f6cc168b
 EBUILD mesa-22.0.3.ebuild 12024 BLAKE2B dbffe1250962d55123bef63c064dbe63f4536a5cdd01cc027138b42b74dd5e04fec81232030def77fadb7a2cc3f8ae590c83768e33169244732159f628648728 SHA512 29844cb6178bc140ae037323c43167689c92ddfa6b74b534171230537297e2f50cbb5d27d1c2b726ad8e6ef298d54873fd4be8cf4ee4c28a847dab569fb8fa97
 EBUILD mesa-22.0.4.ebuild 12032 BLAKE2B 8acd4c2e43d2ca6cf80e7488062e2c49139b4a1b780b92d3df16ef80a69e5af6983fa0adbf32687b7794caf7cfe8f6285dcd4fa76950f7abd9e8fdad6adf1071 SHA512 3506d673f24a5303b3a306e399b17c81ef84570b79754f60b7b8741352fdd6375b745d34ca0d86af12368fc664a4074d6cf92c8d29a585f124f2e3aaf3883a6a
-EBUILD mesa-22.0.5.ebuild 12032 BLAKE2B 8acd4c2e43d2ca6cf80e7488062e2c49139b4a1b780b92d3df16ef80a69e5af6983fa0adbf32687b7794caf7cfe8f6285dcd4fa76950f7abd9e8fdad6adf1071 SHA512 3506d673f24a5303b3a306e399b17c81ef84570b79754f60b7b8741352fdd6375b745d34ca0d86af12368fc664a4074d6cf92c8d29a585f124f2e3aaf3883a6a
+EBUILD mesa-22.0.5.ebuild 12066 BLAKE2B cf88b28f5f359a5c54896158cd73aaa02c1e1ffb96f6d0b91ac788e980e30fd9e8fdea77cb2f984badd5da571d5e63217fe0160224aa5a6958d0e80d38eee1af SHA512 7b1637e2e5c6131213bf250c5043ca4c9670fecacfb63dcd03704b83a3cdaf2f2e825d421682669e80cfa6b00ee53b54403a822c7bd03d7f652e6bbe7c576acc
 EBUILD mesa-22.1.0.ebuild 12079 BLAKE2B ef06ee48009df2890208ede0f404e69df0592fa889c7de6ba392d3ea5405ce2f56f80a7d74891f78c72a2902f7ba27d30a90d9cdd4595b31955a8b0b9678355f SHA512 66bd17f3913468b6e6b9dcc5e3010ab5b19a81eb97d6633e5aef220a6a4964a0c3c1cc29acd28c727f3a4bfd8d784a87df975a404ad81b5f67b5fcea9e8a2323
 EBUILD mesa-22.1.1.ebuild 12083 BLAKE2B 0098256a7a32c52540258dcc1d531a701ad531891d2f6f4ca2f4cf0c1cdc364c4a8fb6487a6b8f0b6efe46d6fd06ff951e194ae4d64ab0b51d58140d95d1ac93 SHA512 b1f9f47fc0cf720a7be0193c7c11e0ec63dd3408aa284690ced9b58761c94520961b2bcb2b00ec0cf7e2b0d66b0d41b77b886069fd605ab08cfc0cee8ed6c3a9
 EBUILD mesa-9999.ebuild 12192 BLAKE2B f7ab540bfcced9776a26c8ed0e313106f766c923c514e7db78f26ade09594480ea5528093736f95b0d5c03137cdde9963b11947f7a7973205c168e7e68ac6500 SHA512 8fcf0c89f6e9dc99e9de9f09f45338c5f14fdc6f516fbe20727fcd77030b5efd99d60c9ad4465410cf4da27f068c6805637c010309df89221ec409093406bb39
diff --git a/media-libs/mesa/mesa-22.0.5.ebuild b/media-libs/mesa/mesa-22.0.5.ebuild
index 2ceff3869cbc..32ebad3156aa 100644
--- a/media-libs/mesa/mesa-22.0.5.ebuild
+++ b/media-libs/mesa/mesa-22.0.5.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
@@ -111,9 +111,10 @@ RDEPEND="${RDEPEND}
 # 1. List all the working slots (with min versions) in ||, newest first.
 # 2. Update the := to specify *max* version, e.g. < 10.
 # 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="13"
+LLVM_MAX_SLOT="14"
 LLVM_DEPSTR="
 	|| (
+		sys-devel/llvm:14[${MULTILIB_USEDEP}]
 		sys-devel/llvm:13[${MULTILIB_USEDEP}]
 		sys-devel/llvm:12[${MULTILIB_USEDEP}]
 	)
diff --git a/media-libs/sdl2-mixer/Manifest b/media-libs/sdl2-mixer/Manifest
index 21b62b323f5e..ba49864a0bf3 100644
--- a/media-libs/sdl2-mixer/Manifest
+++ b/media-libs/sdl2-mixer/Manifest
@@ -1,6 +1,6 @@
 AUX sdl2-mixer-2.0.4-fluidsynth.patch 1457 BLAKE2B 9b8914065ade05bcf70c3783ae22f732e5a401f74cdc39272865d5c6f0fa31c0ee89b16f642a5b5f69b77ecd9dc96cb7313d4dd6c55303efd5d128679f1cb6f3 SHA512 e268a5bf327f2203a7f48ed0cdc05f89fea778eac706555f21ee2b3cab761600988f385195c3078917c422bc70c7b96fff650a1a213370469fe07340dc7d7852
 AUX sdl2-mixer-2.0.4-slibtool.patch 3794 BLAKE2B 5e6f316a32a7c58abdbf764ada81c85e9db6509f99b3a7054de08ea90f1bf54d12bad6f177e7d76181d76f6b0d218acd1f44e8d50e91f7b3ef74056ddf3acd0b SHA512 da520853a59036ea413cc24964798fe40414c072612e2fa0bf79373be669b76d6b07a3853123317f25eb82db1a4dbd105b23469e6da14bb0596242fc1a9060d7
 DIST SDL2_mixer-2.0.4.tar.gz 11125077 BLAKE2B ccb55020e360fa000e82807b8c4e2371228291943d2dc7371606834ca0f781d4e82581b5427e9902156bf3072208db4ec07e95a06f206e40ff530f432dd9e491 SHA512 98c56069640668aaececa63748de21fc8f243c7d06386c45c43d0ee472bbb2595ccda644d9886ce5b95c3a3dee3c0a96903cf9a89ddc18d38f041133470699a3
-EBUILD sdl2-mixer-2.0.4-r1.ebuild 3543 BLAKE2B f45a8c0ee76cb93a9601b99b26b9d3301d46178b3a1caea4a07d11f09b293a3c5ea3f98aaf42151296f8adcc77e2aac2df7a5fa4a200773a10a68b367f64708d SHA512 5ff2c44501cc98f75b80991b4398718c61957d667c0f58b56fb1a2998235ed35750bfd2b5ac0ddae2763675c7456ee5226433e06325a2ad8029b97a399052188
-EBUILD sdl2-mixer-2.0.4.ebuild 3491 BLAKE2B 2f4d9ae4b9a0911f7721e355c48d8a60d4477f3f320b32fdeb9e7eb5e6ac147b5c57dcc03d115c20fe5df21f5812d3ff6b09acb9e4293edb199be5eff2f3419d SHA512 1b076b2813c946e514f13a950809ca5e3fedd67899c0110a99d88a6d7f6594be73a6d44f2bf41650bd7275123fff82f5dd5d6772e04f1717009a552a3a25ac55
+EBUILD sdl2-mixer-2.0.4-r1.ebuild 3545 BLAKE2B 503f4a296306447e9ac324faeb16708eb589436429ed090f5af80256b4caf3f4de0a3d02ea129c5a9baabc81d66ee9ebd3484d4e8a3ba2e14604cd9ec16ab521 SHA512 84e7df6b7166552fbc0c941f839640a85833f93cfd4a2b7adf2b49d01901755190f51edce799a2c829b6acf8a0cf844393f78258d79301aa15b69eae8adf1135
+EBUILD sdl2-mixer-2.0.4.ebuild 3493 BLAKE2B 0b82c1a732cafc36fa99e13a9ae454b94f4aac657040e52a8fcc2e7f2c2427220d7e088610cddaeaf3d1e2750aeaa5381ca177a419c8a510899ddd1963472877 SHA512 e01e37c1c51e3412cc5a20213453d6a7f6b5850249a9cb70533440449c50e9a6653e6128aa70fd57c5e1209726f3c61dab05b9057afd9cd6e82e2f161123a22f
 MISC metadata.xml 673 BLAKE2B 8cc1ebfc30f840ffb98cc60659f5d30f8cafc6e7c3e3ef156e6637ec8bab0ed203679e055917cb406debadbc45f44a3171337d5e13bbf91ca46f91420ba8df02 SHA512 560232a2d580ecb87832520448481c5cc4c07958c929f30bc9f5e5d0b17e957cf36ab70c13059b2bb28b609f3e89f3d02731bb8ad8a74404726147cd4f98be85
diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.0.4-r1.ebuild b/media-libs/sdl2-mixer/sdl2-mixer-2.0.4-r1.ebuild
index 65363e58cfec..307f5ee53b3f 100644
--- a/media-libs/sdl2-mixer/sdl2-mixer-2.0.4-r1.ebuild
+++ b/media-libs/sdl2-mixer/sdl2-mixer-2.0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -92,7 +92,7 @@ multilib_src_configure() {
 		$(use_enable mad music-mp3-mad-gpl)
 		$(use_enable opus music-opus)
 		--disable-music-opus-shared
-		LIBMIKMOD_CONFIG=${EPREFIX}/usr/bin/${CHOST}-libmikmod-config
+		LIBMIKMOD_CONFIG="${EPREFIX}"/usr/bin/${CHOST}-libmikmod-config
 	)
 	ECONF_SOURCE=${S} econf "${myeconfargs[@]}"
 }
diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.0.4.ebuild b/media-libs/sdl2-mixer/sdl2-mixer-2.0.4.ebuild
index 7f066768f34e..750b421f35d9 100644
--- a/media-libs/sdl2-mixer/sdl2-mixer-2.0.4.ebuild
+++ b/media-libs/sdl2-mixer/sdl2-mixer-2.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -91,7 +91,7 @@ multilib_src_configure() {
 		$(use_enable mad music-mp3-mad-gpl)
 		$(use_enable opus music-opus)
 		--disable-music-opus-shared
-		LIBMIKMOD_CONFIG=${EPREFIX}/usr/bin/${CHOST}-libmikmod-config
+		LIBMIKMOD_CONFIG="${EPREFIX}"/usr/bin/${CHOST}-libmikmod-config
 	)
 	ECONF_SOURCE=${S} econf "${myeconfargs[@]}"
 }
diff --git a/media-libs/woff2/Manifest b/media-libs/woff2/Manifest
index 7a6085837925..7593969fe126 100644
--- a/media-libs/woff2/Manifest
+++ b/media-libs/woff2/Manifest
@@ -1,3 +1,3 @@
 DIST woff2-1.0.2.tar.gz 38934 BLAKE2B b4a762cb2377b896147d9ebdae97f17e80bdb94fa8ec1b04e28e9df48c2f3456f83fc548b10a49bbc271bead349348f7582a85c5011f60a9feb4dda84920b6f3 SHA512 c788bba1530aec463e755e901f9342f4b599e3a07f54645fef1dc388ab5d5c30625535e5dd38e9e792e04a640574baa50eeefb6b7338ab403755f4a4e0c3044d
-EBUILD woff2-1.0.2-r5.ebuild 864 BLAKE2B db09788fc7eb8930897dd0d7eec0a817adc7c9c54d0fdf58cc6c1ee4aa666d321742999df031d94059a010304f257851a562f3b881d9f81110dc2cf6da325d83 SHA512 048da2c27d30bb25184ade38956b18c89554e3ba962149e4ed64edebb178acbf1ee7475522e980f49f829deca72158826809960e860d937b2f38e33aed0b8316
+EBUILD woff2-1.0.2-r5.ebuild 870 BLAKE2B 0b7b2788fcf157beed638697b872b55bca60f14aa9d510cf8dac6455d460b4bac4139a6b701df10c670ce5ec6da99a498cf6cdaf319994b43a8cc64d4cd0cef5 SHA512 44baf980f11ae303d2f89dfa9b037621520458553114222ab8302530ee7a3bcf4e6c242f4030f69b63e04afed890baa2a191251b69895693131a3d59957ce6d2
 MISC metadata.xml 354 BLAKE2B ad57a794365a6750452e942c5570e3357d829c917f09f7d79d7cd14612d0adfe6d0dc4f0e6697a3d0ab91dbc8b4927270b7ecff99c1ca0b5f95c88d07b78d23a SHA512 c42129cdbfc646eb68afe8f1cabaefa9aacd6444a99dd469b686bea805ffe3929382ebbab79c1936d5c1b3c4709647aba751e7a73baba367687ba63f1e605afe
diff --git a/media-libs/woff2/woff2-1.0.2-r5.ebuild b/media-libs/woff2/woff2-1.0.2-r5.ebuild
index 73dc123a759f..09d0ca869bcb 100644
--- a/media-libs/woff2/woff2-1.0.2-r5.ebuild
+++ b/media-libs/woff2/woff2-1.0.2-r5.ebuild
@@ -29,9 +29,9 @@ src_configure() {
 src_install() {
 	cmake_src_install
 
-	dobin ${BUILD_DIR}/woff2_compress
-	dobin ${BUILD_DIR}/woff2_decompress
-	dobin ${BUILD_DIR}/woff2_info
+	dobin "${BUILD_DIR}"/woff2_compress
+	dobin "${BUILD_DIR}"/woff2_decompress
+	dobin "${BUILD_DIR}"/woff2_info
 
 	einstalldocs
 }
diff --git a/media-libs/zxing-cpp/Manifest b/media-libs/zxing-cpp/Manifest
index ed47700eddfb..d5e14763fb17 100644
--- a/media-libs/zxing-cpp/Manifest
+++ b/media-libs/zxing-cpp/Manifest
@@ -1,5 +1,3 @@
-DIST zxing-cpp-1.2.0.tar.gz 97942494 BLAKE2B dc220783fe8a9c1ea321ad5b7835553985a06318f909af1574131b55f3a4bb71f8cf90f56925dfe8338df5cc24f91d93d8a7626cd8d2c01473b1ccce09bad8b0 SHA512 e61b4e44ccaf0871b5d8badf9ce0a81576f55e5d6a9458907b9b599a66227adceabb8d51a0c47b32319d8aeff93e758b4785d3bd0440375247471d95999de487
 DIST zxing-cpp-1.3.0.tar.gz 97938087 BLAKE2B f0c9c906ab2b534c67cf66605eca0ecc22a90fc9d69e23397bcb0bc8eaf3d68a7ad41631ea6d9c7f292ee03165d2e038d84f497307384205e2d6f37fef5dddba SHA512 27821667dea3d09b91bf9825ff25483ed658d850fd238009f1c7e43b1b09e62d24b3a2cd78d4e39d29725931b32bfce3e21e7ec871830b3ad69a5a69c72d8de8
-EBUILD zxing-cpp-1.2.0.ebuild 667 BLAKE2B c06f2ee502cc29e76b45db3717bfe9c44ff13ba3e608d6b71cac366bbbf5a885f80ca2c29a76b38f449c819f0a63f1728c34f90c5ce5546722480f28d0fba908 SHA512 71cfdac3c721210be90bd99f36cf21d332d9fd8d97e320c3af124619e8b2a2a580d949e0dd48c422c7d392be5e8a8d9acc48b0c7f9d6d4200996473219c584e9
-EBUILD zxing-cpp-1.3.0.ebuild 670 BLAKE2B ca402af72d18e33f2dd974cc45faf2f3834bc2880287b4f5920ff270b94ff64ae764af68d9999de0b7c84e81f80dbce693e2df155c16bbabd58fc24439a95c23 SHA512 ecff59b43319b4bd25d1488f53ccecefb7c885fbf76e7097c3f6d061c633caa1cc20050509ab432829dbef4e0023b67dcac20176fdba8ebc6efb7049c96fd1bf
+EBUILD zxing-cpp-1.3.0.ebuild 667 BLAKE2B 1ff704a09a6b9c83297a247a61aac7459a222bb5df8e76e37c8383ce18e37c173e3ff4f2ce61467c51b64e11a674f926776304ad5e33eea83520e24436ddf359 SHA512 452c934ccbc1499b8f01af50b467686cb2a7ec959e324800b185251df637c62811208c5bf2f343756684807b0b9ab58592f658a662d351c8a73ccf7777e35452
 MISC metadata.xml 250 BLAKE2B f3e9395137ebb9adf46cd35c1b6156f82c04cfa94f964f6da24fe71eb560cf51b4f70ebfa10daaa4884400ec22782d819ab794dfd29e7a47559f07208397195d SHA512 78c4ff15eed76ba883b457be95dabd41e928a0e64a42b758b5eab4d8a95afca27d5ea6a7cfe0948de578b169153a05f08aadfce1ddd41a88732212a1e76e565f
diff --git a/media-libs/zxing-cpp/zxing-cpp-1.2.0.ebuild b/media-libs/zxing-cpp/zxing-cpp-1.2.0.ebuild
deleted file mode 100644
index dab05f6d9546..000000000000
--- a/media-libs/zxing-cpp/zxing-cpp-1.2.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="C++ Multi-format 1D/2D barcode image processing library"
-HOMEPAGE="https://github.com/nu-book/zxing-cpp"
-SRC_URI="https://github.com/nu-book/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_EXAMPLES=OFF # nothing is installed
-		-DBUILD_BLACKBOX_TESTS=OFF # FIXME: FetchContent.cmake module usage
-		-DBUILD_UNIT_TESTS=OFF # for both tests options. no thanks. bug #793173
-	)
-	cmake_src_configure
-}
diff --git a/media-libs/zxing-cpp/zxing-cpp-1.3.0.ebuild b/media-libs/zxing-cpp/zxing-cpp-1.3.0.ebuild
index 266954e53963..db56bb88febb 100644
--- a/media-libs/zxing-cpp/zxing-cpp-1.3.0.ebuild
+++ b/media-libs/zxing-cpp/zxing-cpp-1.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nu-book/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 src_configure() {
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 6451a87f1ef2..d7896968ace6 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index fd7e0a137663..6e0395484b5d 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -1,7 +1,9 @@
 DIST abcMIDI-2022.05.05.zip 610217 BLAKE2B 241d9ae42defef6345b143c59140f1cee844c19608b6a897b020f0a54c915d45edaf09ef75e1e01b1a932a6e82934aaa82d1e82c74c61d23e1c372418726bff8 SHA512 7f8141792e67e5ed22e84d35f0f9894c5ecba74817ac9c23323d5e7777bad0a3fc477daf43bf515e243aad46476c3a9597d8e9b4e0e865210b5baad0a1ebc6d3
 DIST abcMIDI-2022.05.20.zip 611325 BLAKE2B 1fd9c786ec0a7b3558f71502ceda261419b6883dffe524de6f5203188f5ee618d52ad1cba0662d28a3ba4c252702abf4d5a2e4271b951916e9164c9d573b28ff SHA512 f6e8212c4bc96fc62f95c868f65bfd40208f2aeb5d4913fe1b4d85331dae69a763cfc3db9f446018dd0b43afaec496b6572ea0c46ebeac563902899b71f24645
 DIST abcMIDI-2022.06.07.zip 611323 BLAKE2B 3b0a9a1bbf0265c8c2848aff267acf3fa0b98a6fe24b5878e70db5da3e892c8658ff236511a5524cf5dcf5217bf09ccb762102539cdd12a7d23c6573bd0ed14d SHA512 1e4daf647238e28b3c4c644dfcfbffdacd0e5b9e007a3a9cb8393ba879690c74d5ea2970254d5d3f19a68c5742de80bf5aa387a7f9aa241abec2e952f1bdc0c8
+DIST abcMIDI-2022.06.14.zip 612729 BLAKE2B f9644ea59bb43d50a39f60f31f440e9d4e425701c71877fb812adeaa0757da37d2aabab5c2b3593f38a5a135adc0925545337860452317e558cbfb037c95d4af SHA512 4e8a9a770925e166dabdbf459227b26373c33ed0ec356d093d8f4de457cc9034cd9237d445f31883e7c3974c3fd4b69a6f6fb156b26e03483bcd70793e7457ec
 EBUILD abcmidi-2022.05.05.ebuild 676 BLAKE2B ce33e38e9ac6f8e8467ce54426cc8438bfc8aa6b21292a98097160afc74c3da4e7d649adbb65beb148bad10703ba3bd7fac998cf519705658fbd172ffb28c333 SHA512 5f0e1b9a3484b499ab963df3d9680fd078c2072145dae9bf6ebb55f6bc3ba43abae758434ef5e162cdb786f67375e4b4f085b133a7b6ae764af9f421d59b9021
 EBUILD abcmidi-2022.05.20.ebuild 678 BLAKE2B 4b57316933b325ccfe2e5a34df1dff4f782e09af521e5d21f54ee435552c631fa73869008bb5beb21bfade619c03130083c4c52a266fb7c32b0741be66c3f4ef SHA512 3fcefcdced72e7d8ac0d82b638c893bf2472ba5fb20910b9d3651d890ad5886bdb263b8b8cb43d7f3a400f98df4c7b8a084cfbe666ce0c5b3fc18d0af7a430cc
 EBUILD abcmidi-2022.06.07.ebuild 678 BLAKE2B 4b57316933b325ccfe2e5a34df1dff4f782e09af521e5d21f54ee435552c631fa73869008bb5beb21bfade619c03130083c4c52a266fb7c32b0741be66c3f4ef SHA512 3fcefcdced72e7d8ac0d82b638c893bf2472ba5fb20910b9d3651d890ad5886bdb263b8b8cb43d7f3a400f98df4c7b8a084cfbe666ce0c5b3fc18d0af7a430cc
+EBUILD abcmidi-2022.06.14.ebuild 678 BLAKE2B 4b57316933b325ccfe2e5a34df1dff4f782e09af521e5d21f54ee435552c631fa73869008bb5beb21bfade619c03130083c4c52a266fb7c32b0741be66c3f4ef SHA512 3fcefcdced72e7d8ac0d82b638c893bf2472ba5fb20910b9d3651d890ad5886bdb263b8b8cb43d7f3a400f98df4c7b8a084cfbe666ce0c5b3fc18d0af7a430cc
 MISC metadata.xml 327 BLAKE2B d92d9b40b1c1af1a4ba5cea8b956a098066ae7cc9eab2cb31a0dfbcc37400558f5f35a6ce04a7541ecbea7578906f688d2931c1f62751e5a2d7bb7b80e97cd2f SHA512 170ca99684768ef2d5b0e8a26e6ca64468b3134847ffe53f6a1efb623bfe77a6c09dfd67df553a306af045a47bc69f0d41ceadf508cce7f75f3c2a7614d2d725
diff --git a/media-sound/abcmidi/abcmidi-2022.06.14.ebuild b/media-sound/abcmidi/abcmidi-2022.06.14.ebuild
new file mode 100644
index 000000000000..11f547f4cb8e
--- /dev/null
+++ b/media-sound/abcmidi/abcmidi-2022.06.14.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+MY_P="abcMIDI-${PV}"
+DESCRIPTION="Programs for processing ABC music notation files"
+HOMEPAGE="https://ifdo.ca/~seymour/runabc/top.html"
+SRC_URI="https://ifdo.ca/~seymour/runabc/${MY_P}.zip"
+S="${WORKDIR}"/${PN}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+BDEPEND="app-arch/unzip"
+
+src_prepare() {
+	default
+	sed -i "s:-O2::" configure.ac || die
+	sed -i "s:@datarootdir@/doc/abcmidi:@docdir@:" Makefile.in || die
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	if use examples ; then
+		docinto examples
+		dodoc samples/*.abc
+	fi
+}
diff --git a/media-sound/klick/Manifest b/media-sound/klick/Manifest
index 89db821c5050..3bb6c8939df0 100644
--- a/media-sound/klick/Manifest
+++ b/media-sound/klick/Manifest
@@ -2,4 +2,5 @@ AUX klick-0.12.2-gcc6.patch 1513 BLAKE2B 70eac0137fc8b4ffa25ccb86789efe7fc45cb9d
 AUX klick-0.12.2-sconstruct.patch 1836 BLAKE2B 1e22becd7205fe5f9717b18d1d63f7dfc8b265d995c2d503553676c3d281fb7df818375f1fd76f64067d6d3150124c6f162dc42842d1a7ddf2ef39cf9a95e66a SHA512 0db89995a39962e91085c761cf9eb07470ab20a16dd90ae77e1e34bf912ede28aca15a8c7f7708fdfbafe3c84f3b92059aa01f160b936e20a32cd69fbc6d03c1
 DIST klick-0.12.2.tar.gz 111801 BLAKE2B 990743d079927fae0768c9fd7c979b88055e2886ae7d9f6a25116dbdea5b295b82446c6ac5c7e9af35f48058126bc925c4495f5776fb7cd4c6266741cd6c02bb SHA512 e0da321b4f5573e8a0b7ef53a554bf33b6d999b7125c62648d5ad64278107b429effa573187327d7c6fe5ae07bf9c7f81b96f069358315b2ee9166480f6dae7f
 EBUILD klick-0.12.2-r2.ebuild 1083 BLAKE2B 56b91729dedc79d6f5718d2d38801483f9530b49a44be395b54b3709f1615e8b9501babea8c3dc79a7d4f9dc649c9a7290270b8590541fcca0a2a64e22eb6b45 SHA512 8268dcfb3c7adf45469d367a9c5c7d92ffaa558d4e473bc93099fe76638a083fb5f7c8cf582f58cdda768f80d5c6c6129fc5d71bcf51c8c766a406cceb1e193a
+EBUILD klick-0.12.2-r3.ebuild 1082 BLAKE2B 2440555f5de20232a37c526cc80e79c90f9389e433ad532f956a21d86ff16e3ffdcce1a3e4b747dc822dbbabc6e5bb86ae50e0af21bfdffad5bbbdabc466d151 SHA512 1ab6f94402a193b12a01bfe3bcba844fe4fefb2ae251983af36542fe00a08f8e883092fb0ab7be78a1df9dc13591642cf18fc7681238d3f1a7f1ef26e2e9cb8b
 MISC metadata.xml 546 BLAKE2B 6f3499cca20243d15ae34193598bd09d8d88a40759744b440834fcab459d71e383d1584c575e346ea376552a1f0a40c098d9892b9963af1a75846dfaa4542420 SHA512 af8a15367d57e8592ee6271ac2ee6844170fd953542b9bd7d83ead0c5461b948a63513045d936f27766f8caa0b68e270bc6f500072db453eaca767cde98d239f
diff --git a/media-sound/klick/klick-0.12.2-r3.ebuild b/media-sound/klick/klick-0.12.2-r3.ebuild
new file mode 100644
index 000000000000..dc5e78d639f9
--- /dev/null
+++ b/media-sound/klick/klick-0.12.2-r3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit python-any-r1 scons-utils toolchain-funcs
+
+DESCRIPTION="An advanced command-line based metronome for JACK"
+HOMEPAGE="http://das.nasophon.de/klick"
+SRC_URI="http://das.nasophon.de/download/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug osc rubberband"
+
+RDEPEND="media-libs/libsamplerate
+	media-libs/libsndfile
+	virtual/jack
+	osc? ( media-libs/liblo )
+	rubberband? ( media-libs/rubberband )"
+DEPEND="${RDEPEND}
+	dev-libs/boost"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-sconstruct.patch
+	"${FILESDIR}"/${P}-gcc6.patch
+)
+
+HTML_DOCS=( doc/manual.html )
+
+src_configure() {
+	MYSCONS=(
+		CXX="$(tc-getCXX)"
+		CXXFLAGS="${CXXFLAGS}"
+		LINKFLAGS="${LDFLAGS}"
+		PREFIX="${EPREFIX}/usr"
+		DEBUG=$(usex debug)
+		OSC=$(usex osc)
+		RUBBERBAND=$(usex rubberband)
+	)
+}
+
+src_compile() {
+	escons "${MYSCONS[@]}"
+}
+
+src_install() {
+	escons "${MYSCONS[@]}" DESTDIR="${D}" install
+	einstalldocs
+}
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index f1ac3b6ec9b2..493d5d87db92 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -26,7 +26,7 @@ DIST mixxx-manual-2.3-sr.pdf 34079603 BLAKE2B 83ed178b8b095928138c853b5300176316
 DIST mixxx-manual-2.3-tr.pdf 34062405 BLAKE2B 69b5f76b4e74aa0d48636ae3914a6f40e0104d509f76c0569f99348d17131926a564d7e43a73d34036c5a94be4b61a37645e7933b1dea2513c6d72d5d25334fc SHA512 b05f297f3000767e2a8a2319e56f0db73981418943a96d0822f4f3f51f29bbb5667cc0b487ef328f1d6d115013af705371668ef3081321b6980ea95834a40895
 DIST mixxx-manual-2.3-zh-CN.pdf 34165133 BLAKE2B 58e717082ace6824532392a282cd1452c279410c547fabc333b6adccaf47fb8e4bbac0c612f9679c8d85317e9b706e5fe10b7c1fc11a4325a14c5b3faafdda46 SHA512 995fb6c9bf1f729eaa08cd5b2003f21c76274f8f3046bd85b771cb86c429fa65cc50f0f4a36396e654a4378125157777b2f0f04a9343b20aa3aef76281395aec
 DIST mixxx-manual-2.3-zh-TW.pdf 34135938 BLAKE2B b5747b2156d686bb84166beb2c1552e0d998f3c402793444631c1f146c93fd8f6addb5fc34c0f59b16b2866994b8f64ee5670ab26c683d51b0c36d3f247dcf70 SHA512 55a5c3d5064c021f73a48dab5fb93094bc0f9220a1790518b043a21900dc6792a2fc01ee5c6def6338a3df09bcbb7441e1c8b2f23aac2aad2b2a5974babb8a9f
-EBUILD mixxx-2.3.2.ebuild 3759 BLAKE2B 57f0e43cccb9b766b1705570119cd16b3bbb67bcba1119daef74df6d0499f2c3cc02403216e3c468fede0328d8fb6fdd0ab796913f0249678ef0e0432b37ed03 SHA512 f4b75ba9a27acf3e30209c59d42b6edcf37ab8abdd00f76cf6bd491607a95b3be090486771dd71cd91ea7cea508419538f788df4b3d6b7255ffd11ecfd8adb0a
-EBUILD mixxx-2.3.9999.ebuild 3667 BLAKE2B a110809c0f831aaa12707c87a3befe96898a4ede480b141684af14ee651c7af97ab36e827ae35a729388b8487d08d387a2d94de6589202dc0f911ec775569dda SHA512 0ef19fd437b1c957d31470ecbefd1fa38a4596479f73f96a4da903c4457c0892dc833f34b5d4ecf1fce7e580ed7d1a39c4d7e5ffe8042d3bfd3b3ec1ce10c582
+EBUILD mixxx-2.3.2.ebuild 3761 BLAKE2B 062257f4adbc0198a597f98df5f9b171d076a5b2488d9f62ea68253cf4fb9b0e9be1a96b4371be22ee32c14fdeccdd424bd934076fe52f9f5ef54f3d0f7953d5 SHA512 5835012a8d904379886f0bc6c5cfbbf7e6c0e1ac1d42a9d65c826109aa74110a16bd2b4084ef9a882cbd3d50c80395f4e4a516af99d34825b8bca58dddbd4c5a
+EBUILD mixxx-2.3.9999.ebuild 3669 BLAKE2B ab37bd307fd31eb48915654fcddf740800e74c8f8f04a2b4ac9f7a0129201a471fae61edb0816b23093e3ed3c74cef281b78cb382f7b473471c2c280ac057f7b SHA512 8a38cfb4093a5455fd04a3ef56540bde82d4a64c65c80dc27a240a677c6c7ca6833a901c5a1f4cca1b2cf37b2c47007f4bd93e509df4eeae5027142ad0172ae3
 EBUILD mixxx-9999.ebuild 2740 BLAKE2B 1fc346b62b137915adf3b992ffdddbc1c3ed9eec8b8e854e2f8894b00616c6bade501b856fc40b5061909499209be642b7e0dbd90dbe83ca9a6018dc5d63acb5 SHA512 1f07442ea9b628b1e7dfce44735b570db611725fefdc4d9015e01923050dae3dfd95fb4d34d24ea91e42ac71b8750fc425f6f00ee6a991445755369048ad2e26
 MISC metadata.xml 903 BLAKE2B 1fd2e01da4d96a257d0ba595e67005e5233503f54ea17c81f65d105a61dc42f84df601cc112ff0a5e99393cbc53a0130b890d96a47cc2b88b59cbe7b9779654d SHA512 7e9dfd69240a57efbdaceb4dcfe71549d7a8c2edba5c81f956407e101cb62a0c51cf231e1e68c029783340189139309dde4fa3e995a231856ea094df09288cd8
diff --git a/media-sound/mixxx/mixxx-2.3.2.ebuild b/media-sound/mixxx/mixxx-2.3.2.ebuild
index eda1855950ba..11a3b2cd1187 100644
--- a/media-sound/mixxx/mixxx-2.3.2.ebuild
+++ b/media-sound/mixxx/mixxx-2.3.2.ebuild
@@ -151,7 +151,7 @@ src_install() {
 	local locale
 	for locale in ${PLOCALES} ; do
 		if use l10n_${locale} ; then
-			dodoc ${DISTDIR}/${PN}-manual-$(ver_cut 1-2)-${locale/ja/ja-JP}.pdf
+			dodoc "${DISTDIR}"/${PN}-manual-$(ver_cut 1-2)-${locale/ja/ja-JP}.pdf
 		fi
 	done
 }
diff --git a/media-sound/mixxx/mixxx-2.3.9999.ebuild b/media-sound/mixxx/mixxx-2.3.9999.ebuild
index 73bd3177b918..8d7a94aca60b 100644
--- a/media-sound/mixxx/mixxx-2.3.9999.ebuild
+++ b/media-sound/mixxx/mixxx-2.3.9999.ebuild
@@ -149,7 +149,7 @@ src_install() {
 	local locale
 	for locale in ${PLOCALES} ; do
 		if use l10n_${locale} ; then
-			dodoc ${DISTDIR}/${PN}-manual-$(ver_cut 1-2)-${locale/ja/ja-JP}.pdf
+			dodoc "${DISTDIR}"/${PN}-manual-$(ver_cut 1-2)-${locale/ja/ja-JP}.pdf
 		fi
 	done
 }
diff --git a/media-sound/pms/Manifest b/media-sound/pms/Manifest
index 5b62a8d38035..438b43eed4ab 100644
--- a/media-sound/pms/Manifest
+++ b/media-sound/pms/Manifest
@@ -1,4 +1,4 @@
+AUX pms-0.42_p20170508-gcc12-time.patch 179 BLAKE2B b37b450c435e19ca7ec37276a6503be0bd23139fc2d899baa0e9bf95196df5e498adfd26f75212eed4d3e788dbd123868bef8b4ce1f73e8134634fbeb70473f9 SHA512 eac4c7c2677b1a344ca9b79db14e18e8d1f990f5b690c3d7b80fd9a6eb05eb881375ee5e72a2e410fa62e00a26cfb22178929b7f5a9be6648afa9fdf45934dc4
 DIST pms-0.42_p20170508.tar.gz 140157 BLAKE2B c4c3ff916a9aa36522f48636cca97f22069219ebfc25e219d4aff3d0ca5bf20d80d343d224996db82fb6e8fb13cd9f38f7fc860683bc574124aaf0315d3f2dcb SHA512 686a5e265ebad418a153b9888cc213bbf8cca5aa2d398206848823105edac16e298431c288dc0a74adb23d327c75845cdec1680a6a2a2ae40bc7b41c55ca163c
-EBUILD pms-0.42_p20170508-r1.ebuild 751 BLAKE2B e14ec3a1e8b554617f67e9420a2dcfeadb5f307f6ab4bde827ac5da35005d4c4a39af0a25a64466f734dd06e3cbe33d6a4e62ecb05a6dfb5cf4ce7259ae40370 SHA512 ef2a2c3938d541f4d4128235df7c9888fc38629854e17702e85c217a42ce59f5ed3abac918f8e51cb9a09d4757c2353ceb0f248c3659e62651e305f15714cfdd
-EBUILD pms-9999.ebuild 715 BLAKE2B 15cf04f0719ace386e49cd6e3849640739da21f6f3b004d590988e191f2348bd7f8b7684e9fbfc7b69bd7026cad04b2b3ed7e768f8a1aac76c12aa9a1f82edc4 SHA512 916e8be3e74d785c3b814edd8477b1cf90a0c6fd3bfae523e3d6b0027a549a85dd405f3d093c0093b14d6e2f69d9da45337719f13f831670fa06fa0e63856586
+EBUILD pms-0.42_p20170508-r1.ebuild 817 BLAKE2B b34aa9ec19fb91b5db66cdcb3efc1dc9a8e267c0ca77cae909b7c81f7671fb42fd56890c93e96ce78392bcaecac50568988d04832b3455bb09d1b41b11c3235f SHA512 1d84b721c49ec9b0c4067dd618c42c11fdaf71df0da1c1c177bb588db1503a3e5fd584c6ad574b015032c651e91f7b947a6303d4c03c077d9ef7693339939447
 MISC metadata.xml 327 BLAKE2B 4852360b889e0c7548921f8ebbd4929d117c515b39bc76ebbe21d23cedbbaee4c65143c97a84fd743785f612dddb00788babc7539c1130c02d06b1aadebc598c SHA512 149d693b87ce7beb38f87f784b1035895dbce3a4f1061f3eca1888a9b355b1c72cb2789e39506e06ed9fa8f5966c36f566b2dcf35069a38558b523c71b6b5494
diff --git a/media-sound/pms/files/pms-0.42_p20170508-gcc12-time.patch b/media-sound/pms/files/pms-0.42_p20170508-gcc12-time.patch
new file mode 100644
index 000000000000..b0d586eff2c3
--- /dev/null
+++ b/media-sound/pms/files/pms-0.42_p20170508-gcc12-time.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/851621
+--- a/src/message.cpp
++++ b/src/message.cpp
+@@ -23,6 +23,7 @@
+ 
+ 
+ #include <cstdarg>
++#include <ctime>
+ #include <stdio.h>
+ #include "message.h"
+ 
diff --git a/media-sound/pms/pms-0.42_p20170508-r1.ebuild b/media-sound/pms/pms-0.42_p20170508-r1.ebuild
index 9f0546f7b158..750e97d2c674 100644
--- a/media-sound/pms/pms-0.42_p20170508-r1.ebuild
+++ b/media-sound/pms/pms-0.42_p20170508-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,6 +25,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.42_p20170508-gcc12-time.patch
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_DOC=$(usex doc)
diff --git a/media-sound/pms/pms-9999.ebuild b/media-sound/pms/pms-9999.ebuild
deleted file mode 100644
index c1e5c9adb459..000000000000
--- a/media-sound/pms/pms-9999.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake git-r3
-
-DESCRIPTION="Practical Music Search: an open source ncurses client for mpd, written in C++"
-HOMEPAGE="https://ambientsound.github.io/pms"
-
-EGIT_REPO_URI="https://github.com/ambientsound/pms.git"
-EGIT_BRANCH="0.42.x" # todo: package the golang version
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS=""
-IUSE="+regex doc"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-text/pandoc )
-"
-RDEPEND="
-	sys-libs/ncurses:=[unicode(+)]
-	media-libs/libmpdclient
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DOC=$(usex doc)
-		-DENABLE_REGEX=$(usex regex)
-	)
-
-	cmake_src_configure
-}
diff --git a/media-sound/pulseaudio-daemon/Manifest b/media-sound/pulseaudio-daemon/Manifest
index ed9d8c5097d8..2db53e48333e 100644
--- a/media-sound/pulseaudio-daemon/Manifest
+++ b/media-sound/pulseaudio-daemon/Manifest
@@ -1,8 +1,11 @@
 AUX enable-autospawn.conf 65 BLAKE2B 47e57076b19000ca3c57f0368e453198131c41a5a9c2d0cc8632f0a7ed4e5c992cf93e3c7651c4f3b59ceaf177d4d811bd6774676a2b005ec12259e56d99b4d2 SHA512 61f90b0d19e807a672bd39d190c1102db0b8c46284cf09d4a19b4b96d566633e56a60d21a3a1374e447e8e06496a3aef56bf5ae574337c081e7cf18842458e59
+AUX pulseaudio-16.0-fix-rtp-receiver-sdp-record.patch 1025 BLAKE2B 33b8aa51c966a0716fd9c15c51903e74b760bc72eaf511e9a86182155c6e9e5e6e1b8eb9af40cf7da023de25e1f74a2428d74954c230c53bc61c42e53033a9c2 SHA512 9e573806494b0e8d3aa51db205457e5c63326cb81fe5a2801b0e66b2b49c3133b30c85feafd0b58a64b5949cbc9e29e599459b76cbf5f479281ad8aa5c5bbb5e
+AUX pulseaudio-16.0-optional-module-console-kit.patch 3077 BLAKE2B 3b8abc67478f6c8848a24788bdceeb5bce868bf5214a092c3abbd39a3102679e4b390e56231de0559c8389730a2a75ba21bf4d9f9d942792589c6db66d6eb04d SHA512 bec1a747593d9130bb8cfb05b0894e467c953264879f2a856a420b07ee688640ec2279c136daa825b21e0e7e3bfc3aa1e333487a776d1c7ffb9a6d0293a0502b
 AUX pulseaudio.conf.d 151 BLAKE2B 99b185b9353259f37f3396c6f2bb56b80cac0159c9c5d06af4b298ad71d9c577dd6b3f0d9097fc95184b14193d0d55252987465ebd93bd0005849a68ce9b428d SHA512 f97ed431e371e43d297b099952bf1e897b243a822183524b8e3ea17e888c08590bb3793e195bc22e3254eae7f2e1fa00204a752638746c4dde825a423f08c24b
 AUX pulseaudio.init.d-5 2224 BLAKE2B d7710b77b209391016e9f84b574cdf70636904d7f54caf9297357ebee97e8ae10c54119521ecad99fbef5f1ad341128b06816f8c733faa29d9c44fa8c435008b SHA512 a11d02fd1c6672a7f022e6ef3e3ad8e3a7f2bf50257c38573db0823415c990021a7bf29b1e194d3d9c8a59464673958604086ef519313a4e3a6bd79071397f29
 AUX pulseaudio.service 227 BLAKE2B f58fa701152e84f4d52426f6f76b5a01a1a315d09e5fb8e9e57860b44dc63b78b3f1c1629380b4345c53b003c677f729b3959419e8488e37607c56d6a700626a SHA512 567663b231fe7c2682b08b1059cdad1fcb3c4cb01c1b24aed9afb6fb767b30f250b78bbbed48aadfb06c6d1a4963a6db24877d79a1d36c4be2a128b479c086d6
 AUX pulseaudio.tmpfiles 36 BLAKE2B 4fe7c88fb35f561b0eb756146db17e37201126b5d7f906c88cdc778c6191f17c799f1db072f09d5a384485830e4d33266c224955bad22081255544642399b2f6 SHA512 f040850d81030ef04e1aa368d333a1ae1b7238adef5772280fc344c3068262d5ab8c9f3edb92db9c443f9d7d21abb27583ea1efc51ed733bbfa43e2edc68dde1
 DIST pulseaudio-16.0.tar.xz 1551276 BLAKE2B 54ba5d446bc02246bf842280f577851eb66ff9fed1e1b0d2d03e238796d9d04bc1fc27215b02fdded37441da1747be23d1e03d5a00b79ee3b91eb35c0f76a470 SHA512 42d4968c2dc88f5e39a5358d124e399e40a5abdf815eff387087141bc9dddd217012acb35649a8e0e24a44e8a402d90eb193ce2eef186f7d59550f757a6cc26d
-EBUILD pulseaudio-daemon-16.0-r1.ebuild 11995 BLAKE2B af5844302c36588fb5e24262e217052d701e332371c0ed513d7554f5640135fd8f0ee66318260604535498efd9d7a4bc2968659764a5902d40af6151584380bc SHA512 4caf9ad281bfccb11025e2a3bcabab0c470585de440fb5550f459ec6ffe83e3922ed70289ae2f847772b3c07b8583d2ce157747d7dfb30f832c5d4239a1ab2f0
+EBUILD pulseaudio-daemon-16.0-r1.ebuild 11998 BLAKE2B eae74c6cef4adc800de9d0f444c93ab95ad0c6943b5be4f18b46e530c8df0c33353442df9101a4ba51cc139262e03a0783d26b13cb6b94b8385f92dfd5e0d939 SHA512 a5d155ccaeb75414954dcabc4e539035dd188144c46d1e0818bd8014d505aeaaf4d4798a243eaf722372c305f4c1933420f43e138049e8175885ae304fa7d8f1
+EBUILD pulseaudio-daemon-16.0-r4.ebuild 11991 BLAKE2B a0cad25d3b04a7b7059c1c27b3b10e0917548643ca5fa3ef74e59b9c5cd75c48f66a5213b3ea608184ac35e2fa6deefb5de51bf6568ccbb257b43572975103d5 SHA512 1c1df7772101c0ec87496292f143239523400b2bf84cbdbdb464ca2c9fc340656dfed124725510274c87fa742d5d862001746bf666fa519782dd1d3f04f9996b
 MISC metadata.xml 3570 BLAKE2B 24d7b24a68f5e832708d9879769f55ec4cf146c47a41b5fa0ff33f63a5a9945736e227c6a6afa106f964fd91eb3b0ee441203c92f312ed835ef2197979b6fda9 SHA512 34aa5503ad5483eeff2f7c4713d96322dedbdd56b7d52a17ba0658aba24aef58239d5ee1943a276555c2508fd3d5e18639ec6417044adad512693fa6c673c5df
diff --git a/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-rtp-receiver-sdp-record.patch b/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-rtp-receiver-sdp-record.patch
new file mode 100644
index 000000000000..3d72b9a009c4
--- /dev/null
+++ b/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-rtp-receiver-sdp-record.patch
@@ -0,0 +1,26 @@
+commit d7a633df899dda8738a30df318269e28c902e815
+Author: Igor V. Kovalenko <igor.v.kovalenko@gmail.com>
+Date:   Mon Jun 13 21:38:08 2022 +0300
+
+    rtp: Initialize SDP info struct field added for OPUS
+    
+    Turned out that pa_sdp_info::enable_opus is never initialized, which seldom
+    makes module-rtp-recv believe it will be playing OPUS-encoded stream even though
+    discovered SDP record does not indicate OPUS codec in metadata.
+    
+    Fix this by adding missing initializer.
+    
+    Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/720>
+
+diff --git a/src/modules/rtp/sdp.c b/src/modules/rtp/sdp.c
+index 4e6a442f8..bf131a27e 100644
+--- a/src/modules/rtp/sdp.c
++++ b/src/modules/rtp/sdp.c
+@@ -129,6 +129,7 @@ pa_sdp_info *pa_sdp_parse(const char *t, pa_sdp_info *i, int is_goodbye) {
+     i->origin = i->session_name = NULL;
+     i->salen = 0;
+     i->payload = 255;
++    i->enable_opus = false;
+ 
+     if (pa_startswith(t, PA_SDP_HEADER)) {
+         t += sizeof(PA_SDP_HEADER) - 1;
diff --git a/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-optional-module-console-kit.patch b/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-optional-module-console-kit.patch
new file mode 100644
index 000000000000..4ffdb82f4901
--- /dev/null
+++ b/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-optional-module-console-kit.patch
@@ -0,0 +1,76 @@
+commit 823e46fba0742605f557b68cd591f61624b93966
+Author: Igor V. Kovalenko <igor.v.kovalenko@gmail.com>
+Date:   Sun Jun 12 21:49:32 2022 +0300
+
+    build-sys: meson: Make module-console-kit optional
+    
+    Default build configuration would fail to run on a system without systemd-logind
+    (or elogind) and without ConsoleKit daemon responding on dbus interface. Here,
+    module-console-kit would fail to initialize, preventing daemon from starting.
+    
+    Make module-console-kit an optional build feature to allow opt-out.
+    
+    Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/719>
+
+diff --git a/meson.build b/meson.build
+index d4cdbd6a5..c6db7e670 100644
+--- a/meson.build
++++ b/meson.build
+@@ -732,6 +732,10 @@ if get_option('daemon')
+     cdata.set('HAVE_SYSTEMD_LOGIN', 1)
+   endif
+ 
++  if get_option('consolekit').enabled()
++    assert(dbus_dep.found(), 'ConsoleKit requires D-Bus support')
++  endif
++
+   tcpwrap_dep = cc.find_library('wrap', required: get_option('tcpwrap'))
+   if cc.has_header('tcpd.h') and cc.has_function('hosts_access', dependencies : tcpwrap_dep)
+     cdata.set('HAVE_LIBWRAP', 1)
+@@ -1001,6 +1005,7 @@ summary += [
+   '  Enable HAL->udev compat:     @0@'.format(get_option('hal-compat')),
+   'Enable systemd units:          @0@'.format(systemd_dep.found()),
+   'Enable elogind:                @0@'.format(libelogind_dep.found()),
++  'Enable ConsoleKit:             @0@'.format(not get_option('consolekit').disabled() and dbus_dep.found()),
+   'Enable TCP Wrappers:           @0@'.format(tcpwrap_dep.found()),
+   'Enable OpenSSL (for Airtunes): @0@'.format(openssl_dep.found()),
+   'Database:                      @0@'.format(get_option('database')),
+diff --git a/meson_options.txt b/meson_options.txt
+index b23210072..e7160a3a7 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -99,6 +99,9 @@ option('bluez5-native-headset',
+ option('bluez5-ofono-headset',
+        type : 'boolean',
+        description : 'Optional oFono headset backend support (BlueZ 5)')
++option('consolekit',
++       type : 'feature', value : 'auto',
++       description : 'Optional ConsoleKit support')
+ option('dbus',
+        type : 'feature', value : 'auto',
+        description : 'Optional D-Bus support')
+diff --git a/src/modules/meson.build b/src/modules/meson.build
+index cdf372c8e..1d8004300 100644
+--- a/src/modules/meson.build
++++ b/src/modules/meson.build
+@@ -130,7 +130,6 @@ endif
+ 
+ if dbus_dep.found()
+   all_modules += [
+-    [ 'module-console-kit', 'module-console-kit.c', [], [], [dbus_dep] ],
+     [ 'module-dbus-protocol',
+       [ 'dbus/iface-card.c', 'dbus/iface-card.h',
+ 	'dbus/iface-card-profile.c', 'dbus/iface-card-profile.h',
+@@ -147,6 +146,12 @@ if dbus_dep.found()
+       [], [], [dbus_dep] ],
+     [ 'module-rygel-media-server', 'module-rygel-media-server.c', [], [], [dbus_dep], libprotocol_http ],
+   ]
++
++  if not get_option('consolekit').disabled()
++    all_modules += [
++      [ 'module-console-kit', 'module-console-kit.c', [], [], [dbus_dep] ],
++    ]
++  endif
+ endif
+ 
+ if fftw_dep.found()
diff --git a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r1.ebuild b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r1.ebuild
index ffb4e1a39881..b6489354786a 100644
--- a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r1.ebuild
+++ b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r1.ebuild
@@ -61,7 +61,7 @@ gstreamer_deps="
 	>=media-libs/gstreamer-1.14
 "
 COMMON_DEPEND="
-	>=media-libs/libpulse-${PV}[dbus?,glib?,systemd?,tcpd?,valgrind?,X?]
+	>=media-libs/libpulse-${PV}[dbus?,glib?,systemd?,tcpd(+)?,valgrind?,X?]
 	dev-libs/libatomic_ops
 	>=media-libs/libsndfile-1.0.20
 	>=media-libs/speexdsp-1.2
diff --git a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r4.ebuild b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r4.ebuild
new file mode 100644
index 000000000000..3ec78e0ac672
--- /dev/null
+++ b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r4.ebuild
@@ -0,0 +1,388 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MY_PV="${PV/_pre*}"
+MY_P="pulseaudio-${MY_PV}"
+inherit bash-completion-r1 gnome2-utils meson optfeature systemd tmpfiles udev
+
+DESCRIPTION="A networked sound server with an advanced plugin system"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
+
+if [[ ${PV} = 9999 ]]; then
+	inherit git-r3
+	EGIT_BRANCH="master"
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/pulseaudio/pulseaudio"
+else
+	SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+# libpulse-simple and libpulse link to libpulse-core; this is daemon's
+# library and can link to gdbm and other GPL-only libraries. In this
+# cases, we have a fully GPL-2 package. Leaving the rest of the
+# GPL-forcing USE flags for those who use them.
+LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
+
+SLOT="0"
+
+# +alsa-plugin as discussed in bug #519530
+# TODO: Find out why webrtc-aec is + prefixed - there's already the always available speexdsp-aec
+# NOTE: The current ebuild sets +X almost certainly just for the pulseaudio.desktop file
+IUSE="+alsa +alsa-plugin aptx +asyncns bluetooth dbus elogind equalizer fftw +gdbm +glib gstreamer jack ldac lirc
+ofono-headset +orc oss selinux sox ssl systemd system-wide tcpd test +udev valgrind +webrtc-aec +X zeroconf"
+
+RESTRICT="!test? ( test )"
+
+# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
+# Basically all IUSE are either ${MULTILIB_USEDEP} for client libs or they belong under !daemon ()
+# We duplicate alsa-plugin, {native,ofono}-headset under daemon to let users deal with them at once
+REQUIRED_USE="
+	?? ( elogind systemd )
+	alsa-plugin? ( alsa )
+	aptx? ( bluetooth )
+	bluetooth? ( dbus )
+	equalizer? ( dbus )
+	ldac? ( bluetooth )
+	ofono-headset? ( bluetooth )
+	udev? ( || ( alsa oss ) )
+	zeroconf? ( dbus )
+"
+
+# NOTE:
+# - libpcre needed in some cases, bug #472228
+# - media-libs/speexdsp is providing echo canceller implementation and used in resampler
+# TODO: libatomic_ops is only needed on some architectures and conditions, and then at runtime too
+gstreamer_deps="
+	media-libs/gst-plugins-base
+	>=media-libs/gstreamer-1.14
+"
+COMMON_DEPEND="
+	>=media-libs/libpulse-${PV}[dbus?,glib?,systemd?,valgrind?,X?]
+	dev-libs/libatomic_ops
+	>=media-libs/libsndfile-1.0.20
+	>=media-libs/speexdsp-1.2
+	|| (
+		elibc_glibc? ( virtual/libc )
+		dev-libs/libpcre:3
+	)
+	alsa? ( >=media-libs/alsa-lib-1.0.24 )
+	aptx? ( ${gstreamer_deps} )
+	asyncns? ( >=net-libs/libasyncns-0.1 )
+	bluetooth? (
+		>=net-wireless/bluez-5
+		media-libs/sbc
+	)
+	dev-libs/libltdl
+	sys-kernel/linux-headers
+	>=sys-libs/libcap-2.22-r2
+	dbus? ( >=sys-apps/dbus-1.4.12 )
+	elogind? ( sys-auth/elogind )
+	equalizer? (
+		sci-libs/fftw:3.0=
+	)
+	fftw? (
+		sci-libs/fftw:3.0=
+	)
+	gdbm? ( sys-libs/gdbm:= )
+	glib? ( >=dev-libs/glib-2.28.0:2 )
+	gstreamer? (
+		${gstreamer_deps}
+		>=dev-libs/glib-2.26.0:2
+	)
+	jack? ( virtual/jack )
+	ldac? ( ${gstreamer_deps} )
+	lirc? ( app-misc/lirc )
+	ofono-headset? ( >=net-misc/ofono-1.13 )
+	orc? ( >=dev-lang/orc-0.4.15 )
+	selinux? ( sec-policy/selinux-pulseaudio )
+	sox? ( >=media-libs/soxr-0.1.1 )
+	ssl? ( dev-libs/openssl:= )
+	systemd? ( sys-apps/systemd:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+	udev? ( >=virtual/udev-143[hwdb(+)] )
+	valgrind? ( dev-util/valgrind )
+	webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 )
+	X? (
+		>=x11-libs/libxcb-1.6
+		x11-libs/libICE
+		x11-libs/libSM
+		>=x11-libs/libX11-1.4.0
+		>=x11-libs/libXtst-1.0.99.2
+	)
+	zeroconf? ( >=net-dns/avahi-0.6.12[dbus] )
+	!<media-sound/pulseaudio-15.0-r100
+"
+
+# pulseaudio ships a bundle xmltoman, which uses XML::Parser
+DEPEND="
+	${COMMON_DEPEND}
+	test? ( >=dev-libs/check-0.9.10 )
+	X? ( x11-base/xorg-proto )
+"
+
+# alsa-utils dep is for the alsasound init.d script (see bug 155707); TODO: read it
+# NOTE: Only system-wide needs acct-group/audio unless elogind/systemd is not used
+RDEPEND="
+	${COMMON_DEPEND}
+	system-wide? (
+		alsa? ( media-sound/alsa-utils )
+		acct-user/pulse
+		acct-group/audio
+		acct-group/pulse-access
+	)
+	bluetooth? (
+		ldac? ( media-plugins/gst-plugins-ldac )
+		aptx? ( media-plugins/gst-plugins-openaptx )
+	)
+"
+unset gstreamer_deps
+
+# This is a PDEPEND to avoid a circular dep
+PDEPEND="
+	alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio] ) )
+"
+
+BDEPEND="
+	dev-lang/perl
+	dev-perl/XML-Parser
+	sys-devel/gettext
+	virtual/libiconv
+	virtual/libintl
+	virtual/pkgconfig
+	orc? ( >=dev-lang/orc-0.4.15 )
+	system-wide? ( dev-util/unifdef )
+"
+
+DOCS=( NEWS README )
+
+S="${WORKDIR}/${MY_P}"
+
+# patches merged upstream, to be removed with 16.1 or later bump
+PATCHES=(
+	"${FILESDIR}"/pulseaudio-16.0-fix-rtp-receiver-sdp-record.patch
+	"${FILESDIR}"/pulseaudio-16.0-optional-module-console-kit.patch
+)
+
+src_prepare() {
+	default
+
+	gnome2_environment_reset
+}
+
+src_configure() {
+	local enable_bluez5_gstreamer="disabled"
+	if use aptx || use ldac ; then
+		enable_bluez5_gstreamer="enabled"
+	fi
+
+	local enable_fftw="disabled"
+	if use equalizer || use fftw ; then
+		enable_fftw="enabled"
+	fi
+
+	local emesonargs=(
+		--localstatedir="${EPREFIX}"/var
+
+		-Ddaemon=true
+		-Dclient=false
+		-Ddoxygen=false
+		-Dgcov=false
+		-Dman=true
+		# tests involve random modules, so just do them for the native # TODO: tests should run always
+		$(meson_use test tests)
+		-Ddatabase=$(usex gdbm gdbm simple) # tdb is also an option but no one cares about it
+		-Dstream-restore-clear-old-devices=true
+		-Drunning-from-build-tree=false
+
+		# Paths
+		-Dmodlibexecdir="${EPREFIX}/usr/$(get_libdir)/pulseaudio/modules" # Was $(get_libdir)/${P}
+		-Dsystemduserunitdir=$(systemd_get_userunitdir)
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
+		-Dbashcompletiondir="$(get_bashcompdir)" # Alternatively DEPEND on app-shells/bash-completion for pkg-config to provide the value
+
+		# Optional features
+		$(meson_feature alsa)
+		$(meson_feature asyncns)
+		$(meson_feature zeroconf avahi)
+		$(meson_feature bluetooth bluez5)
+		-Dbluez5-gstreamer=${enable_bluez5_gstreamer}
+		$(meson_use bluetooth bluez5-native-headset)
+		$(meson_use ofono-headset bluez5-ofono-headset)
+		-Dconsolekit=disabled
+		$(meson_feature dbus)
+		$(meson_feature elogind)
+		-Dfftw=${enable_fftw}
+		$(meson_feature glib) # WARNING: toggling this likely changes ABI
+		$(meson_feature glib gsettings) # Supposedly correct?
+		$(meson_feature gstreamer)
+		-Dgtk=disabled
+		-Dhal-compat=false
+		-Dipv6=true
+		$(meson_feature jack)
+		$(meson_feature lirc)
+		$(meson_feature ssl openssl)
+		$(meson_feature orc)
+		$(meson_feature oss oss-output)
+		-Dsamplerate=disabled # Matches upstream
+		$(meson_feature sox soxr)
+		-Dspeex=enabled
+		$(meson_feature systemd)
+		$(meson_feature tcpd tcpwrap)
+		$(meson_feature udev)
+		$(meson_feature valgrind)
+		$(meson_feature X x11)
+
+		# Echo cancellation
+		-Dadrian-aec=false # Not packaged?
+		$(meson_feature webrtc-aec)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# Upstream installs 'pactl' if client is built, with all symlinks except for
+	# 'pulseaudio', 'pacmd' and 'pasuspender' which are installed if server is built.
+	# This trips QA warning, workaround:
+	# - install missing aliases in media-libs/libpulse (client build)
+	# - remove corresponding symlinks in media-sound/pulseaudio-daemonclient (server build)
+	rm "${D}/$(get_bashcompdir)"/pulseaudio || die
+	rm "${D}/$(get_bashcompdir)"/pacmd || die
+	rm "${D}/$(get_bashcompdir)"/pasuspender || die
+
+	if use system-wide; then
+		newconfd "${FILESDIR}"/pulseaudio.conf.d pulseaudio
+
+		use_define() {
+			local define=${2:-$(echo ${1} | tr '[:lower:]' '[:upper:]')}
+
+			use "${1}" && echo "-D${define}" || echo "-U${define}"
+		}
+
+		unifdef -x 1 \
+			$(use_define zeroconf AVAHI) \
+			$(use_define alsa) \
+			$(use_define bluetooth) \
+			$(use_define udev) \
+			"${FILESDIR}"/pulseaudio.init.d-5 \
+			> "${T}"/pulseaudio \
+			|| die
+
+		doinitd "${T}"/pulseaudio
+
+		systemd_dounit "${FILESDIR}"/pulseaudio.service
+
+		# We need /var/run/pulse, bug 442852
+		newtmpfiles "${FILESDIR}"/pulseaudio.tmpfiles pulseaudio.conf
+	else
+		# Prevent warnings when system-wide is not used, bug 447694
+		if use dbus; then
+			rm "${ED}"/etc/dbus-1/system.d/pulseaudio-system.conf || die
+		fi
+	fi
+
+	if use zeroconf; then
+		sed -i \
+			-e '/module-zeroconf-publish/s:^#::' \
+			"${ED}/etc/pulse/default.pa" \
+			|| die
+	fi
+
+	# Only enable autospawning pulseaudio daemon on systems without systemd
+	if ! use systemd; then
+		insinto /etc/pulse/client.conf.d
+		newins "${FILESDIR}/enable-autospawn.conf" "enable-autospawn.conf"
+	fi
+
+	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+
+	use udev && udev_reload
+
+	if use system-wide; then
+		tmpfiles_process "pulseaudio.conf"
+
+		elog "You have enabled the 'system-wide' USE flag for pulseaudio."
+		elog "This mode should only be used on headless servers, embedded systems,"
+		elog "or thin clients. It will usually require manual configuration, and is"
+		elog "incompatible with many expected pulseaudio features."
+		elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED."
+		elog ""
+		elog "For more information, see"
+		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/"
+		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/"
+		elog "    https://wiki.gentoo.org/wiki/PulseAudio#Headless_server"
+		elog ""
+	fi
+
+	if use equalizer; then
+		elog "You will need to load some extra modules to make qpaeq work."
+		elog "You can do that by adding the following two lines in"
+		elog "/etc/pulse/default.pa and restarting pulseaudio:"
+		elog "load-module module-equalizer-sink"
+		elog "load-module module-dbus-protocol"
+		elog ""
+	fi
+
+	if use bluetooth; then
+		elog "You have enabled bluetooth USE flag for pulseaudio. Daemon will now handle"
+		elog "bluetooth Headset (HSP HS and HSP AG) and Handsfree (HFP HF) profiles using"
+		elog "native headset backend by default. This can be selectively disabled"
+		elog "via runtime configuration arguments to module-bluetooth-discover"
+		elog "in /etc/pulse/default.pa"
+		elog "To disable HFP HF append enable_native_hfp_hf=false"
+		elog "To disable HSP HS append enable_native_hsp_hs=false"
+		elog "To disable HSP AG append headset=auto or headset=ofono"
+		elog "(note this does NOT require enabling USE ofono)"
+		elog ""
+	fi
+
+	if use ofono-headset; then
+		elog "You have enabled both native and ofono headset profiles. The runtime decision"
+		elog "which to use is done via the 'headset' argument of module-bluetooth-discover."
+		elog ""
+	fi
+
+	if use gstreamer; then
+		elog "GStreamer-based RTP implementation modile enabled."
+		elog "To use OPUS payload install media-plugins/gst-plugins-opus"
+		elog "and add enable_opus=1 argument to module-rtp-send"
+		elog ""
+	fi
+
+	if use systemd; then
+		elog "Pulseaudio autospawn by client library is no longer enabled when systemd is available."
+		elog "It's recommended to start pulseaudio via its systemd user units:"
+		elog ""
+		elog "  systemctl --user enable pulseaudio.service pulseaudio.socket"
+		elog ""
+		elog "Root user can change system default configuration for all users:"
+		elog ""
+		elog "  systemctl --global enable pulseaudio.service pulseaudio.socket"
+		elog ""
+		elog "If you would like to enable autospawn by client library, edit autospawn flag in /etc/pulse/client.conf like this:"
+		elog ""
+		elog "  autospawn = yes"
+		elog ""
+		elog "The change from autospawn to user units will take effect after restarting."
+		elog ""
+	fi
+
+	optfeature_header "PulseAudio can be enhanced by installing the following:"
+	use equalizer && optfeature "using the qpaeq script" dev-python/PyQt5[dbus,widgets]
+	use dbus && optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+	use udev && udev_reload
+}
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index da8d09ac4c2f..fed83300699c 100644
Binary files a/media-tv/Manifest.gz and b/media-tv/Manifest.gz differ
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index 141de6b1f73f..82efd6f8a8d5 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -1,20 +1,24 @@
 AUX kodi-19.1-fmt-8.patch 875 BLAKE2B 12899b05bc5c79bd6dd9871d45065142848507bdf928dca12a1fff483611df1d924f1a386881232fbdd67eb303e627f41b331b8ce769325731dbbd4b63a0d4ab SHA512 bb54aa79a497d6d13f88ae9d1e530628eecc1b57deba9c4a404c2b5595f5ccc0c0069ce728a34df08ffbcac984713442091bb63bcdb06adacf7dc05965001e58
 DIST ffmpeg-kodi-4.3.1-Matrix-Beta1.tar.gz 13477440 BLAKE2B 49415f76fd2a888b0efadb19597bd89db65c3d9e1224ab529ff0d73ab5734a23982b4d4905ddeb105ce59a816c4642cdb9f5568b0c39c29f5fb9431f9623d4ec SHA512 ce43390e816dabeed4ca231f5f7adade6c721c38e17996a57810fb6025ea49b812133c2a6e29aac7c674d4e4af3a21dbd7e605d85fb966935a01bda983b884ac
 DIST ffmpeg-kodi-4.3.2-Matrix-19.1.tar.gz 13490949 BLAKE2B 90007f2c4bac0e0a52b419d9333cf75b00e291f1ea7447cbdc579ee2f860de7c436c924253600f3fbd6e3faaabe97aaf46db083a5bbd2f5f03badcca5d643e89 SHA512 d3719253d674b16638b873545583b82fba3176803c81ba8bcb37e90456dd956f1c2ee8996493840cff2d61c6399f06ed0524a759f46e4ce174bce23e9c6eda4a
-DIST ffmpeg-kodi-4.4-N-Alpha1.tar.gz 13717391 BLAKE2B 2c45778e36167a8740f8f724dc8a66ea2491d8343b1f2546027c4dd1a711aa7a8b830defc439006402e141f264532cbc623758dd066b45fc8a09f67ffdc0f9b8 SHA512 53edceae357747763dd20cdaae0a546970506e5f488477426821ecb87aff613dadb9c4c46a63594db9e230ba54db6da8e5f34699afc0221fd10adfb8f08cf840
+DIST ffmpeg-kodi-4.4.1-Nexus-Alpha1.tar.gz 13725564 BLAKE2B 51d310e7000aeba657d55341c5fdb540474e197b85062228ab4b314c8309ec11985aa7f105193333fc6106529e8e58c86eafe268190894be8532d0e0b9065fa6 SHA512 8beb04d577b5251e74b0d52f4d130997a8ba94bbd488c7c8309e6b45095c27807e150212888ce3a384b23dff52f8df1a7bde5407bae924ddc363f8125c0616c5
 DIST kodi-19.0.tar.gz 52311355 BLAKE2B 543936b8fb607d1d629a8f2abd9cd0cb3bf6114aa93647c7e8ccee2f99ff1f84a2740bb57f0cbf675b3efa5914e98c57effb28ecd8e9df83a39d67ee708280a2 SHA512 d6c9fe7414b64d33d919d6c3de1ddb4800e36b786a460d2d2f5c1e5346cd4819487e54f212c37778103d44dd051f7df6c74e0a98a0b21d1e4dc9bedaa8570422
 DIST kodi-19.1.tar.gz 52323919 BLAKE2B 6aa82632d2d70e5f84340c572b586e903e7dbc50c4f99fc5118761d495bd13dcbbcd70462e6288147dd4a305952d1e07f08daf45bbc402b59e3ef785391e1fe7 SHA512 725cbc270259ef5d3b79f9bc271b789dc8ef6616a6d4038e0cd449755ca4ed25198ad6e854b304aedc1fb911ecb98a0aad1b3e469857f8aed54fc4634193eb75
 DIST kodi-19.2-Matrix.tar.gz 52359726 BLAKE2B d560a48b050757d22f8fc4c5b4c9c84be2ff4acb2057f1571f00f93c29b5b71ec19b2f09dee3abe578414364523efcbd8b4d6bc3a425ddc4a5a789baebd352d0 SHA512 0efcfa9f3bb00f7fa53f4a500b75f8232f1775af446e997c6a0fd7636ca4e0b161cf075fad52130b5bd7c23f4f4decfb8c60a87669a920c89b13fc3ff55469fb
 DIST kodi-19.3-Matrix.tar.gz 52354039 BLAKE2B 33d9f0081391fcc37d5f2548d92e0746540394db5e495dfd43fed3e68e776091b505ef4ef21a5fa4c3bef74793642d81ad270c58414ab995ab51a20af76ad530 SHA512 ccb8f26ff8a9ca0cec50e069ff9c658de89a868093a8da25d6a55317d68656de6fd7107c5348c545b4f3cdd541293cfd58f8d171877bfa7533d39e072df68c04
 DIST kodi-19.4-Matrix.tar.gz 53487622 BLAKE2B 75432f0fe225d10548c9cbce1ec5a1722ce75e9bc6f19ba9a8deffc50874be94ca1552c5bd75b3ea1712344ebdf6f5934bca3ee315e6acccd2141df7de3304e9 SHA512 2804c57d85877873dae8e62f083b86f51fceebb802819523654a231f50f9850022956e1a9b91702e7c8b3f7ab437ceea7b10319239a8289dbf877ce94bba07c9
 DIST libdvdcss-1.4.2-Leia-Beta-5.tar.gz 101068 BLAKE2B 283aa2cec0a2200d3569bc280cb9659e9224a6b3a77db8a35b269cd8caf1337ac9d8b92b806df66f63ef7458a46bd6261f0b8b14678b10e26644a79dcbeea5da SHA512 5185dbdbeb1bd13ea9d8723f1f4ab599d6f3102f5ba1096cd085aa1cda252c045f327c719227bba8e1b742352ade5e335106c8d0c1637a5a6b93ce661620dd7e
+DIST libdvdcss-1.4.3-Next-Nexus-Alpha2.tar.gz 102251 BLAKE2B c7499013a44e81e1aac736f40802db4bc2a8f70664f4d15a81b9c717861894d99a0e2b58ec922ed2f80f9335cc7647b2607daee2a297252827b17075a50ae739 SHA512 a8cc334036888599feaafc7e563ca079a22e52ca3d0a5f5579571f95fe27d22778f390c86b72912a1bacb0ea6b8a6008ff9d47b32383e3eac810e6ba92e8dea1
 DIST libdvdnav-6.0.0-Leia-Alpha-3.tar.gz 137942 BLAKE2B 7573434a0ae8e8ccabf48173f81fcde29074eb138e119a2ae9156cde3c3d8bfd716f5d0e605b97f2dcac21f570781137c8533c5ae306b51e3905822fda318355 SHA512 11c93eaacd156f8fd7dec7c43d366438b201f31ad55b2870463a9e286912b6ada08882319a021fb7992190f87b909a49f2b83e0321cc17aedc29f7fe5898fa72
+DIST libdvdnav-6.1.1-Next-Nexus-Alpha2.tar.gz 128896 BLAKE2B 021da81f82da0a6a47dfa1019ef07f1879cb3fcc41e790726b0afd5ba0591d24c58399c28f8e3e9b60fe4b078853236e1cb49c0c7a57c1508e6cc4d2f8ecaabd SHA512 01c415a561ea8bd9d568ad2668fbf8bc54304557e413776e1b841145cad3f7b9991a6772af7bac408b2cb87c6236c378e79c1c023a58b280a6c92fee151f0fb1
 DIST libdvdread-6.0.0-Leia-Alpha-3.tar.gz 130649 BLAKE2B 0c206acdaf0776841ab792c74e023af07d9539eb72e03ae164382a31ed950f60e5e15f1d055979d28f1398924471b294d11f064b11b8373353b3962a3777ff3c SHA512 b3419ba0a1a2dd70f1bb6236afdfe1c6e88c9ad4264198b289e3bba9375e077cecf7f89848c7b09debaa445327f3507101f3d157e692f7a7163b2bb52643e1e7
+DIST libdvdread-6.1.3-Next-Nexus-Alpha2.tar.gz 110631 BLAKE2B f84f6ac77ba3fb94cf513d602c79014eb34c7d16a4c7c091a6054d7e121175b8c53a8f1339a6e5baa2d9687e8b6d8439ce76781c49612d26593a20d5ede6a388 SHA512 f96e365ac6788c538b5ed54c5330ef8625962e77c27098b5cbd21332fed5cbafd422f2a997499bc17aa814849fa44b131942278547207e6611a491b0ee05b91a
 EBUILD kodi-19.0-r2.ebuild 10959 BLAKE2B 91b00967a1a81cc44edcf28907de17cb4ef51c114b84db3046e96844b19d7d3733263dfe76485baf8961e1c34defba884f6808890d0e19ad6c1c5e8b3d0a90b0 SHA512 c6b2fd15f28caf506216b85d65443f01ecdb51d85542510cdedf8fd5bd41eda6e0a364f0716fdd7c4f47cd8dd9193f46deee298aa597d7878413b3b866f1be49
 EBUILD kodi-19.1-r2.ebuild 10980 BLAKE2B 51df21a2bc5577199c3d00e76b7b1fbf6faddacbde1b70b4a2e1834e4cfb5691d2d6a861d39348125e29a4cf4ec0a332ea0d233d26af91c6810081c994ab1a14 SHA512 ef44b03077717ddb8c412c86acb90a916adef4b2cada3611c6ea1ab48c1a8745880c16e21ca9e3a1ec6eea15be60c16747d689094058f5aeae130f5775287917
 EBUILD kodi-19.2-r1.ebuild 10967 BLAKE2B aa98be2ffb033153dde9768f69ebbd48f8b283e72f1a938ee4a5bfdb23f2dbaf1db705bd8021054e49dfd5690fc140da72b14479d92d9a7c6af6f78c0b74a70d SHA512 8a3d87bf7de71a21a6cd43148761b609dce52e7467ffb6515a4952ef16e4ed5cf4a04fd0b8e8b4f30ab32912d49ac9c2db0a739a9014617d38b23b0464173752
 EBUILD kodi-19.3-r1.ebuild 10970 BLAKE2B f735aa870b97d620016d7add3d6be68dfa2714e592e59f9cad49d4c9df820468774468d612bffa46428220742a7d26ca4338e165be841f668a45bc98117af77a SHA512 3888c3b014ff78ccb637975271bb4efb9b2851720280c57a6d9bfb12b669e73ccf0f2a82c43346e9fb08d115fbe92bcd34bf31e405d222d80b23bf2888f733df
+EBUILD kodi-19.4-r1.ebuild 10934 BLAKE2B 66b014a8bbdd750529d7ee8e8d254b67f550723f6fd4f3cc37255f4d7ddd996530d298999d5e238defb3988c387df2e1c70ac953fbd78fae7ebc35cedbcd68f7 SHA512 49134ccbd9c5380937c4b1f4aaf32c48bd8883c46386dcede2591a26a82e7c57a624c83134f5f3e3dba7ef6d78518734f4656bf705ab8ad543c806f729677a96
 EBUILD kodi-19.4.ebuild 10969 BLAKE2B 87db4e69b85803793de1bb679beab93861bfcffd04c92cae4a915967359d8007e296c22be2338d4fceaceb5ddb7996a1d748b6fc818204e3ccafd1c547c9e76a SHA512 eca24eaae6ce01d37b06541b2e4bc7c6984f469d67461235802d1cdb86d9e3b3a31f091ecca563a6c1ff6b65067f6d750995b82bc0cba4975cff4a6332cb75b0
-EBUILD kodi-19.9999.ebuild 10970 BLAKE2B f735aa870b97d620016d7add3d6be68dfa2714e592e59f9cad49d4c9df820468774468d612bffa46428220742a7d26ca4338e165be841f668a45bc98117af77a SHA512 3888c3b014ff78ccb637975271bb4efb9b2851720280c57a6d9bfb12b669e73ccf0f2a82c43346e9fb08d115fbe92bcd34bf31e405d222d80b23bf2888f733df
-EBUILD kodi-9999.ebuild 11014 BLAKE2B 1155f586e15067a856e8bbb3719d13cd437d7a733494d853e011d965aec45632fab87e1dd2503e457386aaecfb36a3c2293736aa13ffd0460ef0a3b5e6f5b0cf SHA512 7d0d7efd7411bda4d415b92d7ea65f88e7eeb0d223de8b5b933976653e082a333c89ca523a19b49f99a1e503815988b383dd3c6f7eacefff77a8eb88cc18f5d6
+EBUILD kodi-19.9999.ebuild 10934 BLAKE2B 66b014a8bbdd750529d7ee8e8d254b67f550723f6fd4f3cc37255f4d7ddd996530d298999d5e238defb3988c387df2e1c70ac953fbd78fae7ebc35cedbcd68f7 SHA512 49134ccbd9c5380937c4b1f4aaf32c48bd8883c46386dcede2591a26a82e7c57a624c83134f5f3e3dba7ef6d78518734f4656bf705ab8ad543c806f729677a96
+EBUILD kodi-9999.ebuild 11000 BLAKE2B c362b18d245a3bfc02dec05c7edfdcdee101f12801ad4cbf1af1818de30d538d44dd34fe769aa6b09a05ddd457a3d43b5a510a1fba3e92733932f77856ee577f SHA512 8c03b0055d58750de3bdd99b4096ae27eeaa4764733de7725ffb4ce1baf896057841934f9795a8e03afe48cbf24cb9353a934ab5aa9b33a142f9dd1a9d5873ec
 MISC metadata.xml 2763 BLAKE2B 6ec3b7c4eb4e0686de8f7cc0b8ead41538afe9c1cfb77952087a515647474797ee2901bd47a919c0634551196937d2810e624f0a5ecacd11afa0aaead88342a6 SHA512 c476b5108d33ce322f45268bdcbb224b045584f6b110fda25c074426dced4e87379d82b2c16bfe43157b882390e1cd5affa27da283e49c60e328a094eaa7e588
diff --git a/media-tv/kodi/kodi-19.4-r1.ebuild b/media-tv/kodi/kodi-19.4-r1.ebuild
new file mode 100644
index 000000000000..cf060289c931
--- /dev/null
+++ b/media-tv/kodi/kodi-19.4-r1.ebuild
@@ -0,0 +1,361 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_REQ_USE="sqlite,ssl"
+LIBDVDCSS_VERSION="1.4.2-Leia-Beta-5"
+LIBDVDREAD_VERSION="6.0.0-Leia-Alpha-3"
+LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3"
+FFMPEG_VERSION="4.3.2"
+CODENAME="Matrix"
+FFMPEG_KODI_VERSION="19.1"
+PYTHON_COMPAT=( python3_{8,9,10} )
+SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
+	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
+	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
+	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
+	EGIT_BRANCH="Matrix"
+	inherit git-r3
+else
+	MY_PV=${PV/_p/_r}
+	MY_PV=${MY_PV/_alpha/a}
+	MY_PV=${MY_PV/_beta/b}
+	MY_PV=${MY_PV/_rc/RC}
+	MY_PV="${MY_PV}-${CODENAME}"
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S=${WORKDIR}/xbmc-${MY_PV}
+fi
+
+inherit autotools cmake desktop linux-info pax-utils python-single-r1 xdg
+
+DESCRIPTION="A free and open source media-player and entertainment hub"
+HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+# use flag is called libusb so that it doesn't fool people in thinking that
+# it is _required_ for USB support. Otherwise they'll disable udev and
+# that's going to be worse.
+IUSE="airplay alsa bluetooth bluray caps cec +css dav1d dbus eventclients gbm gles lcms libusb lirc mariadb mysql nfs +optical power-control pulseaudio raspberry-pi samba +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf"
+IUSE="${IUSE} cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( gbm wayland X )
+	?? ( mariadb mysql )
+	bluray? ( udf )
+	udev? ( !libusb )
+	udisks? ( dbus )
+	upower? ( dbus )
+	power-control? ( dbus )
+	vdpau? (
+		X
+		!gles
+		!gbm
+	)
+	zeroconf? ( dbus )
+"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	>=dev-libs/lzo-2.04
+	>=dev-libs/flatbuffers-1.12.0:=
+	>=media-libs/libjpeg-turbo-2.0.4:=
+	>=media-libs/libpng-1.6.26:0=
+"
+COMMON_TARGET_DEPEND="${PYTHON_DEPS}
+	airplay? (
+		>=app-pda/libplist-2.0.0
+		net-libs/shairplay
+	)
+	alsa? ( >=media-libs/alsa-lib-1.1.4.1 )
+	bluetooth? ( net-wireless/bluez )
+	bluray? ( >=media-libs/libbluray-1.1.2 )
+	caps? ( sys-libs/libcap )
+	dbus? ( sys-apps/dbus )
+	dev-db/sqlite
+	dev-libs/crossguid
+	>=dev-libs/fribidi-1.0.5
+	cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] )
+	dev-libs/libpcre[cxx]
+	>=dev-libs/spdlog-1.5.0:=
+	dev-libs/tinyxml[stl]
+	$(python_gen_cond_dep '
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+	')
+	>=dev-libs/libcdio-2.1.0[cxx]
+	>=dev-libs/libfmt-6.1.2
+	dev-libs/libfstrcmp
+	gbm? (
+		>=dev-libs/libinput-1.10.5
+		media-libs/mesa[gbm(+)]
+		x11-libs/libxkbcommon
+	)
+	gles? (
+		!raspberry-pi? ( media-libs/mesa[gles2] )
+	)
+	lcms? ( media-libs/lcms:2 )
+	libusb? ( virtual/libusb:1 )
+	virtual/ttf-fonts
+	media-fonts/roboto
+	>=media-libs/freetype-2.10.1
+	>=media-libs/libass-0.13.4
+	!raspberry-pi? ( media-libs/mesa[egl(+)] )
+	>=media-libs/taglib-1.11.1
+	system-ffmpeg? (
+		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[dav1d?,encode,postproc]
+		=media-video/ffmpeg-4*[openssl]
+	)
+	!system-ffmpeg? (
+		app-arch/bzip2
+		dav1d? ( media-libs/dav1d )
+	)
+	mysql? ( dev-db/mysql-connector-c:= )
+	mariadb? ( dev-db/mariadb-connector-c:= )
+	>=net-misc/curl-7.68.0[http2]
+	nfs? ( >=net-fs/libnfs-2.0.0:= )
+	!gles? ( media-libs/glu )
+	>=dev-libs/openssl-1.1.1k:0=
+	raspberry-pi? (
+		|| ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl(+),gles2,video_cards_vc4] )
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
+	>=sys-libs/zlib-1.2.11
+	udf? ( >=dev-libs/libudfread-1.0.0 )
+	udev? ( virtual/udev )
+	vaapi? (
+		x11-libs/libva:=
+		system-ffmpeg? ( media-video/ffmpeg[vaapi] )
+		vdpau? ( x11-libs/libva-vdpau-driver )
+		wayland? ( x11-libs/libva[wayland] )
+		X? ( x11-libs/libva[X] )
+	)
+	virtual/libiconv
+	vdpau? (
+		|| ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
+		system-ffmpeg? ( media-video/ffmpeg[vdpau] )
+	)
+	wayland? (
+		>=dev-cpp/waylandpp-0.2.3:=
+		media-libs/mesa[wayland]
+		>=dev-libs/wayland-protocols-1.7
+		>=x11-libs/libxkbcommon-0.4.1
+	)
+	webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] )
+	X? (
+		media-libs/mesa[X]
+		!gles? ( media-libs/libglvnd[X] )
+		x11-libs/libX11
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		system-ffmpeg? ( media-video/ffmpeg[X] )
+	)
+	x11-libs/libdrm
+	xslt? (
+		dev-libs/libxslt
+		>=dev-libs/libxml2-2.9.4
+	)
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+RDEPEND="${COMMON_DEPEND} ${COMMON_TARGET_DEPEND}
+	lirc? ( app-misc/lirc )
+	power-control? ( || ( sys-apps/systemd sys-auth/elogind ) )
+	udisks? ( sys-fs/udisks:2 )
+	upower? ( sys-power/upower )
+"
+DEPEND="${COMMON_DEPEND} ${COMMON_TARGET_DEPEND}
+	dev-libs/rapidjson
+	test? ( >=dev-cpp/gtest-1.10.0 )
+"
+BDEPEND="${COMMON_DEPEND}
+	dev-lang/swig
+	dev-util/cmake
+	media-libs/giflib
+	>=dev-libs/flatbuffers-1.11.0
+	>=media-libs/libjpeg-turbo-2.0.4:=
+	>=media-libs/libpng-1.6.26:0=
+	virtual/pkgconfig
+	virtual/jre
+"
+
+CONFIG_CHECK="~IP_MULTICAST"
+ERROR_IP_MULTICAST="
+In some cases Kodi needs to access multicast addresses.
+Please consider enabling IP_MULTICAST under Networking options.
+"
+
+pkg_setup() {
+	check_extra_config
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == *9999 ]] ; then
+		git-r3_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# avoid long delays when powerkit isn't running #348580
+	sed -i \
+		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
+		xbmc/platform/linux/*.cpp || die
+
+	# Prepare tools and libs witch are configured with autotools during compile time
+	AUTOTOOLS_DIRS=(
+		"${S}"/tools/depends/native/TexturePacker/src
+		"${S}"/tools/depends/native/JsonSchemaBuilder/src
+	)
+
+	local d
+	for d in "${AUTOTOOLS_DIRS[@]}" ; do
+		pushd ${d} >/dev/null || die
+		AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
+		popd >/dev/null || die
+	done
+	elibtoolize
+
+	# Prevent autoreconf rerun
+	sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
+		"${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
+		"${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
+		|| die
+}
+
+src_configure() {
+	local platform=()
+	use gbm && platform+=( gbm )
+	use wayland && platform+=( wayland )
+	use X && platform+=( x11 )
+	local core_platform_name="${platform[@]}"
+	local mycmakeargs=(
+		-DENABLE_SSE=$(usex cpu_flags_x86_sse)
+		-DENABLE_SSE2=$(usex cpu_flags_x86_sse2)
+		-DENABLE_SSE3=$(usex cpu_flags_x86_sse3)
+		-DENABLE_SSE4_1=$(usex cpu_flags_x86_sse4_1)
+		-DENABLE_SSE4_2=$(usex cpu_flags_x86_sse4_2)
+		-DENABLE_AVX=$(usex cpu_flags_x86_avx)
+		-DENABLE_AVX2=$(usex cpu_flags_x86_avx2)
+		-DENABLE_NEON=$(usex cpu_flags_arm_neon)
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+		-DVERBOSE=ON
+		-DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
+		-DENABLE_ALSA=$(usex alsa)
+		-DENABLE_AIRTUNES=$(usex airplay)
+		-DENABLE_AVAHI=$(usex zeroconf)
+		-DENABLE_BLUETOOTH=$(usex bluetooth)
+		-DENABLE_BLURAY=$(usex bluray)
+		-DENABLE_CCACHE=OFF
+		-DENABLE_CLANGFORMAT=OFF
+		-DENABLE_CLANGTIDY=OFF
+		-DENABLE_CPPCHECK=OFF
+		-DENABLE_ISO9660PP=$(usex optical)
+		-DENABLE_CEC=$(usex cec)
+		-DENABLE_DBUS=$(usex dbus)
+		-DENABLE_DVDCSS=$(usex css)
+		-DENABLE_EVENTCLIENTS=ON # alway enable to have 'kodi-send' and filter extra staff in 'src_install()'
+		-DENABLE_INTERNAL_CROSSGUID=OFF
+		-DENABLE_INTERNAL_RapidJSON=OFF
+		-DENABLE_INTERNAL_FMT=OFF
+		-DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
+		-DENABLE_INTERNAL_FSTRCMP=OFF
+		-DENABLE_INTERNAL_FLATBUFFERS=OFF
+		-DENABLE_INTERNAL_DAV1D=OFF
+		-DENABLE_INTERNAL_GTEST=OFF
+		-DENABLE_INTERNAL_UDFREAD=OFF
+		-DENABLE_INTERNAL_SPDLOG=OFF
+		-DENABLE_CAP=$(usex caps)
+		-DENABLE_LCMS2=$(usex lcms)
+		-DENABLE_LIRCCLIENT=$(usex lirc)
+		-DENABLE_MARIADBCLIENT=$(usex mariadb)
+		-DENABLE_MDNS=OFF # used only on Android
+		-DENABLE_MICROHTTPD=$(usex webserver)
+		-DENABLE_MYSQLCLIENT=$(usex mysql)
+		-DENABLE_NFS=$(usex nfs)
+		-DENABLE_OPENGLES=$(usex gles)
+		-DENABLE_OPENGL=$(usex !gles)
+		-DENABLE_OPTICAL=$(usex optical)
+		-DENABLE_PLIST=$(usex airplay)
+		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
+		-DENABLE_SMBCLIENT=$(usex samba)
+		-DENABLE_SNDIO=OFF
+		-DENABLE_TESTING=$(usex test)
+		-DENABLE_UDEV=$(usex udev)
+		-DENABLE_UDFREAD=$(usex udf)
+		-DENABLE_UPNP=$(usex upnp)
+		-DENABLE_VAAPI=$(usex vaapi)
+		-DENABLE_VDPAU=$(usex vdpau)
+		-DENABLE_XSLT=$(usex xslt)
+		-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_VERSION}.tar.gz"
+		-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_VERSION}.tar.gz"
+		-Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz"
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+		-DAPP_RENDER_SYSTEM="$(usex gles gles gl)"
+		-DCORE_PLATFORM_NAME="${core_platform_name}"
+	)
+
+	use !udev && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
+
+	use X && use !gles && mycmakeargs+=( -DENABLE_GLX=ON )
+
+	if use system-ffmpeg; then
+		mycmakeargs+=( -DWITH_FFMPEG="yes" )
+	else
+		mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" )
+	fi
+
+	if ! echo "${CFLAGS}" | grep -Fwqe '-DNDEBUG' - && ! echo "${CFLAGS}" | grep -Fwqe '-D_DEBUG' - ; then
+		CFLAGS+=' -DNDEBUG' # Kodi requires one of the 'NDEBUG' or '_DEBUG' defines
+		CXXFLAGS+=' -DNDEBUG'
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile all
+}
+
+src_test() {
+	local myctestargs=(
+		# Known failing, unreliable test
+		# bug #743938
+		-E "(TestCPUInfo.GetCPUFrequency)"
+	)
+
+	# see https://github.com/xbmc/xbmc/issues/17860#issuecomment-630120213
+	KODI_HOME="${BUILD_DIR}" cmake_build check
+}
+
+src_install() {
+	cmake_src_install
+
+	pax-mark Em "${ED}"/usr/$(get_libdir)/${PN}/${PN}.bin
+
+	newicon media/icon48x48.png kodi.png
+
+	rm "${ED}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
+	dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
+		usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
+
+	if use !eventclients ; then
+		rm -f "${ED}"/usr/bin/kodi-ps3remote || die
+		rm -f "${D}"$(python_get_sitedir)/kodi/ps3_remote.py || die
+		rm -rf "${D}"$(python_get_sitedir)/kodi/ps3 || die
+		rm -rf "${D}"$(python_get_sitedir)/kodi/bt || die
+		rm -rf "${ED}"/usr/share/doc/${PF}/kodi-eventclients-dev || die
+	fi
+
+	python_optimize "${D}$(python_get_sitedir)"
+}
diff --git a/media-tv/kodi/kodi-19.9999.ebuild b/media-tv/kodi/kodi-19.9999.ebuild
index 4794c16bf228..cf060289c931 100644
--- a/media-tv/kodi/kodi-19.9999.ebuild
+++ b/media-tv/kodi/kodi-19.9999.ebuild
@@ -131,7 +131,6 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 	udev? ( virtual/udev )
 	vaapi? (
 		x11-libs/libva:=
-		!gles? ( x11-libs/libva[opengl] )
 		system-ffmpeg? ( media-video/ffmpeg[vaapi] )
 		vdpau? ( x11-libs/libva-vdpau-driver )
 		wayland? ( x11-libs/libva[wayland] )
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index c05823b54731..5ec3e824f2b3 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_REQ_USE="sqlite,ssl"
-LIBDVDCSS_VERSION="1.4.2-Leia-Beta-5"
-LIBDVDREAD_VERSION="6.0.0-Leia-Alpha-3"
-LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3"
-FFMPEG_VERSION="4.4"
-CODENAME="N"
+LIBDVDCSS_VERSION="1.4.3-Next-Nexus-Alpha2"
+LIBDVDREAD_VERSION="6.1.3-Next-Nexus-Alpha2"
+LIBDVDNAV_VERSION="6.1.1-Next-Nexus-Alpha2"
+FFMPEG_VERSION="4.4.1"
+CODENAME="Nexus"
 FFMPEG_KODI_VERSION="Alpha1"
 PYTHON_COMPAT=( python3_{8,9,10} )
 SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
@@ -130,7 +130,6 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 	udev? ( virtual/udev )
 	vaapi? (
 		x11-libs/libva:=
-		!gles? ( x11-libs/libva[opengl] )
 		system-ffmpeg? ( media-video/ffmpeg[vaapi] )
 		vdpau? ( x11-libs/libva-vdpau-driver )
 		wayland? ( x11-libs/libva[wayland] )
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index b057f1d98863..cc2255feff2d 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/baka-mplayer/Manifest b/media-video/baka-mplayer/Manifest
index 21c62ae8d23f..91aeef207dd9 100644
--- a/media-video/baka-mplayer/Manifest
+++ b/media-video/baka-mplayer/Manifest
@@ -2,7 +2,7 @@ AUX baka-mplayer-2.0.4-gcc5.patch 1251 BLAKE2B 9f514f754499f5b44ae4a077c2025dfa0
 AUX baka-mplayer-2.0.4-mpv23.patch 782 BLAKE2B de90ac31fcbdd1cb9fb00eae1e282c6ff7e5ee14dd81bc2d8e07bd36250dcffa5de74dd83f2558bb15cae54ca83279c20f2776f315eea7f5b7a946e53a2e3f82 SHA512 9fda60f3569b88eb71d42562ef1650bfd125bf69f80b25ff1c123fb7efda524b7c14ae1f782d1786e9e68263f66db5af95a30c4e2e87468782da750eacbe456f
 AUX baka-mplayer-2.0.4-playlist-regression.patch 886 BLAKE2B b2c0edba4a2a0da89494dec05b78e7768a24af94f06fcda7fa4c4066800e673d551ed82f6b45d14f3f7f2d6d855d3e0be8535b5a6d3093fce90a9627e9f3c5c5 SHA512 3905ce72374c59edb09ed5a311ff257da3010386de9b076de516bd008c23d7e757d7c63151ac350bdc281a575b6387a96a44d1ac5e2229a1a325a3dfc5e6ace4
 DIST baka-mplayer-2.0.4.tar.gz 988060 BLAKE2B 4d73e6626bab90b2ac818fdc1b0d8ab7758a924805ca8356c6fa94d25df9acbfd53d7e997b58e5c85b68e033f83ce89d6e3b0c3e30ecc23d7d75b4bf74ae0911 SHA512 7898d65e87540bcb528d429dc70daefc7d4c0711b2983326cf6fa3a14e566c2742334378befdb710b8cc59452f960bc17b290058ba9e6878e830de6dbafce55a
-EBUILD baka-mplayer-2.0.4-r1.ebuild 1392 BLAKE2B 557b0083d663a96aada33ade3d44d26632983163a2db08c763832130b0e8b254932df7b5a88d4bdd8053be78057c0de9e8456fd083e6331fbb9a72527e1d23c1 SHA512 54f4535ead081d4bc2b86ec11bef81f27ae39835d527b589dc7a962db9615c78bb8e64a7ca0f15d5f42f8ebf362486eaab0ceb1affe5c361121566b551370b63
+EBUILD baka-mplayer-2.0.4-r1.ebuild 1399 BLAKE2B 4e82b0bc35b7740e5891e27412e9156db667106ac2655a5ef6c7c5764893ab73bad86a7362c3dee1a811a95d7bbc319c96d05487ee495a0efcc563520289129a SHA512 e9af289d999d8c35caf425a2a4af7524f5a5031160a5029f683598925f68ef5e567f2a38f18d6218dd5ea47e80d5eaf202b956b86443197d0141f9cd9564c21d
 EBUILD baka-mplayer-2.0.4.ebuild 1135 BLAKE2B 22e814220d9493f077d266aee064a279e105d4ed4d35db3ffb8d3447b99580a9abe380042a1bd9a8fa9fe68138893f90bfff657c520168ff8d4cea1e73201431 SHA512 21bef7f1e283eb3a60cacb6502525ba46299aeaed11ae77da182755428adcfb526027452fbcdf80576854fa9d05d6eae5f720d9e10fe0e8ea5af649eb201a8f3
 EBUILD baka-mplayer-9999.ebuild 1187 BLAKE2B f2ce2028cc9c86799e1e676ccc4cf8fd2fd8dd663605deb74801ae812471295cf1f6537dea13a1960400abbc7f0694ed7015688ea2097575738227598fc8cf25 SHA512 c345059930ff6da0691eddd5e6c3a4c5c445af70bf4bb26b1492a65c337ad3c091455e2a22df67dc918774f7712971e727a9f3accd993adca0e6a3ce942cea46
 MISC metadata.xml 741 BLAKE2B 5fea8a8b3fd803742c6f71acc12e35fddee71fe7deddd35c87bfa0a5bef853833ee19864f69986c141a573cbc65cb2ac8b4aa191a8eeb6b28acd05592200956e SHA512 03f290ffac4d0aa5a978d9fe5e7e7a76e83de243c73e920c045a43b333bdc039a2e09f8f65c56dbc77ef7865b2360fc6bb34eaaf64f4a2df992d30dafafb8331
diff --git a/media-video/baka-mplayer/baka-mplayer-2.0.4-r1.ebuild b/media-video/baka-mplayer/baka-mplayer-2.0.4-r1.ebuild
index 2511f6ebe253..f636c9d563c5 100644
--- a/media-video/baka-mplayer/baka-mplayer-2.0.4-r1.ebuild
+++ b/media-video/baka-mplayer/baka-mplayer-2.0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/u8sand/Baka-MPlayer/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 BDEPEND="
diff --git a/media-video/jellyfin-media-player/Manifest b/media-video/jellyfin-media-player/Manifest
index 0cc08fea0cb6..6144f4cfc6ce 100644
--- a/media-video/jellyfin-media-player/Manifest
+++ b/media-video/jellyfin-media-player/Manifest
@@ -1,3 +1,3 @@
-DIST jellyfin-media-player-1.6.1.tar.gz 573443 BLAKE2B d5a4d6b8d3ee2c5651b1d1be32514722e1b300231760d22d9929eb4b3579b723f72e24b403a875186cd8646bbe799db6b7ff7d0641ab592b68205ef71a8c40d6 SHA512 12e22f6a0d0769427aad01a37d18a68f057d0c5fa93ee308c5f7fe2e7a1a27ceea3b05f5cbf232264467e159bcdac18aa5042838ad7888dd008f0fb3a6751081
-EBUILD jellyfin-media-player-1.6.1.ebuild 1713 BLAKE2B ef0056539995539369eb3df0fe0e537f578d2ed1f2b3e60befd52566ceade5d54c8a7d73f4dfff995cce1f1e154bc1951951e32f2261b2912d1a7e50e5ddc3a5 SHA512 7aed4852ef1608b1ffd190da01ade031299d6a536c2c2dc950372bf582ca9d11e4a9684c156efc86a99ec73f65f8f6644b0fb051f02d01044849c205d3b33fef
+DIST jellyfin-media-player-1.7.0.tar.gz 574396 BLAKE2B 074495988f10e456f3c5cd8c3c0bf470c68df770163403aa6cfc0e1e0b6f51127d9640632f1ad6bf33b5302063971d63c84c86d2d83755991f309bf8882c16f3 SHA512 ebf1ce7d5cbd958ce81ed0f2e2a70e33b26cfeab55eb1acd5b465ec228f8dfa8ee27490cf31099244f022400dd5066e3f685863d841ebb68e31a124c912b5d5d
+EBUILD jellyfin-media-player-1.7.0.ebuild 1749 BLAKE2B acba1565fd7ce4c2c9e0fde57e17680c10127e77acbd5b9305c97d749029ac05a35a06745aebc617f674fe9fe6f0f674b88783236b912fb2d61ec842c1f9b491 SHA512 71d14b2b8f2a22e4d6638779283887e8616c4f1309db90937a87d66893b31edc4f20d19466d49d18c90f4db1420a2afecef4a218b3f34b12860e957e91eef575
 MISC metadata.xml 514 BLAKE2B b1e93ea1ee93d768cdbe7ffa4251b3d647fd39a1f9df6386b3fadaae2420d43358259401c0f0430c4a73adbb7f909614f4c983dd20071fd3e83848ba636013ce SHA512 7640bce309c006863708f7366809bb11a8675e83ae034bec35089e3a4c9fb32713340ee9a22781ab2b56a8454c5cff870c701389de9531f008a5e7f5fda0b533
diff --git a/media-video/jellyfin-media-player/jellyfin-media-player-1.6.1.ebuild b/media-video/jellyfin-media-player/jellyfin-media-player-1.7.0.ebuild
similarity index 91%
rename from media-video/jellyfin-media-player/jellyfin-media-player-1.6.1.ebuild
rename to media-video/jellyfin-media-player/jellyfin-media-player-1.7.0.ebuild
index 418d9eddf93e..348aa5bf5dcc 100644
--- a/media-video/jellyfin-media-player/jellyfin-media-player-1.6.1.ebuild
+++ b/media-video/jellyfin-media-player/jellyfin-media-player-1.7.0.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+JWC_VERSION=10.8.0
+
+PYTHON_COMPAT=( python3_{8..11} )
 inherit cmake python-any-r1
 
 DESCRIPTION="Jellyfin Desktop Client based on Plex Media Player"
@@ -58,7 +60,7 @@ BDEPEND="
 
 RDEPEND="
 	${DEPEND}
-	media-video/jellyfin-web-jmp-bin
+	~media-video/jellyfin-web-jmp-bin-${JWC_VERSION}
 	!dbus? ( x11-misc/xdg-utils )
 "
 
diff --git a/media-video/jellyfin-web-jmp-bin/Manifest b/media-video/jellyfin-web-jmp-bin/Manifest
index 06f1b280213a..765172b5c0b1 100644
--- a/media-video/jellyfin-web-jmp-bin/Manifest
+++ b/media-video/jellyfin-web-jmp-bin/Manifest
@@ -1,3 +1,3 @@
-DIST jellyfin-web-jmp-bin-10.7.6.zip 37127792 BLAKE2B 9756d1d2a2f00970291464c6b667d14df058ddace7d2ddc49c3e9072ca9ecc7f6388255afa701165bc7d8cf6dad12067afd3cdfae082de533faf2aa483868e87 SHA512 e4cd2d63c724e6ede78007c58f5e405b2ca97d1de0e0e86710fdf8756fedac2d50b1da10b61efd4888ffea3738bfde8f3510e49e38c61bf0bd47613634bc20c3
-EBUILD jellyfin-web-jmp-bin-10.7.6.ebuild 538 BLAKE2B 0beded2340b5662832f08e3f00df789115786615c4ee2fb7e55208cf3bc91bb9ab2813861310e61fa083d3984d912922fb619daa37028d2144359e35fe495682 SHA512 85899fd5bafd9a5767b3be1d43d1ac891335ae14be8af4f3caeb5804bdfc245993a936a76271f01d1b69c76e341b441f4556ea13de3f79edce80b228ba8d426d
+DIST jellyfin-web-jmp-bin-10.8.0.zip 44565218 BLAKE2B ecb8ee8d5e8c6ac8d813bdbbce9bb76de807e2f3282586fbcbf5f088b5402a153b0b4e644c940cde064dcfe304ff8486dfa743152aeb7757d36ccf1af38ff3d5 SHA512 1d804a17fcaed760ca16baa912840978745079815c7093f6d85eea5b0d238325df96b951f378822224a43f16a1dfe10617e71573e4e2f63c1e6db947ddbf3b3e
+EBUILD jellyfin-web-jmp-bin-10.8.0.ebuild 538 BLAKE2B 5267aeeeb79cd5b6c9d37d077b5d3984d666e0b4550e6511d6a2e0739904e3ed8cf92aaf532c2d744cca2c1a53ea8705618e16622abd6065fb352374f83c682c SHA512 124b4192b6701582719150aa95043b11405ad0f9a938d039fa19cf90bd8422958365950f9634ea9d3a230cb1317b78ac15e6ae2b4638923da29a9ddd789e1166
 MISC metadata.xml 514 BLAKE2B b1e93ea1ee93d768cdbe7ffa4251b3d647fd39a1f9df6386b3fadaae2420d43358259401c0f0430c4a73adbb7f909614f4c983dd20071fd3e83848ba636013ce SHA512 7640bce309c006863708f7366809bb11a8675e83ae034bec35089e3a4c9fb32713340ee9a22781ab2b56a8454c5cff870c701389de9531f008a5e7f5fda0b533
diff --git a/media-video/jellyfin-web-jmp-bin/jellyfin-web-jmp-bin-10.7.6.ebuild b/media-video/jellyfin-web-jmp-bin/jellyfin-web-jmp-bin-10.8.0.ebuild
similarity index 93%
rename from media-video/jellyfin-web-jmp-bin/jellyfin-web-jmp-bin-10.7.6.ebuild
rename to media-video/jellyfin-web-jmp-bin/jellyfin-web-jmp-bin-10.8.0.ebuild
index 46f12a5b2e43..cd0c93934ceb 100644
--- a/media-video/jellyfin-web-jmp-bin/jellyfin-web-jmp-bin-10.7.6.ebuild
+++ b/media-video/jellyfin-web-jmp-bin/jellyfin-web-jmp-bin-10.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 91c2fea4957d..cdbc954ec873 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -8,8 +8,6 @@ AUX pipewire-0.3.36-fix-crash-uaf-media-session.patch 1295 BLAKE2B 7c32a70c48e2c
 AUX pipewire-0.3.36-fix-version.patch 716 BLAKE2B c447bd11291f809b7607f4094f2d5e3497996a3834e5d5d468dcc63f0e36c117a31158634c08b8acc724f0ce5b599594b05f79ef3e3128ac28843cc08df03fed SHA512 74c757edf20c911df9299b4322486a34746eec8c4aa212441082f954cebe7c7d9c836a757dd134d71b3c31a97abe1494c13dc470495846ffaf52f943ec397532
 AUX pipewire-0.3.36-missing-limits-include.patch 452 BLAKE2B b498e4ec11ab3d5bc4cebdd0975802b68594678aa928dc85b5a7031276af9ec12edb1423714e3e96c7d658e574c679efa9c18afbee1b47b15f3ce582bc021fff SHA512 decd44a59152e4fdc64b79c2e330a09ca9b8f776e72ef7a0150dfe43d9c25f4e501d41c86a445a979137c412dc85e1ffa38fed91f976596500d2a28010d78407
 AUX pipewire-0.3.49-x86-cast.patch 813 BLAKE2B 11107bb9c5a4c626c2ccc4e4aa62c6370b7e0851a7c788caf51ce33151e7e23e70c7d460f19357c3a3b3fa54ac682637f954737b9445fbb67490c9f823a6280d SHA512 0b8cc44f6da29f3a91dc8a15093dfc6f14e9a2220a02d41ddbccc7ea3cadf62d92d8db12602eab0587f782478a5b2264ae0dd887179645fafda8f3ffd4843089
-AUX pipewire-0.3.50-fix-spa-header.patch 1256 BLAKE2B 728296383a96f3b1e283132d2e97c2b26f5edc676d6ae6f7d697d997ba67fad0aedcf30642ca2bfb72c8bef1ef90c7ffb27e1dda8c8d452a71719530bed03f70 SHA512 d3062ea859c3310481395b9d622ee3ada0bae14ee56e3f7d8678b5cb1f5ab4af2d38ecc718e56f5330150f3af999bbd80603048ced66a73c51723a719bf753af
-AUX pipewire-0.3.50-treewide-retain-sections-to.patch 2636 BLAKE2B 75f47ff173f3caf07347006889320c3ea5c8588ce081cfe1059383db36ddd5b0ba6492389841b2c8bfe92bbfb968b12281a701020ad92fc538f10c3a2c26b448 SHA512 7521d13afaa143fa160a3ba966239150de88cda916f961765fb7bf6a31113be4a96028f08a97e2b203875a6eaff2efb9d3501d2154efbef4c0a8afd7ed55e141
 AUX pipewire-0.3.52-pulse-path.patch 2586 BLAKE2B 2569452967f54ac531f07852fcd78070e61f5972c95eed8d8690461f215330e92aad6eca8c5ac393b0903e6d0c26e8a69fac51b445c39aa428cfd47f0ad4d659 SHA512 0ec2d9ceb5acfdf0ecedb7683db52d0d2ddbee52f318a77720134ec51e920d0f76621b4b44c531b7b1c857d161979351eccb08734e6cb80d0c7a8925399d58b3
 AUX pipewire-launcher.sh 149 BLAKE2B 42a9fd174e8216f9941ec72bc50581d539453dd0430ac61712582039f1cfe17cafa050bd87fcb90b9c16ffd891fd9f9c5dfec99b2be8c66eaed0128af180508e SHA512 7f50287565fa44e2296a7b294e8fd3dd64938d2de15c6ff5674d85a6e7bbccbc334c0fb9e28321104aff5335894b3c5a21171f385465e37b422ef53988dbfe4b
 AUX pipewire.desktop 322 BLAKE2B 0299b9054cf881a5cbbdb128a5e8a51308cf0b5a98260dca756e704504ef057e403b2fb4aa2d58f52dde4be59e416c95d8fce21bc3ca6b6447ecab58263a3f21 SHA512 c13ea531cfdd3798f8d6cd20f5fa8c0a5040c27a6ef3850fdd41102a3bf0bcb73176e3300845af77804a98842fb736841223bc9ac1c92eb2034e9d46e41fc344
@@ -17,14 +15,12 @@ AUX pipewire.desktop-r1 325 BLAKE2B 7d823a264e5147bf8669127df22f468518fd54375ed5
 DIST pipewire-0.3.30.tar.gz 1540950 BLAKE2B 69b35743e3ad9a8caf68d9bb16cf395203efed6c3046b3f4ea33bbcdd6649f5d425d813042c12396a7cd5ff4e8ed91dbc395a96fe55935ad50f9c3f3918b0407 SHA512 ec525e0fb7e5c5313245fcc745b971fd7d4a1caa7ab9fe1fa38dc20d50f03e5969197e86b60659971676bec0f79aa7b7951c8209bfe9565a3fd1dcac1b8535b3
 DIST pipewire-0.3.36.tar.gz 1708209 BLAKE2B 20fce0d7f88347fe594491d4fae7b6a8edee67ff7749f1a40b807a5d5094d792e61e3efd05dca2221f781c263e34ff0a50ad3c162231911d4b1d87704df6c775 SHA512 f0fc68ea005018b420a4f65a24dc9c85eb6263c24e66852a7ce2b03f966990d62487b388c7d73ff5adfc10c80c439b1200ae876e41d78f91db190036a1799a14
 DIST pipewire-0.3.49.tar.gz 1769037 BLAKE2B 2567bc98933bfbb295358886e8f97db2af2f0a6ee3c2586c1718e39f7eedaed8528a4663753ba56d3295e42576da015ce9278f22aff9bbd9ca43d883bff5a2f6 SHA512 36398872f7d7b31193d7a8885bbdfb415a122bd779874107a0642202dfd8408f39fddf769bfbae4533c2cc99fe9ef67903d50cc721e936aa4802229f1c46d809
-DIST pipewire-0.3.50.tar.gz 1773182 BLAKE2B d286b73553471795ea8ed60c82e12c955f1835a7a3a8d45baeda6b1e20a795221230b50c21619af4ef5b2b4962d2783de00b1ab2b22b091220970c334de8b9dc SHA512 e29a626258ab28d74e35e310037fac374fe009fb56e0fa41cef7abb1ec6abb26f828cff1b17500f92f1dd4c95c1e0e98f6af497d315dd463f81c2649d1e8ee23
 DIST pipewire-0.3.51.tar.gz 1789070 BLAKE2B 8538eb9f2178efa26365f30b324b707826e580caa1fd9c09b62c561c140c14186e0d2b04808fa78eb5642ddccf1a347def19934ecd654be06b215a693075b6fc SHA512 a762fd260b4b14ad9ef142be11ab1c22268da6726e2179559ffb254f0ce7daf7a502779e33c64313a9c6a9fc1bd15150b76be04ec81aa27c35dbb4333cecdb4a
 DIST pipewire-0.3.52.tar.gz 1810238 BLAKE2B bb75eff5fe7700d0a303fbfed7910aebd82346a5a21c4a0d17c06e6991bc90bb6d4f6b9559c25788494cb11faff957523dcd7f0c4c8a40be11b81c63a5a9e5ef SHA512 30e9cf74c92babafe386f02a03bb5c41a8ee5591a02f15845cca1ee44f091ce68eb14d48943d43b680cb525026a19e0290997670f9a82156eaa72e974fe6d01a
 EBUILD pipewire-0.3.30-r2.ebuild 9675 BLAKE2B df43c7f1ef0622d96741266e53dc343d9697903571c723c73f5267a8083539fde110ea8f6420f2c86e296d275ab45e4b9abacbd6f0310825a6121336cf11215b SHA512 47cdcbd48311cee24b45c05b3283c4bbe1231c44f6d55136966f887aa43ad69b789bf642e003b17aa6f1a3b59963e68047e4f8c396431cb05f6dd4d3161f8c14
 EBUILD pipewire-0.3.36.ebuild 10263 BLAKE2B 033b26477ad91c843e9307504ce8eddcad7977a386925a1960409767946a88ac539954c7647075bb48ac373b4e36fecf0bbdb5d50351213b51465ea298cad336 SHA512 38d6225ab02d31d1fe33723f7c14a385648853b5f4f84cfd13fcf7f91489dffc2c5fbac5f649bdf80bdd9a4bd1b19977bae59eba83beca9c3d9e34030f6f332b
-EBUILD pipewire-0.3.49-r1.ebuild 13078 BLAKE2B 14f399c74c4f93a34a7a75ca9c21a8f362ce7ab6a025cc1a4aedceaf2378ee4a700da77a006cb7f8d39ea77c43e58e3b6f6ddfc1220479a2589d9b08729748aa SHA512 234e4443588e4c0128c9156ddba9ff596ec15eb216058213f5c6ba346c114eae6cab19afd3c9cf1732968f20e3d86e94f83d2fe80c4951e727daa9ff55648c82
-EBUILD pipewire-0.3.50-r3.ebuild 13179 BLAKE2B aed2170f93d5dbe95192ed35e85a88b696ae528faf85b0d67b4d0ff1f449f7b2fa8dcda21126388710af5ff32d938c81bfa2628ffba64feb4a2931b04136f297 SHA512 e7e4cf13c7548db43b4ca3555f93f9133de6b85c639df28279d6feec19bfbc701030ea4d8487c7c0dadcb08a653dd06e7d68273be62efaa0445f2a2054f24930
-EBUILD pipewire-0.3.51-r1.ebuild 13204 BLAKE2B f0cc78e33c90b5451aada66c40c89a8baf3c8663ffefe7a0125eec0157b2924a83b52612552aff14e1a3d96c69662fe13f92358b28a01a959765379264880a6f SHA512 586511b9630d090a30c19f5145a23c18b97b9a75dfab5bf6d6609dd4c2ae2de399733aace1c6b454ac19600f2b7721aa54710ca5ad31d5632be553399f01bdbb
-EBUILD pipewire-0.3.52.ebuild 13297 BLAKE2B 27033d02393e1c5b17c30ee997f6d33172b40f91bee3c775e7e4d63f4aa033861b0aa6b5cace4b9acc24435861a56bd8f8c05229265577fac79097c39e3ab69b SHA512 8ca176fd2e11d2680f383a9fcc5c9a5c3eea602ebf1f0ef620ce2248ba1ad0fd6a598720fe80bc7d6ffb5fd32a9ff889d34d11c1b61936fc6292cdc987fb7319
-EBUILD pipewire-9999.ebuild 13260 BLAKE2B f0e5b0fef246d58b0592b22ea793852b5b6b1feef02f13c61079254a6ae35b38d7ef85fbfe0f37f6160c23211774d583f1de24ed6bbd838aedddcb747f5eeb1a SHA512 75b15d2c7d7076414f5c0a1f8b7daa56f311ac82c7c515e81abd4f3165c2aa7cda6f68e3d126587e4c721d810b43ef8a27c37b4927f0d41c19ad7b3bee82ba38
+EBUILD pipewire-0.3.49-r2.ebuild 13074 BLAKE2B bc61ce451afa845425c53de628ddf8eba92ea106dbabd56f995aab078f7112d42cc1649efbeb1ef0c582dd298da74be1df634d6195097ab8787fda761b46c76e SHA512 751dce1df4347d4f1d218d5f147a2c52f23b0f5c5f737d636dc4a89f9fd5c1b8ac44c57a0132f95e0836ba9fa2120832bf5cf7dd01e28d27bb2395939ea8bbe1
+EBUILD pipewire-0.3.51-r2.ebuild 13198 BLAKE2B fb42f45034ae5dba9d7e1a8078558b8a9ff15b28cd14b6362ae2b5b30bf8a37732bfb1d1a9522d166e9e3c07b465412b73d35a8f570046ec9a08576ca52b6a19 SHA512 ba946800cbf9bd608f439c9306f769037cc9025435e3ed9eb82bee272ea22f25309f1482696f644c703c83093e8516242de49f00463e673e5633049bd565ce71
+EBUILD pipewire-0.3.52-r1.ebuild 13293 BLAKE2B 17049f576d95cacf15f9e2ba4e0e11c61ecb36cf9cf6cad87b847ffdb5873b3b61607f727af6c3c6c6fd8cbbf3620da6ecb0bf8f77329ae79b34cd7af248dbd2 SHA512 ccaa19700ef8aec87ecb0e1c3a537cf15e7a08a3b603241d3a095e6ba22127d897662ddd3f495b923534f2889714129862c9dec14d3ee59262558d6c7faae9f8
+EBUILD pipewire-9999.ebuild 13256 BLAKE2B 0b486819318ee79b892192e04510a9cdb52465dfcfb9e744b84b0779f56a907d6db64ece5ecddae968696b627f91ea9bf83dcdb090ad47cf878f68752b1bd6c1 SHA512 7193f9ebe1ced1cc1a1b84bd45dde762ed1205df938be724cdaabb76562fc0de960a86e3e90164d46e14a9134bc37ae9e0dbfd84d399cf9f52b93825a0aad71c
 MISC metadata.xml 1505 BLAKE2B 415865adf3ecd15444849f69b312a96fb8b59c2a909751b3f8ad868c176fe4c22f76ba0fba78268c75e0847d9c7eb9cc93dbc11d0303d040bb56ded2fc37da9e SHA512 9bd27f8d83889d59bf4fc692e630ab34d2e5fa508bb823c4595b505f95339003c7a81ce1bb37c7294e5a788e9e76297654625d4dfa9aaa3efff05c32e19175b2
diff --git a/media-video/pipewire/files/pipewire-0.3.50-fix-spa-header.patch b/media-video/pipewire/files/pipewire-0.3.50-fix-spa-header.patch
deleted file mode 100644
index 5b9ad3cf2d7c..000000000000
--- a/media-video/pipewire/files/pipewire-0.3.50-fix-spa-header.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/d3ea3142e1a4de206e616bc18f63a529e6b4986a.patch
-https://bugs.gentoo.org/838427
-
-From: psykose <alice@ayaya.dev>
-Date: Wed, 13 Apr 2022 21:57:49 +0000
-Subject: [PATCH] spa: fix c90 header include
-
-placing declarations after code is invalid under ISO c90
-
-Fixes !1211
---- a/spa/include/spa/utils/string.h
-+++ b/spa/include/spa/utils/string.h
-@@ -276,10 +276,11 @@ static inline int spa_scnprintf(char *buffer, size_t size, const char *format, .
- static inline float spa_strtof(const char *str, char **endptr)
- {
- 	static locale_t locale = NULL;
-+	locale_t prev;
- 	float v;
- 	if (SPA_UNLIKELY(locale == NULL))
- 		locale = newlocale(LC_ALL_MASK, "C", NULL);
--	locale_t prev = uselocale(locale);
-+	prev = uselocale(locale);
- 	v = strtof(str, endptr);
- 	uselocale(prev);
- 	return v;
-@@ -319,10 +320,11 @@ static inline bool spa_atof(const char *str, float *val)
- static inline double spa_strtod(const char *str, char **endptr)
- {
- 	static locale_t locale = NULL;
-+	locale_t prev;
- 	double v;
- 	if (SPA_UNLIKELY(locale == NULL))
- 		locale = newlocale(LC_ALL_MASK, "C", NULL);
--	locale_t prev = uselocale(locale);
-+	prev = uselocale(locale);
- 	v = strtod(str, endptr);
- 	uselocale(prev);
- 	return v;
-GitLab
diff --git a/media-video/pipewire/files/pipewire-0.3.50-treewide-retain-sections-to.patch b/media-video/pipewire/files/pipewire-0.3.50-treewide-retain-sections-to.patch
deleted file mode 100644
index 1e1a8198ef26..000000000000
--- a/media-video/pipewire/files/pipewire-0.3.50-treewide-retain-sections-to.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/e28a052105f8ef35b3f469d3b85e1fcb25106f26
-
-From e28a052105f8ef35b3f469d3b85e1fcb25106f26 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= <pobrn@protonmail.com>
-Date: Wed, 13 Apr 2022 18:13:12 +0200
-Subject: [PATCH] treewide: retain sections to prevent linker garbage
- collection
-
-The linker may remove sections that are actually used when
-"--gc-sections" and "-z start-stop-gc" is set. Add the `retain`
-attribute to prevent that.
-
-Furthermore, fix the alignment for `pwtest_suite_decl` objects.
-
-See: #2292
-See: https://lld.llvm.org/ELF/start-stop-gc.html
-See: https://github.com/systemd/systemd/issues/21847
-See: https://github.com/systemd/systemd/pull/21855
----
- src/modules/module-protocol-pulse/module.h | 1 +
- test/pwtest-implementation.h               | 2 +-
- test/pwtest.h                              | 6 ++++--
- 3 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/src/modules/module-protocol-pulse/module.h b/src/modules/module-protocol-pulse/module.h
-index c1153640e..f75d8786c 100644
---- a/src/modules/module-protocol-pulse/module.h
-+++ b/src/modules/module-protocol-pulse/module.h
-@@ -47,6 +47,7 @@ struct module_info {
- 
- #define DEFINE_MODULE_INFO(name)					\
- 	__attribute__((used))						\
-+	__attribute__((retain))						\
- 	__attribute__((section("pw_mod_pulse_modules")))		\
- 	__attribute__((aligned(__alignof__(struct module_info))))	\
- 	const struct module_info name
-diff --git a/test/pwtest-implementation.h b/test/pwtest-implementation.h
-index 7bfad01cf..1525d2056 100644
---- a/test/pwtest-implementation.h
-+++ b/test/pwtest-implementation.h
-@@ -131,7 +131,7 @@ void _pwtest_add(struct pwtest_context *ctx,
- struct pwtest_suite_decl {
- 	const char *name;
- 	enum pwtest_result (*setup)(struct pwtest_context *, struct pwtest_suite *);
--} __attribute__((aligned(16)));
-+};
- 
- 
- #endif /* PWTEST_IMPLEMENTATION_H */
-diff --git a/test/pwtest.h b/test/pwtest.h
-index 9c0737523..6d3070b79 100644
---- a/test/pwtest.h
-+++ b/test/pwtest.h
-@@ -494,9 +494,11 @@ enum pwtest_arg {
-  */
- #define PWTEST_SUITE(cname) \
- 	static enum pwtest_result (cname##__setup)(struct pwtest_context *ctx, struct pwtest_suite *suite); \
--	static const struct pwtest_suite_decl _test_suite \
- 	__attribute__((used)) \
--	__attribute((section("pwtest_suite_section"))) = { \
-+	__attribute__((retain)) \
-+	__attribute__((section("pwtest_suite_section"))) \
-+	__attribute__((aligned(__alignof__(struct pwtest_suite_decl)))) \
-+	static const struct pwtest_suite_decl _test_suite = { \
- 	   .name = #cname, \
- 	   .setup = cname##__setup, \
- 	}; \
--- 
-GitLab
-
diff --git a/media-video/pipewire/pipewire-0.3.49-r1.ebuild b/media-video/pipewire/pipewire-0.3.49-r2.ebuild
similarity index 99%
rename from media-video/pipewire/pipewire-0.3.49-r1.ebuild
rename to media-video/pipewire/pipewire-0.3.49-r2.ebuild
index f44ad9bceed8..b7acb4f37fa8 100644
--- a/media-video/pipewire/pipewire-0.3.49-r1.ebuild
+++ b/media-video/pipewire/pipewire-0.3.49-r2.ebuild
@@ -147,7 +147,7 @@ src_prepare() {
 
 		$(use system-service && {
 			echo @pipewire - rtprio 95
-			echo @pipewire - priority -19
+			echo @pipewire - nice -19
 			echo @pipewire - memlock 4194304
 		})
 
diff --git a/media-video/pipewire/pipewire-0.3.50-r3.ebuild b/media-video/pipewire/pipewire-0.3.50-r3.ebuild
deleted file mode 100644
index a0b6f24526d6..000000000000
--- a/media-video/pipewire/pipewire-0.3.50-r3.ebuild
+++ /dev/null
@@ -1,362 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
-	inherit git-r3
-else
-	if [[ ${PV} == *_p* ]] ; then
-		MY_COMMIT=""
-		SRC_URI="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${MY_COMMIT}/pipewire-${MY_COMMIT}.tar.bz2 -> ${P}.tar.bz2"
-		S="${WORKDIR}"/${PN}-${MY_COMMIT}
-	else
-		SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
-	fi
-
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-DESCRIPTION="Multimedia processing graphs"
-HOMEPAGE="https://pipewire.org/"
-
-LICENSE="MIT LGPL-2.1+ GPL-2"
-# ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49
-SLOT="0/0.4"
-IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2 pipewire-alsa ssl system-service systemd test udev v4l X zeroconf"
-
-# Once replacing system JACK libraries is possible, it's likely that
-# jack-client IUSE will need blocking to avoid users accidentally
-# configuring their systems to send PW sink output to the emulated
-# JACK's sink - doing so is likely to yield no audio, cause a CPU
-# cycles consuming loop (and may even cause GUI crashes)!
-
-REQUIRED_USE="
-	jack-sdk? ( !jack-client )
-	system-service? ( systemd )
-"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	>=dev-util/meson-0.59
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-"
-RDEPEND="
-	acct-group/audio
-	media-libs/alsa-lib
-	sys-apps/dbus[${MULTILIB_USEDEP}]
-	sys-libs/readline:=
-	sys-libs/ncurses:=[unicode(+)]
-	virtual/libintl[${MULTILIB_USEDEP}]
-	bluetooth? (
-		media-libs/fdk-aac
-		media-libs/libldac
-		media-libs/libfreeaptx
-		media-libs/sbc
-		>=net-wireless/bluez-4.101:=
-		virtual/libusb:1
-	)
-	echo-cancel? ( media-libs/webrtc-audio-processing:0 )
-	extra? (
-		>=media-libs/libsndfile-1.0.20
-	)
-	gstreamer? (
-		>=dev-libs/glib-2.32.0:2
-		>=media-libs/gstreamer-1.10.0:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
-	jack-sdk? (
-		!media-sound/jack-audio-connection-kit
-		!media-sound/jack2
-	)
-	lv2? ( media-libs/lilv )
-	pipewire-alsa? (
-		>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
-		!media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio]
-	)
-	!pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] )
-	ssl? ( dev-libs/openssl:= )
-	systemd? ( sys-apps/systemd )
-	system-service? (
-		acct-user/pipewire
-		acct-group/pipewire
-	)
-	udev? ( virtual/libudev[${MULTILIB_USEDEP}] )
-	v4l? ( media-libs/libv4l )
-	X? (
-		media-libs/libcanberra
-		x11-libs/libX11
-		x11-libs/libXfixes
-	)
-	zeroconf? ( net-dns/avahi )
-"
-
-DEPEND="${RDEPEND}"
-
-# TODO: Consider use cases where pipewire is not used for driving audio
-# Doing so with WirePlumber currently involves editing Lua scripts
-PDEPEND=">=media-video/wireplumber-0.4.8-r3"
-
-# Present RDEPEND that are currently always disabled due to the PW
-# code using them being required to be disabled by Gentoo guidelines
-# (i.e. developer binaries not meant for users) and unready code
-#	media-video/ffmpeg:=
-#	media-libs/libsdl2
-#	>=media-libs/vulkan-loader-1.1.69
-#
-# Ditto for DEPEND
-#	>=dev-util/vulkan-headers-1.1.69
-
-DOCS=( {README,INSTALL}.md NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
-
-	"${FILESDIR}"/${P}-fix-spa-header.patch
-	"${FILESDIR}"/${P}-treewide-retain-sections-to.patch
-	"${FILESDIR}"/${PN}-0.3.49-x86-cast.patch
-)
-
-# limitsdfile related code taken from =sys-auth/realtime-base-0.1
-# with changes as necessary.
-limitsdfile=40-${PN}.conf
-
-python_check_deps() {
-	has_version -b "dev-python/docutils[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	default
-
-	einfo "Generating ${limitsdfile}"
-	cat > ${limitsdfile} <<- EOF || die
-		# Start of ${limitsdfile} from ${P}
-
-		@audio	-	memlock 256
-
-		$(use system-service && {
-			echo @pipewire - rtprio 95
-			echo @pipewire - priority -19
-			echo @pipewire - memlock 4194304
-		})
-
-		# End of ${limitsdfile} from ${P}
-	EOF
-}
-
-multilib_src_configure() {
-	# https://bugs.gentoo.org/838301
-	filter-flags -fno-semantic-interposition
-
-	local emesonargs=(
-		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
-
-		$(meson_native_use_feature zeroconf avahi)
-		$(meson_native_use_feature doc docs)
-		$(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone
-		$(meson_native_enabled man)
-		$(meson_feature test tests)
-		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
-		$(meson_native_use_feature gstreamer)
-		$(meson_native_use_feature gstreamer gstreamer-device-provider)
-		$(meson_native_use_feature systemd)
-
-		$(meson_native_use_feature system-service systemd-system-service)
-		-Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)"
-		-Dsystemd-user-unit-dir="$(systemd_get_userunitdir)"
-
-		$(meson_native_use_feature systemd systemd-user-service)
-		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
-		-Dspa-plugins=enabled
-		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (NOTE: media-session is gone so IUSE=alsa/spa_alsa/alsa-backend might be possible)
-		-Daudiomixer=enabled # Matches upstream
-		-Daudioconvert=enabled # Matches upstream
-		$(meson_native_use_feature bluetooth bluez5)
-		$(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
-		$(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
-		$(meson_native_use_feature bluetooth bluez5-backend-ofono)
-		$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
-		$(meson_native_use_feature bluetooth bluez5-codec-aac)
-		$(meson_native_use_feature bluetooth bluez5-codec-aptx)
-		$(meson_native_use_feature bluetooth bluez5-codec-ldac)
-		$(meson_native_use_feature bluetooth libusb) # At least for now only used by bluez5 native (quirk detection of adapters)
-		$(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889
-		-Dcontrol=enabled # Matches upstream
-		-Daudiotestsrc=enabled # Matches upstream
-		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
-		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
-		$(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
-		$(meson_use jack-sdk jack-devel)
-		$(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
-		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
-		-Devl=disabled # Matches upstream
-		-Dtest=disabled # fakesink and fakesource plugins
-		$(meson_native_use_feature lv2)
-		$(meson_native_use_feature v4l v4l2)
-		-Dlibcamera=disabled # libcamera is not in Portage tree
-		$(meson_native_use_feature ssl raop)
-		-Dvideoconvert=enabled # Matches upstream
-		-Dvideotestsrc=enabled # Matches upstream
-		-Dvolume=enabled # Matches upstream
-		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
-		$(meson_native_use_feature extra pw-cat)
-		$(meson_feature udev)
-		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
-		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
-		$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
-		-Dsession-managers="[]" # All available session managers are now their own projects, so there's nothing to build
-
-		# Just for bell sounds in X11 right now.
-		$(meson_native_use_feature X x11)
-		$(meson_native_use_feature X x11-xfixes)
-		$(meson_native_use_feature X libcanberra)
-	)
-
-	meson_src_configure
-}
-
-multilib_src_install() {
-	# Our custom DOCS do not exist in multilib source directory
-	DOCS= meson_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	insinto /etc/security/limits.d
-	doins ${limitsdfile}
-
-	if use pipewire-alsa; then
-		dodir /etc/alsa/conf.d
-		# These will break if someone has /etc that is a symbolic link to a subfolder! See #724222
-		# And the current dosym8 -r implementation is likely affected by the same issue, too.
-		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
-		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
-	fi
-
-	if ! use systemd; then
-		insinto /etc/xdg/autostart
-		newins "${FILESDIR}"/pipewire.desktop-r1 pipewire.desktop
-
-		exeinto /usr/bin
-		newexe "${FILESDIR}"/gentoo-pipewire-launcher.in gentoo-pipewire-launcher
-		eprefixify "${ED}"/usr/bin/gentoo-pipewire-launcher
-	fi
-}
-
-pkg_postinst() {
-	use udev && udev_reload
-
-	elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
-	elog "using PipeWire. Do it either manually or add yourself"
-	elog "to the 'audio' group:"
-	elog
-	elog "  usermod -aG audio <youruser>"
-	elog
-
-	if ! use jack-sdk; then
-		elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
-		elog "alternative libraries have been installed to a non-default location."
-		elog "To use them, put pw-jack <application> before every JACK application."
-		elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
-		elog "provider is still needed to compile the JACK applications themselves."
-		elog
-	fi
-
-	if use systemd; then
-		elog "When switching from PulseAudio, you may need to disable PulseAudio:"
-		elog
-		elog "  systemctl --user disable pulseaudio.service pulseaudio.socket"
-		elog
-		elog "To use PipeWire, the user units must be manually enabled"
-		elog "by running this command as each user you use for desktop activities:"
-		elog
-		elog "  systemctl --user enable pipewire.socket pipewire-pulse.socket"
-		elog
-		elog "A reboot is recommended to avoid interferences from still running"
-		elog "PulseAudio daemon."
-		elog
-		elog "Both new users and those upgrading need to enable WirePlumber"
-		elog "for relevant users:"
-		elog
-		elog "  systemctl --user disable pipewire-media-session.service"
-		elog "  systemctl --user --force enable wireplumber.service"
-		elog
-		elog "Root user may replace --user with --global to change system default"
-		elog "configuration for all of the above commands."
-	else
-		ewarn "PipeWire daemon startup has been moved to a launcher script!"
-		ewarn "Make sure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist or no"
-		ewarn "longer is set to start a session manager or PulseAudio compatibility daemon (all"
-		ewarn "lines similar to '{ path = /usr/bin/pipewire*' should be commented out)"
-		ewarn
-		ewarn "Those manually starting /usr/bin/pipewire via .xinitrc or similar _must_ from"
-		ewarn "now on start ${EROOT}/usr/bin/gentoo-pipewire-launcher instead! It is highly"
-		ewarn "advised that a D-Bus user session is set up before starting the script."
-		ewarn
-		if has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon'; then
-			elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
-			elog "are recommended to edit pulseaudio client configuration files:"
-			elog "${EROOT}/etc/pulse/client.conf and ${EROOT}/etc/pulse/client.conf.d/enable-autospawn.conf"
-			elog "if it exists, and disable autospawning of the original daemon by setting:"
-			elog
-			elog "  autospawn = no"
-			elog
-			elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
-			elog
-			elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
-			elog "${EROOT}/usr/bin/gentoo-pipewire-launcher by commenting out the relevant"
-			elog "command:"
-			elog
-			elog "#${EROOT}/usr/bin/pipewire -c pipewire-pulse.conf &"
-			elog
-		fi
-		elog "NOTE:"
-		elog "Starting with PipeWire-0.3.30, this package is no longer installing its config"
-		elog "into ${EROOT}/etc/pipewire by default. In case you need to change"
-		elog "its config, please start by copying default config from ${EROOT}/usr/share/pipewire"
-		elog "and just override the sections you want to change."
-	fi
-	elog
-
-	elog "For latest tips and tricks, troubleshooting information and documentation"
-	elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
-	elog
-
-	optfeature_header "The following can be installed for optional runtime features:"
-	optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
-
-	if has_version 'net-misc/ofono' ; then
-		ewarn "Native backend has become default. Please disable oFono via:"
-		if systemd_is_booted ; then
-			ewarn "systemctl disable ofono"
-		else
-			ewarn "rc-update delete ofono"
-		fi
-		ewarn
-	fi
-
-	if use system-service; then
-		ewarn
-		ewarn "WARNING: you have enabled the system-service USE flag, which installs"
-		ewarn "the system-wide systemd units that enable PipeWire to run as a system"
-		ewarn "service. This is more than likely NOT what you want. You are strongly"
-		ewarn "advised not to enable this mode and instead stick with systemd user"
-		ewarn "units. The default configuration files will likely not work out of"
-		ewarn "box, and you are on your own with configuration."
-		ewarn
-	fi
-}
diff --git a/media-video/pipewire/pipewire-0.3.51-r1.ebuild b/media-video/pipewire/pipewire-0.3.51-r2.ebuild
similarity index 99%
rename from media-video/pipewire/pipewire-0.3.51-r1.ebuild
rename to media-video/pipewire/pipewire-0.3.51-r2.ebuild
index 533ce828218a..102821f89f32 100644
--- a/media-video/pipewire/pipewire-0.3.51-r1.ebuild
+++ b/media-video/pipewire/pipewire-0.3.51-r2.ebuild
@@ -19,7 +19,7 @@ else
 		SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
 	fi
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="Multimedia processing graphs"
@@ -144,7 +144,7 @@ src_prepare() {
 
 		$(use system-service && {
 			echo @pipewire - rtprio 95
-			echo @pipewire - priority -19
+			echo @pipewire - nice -19
 			echo @pipewire - memlock 4194304
 		})
 
diff --git a/media-video/pipewire/pipewire-0.3.52.ebuild b/media-video/pipewire/pipewire-0.3.52-r1.ebuild
similarity index 99%
rename from media-video/pipewire/pipewire-0.3.52.ebuild
rename to media-video/pipewire/pipewire-0.3.52-r1.ebuild
index 76d0878bb062..c94a3f03a994 100644
--- a/media-video/pipewire/pipewire-0.3.52.ebuild
+++ b/media-video/pipewire/pipewire-0.3.52-r1.ebuild
@@ -145,7 +145,7 @@ src_prepare() {
 
 		$(use system-service && {
 			echo @pipewire - rtprio 95
-			echo @pipewire - priority -19
+			echo @pipewire - nice -19
 			echo @pipewire - memlock 4194304
 		})
 
diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild
index 3fc526e97dfe..9ab78449ccc3 100644
--- a/media-video/pipewire/pipewire-9999.ebuild
+++ b/media-video/pipewire/pipewire-9999.ebuild
@@ -144,7 +144,7 @@ src_prepare() {
 
 		$(use system-service && {
 			echo @pipewire - rtprio 95
-			echo @pipewire - priority -19
+			echo @pipewire - nice -19
 			echo @pipewire - memlock 4194304
 		})
 
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index db1ff8951f64..54ea6f58356e 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -20,7 +20,7 @@ DIST vdr-2.4.6_pinplugin.patch.bz2 5176 BLAKE2B 142ad6551b8e37d223acf86f8c2f511c
 DIST vdr-2.4.6_ttxtsubs_v2.patch.bz2 51971 BLAKE2B e4915314e8f659df1c3e0ff631fd0c3dcec89053ff727fd28400dc6eecc49c1d4743a9bedaf3b11fce03fc6082309d4b4658d00a5b01aa5cbe8686e05412f882 SHA512 14c7b4397ba65e0ff9a5fb0705872f1cb6f1cdd1752b14f83f260540da25b5957632900232f83904c3d4fd6759e537c85bda2cce61455729eab3050a96441548
 DIST vdr-2.4.7.tbz2 919632 BLAKE2B be4e1ec365330855e4b2b26f44b1f35dc323e4783e96ef344a67b3e9fe2c0499760ab0f3d27c5e3bdddf5a65ebb65b0c81a62092301d34370aa19d0dd63bb1ab SHA512 41b8453bc6cdbb0db728b5d7d6624ab3ff9034b58ba443a8196f5fcc9fa78d18698cc91905890244e69d482ffc493374e6da2c97baed95fe742b888bdc63e42b
 DIST vdr-menuorg-2.3.x.diff 8852 BLAKE2B 19b98d51a69f52ecda5500f51ef1741a8397953b20c490055eab0393da5f56ff9598c3e1e8ed8b915f5877e08deeb9ba7a9ef8d9356ad3a1fa12e3778869174a SHA512 7b41c3a529858a4953a57f21619ea01864e140cc1755ee0b03caf1c4de41e80c3f805653502bc8d39d02a4dfcddf720acd4a8c8bd91f4871eef31d86e8e915c0
-EBUILD vdr-2.2.0-r6.ebuild 8168 BLAKE2B 4965d23936592348a37cdba6c6b89e0f651780b32436e113d94a79f1ba1b5d581a259d47160e499e28b5380a932e778b4d9a4c4a0cf675525031d19dd24e6110 SHA512 f47051d63715a36276ced33653928adc5d3378d3b3a28da3f6e68896c9d796b4887eaa78d76e9c6e8b42f65af1ebbd3019b56d8a1e912dddfe0c3e31d7212502
-EBUILD vdr-2.2.0-r7.ebuild 8210 BLAKE2B 004d8448d54dfe58ca1e83d6e1cfd9b84a22e8b0bb837900eba90666d55d4aae91e2e2d55095ab68665af104f52010b10268f5f730f451cedb54570d0271f8e9 SHA512 ca05beee04a50a8af95e4a990050c3430ac5a5829d4162e9c35f29bfd14deff2aa70e6ce6fcee10ceb506c48eca6a5bc15c418894e6d23ad5fb9d58da594e638
-EBUILD vdr-2.4.7-r1.ebuild 6169 BLAKE2B 006d0156bebd83ad5200e0f6587e3252d85fc0818203915c5af3d27e0f3e0b5f99cf272f11f855a344535be6dc4cc8a121a424369fda6bf5cb941a295e48642d SHA512 702c24d7dfda3d4664432ae93b5bfcc063093fb9e5fca2b2f8fd26f1daf8283a9a1dde0028d6a23ba97acf4a5cb3576c4234d7461e9e17c379bdcc8bdb5f4192
+EBUILD vdr-2.2.0-r6.ebuild 8172 BLAKE2B e6823542e56a5ae3bd4cb5d61840522b25ba9c0d1cb600b8a035a5e79f19c530e478751634130199aff157a8d32adc9b154b3d67d863eb54bfc0a8a4dcde8ed6 SHA512 f67d2c299f7e45cb398294735bdaf6fe2c23b06900aad8b9520bd7bab426cffff99d5be2861dfd0a9ac85215324c52b8a4130fd2b4ae6597c3d459f2c179fe3f
+EBUILD vdr-2.2.0-r7.ebuild 8214 BLAKE2B 18aa70b506af3bd462850741e34019ba0d1d30b4f5a8b6aca7c286803721108efb658e18be82c2dfdb5a9acf517038672c9df0112a6518c17d8f9c9f9a14e99b SHA512 1baee9761c40be901a2ec4795775c89b44207622822535b13f91db33f4aec6e7a30b6f0dded4f10c000ea775cca2ce986dd10da4f1eb6afc1d55547db8ab7c9d
+EBUILD vdr-2.4.7-r1.ebuild 6171 BLAKE2B 4ee4c05630a0a0133def40460d97839fe2c9346b162f7b9415c48e544c476cf4cf94a66e905f6176dc23478567aec2f0bf5a738cb1b5fe4a9e005f168e75e751 SHA512 c2e97f014040c1f0af8c56e1aeec947b3cd9f428bda0d8897f2de4531445593fabd53dca7e33c0be958147f7cdbb31f9fc8a15e91923d6317ddaf4f8a54f2e1a
 MISC metadata.xml 1780 BLAKE2B 179a1948c96a7b237b500a08861799c25ae084d5b9cd6702921acd04cfbf0111bbb11170e4d14bf31ad7355ef0899f285857350131badc411548a3611593ecb6 SHA512 6c8c2073c55f327d4dfe52cb22ae1622d936c43503caf2964594656e1281b07110187c139216a73ed10abd625b43509ecdfe41edb7439950653e038991abfb31
diff --git a/media-video/vdr/vdr-2.2.0-r6.ebuild b/media-video/vdr/vdr-2.2.0-r6.ebuild
index 73bef819af6e..372355cbe09d 100644
--- a/media-video/vdr/vdr-2.2.0-r6.ebuild
+++ b/media-video/vdr/vdr-2.2.0-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -74,7 +74,7 @@ enable_patch() {
 		# codesnippet to bring the extpng defines into the vdr.pc CXXFLAGS CFLAGS
 		echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp || die "cannot write to defines.tmp"
 		cat "${T}"/defines.tmp | tr \\\012 ' '  > "${T}"/defines.IUSE || die "cannot write to defines.tmp"
-		export DEFINES_IUSE=$( cat ${T}/defines.IUSE )
+		export DEFINES_IUSE=$( cat "${T}"/defines.IUSE )
 	done
 }
 
@@ -94,7 +94,7 @@ extensions_all_defines() {
 }
 
 lang_po() {
-	LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
+	LING_PO=$( ls "${S}"/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
 }
 
 src_configure() {
diff --git a/media-video/vdr/vdr-2.2.0-r7.ebuild b/media-video/vdr/vdr-2.2.0-r7.ebuild
index ead539ebbd1f..63fed2e99446 100644
--- a/media-video/vdr/vdr-2.2.0-r7.ebuild
+++ b/media-video/vdr/vdr-2.2.0-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -74,7 +74,7 @@ enable_patch() {
 		# codesnippet to bring the extpng defines into the vdr.pc CXXFLAGS CFLAGS
 		echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp || die "cannot write to defines.tmp"
 		cat "${T}"/defines.tmp | tr \\\012 ' '  > "${T}"/defines.IUSE || die "cannot write to defines.tmp"
-		export DEFINES_IUSE=$( cat ${T}/defines.IUSE )
+		export DEFINES_IUSE=$( cat "${T}"/defines.IUSE )
 	done
 }
 
@@ -94,7 +94,7 @@ extensions_all_defines() {
 }
 
 lang_po() {
-	LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
+	LING_PO=$( ls "${S}"/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
 }
 
 src_configure() {
diff --git a/media-video/vdr/vdr-2.4.7-r1.ebuild b/media-video/vdr/vdr-2.4.7-r1.ebuild
index 0e8eed4d4ee5..992581e9e7e2 100644
--- a/media-video/vdr/vdr-2.4.7-r1.ebuild
+++ b/media-video/vdr/vdr-2.4.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -65,7 +65,7 @@ add_cap() {
 }
 
 lang_po() {
-	LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
+	LING_PO=$( ls "${S}"/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
 }
 
 src_configure() {
diff --git a/media-video/wireplumber/Manifest b/media-video/wireplumber/Manifest
index 89e67d541c01..9a977122476c 100644
--- a/media-video/wireplumber/Manifest
+++ b/media-video/wireplumber/Manifest
@@ -7,9 +7,9 @@ AUX wireplumber-0.4.9-config-document-which-options-need-to-be-turned-off-.patch
 AUX wireplumber-0.4.9-scripts-policy-device-profile-clear-tables-when-devi.patch 1102 BLAKE2B 2a1e2cbe901e6284002f1393621f26d9c7eebee9eb4edc334dc9712095724a32de9f5a3def5121c28f1690b9ed634c9d3fe843c4ae221567e60f6140fe6b9339 SHA512 25a70e02e403cf155a4aaa6bc63a8f3d4cae712814932a5529366ea4ad2ef31d6c14080294ae4b9a1bab7ad433c26dde71df88123815159206d3f3c76481824a
 DIST wireplumber-0.4.10.tar.gz 395588 BLAKE2B 6df1af17d1e53ab1449a2f6f9af5a0c4f7b1cd981e07556e5ea3c6b4d5d624e66b97ce4f945f7ccccebbf72b75d35d10990fac11b5228275f27e5320885ff1ec SHA512 342e8bba2cf00faab71ef39bb361b5ada66ff3a68ccf7a756ea1ca402da6e94784eece277ca02992bc7573c51cb8b1bad33aa9c593b3d1bfe0bb0286e2f4506f
 DIST wireplumber-0.4.9.tar.gz 376170 BLAKE2B 50f552c730ac543fc2e8b0e054c861bcd22ed281a62f2921fb956f39b917cce6eb53287dfcfc81db240476f82f5cf1d7556fa34be8bf507ff847089536b81f44 SHA512 39b9e9be014489042fe480219b99d7591e0b68dd44b889bd5c6aeee73e771adb807bc21f48d031217f097182827bd2f48b68d52291036d52e95d4fa75e7f9929
-EBUILD wireplumber-0.4.10-r1.ebuild 3652 BLAKE2B 6cdae58a794ac8710565acbd0af6a5f8d40e13831eef22c066bb2b45569d3f9f6ad3f94f0925ff54a0b032f50d2eb7c2394878bb3eb2924c91ab7ce2f63ee550 SHA512 2daf7d6661b18789a0aa60737923b69b89d180d80164ead599f7ae1ef1ad460df1ec9ebb1d4534efd6b38cec627fb17c555c161a20b4fa6852a3d60236587680
-EBUILD wireplumber-0.4.10-r3.ebuild 3953 BLAKE2B 2dd1cdba585add8ef1e6cf3e0b7b6f51911215de9ae70e49ae1123557830eaf78a111c18bc8de03fdd79a31d43ba2f73299e341a004310b19738a3713609881c SHA512 d1baf6109ebed5c081189392f4fde8cdb4ae6175059deefebea554dffc4c1d5813ed8ec9a811f1f9e397bfc703f455205d89320a1a9322072bdbdab16367cb78
-EBUILD wireplumber-0.4.9-r1.ebuild 3689 BLAKE2B fbc08a9345afaabe31c270b60ce69daf78834a165c64aadf0eb6e6ad7ad5a300676107c377ee11f720df9cd11a8ca300cfea902679679ba1a0e67b0fdd043b5c SHA512 738d760ede5bd05047f399987e7266ee0c732e62f5449468c90dab39385e11e37d67d7559d96229467550e380ba30afbbbb72c08e0c733872ef6f961c4169e27
-EBUILD wireplumber-0.4.9.ebuild 3512 BLAKE2B edd21937127291c47bf9d87566172a22cde8a1aeb24eda1be76355abf5c734192c1b18cb62eade6fab59df8cb1cbf590201a77f9e4eee1e806384f7d9b2b10d6 SHA512 9751335866a253c0598653638600dc3b713adc7377d5f453a2286b7ef0d0a75751f32819c3bdb76a91e7d874109c5e9d511c12c882971c7ff716928c42119081
+EBUILD wireplumber-0.4.10-r1.ebuild 3654 BLAKE2B 43f15fe7997b85dd0cade5c0393f7088766482914e7767926a2d714dc73b17efee6614984200a694c3ce2bcdd2325a6a63768d958fefc044c513d516b6981129 SHA512 dba2d1bff0f1a90bfce06df57e9464a71a27aad3ffe1720cd39402da76579aafb363e3a0fe450d392dff57d3c12f6a1480141c5cb95f7e510b948b654faa63a4
+EBUILD wireplumber-0.4.10-r3.ebuild 3951 BLAKE2B 63f785b4d19d3985c1bb4c57d5b648de18ad09b2a6b09d96544f8111bd3851c64a4a566875891b103af24ba24ef1e479c8ffaa159d9f9f901d4d6920e1fc5295 SHA512 b8453657320f31cd00eeefac1b087d862ceca515585f460728ad0c9038aafb2845bb4ab9e571b478bdaa4f60fe9f0af38e221e5b4ffa60d167eba810899d795e
+EBUILD wireplumber-0.4.9-r1.ebuild 3691 BLAKE2B 63ffe1aa2c86a4fe5cccb29e294189341aa9f70264a2026f16475e52fc6c313c8370dce17753206b7be4ce760f374ad38c8ee3621591e77b6eaa9f84bc75922e SHA512 f37f3130a79ea3898e79ca6abfee456c85b4357620b82aa80f8a119e3c12fcbabf5af55527bf0bee9cc40d5b98a6d707579b8f9be95609fe6abc0ce9071616f4
+EBUILD wireplumber-0.4.9.ebuild 3514 BLAKE2B fcd3cc2a795ba63c467fc46c7480553f9472e6c75f3bb54cd7701c0b28af294afeebdbad4b68f63a1c4adcab4a879c80465c00eb280cbf8db91604a67c493959 SHA512 0284553b29d7ac9b1f7df8f7b99207de4314601ded59df7f2bab33c6d8c538516b8041462221386e477217d43615462f28df6a2ecc81c0d3a2923f506fe565ab
 EBUILD wireplumber-9999.ebuild 3563 BLAKE2B bbd86c4a9cfaaec2dc039b486b6737fc9770783860c755ae6d0bd9b1d9c803f608627273e95d8df68a6acfe81e5080258549ae08f0890f605eaf9c1a66a03bc7 SHA512 1bb23ba5ceff7f46934d0312040d594ab8a33007a15be3a71f5e16f07b8e70f15a3dee3bafa6553fca0cf53522b035df3ecb0468832ba0655223f8b81ce9f81a
 MISC metadata.xml 803 BLAKE2B d05f76db401a8f71c5c1504d17dd8c0a87686f4b0ab2da450a47f71b1a15eeee2aef17107a3a987af70a097c3004c582fdda4c46e37c89466bfb470d032446dd SHA512 cfa42b1862175344b23fe65fb97d86783ded19352988790aefc6a062da212423dd81d8147525e4256025cdcfc6850909ca61d77d6b4243add0a3339b2eb319ee
diff --git a/media-video/wireplumber/wireplumber-0.4.10-r1.ebuild b/media-video/wireplumber/wireplumber-0.4.10-r1.ebuild
index f8675da3d540..4c9a4ce04761 100644
--- a/media-video/wireplumber/wireplumber-0.4.10-r1.ebuild
+++ b/media-video/wireplumber/wireplumber-0.4.10-r1.ebuild
@@ -92,7 +92,7 @@ src_install() {
 	# If a reflinking CoW filesystem is used (e.g. Btrfs), then the files
 	# will not actually get stored twice until modified.
 	insinto /etc
-	doins -r ${ED}/usr/share/wireplumber
+	doins -r "${ED}"/usr/share/wireplumber
 }
 
 pkg_postinst() {
diff --git a/media-video/wireplumber/wireplumber-0.4.10-r3.ebuild b/media-video/wireplumber/wireplumber-0.4.10-r3.ebuild
index bcd942a98219..ff4117251092 100644
--- a/media-video/wireplumber/wireplumber-0.4.10-r3.ebuild
+++ b/media-video/wireplumber/wireplumber-0.4.10-r3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="Replacement for pipewire-media-session"
diff --git a/media-video/wireplumber/wireplumber-0.4.9-r1.ebuild b/media-video/wireplumber/wireplumber-0.4.9-r1.ebuild
index f269c7faf59c..b2cb2a7e4d87 100644
--- a/media-video/wireplumber/wireplumber-0.4.9-r1.ebuild
+++ b/media-video/wireplumber/wireplumber-0.4.9-r1.ebuild
@@ -91,7 +91,7 @@ src_install() {
 	# If a reflinking CoW filesystem is used (e.g. Btrfs), then the files
 	# will not actually get stored twice until modified.
 	insinto /etc
-	doins -r ${ED}/usr/share/wireplumber
+	doins -r "${ED}"/usr/share/wireplumber
 }
 
 pkg_postinst() {
diff --git a/media-video/wireplumber/wireplumber-0.4.9.ebuild b/media-video/wireplumber/wireplumber-0.4.9.ebuild
index 4f4c698eaf54..0c71a9ba7f9b 100644
--- a/media-video/wireplumber/wireplumber-0.4.9.ebuild
+++ b/media-video/wireplumber/wireplumber-0.4.9.ebuild
@@ -86,7 +86,7 @@ src_install() {
 	# If a reflinking CoW filesystem is used (e.g. Btrfs), then the files
 	# will not actually get stored twice until modified.
 	insinto /etc
-	doins -r ${ED}/usr/share/wireplumber
+	doins -r "${ED}"/usr/share/wireplumber
 }
 
 pkg_postinst() {
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 1267359e467c..7a915fa8a705 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 1ce26afb04db..bb1e6ffcdb51 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 13 Jun 2022 11:09:34 +0000
+Thu, 16 Jun 2022 18:09:47 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 44bab0114b22..026c2b1dccde 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 518604 BLAKE2B 771190ff87bcfe6702a19150591bf573a429c51546ab7bd3ae25f101a4ec657d93d6fb83f7cb3aa4055e581eab5fde9d88a73a604dc34f426cb30ebb4385af9b SHA512 0b5d0f14e5d6ec3ff896d9d472edea00620a08f552ffc5516b0264e609527cf65471ee37a5002559add52d5c1898b2b60d48c9e97e6d2451bd84bf24fd112ab4
-TIMESTAMP 2022-06-13T11:09:39Z
+TIMESTAMP 2022-06-16T18:09:52Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmKnGvNfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmKrcfBfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAWLRAAgc9t5kQGvG3T/O+p0mhk/lRaVN7TYNzt9BAlysEMO0kIMr1KOL5JK4F8
-En/rXXK1Do0xY/2boG492LLvvQVESf2oQGxoViEiOLdHrRx9/taSaoedxoNn6k3H
-aAoh2aIFRAUVRCdlHHjLgVZweDG6ids7LaYXcNZTP2szlWqfiZhc0K7PV1JegLOn
-vZHIPM8sXoXDs/7VGso48F9byWeaO9ecZvvmUvnuMTqpauYVtvKNSAxmGS4Q2D9k
-ib8//Wpy6CvK2z4ofOs/OYiLmPo14f7AKZYV5UlQap0NZ85nyHpvTFKzqy/ZjKPM
-CUZ2rgJDQjPxBIiooL+S7BM0F+1PJGUccJZp1/ZaMHo65kvCZvO9SAvSHzUp1y8j
-U6K8+h1PzWoWN2HdmPDiQuvPTwPPMPk6yqE1oX/ZPBs+dfY6kTjdHLUKMNviPKQd
-OpXTQAl8bZ/Q/5fVgH2c2DF90iShxmFZYcLIUggMG6oipVM4EQtAANTm3riqPPpe
-Dvz308oza25Qw0SeUxS6QTFfxj31bAPezaZI+7XQvbTeE/o51Q6imOnNd3qK2CXr
-YNY9Os3h6rBIw6HwWb/AK0E5K8IwQBCF/kYTKCUW2rcA5OiMbvTecr9g2z+MsKtM
-n74RwX8nHVa4hZ9YziYIjevG8Gnll38K8rCOcRiQwPn2RwDCioc=
-=l5kl
+klBeqQ/+N6246n6RhcYCZJPwXyGnBa82/H7x+2IeFkiBjm6FERqsFHvvtM4xosU9
+PaF+vW1jdn3PwOwdWFO0d4VrPE58kHApSSNwzzqUSi7mnWIHHZq87HPJdQ5hN2J8
+8QwHpQsysZKKjQIG8vi1OJOpMLCMs1Zg9icPaOrwLNttJOKTK9y3+idInX2q9Xig
+mpon8aHXrbqmnLX/JfJVUY//7VjOivCC2kiFXQ1I2943+jwFDZr/A72jWzVBzF/k
+0TPC93sJRrKt666S5uyCz/x6Ze46Fp+d874xUgQiFxqDYubYvXdkf6tG+lUdSxzc
+0ZX6I/Eek9eTzVmuIhp9/ozPRzt8sMxIsJ2wx+wVqNTAKHQo65T/WSacKk0nScVZ
+UdmUtaYOCOHow7nfdqCO2TlGEjJMn43JrVtwpSAFhwlleGM3FsFBaMm4NkN8Vnby
+3rOxixNJhjU0KLv3614mVuONiAchoOlROS52Px3CQ7wKz4qHLmuN+UGlic+sCJzI
+0w7Zvxi5kmeFsjRlTyYnkieSBH+hmnFRMeTDkwhU1Ajey8CzvpqzTQZxSGdSLuNi
+XlikWGH/GKGCe/eISDsIIFaJ3vFCG08Xlw95uEwJgGWQKFfzkI2/CTw30LbsSjLP
+DguVj/JWyunCm6zH9Sao0D1Vo2bjaMys18KVnGaE8TP1l6AZpNk=
+=aJ+G
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 068f07b813dd..bb1e6ffcdb51 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 13 Jun 2022 11:09:35 +0000
+Thu, 16 Jun 2022 18:09:47 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 3f3fd4e625f4..75d3ff52a22c 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index ac3491748ce4..d7e8824cd31b 100644
Binary files a/metadata/md5-cache/app-accessibility/Manifest.gz and b/metadata/md5-cache/app-accessibility/Manifest.gz differ
diff --git a/metadata/md5-cache/app-accessibility/sound-icons-0.1 b/metadata/md5-cache/app-accessibility/sound-icons-0.1
index 47133a987f0b..599d9a224c42 100644
--- a/metadata/md5-cache/app-accessibility/sound-icons-0.1
+++ b/metadata/md5-cache/app-accessibility/sound-icons-0.1
@@ -7,4 +7,4 @@ LICENSE=GPL-2
 RDEPEND=app-accessibility/speech-dispatcher
 SLOT=0
 SRC_URI=http://www.freebsoft.org/pub/projects/sound-icons/sound-icons-0.1.tar.gz
-_md5_=b217fbfc55dbd592f6c5b32ab891ebf4
+_md5_=57b63e41510c9b9480bcdf06f6b75b47
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 3afde3400a95..3923bf142f15 100644
Binary files a/metadata/md5-cache/app-admin/Manifest.gz and b/metadata/md5-cache/app-admin/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/awscli-1.25.10 b/metadata/md5-cache/app-admin/awscli-1.25.10
new file mode 100644
index 000000000000..5b1ad831ada4
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.25.10
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/botocore-1.27.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Universal Command Line Environment for AWS
+EAPI=8
+HOMEPAGE=https://github.com/aws/aws-cli/ https://pypi.org/project/awscli/
+INHERIT=bash-completion-r1 distutils-r1 multiprocessing
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.27.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/aws-cli/archive/1.25.10.tar.gz -> aws-cli-1.25.10.gh.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=a47ec3f6b9c6b798cadd95af86a98247
diff --git a/metadata/md5-cache/app-admin/awscli-1.25.8 b/metadata/md5-cache/app-admin/awscli-1.25.8
new file mode 100644
index 000000000000..2abafa742285
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.25.8
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/botocore-1.27.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Universal Command Line Environment for AWS
+EAPI=8
+HOMEPAGE=https://github.com/aws/aws-cli/ https://pypi.org/project/awscli/
+INHERIT=bash-completion-r1 distutils-r1 multiprocessing
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.27.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/aws-cli/archive/1.25.8.tar.gz -> aws-cli-1.25.8.gh.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=a47ec3f6b9c6b798cadd95af86a98247
diff --git a/metadata/md5-cache/app-admin/awscli-1.25.9 b/metadata/md5-cache/app-admin/awscli-1.25.9
new file mode 100644
index 000000000000..85654a60bf04
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.25.9
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/botocore-1.27.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Universal Command Line Environment for AWS
+EAPI=8
+HOMEPAGE=https://github.com/aws/aws-cli/ https://pypi.org/project/awscli/
+INHERIT=bash-completion-r1 distutils-r1 multiprocessing
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.27.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/aws-cli/archive/1.25.9.tar.gz -> aws-cli-1.25.9.gh.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=a47ec3f6b9c6b798cadd95af86a98247
diff --git a/metadata/md5-cache/app-admin/exo-1.54.0 b/metadata/md5-cache/app-admin/exo-1.56.0
similarity index 76%
rename from metadata/md5-cache/app-admin/exo-1.54.0
rename to metadata/md5-cache/app-admin/exo-1.56.0
index ef4b299ca3a3..0196314df187 100644
--- a/metadata/md5-cache/app-admin/exo-1.54.0
+++ b/metadata/md5-cache/app-admin/exo-1.56.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RESTRICT=strip
 SLOT=0
-SRC_URI=https://github.com/exoscale/cli/archive/v1.54.0.tar.gz -> exo-1.54.0.tar.gz
+SRC_URI=https://github.com/exoscale/cli/archive/v1.56.0.tar.gz -> exo-1.56.0.tar.gz
 _md5_=f7f4d5543cc6f661b9e628a3970cb6a7
diff --git a/metadata/md5-cache/app-admin/hcloud-1.29.0 b/metadata/md5-cache/app-admin/hcloud-1.29.0
deleted file mode 100644
index 7843305f38d8..000000000000
--- a/metadata/md5-cache/app-admin/hcloud-1.29.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-lang/go:=
-DESCRIPTION=A command-line interface for Hetzner Cloud
-EAPI=7
-HOMEPAGE=https://github.com/hetznercloud/cli
-KEYWORDS=amd64
-LICENSE=MIT
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ago/distfiles/hcloud-1.29.0.tar.xz
-_md5_=29dfefc2cd248e18df48cae0875c6969
diff --git a/metadata/md5-cache/app-admin/hcloud-1.29.5 b/metadata/md5-cache/app-admin/hcloud-1.29.5
index 64ac04f4a66d..729791b94d5c 100644
--- a/metadata/md5-cache/app-admin/hcloud-1.29.5
+++ b/metadata/md5-cache/app-admin/hcloud-1.29.5
@@ -3,9 +3,9 @@ DEPEND=dev-lang/go:=
 DESCRIPTION=A command-line interface for Hetzner Cloud
 EAPI=7
 HOMEPAGE=https://github.com/hetznercloud/cli
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MIT
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ago/distfiles/hcloud-1.29.5.tar.xz
-_md5_=ce2c107bbfa1fdd484f3cf1d93721e70
+_md5_=5306160267c67ea8dbe4502c83cc2315
diff --git a/metadata/md5-cache/app-admin/helm-3.8.1 b/metadata/md5-cache/app-admin/helm-3.8.1
index 7a034c70089c..269a9a9a6a02 100644
--- a/metadata/md5-cache/app-admin/helm-3.8.1
+++ b/metadata/md5-cache/app-admin/helm-3.8.1
@@ -4,10 +4,10 @@ DESCRIPTION=Kubernetes Package Manager
 EAPI=8
 HOMEPAGE=https://github.com/helm/helm https://helm.sh
 INHERIT=bash-completion-r1 go-module
-KEYWORDS=amd64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RESTRICT=test strip
 SLOT=0
 SRC_URI=https://github.com/helm/helm/archive/v3.8.1.tar.gz -> k8s-helm-3.8.1.tar.gz https://dev.gentoo.org/~williamh/dist/helm-3.8.1-deps.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=d3c9d6127dcf43c956e5a16a448082bd
+_md5_=142eeac6d96b0c5be3ddd97c69c44790
diff --git a/metadata/md5-cache/app-admin/metalog-20220214 b/metadata/md5-cache/app-admin/metalog-20220214
index be89d7a20de2..481c842b33ad 100644
--- a/metadata/md5-cache/app-admin/metalog-20220214
+++ b/metadata/md5-cache/app-admin/metalog-20220214
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/hvisage/metalog
 INHERIT=autotools systemd
 IUSE=unicode
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin
 LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre2
 SLOT=0
 SRC_URI=https://github.com/hvisage/metalog/archive/metalog-20220214.tar.gz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ede9f85ebd6a164cdd476367b75a28ec
+_md5_=41128c8453ac1114c01a87726f309bba
diff --git a/metadata/md5-cache/app-admin/sudo-1.9.11_p2 b/metadata/md5-cache/app-admin/sudo-1.9.11_p2
new file mode 100644
index 000000000000..89218fee88a0
--- /dev/null
+++ b/metadata/md5-cache/app-admin/sudo-1.9.11_p2
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( sec-keys/openpgp-keys-sudo ) sys-devel/bison virtual/pkgconfig >=app-portage/elt-patches-20170815 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=configure install postinst prepare unpack
+DEPEND=sys-libs/zlib:= virtual/libcrypt:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1:= sasl? ( dev-libs/cyrus-sasl net-nds/openldap:=[sasl] ) ) pam? ( sys-libs/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( dev-libs/openssl:0= ) sssd? ( sys-auth/sssd[sudo] )
+DESCRIPTION=Allows users or groups to run commands as other users
+EAPI=8
+HOMEPAGE=https://www.sudo.ws/
+INHERIT=pam libtool tmpfiles toolchain-funcs verify-sig
+IUSE=gcrypt ldap nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~sparc-solaris
+LICENSE=ISC BSD
+RDEPEND=sys-libs/zlib:= virtual/libcrypt:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1:= sasl? ( dev-libs/cyrus-sasl net-nds/openldap:=[sasl] ) ) pam? ( sys-libs/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( dev-libs/openssl:0= ) sssd? ( sys-auth/sssd[sudo] ) >=app-misc/editor-wrapper-3 virtual/editor ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) selinux? ( sec-policy/selinux-sudo ) sendmail? ( virtual/mta ) virtual/tmpfiles
+REQUIRED_USE=?? ( pam skey ) ?? ( gcrypt ssl )
+SLOT=0
+SRC_URI=https://www.sudo.ws/sudo/dist/sudo-1.9.11p2.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.9.11p2.tar.gz verify-sig? ( https://www.sudo.ws/sudo/dist/sudo-1.9.11p2.tar.gz.sig ftp://ftp.sudo.ws/pub/sudo/sudo-1.9.11p2.tar.gz.sig )
+_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pam	e44a1dd98f13e1ad76de01e919bde1f1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=c8468dd9e5db6dc8b9b10074b3864101
diff --git a/metadata/md5-cache/app-admin/sudo-9999 b/metadata/md5-cache/app-admin/sudo-9999
index 8ecc4902798d..8b5eb67df100 100644
--- a/metadata/md5-cache/app-admin/sudo-9999
+++ b/metadata/md5-cache/app-admin/sudo-9999
@@ -2,7 +2,7 @@ BDEPEND=sys-devel/bison virtual/pkgconfig >=app-portage/elt-patches-20170815 dev
 DEFINED_PHASES=configure install postinst prepare unpack
 DEPEND=sys-libs/zlib:= virtual/libcrypt:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1:= sasl? ( dev-libs/cyrus-sasl net-nds/openldap:=[sasl] ) ) pam? ( sys-libs/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( dev-libs/openssl:0= ) sssd? ( sys-auth/sssd[sudo] )
 DESCRIPTION=Allows users or groups to run commands as other users
-EAPI=7
+EAPI=8
 HOMEPAGE=https://www.sudo.ws/
 INHERIT=pam libtool tmpfiles toolchain-funcs mercurial
 IUSE=gcrypt ldap nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=sys-libs/zlib:= virtual/libcrypt:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1:= sasl? ( dev-libs/cyrus-sasl net-nds/openldap:=[sasl] ) ) pam? ( sys-libs/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( dev-libs/openssl:0= ) sssd? ( sys-auth/sssd[sudo] ) >=app-misc/editor-wrapper-3 virtual/editor ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) selinux? ( sec-policy/selinux-sudo ) sendmail? ( virtual/mta ) virtual/tmpfiles
 REQUIRED_USE=?? ( pam skey ) ?? ( gcrypt ssl )
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	libtool	241a8f577b9781a42a7421e53448a44e	mercurial	53b96197cb26db4afb5056f1bbfa4845	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=21ce1178f7c3441042eca113b7ef6409
+_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	libtool	241a8f577b9781a42a7421e53448a44e	mercurial	53b96197cb26db4afb5056f1bbfa4845	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pam	e44a1dd98f13e1ad76de01e919bde1f1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=c8468dd9e5db6dc8b9b10074b3864101
diff --git a/metadata/md5-cache/app-antivirus/Manifest.gz b/metadata/md5-cache/app-antivirus/Manifest.gz
index 81dc0f674b24..32eef91e0734 100644
Binary files a/metadata/md5-cache/app-antivirus/Manifest.gz and b/metadata/md5-cache/app-antivirus/Manifest.gz differ
diff --git a/metadata/md5-cache/app-antivirus/lkrg-0.9.2 b/metadata/md5-cache/app-antivirus/lkrg-0.9.2
index 1d32206af62c..81db0a391888 100644
--- a/metadata/md5-cache/app-antivirus/lkrg-0.9.2
+++ b/metadata/md5-cache/app-antivirus/lkrg-0.9.2
@@ -12,4 +12,4 @@ RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:
 SLOT=0
 SRC_URI=https://lkrg.org/download/lkrg-0.9.2.tar.gz verify-sig? ( https://lkrg.org/download/lkrg-0.9.2.tar.gz.sign )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	linux-mod	6ff232574f0bcad33767903505553e8d	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=fa04f95c1d70c18bd6786eeba5fa4cad
+_md5_=0f3a8ee08ddd7e19d3ceb2805fb3ea67
diff --git a/metadata/md5-cache/app-antivirus/lkrg-0.9.3 b/metadata/md5-cache/app-antivirus/lkrg-0.9.3
index c7e0d2f0ca61..be852c7846a0 100644
--- a/metadata/md5-cache/app-antivirus/lkrg-0.9.3
+++ b/metadata/md5-cache/app-antivirus/lkrg-0.9.3
@@ -12,4 +12,4 @@ RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:
 SLOT=0
 SRC_URI=https://lkrg.org/download/lkrg-0.9.3.tar.gz verify-sig? ( https://lkrg.org/download/lkrg-0.9.3.tar.gz.sign )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	linux-mod	6ff232574f0bcad33767903505553e8d	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=74b9f34ee4e44b697b0577d4f471cff5
+_md5_=d6ef989d64dc9f8739daae434275e078
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index a9d38722cee0..e27321a105b4 100644
Binary files a/metadata/md5-cache/app-arch/Manifest.gz and b/metadata/md5-cache/app-arch/Manifest.gz differ
diff --git a/metadata/md5-cache/app-arch/zstd-1.5.1-r3 b/metadata/md5-cache/app-arch/zstd-1.5.1-r3
new file mode 100644
index 000000000000..2247a1cf9aeb
--- /dev/null
+++ b/metadata/md5-cache/app-arch/zstd-1.5.1-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-arch/xz-utils lz4? ( app-arch/lz4 )
+DESCRIPTION=zstd fast compression library
+EAPI=8
+HOMEPAGE=https://facebook.github.io/zstd/
+INHERIT=multilib-minimal toolchain-funcs usr-ldscript
+IUSE=lz4 static-libs split-usr +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( BSD GPL-2 )
+RDEPEND=app-arch/xz-utils lz4? ( app-arch/lz4 )
+SLOT=0/1
+SRC_URI=https://github.com/facebook/zstd/archive/v1.5.1.tar.gz -> zstd-1.5.1.tar.gz
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	fd9cde67030b26e479eeadaced488253	usr-ldscript	5c738dce357b54d5a90e30094d2f983c
+_md5_=f6f82997c422fbe78a07c2d96ef220bf
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index ed7bb72f87ee..be243aa4c591 100644
Binary files a/metadata/md5-cache/app-backup/Manifest.gz and b/metadata/md5-cache/app-backup/Manifest.gz differ
diff --git a/metadata/md5-cache/app-backup/tsm-8.1.13.3 b/metadata/md5-cache/app-backup/tsm-8.1.13.3
index 8ff333222d47..87af484365a2 100644
--- a/metadata/md5-cache/app-backup/tsm-8.1.13.3
+++ b/metadata/md5-cache/app-backup/tsm-8.1.13.3
@@ -13,4 +13,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=ftp://ftp.software.ibm.com/storage/tivoli-storage-management/patches/client/v8r1/Linux/LinuxX86/BA/v8113/8.1.13.3-TIV-TSMBAC-LinuxX86.tar
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	rpm	f73e907469f65e52192f110dec72dce0	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=6a1910bd1e51d3b6d113a7b424668a96
+_md5_=f29eb5e081a048778eb2cd55c1b6ed1e
diff --git a/metadata/md5-cache/app-cdr/Manifest.gz b/metadata/md5-cache/app-cdr/Manifest.gz
index 42132064ce4a..3fb273524293 100644
Binary files a/metadata/md5-cache/app-cdr/Manifest.gz and b/metadata/md5-cache/app-cdr/Manifest.gz differ
diff --git a/metadata/md5-cache/app-cdr/dvdisaster-0.79.5 b/metadata/md5-cache/app-cdr/dvdisaster-0.79.5
index b299a08d51eb..039a8821e33e 100644
--- a/metadata/md5-cache/app-cdr/dvdisaster-0.79.5
+++ b/metadata/md5-cache/app-cdr/dvdisaster-0.79.5
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:2 nls? ( virtual/libin
 SLOT=0
 SRC_URI=http://dvdisaster.net/downloads/dvdisaster-0.79.5.tar.bz2
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=3513bd6917a9c6faaee7e608ab736c05
+_md5_=0a19c43bd9b650b24610ed477ddbd8bd
diff --git a/metadata/md5-cache/app-containers/Manifest.gz b/metadata/md5-cache/app-containers/Manifest.gz
index 7b93cc2e4a50..a52a940e75c7 100644
Binary files a/metadata/md5-cache/app-containers/Manifest.gz and b/metadata/md5-cache/app-containers/Manifest.gz differ
diff --git a/metadata/md5-cache/app-containers/docker-compose-2.3.3-r2 b/metadata/md5-cache/app-containers/docker-compose-2.3.3-r2
deleted file mode 100644
index 1168d4d63e32..000000000000
--- a/metadata/md5-cache/app-containers/docker-compose-2.3.3-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-lang/go-1.16 app-arch/unzip
-DEFINED_PHASES=compile install postinst prepare test unpack
-DESCRIPTION=Multi-container orchestration for Docker
-EAPI=8
-HOMEPAGE=https://github.com/docker/compose
-INHERIT=bash-completion-r1 go-module
-KEYWORDS=~amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=>=app-containers/docker-cli-20.10.3
-RESTRICT=strip
-SLOT=2
-SRC_URI=https://github.com/docker/compose/archive/v2.3.3.tar.gz -> docker-compose-2.3.3.tar.gz https://dev.gentoo.org/~williamh/dist/docker-compose-2.3.3-deps.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=014af38048504c717856e7349868cbba
diff --git a/metadata/md5-cache/app-containers/docker-compose-2.4.1 b/metadata/md5-cache/app-containers/docker-compose-2.4.1
deleted file mode 100644
index 7661bc2e8a06..000000000000
--- a/metadata/md5-cache/app-containers/docker-compose-2.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-lang/go-1.16 app-arch/unzip
-DEFINED_PHASES=compile install postinst prepare test unpack
-DESCRIPTION=Multi-container orchestration for Docker
-EAPI=8
-HOMEPAGE=https://github.com/docker/compose
-INHERIT=bash-completion-r1 go-module
-KEYWORDS=~amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=>=app-containers/docker-cli-20.10.3
-RESTRICT=strip
-SLOT=2
-SRC_URI=https://github.com/docker/compose/archive/v2.4.1.tar.gz -> docker-compose-2.4.1.tar.gz https://dev.gentoo.org/~williamh/dist/docker-compose-2.4.1-deps.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=014af38048504c717856e7349868cbba
diff --git a/metadata/md5-cache/app-containers/grype-0.39.0 b/metadata/md5-cache/app-containers/grype-0.39.0
new file mode 100644
index 000000000000..cb026801c158
--- /dev/null
+++ b/metadata/md5-cache/app-containers/grype-0.39.0
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.16 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=A vulnerability scanner for container images and filesystems
+EAPI=8
+HOMEPAGE=https://www.anchore.com
+INHERIT=go-module
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/anchore/grype/archive/v0.39.0.tar.gz -> grype-0.39.0.tar.gz https://dev.gentoo.org/~williamh/dist/grype-0.39.0-deps.tar.xz
+_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
+_md5_=88727e1e12f2a96bf5bec041fd94f637
diff --git a/metadata/md5-cache/app-containers/lxd-4.0.9-r3 b/metadata/md5-cache/app-containers/lxd-4.0.9-r3
index 552e1bf4b82a..fc0b6c46d426 100644
--- a/metadata/md5-cache/app-containers/lxd-4.0.9-r3
+++ b/metadata/md5-cache/app-containers/lxd-4.0.9-r3
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://linuxcontainers.org/downloads/lxd/lxd-4.0.9.tar.gz verify-sig? ( https://linuxcontainers.org/downloads/lxd/lxd-4.0.9.tar.gz.asc )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	optfeature	d524f291c80f9d21ad80fe978e3ca760	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=83616fbe0a429fc4fca805bb963e8905
+_md5_=e913ef97b67a39fd24bb0fae70a1ed29
diff --git a/metadata/md5-cache/app-containers/lxd-5.0.0 b/metadata/md5-cache/app-containers/lxd-5.0.0
index 06df0a572eb7..b356753cdd2f 100644
--- a/metadata/md5-cache/app-containers/lxd-5.0.0
+++ b/metadata/md5-cache/app-containers/lxd-5.0.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://linuxcontainers.org/lxd/introduction/ https://github.com/lxc/lxd
 INHERIT=bash-completion-r1 go-module linux-info optfeature systemd verify-sig
 IUSE=apparmor ipv6 nls verify-sig verify-sig
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=acct-group/lxd app-arch/xz-utils >=app-containers/lxc-3.0.0[apparmor?,seccomp(+)] dev-db/sqlite:3 dev-libs/dqlite dev-libs/lzo dev-libs/raft[lz4] >=dev-util/xdelta-3.0[lzma(+)] net-dns/dnsmasq[dhcp,ipv6(+)?] sys-libs/libcap virtual/udev net-firewall/ebtables net-firewall/iptables[ipv6(+)?] sys-apps/iproute2[ipv6(+)?] sys-fs/fuse:* sys-fs/lxcfs sys-fs/squashfs-tools[lzma] virtual/acl
+RDEPEND=acct-group/lxd app-arch/xz-utils >=app-containers/lxc-3.0.0[apparmor?,seccomp(+)] dev-db/sqlite:3 dev-libs/dqlite dev-libs/lzo dev-libs/raft[lz4] >=dev-util/xdelta-3.0[lzma(+)] net-dns/dnsmasq[dhcp,ipv6(+)?] sys-libs/libcap virtual/udev net-firewall/ebtables net-firewall/iptables[ipv6(+)?] sys-apps/iproute2[ipv6(+)?] sys-fs/fuse:* >=sys-fs/lxcfs-5.0.0 sys-fs/squashfs-tools[lzma] virtual/acl
 RESTRICT=test strip
 SLOT=0
 SRC_URI=https://linuxcontainers.org/downloads/lxd/lxd-5.0.0.tar.gz verify-sig? ( https://linuxcontainers.org/downloads/lxd/lxd-5.0.0.tar.gz.asc )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	optfeature	d524f291c80f9d21ad80fe978e3ca760	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=6520381d1d6df8e6ef48faa68ae09d38
+_md5_=3c02bfcf8776237e9fe74061d3afb3eb
diff --git a/metadata/md5-cache/app-containers/syft-0.47.0 b/metadata/md5-cache/app-containers/syft-0.47.0
new file mode 100644
index 000000000000..d2167a28a876
--- /dev/null
+++ b/metadata/md5-cache/app-containers/syft-0.47.0
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.16 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=Generate a Software Bill of Materials from container images and filesystems
+EAPI=8
+HOMEPAGE=https://www.anchore.com
+INHERIT=go-module
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/anchore/syft/archive/v0.47.0.tar.gz -> syft-0.47.0.tar.gz https://dev.gentoo.org/~williamh/dist/syft-0.47.0-deps.tar.xz
+_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
+_md5_=3bb6873e8304125a936be7438ed0572a
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 260946da8ba2..5b2898453b0d 100644
Binary files a/metadata/md5-cache/app-crypt/Manifest.gz and b/metadata/md5-cache/app-crypt/Manifest.gz differ
diff --git a/metadata/md5-cache/app-crypt/gnupg-2.2.35 b/metadata/md5-cache/app-crypt/gnupg-2.2.35
index 0e93f2bc89e9..ec37ff9f9ab1 100644
--- a/metadata/md5-cache/app-crypt/gnupg-2.2.35
+++ b/metadata/md5-cache/app-crypt/gnupg-2.2.35
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gnupg.org/
 INHERIT=flag-o-matic systemd toolchain-funcs verify-sig
 IUSE=bzip2 doc ldap nls readline selinux +smartcard ssl test tofu tools usb user-socket wks-server verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.8.0:= >=dev-libs/libgpg-error-1.29 >=dev-libs/libksba-1.3.5 >=dev-libs/npth-1.2 >=net-misc/curl-7.10 sys-libs/zlib bzip2? ( app-arch/bzip2 ) ldap? ( net-nds/openldap:= ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:1 ) ) ssl? ( >=net-libs/gnutls-3.0:0= ) tofu? ( >=dev-db/sqlite-3.7 ) app-crypt/pinentry nls? ( virtual/libintl ) selinux? ( sec-policy/selinux-gpg ) wks-server? ( virtual/mta )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnupg/gnupg/gnupg-2.2.35.tar.bz2 verify-sig? ( mirror://gnupg/gnupg/gnupg-2.2.35.tar.bz2.sig )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=779074458e8ccce608e34a548467485d
+_md5_=51286c4f59238451c2f68ec9d452c02d
diff --git a/metadata/md5-cache/app-crypt/gpgme-1.17.1-r1 b/metadata/md5-cache/app-crypt/gpgme-1.17.1-r1
index 23932adb6aa9..783c554bd924 100644
--- a/metadata/md5-cache/app-crypt/gpgme-1.17.1-r1
+++ b/metadata/md5-cache/app-crypt/gpgme-1.17.1-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=http://www.gnupg.org/related_software/gpgme
 INHERIT=distutils-r1 libtool flag-o-matic qmake-utils toolchain-funcs verify-sig
 IUSE=common-lisp static-libs +cxx python qt5 test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 verify-sig
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=app-crypt/gnupg-2 >=dev-libs/libassuan-2.5.3:= >=dev-libs/libgpg-error-1.36:= python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) qt5? ( dev-qt/qtcore:5 )
 REQUIRED_USE=qt5? ( cxx ) python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=1/11.6.15
 SRC_URI=mirror://gnupg/gpgme/gpgme-1.17.1.tar.bz2 verify-sig? ( mirror://gnupg/gpgme/gpgme-1.17.1.tar.bz2.sig )
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=6c8cb15c22d91a54c958b1bffa65194b
+_md5_=8baa50d69e49f4feaba5e6921dd810a1
diff --git a/metadata/md5-cache/app-crypt/libsecret-0.20.5-r3 b/metadata/md5-cache/app-crypt/libsecret-0.20.5-r3
index ddfe1522b8fb..474b26e32e06 100644
--- a/metadata/md5-cache/app-crypt/libsecret-0.20.5-r3
+++ b/metadata/md5-cache/app-crypt/libsecret-0.20.5-r3
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libsecret/0.20/libsecret-0.20.5.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=8efebf4b50512edb0e551b1eff5176ba
+_md5_=76c9dc2927c21f2673644330e931323a
diff --git a/metadata/md5-cache/app-crypt/p11-kit-0.23.22 b/metadata/md5-cache/app-crypt/p11-kit-0.23.22
index fce59c79d426..4a91f823ddf7 100644
--- a/metadata/md5-cache/app-crypt/p11-kit-0.23.22
+++ b/metadata/md5-cache/app-crypt/p11-kit-0.23.22
@@ -13,4 +13,4 @@ REQUIRED_USE=trust? ( asn1 )
 SLOT=0
 SRC_URI=https://github.com/p11-glue/p11-kit/releases/download/0.23.22/p11-kit-0.23.22.tar.xz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=fc4a615ec446b2380b4e957e0a0243d0
+_md5_=16be71badeaf6afb28012c239d5508e4
diff --git a/metadata/md5-cache/app-crypt/p11-kit-0.24.1 b/metadata/md5-cache/app-crypt/p11-kit-0.24.1
index ca2473c0d43e..5afacd3734c4 100644
--- a/metadata/md5-cache/app-crypt/p11-kit-0.24.1
+++ b/metadata/md5-cache/app-crypt/p11-kit-0.24.1
@@ -13,4 +13,4 @@ REQUIRED_USE=trust? ( asn1 )
 SLOT=0
 SRC_URI=https://github.com/p11-glue/p11-kit/releases/download/0.24.1/p11-kit-0.24.1.tar.xz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=6bec408f92f23cdcb8b554714083b795
+_md5_=cf942c256db700544306e7806d769a72
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 3592c0f0b808..962c3f3c955c 100644
Binary files a/metadata/md5-cache/app-editors/Manifest.gz and b/metadata/md5-cache/app-editors/Manifest.gz differ
diff --git a/metadata/md5-cache/app-editors/featherpad-1.2.0 b/metadata/md5-cache/app-editors/featherpad-1.2.0
new file mode 100644
index 000000000000..1708dc336d1b
--- /dev/null
+++ b/metadata/md5-cache/app-editors/featherpad-1.2.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-qt/linguist-tools:5 dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=app-text/hunspell:= >=dev-qt/qtcore-5.15.0 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 )
+DESCRIPTION=Lightweight Qt5 Plain-Text Editor for Linux
+EAPI=8
+HOMEPAGE=https://github.com/tsujan/FeatherPad
+INHERIT=xdg cmake
+IUSE=+X
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=GPL-3+
+RDEPEND=app-text/hunspell:= >=dev-qt/qtcore-5.15.0 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 )
+SLOT=0
+SRC_URI=https://github.com/tsujan/FeatherPad/archive/V1.2.0.tar.gz -> featherpad-1.2.0.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=f827fd70549de23dc22dd2e0144725e3
diff --git a/metadata/md5-cache/app-editors/ghex-42.3 b/metadata/md5-cache/app-editors/ghex-42.3
new file mode 100644
index 000000000000..7907ee5c9ff3
--- /dev/null
+++ b/metadata/md5-cache/app-editors/ghex-42.3
@@ -0,0 +1,16 @@
+BDEPEND=gtk-doc? ( dev-util/gi-docgen ) test? ( dev-util/desktop-file-utils dev-libs/appstream-glib ) dev-util/gtk-update-icon-cache dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst test
+DEPEND=>=dev-libs/glib-2.66.0:2 >=gui-libs/gtk-4.0.0:4 dev-libs/gobject-introspection !app-editors/ghex:2
+DESCRIPTION=GNOME hexadecimal editor
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Ghex
+INHERIT=gnome.org gnome2-utils meson xdg
+IUSE=gtk-doc test
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2+ FDL-1.1+
+RDEPEND=>=dev-libs/glib-2.66.0:2 >=gui-libs/gtk-4.0.0:4 dev-libs/gobject-introspection !app-editors/ghex:2
+RESTRICT=!test? ( test )
+SLOT=4
+SRC_URI=mirror://gnome/sources/ghex/42/ghex-42.3.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=bfb602a58147f57a07ff979ccba5325b
diff --git a/metadata/md5-cache/app-editors/gnome-text-editor-42.2 b/metadata/md5-cache/app-editors/gnome-text-editor-42.2
new file mode 100644
index 000000000000..ddc7b1e0a9ab
--- /dev/null
+++ b/metadata/md5-cache/app-editors/gnome-text-editor-42.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/glib-utils dev-util/itstool >=sys-devel/gettext-0.21 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst test
+DEPEND=>=dev-libs/glib-2.69:2 >=gui-libs/gtk-4.6:4 >=gui-libs/gtksourceview-5.4.1:5 gui-libs/libadwaita:1 dev-libs/libpcre spell? ( >=app-text/enchant-2.2.0:2 dev-libs/icu:= )
+DESCRIPTION=A simple text editor for the GNOME desktop
+EAPI=8
+HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-text-editor
+INHERIT=gnome.org gnome2-utils meson xdg
+IUSE=spell
+KEYWORDS=~amd64
+LICENSE=GPL-3+ CC-BY-SA-3.0
+RDEPEND=>=dev-libs/glib-2.69:2 >=gui-libs/gtk-4.6:4 >=gui-libs/gtksourceview-5.4.1:5 gui-libs/libadwaita:1 dev-libs/libpcre spell? ( >=app-text/enchant-2.2.0:2 dev-libs/icu:= ) gnome-base/gsettings-desktop-schemas
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-text-editor/42/gnome-text-editor-42.2.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=3897aaf510178de247da4bee87e813f9
diff --git a/metadata/md5-cache/app-editors/mg-20210609-r1 b/metadata/md5-cache/app-editors/mg-20220614
similarity index 59%
rename from metadata/md5-cache/app-editors/mg-20210609-r1
rename to metadata/md5-cache/app-editors/mg-20220614
index 85f5b72e8a7f..6dc0198fa4b8 100644
--- a/metadata/md5-cache/app-editors/mg-20210609-r1
+++ b/metadata/md5-cache/app-editors/mg-20220614
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile install postinst prepare
 DEPEND=sys-libs/ncurses:0= >=dev-libs/libbsd-0.7.0
 DESCRIPTION=MicroGnuEmacs, a port from the BSDs
 EAPI=8
-HOMEPAGE=https://homepage.boetes.org/software/mg/ https://github.com/hboetes/mg
+HOMEPAGE=https://github.com/hboetes/mg
 INHERIT=toolchain-funcs
 IUSE=livecd
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ppc ~ppc64 ~riscv sparc x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=public-domain
 RDEPEND=sys-libs/ncurses:0= >=dev-libs/libbsd-0.7.0
 SLOT=0
-SRC_URI=https://github.com/hboetes/mg/archive/20210609.tar.gz -> mg-20210609.tar.gz
+SRC_URI=https://github.com/hboetes/mg/archive/20220614.tar.gz -> mg-20220614.tar.gz
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=a5d8be5ad04d5c6c5f023f3e39c87ff4
+_md5_=0af06f10b91a5fb3a87a29701e0110c4
diff --git a/metadata/md5-cache/app-editors/nano-5.9 b/metadata/md5-cache/app-editors/nano-5.9
deleted file mode 100644
index 7978dd1c97f1..000000000000
--- a/metadata/md5-cache/app-editors/nano-5.9
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext ) virtual/pkgconfig
-DEFINED_PHASES=configure install prepare
-DEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] sys-libs/ncurses:= magic? ( sys-apps/file ) nls? ( virtual/libintl ) ) static? ( >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] sys-libs/ncurses:=[static-libs(+)] magic? ( sys-apps/file[static-libs(+)] ) nls? ( virtual/libintl ) )
-DESCRIPTION=GNU GPL'd Pico clone with more functionality
-EAPI=8
-HOMEPAGE=https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide
-INHERIT=flag-o-matic
-IUSE=debug justify magic minimal ncurses nls +spell +split-usr static unicode
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] sys-libs/ncurses:= magic? ( sys-apps/file ) nls? ( virtual/libintl ) )
-REQUIRED_USE=magic? ( !minimal )
-SLOT=0
-SRC_URI=https://www.nano-editor.org/dist/v5/nano-5.9.tar.gz
-_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=1dd7679362ee1cc6e5a9376fa55a9644
diff --git a/metadata/md5-cache/app-editors/qhexedit2-0.8.6_p20190316-r2 b/metadata/md5-cache/app-editors/qhexedit2-0.8.6_p20190316-r2
index 41ddea9cd285..81ba7caae122 100644
--- a/metadata/md5-cache/app-editors/qhexedit2-0.8.6_p20190316-r2
+++ b/metadata/md5-cache/app-editors/qhexedit2-0.8.6_p20190316-r2
@@ -13,4 +13,4 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 py
 SLOT=0
 SRC_URI=https://github.com/lancos/qhexedit2/archive/ba5af8616b3a6c916e718914225a483267c01356.tar.gz -> qhexedit2-0.8.6_p20190316.tar.gz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=d5e677f3817ca30ab58151f5e07a263d
+_md5_=1a9c633af8815ee2ac271f633c410ef8
diff --git a/metadata/md5-cache/app-editors/qhexedit2-0.8.9_p20210525-r2 b/metadata/md5-cache/app-editors/qhexedit2-0.8.9_p20210525-r2
index 54b2e5ab53e7..35c61493eac6 100644
--- a/metadata/md5-cache/app-editors/qhexedit2-0.8.9_p20210525-r2
+++ b/metadata/md5-cache/app-editors/qhexedit2-0.8.9_p20210525-r2
@@ -13,4 +13,4 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 py
 SLOT=0
 SRC_URI=https://github.com/Simsys/qhexedit2/archive/541139125be034b90b6811a84faa1413e357fd94.tar.gz -> qhexedit2-0.8.9_p20210525.tar.gz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ea397b7c3a3d0da30239cb801a402b79
+_md5_=90b21a50dddc797871d4a20dcaeb2eba
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index e0fad70cfcc5..132450988832 100644
Binary files a/metadata/md5-cache/app-emacs/Manifest.gz and b/metadata/md5-cache/app-emacs/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emacs/auctex-11.92 b/metadata/md5-cache/app-emacs/auctex-11.92
deleted file mode 100644
index 1cc9f755b86c..000000000000
--- a/metadata/md5-cache/app-emacs/auctex-11.92
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=virtual/latex-base preview-latex? ( app-text/dvipng app-text/ghostscript-gpl ) >=app-editors/emacs-23.1:*
-DESCRIPTION=Extensible package for writing and formatting TeX files in Emacs
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/auctex/
-IUSE=preview-latex
-KEYWORDS=amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
-LICENSE=GPL-3+ FDL-1.3+
-RDEPEND=virtual/latex-base preview-latex? ( app-text/dvipng app-text/ghostscript-gpl ) >=app-editors/emacs-23.1:*
-SLOT=0
-SRC_URI=mirror://gnu/auctex/auctex-11.92.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145
-_md5_=c92ca17c6883f54492f4f93aa05f924b
diff --git a/metadata/md5-cache/app-emacs/auctex-12.2 b/metadata/md5-cache/app-emacs/auctex-12.2
deleted file mode 100644
index 98cb17ff1588..000000000000
--- a/metadata/md5-cache/app-emacs/auctex-12.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/latex-base preview-latex? ( app-text/dvipng app-text/ghostscript-gpl ) >=app-editors/emacs-24:*
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DESCRIPTION=Extensible package for writing and formatting TeX files in Emacs
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/auctex/
-IUSE=preview-latex
-KEYWORDS=amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
-LICENSE=GPL-3+ FDL-1.3+
-RDEPEND=virtual/latex-base preview-latex? ( app-text/dvipng app-text/ghostscript-gpl ) >=app-editors/emacs-24:*
-SLOT=0
-SRC_URI=mirror://gnu/auctex/auctex-12.2.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145
-_md5_=3817cba598317249bc4d3e472ee31a78
diff --git a/metadata/md5-cache/app-emacs/auctex-13.1 b/metadata/md5-cache/app-emacs/auctex-13.1
index 0e271fb86aa1..8e9c7a70ce4d 100644
--- a/metadata/md5-cache/app-emacs/auctex-13.1
+++ b/metadata/md5-cache/app-emacs/auctex-13.1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://www.gnu.org/software/auctex/
 INHERIT=elisp
 IUSE=preview-latex
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+KEYWORDS=amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=GPL-3+ FDL-1.3+
 RDEPEND=virtual/latex-base preview-latex? ( app-text/dvipng app-text/ghostscript-gpl ) >=app-editors/emacs-25.1:*
 SLOT=0
 SRC_URI=mirror://gnu/auctex/auctex-13.1.tar.gz
 _eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145
-_md5_=30e634b324c4f1d374df6d03892f2b87
+_md5_=0c2484302b6ef2f174b6a870d8b8ee25
diff --git a/metadata/md5-cache/app-emacs/csv-mode-1.20 b/metadata/md5-cache/app-emacs/csv-mode-1.20
index 4dc4e663eb9f..f88d942a58db 100644
--- a/metadata/md5-cache/app-emacs/csv-mode-1.20
+++ b/metadata/md5-cache/app-emacs/csv-mode-1.20
@@ -4,10 +4,10 @@ DESCRIPTION=A major mode for editing comma-separated value files
 EAPI=8
 HOMEPAGE=https://elpa.gnu.org/packages/csv-mode.html https://www.emacswiki.org/emacs/CsvMode
 INHERIT=elisp
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~ppc sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/csv-mode-1.20.el.xz
 _eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145
-_md5_=58da185421f32eaab271c340a726befe
+_md5_=cafb19e875b7e97f2914867338ee362d
diff --git a/metadata/md5-cache/app-emacs/helm-3.8.0 b/metadata/md5-cache/app-emacs/helm-3.8.0
deleted file mode 100644
index 7e95a5b99608..000000000000
--- a/metadata/md5-cache/app-emacs/helm-3.8.0
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-emacs/async app-emacs/popup >=app-editors/emacs-23.1:*
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DESCRIPTION=Emacs incremental completion and selection narrowing framework
-EAPI=8
-HOMEPAGE=https://emacs-helm.github.io/helm/
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+
-RDEPEND=app-emacs/async app-emacs/popup >=app-editors/emacs-23.1:*
-SLOT=0
-SRC_URI=https://github.com/emacs-helm/helm/archive/v3.8.0.tar.gz -> helm-3.8.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145
-_md5_=72d5b08bd62e60c2d24e35002fa7d5fb
diff --git a/metadata/md5-cache/app-emacs/helm-3.8.5 b/metadata/md5-cache/app-emacs/helm-3.8.5
index 87e8b84a9c50..ee424141c53f 100644
--- a/metadata/md5-cache/app-emacs/helm-3.8.5
+++ b/metadata/md5-cache/app-emacs/helm-3.8.5
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Emacs incremental completion and selection narrowing framework
 EAPI=8
 HOMEPAGE=https://emacs-helm.github.io/helm/
-KEYWORDS=~amd64 ~x86
+INHERIT=elisp
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=app-emacs/async app-emacs/popup >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/emacs-helm/helm/archive/v3.8.5.tar.gz -> helm-3.8.5.tar.gz
 _eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145
-_md5_=d1feeb3869134df7a6a493c04deda264
+_md5_=95075992688a41a1d16a800f1b1ebe68
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 006dd8a16572..c3114c735802 100644
Binary files a/metadata/md5-cache/app-emulation/Manifest.gz and b/metadata/md5-cache/app-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emulation/ruffle-0_p20220614 b/metadata/md5-cache/app-emulation/ruffle-0_p20220614
new file mode 100644
index 000000000000..ea6e73125ef4
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/ruffle-0_p20220614
@@ -0,0 +1,15 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta1-r1:3.11[xml(+)] >=dev-lang/python-3.10.0_p1-r1:3.10[xml(+)] >=dev-lang/python-3.9.9-r1:3.9[xml(+)] >=dev-lang/python-3.8.12_p1-r1:3.8[xml(+)] ) virtual/pkgconfig >=virtual/rust-1.61 >=virtual/rust-1.53
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/glib:2 dev-libs/openssl:= media-libs/alsa-lib sys-libs/zlib:= x11-libs/gtk+:3 x11-libs/libxcb:=
+DESCRIPTION=Flash Player emulator written in Rust
+EAPI=8
+HOMEPAGE=https://ruffle.rs/
+INHERIT=cargo desktop flag-o-matic python-any-r1 xdg
+IUSE=debug
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT MPL-2.0 ZLIB curl
+RDEPEND=dev-libs/glib:2 dev-libs/openssl:= media-libs/alsa-lib sys-libs/zlib:= x11-libs/gtk+:3 x11-libs/libxcb:=
+SLOT=0
+SRC_URI=https://github.com/ruffle-rs/ruffle/archive/refs/tags/nightly-2022-06-14.tar.gz -> ruffle-nightly-2022-06-14.tar.gz https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/adler32/1.2.0/download -> adler32-1.2.0.crate https://crates.io/api/v1/crates/ahash/0.7.6/download -> ahash-0.7.6.crate https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/alsa/0.6.0/download -> alsa-0.6.0.crate https://crates.io/api/v1/crates/alsa-sys/0.3.1/download -> alsa-sys-0.3.1.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/approx/0.5.1/download -> approx-0.5.1.crate https://crates.io/api/v1/crates/arrayvec/0.5.2/download -> arrayvec-0.5.2.crate https://crates.io/api/v1/crates/arrayvec/0.7.2/download -> arrayvec-0.7.2.crate https://crates.io/api/v1/crates/ash/0.34.0+1.2.203/download -> ash-0.34.0+1.2.203.crate https://crates.io/api/v1/crates/async-channel/1.6.1/download -> async-channel-1.6.1.crate https://crates.io/api/v1/crates/atk-sys/0.15.1/download -> atk-sys-0.15.1.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bindgen/0.56.0/download -> bindgen-0.56.0.crate https://crates.io/api/v1/crates/bit-set/0.5.2/download -> bit-set-0.5.2.crate https://crates.io/api/v1/crates/bit-vec/0.6.3/download -> bit-vec-0.6.3.crate https://crates.io/api/v1/crates/bit_field/0.10.1/download -> bit_field-0.10.1.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/bitflags_serde_shim/0.2.2/download -> bitflags_serde_shim-0.2.2.crate https://crates.io/api/v1/crates/bitstream-io/1.5.0/download -> bitstream-io-1.5.0.crate https://crates.io/api/v1/crates/bitvec/0.19.6/download -> bitvec-0.19.6.crate https://crates.io/api/v1/crates/block/0.1.6/download -> block-0.1.6.crate https://crates.io/api/v1/crates/block-buffer/0.10.2/download -> block-buffer-0.10.2.crate https://crates.io/api/v1/crates/bstr/0.2.17/download -> bstr-0.2.17.crate https://crates.io/api/v1/crates/build_const/0.2.2/download -> build_const-0.2.2.crate https://crates.io/api/v1/crates/bumpalo/3.9.1/download -> bumpalo-3.9.1.crate https://crates.io/api/v1/crates/bytemuck/1.9.1/download -> bytemuck-1.9.1.crate https://crates.io/api/v1/crates/bytemuck_derive/1.1.0/download -> bytemuck_derive-1.1.0.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/bytes/1.1.0/download -> bytes-1.1.0.crate https://crates.io/api/v1/crates/cache-padded/1.2.0/download -> cache-padded-1.2.0.crate https://crates.io/api/v1/crates/cairo-sys-rs/0.15.1/download -> cairo-sys-rs-0.15.1.crate https://crates.io/api/v1/crates/calloop/0.9.3/download -> calloop-0.9.3.crate https://crates.io/api/v1/crates/castaway/0.1.2/download -> castaway-0.1.2.crate https://crates.io/api/v1/crates/cc/1.0.73/download -> cc-1.0.73.crate https://crates.io/api/v1/crates/cesu8/1.1.0/download -> cesu8-1.1.0.crate https://crates.io/api/v1/crates/cexpr/0.4.0/download -> cexpr-0.4.0.crate https://crates.io/api/v1/crates/cfg-expr/0.10.2/download -> cfg-expr-0.10.2.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/cfg_aliases/0.1.1/download -> cfg_aliases-0.1.1.crate https://crates.io/api/v1/crates/chrono/0.4.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/clang-sys/1.3.1/download -> clang-sys-1.3.1.crate https://crates.io/api/v1/crates/clap/3.1.18/download -> clap-3.1.18.crate https://crates.io/api/v1/crates/clap_derive/3.1.18/download -> clap_derive-3.1.18.crate https://crates.io/api/v1/crates/clap_lex/0.2.0/download -> clap_lex-0.2.0.crate https://crates.io/api/v1/crates/clipboard/0.5.0/download -> clipboard-0.5.0.crate https://crates.io/api/v1/crates/clipboard-win/2.2.0/download -> clipboard-win-2.2.0.crate https://crates.io/api/v1/crates/cocoa/0.24.0/download -> cocoa-0.24.0.crate https://crates.io/api/v1/crates/cocoa-foundation/0.1.0/download -> cocoa-foundation-0.1.0.crate https://crates.io/api/v1/crates/codespan-reporting/0.11.1/download -> codespan-reporting-0.11.1.crate https://crates.io/api/v1/crates/color_quant/1.1.0/download -> color_quant-1.1.0.crate https://crates.io/api/v1/crates/combine/4.6.3/download -> combine-4.6.3.crate https://crates.io/api/v1/crates/concurrent-queue/1.2.2/download -> concurrent-queue-1.2.2.crate https://crates.io/api/v1/crates/console/0.15.0/download -> console-0.15.0.crate https://crates.io/api/v1/crates/console_error_panic_hook/0.1.7/download -> console_error_panic_hook-0.1.7.crate https://crates.io/api/v1/crates/console_log/0.2.0/download -> console_log-0.2.0.crate https://crates.io/api/v1/crates/cookie-factory/0.3.2/download -> cookie-factory-0.3.2.crate https://crates.io/api/v1/crates/copyless/0.1.5/download -> copyless-0.1.5.crate https://crates.io/api/v1/crates/core-foundation/0.7.0/download -> core-foundation-0.7.0.crate https://crates.io/api/v1/crates/core-foundation/0.9.3/download -> core-foundation-0.9.3.crate https://crates.io/api/v1/crates/core-foundation-sys/0.7.0/download -> core-foundation-sys-0.7.0.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/core-graphics/0.19.2/download -> core-graphics-0.19.2.crate https://crates.io/api/v1/crates/core-graphics/0.22.3/download -> core-graphics-0.22.3.crate https://crates.io/api/v1/crates/core-graphics-types/0.1.1/download -> core-graphics-types-0.1.1.crate https://crates.io/api/v1/crates/core-video-sys/0.1.4/download -> core-video-sys-0.1.4.crate https://crates.io/api/v1/crates/coreaudio-rs/0.10.0/download -> coreaudio-rs-0.10.0.crate https://crates.io/api/v1/crates/coreaudio-sys/0.2.9/download -> coreaudio-sys-0.2.9.crate https://crates.io/api/v1/crates/cpal/0.13.5/download -> cpal-0.13.5.crate https://crates.io/api/v1/crates/cpufeatures/0.2.1/download -> cpufeatures-0.2.1.crate https://crates.io/api/v1/crates/crc/1.8.1/download -> crc-1.8.1.crate https://crates.io/api/v1/crates/crc32fast/1.3.2/download -> crc32fast-1.3.2.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.4/download -> crossbeam-channel-0.5.4.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.1/download -> crossbeam-deque-0.8.1.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.8/download -> crossbeam-epoch-0.9.8.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.8/download -> crossbeam-utils-0.8.8.crate https://crates.io/api/v1/crates/crypto-common/0.1.3/download -> crypto-common-0.1.3.crate https://crates.io/api/v1/crates/csv/1.1.6/download -> csv-1.1.6.crate https://crates.io/api/v1/crates/csv-core/0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/ctor/0.1.21/download -> ctor-0.1.21.crate https://crates.io/api/v1/crates/cty/0.2.2/download -> cty-0.2.2.crate https://crates.io/api/v1/crates/curl/0.4.43/download -> curl-0.4.43.crate https://crates.io/api/v1/crates/curl-sys/0.4.55+curl-7.83.1/download -> curl-sys-0.4.55+curl-7.83.1.crate https://crates.io/api/v1/crates/d3d12/0.4.1/download -> d3d12-0.4.1.crate https://crates.io/api/v1/crates/darling/0.13.1/download -> darling-0.13.1.crate https://crates.io/api/v1/crates/darling_core/0.13.1/download -> darling_core-0.13.1.crate https://crates.io/api/v1/crates/darling_macro/0.13.1/download -> darling_macro-0.13.1.crate https://crates.io/api/v1/crates/deflate/1.0.0/download -> deflate-1.0.0.crate https://crates.io/api/v1/crates/derive-try-from-primitive/1.0.0/download -> derive-try-from-primitive-1.0.0.crate https://crates.io/api/v1/crates/diff/0.1.12/download -> diff-0.1.12.crate https://crates.io/api/v1/crates/digest/0.10.3/download -> digest-0.10.3.crate https://crates.io/api/v1/crates/dirs/4.0.0/download -> dirs-4.0.0.crate https://crates.io/api/v1/crates/dirs-sys/0.3.6/download -> dirs-sys-0.3.6.crate https://crates.io/api/v1/crates/dispatch/0.2.0/download -> dispatch-0.2.0.crate https://crates.io/api/v1/crates/dlib/0.5.0/download -> dlib-0.5.0.crate https://crates.io/api/v1/crates/downcast-rs/1.2.0/download -> downcast-rs-1.2.0.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/embed-resource/1.7.2/download -> embed-resource-1.7.2.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/encoding_rs/0.8.31/download -> encoding_rs-0.8.31.crate https://crates.io/api/v1/crates/enum-map/2.3.0/download -> enum-map-2.3.0.crate https://crates.io/api/v1/crates/enum-map-derive/0.9.0/download -> enum-map-derive-0.9.0.crate https://crates.io/api/v1/crates/enumset/1.0.8/download -> enumset-1.0.8.crate https://crates.io/api/v1/crates/enumset_derive/0.5.5/download -> enumset_derive-0.5.5.crate https://crates.io/api/v1/crates/env_logger/0.9.0/download -> env_logger-0.9.0.crate https://crates.io/api/v1/crates/euclid/0.22.6/download -> euclid-0.22.6.crate https://crates.io/api/v1/crates/event-listener/2.5.2/download -> event-listener-2.5.2.crate https://crates.io/api/v1/crates/exr/1.4.2/download -> exr-1.4.2.crate https://crates.io/api/v1/crates/fastrand/1.7.0/download -> fastrand-1.7.0.crate https://crates.io/api/v1/crates/flate2/1.0.24/download -> flate2-1.0.24.crate https://crates.io/api/v1/crates/float_next_after/0.1.5/download -> float_next_after-0.1.5.crate https://crates.io/api/v1/crates/flume/0.10.12/download -> flume-0.10.12.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/funty/1.1.0/download -> funty-1.1.0.crate https://crates.io/api/v1/crates/futures/0.3.21/download -> futures-0.3.21.crate https://crates.io/api/v1/crates/futures-channel/0.3.21/download -> futures-channel-0.3.21.crate https://crates.io/api/v1/crates/futures-core/0.3.21/download -> futures-core-0.3.21.crate https://crates.io/api/v1/crates/futures-executor/0.3.21/download -> futures-executor-0.3.21.crate https://crates.io/api/v1/crates/futures-io/0.3.21/download -> futures-io-0.3.21.crate https://crates.io/api/v1/crates/futures-lite/1.12.0/download -> futures-lite-1.12.0.crate https://crates.io/api/v1/crates/futures-macro/0.3.21/download -> futures-macro-0.3.21.crate https://crates.io/api/v1/crates/futures-sink/0.3.21/download -> futures-sink-0.3.21.crate https://crates.io/api/v1/crates/futures-task/0.3.21/download -> futures-task-0.3.21.crate https://crates.io/api/v1/crates/futures-util/0.3.21/download -> futures-util-0.3.21.crate https://crates.io/api/v1/crates/fxhash/0.2.1/download -> fxhash-0.2.1.crate https://crates.io/api/v1/crates/gdk-pixbuf-sys/0.15.1/download -> gdk-pixbuf-sys-0.15.1.crate https://crates.io/api/v1/crates/gdk-sys/0.15.1/download -> gdk-sys-0.15.1.crate https://crates.io/api/v1/crates/generational-arena/0.2.8/download -> generational-arena-0.2.8.crate https://crates.io/api/v1/crates/generic-array/0.14.5/download -> generic-array-0.14.5.crate https://crates.io/api/v1/crates/getrandom/0.2.6/download -> getrandom-0.2.6.crate https://crates.io/api/v1/crates/gif/0.11.3/download -> gif-0.11.3.crate https://crates.io/api/v1/crates/gio-sys/0.15.7/download -> gio-sys-0.15.7.crate https://crates.io/api/v1/crates/glib-sys/0.15.7/download -> glib-sys-0.15.7.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/glow/0.11.2/download -> glow-0.11.2.crate https://crates.io/api/v1/crates/gobject-sys/0.15.9/download -> gobject-sys-0.15.9.crate https://crates.io/api/v1/crates/gpu-alloc/0.5.3/download -> gpu-alloc-0.5.3.crate https://crates.io/api/v1/crates/gpu-alloc-types/0.2.0/download -> gpu-alloc-types-0.2.0.crate https://crates.io/api/v1/crates/gpu-descriptor/0.2.2/download -> gpu-descriptor-0.2.2.crate https://crates.io/api/v1/crates/gpu-descriptor-types/0.1.1/download -> gpu-descriptor-types-0.1.1.crate https://crates.io/api/v1/crates/gtk-sys/0.15.3/download -> gtk-sys-0.15.3.crate https://crates.io/api/v1/crates/half/1.8.2/download -> half-1.8.2.crate https://crates.io/api/v1/crates/hashbrown/0.11.2/download -> hashbrown-0.11.2.crate https://crates.io/api/v1/crates/hashbrown/0.9.1/download -> hashbrown-0.9.1.crate https://crates.io/api/v1/crates/heck/0.4.0/download -> heck-0.4.0.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/hexf-parse/0.2.1/download -> hexf-parse-0.2.1.crate https://crates.io/api/v1/crates/http/0.2.6/download -> http-0.2.6.crate https://crates.io/api/v1/crates/humantime/2.1.0/download -> humantime-2.1.0.crate https://crates.io/api/v1/crates/ident_case/1.0.1/download -> ident_case-1.0.1.crate https://crates.io/api/v1/crates/idna/0.2.3/download -> idna-0.2.3.crate https://crates.io/api/v1/crates/image/0.24.2/download -> image-0.24.2.crate https://crates.io/api/v1/crates/indexmap/1.6.2/download -> indexmap-1.6.2.crate https://crates.io/api/v1/crates/indicatif/0.16.2/download -> indicatif-0.16.2.crate https://crates.io/api/v1/crates/inflate/0.4.5/download -> inflate-0.4.5.crate https://crates.io/api/v1/crates/inplace_it/0.3.3/download -> inplace_it-0.3.3.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/isahc/1.7.2/download -> isahc-1.7.2.crate https://crates.io/api/v1/crates/itoa/0.4.8/download -> itoa-0.4.8.crate https://crates.io/api/v1/crates/itoa/1.0.1/download -> itoa-1.0.1.crate https://crates.io/api/v1/crates/jni/0.19.0/download -> jni-0.19.0.crate https://crates.io/api/v1/crates/jni-sys/0.3.0/download -> jni-sys-0.3.0.crate https://crates.io/api/v1/crates/jobserver/0.1.24/download -> jobserver-0.1.24.crate https://crates.io/api/v1/crates/jpeg-decoder/0.1.22/download -> jpeg-decoder-0.1.22.crate https://crates.io/api/v1/crates/jpeg-decoder/0.2.6/download -> jpeg-decoder-0.2.6.crate https://crates.io/api/v1/crates/js-sys/0.3.57/download -> js-sys-0.3.57.crate https://crates.io/api/v1/crates/khronos-egl/4.1.0/download -> khronos-egl-4.1.0.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/lebe/0.5.1/download -> lebe-0.5.1.crate https://crates.io/api/v1/crates/lexical-core/0.7.6/download -> lexical-core-0.7.6.crate https://crates.io/api/v1/crates/libc/0.2.120/download -> libc-0.2.120.crate https://crates.io/api/v1/crates/libflate/1.2.0/download -> libflate-1.2.0.crate https://crates.io/api/v1/crates/libflate_lz77/1.1.0/download -> libflate_lz77-1.1.0.crate https://crates.io/api/v1/crates/libloading/0.7.3/download -> libloading-0.7.3.crate https://crates.io/api/v1/crates/libnghttp2-sys/0.1.7+1.45.0/download -> libnghttp2-sys-0.1.7+1.45.0.crate https://crates.io/api/v1/crates/libz-sys/1.1.5/download -> libz-sys-1.1.5.crate https://crates.io/api/v1/crates/lock_api/0.4.6/download -> lock_api-0.4.6.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/lyon/0.17.10/download -> lyon-0.17.10.crate https://crates.io/api/v1/crates/lyon_algorithms/0.17.7/download -> lyon_algorithms-0.17.7.crate https://crates.io/api/v1/crates/lyon_geom/0.17.6/download -> lyon_geom-0.17.6.crate https://crates.io/api/v1/crates/lyon_path/0.17.7/download -> lyon_path-0.17.7.crate https://crates.io/api/v1/crates/lyon_tessellation/0.17.10/download -> lyon_tessellation-0.17.10.crate https://crates.io/api/v1/crates/lzma-rs/0.2.0/download -> lzma-rs-0.2.0.crate https://crates.io/api/v1/crates/mach/0.3.2/download -> mach-0.3.2.crate https://crates.io/api/v1/crates/malloc_buf/0.0.6/download -> malloc_buf-0.0.6.crate https://crates.io/api/v1/crates/matches/0.1.9/download -> matches-0.1.9.crate https://crates.io/api/v1/crates/memchr/2.4.1/download -> memchr-2.4.1.crate https://crates.io/api/v1/crates/memmap2/0.3.1/download -> memmap2-0.3.1.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/metal/0.23.1/download -> metal-0.23.1.crate https://crates.io/api/v1/crates/mime/0.3.16/download -> mime-0.3.16.crate https://crates.io/api/v1/crates/minimal-lexical/0.2.1/download -> minimal-lexical-0.2.1.crate https://crates.io/api/v1/crates/minimp3/0.5.1/download -> minimp3-0.5.1.crate https://crates.io/api/v1/crates/minimp3-sys/0.3.2/download -> minimp3-sys-0.3.2.crate https://crates.io/api/v1/crates/miniz_oxide/0.5.1/download -> miniz_oxide-0.5.1.crate https://crates.io/api/v1/crates/mio/0.8.1/download -> mio-0.8.1.crate https://crates.io/api/v1/crates/miow/0.3.7/download -> miow-0.3.7.crate https://crates.io/api/v1/crates/naga/0.8.5/download -> naga-0.8.5.crate https://crates.io/api/v1/crates/nanorand/0.7.0/download -> nanorand-0.7.0.crate https://crates.io/api/v1/crates/ndk/0.5.0/download -> ndk-0.5.0.crate https://crates.io/api/v1/crates/ndk/0.6.0/download -> ndk-0.6.0.crate https://crates.io/api/v1/crates/ndk-context/0.1.0/download -> ndk-context-0.1.0.crate https://crates.io/api/v1/crates/ndk-glue/0.5.1/download -> ndk-glue-0.5.1.crate https://crates.io/api/v1/crates/ndk-glue/0.6.1/download -> ndk-glue-0.6.1.crate https://crates.io/api/v1/crates/ndk-macro/0.3.0/download -> ndk-macro-0.3.0.crate https://crates.io/api/v1/crates/ndk-sys/0.2.2/download -> ndk-sys-0.2.2.crate https://crates.io/api/v1/crates/ndk-sys/0.3.0/download -> ndk-sys-0.3.0.crate https://crates.io/api/v1/crates/nix/0.22.3/download -> nix-0.22.3.crate https://crates.io/api/v1/crates/nix/0.23.1/download -> nix-0.23.1.crate https://crates.io/api/v1/crates/nom/5.1.2/download -> nom-5.1.2.crate https://crates.io/api/v1/crates/nom/6.1.2/download -> nom-6.1.2.crate https://crates.io/api/v1/crates/nom/7.1.1/download -> nom-7.1.1.crate https://crates.io/api/v1/crates/ntapi/0.3.7/download -> ntapi-0.3.7.crate https://crates.io/api/v1/crates/num-complex/0.4.0/download -> num-complex-0.4.0.crate https://crates.io/api/v1/crates/num-derive/0.3.3/download -> num-derive-0.3.3.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-iter/0.1.42/download -> num-iter-0.1.42.crate https://crates.io/api/v1/crates/num-rational/0.4.0/download -> num-rational-0.4.0.crate https://crates.io/api/v1/crates/num-traits/0.2.15/download -> num-traits-0.2.15.crate https://crates.io/api/v1/crates/num_cpus/1.13.1/download -> num_cpus-1.13.1.crate https://crates.io/api/v1/crates/num_enum/0.5.7/download -> num_enum-0.5.7.crate https://crates.io/api/v1/crates/num_enum_derive/0.5.7/download -> num_enum_derive-0.5.7.crate https://crates.io/api/v1/crates/number_prefix/0.4.0/download -> number_prefix-0.4.0.crate https://crates.io/api/v1/crates/objc/0.2.7/download -> objc-0.2.7.crate https://crates.io/api/v1/crates/objc-foundation/0.1.1/download -> objc-foundation-0.1.1.crate https://crates.io/api/v1/crates/objc_exception/0.1.2/download -> objc_exception-0.1.2.crate https://crates.io/api/v1/crates/objc_id/0.1.1/download -> objc_id-0.1.1.crate https://crates.io/api/v1/crates/oboe/0.4.5/download -> oboe-0.4.5.crate https://crates.io/api/v1/crates/oboe-sys/0.4.5/download -> oboe-sys-0.4.5.crate https://crates.io/api/v1/crates/once_cell/1.10.0/download -> once_cell-1.10.0.crate https://crates.io/api/v1/crates/openssl-probe/0.1.5/download -> openssl-probe-0.1.5.crate https://crates.io/api/v1/crates/openssl-sys/0.9.72/download -> openssl-sys-0.9.72.crate https://crates.io/api/v1/crates/os_str_bytes/6.0.0/download -> os_str_bytes-6.0.0.crate https://crates.io/api/v1/crates/output_vt100/0.1.3/download -> output_vt100-0.1.3.crate https://crates.io/api/v1/crates/pango-sys/0.15.1/download -> pango-sys-0.15.1.crate https://crates.io/api/v1/crates/parking/2.0.0/download -> parking-2.0.0.crate https://crates.io/api/v1/crates/parking_lot/0.11.2/download -> parking_lot-0.11.2.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.5/download -> parking_lot_core-0.8.5.crate https://crates.io/api/v1/crates/path-slash/0.1.4/download -> path-slash-0.1.4.crate https://crates.io/api/v1/crates/peeking_take_while/0.1.2/download -> peeking_take_while-0.1.2.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pin-project/1.0.10/download -> pin-project-1.0.10.crate https://crates.io/api/v1/crates/pin-project-internal/1.0.10/download -> pin-project-internal-1.0.10.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.8/download -> pin-project-lite-0.2.8.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.24/download -> pkg-config-0.3.24.crate https://crates.io/api/v1/crates/png/0.17.5/download -> png-0.17.5.crate https://crates.io/api/v1/crates/polling/2.2.0/download -> polling-2.2.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.16/download -> ppv-lite86-0.2.16.crate https://crates.io/api/v1/crates/pretty_assertions/1.2.1/download -> pretty_assertions-1.2.1.crate https://crates.io/api/v1/crates/primal-check/0.3.1/download -> primal-check-0.3.1.crate https://crates.io/api/v1/crates/proc-macro-crate/1.1.3/download -> proc-macro-crate-1.1.3.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro2/1.0.39/download -> proc-macro2-1.0.39.crate https://crates.io/api/v1/crates/profiling/1.0.5/download -> profiling-1.0.5.crate https://crates.io/api/v1/crates/quote/1.0.18/download -> quote-1.0.18.crate https://crates.io/api/v1/crates/radium/0.5.3/download -> radium-0.5.3.crate https://crates.io/api/v1/crates/rand/0.8.5/download -> rand-0.8.5.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.6.3/download -> rand_core-0.6.3.crate https://crates.io/api/v1/crates/range-alloc/0.1.2/download -> range-alloc-0.1.2.crate https://crates.io/api/v1/crates/raw-window-handle/0.4.2/download -> raw-window-handle-0.4.2.crate https://crates.io/api/v1/crates/rayon/1.5.3/download -> rayon-1.5.3.crate https://crates.io/api/v1/crates/rayon-core/1.9.2/download -> rayon-core-1.9.2.crate https://crates.io/api/v1/crates/redox_syscall/0.2.11/download -> redox_syscall-0.2.11.crate https://crates.io/api/v1/crates/redox_users/0.4.0/download -> redox_users-0.4.0.crate https://crates.io/api/v1/crates/regex/1.5.5/download -> regex-1.5.5.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/regress/0.4.1/download -> regress-0.4.1.crate https://crates.io/api/v1/crates/renderdoc-sys/0.7.1/download -> renderdoc-sys-0.7.1.crate https://crates.io/api/v1/crates/rfd/0.8.4/download -> rfd-0.8.4.crate https://crates.io/api/v1/crates/rle-decode-fast/1.0.3/download -> rle-decode-fast-1.0.3.crate https://crates.io/api/v1/crates/ron/0.7.0/download -> ron-0.7.0.crate https://crates.io/api/v1/crates/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.crate https://crates.io/api/v1/crates/rustc_version/0.4.0/download -> rustc_version-0.4.0.crate https://crates.io/api/v1/crates/rustdct/0.7.0/download -> rustdct-0.7.0.crate https://crates.io/api/v1/crates/rustfft/6.0.1/download -> rustfft-6.0.1.crate https://crates.io/api/v1/crates/ryu/1.0.9/download -> ryu-1.0.9.crate https://crates.io/api/v1/crates/safe_arch/0.6.0/download -> safe_arch-0.6.0.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/schannel/0.1.19/download -> schannel-0.1.19.crate https://crates.io/api/v1/crates/scoped-tls/1.0.0/download -> scoped-tls-1.0.0.crate https://crates.io/api/v1/crates/scoped_threadpool/0.1.9/download -> scoped_threadpool-0.1.9.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/semver/1.0.6/download -> semver-1.0.6.crate https://crates.io/api/v1/crates/serde/1.0.137/download -> serde-1.0.137.crate https://crates.io/api/v1/crates/serde_derive/1.0.137/download -> serde_derive-1.0.137.crate https://crates.io/api/v1/crates/serde_json/1.0.81/download -> serde_json-1.0.81.crate https://crates.io/api/v1/crates/sha2/0.10.2/download -> sha2-0.10.2.crate https://crates.io/api/v1/crates/shlex/0.1.1/download -> shlex-0.1.1.crate https://crates.io/api/v1/crates/sid/0.6.1/download -> sid-0.6.1.crate https://crates.io/api/v1/crates/slab/0.4.5/download -> slab-0.4.5.crate https://crates.io/api/v1/crates/slice-deque/0.3.0/download -> slice-deque-0.3.0.crate https://crates.io/api/v1/crates/slotmap/1.0.6/download -> slotmap-1.0.6.crate https://crates.io/api/v1/crates/sluice/0.5.5/download -> sluice-0.5.5.crate https://crates.io/api/v1/crates/smallvec/1.8.0/download -> smallvec-1.8.0.crate https://crates.io/api/v1/crates/smithay-client-toolkit/0.15.3/download -> smithay-client-toolkit-0.15.3.crate https://crates.io/api/v1/crates/socket2/0.4.4/download -> socket2-0.4.4.crate https://crates.io/api/v1/crates/spin/0.9.2/download -> spin-0.9.2.crate https://crates.io/api/v1/crates/spirv/0.2.0+1.5.4/download -> spirv-0.2.0+1.5.4.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/stdweb/0.1.3/download -> stdweb-0.1.3.crate https://crates.io/api/v1/crates/strength_reduce/0.2.3/download -> strength_reduce-0.2.3.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/symphonia/0.5.0/download -> symphonia-0.5.0.crate https://crates.io/api/v1/crates/symphonia-bundle-mp3/0.5.0/download -> symphonia-bundle-mp3-0.5.0.crate https://crates.io/api/v1/crates/symphonia-core/0.5.0/download -> symphonia-core-0.5.0.crate https://crates.io/api/v1/crates/symphonia-metadata/0.5.0/download -> symphonia-metadata-0.5.0.crate https://crates.io/api/v1/crates/syn/1.0.96/download -> syn-1.0.96.crate https://crates.io/api/v1/crates/synstructure/0.12.6/download -> synstructure-0.12.6.crate https://crates.io/api/v1/crates/system-deps/6.0.2/download -> system-deps-6.0.2.crate https://crates.io/api/v1/crates/tap/1.0.1/download -> tap-1.0.1.crate https://crates.io/api/v1/crates/termcolor/1.1.3/download -> termcolor-1.1.3.crate https://crates.io/api/v1/crates/terminal_size/0.1.17/download -> terminal_size-0.1.17.crate https://crates.io/api/v1/crates/textwrap/0.15.0/download -> textwrap-0.15.0.crate https://crates.io/api/v1/crates/thiserror/1.0.31/download -> thiserror-1.0.31.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.31/download -> thiserror-impl-1.0.31.crate https://crates.io/api/v1/crates/threadpool/1.8.1/download -> threadpool-1.8.1.crate https://crates.io/api/v1/crates/tiff/0.7.1/download -> tiff-0.7.1.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/tinyvec/1.5.1/download -> tinyvec-1.5.1.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/tracing/0.1.32/download -> tracing-0.1.32.crate https://crates.io/api/v1/crates/tracing-attributes/0.1.20/download -> tracing-attributes-0.1.20.crate https://crates.io/api/v1/crates/tracing-core/0.1.23/download -> tracing-core-0.1.23.crate https://crates.io/api/v1/crates/tracing-futures/0.2.5/download -> tracing-futures-0.2.5.crate https://crates.io/api/v1/crates/transpose/0.2.1/download -> transpose-0.2.1.crate https://crates.io/api/v1/crates/typenum/1.15.0/download -> typenum-1.15.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.7/download -> unicode-bidi-0.3.7.crate https://crates.io/api/v1/crates/unicode-ident/1.0.0/download -> unicode-ident-1.0.0.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.19/download -> unicode-normalization-0.1.19.crate https://crates.io/api/v1/crates/unicode-width/0.1.9/download -> unicode-width-0.1.9.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/url/2.2.2/download -> url-2.2.2.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/version-compare/0.1.0/download -> version-compare-0.1.0.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/vswhom/0.1.0/download -> vswhom-0.1.0.crate https://crates.io/api/v1/crates/vswhom-sys/0.1.1/download -> vswhom-sys-0.1.1.crate https://crates.io/api/v1/crates/waker-fn/1.1.0/download -> waker-fn-1.1.0.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.80/download -> wasm-bindgen-0.2.80.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.80/download -> wasm-bindgen-backend-0.2.80.crate https://crates.io/api/v1/crates/wasm-bindgen-futures/0.4.30/download -> wasm-bindgen-futures-0.4.30.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.80/download -> wasm-bindgen-macro-0.2.80.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.80/download -> wasm-bindgen-macro-support-0.2.80.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.80/download -> wasm-bindgen-shared-0.2.80.crate https://crates.io/api/v1/crates/wayland-client/0.29.4/download -> wayland-client-0.29.4.crate https://crates.io/api/v1/crates/wayland-commons/0.29.4/download -> wayland-commons-0.29.4.crate https://crates.io/api/v1/crates/wayland-cursor/0.29.4/download -> wayland-cursor-0.29.4.crate https://crates.io/api/v1/crates/wayland-protocols/0.29.4/download -> wayland-protocols-0.29.4.crate https://crates.io/api/v1/crates/wayland-scanner/0.29.4/download -> wayland-scanner-0.29.4.crate https://crates.io/api/v1/crates/wayland-sys/0.29.4/download -> wayland-sys-0.29.4.crate https://crates.io/api/v1/crates/weak-table/0.3.2/download -> weak-table-0.3.2.crate https://crates.io/api/v1/crates/web-sys/0.3.57/download -> web-sys-0.3.57.crate https://crates.io/api/v1/crates/webbrowser/0.7.1/download -> webbrowser-0.7.1.crate https://crates.io/api/v1/crates/weezl/0.1.5/download -> weezl-0.1.5.crate https://crates.io/api/v1/crates/wepoll-ffi/0.1.2/download -> wepoll-ffi-0.1.2.crate https://crates.io/api/v1/crates/wgpu/0.12.0/download -> wgpu-0.12.0.crate https://crates.io/api/v1/crates/wgpu-core/0.12.2/download -> wgpu-core-0.12.2.crate https://crates.io/api/v1/crates/wgpu-hal/0.12.4/download -> wgpu-hal-0.12.4.crate https://crates.io/api/v1/crates/wgpu-types/0.12.0/download -> wgpu-types-0.12.0.crate https://crates.io/api/v1/crates/wide/0.7.4/download -> wide-0.7.4.crate https://crates.io/api/v1/crates/widestring/0.5.1/download -> widestring-0.5.1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/windows/0.37.0/download -> windows-0.37.0.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.37.0/download -> windows_aarch64_msvc-0.37.0.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.37.0/download -> windows_i686_gnu-0.37.0.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.37.0/download -> windows_i686_msvc-0.37.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.37.0/download -> windows_x86_64_gnu-0.37.0.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.37.0/download -> windows_x86_64_msvc-0.37.0.crate https://crates.io/api/v1/crates/winit/0.26.1/download -> winit-0.26.1.crate https://crates.io/api/v1/crates/winreg/0.10.1/download -> winreg-0.10.1.crate https://crates.io/api/v1/crates/wyz/0.2.0/download -> wyz-0.2.0.crate https://crates.io/api/v1/crates/x11-clipboard/0.3.3/download -> x11-clipboard-0.3.3.crate https://crates.io/api/v1/crates/x11-dl/2.19.1/download -> x11-dl-2.19.1.crate https://crates.io/api/v1/crates/xcb/0.8.2/download -> xcb-0.8.2.crate https://crates.io/api/v1/crates/xcursor/0.3.4/download -> xcursor-0.3.4.crate https://crates.io/api/v1/crates/xml-rs/0.8.4/download -> xml-rs-0.8.4.crate https://github.com/RustAudio/dasp/archive/f05a703d247bb504d7e812b51e95f3765d9c5e94.tar.gz -> dasp-f05a703d247bb504d7e812b51e95f3765d9c5e94.tar.gz https://github.com/ruffle-rs/gc-arena/archive/4931b3bc25b2b74174ff5eb9c34ae0dda732778b.tar.gz -> gc-arena-4931b3bc25b2b74174ff5eb9c34ae0dda732778b.tar.gz https://github.com/ruffle-rs/h263-rs/archive/023e14c73e565c4c778d41f66cfbac5ece6419b2.tar.gz -> h263-rs-023e14c73e565c4c778d41f66cfbac5ece6419b2.tar.gz https://github.com/ruffle-rs/nellymoser/archive/4a33521c29a918950df8ae9fe07e527ac65553f5.tar.gz -> nellymoser-4a33521c29a918950df8ae9fe07e527ac65553f5.tar.gz https://github.com/ruffle-rs/nihav-vp6/archive/9416fcc9fc8aab8f4681aa9093b42922214abbd3.tar.gz -> nihav-vp6-9416fcc9fc8aab8f4681aa9093b42922214abbd3.tar.gz https://github.com/ruffle-rs/quick-xml/archive/8496365ec1412eb5ba5de350937b6bce352fa0ba.tar.gz -> quick-xml-8496365ec1412eb5ba5de350937b6bce352fa0ba.tar.gz https://github.com/ruffle-rs/rust-flash-lso/archive/19fecd07b9888c4bdaa66771c468095783b52bed.tar.gz -> rust-flash-lso-19fecd07b9888c4bdaa66771c468095783b52bed.tar.gz
+_eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=ccfe11d206743b6e1cfa1ce3cb1e69d4
diff --git a/metadata/md5-cache/app-emulation/virtualbox-6.1.32-r1 b/metadata/md5-cache/app-emulation/virtualbox-6.1.32-r2
similarity index 100%
rename from metadata/md5-cache/app-emulation/virtualbox-6.1.32-r1
rename to metadata/md5-cache/app-emulation/virtualbox-6.1.32-r2
diff --git a/metadata/md5-cache/app-emulation/virtualbox-6.1.34 b/metadata/md5-cache/app-emulation/virtualbox-6.1.34-r1
similarity index 99%
rename from metadata/md5-cache/app-emulation/virtualbox-6.1.34
rename to metadata/md5-cache/app-emulation/virtualbox-6.1.34-r1
index 53f931c7c62b..44c68571c028 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-6.1.34
+++ b/metadata/md5-cache/app-emulation/virtualbox-6.1.34-r1
@@ -13,4 +13,4 @@ REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_sing
 SLOT=0/6.1
 SRC_URI=https://download.virtualbox.org/virtualbox/6.1.34/VirtualBox-6.1.34.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=8ebe060427ed4f36cfac56b1906900ad
+_md5_=189d397dbefed2f6a846d0a0b8a3b407
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index ef8d55004914..f7b2f1d8af74 100644
Binary files a/metadata/md5-cache/app-i18n/Manifest.gz and b/metadata/md5-cache/app-i18n/Manifest.gz differ
diff --git a/metadata/md5-cache/app-i18n/opencc-1.1.3 b/metadata/md5-cache/app-i18n/opencc-1.1.3
index 3492c36d7f24..45349e562246 100644
--- a/metadata/md5-cache/app-i18n/opencc-1.1.3
+++ b/metadata/md5-cache/app-i18n/opencc-1.1.3
@@ -6,11 +6,11 @@ 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
+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	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=3c2890a7eedc5bd7b0bac545fabd7175
+_md5_=7d921dece30d4d8016beb17703e2ad2c
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index c873b6e6d24d..1d79b7f2659d 100644
Binary files a/metadata/md5-cache/app-misc/Manifest.gz and b/metadata/md5-cache/app-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-misc/cw-1.0.16-r4 b/metadata/md5-cache/app-misc/cw-1.0.16-r4
new file mode 100644
index 000000000000..555f097d65b7
--- /dev/null
+++ b/metadata/md5-cache/app-misc/cw-1.0.16-r4
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install postinst unpack
+DESCRIPTION=A non-intrusive real-time ANSI color wrapper for common unix-based commands
+EAPI=8
+HOMEPAGE=http://cwrapper.sourceforge.net
+INHERIT=flag-o-matic toolchain-funcs
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/cwrapper/cw-1.0.16.tar.bz2
+_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=73cdfdcce3edc21a95fd1e86a7ba4730
diff --git a/metadata/md5-cache/app-misc/mc-9999 b/metadata/md5-cache/app-misc/mc-9999
index a161202f7370..88d5fb799d58 100644
--- a/metadata/md5-cache/app-misc/mc-9999
+++ b/metadata/md5-cache/app-misc/mc-9999
@@ -13,4 +13,4 @@ REQUIRED_USE=spell? ( edit )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=616bc0d7ad39a7a74319627afb3a28b1
+_md5_=88b30298a78a43b9f56bd794216726b6
diff --git a/metadata/md5-cache/app-misc/rover-1.0.1 b/metadata/md5-cache/app-misc/rover-1.0.1
new file mode 100644
index 000000000000..25c9eacc5f60
--- /dev/null
+++ b/metadata/md5-cache/app-misc/rover-1.0.1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install
+DEPEND=sys-libs/ncurses:=[unicode(+)]
+DESCRIPTION=simple file browser for the terminal
+EAPI=8
+HOMEPAGE=https://lecram.github.io/p/rover/
+INHERIT=toolchain-funcs
+KEYWORDS=~amd64
+LICENSE=public-domain
+RDEPEND=sys-libs/ncurses:=[unicode(+)]
+SLOT=0
+SRC_URI=https://github.com/lecram/rover/archive/v1.0.1/rover-1.0.1.tar.gz
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=e1146a430873bb2d2d84024b1c734d97
diff --git a/metadata/md5-cache/app-misc/rover-9999 b/metadata/md5-cache/app-misc/rover-9999
new file mode 100644
index 000000000000..75e45a7d367a
--- /dev/null
+++ b/metadata/md5-cache/app-misc/rover-9999
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile install unpack
+DEPEND=sys-libs/ncurses:=[unicode(+)]
+DESCRIPTION=simple file browser for the terminal
+EAPI=8
+HOMEPAGE=https://lecram.github.io/p/rover/
+INHERIT=toolchain-funcs git-r3
+LICENSE=public-domain
+PROPERTIES=live
+RDEPEND=sys-libs/ncurses:=[unicode(+)]
+SLOT=0
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=5d427722a596fda07aeba7ac64af508e
diff --git a/metadata/md5-cache/app-misc/rpick-0.8.10 b/metadata/md5-cache/app-misc/rpick-0.8.10
index 374e4b5b4661..2d45142fb713 100644
--- a/metadata/md5-cache/app-misc/rpick-0.8.10
+++ b/metadata/md5-cache/app-misc/rpick-0.8.10
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://github.com/bowlofeggs/rpick
 INHERIT=cargo
 IUSE=debug
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=amd64 ppc64 x86
 LICENSE=GPL-3 Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 CC0-1.0 MIT Unlicense
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/approx/0.5.1/download -> approx-0.5.1.crate https://crates.io/api/v1/crates/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.5.2/download -> arrayvec-0.5.2.crate https://crates.io/api/v1/crates/assert_cmd/2.0.4/download -> assert_cmd-2.0.4.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.11/download -> blake2b_simd-0.5.11.crate https://crates.io/api/v1/crates/bstr/0.2.17/download -> bstr-0.2.17.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/clap/3.1.18/download -> clap-3.1.18.crate https://crates.io/api/v1/crates/clap_derive/3.1.18/download -> clap_derive-3.1.18.crate https://crates.io/api/v1/crates/clap_lex/0.2.0/download -> clap_lex-0.2.0.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.5/download -> constant_time_eq-0.1.5.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.8/download -> crossbeam-utils-0.8.8.crate https://crates.io/api/v1/crates/csv/1.1.6/download -> csv-1.1.6.crate https://crates.io/api/v1/crates/csv-core/0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/difflib/0.4.0/download -> difflib-0.4.0.crate https://crates.io/api/v1/crates/dirs/1.0.5/download -> dirs-1.0.5.crate https://crates.io/api/v1/crates/dirs-next/2.0.0/download -> dirs-next-2.0.0.crate https://crates.io/api/v1/crates/dirs-sys-next/0.1.2/download -> dirs-sys-next-0.1.2.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/downcast/0.11.0/download -> downcast-0.11.0.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/fastrand/1.7.0/download -> fastrand-1.7.0.crate https://crates.io/api/v1/crates/float-cmp/0.9.0/download -> float-cmp-0.9.0.crate https://crates.io/api/v1/crates/fragile/1.2.0/download -> fragile-1.2.0.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/getrandom/0.2.6/download -> getrandom-0.2.6.crate https://crates.io/api/v1/crates/hashbrown/0.11.2/download -> hashbrown-0.11.2.crate https://crates.io/api/v1/crates/heck/0.4.0/download -> heck-0.4.0.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/indexmap/1.8.1/download -> indexmap-1.8.1.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/itertools/0.10.3/download -> itertools-0.10.3.crate https://crates.io/api/v1/crates/itoa/0.4.8/download -> itoa-0.4.8.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.125/download -> libc-0.2.125.crate https://crates.io/api/v1/crates/libm/0.2.2/download -> libm-0.2.2.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.4/download -> linked-hash-map-0.5.4.crate https://crates.io/api/v1/crates/matrixmultiply/0.3.2/download -> matrixmultiply-0.3.2.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/mockall/0.11.0/download -> mockall-0.11.0.crate https://crates.io/api/v1/crates/mockall_derive/0.11.0/download -> mockall_derive-0.11.0.crate https://crates.io/api/v1/crates/nalgebra/0.27.1/download -> nalgebra-0.27.1.crate https://crates.io/api/v1/crates/nalgebra-macros/0.1.0/download -> nalgebra-macros-0.1.0.crate https://crates.io/api/v1/crates/normalize-line-endings/0.3.0/download -> normalize-line-endings-0.3.0.crate https://crates.io/api/v1/crates/num-complex/0.4.1/download -> num-complex-0.4.1.crate https://crates.io/api/v1/crates/num-integer/0.1.45/download -> num-integer-0.1.45.crate https://crates.io/api/v1/crates/num-rational/0.4.0/download -> num-rational-0.4.0.crate https://crates.io/api/v1/crates/num-traits/0.2.15/download -> num-traits-0.2.15.crate https://crates.io/api/v1/crates/os_str_bytes/6.0.0/download -> os_str_bytes-6.0.0.crate https://crates.io/api/v1/crates/paste/1.0.7/download -> paste-1.0.7.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.16/download -> ppv-lite86-0.2.16.crate https://crates.io/api/v1/crates/predicates/2.1.1/download -> predicates-2.1.1.crate https://crates.io/api/v1/crates/predicates-core/1.0.3/download -> predicates-core-1.0.3.crate https://crates.io/api/v1/crates/predicates-tree/1.0.5/download -> predicates-tree-1.0.5.crate https://crates.io/api/v1/crates/prettytable-rs/0.8.0/download -> prettytable-rs-0.8.0.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro2/1.0.38/download -> proc-macro2-1.0.38.crate https://crates.io/api/v1/crates/quote/1.0.18/download -> quote-1.0.18.crate https://crates.io/api/v1/crates/rand/0.8.5/download -> rand-0.8.5.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.6.3/download -> rand_core-0.6.3.crate https://crates.io/api/v1/crates/rand_distr/0.4.3/download -> rand_distr-0.4.3.crate https://crates.io/api/v1/crates/rawpointer/0.2.1/download -> rawpointer-0.2.1.crate https://crates.io/api/v1/crates/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.crate https://crates.io/api/v1/crates/redox_syscall/0.2.13/download -> redox_syscall-0.2.13.crate https://crates.io/api/v1/crates/redox_users/0.3.5/download -> redox_users-0.3.5.crate https://crates.io/api/v1/crates/redox_users/0.4.3/download -> redox_users-0.4.3.crate https://crates.io/api/v1/crates/regex/1.5.5/download -> regex-1.5.5.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rpick/0.8.10/download -> rpick-0.8.10.crate https://crates.io/api/v1/crates/rust-argon2/0.8.3/download -> rust-argon2-0.8.3.crate https://crates.io/api/v1/crates/ryu/1.0.9/download -> ryu-1.0.9.crate https://crates.io/api/v1/crates/serde/1.0.137/download -> serde-1.0.137.crate https://crates.io/api/v1/crates/serde_derive/1.0.137/download -> serde_derive-1.0.137.crate https://crates.io/api/v1/crates/serde_yaml/0.8.24/download -> serde_yaml-0.8.24.crate https://crates.io/api/v1/crates/simba/0.5.1/download -> simba-0.5.1.crate https://crates.io/api/v1/crates/statrs/0.15.0/download -> statrs-0.15.0.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/syn/1.0.93/download -> syn-1.0.93.crate https://crates.io/api/v1/crates/tempfile/3.3.0/download -> tempfile-3.3.0.crate https://crates.io/api/v1/crates/term/0.5.2/download -> term-0.5.2.crate https://crates.io/api/v1/crates/termcolor/1.1.3/download -> termcolor-1.1.3.crate https://crates.io/api/v1/crates/termtree/0.2.4/download -> termtree-0.2.4.crate https://crates.io/api/v1/crates/textwrap/0.15.0/download -> textwrap-0.15.0.crate https://crates.io/api/v1/crates/thiserror/1.0.31/download -> thiserror-1.0.31.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.31/download -> thiserror-impl-1.0.31.crate https://crates.io/api/v1/crates/typenum/1.15.0/download -> typenum-1.15.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.9/download -> unicode-width-0.1.9.crate https://crates.io/api/v1/crates/unicode-xid/0.2.3/download -> unicode-xid-0.2.3.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/yaml-rust/0.4.5/download -> yaml-rust-0.4.5.crate
 _eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=df7cbd0dd169fab22727b1d36050a9ab
+_md5_=e44afae4099e46d30561d83c760efdf6
diff --git a/metadata/md5-cache/app-misc/tdl-1.5.2-r3 b/metadata/md5-cache/app-misc/tdl-1.5.2-r3
index 28078a39ae78..35fe7ec8bc9f 100644
--- a/metadata/md5-cache/app-misc/tdl-1.5.2-r3
+++ b/metadata/md5-cache/app-misc/tdl-1.5.2-r3
@@ -11,4 +11,4 @@ RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
 SLOT=0
 SRC_URI=http://www.rpcurnow.force9.co.uk/tdl/tdl-1.5.2.tar.gz https://dev.gentoo.org/~jlec/distfiles/tdl-screenshot.png.tar
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=414829c9e83849ee46b28e0c9f893728
+_md5_=a102dbabb6d0fcf56c9a9e1e2a2bba93
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 17b2154426b0..9c34cfa2d41e 100644
Binary files a/metadata/md5-cache/app-office/Manifest.gz and b/metadata/md5-cache/app-office/Manifest.gz differ
diff --git a/metadata/md5-cache/app-office/libalkimia-8.1.0-r1 b/metadata/md5-cache/app-office/libalkimia-8.1.0-r1
deleted file mode 100644
index 3b7f62c11755..000000000000
--- a/metadata/md5-cache/app-office/libalkimia-8.1.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.74.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcodecs-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/ktextwidgets-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 !gmp? ( sci-libs/mpir:=[cxx] ) gmp? ( dev-libs/gmp:0=[cxx(+)] ) plasma? ( >=kde-frameworks/kpackage-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.15.2:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library with common classes and functionality used by KDE finance applications
-EAPI=7
-HOMEPAGE=https://www.linux-apps.com/content/show.php/libalkimia?content=137323 https://community.kde.org/Alkimia
-INHERIT=ecm kde.org
-IUSE=doc gmp plasma webengine test debug test
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcodecs-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/ktextwidgets-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 !gmp? ( sci-libs/mpir:=[cxx] ) gmp? ( dev-libs/gmp:0=[cxx(+)] ) plasma? ( >=kde-frameworks/kpackage-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.15.2:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0/8
-SRC_URI=mirror://kde/stable/alkimia/8.1.0/alkimia-8.1.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=99b171c446494a7c3983a6eb791d5f1c
diff --git a/metadata/md5-cache/app-office/libreoffice-7.2.6.2-r1 b/metadata/md5-cache/app-office/libreoffice-7.2.6.2-r1
deleted file mode 100644
index 7f57ff13fc80..000000000000
--- a/metadata/md5-cache/app-office/libreoffice-7.2.6.2-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig clang? ( || ( ( sys-devel/clang:13 sys-devel/llvm:13 =sys-devel/lld-13* ) ( sys-devel/clang:12 sys-devel/llvm:12 =sys-devel/lld-12* ) ( sys-devel/clang:11 sys-devel/llvm:11 =sys-devel/lld-11* ) ) ) odk? ( >=app-doc/doxygen-1.8.4 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+),xml] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+),xml] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+),xml] ) app-arch/unzip app-arch/zip app-crypt/gpgme:=[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libnumbertext-1.0.6 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.5.2 dev-db/unixODBC dev-lang/perl >=dev-libs/boost-1.72.0:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error dev-libs/liborcus:0/0.16 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.28[nss] >=games-engines/box2d-2.4.1:0 media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig >=media-libs/freetype-2.11.0-r1:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf media-libs/zxing-cpp >=net-libs/neon-0.31.1:= net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender accessibility? ( python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] ) ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus[X] ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl(+)] x11-libs/gtk+:3[X] x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap:= ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 ) mariadb? ( dev-db/mariadb-connector-c:= ) !mariadb? ( dev-db/mysql-connector-c:= ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) >=dev-libs/libatomic_ops-7.2d dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3.1 dev-util/mdds:1/1.5 media-libs/glm sys-devel/ucpp x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst java? ( dev-java/ant-core || ( dev-java/openjdk:11 dev-java/openjdk-bin:11 ) ) test? ( app-crypt/gnupg dev-util/cppunit media-fonts/dejavu media-fonts/liberation-fonts ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=A full office productivity suite
-EAPI=8
-HOMEPAGE=https://www.libreoffice.org
-INHERIT=autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-IUSE=accessibility base bluetooth +branding clang coinmp +cups custom-cflags +dbus debug eds firebird googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test vulkan libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher java python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux
-LICENSE=|| ( LGPL-3 MPL-1.1 )
-PDEPEND==app-office/libreoffice-l10n-7.2*
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+),xml] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+),xml] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+),xml] ) app-arch/unzip app-arch/zip app-crypt/gpgme:=[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libnumbertext-1.0.6 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.5.2 dev-db/unixODBC dev-lang/perl >=dev-libs/boost-1.72.0:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error dev-libs/liborcus:0/0.16 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.28[nss] >=games-engines/box2d-2.4.1:0 media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig >=media-libs/freetype-2.11.0-r1:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf media-libs/zxing-cpp >=net-libs/neon-0.31.1:= net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender accessibility? ( python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] ) ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus[X] ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl(+)] x11-libs/gtk+:3[X] x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap:= ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 ) mariadb? ( dev-db/mariadb-connector-c:= ) !mariadb? ( dev-db/mysql-connector-c:= ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug media-fonts/liberation-fonts || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( || ( dev-java/openjdk:11 dev-java/openjdk-jre-bin:11 >=virtual/jre-1.8 ) ) kde? ( kde-frameworks/breeze-icons:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) base? ( firebird java ) bluetooth? ( dbus ) gtk? ( dbus ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-7.2.6.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-7.2.6.2.tar.xz https://download.documentfoundation.org/libreoffice/src/7.2.6//libreoffice-7.2.6.2.tar.xz https://download.documentfoundation.org/libreoffice/src/7.2.6//libreoffice-help-7.2.6.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/7.2.6.2/src/libreoffice-7.2.6.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/7.2.6.2/src/libreoffice-help-7.2.6.2.tar.xz https://dev-www.libreoffice.org/src//libcmis-0.5.2.tar.xz https://dev-www.libreoffice.org/src//dtoa-20180411.tgz https://dev-www.libreoffice.org/src//skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz base? ( https://dev-www.libreoffice.org/src//commons-logging-1.2-src.tar.gz https://dev-www.libreoffice.org/src//ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip https://dev-www.libreoffice.org/src//d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip https://dev-www.libreoffice.org/src//eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip https://dev-www.libreoffice.org/src//3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip https://dev-www.libreoffice.org/src//3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip https://dev-www.libreoffice.org/src//db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip https://dev-www.libreoffice.org/src//97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip https://dev-www.libreoffice.org/src//8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip https://dev-www.libreoffice.org/src//f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip https://dev-www.libreoffice.org/src//ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip https://dev-www.libreoffice.org/src//39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip ) java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b77ffc2a3a9718ded51a14ee1ed12d9f
diff --git a/metadata/md5-cache/app-office/libreoffice-7.3.3.2-r3 b/metadata/md5-cache/app-office/libreoffice-7.3.3.2-r3
index 4bee0e7bab9f..99eda168478d 100644
--- a/metadata/md5-cache/app-office/libreoffice-7.3.3.2-r3
+++ b/metadata/md5-cache/app-office/libreoffice-7.3.3.2-r3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.libreoffice.org
 INHERIT=autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
 IUSE=accessibility base bluetooth +branding clang coinmp +cups custom-cflags +dbus debug eds firebird googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test vulkan libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher java python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux
 LICENSE=|| ( LGPL-3 MPL-1.1 )
 PDEPEND==app-office/libreoffice-l10n-7.3*
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+),xml] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+),xml] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+),xml] ) app-arch/unzip app-arch/zip app-crypt/gpgme:=[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libnumbertext-1.0.6 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes dev-cpp/abseil-cpp:= >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.5.2 dev-db/unixODBC dev-lang/perl >=dev-libs/boost-1.72.0:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.17.2:0/0.17 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.28[nss] >=games-engines/box2d-2.4.1:0 media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig >=media-libs/freetype-2.11.0-r1:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libjpeg-turbo:= media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf media-libs/openjpeg:= media-libs/zxing-cpp >=net-libs/neon-0.31.1:= net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender accessibility? ( python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] ) ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus[X] ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl(+)] x11-libs/gtk+:3[X] x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap:= ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 ) mariadb? ( dev-db/mariadb-connector-c:= ) !mariadb? ( dev-db/mysql-connector-c:= ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) acct-group/libreoffice acct-user/libreoffice !app-office/libreoffice-bin !app-office/libreoffice-bin-debug media-fonts/liberation-fonts || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( || ( dev-java/openjdk:11 dev-java/openjdk-jre-bin:11 >=virtual/jre-1.8 ) ) kde? ( kde-frameworks/breeze-icons:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-7.3.3.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-7.3.3.2.tar.xz https://download.documentfoundation.org/libreoffice/src/7.3.3//libreoffice-7.3.3.2.tar.xz https://download.documentfoundation.org/libreoffice/src/7.3.3//libreoffice-help-7.3.3.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/7.3.3.2/src/libreoffice-7.3.3.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/7.3.3.2/src/libreoffice-help-7.3.3.2.tar.xz https://dev-www.libreoffice.org/src//libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz https://dev-www.libreoffice.org/src//libcmis-0.5.2.tar.xz https://dev-www.libreoffice.org/src//dtoa-20180411.tgz https://dev-www.libreoffice.org/src//skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz base? ( https://dev-www.libreoffice.org/src//commons-logging-1.2-src.tar.gz https://dev-www.libreoffice.org/src//ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip https://dev-www.libreoffice.org/src//d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip https://dev-www.libreoffice.org/src//eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip https://dev-www.libreoffice.org/src//3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip https://dev-www.libreoffice.org/src//3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip https://dev-www.libreoffice.org/src//db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip https://dev-www.libreoffice.org/src//97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip https://dev-www.libreoffice.org/src//8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip https://dev-www.libreoffice.org/src//f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip https://dev-www.libreoffice.org/src//ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip https://dev-www.libreoffice.org/src//39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip ) java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=26600422f1b40054a800a31b0dc7d834
+_md5_=23a109f7a9aa8554f23cb4b95ada13cc
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-7.2.6.2 b/metadata/md5-cache/app-office/libreoffice-bin-7.2.6.2
deleted file mode 100644
index 6813d5bac084..000000000000
--- a/metadata/md5-cache/app-office/libreoffice-bin-7.2.6.2
+++ /dev/null
@@ -1,17 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-util/xdelta:3 java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=A full office productivity suite. Binary package
-EAPI=7
-HOMEPAGE=https://www.libreoffice.org
-INHERIT=java-pkg-opt-2 python-single-r1 prefix toolchain-funcs xdg-utils
-IUSE=gnome java kde java +python_single_target_python3_9
-KEYWORDS=-* amd64 x86
-LICENSE=LGPL-3
-PDEPEND==app-office/libreoffice-l10n-7.2.6.2*
-RDEPEND=app-text/hunspell:0/1.7 =app-text/libexttextcat-3.4* =app-text/libmwaw-0.3* dev-libs/boost:0/1.78.0 dev-libs/icu:0/70.1 dev-libs/liborcus:0/0.16 >=media-gfx/graphite2-1.3.10 media-libs/harfbuzz:0/3.0.0[icu] media-libs/libpng:0/16 >=sys-devel/gcc-11.2.1 >=sys-libs/glibc-2.34 virtual/jpeg-compat:62 python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml] ) app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libnumbertext-1.0.6 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.5.2 dev-db/unixODBC >=games-engines/box2d-2.4.1:0 dev-lang/perl >=dev-libs/boost-1.72.0:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error dev-libs/liborcus:0/0.16 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.28[nss] media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig >=media-libs/freetype-2.11.0-r1:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf media-libs/zxing-cpp >=net-libs/neon-0.31.1:= net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender net-print/cups sys-apps/dbus[X] gnome? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 !kde? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl(+)] x11-libs/gtk+:3[X] x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) dev-db/mariadb-connector-c !app-office/libreoffice !app-office/openoffice media-fonts/liberation-fonts || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( virtual/jre:11 ) kde? ( kde-frameworks/breeze-icons:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=kde? ( !gnome ) gnome? ( !kde ) ^^ ( python_single_target_python3_9 )
-RESTRICT=test strip
-SLOT=0
-SRC_URI=amd64? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-7.2.6.2.tar.xz kde? ( !java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-kde-7.2.6.2.xd3 ) java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-kde-java-7.2.6.2.xd3 ) ) gnome? ( !java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-gnome-7.2.6.2.xd3 ) java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-gnome-java-7.2.6.2.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-java-7.2.6.2.xd3 ) ) ) ) x86? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-7.2.6.2.tar.xz kde? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-kde-7.2.6.2.xd3 ) gnome? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-gnome-7.2.6.2.xd3 ) )
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=63d893f7557278b91a0ce8f4955c7505
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-7.2.6.2-r1 b/metadata/md5-cache/app-office/libreoffice-bin-7.2.6.2-r1
deleted file mode 100644
index c44776378913..000000000000
--- a/metadata/md5-cache/app-office/libreoffice-bin-7.2.6.2-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-util/xdelta:3 java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=A full office productivity suite. Binary package
-EAPI=7
-HOMEPAGE=https://www.libreoffice.org
-INHERIT=java-pkg-opt-2 python-single-r1 prefix toolchain-funcs xdg-utils
-IUSE=gnome java kde java +python_single_target_python3_9
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=LGPL-3
-PDEPEND==app-office/libreoffice-l10n-7.2.6.2*
-RDEPEND=app-text/hunspell:0/1.7 =app-text/libexttextcat-3.4* =app-text/libmwaw-0.3* dev-libs/boost:0/1.78.0 dev-libs/icu:0/70.1 dev-libs/liborcus:0/0.16 >=media-gfx/graphite2-1.3.10 media-libs/harfbuzz:0/3.0.0[icu] media-libs/libpng:0/16 >=sys-devel/gcc-11.2.1 >=sys-libs/glibc-2.34 virtual/jpeg-compat:62 python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml] ) app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libnumbertext-1.0.6 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.5.2 dev-db/unixODBC >=games-engines/box2d-2.4.1:0 dev-lang/perl >=dev-libs/boost-1.72.0:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error dev-libs/liborcus:0/0.16 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.28[nss] media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig >=media-libs/freetype-2.11.0-r1:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf media-libs/zxing-cpp >=net-libs/neon-0.31.1:= net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender net-print/cups sys-apps/dbus[X] gnome? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 !kde? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl(+)] x11-libs/gtk+:3[X] x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) dev-db/mariadb-connector-c !app-office/libreoffice !app-office/openoffice media-fonts/liberation-fonts || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( virtual/jre:11 ) kde? ( kde-frameworks/breeze-icons:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=kde? ( !gnome ) gnome? ( !kde ) ^^ ( python_single_target_python3_9 )
-RESTRICT=test strip
-SLOT=0
-SRC_URI=amd64? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-7.2.6.2-r1.tar.xz kde? ( !java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-kde-7.2.6.2-r1.xd3 ) java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-kde-java-7.2.6.2-r1.xd3 ) ) gnome? ( !java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-gnome-7.2.6.2-r1.xd3 ) java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-gnome-java-7.2.6.2-r1.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-java-7.2.6.2-r1.xd3 ) ) ) ) x86? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-7.2.6.2-r1.tar.xz kde? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-kde-7.2.6.2-r1.xd3 ) gnome? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-gnome-7.2.6.2-r1.xd3 ) )
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=2b189fcbb8f2073b46fe57dc04f09f10
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-7.3.3.2-r3 b/metadata/md5-cache/app-office/libreoffice-bin-7.3.3.2-r3
index 5a843108b740..98c93ef2a725 100644
--- a/metadata/md5-cache/app-office/libreoffice-bin-7.3.3.2-r3
+++ b/metadata/md5-cache/app-office/libreoffice-bin-7.3.3.2-r3
@@ -5,7 +5,7 @@ EAPI=7
 HOMEPAGE=https://www.libreoffice.org
 INHERIT=java-pkg-opt-2 python-single-r1 prefix toolchain-funcs xdg-utils
 IUSE=gnome java kde java +python_single_target_python3_9
-KEYWORDS=-* amd64 ~x86
+KEYWORDS=-* amd64 x86
 LICENSE=LGPL-3
 PDEPEND==app-office/libreoffice-l10n-7.3.3.2*
 RDEPEND=app-text/hunspell:0/1.7 =app-text/libexttextcat-3.4* =app-text/libmwaw-0.3* dev-cpp/abseil-cpp:0/20211102 dev-libs/boost:0/1.79.0 dev-libs/icu:0/71.1 dev-libs/liborcus:0/0.17 >=media-gfx/graphite2-1.3.10 media-libs/harfbuzz:0/4.0.0[icu] media-libs/libjpeg-turbo:0/0.2 media-libs/libpng:0/16 media-libs/openjpeg:2/7 >=sys-devel/gcc-11.2.1 >=sys-libs/glibc-2.34 python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml] ) app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libnumbertext-1.0.6 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes dev-cpp/abseil-cpp:= >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.5.2 dev-db/unixODBC >=games-engines/box2d-2.4.1:0 dev-lang/perl >=dev-libs/boost-1.72.0:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.17.2:0/0.17 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.28[nss] media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig >=media-libs/freetype-2.11.0-r1:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libjpeg-turbo:= media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf media-libs/openjpeg:= media-libs/zxing-cpp >=net-libs/neon-0.31.1:= net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/glu virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender net-print/cups sys-apps/dbus[X] gnome? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 !kde? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl(+)] x11-libs/gtk+:3[X] x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) dev-db/mariadb-connector-c acct-group/libreoffice acct-user/libreoffice !app-office/libreoffice !app-office/openoffice media-fonts/liberation-fonts || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( virtual/jre:11 ) kde? ( kde-frameworks/breeze-icons:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
@@ -14,4 +14,4 @@ RESTRICT=test strip
 SLOT=0
 SRC_URI=amd64? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-7.3.3.2-r3.tar.xz kde? ( !java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-kde-7.3.3.2-r3.xd3 ) java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-kde-java-7.3.3.2-r3.xd3 ) ) gnome? ( !java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-gnome-7.3.3.2-r3.xd3 ) java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-gnome-java-7.3.3.2-r3.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-java-7.3.3.2-r3.xd3 ) ) ) ) x86? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-7.3.3.2-r3.tar.xz kde? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-kde-7.3.3.2-r3.xd3 ) gnome? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-gnome-7.3.3.2-r3.xd3 ) )
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=644daf9c2a3fdd785ca86e5877bbf41f
+_md5_=9e8e6df674bb91f78ee5c5add0b23f99
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-debug-7.2.6.2 b/metadata/md5-cache/app-office/libreoffice-bin-debug-7.2.6.2
deleted file mode 100644
index f6c30c0c1cd6..000000000000
--- a/metadata/md5-cache/app-office/libreoffice-bin-debug-7.2.6.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install unpack
-DEPEND=dev-util/xdelta:3
-DESCRIPTION=LibreOffice, a full office productivity suite. Binary package, debug info
-EAPI=7
-HOMEPAGE=https://www.libreoffice.org
-IUSE=gnome java kde
-KEYWORDS=-* amd64 x86
-LICENSE=LGPL-3
-RDEPEND=~app-office/libreoffice-bin-7.2.6.2[gnome=,java=,kde=]
-RESTRICT=test strip
-SLOT=0
-SRC_URI=amd64? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-7.2.6.2.tar.xz kde? ( !java? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-kde-7.2.6.2.xd3 ) java? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-kde-java-7.2.6.2.xd3 ) ) gnome? ( !java? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-gnome-7.2.6.2.xd3 ) java? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-gnome-java-7.2.6.2.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-java-7.2.6.2.xd3 ) ) ) ) x86? ( https://tamiko.43-1.org/distfiles/x86-debug-libreoffice-7.2.6.2.tar.xz kde? ( https://tamiko.43-1.org/distfiles/x86-debug-libreoffice-kde-7.2.6.2.xd3 ) gnome? ( https://tamiko.43-1.org/distfiles/x86-debug-libreoffice-gnome-7.2.6.2.xd3 ) )
-_md5_=8d7813649db2784823af16235cd9c166
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-debug-7.2.6.2-r1 b/metadata/md5-cache/app-office/libreoffice-bin-debug-7.2.6.2-r1
deleted file mode 100644
index 802c533b393b..000000000000
--- a/metadata/md5-cache/app-office/libreoffice-bin-debug-7.2.6.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install unpack
-DEPEND=dev-util/xdelta:3
-DESCRIPTION=LibreOffice, a full office productivity suite. Binary package, debug info
-EAPI=7
-HOMEPAGE=https://www.libreoffice.org
-IUSE=gnome java kde
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND==app-office/libreoffice-bin-7.2.6.2-r1[gnome=,java=,kde=]
-RESTRICT=test strip
-SLOT=0
-SRC_URI=amd64? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-7.2.6.2-r1.tar.xz kde? ( !java? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-kde-7.2.6.2-r1.xd3 ) java? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-kde-java-7.2.6.2-r1.xd3 ) ) gnome? ( !java? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-gnome-7.2.6.2-r1.xd3 ) java? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-gnome-java-7.2.6.2-r1.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-java-7.2.6.2-r1.xd3 ) ) ) ) x86? ( https://tamiko.43-1.org/distfiles/x86-debug-libreoffice-7.2.6.2-r1.tar.xz kde? ( https://tamiko.43-1.org/distfiles/x86-debug-libreoffice-kde-7.2.6.2-r1.xd3 ) gnome? ( https://tamiko.43-1.org/distfiles/x86-debug-libreoffice-gnome-7.2.6.2-r1.xd3 ) )
-_md5_=f97bc6101496ee291ab2e0e41cd7e2ee
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-debug-7.3.3.2-r3 b/metadata/md5-cache/app-office/libreoffice-bin-debug-7.3.3.2-r3
index 2e30e853526f..7e6c68d22d81 100644
--- a/metadata/md5-cache/app-office/libreoffice-bin-debug-7.3.3.2-r3
+++ b/metadata/md5-cache/app-office/libreoffice-bin-debug-7.3.3.2-r3
@@ -4,10 +4,10 @@ DESCRIPTION=LibreOffice, a full office productivity suite. Binary package, debug
 EAPI=7
 HOMEPAGE=https://www.libreoffice.org
 IUSE=gnome java kde
-KEYWORDS=-* amd64 ~x86
+KEYWORDS=-* amd64 x86
 LICENSE=LGPL-3
 RDEPEND==app-office/libreoffice-bin-7.3.3.2-r3[gnome=,java=,kde=]
 RESTRICT=test strip
 SLOT=0
 SRC_URI=amd64? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-7.3.3.2-r3.tar.xz kde? ( !java? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-kde-7.3.3.2-r3.xd3 ) java? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-kde-java-7.3.3.2-r3.xd3 ) ) gnome? ( !java? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-gnome-7.3.3.2-r3.xd3 ) java? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-gnome-java-7.3.3.2-r3.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-java-7.3.3.2-r3.xd3 ) ) ) ) x86? ( https://tamiko.43-1.org/distfiles/x86-debug-libreoffice-7.3.3.2-r3.tar.xz kde? ( https://tamiko.43-1.org/distfiles/x86-debug-libreoffice-kde-7.3.3.2-r3.xd3 ) gnome? ( https://tamiko.43-1.org/distfiles/x86-debug-libreoffice-gnome-7.3.3.2-r3.xd3 ) )
-_md5_=7db2d2fafd1499306a90e18fe6a899f5
+_md5_=5b95c159a2db25943cb97acd8c4b5977
diff --git a/metadata/md5-cache/app-office/libreoffice-l10n-7.2.6.2 b/metadata/md5-cache/app-office/libreoffice-l10n-7.2.6.2
deleted file mode 100644
index 40f9aa30d42d..000000000000
--- a/metadata/md5-cache/app-office/libreoffice-l10n-7.2.6.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/rpm2targz
-DEFINED_PHASES=compile configure install prepare unpack
-DESCRIPTION=Translations for the Libreoffice suite
-EAPI=8
-HOMEPAGE=https://www.libreoffice.org
-INHERIT=rpm
-IUSE=offlinehelp l10n_am l10n_ar l10n_ast l10n_bg l10n_bn-IN l10n_bn l10n_bo l10n_bs l10n_ca-valencia l10n_ca l10n_cs l10n_da l10n_de l10n_dz l10n_el l10n_en-GB l10n_en l10n_en-ZA l10n_eo l10n_es l10n_et l10n_eu l10n_fi l10n_fr l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_km l10n_ko l10n_lo l10n_lt l10n_lv l10n_mk l10n_nb l10n_ne l10n_nl l10n_nn l10n_om l10n_pl l10n_pt-BR l10n_pt l10n_ro l10n_ru l10n_si l10n_sid l10n_sk l10n_sl l10n_sq l10n_sv l10n_ta l10n_tg l10n_tr l10n_ug l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW l10n_af l10n_as l10n_be l10n_br l10n_brx l10n_ckb l10n_cy l10n_dgo l10n_dsb l10n_fa l10n_fur l10n_fy l10n_ga l10n_gd l10n_gug l10n_hsb l10n_kab l10n_kk l10n_kmr-Latn l10n_kn l10n_kok l10n_ks l10n_lb l10n_mai l10n_ml l10n_mn l10n_mni l10n_mr l10n_my l10n_nr l10n_nso l10n_oc l10n_or l10n_pa l10n_rw l10n_sa l10n_sat l10n_sd l10n_sr-Latn l10n_sr l10n_ss l10n_st l10n_sw-TZ l10n_szl l10n_te l10n_th l10n_tn l10n_ts l10n_tt l10n_uz l10n_ve l10n_vec l10n_xh l10n_zu
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux
-LICENSE=|| ( LGPL-3 MPL-1.1 )
-RDEPEND=app-text/hunspell
-RESTRICT=strip
-SLOT=0
-SRC_URI=l10n_am? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_am.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_am.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_am.tar.gz ) ) l10n_ar? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_ar.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_ar.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_ar.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_ar.tar.gz ) ) l10n_ast? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_ast.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_ast.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_ast.tar.gz ) ) l10n_bg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_bg.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_bg.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_bg.tar.gz ) ) l10n_bn-IN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_bn-IN.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_bn-IN.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_bn-IN.tar.gz ) ) l10n_bn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_bn.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_bn.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_bn.tar.gz ) ) l10n_bo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_bo.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_bo.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_bo.tar.gz ) ) l10n_bs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_bs.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_bs.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_bs.tar.gz ) ) l10n_ca-valencia? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz ) ) l10n_ca? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_ca.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_ca.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_ca.tar.gz ) ) l10n_cs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_cs.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_cs.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_cs.tar.gz ) ) l10n_da? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_da.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_da.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_da.tar.gz ) ) l10n_de? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_de.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_de.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_de.tar.gz ) ) l10n_dz? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_dz.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_dz.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_dz.tar.gz ) ) l10n_el? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_el.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_el.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_el.tar.gz ) ) l10n_en-GB? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_en-GB.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_en-GB.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_en-GB.tar.gz ) ) l10n_en? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_en-US.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_en-US.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_en-US.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_en-US.tar.gz ) ) l10n_en-ZA? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_en-ZA.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_en-ZA.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_en-ZA.tar.gz ) ) l10n_eo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_eo.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_eo.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_eo.tar.gz ) ) l10n_es? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_es.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_es.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_es.tar.gz ) ) l10n_et? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_et.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_et.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_et.tar.gz ) ) l10n_eu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_eu.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_eu.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_eu.tar.gz ) ) l10n_fi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_fi.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_fi.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_fi.tar.gz ) ) l10n_fr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_fr.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_fr.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_fr.tar.gz ) ) l10n_gl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_gl.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_gl.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_gl.tar.gz ) ) l10n_gu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_gu.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_gu.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_gu.tar.gz ) ) l10n_he? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_he.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_he.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_he.tar.gz ) ) l10n_hi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_hi.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_hi.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_hi.tar.gz ) ) l10n_hr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_hr.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_hr.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_hr.tar.gz ) ) l10n_hu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_hu.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_hu.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_hu.tar.gz ) ) l10n_id? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_id.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_id.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_id.tar.gz ) ) l10n_is? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_is.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_is.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_is.tar.gz ) ) l10n_it? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_it.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_it.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_it.tar.gz ) ) l10n_ja? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_ja.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_ja.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_ja.tar.gz ) ) l10n_ka? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_ka.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_ka.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_ka.tar.gz ) ) l10n_km? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_km.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_km.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_km.tar.gz ) ) l10n_ko? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_ko.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_ko.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_ko.tar.gz ) ) l10n_lo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_lo.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_lo.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_lo.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_lo.tar.gz ) ) l10n_lt? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_lt.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_lt.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_lt.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_lt.tar.gz ) ) l10n_lv? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_lv.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_lv.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_lv.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_lv.tar.gz ) ) l10n_mk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_mk.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_mk.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_mk.tar.gz ) ) l10n_nb? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_nb.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_nb.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_nb.tar.gz ) ) l10n_ne? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_ne.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_ne.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_ne.tar.gz ) ) l10n_nl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_nl.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_nl.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_nl.tar.gz ) ) l10n_nn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_nn.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_nn.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_nn.tar.gz ) ) l10n_om? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_om.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_om.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_om.tar.gz ) ) l10n_pl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_pl.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_pl.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_pl.tar.gz ) ) l10n_pt-BR? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_pt-BR.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_pt-BR.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_pt-BR.tar.gz ) ) l10n_pt? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_pt.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_pt.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_pt.tar.gz ) ) l10n_ro? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_ro.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_ro.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_ro.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_ro.tar.gz ) ) l10n_ru? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_ru.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_ru.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_ru.tar.gz ) ) l10n_si? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_si.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_si.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_si.tar.gz ) ) l10n_sid? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_sid.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_sid.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_sid.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_sid.tar.gz ) ) l10n_sk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_sk.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_sk.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_sk.tar.gz ) ) l10n_sl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_sl.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_sl.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_sl.tar.gz ) ) l10n_sq? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_sq.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_sq.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_sq.tar.gz ) ) l10n_sv? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_sv.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_sv.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_sv.tar.gz ) ) l10n_ta? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_ta.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_ta.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_ta.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_ta.tar.gz ) ) l10n_tg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_tg.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_tg.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_tg.tar.gz ) ) l10n_tr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_tr.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_tr.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_tr.tar.gz ) ) l10n_ug? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_ug.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_ug.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_ug.tar.gz ) ) l10n_uk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_uk.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_uk.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_uk.tar.gz ) ) l10n_vi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_vi.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_vi.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_vi.tar.gz ) ) l10n_zh-CN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_zh-CN.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_zh-CN.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_zh-CN.tar.gz ) ) l10n_zh-TW? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_helppack_zh-TW.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_zh-TW.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_helppack_zh-TW.tar.gz ) ) l10n_am? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_am.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_am.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_am.tar.gz ) l10n_ar? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_ar.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ar.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ar.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ar.tar.gz ) l10n_ast? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_ast.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ast.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ast.tar.gz ) l10n_bg? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_bg.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_bg.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_bg.tar.gz ) l10n_bn-IN? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_bn-IN.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_bn-IN.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_bn-IN.tar.gz ) l10n_bn? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_bn.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_bn.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_bn.tar.gz ) l10n_bo? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_bo.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_bo.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_bo.tar.gz ) l10n_bs? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_bs.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_bs.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_bs.tar.gz ) l10n_ca-valencia? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz ) l10n_ca? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_ca.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ca.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ca.tar.gz ) l10n_cs? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_cs.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_cs.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_cs.tar.gz ) l10n_da? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_da.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_da.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_da.tar.gz ) l10n_de? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_de.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_de.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_de.tar.gz ) l10n_dz? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_dz.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_dz.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_dz.tar.gz ) l10n_el? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_el.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_el.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_el.tar.gz ) l10n_en-GB? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_en-GB.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_en-GB.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_en-GB.tar.gz ) l10n_en-ZA? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_en-ZA.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_en-ZA.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_en-ZA.tar.gz ) l10n_eo? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_eo.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_eo.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_eo.tar.gz ) l10n_es? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_es.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_es.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_es.tar.gz ) l10n_et? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_et.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_et.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_et.tar.gz ) l10n_eu? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_eu.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_eu.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_eu.tar.gz ) l10n_fi? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_fi.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_fi.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_fi.tar.gz ) l10n_fr? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_fr.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_fr.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_fr.tar.gz ) l10n_gl? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_gl.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_gl.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_gl.tar.gz ) l10n_gu? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_gu.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_gu.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_gu.tar.gz ) l10n_he? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_he.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_he.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_he.tar.gz ) l10n_hi? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_hi.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_hi.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_hi.tar.gz ) l10n_hr? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_hr.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_hr.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_hr.tar.gz ) l10n_hu? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_hu.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_hu.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_hu.tar.gz ) l10n_id? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_id.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_id.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_id.tar.gz ) l10n_is? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_is.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_is.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_is.tar.gz ) l10n_it? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_it.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_it.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_it.tar.gz ) l10n_ja? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_ja.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ja.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ja.tar.gz ) l10n_ka? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_ka.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ka.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ka.tar.gz ) l10n_km? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_km.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_km.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_km.tar.gz ) l10n_ko? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_ko.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ko.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ko.tar.gz ) l10n_lo? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_lo.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_lo.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_lo.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_lo.tar.gz ) l10n_lt? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_lt.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_lt.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_lt.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_lt.tar.gz ) l10n_lv? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_lv.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_lv.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_lv.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_lv.tar.gz ) l10n_mk? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_mk.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_mk.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_mk.tar.gz ) l10n_nb? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_nb.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_nb.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_nb.tar.gz ) l10n_ne? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_ne.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ne.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ne.tar.gz ) l10n_nl? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_nl.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_nl.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_nl.tar.gz ) l10n_nn? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_nn.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_nn.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_nn.tar.gz ) l10n_om? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_om.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_om.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_om.tar.gz ) l10n_pl? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_pl.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_pl.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_pl.tar.gz ) l10n_pt-BR? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_pt-BR.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_pt-BR.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_pt-BR.tar.gz ) l10n_pt? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_pt.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_pt.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_pt.tar.gz ) l10n_ro? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_ro.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ro.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ro.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ro.tar.gz ) l10n_ru? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_ru.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ru.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ru.tar.gz ) l10n_si? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_si.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_si.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_si.tar.gz ) l10n_sid? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_sid.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_sid.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_sid.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_sid.tar.gz ) l10n_sk? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_sk.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_sk.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_sk.tar.gz ) l10n_sl? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_sl.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_sl.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_sl.tar.gz ) l10n_sq? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_sq.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_sq.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_sq.tar.gz ) l10n_sv? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_sv.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_sv.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_sv.tar.gz ) l10n_ta? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_ta.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ta.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ta.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ta.tar.gz ) l10n_tg? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_tg.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_tg.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_tg.tar.gz ) l10n_tr? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_tr.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_tr.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_tr.tar.gz ) l10n_ug? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_ug.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ug.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ug.tar.gz ) l10n_uk? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_uk.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_uk.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_uk.tar.gz ) l10n_vi? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_vi.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_vi.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_vi.tar.gz ) l10n_zh-CN? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_zh-CN.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz ) l10n_zh-TW? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_zh-TW.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz ) l10n_af? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_af.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_af.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_af.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_af.tar.gz ) l10n_as? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_as.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_as.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_as.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_as.tar.gz ) l10n_be? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_be.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_be.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_be.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_be.tar.gz ) l10n_br? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_br.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_br.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_br.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_br.tar.gz ) l10n_brx? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_brx.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_brx.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_brx.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_brx.tar.gz ) l10n_ckb? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_ckb.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ckb.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ckb.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ckb.tar.gz ) l10n_cy? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_cy.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_cy.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_cy.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_cy.tar.gz ) l10n_dgo? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_dgo.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_dgo.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_dgo.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_dgo.tar.gz ) l10n_dsb? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_dsb.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_dsb.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_dsb.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_dsb.tar.gz ) l10n_fa? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_fa.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_fa.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_fa.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_fa.tar.gz ) l10n_fur? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_fur.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_fur.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_fur.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_fur.tar.gz ) l10n_fy? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_fy.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_fy.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_fy.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_fy.tar.gz ) l10n_ga? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_ga.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ga.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ga.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ga.tar.gz ) l10n_gd? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_gd.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_gd.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_gd.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_gd.tar.gz ) l10n_gug? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_gug.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_gug.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_gug.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_gug.tar.gz ) l10n_hsb? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_hsb.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_hsb.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_hsb.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_hsb.tar.gz ) l10n_kab? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_kab.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_kab.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_kab.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_kab.tar.gz ) l10n_kk? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_kk.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_kk.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_kk.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_kk.tar.gz ) l10n_kmr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz ) l10n_kn? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_kn.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_kn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_kn.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_kn.tar.gz ) l10n_kok? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_kok.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_kok.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_kok.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_kok.tar.gz ) l10n_ks? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_ks.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ks.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ks.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ks.tar.gz ) l10n_lb? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_lb.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_lb.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_lb.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_lb.tar.gz ) l10n_mai? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_mai.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_mai.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_mai.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_mai.tar.gz ) l10n_ml? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_ml.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ml.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ml.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ml.tar.gz ) l10n_mn? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_mn.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_mn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_mn.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_mn.tar.gz ) l10n_mni? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_mni.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_mni.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_mni.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_mni.tar.gz ) l10n_mr? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_mr.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_mr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_mr.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_mr.tar.gz ) l10n_my? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_my.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_my.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_my.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_my.tar.gz ) l10n_nr? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_nr.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_nr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_nr.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_nr.tar.gz ) l10n_nso? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_nso.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_nso.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_nso.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_nso.tar.gz ) l10n_oc? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_oc.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_oc.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_oc.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_oc.tar.gz ) l10n_or? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_or.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_or.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_or.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_or.tar.gz ) l10n_pa? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_pa-IN.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_pa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_pa-IN.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_pa-IN.tar.gz ) l10n_rw? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_rw.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_rw.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_rw.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_rw.tar.gz ) l10n_sa? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_sa-IN.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_sa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_sa-IN.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_sa-IN.tar.gz ) l10n_sat? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_sat.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_sat.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_sat.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_sat.tar.gz ) l10n_sd? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_sd.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_sd.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_sd.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_sd.tar.gz ) l10n_sr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz ) l10n_sr? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_sr.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_sr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_sr.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_sr.tar.gz ) l10n_ss? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_ss.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ss.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ss.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ss.tar.gz ) l10n_st? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_st.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_st.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_st.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_st.tar.gz ) l10n_sw-TZ? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz ) l10n_szl? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_szl.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_szl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_szl.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_szl.tar.gz ) l10n_te? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_te.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_te.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_te.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_te.tar.gz ) l10n_th? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_th.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_th.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_th.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_th.tar.gz ) l10n_tn? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_tn.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_tn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_tn.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_tn.tar.gz ) l10n_ts? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_ts.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ts.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ts.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ts.tar.gz ) l10n_tt? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_tt.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_tt.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_tt.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_tt.tar.gz ) l10n_uz? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_uz.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_uz.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_uz.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_uz.tar.gz ) l10n_ve? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_ve.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ve.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ve.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_ve.tar.gz ) l10n_vec? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_vec.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_vec.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_vec.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_vec.tar.gz ) l10n_xh? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_xh.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_xh.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_xh.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_xh.tar.gz ) l10n_zu? ( https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm_langpack_zu.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_zu.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.2.6/rpm/x86_64/LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_zu.tar.gz -> LibreOffice_7.2.6.2_Linux_x86-64_rpm_langpack_zu.tar.gz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	rpm	f73e907469f65e52192f110dec72dce0
-_md5_=5d9daa6e3403080aecf2468d0dc5ef65
diff --git a/metadata/md5-cache/app-office/libreoffice-l10n-7.3.3.2 b/metadata/md5-cache/app-office/libreoffice-l10n-7.3.3.2
index 1c149eb7f320..acdfd1c4ee64 100644
--- a/metadata/md5-cache/app-office/libreoffice-l10n-7.3.3.2
+++ b/metadata/md5-cache/app-office/libreoffice-l10n-7.3.3.2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.libreoffice.org
 INHERIT=rpm
 IUSE=offlinehelp l10n_am l10n_ar l10n_ast l10n_bg l10n_bn-IN l10n_bn l10n_bo l10n_bs l10n_ca-valencia l10n_ca l10n_cs l10n_da l10n_de l10n_dz l10n_el l10n_en-GB l10n_en l10n_en-ZA l10n_eo l10n_es l10n_et l10n_eu l10n_fi l10n_fr l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_km l10n_ko l10n_lo l10n_lt l10n_lv l10n_mk l10n_nb l10n_ne l10n_nl l10n_nn l10n_om l10n_pl l10n_pt-BR l10n_pt l10n_ro l10n_ru l10n_si l10n_sid l10n_sk l10n_sl l10n_sq l10n_sv l10n_ta l10n_tg l10n_tr l10n_ug l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW l10n_af l10n_as l10n_be l10n_br l10n_brx l10n_ckb l10n_cy l10n_dgo l10n_dsb l10n_fa l10n_fur l10n_fy l10n_ga l10n_gd l10n_gug l10n_hsb l10n_kab l10n_kk l10n_kmr-Latn l10n_kn l10n_kok l10n_ks l10n_lb l10n_mai l10n_ml l10n_mn l10n_mni l10n_mr l10n_my l10n_nr l10n_nso l10n_oc l10n_or l10n_pa l10n_rw l10n_sa l10n_sat l10n_sd l10n_sr-Latn l10n_sr l10n_ss l10n_st l10n_sw-TZ l10n_szl l10n_te l10n_th l10n_tn l10n_ts l10n_tt l10n_uz l10n_ve l10n_vec l10n_xh l10n_zu
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux
 LICENSE=|| ( LGPL-3 MPL-1.1 )
 RDEPEND=app-text/hunspell
 RESTRICT=strip
 SLOT=0
 SRC_URI=l10n_am? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_am.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_am.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_am.tar.gz ) ) l10n_ar? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_ar.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_ar.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_ar.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_ar.tar.gz ) ) l10n_ast? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_ast.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_ast.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_ast.tar.gz ) ) l10n_bg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_bg.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_bg.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_bg.tar.gz ) ) l10n_bn-IN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_bn-IN.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_bn-IN.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_bn-IN.tar.gz ) ) l10n_bn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_bn.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_bn.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_bn.tar.gz ) ) l10n_bo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_bo.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_bo.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_bo.tar.gz ) ) l10n_bs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_bs.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_bs.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_bs.tar.gz ) ) l10n_ca-valencia? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz ) ) l10n_ca? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_ca.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_ca.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_ca.tar.gz ) ) l10n_cs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_cs.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_cs.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_cs.tar.gz ) ) l10n_da? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_da.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_da.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_da.tar.gz ) ) l10n_de? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_de.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_de.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_de.tar.gz ) ) l10n_dz? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_dz.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_dz.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_dz.tar.gz ) ) l10n_el? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_el.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_el.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_el.tar.gz ) ) l10n_en-GB? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_en-GB.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_en-GB.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_en-GB.tar.gz ) ) l10n_en? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_en-US.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_en-US.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_en-US.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_en-US.tar.gz ) ) l10n_en-ZA? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_en-ZA.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_en-ZA.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_en-ZA.tar.gz ) ) l10n_eo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_eo.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_eo.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_eo.tar.gz ) ) l10n_es? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_es.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_es.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_es.tar.gz ) ) l10n_et? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_et.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_et.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_et.tar.gz ) ) l10n_eu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_eu.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_eu.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_eu.tar.gz ) ) l10n_fi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_fi.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_fi.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_fi.tar.gz ) ) l10n_fr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_fr.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_fr.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_fr.tar.gz ) ) l10n_gl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_gl.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_gl.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_gl.tar.gz ) ) l10n_gu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_gu.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_gu.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_gu.tar.gz ) ) l10n_he? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_he.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_he.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_he.tar.gz ) ) l10n_hi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_hi.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_hi.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_hi.tar.gz ) ) l10n_hr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_hr.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_hr.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_hr.tar.gz ) ) l10n_hu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_hu.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_hu.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_hu.tar.gz ) ) l10n_id? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_id.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_id.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_id.tar.gz ) ) l10n_is? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_is.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_is.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_is.tar.gz ) ) l10n_it? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_it.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_it.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_it.tar.gz ) ) l10n_ja? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_ja.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_ja.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_ja.tar.gz ) ) l10n_ka? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_ka.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_ka.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_ka.tar.gz ) ) l10n_km? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_km.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_km.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_km.tar.gz ) ) l10n_ko? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_ko.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_ko.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_ko.tar.gz ) ) l10n_lo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_lo.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_lo.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_lo.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_lo.tar.gz ) ) l10n_lt? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_lt.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_lt.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_lt.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_lt.tar.gz ) ) l10n_lv? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_lv.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_lv.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_lv.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_lv.tar.gz ) ) l10n_mk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_mk.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_mk.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_mk.tar.gz ) ) l10n_nb? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_nb.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_nb.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_nb.tar.gz ) ) l10n_ne? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_ne.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_ne.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_ne.tar.gz ) ) l10n_nl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_nl.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_nl.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_nl.tar.gz ) ) l10n_nn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_nn.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_nn.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_nn.tar.gz ) ) l10n_om? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_om.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_om.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_om.tar.gz ) ) l10n_pl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_pl.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_pl.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_pl.tar.gz ) ) l10n_pt-BR? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_pt-BR.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_pt-BR.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_pt-BR.tar.gz ) ) l10n_pt? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_pt.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_pt.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_pt.tar.gz ) ) l10n_ro? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_ro.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_ro.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_ro.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_ro.tar.gz ) ) l10n_ru? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_ru.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_ru.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_ru.tar.gz ) ) l10n_si? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_si.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_si.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_si.tar.gz ) ) l10n_sid? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_sid.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_sid.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_sid.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_sid.tar.gz ) ) l10n_sk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_sk.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_sk.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_sk.tar.gz ) ) l10n_sl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_sl.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_sl.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_sl.tar.gz ) ) l10n_sq? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_sq.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_sq.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_sq.tar.gz ) ) l10n_sv? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_sv.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_sv.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_sv.tar.gz ) ) l10n_ta? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_ta.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_ta.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_ta.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_ta.tar.gz ) ) l10n_tg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_tg.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_tg.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_tg.tar.gz ) ) l10n_tr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_tr.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_tr.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_tr.tar.gz ) ) l10n_ug? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_ug.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_ug.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_ug.tar.gz ) ) l10n_uk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_uk.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_uk.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_uk.tar.gz ) ) l10n_vi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_vi.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_vi.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_vi.tar.gz ) ) l10n_zh-CN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_zh-CN.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_zh-CN.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_zh-CN.tar.gz ) ) l10n_zh-TW? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_helppack_zh-TW.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_zh-TW.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_helppack_zh-TW.tar.gz ) ) l10n_am? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_am.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_am.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_am.tar.gz ) l10n_ar? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_ar.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ar.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ar.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ar.tar.gz ) l10n_ast? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_ast.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ast.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ast.tar.gz ) l10n_bg? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_bg.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_bg.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_bg.tar.gz ) l10n_bn-IN? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_bn-IN.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_bn-IN.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_bn-IN.tar.gz ) l10n_bn? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_bn.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_bn.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_bn.tar.gz ) l10n_bo? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_bo.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_bo.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_bo.tar.gz ) l10n_bs? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_bs.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_bs.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_bs.tar.gz ) l10n_ca-valencia? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz ) l10n_ca? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_ca.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ca.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ca.tar.gz ) l10n_cs? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_cs.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_cs.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_cs.tar.gz ) l10n_da? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_da.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_da.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_da.tar.gz ) l10n_de? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_de.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_de.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_de.tar.gz ) l10n_dz? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_dz.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_dz.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_dz.tar.gz ) l10n_el? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_el.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_el.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_el.tar.gz ) l10n_en-GB? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_en-GB.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_en-GB.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_en-GB.tar.gz ) l10n_en-ZA? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_en-ZA.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_en-ZA.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_en-ZA.tar.gz ) l10n_eo? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_eo.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_eo.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_eo.tar.gz ) l10n_es? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_es.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_es.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_es.tar.gz ) l10n_et? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_et.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_et.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_et.tar.gz ) l10n_eu? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_eu.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_eu.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_eu.tar.gz ) l10n_fi? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_fi.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_fi.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_fi.tar.gz ) l10n_fr? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_fr.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_fr.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_fr.tar.gz ) l10n_gl? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_gl.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_gl.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_gl.tar.gz ) l10n_gu? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_gu.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_gu.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_gu.tar.gz ) l10n_he? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_he.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_he.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_he.tar.gz ) l10n_hi? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_hi.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_hi.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_hi.tar.gz ) l10n_hr? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_hr.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_hr.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_hr.tar.gz ) l10n_hu? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_hu.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_hu.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_hu.tar.gz ) l10n_id? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_id.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_id.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_id.tar.gz ) l10n_is? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_is.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_is.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_is.tar.gz ) l10n_it? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_it.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_it.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_it.tar.gz ) l10n_ja? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_ja.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ja.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ja.tar.gz ) l10n_ka? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_ka.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ka.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ka.tar.gz ) l10n_km? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_km.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_km.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_km.tar.gz ) l10n_ko? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_ko.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ko.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ko.tar.gz ) l10n_lo? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_lo.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_lo.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_lo.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_lo.tar.gz ) l10n_lt? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_lt.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_lt.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_lt.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_lt.tar.gz ) l10n_lv? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_lv.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_lv.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_lv.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_lv.tar.gz ) l10n_mk? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_mk.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_mk.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_mk.tar.gz ) l10n_nb? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_nb.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_nb.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_nb.tar.gz ) l10n_ne? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_ne.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ne.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ne.tar.gz ) l10n_nl? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_nl.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_nl.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_nl.tar.gz ) l10n_nn? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_nn.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_nn.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_nn.tar.gz ) l10n_om? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_om.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_om.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_om.tar.gz ) l10n_pl? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_pl.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_pl.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_pl.tar.gz ) l10n_pt-BR? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_pt-BR.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_pt-BR.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_pt-BR.tar.gz ) l10n_pt? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_pt.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_pt.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_pt.tar.gz ) l10n_ro? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_ro.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ro.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ro.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ro.tar.gz ) l10n_ru? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_ru.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ru.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ru.tar.gz ) l10n_si? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_si.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_si.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_si.tar.gz ) l10n_sid? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_sid.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_sid.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_sid.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_sid.tar.gz ) l10n_sk? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_sk.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_sk.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_sk.tar.gz ) l10n_sl? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_sl.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_sl.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_sl.tar.gz ) l10n_sq? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_sq.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_sq.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_sq.tar.gz ) l10n_sv? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_sv.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_sv.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_sv.tar.gz ) l10n_ta? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_ta.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ta.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ta.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ta.tar.gz ) l10n_tg? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_tg.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_tg.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_tg.tar.gz ) l10n_tr? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_tr.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_tr.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_tr.tar.gz ) l10n_ug? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_ug.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ug.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ug.tar.gz ) l10n_uk? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_uk.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_uk.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_uk.tar.gz ) l10n_vi? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_vi.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_vi.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_vi.tar.gz ) l10n_zh-CN? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_zh-CN.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz ) l10n_zh-TW? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_zh-TW.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz ) l10n_af? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_af.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_af.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_af.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_af.tar.gz ) l10n_as? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_as.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_as.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_as.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_as.tar.gz ) l10n_be? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_be.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_be.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_be.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_be.tar.gz ) l10n_br? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_br.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_br.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_br.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_br.tar.gz ) l10n_brx? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_brx.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_brx.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_brx.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_brx.tar.gz ) l10n_ckb? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_ckb.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ckb.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ckb.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ckb.tar.gz ) l10n_cy? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_cy.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_cy.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_cy.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_cy.tar.gz ) l10n_dgo? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_dgo.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_dgo.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_dgo.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_dgo.tar.gz ) l10n_dsb? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_dsb.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_dsb.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_dsb.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_dsb.tar.gz ) l10n_fa? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_fa.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_fa.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_fa.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_fa.tar.gz ) l10n_fur? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_fur.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_fur.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_fur.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_fur.tar.gz ) l10n_fy? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_fy.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_fy.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_fy.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_fy.tar.gz ) l10n_ga? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_ga.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ga.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ga.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ga.tar.gz ) l10n_gd? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_gd.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_gd.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_gd.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_gd.tar.gz ) l10n_gug? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_gug.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_gug.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_gug.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_gug.tar.gz ) l10n_hsb? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_hsb.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_hsb.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_hsb.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_hsb.tar.gz ) l10n_kab? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_kab.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_kab.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_kab.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_kab.tar.gz ) l10n_kk? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_kk.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_kk.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_kk.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_kk.tar.gz ) l10n_kmr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz ) l10n_kn? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_kn.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_kn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_kn.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_kn.tar.gz ) l10n_kok? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_kok.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_kok.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_kok.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_kok.tar.gz ) l10n_ks? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_ks.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ks.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ks.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ks.tar.gz ) l10n_lb? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_lb.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_lb.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_lb.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_lb.tar.gz ) l10n_mai? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_mai.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_mai.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_mai.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_mai.tar.gz ) l10n_ml? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_ml.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ml.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ml.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ml.tar.gz ) l10n_mn? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_mn.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_mn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_mn.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_mn.tar.gz ) l10n_mni? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_mni.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_mni.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_mni.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_mni.tar.gz ) l10n_mr? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_mr.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_mr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_mr.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_mr.tar.gz ) l10n_my? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_my.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_my.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_my.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_my.tar.gz ) l10n_nr? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_nr.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_nr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_nr.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_nr.tar.gz ) l10n_nso? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_nso.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_nso.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_nso.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_nso.tar.gz ) l10n_oc? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_oc.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_oc.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_oc.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_oc.tar.gz ) l10n_or? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_or.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_or.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_or.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_or.tar.gz ) l10n_pa? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_pa-IN.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_pa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_pa-IN.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_pa-IN.tar.gz ) l10n_rw? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_rw.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_rw.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_rw.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_rw.tar.gz ) l10n_sa? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_sa-IN.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_sa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_sa-IN.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_sa-IN.tar.gz ) l10n_sat? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_sat.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_sat.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_sat.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_sat.tar.gz ) l10n_sd? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_sd.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_sd.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_sd.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_sd.tar.gz ) l10n_sr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz ) l10n_sr? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_sr.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_sr.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_sr.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_sr.tar.gz ) l10n_ss? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_ss.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ss.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ss.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ss.tar.gz ) l10n_st? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_st.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_st.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_st.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_st.tar.gz ) l10n_sw-TZ? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz ) l10n_szl? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_szl.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_szl.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_szl.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_szl.tar.gz ) l10n_te? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_te.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_te.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_te.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_te.tar.gz ) l10n_th? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_th.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_th.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_th.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_th.tar.gz ) l10n_tn? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_tn.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_tn.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_tn.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_tn.tar.gz ) l10n_ts? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_ts.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ts.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ts.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ts.tar.gz ) l10n_tt? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_tt.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_tt.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_tt.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_tt.tar.gz ) l10n_uz? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_uz.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_uz.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_uz.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_uz.tar.gz ) l10n_ve? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_ve.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ve.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ve.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_ve.tar.gz ) l10n_vec? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_vec.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_vec.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_vec.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_vec.tar.gz ) l10n_xh? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_xh.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_xh.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_xh.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_xh.tar.gz ) l10n_zu? ( https://download.documentfoundation.org/libreoffice/stable/7.3.3/rpm/x86_64/LibreOffice_7.3.3_Linux_x86-64_rpm_langpack_zu.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_zu.tar.gz https://download.documentfoundation.org/libreoffice/testing/7.3.3/rpm/x86_64/LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_zu.tar.gz -> LibreOffice_7.3.3.2_Linux_x86-64_rpm_langpack_zu.tar.gz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	rpm	f73e907469f65e52192f110dec72dce0
-_md5_=7336e81a7eda823d016f656db60c5ae0
+_md5_=5d9daa6e3403080aecf2468d0dc5ef65
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index b6818b5baba8..0b8598a89e96 100644
Binary files a/metadata/md5-cache/app-portage/Manifest.gz and b/metadata/md5-cache/app-portage/Manifest.gz differ
diff --git a/metadata/md5-cache/app-portage/portage-utils-0.94.1 b/metadata/md5-cache/app-portage/portage-utils-0.94.1
new file mode 100644
index 000000000000..446bbbef9be3
--- /dev/null
+++ b/metadata/md5-cache/app-portage/portage-utils-0.94.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure
+DEPEND=qmanifest? ( openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) static? ( app-crypt/libb2:=[static-libs] dev-libs/openssl:0=[static-libs] sys-libs/zlib:=[static-libs] app-crypt/gpgme:=[static-libs] ) !static? ( app-crypt/libb2:= dev-libs/openssl:0= sys-libs/zlib:= app-crypt/gpgme:= ) ) qtegrity? ( openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) static? ( dev-libs/openssl:0=[static-libs] ) !static? ( dev-libs/openssl:0= ) )
+DESCRIPTION=Small and fast Portage helper tools written in C
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/Portage-utils
+IUSE=nls static openmp +qmanifest +qtegrity
+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=qmanifest? ( openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) static? ( app-crypt/libb2:=[static-libs] dev-libs/openssl:0=[static-libs] sys-libs/zlib:=[static-libs] app-crypt/gpgme:=[static-libs] ) !static? ( app-crypt/libb2:= dev-libs/openssl:0= sys-libs/zlib:= app-crypt/gpgme:= ) ) qtegrity? ( openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) static? ( dev-libs/openssl:0=[static-libs] ) !static? ( dev-libs/openssl:0= ) )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~grobian/distfiles/portage-utils-0.94.1.tar.xz
+_md5_=9efb61b81c6fdd55a9a3806f9dfd20d3
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 246fc170c441..67d0fad023fb 100644
Binary files a/metadata/md5-cache/app-shells/Manifest.gz and b/metadata/md5-cache/app-shells/Manifest.gz differ
diff --git a/metadata/md5-cache/app-shells/bash-2.05b_p13 b/metadata/md5-cache/app-shells/bash-2.05b_p13
index ac7ec58f2ff4..76d1ae2bfa3a 100644
--- a/metadata/md5-cache/app-shells/bash-2.05b_p13
+++ b/metadata/md5-cache/app-shells/bash-2.05b_p13
@@ -9,6 +9,6 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=!static? ( >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-6.2 ) )
 SLOT=2.05b
-SRC_URI=mirror://gnu/bash/bash-2.05b.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-001 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-002 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-003 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-004 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-005 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-006 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-007 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-008 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-009 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-010 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-011 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-012 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-013 mirror://gnu/bash/bash-2.05b-patches/bash205b-001 mirror://gnu/bash/bash-2.05b-patches/bash205b-002 mirror://gnu/bash/bash-2.05b-patches/bash205b-003 mirror://gnu/bash/bash-2.05b-patches/bash205b-004 mirror://gnu/bash/bash-2.05b-patches/bash205b-005 mirror://gnu/bash/bash-2.05b-patches/bash205b-006 mirror://gnu/bash/bash-2.05b-patches/bash205b-007 mirror://gnu/bash/bash-2.05b-patches/bash205b-008 mirror://gnu/bash/bash-2.05b-patches/bash205b-009 mirror://gnu/bash/bash-2.05b-patches/bash205b-010 mirror://gnu/bash/bash-2.05b-patches/bash205b-011 mirror://gnu/bash/bash-2.05b-patches/bash205b-012 mirror://gnu/bash/bash-2.05b-patches/bash205b-013
+SRC_URI=mirror://gnu/bash/bash-2.05b.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-001 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-002 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-003 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-004 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-005 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-006 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-007 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-008 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-009 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-010 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-011 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-012 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-013 mirror://gnu/bash/bash-2.05b-patches/bash205b-001 mirror://gnu/bash/bash-2.05b-patches/bash205b-002 mirror://gnu/bash/bash-2.05b-patches/bash205b-003 mirror://gnu/bash/bash-2.05b-patches/bash205b-004 mirror://gnu/bash/bash-2.05b-patches/bash205b-005 mirror://gnu/bash/bash-2.05b-patches/bash205b-006 mirror://gnu/bash/bash-2.05b-patches/bash205b-007 mirror://gnu/bash/bash-2.05b-patches/bash205b-008 mirror://gnu/bash/bash-2.05b-patches/bash205b-009 mirror://gnu/bash/bash-2.05b-patches/bash205b-010 mirror://gnu/bash/bash-2.05b-patches/bash205b-011 mirror://gnu/bash/bash-2.05b-patches/bash205b-012 mirror://gnu/bash/bash-2.05b-patches/bash205b-013 https://dev.gentoo.org/~sam/distfiles/app-shells/bash/bash-2.05b_p13-patches.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ffc80d0ec80637353c15e6dedde5cb67
+_md5_=7ce6abe4370efa305e98d77c5d6f6fa7
diff --git a/metadata/md5-cache/app-shells/bash-3.0_p22 b/metadata/md5-cache/app-shells/bash-3.0_p22
index bf5cc8149f33..f7e72ad63597 100644
--- a/metadata/md5-cache/app-shells/bash-3.0_p22
+++ b/metadata/md5-cache/app-shells/bash-3.0_p22
@@ -9,6 +9,6 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=!static? ( >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-6.2 ) )
 SLOT=3.0
-SRC_URI=mirror://gnu/bash/bash-3.0.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-001 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-002 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-003 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-004 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-005 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-006 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-007 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-008 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-009 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-010 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-011 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-012 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-013 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-014 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-015 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-016 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-017 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-018 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-019 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-020 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-021 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-022 mirror://gnu/bash/bash-3.0-patches/bash30-001 mirror://gnu/bash/bash-3.0-patches/bash30-002 mirror://gnu/bash/bash-3.0-patches/bash30-003 mirror://gnu/bash/bash-3.0-patches/bash30-004 mirror://gnu/bash/bash-3.0-patches/bash30-005 mirror://gnu/bash/bash-3.0-patches/bash30-006 mirror://gnu/bash/bash-3.0-patches/bash30-007 mirror://gnu/bash/bash-3.0-patches/bash30-008 mirror://gnu/bash/bash-3.0-patches/bash30-009 mirror://gnu/bash/bash-3.0-patches/bash30-010 mirror://gnu/bash/bash-3.0-patches/bash30-011 mirror://gnu/bash/bash-3.0-patches/bash30-012 mirror://gnu/bash/bash-3.0-patches/bash30-013 mirror://gnu/bash/bash-3.0-patches/bash30-014 mirror://gnu/bash/bash-3.0-patches/bash30-015 mirror://gnu/bash/bash-3.0-patches/bash30-016 mirror://gnu/bash/bash-3.0-patches/bash30-017 mirror://gnu/bash/bash-3.0-patches/bash30-018 mirror://gnu/bash/bash-3.0-patches/bash30-019 mirror://gnu/bash/bash-3.0-patches/bash30-020 mirror://gnu/bash/bash-3.0-patches/bash30-021 mirror://gnu/bash/bash-3.0-patches/bash30-022
+SRC_URI=mirror://gnu/bash/bash-3.0.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-001 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-002 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-003 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-004 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-005 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-006 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-007 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-008 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-009 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-010 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-011 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-012 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-013 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-014 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-015 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-016 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-017 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-018 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-019 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-020 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-021 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-022 mirror://gnu/bash/bash-3.0-patches/bash30-001 mirror://gnu/bash/bash-3.0-patches/bash30-002 mirror://gnu/bash/bash-3.0-patches/bash30-003 mirror://gnu/bash/bash-3.0-patches/bash30-004 mirror://gnu/bash/bash-3.0-patches/bash30-005 mirror://gnu/bash/bash-3.0-patches/bash30-006 mirror://gnu/bash/bash-3.0-patches/bash30-007 mirror://gnu/bash/bash-3.0-patches/bash30-008 mirror://gnu/bash/bash-3.0-patches/bash30-009 mirror://gnu/bash/bash-3.0-patches/bash30-010 mirror://gnu/bash/bash-3.0-patches/bash30-011 mirror://gnu/bash/bash-3.0-patches/bash30-012 mirror://gnu/bash/bash-3.0-patches/bash30-013 mirror://gnu/bash/bash-3.0-patches/bash30-014 mirror://gnu/bash/bash-3.0-patches/bash30-015 mirror://gnu/bash/bash-3.0-patches/bash30-016 mirror://gnu/bash/bash-3.0-patches/bash30-017 mirror://gnu/bash/bash-3.0-patches/bash30-018 mirror://gnu/bash/bash-3.0-patches/bash30-019 mirror://gnu/bash/bash-3.0-patches/bash30-020 mirror://gnu/bash/bash-3.0-patches/bash30-021 mirror://gnu/bash/bash-3.0-patches/bash30-022 https://dev.gentoo.org/~sam/distfiles/app-shells/bash/bash-3.0_p22-patches.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=d5266fe29edf1b1137d54a9962c5616b
+_md5_=6faa6a71e001cf7724bf3ba1bbe42082
diff --git a/metadata/md5-cache/app-shells/bash-3.1_p23 b/metadata/md5-cache/app-shells/bash-3.1_p23
index 20cb80d64619..364c82e3fc87 100644
--- a/metadata/md5-cache/app-shells/bash-3.1_p23
+++ b/metadata/md5-cache/app-shells/bash-3.1_p23
@@ -9,6 +9,6 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=!static? ( >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-6.2 ) )
 SLOT=3.1
-SRC_URI=mirror://gnu/bash/bash-3.1.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-001 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-002 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-003 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-004 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-005 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-006 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-007 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-008 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-009 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-010 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-011 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-012 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-013 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-014 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-015 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-016 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-017 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-018 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-019 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-020 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-021 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-022 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-023 mirror://gnu/bash/bash-3.1-patches/bash31-001 mirror://gnu/bash/bash-3.1-patches/bash31-002 mirror://gnu/bash/bash-3.1-patches/bash31-003 mirror://gnu/bash/bash-3.1-patches/bash31-004 mirror://gnu/bash/bash-3.1-patches/bash31-005 mirror://gnu/bash/bash-3.1-patches/bash31-006 mirror://gnu/bash/bash-3.1-patches/bash31-007 mirror://gnu/bash/bash-3.1-patches/bash31-008 mirror://gnu/bash/bash-3.1-patches/bash31-009 mirror://gnu/bash/bash-3.1-patches/bash31-010 mirror://gnu/bash/bash-3.1-patches/bash31-011 mirror://gnu/bash/bash-3.1-patches/bash31-012 mirror://gnu/bash/bash-3.1-patches/bash31-013 mirror://gnu/bash/bash-3.1-patches/bash31-014 mirror://gnu/bash/bash-3.1-patches/bash31-015 mirror://gnu/bash/bash-3.1-patches/bash31-016 mirror://gnu/bash/bash-3.1-patches/bash31-017 mirror://gnu/bash/bash-3.1-patches/bash31-018 mirror://gnu/bash/bash-3.1-patches/bash31-019 mirror://gnu/bash/bash-3.1-patches/bash31-020 mirror://gnu/bash/bash-3.1-patches/bash31-021 mirror://gnu/bash/bash-3.1-patches/bash31-022 mirror://gnu/bash/bash-3.1-patches/bash31-023
+SRC_URI=mirror://gnu/bash/bash-3.1.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-001 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-002 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-003 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-004 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-005 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-006 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-007 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-008 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-009 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-010 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-011 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-012 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-013 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-014 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-015 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-016 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-017 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-018 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-019 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-020 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-021 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-022 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-023 mirror://gnu/bash/bash-3.1-patches/bash31-001 mirror://gnu/bash/bash-3.1-patches/bash31-002 mirror://gnu/bash/bash-3.1-patches/bash31-003 mirror://gnu/bash/bash-3.1-patches/bash31-004 mirror://gnu/bash/bash-3.1-patches/bash31-005 mirror://gnu/bash/bash-3.1-patches/bash31-006 mirror://gnu/bash/bash-3.1-patches/bash31-007 mirror://gnu/bash/bash-3.1-patches/bash31-008 mirror://gnu/bash/bash-3.1-patches/bash31-009 mirror://gnu/bash/bash-3.1-patches/bash31-010 mirror://gnu/bash/bash-3.1-patches/bash31-011 mirror://gnu/bash/bash-3.1-patches/bash31-012 mirror://gnu/bash/bash-3.1-patches/bash31-013 mirror://gnu/bash/bash-3.1-patches/bash31-014 mirror://gnu/bash/bash-3.1-patches/bash31-015 mirror://gnu/bash/bash-3.1-patches/bash31-016 mirror://gnu/bash/bash-3.1-patches/bash31-017 mirror://gnu/bash/bash-3.1-patches/bash31-018 mirror://gnu/bash/bash-3.1-patches/bash31-019 mirror://gnu/bash/bash-3.1-patches/bash31-020 mirror://gnu/bash/bash-3.1-patches/bash31-021 mirror://gnu/bash/bash-3.1-patches/bash31-022 mirror://gnu/bash/bash-3.1-patches/bash31-023 https://dev.gentoo.org/~sam/distfiles/app-shells/bash/bash-3.1_p23-patches.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=1acfc8fa5f768e31e8461c6b91447041
+_md5_=c2ce4046d783bb44d0bc21f691ab069a
diff --git a/metadata/md5-cache/app-shells/bash-3.2_p57 b/metadata/md5-cache/app-shells/bash-3.2_p57
index 65c3a4f90517..3614bccc2388 100644
--- a/metadata/md5-cache/app-shells/bash-3.2_p57
+++ b/metadata/md5-cache/app-shells/bash-3.2_p57
@@ -9,6 +9,6 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=!static? ( >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-6.2 ) )
 SLOT=3.2
-SRC_URI=mirror://gnu/bash/bash-3.2.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-001 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-002 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-003 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-004 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-005 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-006 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-007 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-008 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-009 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-010 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-011 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-012 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-013 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-014 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-015 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-016 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-017 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-018 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-019 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-020 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-021 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-022 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-023 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-024 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-025 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-026 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-027 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-028 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-029 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-030 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-031 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-032 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-033 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-034 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-035 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-036 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-037 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-038 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-039 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-040 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-041 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-042 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-043 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-044 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-045 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-046 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-047 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-048 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-049 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-050 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-051 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-052 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-053 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-054 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-055 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-056 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-057 mirror://gnu/bash/bash-3.2-patches/bash32-001 mirror://gnu/bash/bash-3.2-patches/bash32-002 mirror://gnu/bash/bash-3.2-patches/bash32-003 mirror://gnu/bash/bash-3.2-patches/bash32-004 mirror://gnu/bash/bash-3.2-patches/bash32-005 mirror://gnu/bash/bash-3.2-patches/bash32-006 mirror://gnu/bash/bash-3.2-patches/bash32-007 mirror://gnu/bash/bash-3.2-patches/bash32-008 mirror://gnu/bash/bash-3.2-patches/bash32-009 mirror://gnu/bash/bash-3.2-patches/bash32-010 mirror://gnu/bash/bash-3.2-patches/bash32-011 mirror://gnu/bash/bash-3.2-patches/bash32-012 mirror://gnu/bash/bash-3.2-patches/bash32-013 mirror://gnu/bash/bash-3.2-patches/bash32-014 mirror://gnu/bash/bash-3.2-patches/bash32-015 mirror://gnu/bash/bash-3.2-patches/bash32-016 mirror://gnu/bash/bash-3.2-patches/bash32-017 mirror://gnu/bash/bash-3.2-patches/bash32-018 mirror://gnu/bash/bash-3.2-patches/bash32-019 mirror://gnu/bash/bash-3.2-patches/bash32-020 mirror://gnu/bash/bash-3.2-patches/bash32-021 mirror://gnu/bash/bash-3.2-patches/bash32-022 mirror://gnu/bash/bash-3.2-patches/bash32-023 mirror://gnu/bash/bash-3.2-patches/bash32-024 mirror://gnu/bash/bash-3.2-patches/bash32-025 mirror://gnu/bash/bash-3.2-patches/bash32-026 mirror://gnu/bash/bash-3.2-patches/bash32-027 mirror://gnu/bash/bash-3.2-patches/bash32-028 mirror://gnu/bash/bash-3.2-patches/bash32-029 mirror://gnu/bash/bash-3.2-patches/bash32-030 mirror://gnu/bash/bash-3.2-patches/bash32-031 mirror://gnu/bash/bash-3.2-patches/bash32-032 mirror://gnu/bash/bash-3.2-patches/bash32-033 mirror://gnu/bash/bash-3.2-patches/bash32-034 mirror://gnu/bash/bash-3.2-patches/bash32-035 mirror://gnu/bash/bash-3.2-patches/bash32-036 mirror://gnu/bash/bash-3.2-patches/bash32-037 mirror://gnu/bash/bash-3.2-patches/bash32-038 mirror://gnu/bash/bash-3.2-patches/bash32-039 mirror://gnu/bash/bash-3.2-patches/bash32-040 mirror://gnu/bash/bash-3.2-patches/bash32-041 mirror://gnu/bash/bash-3.2-patches/bash32-042 mirror://gnu/bash/bash-3.2-patches/bash32-043 mirror://gnu/bash/bash-3.2-patches/bash32-044 mirror://gnu/bash/bash-3.2-patches/bash32-045 mirror://gnu/bash/bash-3.2-patches/bash32-046 mirror://gnu/bash/bash-3.2-patches/bash32-047 mirror://gnu/bash/bash-3.2-patches/bash32-048 mirror://gnu/bash/bash-3.2-patches/bash32-049 mirror://gnu/bash/bash-3.2-patches/bash32-050 mirror://gnu/bash/bash-3.2-patches/bash32-051 mirror://gnu/bash/bash-3.2-patches/bash32-052 mirror://gnu/bash/bash-3.2-patches/bash32-053 mirror://gnu/bash/bash-3.2-patches/bash32-054 mirror://gnu/bash/bash-3.2-patches/bash32-055 mirror://gnu/bash/bash-3.2-patches/bash32-056 mirror://gnu/bash/bash-3.2-patches/bash32-057
+SRC_URI=mirror://gnu/bash/bash-3.2.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-001 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-002 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-003 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-004 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-005 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-006 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-007 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-008 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-009 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-010 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-011 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-012 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-013 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-014 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-015 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-016 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-017 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-018 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-019 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-020 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-021 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-022 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-023 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-024 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-025 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-026 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-027 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-028 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-029 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-030 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-031 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-032 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-033 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-034 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-035 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-036 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-037 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-038 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-039 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-040 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-041 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-042 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-043 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-044 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-045 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-046 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-047 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-048 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-049 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-050 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-051 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-052 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-053 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-054 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-055 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-056 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-057 mirror://gnu/bash/bash-3.2-patches/bash32-001 mirror://gnu/bash/bash-3.2-patches/bash32-002 mirror://gnu/bash/bash-3.2-patches/bash32-003 mirror://gnu/bash/bash-3.2-patches/bash32-004 mirror://gnu/bash/bash-3.2-patches/bash32-005 mirror://gnu/bash/bash-3.2-patches/bash32-006 mirror://gnu/bash/bash-3.2-patches/bash32-007 mirror://gnu/bash/bash-3.2-patches/bash32-008 mirror://gnu/bash/bash-3.2-patches/bash32-009 mirror://gnu/bash/bash-3.2-patches/bash32-010 mirror://gnu/bash/bash-3.2-patches/bash32-011 mirror://gnu/bash/bash-3.2-patches/bash32-012 mirror://gnu/bash/bash-3.2-patches/bash32-013 mirror://gnu/bash/bash-3.2-patches/bash32-014 mirror://gnu/bash/bash-3.2-patches/bash32-015 mirror://gnu/bash/bash-3.2-patches/bash32-016 mirror://gnu/bash/bash-3.2-patches/bash32-017 mirror://gnu/bash/bash-3.2-patches/bash32-018 mirror://gnu/bash/bash-3.2-patches/bash32-019 mirror://gnu/bash/bash-3.2-patches/bash32-020 mirror://gnu/bash/bash-3.2-patches/bash32-021 mirror://gnu/bash/bash-3.2-patches/bash32-022 mirror://gnu/bash/bash-3.2-patches/bash32-023 mirror://gnu/bash/bash-3.2-patches/bash32-024 mirror://gnu/bash/bash-3.2-patches/bash32-025 mirror://gnu/bash/bash-3.2-patches/bash32-026 mirror://gnu/bash/bash-3.2-patches/bash32-027 mirror://gnu/bash/bash-3.2-patches/bash32-028 mirror://gnu/bash/bash-3.2-patches/bash32-029 mirror://gnu/bash/bash-3.2-patches/bash32-030 mirror://gnu/bash/bash-3.2-patches/bash32-031 mirror://gnu/bash/bash-3.2-patches/bash32-032 mirror://gnu/bash/bash-3.2-patches/bash32-033 mirror://gnu/bash/bash-3.2-patches/bash32-034 mirror://gnu/bash/bash-3.2-patches/bash32-035 mirror://gnu/bash/bash-3.2-patches/bash32-036 mirror://gnu/bash/bash-3.2-patches/bash32-037 mirror://gnu/bash/bash-3.2-patches/bash32-038 mirror://gnu/bash/bash-3.2-patches/bash32-039 mirror://gnu/bash/bash-3.2-patches/bash32-040 mirror://gnu/bash/bash-3.2-patches/bash32-041 mirror://gnu/bash/bash-3.2-patches/bash32-042 mirror://gnu/bash/bash-3.2-patches/bash32-043 mirror://gnu/bash/bash-3.2-patches/bash32-044 mirror://gnu/bash/bash-3.2-patches/bash32-045 mirror://gnu/bash/bash-3.2-patches/bash32-046 mirror://gnu/bash/bash-3.2-patches/bash32-047 mirror://gnu/bash/bash-3.2-patches/bash32-048 mirror://gnu/bash/bash-3.2-patches/bash32-049 mirror://gnu/bash/bash-3.2-patches/bash32-050 mirror://gnu/bash/bash-3.2-patches/bash32-051 mirror://gnu/bash/bash-3.2-patches/bash32-052 mirror://gnu/bash/bash-3.2-patches/bash32-053 mirror://gnu/bash/bash-3.2-patches/bash32-054 mirror://gnu/bash/bash-3.2-patches/bash32-055 mirror://gnu/bash/bash-3.2-patches/bash32-056 mirror://gnu/bash/bash-3.2-patches/bash32-057 https://dev.gentoo.org/~sam/distfiles/app-shells/bash/bash-3.2_p57-patches.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=b0848e82875183cf98655ebdea48c191
+_md5_=9a48fa56d47419ad557f516215aa218b
diff --git a/metadata/md5-cache/app-shells/bash-4.0_p44 b/metadata/md5-cache/app-shells/bash-4.0_p44
index e8a586278a73..64da5375c9fe 100644
--- a/metadata/md5-cache/app-shells/bash-4.0_p44
+++ b/metadata/md5-cache/app-shells/bash-4.0_p44
@@ -9,6 +9,6 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-3
 RDEPEND=!static? ( >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-6.2 ) )
 SLOT=4.0
-SRC_URI=mirror://gnu/bash/bash-4.0.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-001 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-002 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-003 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-004 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-005 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-006 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-007 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-008 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-009 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-010 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-011 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-012 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-013 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-014 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-015 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-016 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-017 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-018 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-019 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-020 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-021 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-022 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-023 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-024 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-025 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-026 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-027 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-028 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-029 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-030 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-031 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-032 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-033 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-034 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-035 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-036 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-037 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-038 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-039 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-040 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-041 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-042 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-043 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-044 mirror://gnu/bash/bash-4.0-patches/bash40-001 mirror://gnu/bash/bash-4.0-patches/bash40-002 mirror://gnu/bash/bash-4.0-patches/bash40-003 mirror://gnu/bash/bash-4.0-patches/bash40-004 mirror://gnu/bash/bash-4.0-patches/bash40-005 mirror://gnu/bash/bash-4.0-patches/bash40-006 mirror://gnu/bash/bash-4.0-patches/bash40-007 mirror://gnu/bash/bash-4.0-patches/bash40-008 mirror://gnu/bash/bash-4.0-patches/bash40-009 mirror://gnu/bash/bash-4.0-patches/bash40-010 mirror://gnu/bash/bash-4.0-patches/bash40-011 mirror://gnu/bash/bash-4.0-patches/bash40-012 mirror://gnu/bash/bash-4.0-patches/bash40-013 mirror://gnu/bash/bash-4.0-patches/bash40-014 mirror://gnu/bash/bash-4.0-patches/bash40-015 mirror://gnu/bash/bash-4.0-patches/bash40-016 mirror://gnu/bash/bash-4.0-patches/bash40-017 mirror://gnu/bash/bash-4.0-patches/bash40-018 mirror://gnu/bash/bash-4.0-patches/bash40-019 mirror://gnu/bash/bash-4.0-patches/bash40-020 mirror://gnu/bash/bash-4.0-patches/bash40-021 mirror://gnu/bash/bash-4.0-patches/bash40-022 mirror://gnu/bash/bash-4.0-patches/bash40-023 mirror://gnu/bash/bash-4.0-patches/bash40-024 mirror://gnu/bash/bash-4.0-patches/bash40-025 mirror://gnu/bash/bash-4.0-patches/bash40-026 mirror://gnu/bash/bash-4.0-patches/bash40-027 mirror://gnu/bash/bash-4.0-patches/bash40-028 mirror://gnu/bash/bash-4.0-patches/bash40-029 mirror://gnu/bash/bash-4.0-patches/bash40-030 mirror://gnu/bash/bash-4.0-patches/bash40-031 mirror://gnu/bash/bash-4.0-patches/bash40-032 mirror://gnu/bash/bash-4.0-patches/bash40-033 mirror://gnu/bash/bash-4.0-patches/bash40-034 mirror://gnu/bash/bash-4.0-patches/bash40-035 mirror://gnu/bash/bash-4.0-patches/bash40-036 mirror://gnu/bash/bash-4.0-patches/bash40-037 mirror://gnu/bash/bash-4.0-patches/bash40-038 mirror://gnu/bash/bash-4.0-patches/bash40-039 mirror://gnu/bash/bash-4.0-patches/bash40-040 mirror://gnu/bash/bash-4.0-patches/bash40-041 mirror://gnu/bash/bash-4.0-patches/bash40-042 mirror://gnu/bash/bash-4.0-patches/bash40-043 mirror://gnu/bash/bash-4.0-patches/bash40-044
+SRC_URI=mirror://gnu/bash/bash-4.0.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-001 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-002 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-003 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-004 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-005 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-006 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-007 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-008 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-009 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-010 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-011 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-012 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-013 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-014 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-015 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-016 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-017 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-018 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-019 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-020 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-021 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-022 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-023 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-024 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-025 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-026 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-027 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-028 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-029 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-030 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-031 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-032 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-033 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-034 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-035 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-036 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-037 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-038 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-039 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-040 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-041 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-042 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-043 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-044 mirror://gnu/bash/bash-4.0-patches/bash40-001 mirror://gnu/bash/bash-4.0-patches/bash40-002 mirror://gnu/bash/bash-4.0-patches/bash40-003 mirror://gnu/bash/bash-4.0-patches/bash40-004 mirror://gnu/bash/bash-4.0-patches/bash40-005 mirror://gnu/bash/bash-4.0-patches/bash40-006 mirror://gnu/bash/bash-4.0-patches/bash40-007 mirror://gnu/bash/bash-4.0-patches/bash40-008 mirror://gnu/bash/bash-4.0-patches/bash40-009 mirror://gnu/bash/bash-4.0-patches/bash40-010 mirror://gnu/bash/bash-4.0-patches/bash40-011 mirror://gnu/bash/bash-4.0-patches/bash40-012 mirror://gnu/bash/bash-4.0-patches/bash40-013 mirror://gnu/bash/bash-4.0-patches/bash40-014 mirror://gnu/bash/bash-4.0-patches/bash40-015 mirror://gnu/bash/bash-4.0-patches/bash40-016 mirror://gnu/bash/bash-4.0-patches/bash40-017 mirror://gnu/bash/bash-4.0-patches/bash40-018 mirror://gnu/bash/bash-4.0-patches/bash40-019 mirror://gnu/bash/bash-4.0-patches/bash40-020 mirror://gnu/bash/bash-4.0-patches/bash40-021 mirror://gnu/bash/bash-4.0-patches/bash40-022 mirror://gnu/bash/bash-4.0-patches/bash40-023 mirror://gnu/bash/bash-4.0-patches/bash40-024 mirror://gnu/bash/bash-4.0-patches/bash40-025 mirror://gnu/bash/bash-4.0-patches/bash40-026 mirror://gnu/bash/bash-4.0-patches/bash40-027 mirror://gnu/bash/bash-4.0-patches/bash40-028 mirror://gnu/bash/bash-4.0-patches/bash40-029 mirror://gnu/bash/bash-4.0-patches/bash40-030 mirror://gnu/bash/bash-4.0-patches/bash40-031 mirror://gnu/bash/bash-4.0-patches/bash40-032 mirror://gnu/bash/bash-4.0-patches/bash40-033 mirror://gnu/bash/bash-4.0-patches/bash40-034 mirror://gnu/bash/bash-4.0-patches/bash40-035 mirror://gnu/bash/bash-4.0-patches/bash40-036 mirror://gnu/bash/bash-4.0-patches/bash40-037 mirror://gnu/bash/bash-4.0-patches/bash40-038 mirror://gnu/bash/bash-4.0-patches/bash40-039 mirror://gnu/bash/bash-4.0-patches/bash40-040 mirror://gnu/bash/bash-4.0-patches/bash40-041 mirror://gnu/bash/bash-4.0-patches/bash40-042 mirror://gnu/bash/bash-4.0-patches/bash40-043 mirror://gnu/bash/bash-4.0-patches/bash40-044 https://dev.gentoo.org/~sam/distfiles/app-shells/bash/bash-4.0_p44-patches.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=7bfc92ea0181b5c518d86a9248eba427
+_md5_=5328a60b3ac9c72ca1067f5d80fe45c6
diff --git a/metadata/md5-cache/app-shells/bash-4.1_p17 b/metadata/md5-cache/app-shells/bash-4.1_p17
index a4435b263204..6a79c13af3ce 100644
--- a/metadata/md5-cache/app-shells/bash-4.1_p17
+++ b/metadata/md5-cache/app-shells/bash-4.1_p17
@@ -9,6 +9,6 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-3
 RDEPEND=!static? ( >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-6.2 ) )
 SLOT=4.1
-SRC_URI=mirror://gnu/bash/bash-4.1.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-001 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-002 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-003 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-004 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-005 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-006 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-007 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-008 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-009 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-010 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-011 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-012 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-013 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-014 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-015 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-016 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-017 mirror://gnu/bash/bash-4.1-patches/bash41-001 mirror://gnu/bash/bash-4.1-patches/bash41-002 mirror://gnu/bash/bash-4.1-patches/bash41-003 mirror://gnu/bash/bash-4.1-patches/bash41-004 mirror://gnu/bash/bash-4.1-patches/bash41-005 mirror://gnu/bash/bash-4.1-patches/bash41-006 mirror://gnu/bash/bash-4.1-patches/bash41-007 mirror://gnu/bash/bash-4.1-patches/bash41-008 mirror://gnu/bash/bash-4.1-patches/bash41-009 mirror://gnu/bash/bash-4.1-patches/bash41-010 mirror://gnu/bash/bash-4.1-patches/bash41-011 mirror://gnu/bash/bash-4.1-patches/bash41-012 mirror://gnu/bash/bash-4.1-patches/bash41-013 mirror://gnu/bash/bash-4.1-patches/bash41-014 mirror://gnu/bash/bash-4.1-patches/bash41-015 mirror://gnu/bash/bash-4.1-patches/bash41-016 mirror://gnu/bash/bash-4.1-patches/bash41-017
+SRC_URI=mirror://gnu/bash/bash-4.1.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-001 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-002 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-003 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-004 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-005 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-006 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-007 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-008 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-009 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-010 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-011 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-012 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-013 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-014 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-015 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-016 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-017 mirror://gnu/bash/bash-4.1-patches/bash41-001 mirror://gnu/bash/bash-4.1-patches/bash41-002 mirror://gnu/bash/bash-4.1-patches/bash41-003 mirror://gnu/bash/bash-4.1-patches/bash41-004 mirror://gnu/bash/bash-4.1-patches/bash41-005 mirror://gnu/bash/bash-4.1-patches/bash41-006 mirror://gnu/bash/bash-4.1-patches/bash41-007 mirror://gnu/bash/bash-4.1-patches/bash41-008 mirror://gnu/bash/bash-4.1-patches/bash41-009 mirror://gnu/bash/bash-4.1-patches/bash41-010 mirror://gnu/bash/bash-4.1-patches/bash41-011 mirror://gnu/bash/bash-4.1-patches/bash41-012 mirror://gnu/bash/bash-4.1-patches/bash41-013 mirror://gnu/bash/bash-4.1-patches/bash41-014 mirror://gnu/bash/bash-4.1-patches/bash41-015 mirror://gnu/bash/bash-4.1-patches/bash41-016 mirror://gnu/bash/bash-4.1-patches/bash41-017 https://dev.gentoo.org/~sam/distfiles/app-shells/bash/bash-4.1_p17-patches.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=b1b101e329e3de05960547f8c0b106df
+_md5_=cafdc6bbfba041758204d78d5f144517
diff --git a/metadata/md5-cache/app-shells/bash-4.2_p53 b/metadata/md5-cache/app-shells/bash-4.2_p53
index ba1ff4e24e03..e6c6f7568c98 100644
--- a/metadata/md5-cache/app-shells/bash-4.2_p53
+++ b/metadata/md5-cache/app-shells/bash-4.2_p53
@@ -10,6 +10,6 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-3
 RDEPEND=!static? ( >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-6.2 ) )
 SLOT=4.2
-SRC_URI=mirror://gnu/bash/bash-4.2.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-001 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-002 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-003 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-004 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-005 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-006 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-007 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-008 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-009 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-010 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-011 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-012 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-013 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-014 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-015 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-016 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-017 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-018 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-019 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-020 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-021 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-022 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-023 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-024 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-025 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-026 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-027 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-028 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-029 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-030 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-031 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-032 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-033 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-034 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-035 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-036 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-037 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-038 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-039 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-040 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-041 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-042 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-043 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-044 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-045 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-046 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-047 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-048 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-049 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-050 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-051 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-052 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-053 mirror://gnu/bash/bash-4.2-patches/bash42-001 mirror://gnu/bash/bash-4.2-patches/bash42-002 mirror://gnu/bash/bash-4.2-patches/bash42-003 mirror://gnu/bash/bash-4.2-patches/bash42-004 mirror://gnu/bash/bash-4.2-patches/bash42-005 mirror://gnu/bash/bash-4.2-patches/bash42-006 mirror://gnu/bash/bash-4.2-patches/bash42-007 mirror://gnu/bash/bash-4.2-patches/bash42-008 mirror://gnu/bash/bash-4.2-patches/bash42-009 mirror://gnu/bash/bash-4.2-patches/bash42-010 mirror://gnu/bash/bash-4.2-patches/bash42-011 mirror://gnu/bash/bash-4.2-patches/bash42-012 mirror://gnu/bash/bash-4.2-patches/bash42-013 mirror://gnu/bash/bash-4.2-patches/bash42-014 mirror://gnu/bash/bash-4.2-patches/bash42-015 mirror://gnu/bash/bash-4.2-patches/bash42-016 mirror://gnu/bash/bash-4.2-patches/bash42-017 mirror://gnu/bash/bash-4.2-patches/bash42-018 mirror://gnu/bash/bash-4.2-patches/bash42-019 mirror://gnu/bash/bash-4.2-patches/bash42-020 mirror://gnu/bash/bash-4.2-patches/bash42-021 mirror://gnu/bash/bash-4.2-patches/bash42-022 mirror://gnu/bash/bash-4.2-patches/bash42-023 mirror://gnu/bash/bash-4.2-patches/bash42-024 mirror://gnu/bash/bash-4.2-patches/bash42-025 mirror://gnu/bash/bash-4.2-patches/bash42-026 mirror://gnu/bash/bash-4.2-patches/bash42-027 mirror://gnu/bash/bash-4.2-patches/bash42-028 mirror://gnu/bash/bash-4.2-patches/bash42-029 mirror://gnu/bash/bash-4.2-patches/bash42-030 mirror://gnu/bash/bash-4.2-patches/bash42-031 mirror://gnu/bash/bash-4.2-patches/bash42-032 mirror://gnu/bash/bash-4.2-patches/bash42-033 mirror://gnu/bash/bash-4.2-patches/bash42-034 mirror://gnu/bash/bash-4.2-patches/bash42-035 mirror://gnu/bash/bash-4.2-patches/bash42-036 mirror://gnu/bash/bash-4.2-patches/bash42-037 mirror://gnu/bash/bash-4.2-patches/bash42-038 mirror://gnu/bash/bash-4.2-patches/bash42-039 mirror://gnu/bash/bash-4.2-patches/bash42-040 mirror://gnu/bash/bash-4.2-patches/bash42-041 mirror://gnu/bash/bash-4.2-patches/bash42-042 mirror://gnu/bash/bash-4.2-patches/bash42-043 mirror://gnu/bash/bash-4.2-patches/bash42-044 mirror://gnu/bash/bash-4.2-patches/bash42-045 mirror://gnu/bash/bash-4.2-patches/bash42-046 mirror://gnu/bash/bash-4.2-patches/bash42-047 mirror://gnu/bash/bash-4.2-patches/bash42-048 mirror://gnu/bash/bash-4.2-patches/bash42-049 mirror://gnu/bash/bash-4.2-patches/bash42-050 mirror://gnu/bash/bash-4.2-patches/bash42-051 mirror://gnu/bash/bash-4.2-patches/bash42-052 mirror://gnu/bash/bash-4.2-patches/bash42-053
+SRC_URI=mirror://gnu/bash/bash-4.2.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-001 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-002 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-003 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-004 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-005 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-006 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-007 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-008 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-009 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-010 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-011 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-012 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-013 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-014 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-015 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-016 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-017 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-018 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-019 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-020 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-021 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-022 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-023 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-024 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-025 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-026 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-027 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-028 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-029 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-030 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-031 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-032 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-033 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-034 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-035 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-036 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-037 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-038 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-039 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-040 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-041 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-042 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-043 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-044 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-045 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-046 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-047 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-048 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-049 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-050 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-051 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-052 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-053 mirror://gnu/bash/bash-4.2-patches/bash42-001 mirror://gnu/bash/bash-4.2-patches/bash42-002 mirror://gnu/bash/bash-4.2-patches/bash42-003 mirror://gnu/bash/bash-4.2-patches/bash42-004 mirror://gnu/bash/bash-4.2-patches/bash42-005 mirror://gnu/bash/bash-4.2-patches/bash42-006 mirror://gnu/bash/bash-4.2-patches/bash42-007 mirror://gnu/bash/bash-4.2-patches/bash42-008 mirror://gnu/bash/bash-4.2-patches/bash42-009 mirror://gnu/bash/bash-4.2-patches/bash42-010 mirror://gnu/bash/bash-4.2-patches/bash42-011 mirror://gnu/bash/bash-4.2-patches/bash42-012 mirror://gnu/bash/bash-4.2-patches/bash42-013 mirror://gnu/bash/bash-4.2-patches/bash42-014 mirror://gnu/bash/bash-4.2-patches/bash42-015 mirror://gnu/bash/bash-4.2-patches/bash42-016 mirror://gnu/bash/bash-4.2-patches/bash42-017 mirror://gnu/bash/bash-4.2-patches/bash42-018 mirror://gnu/bash/bash-4.2-patches/bash42-019 mirror://gnu/bash/bash-4.2-patches/bash42-020 mirror://gnu/bash/bash-4.2-patches/bash42-021 mirror://gnu/bash/bash-4.2-patches/bash42-022 mirror://gnu/bash/bash-4.2-patches/bash42-023 mirror://gnu/bash/bash-4.2-patches/bash42-024 mirror://gnu/bash/bash-4.2-patches/bash42-025 mirror://gnu/bash/bash-4.2-patches/bash42-026 mirror://gnu/bash/bash-4.2-patches/bash42-027 mirror://gnu/bash/bash-4.2-patches/bash42-028 mirror://gnu/bash/bash-4.2-patches/bash42-029 mirror://gnu/bash/bash-4.2-patches/bash42-030 mirror://gnu/bash/bash-4.2-patches/bash42-031 mirror://gnu/bash/bash-4.2-patches/bash42-032 mirror://gnu/bash/bash-4.2-patches/bash42-033 mirror://gnu/bash/bash-4.2-patches/bash42-034 mirror://gnu/bash/bash-4.2-patches/bash42-035 mirror://gnu/bash/bash-4.2-patches/bash42-036 mirror://gnu/bash/bash-4.2-patches/bash42-037 mirror://gnu/bash/bash-4.2-patches/bash42-038 mirror://gnu/bash/bash-4.2-patches/bash42-039 mirror://gnu/bash/bash-4.2-patches/bash42-040 mirror://gnu/bash/bash-4.2-patches/bash42-041 mirror://gnu/bash/bash-4.2-patches/bash42-042 mirror://gnu/bash/bash-4.2-patches/bash42-043 mirror://gnu/bash/bash-4.2-patches/bash42-044 mirror://gnu/bash/bash-4.2-patches/bash42-045 mirror://gnu/bash/bash-4.2-patches/bash42-046 mirror://gnu/bash/bash-4.2-patches/bash42-047 mirror://gnu/bash/bash-4.2-patches/bash42-048 mirror://gnu/bash/bash-4.2-patches/bash42-049 mirror://gnu/bash/bash-4.2-patches/bash42-050 mirror://gnu/bash/bash-4.2-patches/bash42-051 mirror://gnu/bash/bash-4.2-patches/bash42-052 mirror://gnu/bash/bash-4.2-patches/bash42-053 https://dev.gentoo.org/~sam/distfiles/app-shells/bash/bash-4.2_p53-patches.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=b3e51143ab7b7d188b3fb9227dd3d8cb
+_md5_=950a3ba1a4db31ee2adda4de33e78df6
diff --git a/metadata/md5-cache/app-shells/bash-4.3_p48-r2 b/metadata/md5-cache/app-shells/bash-4.3_p48-r2
index 88079c940ee1..136397899e40 100644
--- a/metadata/md5-cache/app-shells/bash-4.3_p48-r2
+++ b/metadata/md5-cache/app-shells/bash-4.3_p48-r2
@@ -10,6 +10,6 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.2-r2:0= readline? ( >=sys-libs/readline-6.3:0= ) nls? ( virtual/libintl ) !<sys-apps/portage-2.1.6.7_p1
 SLOT=4.3
-SRC_URI=mirror://gnu/bash/bash-4.3.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-001 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-002 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-003 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-004 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-005 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-006 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-007 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-008 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-009 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-010 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-011 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-012 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-013 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-014 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-015 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-016 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-017 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-018 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-019 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-020 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-021 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-022 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-023 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-024 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-025 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-026 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-027 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-028 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-029 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-030 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-031 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-032 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-033 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-034 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-035 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-036 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-037 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-038 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-039 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-040 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-041 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-042 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-043 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-044 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-045 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-046 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-047 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-048 mirror://gnu/bash/bash-4.3-patches/bash43-001 mirror://gnu/bash/bash-4.3-patches/bash43-002 mirror://gnu/bash/bash-4.3-patches/bash43-003 mirror://gnu/bash/bash-4.3-patches/bash43-004 mirror://gnu/bash/bash-4.3-patches/bash43-005 mirror://gnu/bash/bash-4.3-patches/bash43-006 mirror://gnu/bash/bash-4.3-patches/bash43-007 mirror://gnu/bash/bash-4.3-patches/bash43-008 mirror://gnu/bash/bash-4.3-patches/bash43-009 mirror://gnu/bash/bash-4.3-patches/bash43-010 mirror://gnu/bash/bash-4.3-patches/bash43-011 mirror://gnu/bash/bash-4.3-patches/bash43-012 mirror://gnu/bash/bash-4.3-patches/bash43-013 mirror://gnu/bash/bash-4.3-patches/bash43-014 mirror://gnu/bash/bash-4.3-patches/bash43-015 mirror://gnu/bash/bash-4.3-patches/bash43-016 mirror://gnu/bash/bash-4.3-patches/bash43-017 mirror://gnu/bash/bash-4.3-patches/bash43-018 mirror://gnu/bash/bash-4.3-patches/bash43-019 mirror://gnu/bash/bash-4.3-patches/bash43-020 mirror://gnu/bash/bash-4.3-patches/bash43-021 mirror://gnu/bash/bash-4.3-patches/bash43-022 mirror://gnu/bash/bash-4.3-patches/bash43-023 mirror://gnu/bash/bash-4.3-patches/bash43-024 mirror://gnu/bash/bash-4.3-patches/bash43-025 mirror://gnu/bash/bash-4.3-patches/bash43-026 mirror://gnu/bash/bash-4.3-patches/bash43-027 mirror://gnu/bash/bash-4.3-patches/bash43-028 mirror://gnu/bash/bash-4.3-patches/bash43-029 mirror://gnu/bash/bash-4.3-patches/bash43-030 mirror://gnu/bash/bash-4.3-patches/bash43-031 mirror://gnu/bash/bash-4.3-patches/bash43-032 mirror://gnu/bash/bash-4.3-patches/bash43-033 mirror://gnu/bash/bash-4.3-patches/bash43-034 mirror://gnu/bash/bash-4.3-patches/bash43-035 mirror://gnu/bash/bash-4.3-patches/bash43-036 mirror://gnu/bash/bash-4.3-patches/bash43-037 mirror://gnu/bash/bash-4.3-patches/bash43-038 mirror://gnu/bash/bash-4.3-patches/bash43-039 mirror://gnu/bash/bash-4.3-patches/bash43-040 mirror://gnu/bash/bash-4.3-patches/bash43-041 mirror://gnu/bash/bash-4.3-patches/bash43-042 mirror://gnu/bash/bash-4.3-patches/bash43-043 mirror://gnu/bash/bash-4.3-patches/bash43-044 mirror://gnu/bash/bash-4.3-patches/bash43-045 mirror://gnu/bash/bash-4.3-patches/bash43-046 mirror://gnu/bash/bash-4.3-patches/bash43-047 mirror://gnu/bash/bash-4.3-patches/bash43-048
+SRC_URI=mirror://gnu/bash/bash-4.3.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-001 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-002 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-003 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-004 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-005 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-006 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-007 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-008 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-009 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-010 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-011 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-012 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-013 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-014 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-015 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-016 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-017 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-018 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-019 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-020 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-021 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-022 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-023 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-024 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-025 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-026 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-027 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-028 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-029 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-030 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-031 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-032 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-033 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-034 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-035 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-036 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-037 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-038 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-039 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-040 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-041 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-042 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-043 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-044 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-045 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-046 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-047 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-048 mirror://gnu/bash/bash-4.3-patches/bash43-001 mirror://gnu/bash/bash-4.3-patches/bash43-002 mirror://gnu/bash/bash-4.3-patches/bash43-003 mirror://gnu/bash/bash-4.3-patches/bash43-004 mirror://gnu/bash/bash-4.3-patches/bash43-005 mirror://gnu/bash/bash-4.3-patches/bash43-006 mirror://gnu/bash/bash-4.3-patches/bash43-007 mirror://gnu/bash/bash-4.3-patches/bash43-008 mirror://gnu/bash/bash-4.3-patches/bash43-009 mirror://gnu/bash/bash-4.3-patches/bash43-010 mirror://gnu/bash/bash-4.3-patches/bash43-011 mirror://gnu/bash/bash-4.3-patches/bash43-012 mirror://gnu/bash/bash-4.3-patches/bash43-013 mirror://gnu/bash/bash-4.3-patches/bash43-014 mirror://gnu/bash/bash-4.3-patches/bash43-015 mirror://gnu/bash/bash-4.3-patches/bash43-016 mirror://gnu/bash/bash-4.3-patches/bash43-017 mirror://gnu/bash/bash-4.3-patches/bash43-018 mirror://gnu/bash/bash-4.3-patches/bash43-019 mirror://gnu/bash/bash-4.3-patches/bash43-020 mirror://gnu/bash/bash-4.3-patches/bash43-021 mirror://gnu/bash/bash-4.3-patches/bash43-022 mirror://gnu/bash/bash-4.3-patches/bash43-023 mirror://gnu/bash/bash-4.3-patches/bash43-024 mirror://gnu/bash/bash-4.3-patches/bash43-025 mirror://gnu/bash/bash-4.3-patches/bash43-026 mirror://gnu/bash/bash-4.3-patches/bash43-027 mirror://gnu/bash/bash-4.3-patches/bash43-028 mirror://gnu/bash/bash-4.3-patches/bash43-029 mirror://gnu/bash/bash-4.3-patches/bash43-030 mirror://gnu/bash/bash-4.3-patches/bash43-031 mirror://gnu/bash/bash-4.3-patches/bash43-032 mirror://gnu/bash/bash-4.3-patches/bash43-033 mirror://gnu/bash/bash-4.3-patches/bash43-034 mirror://gnu/bash/bash-4.3-patches/bash43-035 mirror://gnu/bash/bash-4.3-patches/bash43-036 mirror://gnu/bash/bash-4.3-patches/bash43-037 mirror://gnu/bash/bash-4.3-patches/bash43-038 mirror://gnu/bash/bash-4.3-patches/bash43-039 mirror://gnu/bash/bash-4.3-patches/bash43-040 mirror://gnu/bash/bash-4.3-patches/bash43-041 mirror://gnu/bash/bash-4.3-patches/bash43-042 mirror://gnu/bash/bash-4.3-patches/bash43-043 mirror://gnu/bash/bash-4.3-patches/bash43-044 mirror://gnu/bash/bash-4.3-patches/bash43-045 mirror://gnu/bash/bash-4.3-patches/bash43-046 mirror://gnu/bash/bash-4.3-patches/bash43-047 mirror://gnu/bash/bash-4.3-patches/bash43-048 https://dev.gentoo.org/~sam/distfiles/app-shells/bash/bash-4.3_p48-r2-patches.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=13088491b7fcea7274ada928a40f562f
+_md5_=4ea4c5d1e9cec3a10ffd612e54cb61d3
diff --git a/metadata/md5-cache/app-shells/bash-4.4_p23-r2 b/metadata/md5-cache/app-shells/bash-4.4_p23-r2
index 6ce501ddddaa..d163313fe38f 100644
--- a/metadata/md5-cache/app-shells/bash-4.4_p23-r2
+++ b/metadata/md5-cache/app-shells/bash-4.4_p23-r2
@@ -9,6 +9,6 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sp
 LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-7.0:0= )
 SLOT=4.4
-SRC_URI=mirror://gnu/bash/bash-4.4.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-001 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-002 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-003 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-004 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-005 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-006 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-007 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-008 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-009 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-010 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-011 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-012 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-013 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-014 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-015 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-016 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-017 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-018 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-019 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-020 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-021 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-022 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-023 mirror://gnu/bash/bash-4.4-patches/bash44-001 mirror://gnu/bash/bash-4.4-patches/bash44-002 mirror://gnu/bash/bash-4.4-patches/bash44-003 mirror://gnu/bash/bash-4.4-patches/bash44-004 mirror://gnu/bash/bash-4.4-patches/bash44-005 mirror://gnu/bash/bash-4.4-patches/bash44-006 mirror://gnu/bash/bash-4.4-patches/bash44-007 mirror://gnu/bash/bash-4.4-patches/bash44-008 mirror://gnu/bash/bash-4.4-patches/bash44-009 mirror://gnu/bash/bash-4.4-patches/bash44-010 mirror://gnu/bash/bash-4.4-patches/bash44-011 mirror://gnu/bash/bash-4.4-patches/bash44-012 mirror://gnu/bash/bash-4.4-patches/bash44-013 mirror://gnu/bash/bash-4.4-patches/bash44-014 mirror://gnu/bash/bash-4.4-patches/bash44-015 mirror://gnu/bash/bash-4.4-patches/bash44-016 mirror://gnu/bash/bash-4.4-patches/bash44-017 mirror://gnu/bash/bash-4.4-patches/bash44-018 mirror://gnu/bash/bash-4.4-patches/bash44-019 mirror://gnu/bash/bash-4.4-patches/bash44-020 mirror://gnu/bash/bash-4.4-patches/bash44-021 mirror://gnu/bash/bash-4.4-patches/bash44-022 mirror://gnu/bash/bash-4.4-patches/bash44-023
+SRC_URI=mirror://gnu/bash/bash-4.4.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-001 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-002 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-003 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-004 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-005 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-006 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-007 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-008 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-009 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-010 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-011 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-012 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-013 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-014 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-015 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-016 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-017 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-018 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-019 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-020 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-021 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-022 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-023 mirror://gnu/bash/bash-4.4-patches/bash44-001 mirror://gnu/bash/bash-4.4-patches/bash44-002 mirror://gnu/bash/bash-4.4-patches/bash44-003 mirror://gnu/bash/bash-4.4-patches/bash44-004 mirror://gnu/bash/bash-4.4-patches/bash44-005 mirror://gnu/bash/bash-4.4-patches/bash44-006 mirror://gnu/bash/bash-4.4-patches/bash44-007 mirror://gnu/bash/bash-4.4-patches/bash44-008 mirror://gnu/bash/bash-4.4-patches/bash44-009 mirror://gnu/bash/bash-4.4-patches/bash44-010 mirror://gnu/bash/bash-4.4-patches/bash44-011 mirror://gnu/bash/bash-4.4-patches/bash44-012 mirror://gnu/bash/bash-4.4-patches/bash44-013 mirror://gnu/bash/bash-4.4-patches/bash44-014 mirror://gnu/bash/bash-4.4-patches/bash44-015 mirror://gnu/bash/bash-4.4-patches/bash44-016 mirror://gnu/bash/bash-4.4-patches/bash44-017 mirror://gnu/bash/bash-4.4-patches/bash44-018 mirror://gnu/bash/bash-4.4-patches/bash44-019 mirror://gnu/bash/bash-4.4-patches/bash44-020 mirror://gnu/bash/bash-4.4-patches/bash44-021 mirror://gnu/bash/bash-4.4-patches/bash44-022 mirror://gnu/bash/bash-4.4-patches/bash44-023 https://dev.gentoo.org/~sam/distfiles/app-shells/bash/bash-4.4_p23-r2-patches.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=02b2efdd624e2d9b4e8c9ff5b4d1215e
+_md5_=4cb63df4f5990a928766579d0b523e2b
diff --git a/metadata/md5-cache/app-shells/bash-5.0_p18 b/metadata/md5-cache/app-shells/bash-5.0_p18
index a63735568cdb..ab16817ffe62 100644
--- a/metadata/md5-cache/app-shells/bash-5.0_p18
+++ b/metadata/md5-cache/app-shells/bash-5.0_p18
@@ -9,6 +9,6 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sp
 LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-8.0:0= )
 SLOT=0
-SRC_URI=mirror://gnu/bash/bash-5.0.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-001 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-002 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-003 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-004 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-005 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-006 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-007 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-008 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-009 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-010 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-011 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-012 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-013 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-014 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-015 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-016 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-017 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-018 mirror://gnu/bash/bash-5.0-patches/bash50-001 mirror://gnu/bash/bash-5.0-patches/bash50-002 mirror://gnu/bash/bash-5.0-patches/bash50-003 mirror://gnu/bash/bash-5.0-patches/bash50-004 mirror://gnu/bash/bash-5.0-patches/bash50-005 mirror://gnu/bash/bash-5.0-patches/bash50-006 mirror://gnu/bash/bash-5.0-patches/bash50-007 mirror://gnu/bash/bash-5.0-patches/bash50-008 mirror://gnu/bash/bash-5.0-patches/bash50-009 mirror://gnu/bash/bash-5.0-patches/bash50-010 mirror://gnu/bash/bash-5.0-patches/bash50-011 mirror://gnu/bash/bash-5.0-patches/bash50-012 mirror://gnu/bash/bash-5.0-patches/bash50-013 mirror://gnu/bash/bash-5.0-patches/bash50-014 mirror://gnu/bash/bash-5.0-patches/bash50-015 mirror://gnu/bash/bash-5.0-patches/bash50-016 mirror://gnu/bash/bash-5.0-patches/bash50-017 mirror://gnu/bash/bash-5.0-patches/bash50-018
+SRC_URI=mirror://gnu/bash/bash-5.0.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-001 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-002 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-003 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-004 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-005 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-006 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-007 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-008 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-009 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-010 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-011 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-012 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-013 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-014 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-015 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-016 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-017 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-018 mirror://gnu/bash/bash-5.0-patches/bash50-001 mirror://gnu/bash/bash-5.0-patches/bash50-002 mirror://gnu/bash/bash-5.0-patches/bash50-003 mirror://gnu/bash/bash-5.0-patches/bash50-004 mirror://gnu/bash/bash-5.0-patches/bash50-005 mirror://gnu/bash/bash-5.0-patches/bash50-006 mirror://gnu/bash/bash-5.0-patches/bash50-007 mirror://gnu/bash/bash-5.0-patches/bash50-008 mirror://gnu/bash/bash-5.0-patches/bash50-009 mirror://gnu/bash/bash-5.0-patches/bash50-010 mirror://gnu/bash/bash-5.0-patches/bash50-011 mirror://gnu/bash/bash-5.0-patches/bash50-012 mirror://gnu/bash/bash-5.0-patches/bash50-013 mirror://gnu/bash/bash-5.0-patches/bash50-014 mirror://gnu/bash/bash-5.0-patches/bash50-015 mirror://gnu/bash/bash-5.0-patches/bash50-016 mirror://gnu/bash/bash-5.0-patches/bash50-017 mirror://gnu/bash/bash-5.0-patches/bash50-018 https://dev.gentoo.org/~sam/distfiles/app-shells/bash/bash-5.0_p18-patches.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=87152a76f90bff05effb1312302373dd
+_md5_=811b90644064b92231e8a9e228cb2230
diff --git a/metadata/md5-cache/app-shells/bash-5.1_p16 b/metadata/md5-cache/app-shells/bash-5.1_p16
index d749bad13c79..e269e01b7c22 100644
--- a/metadata/md5-cache/app-shells/bash-5.1_p16
+++ b/metadata/md5-cache/app-shells/bash-5.1_p16
@@ -10,6 +10,6 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~
 LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-8.1:0= )
 SLOT=0
-SRC_URI=mirror://gnu/bash/bash-5.1.tar.gz mirror://gnu/bash/bash-5.1-patches/bash51-001 mirror://gnu/bash/bash-5.1-patches/bash51-002 mirror://gnu/bash/bash-5.1-patches/bash51-003 mirror://gnu/bash/bash-5.1-patches/bash51-004 mirror://gnu/bash/bash-5.1-patches/bash51-005 mirror://gnu/bash/bash-5.1-patches/bash51-006 mirror://gnu/bash/bash-5.1-patches/bash51-007 mirror://gnu/bash/bash-5.1-patches/bash51-008 mirror://gnu/bash/bash-5.1-patches/bash51-009 mirror://gnu/bash/bash-5.1-patches/bash51-010 mirror://gnu/bash/bash-5.1-patches/bash51-011 mirror://gnu/bash/bash-5.1-patches/bash51-012 mirror://gnu/bash/bash-5.1-patches/bash51-013 mirror://gnu/bash/bash-5.1-patches/bash51-014 mirror://gnu/bash/bash-5.1-patches/bash51-015 mirror://gnu/bash/bash-5.1-patches/bash51-016 mirror://gnu/bash/bash-5.1-patches/bash51-001.sig mirror://gnu/bash/bash-5.1-patches/bash51-002.sig mirror://gnu/bash/bash-5.1-patches/bash51-003.sig mirror://gnu/bash/bash-5.1-patches/bash51-004.sig mirror://gnu/bash/bash-5.1-patches/bash51-005.sig mirror://gnu/bash/bash-5.1-patches/bash51-006.sig mirror://gnu/bash/bash-5.1-patches/bash51-007.sig mirror://gnu/bash/bash-5.1-patches/bash51-008.sig mirror://gnu/bash/bash-5.1-patches/bash51-009.sig mirror://gnu/bash/bash-5.1-patches/bash51-010.sig mirror://gnu/bash/bash-5.1-patches/bash51-011.sig mirror://gnu/bash/bash-5.1-patches/bash51-012.sig mirror://gnu/bash/bash-5.1-patches/bash51-013.sig mirror://gnu/bash/bash-5.1-patches/bash51-014.sig mirror://gnu/bash/bash-5.1-patches/bash51-015.sig mirror://gnu/bash/bash-5.1-patches/bash51-016.sig ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-001 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-002 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-003 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-004 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-005 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-006 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-007 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-008 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-009 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-010 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-011 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-012 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-013 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-014 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-015 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-016 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-001.sig ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-002.sig ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-003.sig ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-004.sig ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-005.sig ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-006.sig ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-007.sig ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-008.sig ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-009.sig ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-010.sig ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-011.sig ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-012.sig ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-013.sig ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-014.sig ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-015.sig ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-016.sig verify-sig? ( mirror://gnu/bash/bash-5.1.tar.gz.sig )
+SRC_URI=mirror://gnu/bash/bash-5.1.tar.gz mirror://gnu/bash/bash-5.1-patches/bash51-001 mirror://gnu/bash/bash-5.1-patches/bash51-002 mirror://gnu/bash/bash-5.1-patches/bash51-003 mirror://gnu/bash/bash-5.1-patches/bash51-004 mirror://gnu/bash/bash-5.1-patches/bash51-005 mirror://gnu/bash/bash-5.1-patches/bash51-006 mirror://gnu/bash/bash-5.1-patches/bash51-007 mirror://gnu/bash/bash-5.1-patches/bash51-008 mirror://gnu/bash/bash-5.1-patches/bash51-009 mirror://gnu/bash/bash-5.1-patches/bash51-010 mirror://gnu/bash/bash-5.1-patches/bash51-011 mirror://gnu/bash/bash-5.1-patches/bash51-012 mirror://gnu/bash/bash-5.1-patches/bash51-013 mirror://gnu/bash/bash-5.1-patches/bash51-014 mirror://gnu/bash/bash-5.1-patches/bash51-015 mirror://gnu/bash/bash-5.1-patches/bash51-016 mirror://gnu/bash/bash-5.1-patches/bash51-001.sig mirror://gnu/bash/bash-5.1-patches/bash51-002.sig mirror://gnu/bash/bash-5.1-patches/bash51-003.sig mirror://gnu/bash/bash-5.1-patches/bash51-004.sig mirror://gnu/bash/bash-5.1-patches/bash51-005.sig mirror://gnu/bash/bash-5.1-patches/bash51-006.sig mirror://gnu/bash/bash-5.1-patches/bash51-007.sig mirror://gnu/bash/bash-5.1-patches/bash51-008.sig mirror://gnu/bash/bash-5.1-patches/bash51-009.sig mirror://gnu/bash/bash-5.1-patches/bash51-010.sig mirror://gnu/bash/bash-5.1-patches/bash51-011.sig mirror://gnu/bash/bash-5.1-patches/bash51-012.sig mirror://gnu/bash/bash-5.1-patches/bash51-013.sig mirror://gnu/bash/bash-5.1-patches/bash51-014.sig mirror://gnu/bash/bash-5.1-patches/bash51-015.sig mirror://gnu/bash/bash-5.1-patches/bash51-016.sig ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-001 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-002 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-003 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-004 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-005 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-006 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-007 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-008 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-009 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-010 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-011 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-012 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-013 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-014 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-015 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-016 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-001.sig ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-002.sig ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-003.sig ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-004.sig ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-005.sig ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-006.sig ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-007.sig ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-008.sig ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-009.sig ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-010.sig ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-011.sig ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-012.sig ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-013.sig ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-014.sig ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-015.sig ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-016.sig verify-sig? ( mirror://gnu/bash/bash-5.1.tar.gz.sig ) https://dev.gentoo.org/~sam/distfiles/app-shells/bash/bash-5.1_p16-patches.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=42a0dc1987c744b12c97eed1d5a1c526
+_md5_=f7758a4d2a439cff881d3c1eea13571e
diff --git a/metadata/md5-cache/app-shells/bash-5.2_beta b/metadata/md5-cache/app-shells/bash-5.2_beta
index b4a68e4fa8b1..cb6f641e4ff1 100644
--- a/metadata/md5-cache/app-shells/bash-5.2_beta
+++ b/metadata/md5-cache/app-shells/bash-5.2_beta
@@ -11,4 +11,4 @@ RDEPEND=>=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) readline? ( >=sys-
 SLOT=0
 SRC_URI=ftp://ftp.cwru.edu/pub/bash/bash-5.2-beta.tar.gz verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.2-beta.tar.gz.sig )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=f1bdfbf1e567ac5ede4b80d97b31a335
+_md5_=f0896ef481928fb774a5d7db30becd19
diff --git a/metadata/md5-cache/app-shells/bash-9999 b/metadata/md5-cache/app-shells/bash-9999
index aaab0bca5151..35ab56cec8b2 100644
--- a/metadata/md5-cache/app-shells/bash-9999
+++ b/metadata/md5-cache/app-shells/bash-9999
@@ -11,4 +11,4 @@ PROPERTIES=live
 RDEPEND=>=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-8.2:0= )
 SLOT=0
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=f1bdfbf1e567ac5ede4b80d97b31a335
+_md5_=f0896ef481928fb774a5d7db30becd19
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 104e157438dd..f0f6dd74d25b 100644
Binary files a/metadata/md5-cache/app-text/Manifest.gz and b/metadata/md5-cache/app-text/Manifest.gz differ
diff --git a/metadata/md5-cache/app-text/ding-1.9 b/metadata/md5-cache/app-text/ding-1.9
index 50b8c4cf84f4..9ddf66a4a991 100644
--- a/metadata/md5-cache/app-text/ding-1.9
+++ b/metadata/md5-cache/app-text/ding-1.9
@@ -3,10 +3,11 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Tk based dictionary (German-English) (incl. dictionary itself)
 EAPI=7
 HOMEPAGE=https://www-user.tu-chemnitz.de/~fri/ding/
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+INHERIT=desktop xdg
+KEYWORDS=amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/tk-8.3
 SLOT=0
 SRC_URI=http://wftp.tu-chemnitz.de/pub/Local/urz/ding/ding-1.9.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=bc2f61884886d88e7883da6156b160ec
+_md5_=81ca29a30ed218d23bc7f7bcd5931a90
diff --git a/metadata/md5-cache/app-text/gspell-1.11.1 b/metadata/md5-cache/app-text/gspell-1.11.1
new file mode 100644
index 000000000000..99599a46e4a9
--- /dev/null
+++ b/metadata/md5-cache/app-text/gspell-1.11.1
@@ -0,0 +1,17 @@
+BDEPEND=dev-libs/libxml2:2 dev-util/glib-utils >=dev-util/gtk-doc-am-1.25 >=sys-devel/gettext-0.19.6 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56 dev-lang/vala:0.54 dev-lang/vala:0.52 dev-lang/vala:0.50 ) ) test? ( app-text/enchant:2[hunspell] || ( app-dicts/myspell-en[l10n_en(+)] app-dicts/myspell-en[l10n_en-US(+)] ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=app-text/enchant-2.1.3:2 >=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.20:3[introspection?] dev-libs/icu:= introspection? ( >=dev-libs/gobject-introspection-1.42.0:= ) test? ( sys-apps/dbus )
+DESCRIPTION=Spell check library for GTK+ applications
+EAPI=8
+HOMEPAGE=https://gitlab.gnome.org/GNOME/gspell
+INHERIT=gnome2 vala virtualx
+IUSE=+introspection +vala test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=app-text/enchant-2.1.3:2 >=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.20:3[introspection?] dev-libs/icu:= introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
+REQUIRED_USE=vala? ( introspection )
+RESTRICT=!test? ( test )
+SLOT=0/2
+SRC_URI=mirror://gnome/sources/gspell/1.11/gspell-1.11.1.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=1aa276514ff050a0e59fa17618ef6a3e
diff --git a/metadata/md5-cache/app-text/lesspipe-2.05 b/metadata/md5-cache/app-text/lesspipe-2.05
index 470da944afcb..7e4c1acbb01d 100644
--- a/metadata/md5-cache/app-text/lesspipe-2.05
+++ b/metadata/md5-cache/app-text/lesspipe-2.05
@@ -4,10 +4,10 @@ DESCRIPTION=A preprocessor for less
 EAPI=7
 HOMEPAGE=https://github.com/wofr06/lesspipe
 INHERIT=bash-completion-r1
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/wofr06/lesspipe/archive/v2.05.tar.gz -> lesspipe-2.05.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=12d148ff5e3cbbc7dd1b62b14ca2e815
+_md5_=170b55c94fbf28d3f21c76964f0eeb10
diff --git a/metadata/md5-cache/app-text/libetonyek-0.1.10 b/metadata/md5-cache/app-text/libetonyek-0.1.10
deleted file mode 100644
index ab828e8849a1..000000000000
--- a/metadata/md5-cache/app-text/libetonyek-0.1.10
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen )
-DEFINED_PHASES=configure install prepare
-DEPEND=app-text/liblangtag dev-libs/librevenge dev-libs/libxml2 >=dev-util/mdds-1.5:1/1.5 sys-libs/zlib dev-libs/boost media-libs/glm sys-devel/libtool test? ( dev-util/cppunit )
-DESCRIPTION=Library parsing Apple Keynote presentations
-EAPI=7
-HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libetonyek
-IUSE=doc static-libs test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=|| ( GPL-2+ LGPL-2.1 MPL-1.1 )
-RDEPEND=app-text/liblangtag dev-libs/librevenge dev-libs/libxml2 >=dev-util/mdds-1.5:1/1.5 sys-libs/zlib
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://dev-www.libreoffice.org/src/libetonyek/libetonyek-0.1.10.tar.xz
-_md5_=486326ec7b8ae6799253fd1e8688d35b
diff --git a/metadata/md5-cache/app-text/libetonyek-0.1.10-r1 b/metadata/md5-cache/app-text/libetonyek-0.1.10-r1
index 72a6a2c155cd..51701b0ad911 100644
--- a/metadata/md5-cache/app-text/libetonyek-0.1.10-r1
+++ b/metadata/md5-cache/app-text/libetonyek-0.1.10-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Library parsing Apple Keynote presentations
 EAPI=8
 HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libetonyek
 IUSE=doc static-libs test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=|| ( GPL-2+ LGPL-2.1 MPL-1.1 )
 RDEPEND=app-text/liblangtag dev-libs/librevenge dev-libs/libxml2 >=dev-util/mdds-2.0:1= sys-libs/zlib
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev-www.libreoffice.org/src/libetonyek/libetonyek-0.1.10.tar.xz
-_md5_=8058a0d29de784c3f2d590ed4c18fb0d
+_md5_=eae603cef28249440c8aceba11628109
diff --git a/metadata/md5-cache/app-text/libnumbertext-1.0.10 b/metadata/md5-cache/app-text/libnumbertext-1.0.10
index 708a73ce9591..93b9dbbc4e40 100644
--- a/metadata/md5-cache/app-text/libnumbertext-1.0.10
+++ b/metadata/md5-cache/app-text/libnumbertext-1.0.10
@@ -2,8 +2,8 @@ DEFINED_PHASES=configure install
 DESCRIPTION=Number to number name and money text conversion libraries
 EAPI=8
 HOMEPAGE=https://github.com/Numbertext/libnumbertext
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-3+
 SLOT=0
 SRC_URI=https://github.com/Numbertext/libnumbertext/releases/download/1.0.10/libnumbertext-1.0.10.tar.xz
-_md5_=be6f35bfb001086cf4e2816c4714995d
+_md5_=710ed8652f242ffd3a38337c197ec978
diff --git a/metadata/md5-cache/app-text/libnumbertext-1.0.8 b/metadata/md5-cache/app-text/libnumbertext-1.0.8
deleted file mode 100644
index 2c9527005fc4..000000000000
--- a/metadata/md5-cache/app-text/libnumbertext-1.0.8
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=Number to number name and money text conversion libraries
-EAPI=8
-HOMEPAGE=https://github.com/Numbertext/libnumbertext
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-3+
-SLOT=0
-SRC_URI=https://github.com/Numbertext/libnumbertext/releases/download/1.0.8/libnumbertext-1.0.8.tar.xz
-_md5_=710ed8652f242ffd3a38337c197ec978
diff --git a/metadata/md5-cache/app-text/poppler-22.05.0 b/metadata/md5-cache/app-text/poppler-22.05.0
index 102fa4cfc506..753bea394ea5 100644
--- a/metadata/md5-cache/app-text/poppler-22.05.0
+++ b/metadata/md5-cache/app-text/poppler-22.05.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://poppler.freedesktop.org/
 INHERIT=cmake toolchain-funcs xdg-utils
 IUSE=boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=media-libs/fontconfig >=media-libs/freetype-2.8 sys-libs/zlib cairo? ( dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection:= ) ) curl? ( net-misc/curl ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) cjk? ( app-text/poppler-data )
 RESTRICT=test
 SLOT=0/121
 SRC_URI=https://poppler.freedesktop.org/poppler-22.05.0.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d9f21266e2f80811b34ed14492cfff63
+_md5_=d3768e2f922eb5fed1671a9171388072
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 6181531d5b41..fcd8cbfa5d3d 100644
Binary files a/metadata/md5-cache/dev-cpp/Manifest.gz and b/metadata/md5-cache/dev-cpp/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-cpp/gemmlowp-2021.12.20 b/metadata/md5-cache/dev-cpp/gemmlowp-2021.12.20
new file mode 100644
index 000000000000..0ae70cf8355c
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/gemmlowp-2021.12.20
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-cpp/gtest ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-precision matrix multiplication
+EAPI=8
+HOMEPAGE=https://github.com/google/gemmlowp/
+INHERIT=cmake
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/google/gemmlowp/archive/e844ffd17118c1e17d94e1ba4354c075a4577b88.tar.gz -> gemmlowp-2021.12.20.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=451c358a0f4186de11d5e94bcc32c20c
diff --git a/metadata/md5-cache/dev-cpp/gflags-2.2.1-r1 b/metadata/md5-cache/dev-cpp/gflags-2.2.1-r1
index a4e47f4e58c8..5c94d52a4e54 100644
--- a/metadata/md5-cache/dev-cpp/gflags-2.2.1-r1
+++ b/metadata/md5-cache/dev-cpp/gflags-2.2.1-r1
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://gflags.github.io/gflags/
 INHERIT=cmake-multilib
 IUSE=static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0/2.2
 SRC_URI=https://github.com/gflags/gflags/archive/v2.2.1.tar.gz -> gflags-2.2.1.tar.gz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=47271929f1967da360871c3b5d566750
+_md5_=3c0978fa56080cefdaa71ca794720149
diff --git a/metadata/md5-cache/dev-cpp/highway-0.16.0-r1 b/metadata/md5-cache/dev-cpp/highway-0.16.0-r1
index 69e2f964bbf6..5370ad37b1c2 100644
--- a/metadata/md5-cache/dev-cpp/highway-0.16.0-r1
+++ b/metadata/md5-cache/dev-cpp/highway-0.16.0-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/google/highway
 INHERIT=cmake-multilib
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86
 LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/highway/archive/refs/tags/0.16.0.tar.gz -> highway-0.16.0.tar.gz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=fe8c304193482cdfd72a2064bbecd304
+_md5_=fe63003cffef2a952cb61ffe48f23011
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index feee8f00e077..c1fc4a6f15ad 100644
Binary files a/metadata/md5-cache/dev-db/Manifest.gz and b/metadata/md5-cache/dev-db/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-db/myodbc-8.0.27-r1 b/metadata/md5-cache/dev-db/myodbc-8.0.27-r1
index 6aa05e1d4740..d1223ea4e59c 100644
--- a/metadata/md5-cache/dev-db/myodbc-8.0.27-r1
+++ b/metadata/md5-cache/dev-db/myodbc-8.0.27-r1
@@ -12,4 +12,4 @@ RDEPEND=dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n
 SLOT=8.0
 SRC_URI=https://dev.mysql.com/get/Downloads/Connector-ODBC/8.0/mysql-connector-odbc-8.0.27-src.tar.gz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=f89a1851084937dbe4cf34d0f29d8ea0
+_md5_=1f9fd175e974898f25a57ff726ec298e
diff --git a/metadata/md5-cache/dev-db/mysql-8.0.27 b/metadata/md5-cache/dev-db/mysql-8.0.27
index 221e013c9b85..e27ee5b58f06 100644
--- a/metadata/md5-cache/dev-db/mysql-8.0.27
+++ b/metadata/md5-cache/dev-db/mysql-8.0.27
@@ -6,13 +6,13 @@ EAPI=8
 HOMEPAGE=https://www.mysql.com/
 INHERIT=check-reqs cmake flag-o-matic linux-info multiprocessing prefix toolchain-funcs
 IUSE=cjk cracklib debug jemalloc latin1 numa +perl profiling router selinux +server tcmalloc test
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~mips -ppc ppc64 -riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~mips -ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
 RDEPEND=>=app-arch/lz4-0_p131:= app-arch/zstd:= sys-libs/ncurses:0= >=sys-libs/zlib-1.2.3:0= >=dev-libs/openssl-1.0.0:0= server? ( dev-libs/icu:= dev-libs/libevent:=[ssl,threads] >=dev-libs/protobuf-3.8:= net-libs/libtirpc:= cjk? ( app-text/mecab:= ) jemalloc? ( dev-libs/jemalloc:0= ) kernel_linux? ( dev-libs/libaio:0= sys-process/procps:0= ) numa? ( sys-process/numactl ) tcmalloc? ( dev-util/google-perftools:0= ) ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !dev-db/mysql:0 !dev-db/mysql:5.7 selinux? ( sec-policy/selinux-mysql ) !prefix? ( acct-group/mysql acct-user/mysql dev-db/mysql-init-scripts )
 REQUIRED_USE=?? ( tcmalloc jemalloc ) cjk? ( server ) jemalloc? ( server ) numa? ( server ) profiling? ( server ) router? ( server ) tcmalloc? ( server )
 RESTRICT=!test? ( test )
 SLOT=8.0
-SRC_URI=https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-8.0.27.tar.gz https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-8.0.27.tar.gz http://downloads.mysql.com/archives/MySQL-8.0/mysql-boost-8.0.27.tar.gz https://dev.gentoo.org/~whissi/dist/mysql/mysql-8.0.27-patches-02.tar.xz
+SRC_URI=https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-8.0.27.tar.gz https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-8.0.27.tar.gz http://downloads.mysql.com/archives/MySQL-8.0/mysql-boost-8.0.27.tar.gz https://dev.gentoo.org/~whissi/dist/mysql/mysql-8.0.27-patches-03.tar.xz https://dev.gentoo.org/~dlan/dist/mysql/mysql-8.0.27-patches-03.tar.xz
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=e6bebb36441c4be8b0051a347689c51c
+_md5_=a3ce7194dba229133d09aeef2597e269
diff --git a/metadata/md5-cache/dev-db/pg_activity-2.3.0 b/metadata/md5-cache/dev-db/pg_activity-2.3.0
deleted file mode 100644
index 20b18de572d1..000000000000
--- a/metadata/md5-cache/dev-db/pg_activity-2.3.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/psycopg:2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/blessed[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/humanize[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Realtime PostgreSQL database server monitoring tool
-EAPI=7
-HOMEPAGE=https://github.com/dalibo/pg_activity
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=POSTGRESQL
-RDEPEND=dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/blessed[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/humanize[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/dalibo/pg_activity/archive/v2.3.0.tar.gz -> pg_activity-2.3.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=3b49135c9db8899b2b3e914dd7266e54
diff --git a/metadata/md5-cache/dev-db/pg_activity-2.3.1 b/metadata/md5-cache/dev-db/pg_activity-2.3.1
new file mode 100644
index 000000000000..178ab367f354
--- /dev/null
+++ b/metadata/md5-cache/dev-db/pg_activity-2.3.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/attrs[python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/psycopg:2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/attrs[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/blessed[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/humanize[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Realtime PostgreSQL database server monitoring tool
+EAPI=8
+HOMEPAGE=https://github.com/dalibo/pg_activity
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=POSTGRESQL
+RDEPEND=dev-python/attrs[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/blessed[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/humanize[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/dalibo/pg_activity/archive/v2.3.1.tar.gz -> pg_activity-2.3.1.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=2d829488a6257d36ce1c29d897290d54
diff --git a/metadata/md5-cache/dev-db/pgpool2-4.2.1-r2 b/metadata/md5-cache/dev-db/pgpool2-4.2.1-r2
index 9bbb6df97a59..90aadc91a7cd 100644
--- a/metadata/md5-cache/dev-db/pgpool2-4.2.1-r2
+++ b/metadata/md5-cache/dev-db/pgpool2-4.2.1-r2
@@ -12,4 +12,4 @@ RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_
 SLOT=0
 SRC_URI=https://www.pgpool.net/download.php?f=pgpool-II-4.2.1.tar.gz -> pgpool-II-4.2.1.tar.gz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	postgres	8f9102af4a3f35d1c700d85892ffecbb	postgres-multi	67d8361b394ded18c2e915e9e493e5f7	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ccac8a4693591f1a73e116cd82083719
+_md5_=a6d20d92ae95e4340119b929d025b674
diff --git a/metadata/md5-cache/dev-db/pgpool2-4.2.2-r2 b/metadata/md5-cache/dev-db/pgpool2-4.2.2-r2
index 3e528631dfdf..16a9ec365ad2 100644
--- a/metadata/md5-cache/dev-db/pgpool2-4.2.2-r2
+++ b/metadata/md5-cache/dev-db/pgpool2-4.2.2-r2
@@ -12,4 +12,4 @@ RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_
 SLOT=0
 SRC_URI=https://www.pgpool.net/download.php?f=pgpool-II-4.2.2.tar.gz -> pgpool-II-4.2.2.tar.gz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	postgres	8f9102af4a3f35d1c700d85892ffecbb	postgres-multi	67d8361b394ded18c2e915e9e493e5f7	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=29b6dff8835a26b09cc2151fa1fd7d79
+_md5_=d7db356746d817af14715998e668981e
diff --git a/metadata/md5-cache/dev-db/pgpool2-4.2.9 b/metadata/md5-cache/dev-db/pgpool2-4.2.9
new file mode 100644
index 000000000000..7e399ffe6ea2
--- /dev/null
+++ b/metadata/md5-cache/dev-db/pgpool2-4.2.9
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=postgres_targets_postgres14? ( dev-db/postgresql:14= ) postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) net-libs/libnsl:0= virtual/libcrypt:= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:0= ) sys-devel/bison virtual/pkgconfig
+DESCRIPTION=Connection pool server for PostgreSQL
+EAPI=7
+HOMEPAGE=https://www.pgpool.net/
+INHERIT=autotools postgres-multi
+IUSE=doc memcached pam ssl static-libs postgres_targets_postgres14 postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=postgres_targets_postgres14? ( dev-db/postgresql:14= ) postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) net-libs/libnsl:0= virtual/libcrypt:= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:0= )
+SLOT=0
+SRC_URI=https://www.pgpool.net/download.php?f=pgpool-II-4.2.9.tar.gz -> pgpool-II-4.2.9.tar.gz
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	postgres	8f9102af4a3f35d1c700d85892ffecbb	postgres-multi	67d8361b394ded18c2e915e9e493e5f7	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=620df826f452d2784cac73d92646b41d
diff --git a/metadata/md5-cache/dev-db/pgpool2-4.3.2 b/metadata/md5-cache/dev-db/pgpool2-4.3.2
new file mode 100644
index 000000000000..430013d15ff9
--- /dev/null
+++ b/metadata/md5-cache/dev-db/pgpool2-4.3.2
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=postgres_targets_postgres14? ( dev-db/postgresql:14= ) postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) acct-user/pgpool net-libs/libnsl:0= virtual/libcrypt:= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:0= ) sys-devel/bison virtual/pkgconfig
+DESCRIPTION=Connection pool server for PostgreSQL
+EAPI=7
+HOMEPAGE=https://www.pgpool.net/
+INHERIT=autotools postgres-multi
+IUSE=doc memcached pam ssl static-libs postgres_targets_postgres14 postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=postgres_targets_postgres14? ( dev-db/postgresql:14= ) postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) acct-user/pgpool net-libs/libnsl:0= virtual/libcrypt:= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:0= )
+SLOT=0
+SRC_URI=https://www.pgpool.net/download.php?f=pgpool-II-4.3.2.tar.gz -> pgpool-II-4.3.2.tar.gz
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	postgres	8f9102af4a3f35d1c700d85892ffecbb	postgres-multi	67d8361b394ded18c2e915e9e493e5f7	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=b95fd8310f186431911460efab87554e
diff --git a/metadata/md5-cache/dev-db/pgpool2-9999 b/metadata/md5-cache/dev-db/pgpool2-9999
index 851a51af2519..d4ff5fba6c65 100644
--- a/metadata/md5-cache/dev-db/pgpool2-9999
+++ b/metadata/md5-cache/dev-db/pgpool2-9999
@@ -11,4 +11,4 @@ PROPERTIES=live
 RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) acct-group/postgres acct-user/pgpool net-libs/libnsl:0= virtual/libcrypt:= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:= )
 SLOT=0
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	postgres	8f9102af4a3f35d1c700d85892ffecbb	postgres-multi	67d8361b394ded18c2e915e9e493e5f7	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=4df844c3b59981bfb50580a52f0a92a3
+_md5_=b4df5d18bcd976f34bf51f2583ea8cfb
diff --git a/metadata/md5-cache/dev-db/pgtap-1.2.0-r2 b/metadata/md5-cache/dev-db/pgtap-1.2.0-r2
index a239fd2c229b..ac44ab5754c6 100644
--- a/metadata/md5-cache/dev-db/pgtap-1.2.0-r2
+++ b/metadata/md5-cache/dev-db/pgtap-1.2.0-r2
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://api.pgxn.org/dist/pgtap/1.2.0/pgtap-1.2.0.zip
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	postgres	8f9102af4a3f35d1c700d85892ffecbb	postgres-multi	67d8361b394ded18c2e915e9e493e5f7
-_md5_=1e4e315b4c6439be266c3c34e40cc922
+_md5_=292cc02345ac68a81a9f6af73ddcd664
diff --git a/metadata/md5-cache/dev-db/postgresql-14.3 b/metadata/md5-cache/dev-db/postgresql-14.4
similarity index 98%
rename from metadata/md5-cache/dev-db/postgresql-14.3
rename to metadata/md5-cache/dev-db/postgresql-14.4
index d051c8248690..4ea35c5ff10d 100644
--- a/metadata/md5-cache/dev-db/postgresql-14.3
+++ b/metadata/md5-cache/dev-db/postgresql-14.4
@@ -11,6 +11,6 @@ LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) lz4? ( app-arch/lz4 ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_musl? ( dev-libs/ossp-uuid ) ) ) selinux? ( sec-policy/selinux-postgresql ) virtual/tmpfiles
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
 SLOT=14
-SRC_URI=https://ftp.postgresql.org/pub/source/v14.3/postgresql-14.3.tar.bz2
+SRC_URI=https://ftp.postgresql.org/pub/source/v14.4/postgresql-14.4.tar.bz2
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=367bcacc074c9f33797c29a67f88718f
diff --git a/metadata/md5-cache/dev-db/pspg-5.5.4 b/metadata/md5-cache/dev-db/pspg-5.5.4
index f12aa50671da..ed9f809694bc 100644
--- a/metadata/md5-cache/dev-db/pspg-5.5.4
+++ b/metadata/md5-cache/dev-db/pspg-5.5.4
@@ -3,10 +3,10 @@ DEPEND=sys-libs/ncurses:= dev-db/postgresql:= sys-libs/readline:=
 DESCRIPTION=A better pager for psql, mysql, and more
 EAPI=8
 HOMEPAGE=https://github.com/okbob/pspg
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:= dev-db/postgresql:= sys-libs/readline:=
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/okbob/pspg/archive/5.5.4.tar.gz -> pspg-5.5.4.tar.gz
-_md5_=3e2f5346e849b38e84a741fcdd62ad6d
+_md5_=7369d8d17cfde46e2caf5186dc1c07e2
diff --git a/metadata/md5-cache/dev-db/redis-5.0.14 b/metadata/md5-cache/dev-db/redis-5.0.14
index bd5dc2d532ea..ceeba04b9fd3 100644
--- a/metadata/md5-cache/dev-db/redis-5.0.14
+++ b/metadata/md5-cache/dev-db/redis-5.0.14
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.redis.io/releases/redis-5.0.14.tar.gz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=0db676bef7c9f6a41e3c2749f8146361
+_md5_=1a8a28b2a6e17cda9a9517b54e51fe86
diff --git a/metadata/md5-cache/dev-db/redis-6.0.16 b/metadata/md5-cache/dev-db/redis-6.0.16
index e696310aa298..be96ab00e5ff 100644
--- a/metadata/md5-cache/dev-db/redis-6.0.16
+++ b/metadata/md5-cache/dev-db/redis-6.0.16
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.redis.io/releases/redis-6.0.16.tar.gz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=eb0ceed85c84f94b78e6a6b69df3a398
+_md5_=8eaf44fbaf59b4e269d97386b30415fa
diff --git a/metadata/md5-cache/dev-db/redis-6.2.6 b/metadata/md5-cache/dev-db/redis-6.2.6
index 956fd2c39b61..dd83d0353089 100644
--- a/metadata/md5-cache/dev-db/redis-6.2.6
+++ b/metadata/md5-cache/dev-db/redis-6.2.6
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.redis.io/releases/redis-6.2.6.tar.gz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=5b3e988cb10773ff101d2c686cca36d1
+_md5_=521be6b072463e350cac3d0548cd01cc
diff --git a/metadata/md5-cache/dev-db/redis-7.0.0-r1 b/metadata/md5-cache/dev-db/redis-7.0.0-r2
similarity index 86%
rename from metadata/md5-cache/dev-db/redis-7.0.0-r1
rename to metadata/md5-cache/dev-db/redis-7.0.0-r2
index d8f6fe1d6cef..2ec5abc43278 100644
--- a/metadata/md5-cache/dev-db/redis-7.0.0-r1
+++ b/metadata/md5-cache/dev-db/redis-7.0.0-r2
@@ -1,6 +1,6 @@
 BDEPEND=jemalloc? ( >=dev-libs/jemalloc-5.1:= ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd:= ) tcmalloc? ( dev-util/google-perftools ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=test? ( dev-lang/tcl:0= ssl? ( dev-tcltk/tls ) )
+DEPEND=jemalloc? ( >=dev-libs/jemalloc-5.1:= ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd:= ) tcmalloc? ( dev-util/google-perftools ) test? ( dev-lang/tcl:0= ssl? ( dev-tcltk/tls ) )
 DESCRIPTION=A persistent caching system, key-value, and data structures database
 EAPI=8
 HOMEPAGE=https://redis.io
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.redis.io/releases/redis-7.0.0.tar.gz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=969662ed802ff9a58794f60567ece293
+_md5_=6aa2182b313410bea576bf066e99d527
diff --git a/metadata/md5-cache/dev-db/redis-7.0.1 b/metadata/md5-cache/dev-db/redis-7.0.1-r1
similarity index 86%
rename from metadata/md5-cache/dev-db/redis-7.0.1
rename to metadata/md5-cache/dev-db/redis-7.0.1-r1
index 9efe8a2c2989..1eec1fe5210b 100644
--- a/metadata/md5-cache/dev-db/redis-7.0.1
+++ b/metadata/md5-cache/dev-db/redis-7.0.1-r1
@@ -1,6 +1,6 @@
 BDEPEND=jemalloc? ( >=dev-libs/jemalloc-5.1:= ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd:= ) tcmalloc? ( dev-util/google-perftools ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=test? ( dev-lang/tcl:0= ssl? ( dev-tcltk/tls ) )
+DEPEND=jemalloc? ( >=dev-libs/jemalloc-5.1:= ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd:= ) tcmalloc? ( dev-util/google-perftools ) test? ( dev-lang/tcl:0= ssl? ( dev-tcltk/tls ) )
 DESCRIPTION=A persistent caching system, key-value, and data structures database
 EAPI=8
 HOMEPAGE=https://redis.io
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.redis.io/releases/redis-7.0.1.tar.gz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=969662ed802ff9a58794f60567ece293
+_md5_=6aa2182b313410bea576bf066e99d527
diff --git a/metadata/md5-cache/dev-db/redis-7.0.2 b/metadata/md5-cache/dev-db/redis-7.0.2
new file mode 100644
index 000000000000..6a93eac7616b
--- /dev/null
+++ b/metadata/md5-cache/dev-db/redis-7.0.2
@@ -0,0 +1,17 @@
+BDEPEND=jemalloc? ( >=dev-libs/jemalloc-5.1:= ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd:= ) tcmalloc? ( dev-util/google-perftools ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=jemalloc? ( >=dev-libs/jemalloc-5.1:= ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd:= ) tcmalloc? ( dev-util/google-perftools ) test? ( dev-lang/tcl:0= ssl? ( dev-tcltk/tls ) )
+DESCRIPTION=A persistent caching system, key-value, and data structures database
+EAPI=8
+HOMEPAGE=https://redis.io
+INHERIT=autotools edo flag-o-matic multiprocessing systemd tmpfiles toolchain-funcs
+IUSE=+jemalloc ssl systemd tcmalloc test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=BSD
+RDEPEND=jemalloc? ( >=dev-libs/jemalloc-5.1:= ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd:= ) tcmalloc? ( dev-util/google-perftools ) acct-group/redis acct-user/redis virtual/tmpfiles
+REQUIRED_USE=?? ( jemalloc tcmalloc )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://download.redis.io/releases/redis-7.0.2.tar.gz
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=6aa2182b313410bea576bf066e99d527
diff --git a/metadata/md5-cache/dev-db/sqlite-9999 b/metadata/md5-cache/dev-db/sqlite-9999
new file mode 100644
index 000000000000..67613d4359ca
--- /dev/null
+++ b/metadata/md5-cache/dev-db/sqlite-9999
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/tcl-8.6:0 dev-vcs/fossil sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0= ) test? ( >=dev-lang/tcl-8.6:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=SQL database engine
+EAPI=7
+HOMEPAGE=https://sqlite.org/
+INHERIT=autotools flag-o-matic multilib-minimal toolchain-funcs
+IUSE=debug doc icu +readline secure-delete static-libs tcl test tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+LICENSE=public-domain
+PROPERTIES=live
+RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0= )
+RESTRICT=!test? ( test )
+SLOT=3
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=330ad8783191765a867cbe25ca199739
diff --git a/metadata/md5-cache/dev-db/sqlmap-1.6.5 b/metadata/md5-cache/dev-db/sqlmap-1.6.5
new file mode 100644
index 000000000000..de9197250f26
--- /dev/null
+++ b/metadata/md5-cache/dev-db/sqlmap-1.6.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install setup
+DESCRIPTION=An automatic SQL injection and database takeover tool
+EAPI=8
+HOMEPAGE=https://sqlmap.org/
+INHERIT=bash-completion-r1 python-single-r1 wrapper
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD BSD-2 GPL-2+ LGPL-2.1+ MIT public-domain
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11[sqlite] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+SLOT=0
+SRC_URI=https://github.com/sqlmapproject/sqlmap/archive/refs/tags/1.6.5.tar.gz -> sqlmap-1.6.5.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=7e5b6e570b00bc712a6d5e1453236b9d
diff --git a/metadata/md5-cache/dev-db/sqlmap-9999 b/metadata/md5-cache/dev-db/sqlmap-9999
index b3446a268dd0..2a89fac87e19 100644
--- a/metadata/md5-cache/dev-db/sqlmap-9999
+++ b/metadata/md5-cache/dev-db/sqlmap-9999
@@ -4,11 +4,11 @@ DESCRIPTION=An automatic SQL injection and database takeover tool
 EAPI=8
 HOMEPAGE=https://sqlmap.org/
 INHERIT=bash-completion-r1 python-single-r1 wrapper git-r3
-IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 LICENSE=BSD BSD-2 GPL-2+ LGPL-2.1+ MIT public-domain
 PROPERTIES=live
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11[sqlite] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=8b88702d62f2769898f45f6083aec960
+_md5_=7e5b6e570b00bc712a6d5e1453236b9d
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index b16e2c541087..092938e58290 100644
Binary files a/metadata/md5-cache/dev-embedded/Manifest.gz and b/metadata/md5-cache/dev-embedded/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-embedded/libftd2xx-1.4.8 b/metadata/md5-cache/dev-embedded/libftd2xx-1.4.8
index 0f255c4bccd6..e59b551d82db 100644
--- a/metadata/md5-cache/dev-embedded/libftd2xx-1.4.8
+++ b/metadata/md5-cache/dev-embedded/libftd2xx-1.4.8
@@ -7,4 +7,4 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=FTDI LGPL-2.1+
 SLOT=0
 SRC_URI=amd64? ( http://www.ftdichip.com/Drivers/D2XX/Linux/libftd2xx-x86_64-1.4.8.gz -> libftd2xx-x86_64-1.4.8.tar.gz ) arm? ( http://www.ftdichip.com/Drivers/D2XX/Linux/libftd2xx-arm-v6-hf-1.4.8.gz -> libftd2xx-arm-v6-hf-1.4.8.tar.gz ) x86? ( http://www.ftdichip.com/Drivers/D2XX/Linux/libftd2xx-i386-1.4.8.gz -> libftd2xx-i386-1.4.8.tar.gz )
-_md5_=12dad31eabd6808e666240c2a8d772cc
+_md5_=4eba483faa6990c1e006a35e6fab8108
diff --git a/metadata/md5-cache/dev-haskell/Manifest.gz b/metadata/md5-cache/dev-haskell/Manifest.gz
index 470fbad156a0..362cc04d8701 100644
Binary files a/metadata/md5-cache/dev-haskell/Manifest.gz and b/metadata/md5-cache/dev-haskell/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-haskell/language-haskell-extract-0.2.4-r1 b/metadata/md5-cache/dev-haskell/language-haskell-extract-0.2.4-r1
index 9b1a5d999ed2..f4f92b6fba54 100644
--- a/metadata/md5-cache/dev-haskell/language-haskell-extract-0.2.4-r1
+++ b/metadata/md5-cache/dev-haskell/language-haskell-extract-0.2.4-r1
@@ -11,4 +11,4 @@ RDEPEND=dev-haskell/regex-posix:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2.4
 SRC_URI=https://hackage.haskell.org/package/language-haskell-extract-0.2.4/language-haskell-extract-0.2.4.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	81cdafdd21e27dfc13f0f7b4947fa145	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ce28954ad5c96d5c56205894a27de2d7
+_md5_=ba927d5bf6e803a72c62abc9d924d7f6
diff --git a/metadata/md5-cache/dev-haskell/wcwidth-0.0.2 b/metadata/md5-cache/dev-haskell/wcwidth-0.0.2
index 42e1febdfd0e..c0d0ecf3f097 100644
--- a/metadata/md5-cache/dev-haskell/wcwidth-0.0.2
+++ b/metadata/md5-cache/dev-haskell/wcwidth-0.0.2
@@ -11,4 +11,4 @@ RDEPEND=>=dev-lang/ghc-7.4.1:= cli? ( >=dev-haskell/attoparsec-0.8.5:=[profile?]
 SLOT=0/0.0.2
 SRC_URI=https://hackage.haskell.org/package/wcwidth-0.0.2/wcwidth-0.0.2.tar.gz
 _eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	81cdafdd21e27dfc13f0f7b4947fa145	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=2bd8044d3bd8dcc20b9e30242b5a097d
+_md5_=47621766d09abc5ca6a8ccce4b2bfe5b
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index b1bc0429d194..d8639e5e42eb 100644
Binary files a/metadata/md5-cache/dev-java/Manifest.gz and b/metadata/md5-cache/dev-java/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-java/byte-buddy-1.12.8 b/metadata/md5-cache/dev-java/byte-buddy-1.12.8
index b0ba602623a2..8d7a36bc169c 100644
--- a/metadata/md5-cache/dev-java/byte-buddy-1.12.8
+++ b/metadata/md5-cache/dev-java/byte-buddy-1.12.8
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://bytebuddy.net/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy/1.12.8/byte-buddy-1.12.8-sources.jar
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	95922adb58696025c86c401d825178a7	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30
-_md5_=eed9f343de99ddd49e78f04a346a5875
+_md5_=600f7f8458b369b8c078fcf2d5f89c62
diff --git a/metadata/md5-cache/dev-java/byte-buddy-agent-1.12.8 b/metadata/md5-cache/dev-java/byte-buddy-agent-1.12.8
index cb2f2e12c185..bde35ac576b2 100644
--- a/metadata/md5-cache/dev-java/byte-buddy-agent-1.12.8
+++ b/metadata/md5-cache/dev-java/byte-buddy-agent-1.12.8
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://bytebuddy.net/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent/1.12.8/byte-buddy-agent-1.12.8-sources.jar test? ( https://codeload.github.com/raphw/byte-buddy/tar.gz/byte-buddy-1.12.8 -> byte-buddy-1.12.8.tar.gz )
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	95922adb58696025c86c401d825178a7	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30
-_md5_=92bc1e8ac4e3b6c2b67e4862e9fa908a
+_md5_=befbb8c84cb9125ebe6569a4317189d2
diff --git a/metadata/md5-cache/dev-java/findbugs-annotations-3.0.1 b/metadata/md5-cache/dev-java/findbugs-annotations-3.0.1
index c27ebf2b0d38..7bb3c4bc7065 100644
--- a/metadata/md5-cache/dev-java/findbugs-annotations-3.0.1
+++ b/metadata/md5-cache/dev-java/findbugs-annotations-3.0.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://findbugs.sourceforge.net/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=LGPL-3
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/jsr305-3.0.2:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/com/google/code/findbugs/findbugs-annotations/3.0.1/findbugs-annotations-3.0.1-sources.jar
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	95922adb58696025c86c401d825178a7	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30
-_md5_=b244a3d5622c61a6b6479b912153d5a9
+_md5_=cd931dba2dccf81d319351bc2889e68a
diff --git a/metadata/md5-cache/dev-java/jna-5.10.0 b/metadata/md5-cache/dev-java/jna-5.10.0
index 8b6d3df61b88..8bcf9ce3caf4 100644
--- a/metadata/md5-cache/dev-java/jna-5.10.0
+++ b/metadata/md5-cache/dev-java/jna-5.10.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/java-native-access/jna
 INHERIT=java-pkg-2 java-ant-2 toolchain-funcs
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=|| ( Apache-2.0 LGPL-2.1+ )
 RDEPEND=>=virtual/jre-1.8:* >=dev-libs/libffi-3.4:= >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://github.com/java-native-access/jna/archive/refs/tags/5.10.0.tar.gz -> jna-5.10.0.tar.gz
 _eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=bb55a5092e48e4602491157e063c6848
+_md5_=54023cd635be486c83cb8a96d2544825
diff --git a/metadata/md5-cache/dev-java/jython-2.7.0-r6 b/metadata/md5-cache/dev-java/jython-2.7.0-r6
index 7762ec38e972..43f687870b6f 100644
--- a/metadata/md5-cache/dev-java/jython-2.7.0-r6
+++ b/metadata/md5-cache/dev-java/jython-2.7.0-r6
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.jython.org
 INHERIT=java-pkg-2 java-ant-2 python-utils-r1 flag-o-matic
 IUSE=examples test doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=PSF-2
 RDEPEND=dev-java/antlr:3 dev-java/netty:0 dev-java/asm:9 dev-java/commons-compress:0 dev-java/guava:0 dev-java/jffi:1.2 dev-java/jline:2 dev-java/icu4j:70 dev-java/jnr-constants:0 dev-java/jnr-posix:3.0 dev-java/jnr-netdb:1.0 dev-java/stringtemplate:0 dev-java/xerces:2 java-virtuals/servlet-api:3.0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=2.7
 SRC_URI=https://search.maven.org/remotecontent?filepath=org/python/jython/2.7.0/jython-2.7.0-sources.jar
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=f5e80abcb880708c44ef94f413cfb17c
+_md5_=c329c7fa36af4c0a56e5448b9485d293
diff --git a/metadata/md5-cache/dev-java/logback-classic-1.2.11 b/metadata/md5-cache/dev-java/logback-classic-1.2.11
index 526cb56a9e40..15cb4202225a 100644
--- a/metadata/md5-cache/dev-java/logback-classic-1.2.11
+++ b/metadata/md5-cache/dev-java/logback-classic-1.2.11
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=http://logback.qos.ch
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=EPL-1.0 LGPL-3
 RDEPEND=virtual/jre:1.8 dev-java/janino:0 dev-java/javax-mail:0 dev-java/logback-core:0 dev-java/reflections:0 dev-java/slf4j-api:0 java-virtuals/servlet-api:3.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/logback/archive/v_1.2.11.tar.gz -> logback-1.2.11.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	95922adb58696025c86c401d825178a7	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30
-_md5_=b25afd6c5834774863a7be6eedabbd6d
+_md5_=52a1f47812a33f27fc327db283821a35
diff --git a/metadata/md5-cache/dev-java/logback-core-1.2.11 b/metadata/md5-cache/dev-java/logback-core-1.2.11
index d3e363e8c71d..abdbb881cc20 100644
--- a/metadata/md5-cache/dev-java/logback-core-1.2.11
+++ b/metadata/md5-cache/dev-java/logback-core-1.2.11
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://logback.qos.ch
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=EPL-1.0 LGPL-3
 RDEPEND=>=virtual/jre-1.8:* dev-java/javax-mail:0 dev-java/janino:0 dev-java/jansi:0 java-virtuals/servlet-api:3.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/logback/archive/v_1.2.11.tar.gz -> logback-1.2.11.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	95922adb58696025c86c401d825178a7	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30
-_md5_=ba9b6fa4946b7ef045d5072275abb853
+_md5_=058cc17b584d7e1381d42f6f8239f9b5
diff --git a/metadata/md5-cache/dev-java/mockito-4.4.0 b/metadata/md5-cache/dev-java/mockito-4.4.0
index bf59ef3b31d7..1a1923903a43 100644
--- a/metadata/md5-cache/dev-java/mockito-4.4.0
+++ b/metadata/md5-cache/dev-java/mockito-4.4.0
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/mockito/mockito
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* dev-java/byte-buddy:0 dev-java/byte-buddy-agent:0 dev-java/junit:4 dev-java/objenesis:0 dev-java/opentest4j:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4
 SRC_URI=https://codeload.github.com/mockito/mockito/tar.gz/v4.4.0 -> mockito-4.4.0.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	95922adb58696025c86c401d825178a7	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30
-_md5_=dbdc51a283c629b3a94da7e5d9b2cdec
+_md5_=ee2bcbc62d5556fca8e6741a9056a205
diff --git a/metadata/md5-cache/dev-java/netty-4.1.35 b/metadata/md5-cache/dev-java/netty-4.1.35
index af7779eb2bee..944bf09d0a43 100644
--- a/metadata/md5-cache/dev-java/netty-4.1.35
+++ b/metadata/md5-cache/dev-java/netty-4.1.35
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://netty.io/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/commons-logging:0 dev-java/jctools-core:0 dev-java/log4j-12-api:2 dev-java/slf4j-simple:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/netty/netty/archive/refs/tags/netty-4.1.35.Final.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	95922adb58696025c86c401d825178a7	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30
-_md5_=449c1fcdc263291464441dadf8c476ec
+_md5_=315f7d07a9dec31090dba48111ef736c
diff --git a/metadata/md5-cache/dev-java/tomcat-native-1.2.34 b/metadata/md5-cache/dev-java/tomcat-native-1.2.34
new file mode 100644
index 000000000000..cc26b3b39cdf
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-native-1.2.34
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DESCRIPTION=Allows Tomcat to use certain native resources for better performance
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-ant-2
+IUSE=static-libs test
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/apr:1= dev-libs/openssl:0= >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://apache/tomcat/tomcat-connectors/native/1.2.34/source/tomcat-native-1.2.34-src.tar.gz
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=33cb3c7df9ef11012684ca5aa22cc64b
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.21 b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.21
index 9dead229ed72..0e2a854eeb49 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.21
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.21
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://tomcat.apache.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=source
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=5.0
 SRC_URI=mirror://apache/tomcat/tomcat-10/v10.0.21/src/apache-tomcat-10.0.21-src.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	95922adb58696025c86c401d825178a7	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30
-_md5_=484ed8723ef13a21c7a8ed2078e7409b
+_md5_=0cc78c6542b8f477e785c9b2bf659dc4
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.79 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.79
index 3404c0ecdfae..8ff7b4d45f3a 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.79
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.79
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://tomcat.apache.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.1
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.79/src/apache-tomcat-8.5.79-src.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	95922adb58696025c86c401d825178a7	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30
-_md5_=ab5d48ecbb7dcf4732f97868224457ca
+_md5_=496e54c23583009c959b8c817b8a5272
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.81 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.81
new file mode 100644
index 000000000000..1d015dcee1db
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.81
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation
+EAPI=7
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=source
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=3.1
+SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.81/src/apache-tomcat-8.5.81-src.tar.gz
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	95922adb58696025c86c401d825178a7	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30
+_md5_=ab5d48ecbb7dcf4732f97868224457ca
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.63 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.63
index 5d2952da3ff5..ae5161979c79 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.63
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.63
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://tomcat.apache.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.0
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.63/src/apache-tomcat-9.0.63-src.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	95922adb58696025c86c401d825178a7	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30
-_md5_=08ded5a97f72bfd8d150c726103afe2f
+_md5_=1d3ad592e13b42d210ea25b61e297905
diff --git a/metadata/md5-cache/dev-java/wsdl4j-1.6.3 b/metadata/md5-cache/dev-java/wsdl4j-1.6.3
new file mode 100644
index 000000000000..11175e33b12a
--- /dev/null
+++ b/metadata/md5-cache/dev-java/wsdl4j-1.6.3
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Web Services Description Language for Java Toolkit (WSDL4J)
+EAPI=8
+HOMEPAGE=https://wsdl4j.sourceforge.net
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=CPL-1.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=mirror://sourceforge/project/wsdl4j/WSDL4J/1.6.3/wsdl4j-src-1.6.3.zip
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	95922adb58696025c86c401d825178a7	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30
+_md5_=21c268ecb0cfb00a9832d67b1238866c
diff --git a/metadata/md5-cache/dev-java/xmlgraphics-commons-2.7-r1 b/metadata/md5-cache/dev-java/xmlgraphics-commons-2.7-r1
index 774c6348f841..88f6895081e6 100644
--- a/metadata/md5-cache/dev-java/xmlgraphics-commons-2.7-r1
+++ b/metadata/md5-cache/dev-java/xmlgraphics-commons-2.7-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://xmlgraphics.apache.org/commons/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-java/commons-io:1 dev-java/commons-logging:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://apache/xmlgraphics/commons/source/xmlgraphics-commons-2.7-src.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	95922adb58696025c86c401d825178a7	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30
-_md5_=d75d0062b9b3ad5059edf6e21f052bac
+_md5_=224b31f50c57ebe6b70dd2731dcc1e32
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index e1cb5b98603a..19b7f1005b25 100644
Binary files a/metadata/md5-cache/dev-lang/Manifest.gz and b/metadata/md5-cache/dev-lang/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lang/R-4.2.0 b/metadata/md5-cache/dev-lang/R-4.2.0
index de19aa99e919..c5f8d62bf131 100644
--- a/metadata/md5-cache/dev-lang/R-4.2.0
+++ b/metadata/md5-cache/dev-lang/R-4.2.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.r-project.org/
 INHERIT=bash-completion-r1 autotools flag-o-matic fortran-2 toolchain-funcs
 IUSE=cairo doc icu java jpeg lapack lto minimal nls openmp perl png prefix profile readline test tiff tk X
-KEYWORDS=amd64 ~arm64 ~hppa ~ia64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm64 ~hppa ~ia64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( GPL-2 GPL-3 ) LGPL-2.1
 RDEPEND=app-arch/bzip2 app-arch/xz-utils app-text/ghostscript-gpl dev-libs/libpcre2:= >=dev-libs/tre-0.8.0_p20210321[approx] net-libs/libtirpc net-misc/curl virtual/blas sys-libs/zlib[minizip] || ( sys-apps/coreutils app-misc/realpath ) cairo? ( x11-libs/cairo:=[X=] x11-libs/pango:= ) icu? ( dev-libs/icu:= ) jpeg? ( virtual/jpeg ) lapack? ( virtual/lapack ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:= ) readline? ( sys-libs/readline:= ) tiff? ( media-libs/tiff:= ) tk? ( dev-lang/tk:= ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xdg-utils ) java? ( >=virtual/jre-1.8:* ) virtual/fortran
 REQUIRED_USE=png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )
@@ -14,4 +14,4 @@ RESTRICT=minimal? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://cran/src/base/R-4/R-4.2.0.tar.gz https://raw.githubusercontent.com/deepayan/rcompletion/78d6830e28ea90a046da79a9b4f70c39594bb6d6/bash_completion/R -> R-78d6830e28ea90a046da79a9b4f70c39594bb6d6.bash_completion
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=b6472b4cf86ed0123cdbc444107d7818
+_md5_=cf1965031d22170c375ee6bcf1ad4809
diff --git a/metadata/md5-cache/dev-lang/execline-2.8.2.0 b/metadata/md5-cache/dev-lang/execline-2.8.2.0
deleted file mode 100644
index 41396171466a..000000000000
--- a/metadata/md5-cache/dev-lang/execline-2.8.2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=>=dev-libs/skalibs-2.10.1.0:=[static-libs?]
-DESCRIPTION=A non-interactive scripting language
-EAPI=8
-HOMEPAGE=https://www.skarnet.org/software/execline/
-INHERIT=toolchain-funcs
-IUSE=static static-libs
-KEYWORDS=amd64 ~arm x86
-LICENSE=ISC
-RDEPEND=>=dev-libs/skalibs-2.10.1.0:=[static-libs?]
-REQUIRED_USE=static? ( static-libs )
-SLOT=0/2.8
-SRC_URI=https://www.skarnet.org/software/execline/execline-2.8.2.0.tar.gz
-_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=81d3f97c1efdf47bce6d28f2b72319a9
diff --git a/metadata/md5-cache/dev-lang/gforth-0.7.3-r2 b/metadata/md5-cache/dev-lang/gforth-0.7.3-r2
index b49cee52f18c..311e95e38feb 100644
--- a/metadata/md5-cache/dev-lang/gforth-0.7.3-r2
+++ b/metadata/md5-cache/dev-lang/gforth-0.7.3-r2
@@ -3,6 +3,7 @@ DEPEND=dev-libs/ffcall emacs? ( >=app-editors/emacs-23.1:* )
 DESCRIPTION=GNU Forth is a fast and portable implementation of the ANSI Forth language
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/gforth
+INHERIT=elisp-common
 IUSE=+check emacs
 KEYWORDS=~amd64 ~arm64 ~ppc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris
 LICENSE=GPL-3
@@ -10,4 +11,4 @@ RDEPEND=dev-libs/ffcall emacs? ( >=app-editors/emacs-23.1:* )
 SLOT=0
 SRC_URI=mirror://gnu/gforth/gforth-0.7.3.tar.gz
 _eclasses_=elisp-common	e7aaa047873789f549ea3df2f04b2145
-_md5_=3e3df2c9d7ddfdef4f307869477a61a1
+_md5_=b88739ac83d7a959e935dab7b1dfb11f
diff --git a/metadata/md5-cache/dev-lang/go-1.17.10 b/metadata/md5-cache/dev-lang/go-1.17.10
deleted file mode 100644
index 9bf7e4816878..000000000000
--- a/metadata/md5-cache/dev-lang/go-1.17.10
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( dev-lang/go dev-lang/go-bootstrap )
-DEFINED_PHASES=compile install postinst test
-DESCRIPTION=A concurrent garbage collected and typesafe programming language
-EAPI=7
-HOMEPAGE=https://go.dev
-INHERIT=toolchain-funcs
-IUSE=cpu_flags_x86_sse2
-KEYWORDS=-* amd64 arm arm64 ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
-LICENSE=BSD
-RESTRICT=strip
-SLOT=0/1.17.10
-SRC_URI=https://storage.googleapis.com/golang/go1.17.10.src.tar.gz
-_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ac3453c815991c44ecf86884873769c6
diff --git a/metadata/md5-cache/dev-lang/go-1.18.2 b/metadata/md5-cache/dev-lang/go-1.18.2
deleted file mode 100644
index 3cbee6f70e52..000000000000
--- a/metadata/md5-cache/dev-lang/go-1.18.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( dev-lang/go dev-lang/go-bootstrap )
-DEFINED_PHASES=compile install postinst test
-DESCRIPTION=A concurrent garbage collected and typesafe programming language
-EAPI=7
-HOMEPAGE=https://go.dev
-INHERIT=toolchain-funcs
-IUSE=cpu_flags_x86_sse2
-KEYWORDS=-* amd64 arm arm64 ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
-LICENSE=BSD
-RESTRICT=strip
-SLOT=0/1.18.2
-SRC_URI=https://storage.googleapis.com/golang/go1.18.2.src.tar.gz
-_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ac3453c815991c44ecf86884873769c6
diff --git a/metadata/md5-cache/dev-lang/mlton-20180207 b/metadata/md5-cache/dev-lang/mlton-20180207
index 4e669051b0df..ae3eacaf8dc4 100644
--- a/metadata/md5-cache/dev-lang/mlton-20180207
+++ b/metadata/md5-cache/dev-lang/mlton-20180207
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/gmp:*
 SLOT=0/20180207
 SRC_URI=!binary? ( mirror://sourceforge/mlton/mlton-20180207.src.tgz ) !bootstrap-smlnj? ( amd64? ( mirror://sourceforge/mlton/mlton-20180207-1.amd64-linux.tgz ) )
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	multibuild	d26d81f242cb193d899a72bca423d0bd	pax-utils	91d47e5d20627c717aa878b9167c62a8
-_md5_=8b77f08003e305274e9aafdaabf2ffe0
+_md5_=a23573bc6862f95f11529954a9c002fc
diff --git a/metadata/md5-cache/dev-lang/python-3.10.4_p1 b/metadata/md5-cache/dev-lang/python-3.10.4_p1
deleted file mode 100644
index 0991fc3dfad1..000000000000
--- a/metadata/md5-cache/dev-lang/python-3.10.4_p1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/autoconf-archive virtual/awk virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-python ) !sys-devel/gcc[libffi(-)] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_10(-)] dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !!<sys-apps/sandbox-2.21 bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] )
-DESCRIPTION=An interpreted, interactive, object-oriented programming language
-EAPI=7
-HOMEPAGE=https://www.python.org/
-INHERIT=autotools check-reqs flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs verify-sig
-IUSE=bluetooth build examples gdbm hardened libedit lto +ncurses pgo +readline +sqlite +ssl test tk wininst +xml verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=PSF-2
-RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_10(-)] dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !!<sys-apps/sandbox-2.21 build? ( app-misc/mime-types )
-RESTRICT=!test? ( test )
-SLOT=3.10
-SRC_URI=https://www.python.org/ftp/python/3.10.4/Python-3.10.4.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.10.4_p1.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.10.4/Python-3.10.4.tar.xz.asc )
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=3069d0927fe7629ce81f3e17ac2a390b
diff --git a/metadata/md5-cache/dev-lang/python-3.11.0_beta1-r2 b/metadata/md5-cache/dev-lang/python-3.11.0_beta1-r2
deleted file mode 100644
index cee3f735d17b..000000000000
--- a/metadata/md5-cache/dev-lang/python-3.11.0_beta1-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/autoconf-archive virtual/awk virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-python ) !sys-devel/gcc[libffi(-)] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=app-arch/bzip2:= app-arch/xz-utils:= app-crypt/libb2 >=dev-libs/expat-2.1:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) !!<sys-apps/sandbox-2.21 bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] )
-DESCRIPTION=An interpreted, interactive, object-oriented programming language
-EAPI=7
-HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
-INHERIT=autotools check-reqs flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs verify-sig
-IUSE=bluetooth build examples gdbm hardened libedit lto +ncurses pgo +readline +sqlite +ssl test tk wininst verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=PSF-2
-RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= app-crypt/libb2 >=dev-libs/expat-2.1:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) !!<sys-apps/sandbox-2.21 !build? ( app-misc/mime-types ) dev-lang/python-exec[python_targets_python3_11(-)]
-RESTRICT=!test? ( test )
-SLOT=3.11
-SRC_URI=https://www.python.org/ftp/python/3.11.0/Python-3.11.0b1.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.11.0b1.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.11.0/Python-3.11.0b1.tar.xz.asc )
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ef7ff77247c74c753aded4e4053b1139
diff --git a/metadata/md5-cache/dev-lang/python-3.11.0_beta2 b/metadata/md5-cache/dev-lang/python-3.11.0_beta2
deleted file mode 100644
index 8ea1fc895275..000000000000
--- a/metadata/md5-cache/dev-lang/python-3.11.0_beta2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/autoconf-archive virtual/awk virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-python ) !sys-devel/gcc[libffi(-)] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=app-arch/bzip2:= app-arch/xz-utils:= app-crypt/libb2 >=dev-libs/expat-2.1:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) !!<sys-apps/sandbox-2.21 bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] )
-DESCRIPTION=An interpreted, interactive, object-oriented programming language
-EAPI=7
-HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
-INHERIT=autotools check-reqs flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs verify-sig
-IUSE=bluetooth build examples gdbm hardened libedit lto +ncurses pgo +readline +sqlite +ssl test tk wininst verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=PSF-2
-RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= app-crypt/libb2 >=dev-libs/expat-2.1:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) !!<sys-apps/sandbox-2.21 !build? ( app-misc/mime-types ) dev-lang/python-exec[python_targets_python3_11(-)]
-RESTRICT=!test? ( test )
-SLOT=3.11
-SRC_URI=https://www.python.org/ftp/python/3.11.0/Python-3.11.0b2.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.11.0b2.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.11.0/Python-3.11.0b2.tar.xz.asc )
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ef7ff77247c74c753aded4e4053b1139
diff --git a/metadata/md5-cache/dev-lang/python-3.11.0_beta2_p1 b/metadata/md5-cache/dev-lang/python-3.11.0_beta2_p1
deleted file mode 100644
index 275cb40347cd..000000000000
--- a/metadata/md5-cache/dev-lang/python-3.11.0_beta2_p1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/autoconf-archive virtual/awk virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-python ) !sys-devel/gcc[libffi(-)] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=app-arch/bzip2:= app-arch/xz-utils:= app-crypt/libb2 >=dev-libs/expat-2.1:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) !!<sys-apps/sandbox-2.21 bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] )
-DESCRIPTION=An interpreted, interactive, object-oriented programming language
-EAPI=7
-HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
-INHERIT=autotools check-reqs flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs verify-sig
-IUSE=bluetooth build examples gdbm hardened libedit lto +ncurses pgo +readline +sqlite +ssl test tk wininst verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=PSF-2
-RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= app-crypt/libb2 >=dev-libs/expat-2.1:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) !!<sys-apps/sandbox-2.21 !build? ( app-misc/mime-types ) dev-lang/python-exec[python_targets_python3_11(-)]
-RESTRICT=!test? ( test )
-SLOT=3.11
-SRC_URI=https://www.python.org/ftp/python/3.11.0/Python-3.11.0b2.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.11.0b2_p1.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.11.0/Python-3.11.0b2.tar.xz.asc )
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ef7ff77247c74c753aded4e4053b1139
diff --git a/metadata/md5-cache/dev-lang/python-3.8.13_p1 b/metadata/md5-cache/dev-lang/python-3.8.13_p1
deleted file mode 100644
index bb6f32c731c9..000000000000
--- a/metadata/md5-cache/dev-lang/python-3.8.13_p1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/autoconf-archive virtual/awk virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-python ) !sys-devel/gcc[libffi(-)] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_8(-)] dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] )
-DESCRIPTION=An interpreted, interactive, object-oriented programming language
-EAPI=7
-HOMEPAGE=https://www.python.org/
-INHERIT=autotools flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs verify-sig
-IUSE=bluetooth build examples gdbm hardened +ncurses +readline +sqlite +ssl test tk wininst +xml verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=PSF-2
-RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_8(-)] dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) build? ( app-misc/mime-types )
-RESTRICT=!test? ( test )
-SLOT=3.8
-SRC_URI=https://www.python.org/ftp/python/3.8.13/Python-3.8.13.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.8.13_p1.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.8.13/Python-3.8.13.tar.xz.asc )
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=7dd954435c89a09076ce2e9ee9a57cff
diff --git a/metadata/md5-cache/dev-lang/python-3.9.11 b/metadata/md5-cache/dev-lang/python-3.9.11
deleted file mode 100644
index dd245b5dab72..000000000000
--- a/metadata/md5-cache/dev-lang/python-3.9.11
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/awk virtual/pkgconfig sys-devel/autoconf-archive verify-sig? ( sec-keys/openpgp-keys-python ) !sys-devel/gcc[libffi(-)] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_9(-)] dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] )
-DESCRIPTION=An interpreted, interactive, object-oriented programming language
-EAPI=7
-HOMEPAGE=https://www.python.org/
-INHERIT=autotools check-reqs flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs verify-sig
-IUSE=bluetooth build examples gdbm hardened lto +ncurses pgo +readline +sqlite +ssl test tk wininst +xml verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=PSF-2
-RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_9(-)] dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
-RESTRICT=!test? ( test )
-SLOT=3.9
-SRC_URI=https://www.python.org/ftp/python/3.9.11/Python-3.9.11.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.9.11.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.9.11/Python-3.9.11.tar.xz.asc )
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=6a8aedf58a23da91f65e2c023ba634dc
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r10 b/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r10
index 7fd614117a33..ddafad4edae7 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r10
+++ b/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r10
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/mozjs185
 SRC_URI=https://archive.mozilla.org/pub/js/js185-1.0.0.tar.gz https://dev.gentoo.org/~axs/distfiles/spidermonkey-slot0-patches-02.tar.xz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=81d3f5e09ce930d85ae4fcdc54d77b56
+_md5_=a95f5fbc1dd6a693ba3876febdf4526a
diff --git a/metadata/md5-cache/dev-lang/teyjus-2.1 b/metadata/md5-cache/dev-lang/teyjus-2.1
index f238887ccb60..bf9c33612c26 100644
--- a/metadata/md5-cache/dev-lang/teyjus-2.1
+++ b/metadata/md5-cache/dev-lang/teyjus-2.1
@@ -11,4 +11,4 @@ RDEPEND=>=sys-devel/binutils-2.17:* >=sys-devel/gcc-2.95.3:* >=dev-lang/ocaml-3.
 SLOT=0/2.1
 SRC_URI=https://github.com/teyjus/teyjus/archive/v2.1.tar.gz -> teyjus-2.1.tar.gz
 _eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp-common	e7aaa047873789f549ea3df2f04b2145	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=5070c03cafa714de321e27f21715a0bb
+_md5_=8be9c8c3f75a6fee7b6531aaa523d723
diff --git a/metadata/md5-cache/dev-lang/teyjus-2.1-r1 b/metadata/md5-cache/dev-lang/teyjus-2.1-r1
index 448f3ecfed2b..a1ed21989433 100644
--- a/metadata/md5-cache/dev-lang/teyjus-2.1-r1
+++ b/metadata/md5-cache/dev-lang/teyjus-2.1-r1
@@ -3,6 +3,7 @@ DEPEND=>=sys-devel/binutils-2.17:* >=sys-devel/gcc-2.95.3:* >=dev-lang/ocaml-3.1
 DESCRIPTION=Higher-order logic programming language Lambda Prolog
 EAPI=7
 HOMEPAGE=http://teyjus.cs.umn.edu/
+INHERIT=elisp-common
 IUSE=emacs examples +ocamlopt
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
@@ -10,4 +11,4 @@ RDEPEND=>=sys-devel/binutils-2.17:* >=sys-devel/gcc-2.95.3:* >=dev-lang/ocaml-3.
 SLOT=0/2.1
 SRC_URI=https://github.com/teyjus/teyjus/archive/v2.1.tar.gz -> teyjus-2.1.tar.gz
 _eclasses_=elisp-common	e7aaa047873789f549ea3df2f04b2145
-_md5_=9fb896cc4c8813e11c023ed98a194a83
+_md5_=dace6ac5fb4c01ed088cca91f550a358
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 23e6d16bdddf..4145d17b3092 100644
Binary files a/metadata/md5-cache/dev-libs/Manifest.gz and b/metadata/md5-cache/dev-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-libs/boost-1.79.0 b/metadata/md5-cache/dev-libs/boost-1.79.0
index 9b3ffb923d05..bb96711c9c5b 100644
--- a/metadata/md5-cache/dev-libs/boost-1.79.0
+++ b/metadata/md5-cache/dev-libs/boost-1.79.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.boost.org/
 INHERIT=flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal
 IUSE=bzip2 context debug doc icu lzma +nls mpi numpy python tools zlib zstd 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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=Boost-1.0
 RDEPEND=!app-admin/eselect-boost !dev-libs/boost-numpy !<dev-libs/leatherman-1.12.0-r1 bzip2? ( app-arch/bzip2:=[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-3.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !icu? ( virtual/libiconv[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:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mpi? ( >=virtual/mpi-2.0-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx,threads] ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) numpy? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) zlib? ( sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0/1.79.0
 SRC_URI=https://boostorg.jfrog.io/artifactory/main/release/1.79.0/source/boost_1_79_0.tar.bz2
 _eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=6cd17ff6f1a95ec465e06128b2b721ba
+_md5_=f84715b9eafa494ddf2c3494510dfb4f
diff --git a/metadata/md5-cache/dev-libs/cxxtools-3.0-r2 b/metadata/md5-cache/dev-libs/cxxtools-3.0-r2
new file mode 100644
index 000000000000..69650af88211
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/cxxtools-3.0-r2
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=virtual/libiconv
+DESCRIPTION=Collection of general purpose C++-classes
+EAPI=7
+HOMEPAGE=http://www.tntnet.org/cxxtools.html
+INHERIT=autotools
+KEYWORDS=~amd64 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=virtual/libiconv
+SLOT=0
+SRC_URI=http://www.tntnet.org/download/cxxtools-3.0.tar.gz
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=de69fcd5641de3fb7d4238a7f84835da
diff --git a/metadata/md5-cache/dev-libs/flatbuffers-2.0.0-r1 b/metadata/md5-cache/dev-libs/flatbuffers-2.0.0-r1
deleted file mode 100644
index 85589b30afc8..000000000000
--- a/metadata/md5-cache/dev-libs/flatbuffers-2.0.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Memory efficient serialization library
-EAPI=7
-HOMEPAGE=https://google.github.io/flatbuffers/
-INHERIT=cmake
-IUSE=static-libs test
-KEYWORDS=amd64 ~arm arm64 x86
-LICENSE=Apache-2.0
-RESTRICT=!test? ( test )
-SLOT=0/2
-SRC_URI=https://github.com/google/flatbuffers/archive/v2.0.0.tar.gz -> flatbuffers-2.0.0.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=07abc6c1d499f696bcab9865532c4768
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-1.72.0 b/metadata/md5-cache/dev-libs/gobject-introspection-1.72.0
index 72901c84cc6d..26c0a37262f8 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-1.72.0
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-1.72.0
@@ -1,6 +1,6 @@
-BDEPEND=app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=gtk-doc? ( >=dev-util/gtk-doc-1.19 app-text/docbook-xml-dtd:4.3 app-text/docbook-xml-dtd:4.5 ) sys-devel/bison sys-devel/flex test? ( x11-libs/cairo[glib] python_single_target_python3_8? ( dev-python/mako[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mako[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mako[python_targets_python3_10(-)] dev-python/markdown[python_targets_python3_10(-)] ) ) app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/gobject-introspection-common-1.72.0 >=dev-libs/glib-2.58.0:2 dev-libs/libffi:= doctool? ( python_single_target_python3_8? ( dev-python/mako[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mako[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mako[python_targets_python3_10(-)] dev-python/markdown[python_targets_python3_10(-)] ) ) virtual/pkgconfig python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml] ) gtk-doc? ( >=dev-util/gtk-doc-1.19 app-text/docbook-xml-dtd:4.3 app-text/docbook-xml-dtd:4.5 ) sys-devel/bison sys-devel/flex test? ( x11-libs/cairo[glib] python_single_target_python3_8? ( dev-python/mako[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mako[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mako[python_targets_python3_10(-)] dev-python/markdown[python_targets_python3_10(-)] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/gobject-introspection-common-1.72.0 >=dev-libs/glib-2.58.0:2 dev-libs/libffi:= doctool? ( python_single_target_python3_8? ( dev-python/mako[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mako[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mako[python_targets_python3_10(-)] dev-python/markdown[python_targets_python3_10(-)] ) ) virtual/pkgconfig python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Introspection system for GObject-based libraries
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/GObjectIntrospection
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gobject-introspection/1.72/gobject-introspection-1.72.0.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=89022378c5d70dd2a2bf2634170ea215
+_md5_=1de4745cef70089fe6386ace91ab9cab
diff --git a/metadata/md5-cache/dev-libs/icu-71.1 b/metadata/md5-cache/dev-libs/icu-71.1
deleted file mode 100644
index 8a5758d91627..000000000000
--- a/metadata/md5-cache/dev-libs/icu-71.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) sys-devel/autoconf-archive virtual/pkgconfig doc? ( app-doc/doxygen[dot] ) verify-sig? ( sec-keys/openpgp-keys-icu ) 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 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DESCRIPTION=International Components for Unicode
-EAPI=8
-HOMEPAGE=https://icu.unicode.org/
-INHERIT=autotools flag-o-matic multilib-minimal python-any-r1 toolchain-funcs verify-sig
-IUSE=debug doc examples static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 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 ~x86-winnt
-LICENSE=BSD
-RESTRICT=!test? ( test )
-SLOT=0/71.1
-SRC_URI=https://github.com/unicode-org/icu/releases/download/release-71-1/icu4c-71_1-src.tgz verify-sig? ( https://github.com/unicode-org/icu/releases/download/release-71-1/icu4c-71_1-src.tgz.asc )
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=0cccef0c8acffc40119cddddd1e0992c
diff --git a/metadata/md5-cache/dev-libs/icu-71.1-r1 b/metadata/md5-cache/dev-libs/icu-71.1-r1
index c199f4e7dfc8..f7e48b78989b 100644
--- a/metadata/md5-cache/dev-libs/icu-71.1-r1
+++ b/metadata/md5-cache/dev-libs/icu-71.1-r1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://icu.unicode.org/
 INHERIT=autotools flag-o-matic multilib-minimal python-any-r1 toolchain-funcs verify-sig
 IUSE=debug doc examples static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 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 ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0/71.1
 SRC_URI=https://github.com/unicode-org/icu/releases/download/release-71-1/icu4c-71_1-src.tgz verify-sig? ( https://github.com/unicode-org/icu/releases/download/release-71-1/icu4c-71_1-src.tgz.asc )
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=da1db0f336aed8201e547ae6d14cbf8c
+_md5_=ad985e42d90dec3fc80afbd9cdc27efa
diff --git a/metadata/md5-cache/dev-libs/icu-layoutex-71.1 b/metadata/md5-cache/dev-libs/icu-layoutex-71.1
index f039b3c07071..076eec86b75a 100644
--- a/metadata/md5-cache/dev-libs/icu-layoutex-71.1
+++ b/metadata/md5-cache/dev-libs/icu-layoutex-71.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://icu-project.org/
 INHERIT=autotools flag-o-matic multilib-minimal toolchain-funcs verify-sig
 IUSE=debug static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=~dev-libs/icu-71.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/icu-le-hb[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/71.1
 SRC_URI=https://github.com/unicode-org/icu/releases/download/release-71-1/icu4c-71_1-src.tgz verify-sig? ( https://github.com/unicode-org/icu/releases/download/release-71-1/icu4c-71_1-src.tgz.asc )
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=e19d0136a424def2acfbcbb0b60dafb2
+_md5_=3368e5e28af3a6c02898da5479a02480
diff --git a/metadata/md5-cache/dev-libs/libdbusmenu-16.04.0-r2 b/metadata/md5-cache/dev-libs/libdbusmenu-16.04.0-r2
new file mode 100644
index 000000000000..90eef748a56d
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libdbusmenu-16.04.0-r2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/glib-utils dev-util/intltool sys-devel/gettext virtual/pkgconfig introspection? ( || ( dev-lang/vala:0.56[vapigen(+)] dev-lang/vala:0.54[vapigen(+)] dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] ) ) test? ( >=dev-libs/json-glib-0.13.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/dbus-test-runner-15.04.0_p100 gtk? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) gtk3? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) ) 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 preinst prepare test
+DEPEND=>=dev-libs/dbus-glib-0.100[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.35.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gtk? ( x11-libs/gtk+:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk3? ( >=x11-libs/gtk+-3.2:3[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1 )
+DESCRIPTION=Library to pass menu structure across DBus
+EAPI=8
+HOMEPAGE=https://launchpad.net/libdbusmenu
+INHERIT=autotools flag-o-matic multilib-minimal vala virtualx xdg-utils
+IUSE=debug gtk gtk3 +introspection test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2.1 LGPL-3
+RDEPEND=>=dev-libs/dbus-glib-0.100[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.35.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gtk? ( x11-libs/gtk+:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk3? ( >=x11-libs/gtk+-3.2:3[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://launchpad.net/dbusmenu/16.04/16.04.0/+download/libdbusmenu-16.04.0.tar.gz
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=e9047619497a381b4c12a3f3cda52ec7
diff --git a/metadata/md5-cache/dev-libs/libffi-3.4.2-r1 b/metadata/md5-cache/dev-libs/libffi-3.4.2-r1
index cabe70c10de6..5ed80c3aaa73 100644
--- a/metadata/md5-cache/dev-libs/libffi-3.4.2-r1
+++ b/metadata/md5-cache/dev-libs/libffi-3.4.2-r1
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://sourceware.org/libffi/
 INHERIT=multilib-minimal preserve-libs
 IUSE=debug exec-static-trampoline experimental-loong pax-kernel static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/8
 SRC_URI=https://github.com/libffi/libffi/releases/download/v3.4.2/libffi-3.4.2.tar.gz experimental-loong? ( https://dev.gentoo.org/~xen0n/distfiles/libffi-3.4.2-loongarch64-20220428.patch.xz )
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=17e673288933123934c556f2008d1fa4
+_md5_=067842e97bebc2f98982f7255bee45f3
diff --git a/metadata/md5-cache/dev-libs/libffi-compat-3.3-r2 b/metadata/md5-cache/dev-libs/libffi-compat-3.3-r2
index cfc57d19aaa4..d493d80163b5 100644
--- a/metadata/md5-cache/dev-libs/libffi-compat-3.3-r2
+++ b/metadata/md5-cache/dev-libs/libffi-compat-3.3-r2
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://sourceware.org/libffi/
 INHERIT=multilib-minimal
 IUSE=debug pax-kernel test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=!dev-libs/libffi:0/7
 RESTRICT=!test? ( test )
 SLOT=7
 SRC_URI=https://github.com/libffi/libffi/releases/download/v3.3/libffi-3.3.tar.gz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=b24c5e8dfc887a34ca5f633002b1a233
+_md5_=0d1c17d1b00fb075eb21862728a22296
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.10.1-r1 b/metadata/md5-cache/dev-libs/libgcrypt-1.10.1-r1
new file mode 100644
index 000000000000..c2a885246946
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.10.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( virtual/texi2dvi ) verify-sig? ( sec-keys/openpgp-keys-gnupg ) 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 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-libs/libgpg-error-1.25[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=General purpose crypto library based on the code used in GnuPG
+EAPI=7
+HOMEPAGE=https://www.gnupg.org/
+INHERIT=autotools flag-o-matic multilib-minimal toolchain-funcs verify-sig
+IUSE=+asm cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3 cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_padlock cpu_flags_x86_sha cpu_flags_x86_sse4_1 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 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=LGPL-2.1 MIT
+RDEPEND=>=dev-libs/libgpg-error-1.25[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=cpu_flags_arm_aes? ( cpu_flags_arm_sha1 cpu_flags_arm_sha2 ) cpu_flags_arm_sha1? ( cpu_flags_arm_aes cpu_flags_arm_sha2 ) cpu_flags_arm_sha2? ( cpu_flags_arm_aes cpu_flags_arm_sha1 ) cpu_flags_ppc_vsx3? ( cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 ) cpu_flags_ppc_vsx2? ( cpu_flags_ppc_altivec )
+SLOT=0/20
+SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.10.1.tar.bz2 verify-sig? ( mirror://gnupg/libgcrypt/libgcrypt-1.10.1.tar.bz2.sig )
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=a83a6d23287c0f0446774bd7058f9bbc
diff --git a/metadata/md5-cache/dev-libs/libgpg-error-1.45 b/metadata/md5-cache/dev-libs/libgpg-error-1.45
index 75a9abd5d503..c07e32b4388a 100644
--- a/metadata/md5-cache/dev-libs/libgpg-error-1.45
+++ b/metadata/md5-cache/dev-libs/libgpg-error-1.45
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.gnupg.org/related_software/libgpg-error
 INHERIT=autotools multilib-minimal toolchain-funcs prefix
 IUSE=common-lisp nls static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnupg/libgpg-error/libgpg-error-1.45.tar.bz2
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=959649ee7441cd9e172d6a2a684a200d
+_md5_=0ec4975896f8358fcbf6c3a6dfdd1f5d
diff --git a/metadata/md5-cache/dev-libs/libixion-0.16.1 b/metadata/md5-cache/dev-libs/libixion-0.16.1
deleted file mode 100644
index 341b0798dab4..000000000000
--- a/metadata/md5-cache/dev-libs/libixion-0.16.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=dev-libs/boost:= dev-util/mdds:1/1.5 python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) )
-DESCRIPTION=General purpose formula parser & interpreter
-EAPI=7
-HOMEPAGE=https://gitlab.com/ixion/ixion
-INHERIT=python-single-r1
-IUSE=debug python +threads python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
-LICENSE=MIT
-RDEPEND=dev-libs/boost:= dev-util/mdds:1/1.5 python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
-SLOT=0/0.16
-SRC_URI=https://kohei.us/files/ixion/src/libixion-0.16.1.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=cc3187cc378f33a0eda8e8ae0ac3ce11
diff --git a/metadata/md5-cache/dev-libs/libixion-0.17.0 b/metadata/md5-cache/dev-libs/libixion-0.17.0
index 113e3bf4c507..2a0cff648547 100644
--- a/metadata/md5-cache/dev-libs/libixion-0.17.0
+++ b/metadata/md5-cache/dev-libs/libixion-0.17.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://gitlab.com/ixion/ixion
 INHERIT=python-single-r1
 IUSE=debug python +threads python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
 LICENSE=MIT
 RDEPEND=dev-libs/boost:= dev-util/mdds:1/2.0 python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 SLOT=0/0.17
 SRC_URI=https://kohei.us/files/ixion/src/libixion-0.17.0.tar.xz
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=f1824ab329a8880e2f98236bf13dde12
+_md5_=9bc266160f0081a3700ec2c1c2566b0f
diff --git a/metadata/md5-cache/dev-libs/libksba-1.6.0 b/metadata/md5-cache/dev-libs/libksba-1.6.0
index 37f3fd304d36..2b0758865a17 100644
--- a/metadata/md5-cache/dev-libs/libksba-1.6.0
+++ b/metadata/md5-cache/dev-libs/libksba-1.6.0
@@ -5,9 +5,9 @@ DESCRIPTION=X.509 and CMS (PKCS#7) library
 EAPI=7
 HOMEPAGE=http://www.gnupg.org/related_software/libksba
 IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-3+ GPL-2+ GPL-3
 RDEPEND=>=dev-libs/libgpg-error-1.8
 SLOT=0
 SRC_URI=mirror://gnupg/libksba/libksba-1.6.0.tar.bz2
-_md5_=6b7e4dc1de05eeb570f2d6bdbdbf0eb6
+_md5_=2ff3d325f7c70dda9690a8d279f9e72c
diff --git a/metadata/md5-cache/dev-libs/libltdl-2.4.7 b/metadata/md5-cache/dev-libs/libltdl-2.4.7
index f8a02b899876..f1d252fa332b 100644
--- a/metadata/md5-cache/dev-libs/libltdl-2.4.7
+++ b/metadata/md5-cache/dev-libs/libltdl-2.4.7
@@ -5,9 +5,9 @@ EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libtool/
 INHERIT=multilib-minimal
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnu/libtool/libtool-2.4.7.tar.xz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=7d31eadd5b51b70a4bbc89585a80aec4
+_md5_=cb379adfeb4efa7996e5d6de94a82677
diff --git a/metadata/md5-cache/dev-libs/liborcus-0.16.1 b/metadata/md5-cache/dev-libs/liborcus-0.16.1
deleted file mode 100644
index b3ecf9b92003..000000000000
--- a/metadata/md5-cache/dev-libs/liborcus-0.16.1
+++ /dev/null
@@ -1,17 +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 setup
-DEPEND=dev-libs/boost:=[zlib(+)] sys-libs/zlib python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) spreadsheet-model? ( dev-libs/libixion:0/0.16 ) dev-util/mdds:1/1.5
-DESCRIPTION=Standalone file import filter library for spreadsheet documents
-EAPI=7
-HOMEPAGE=https://gitlab.com/orcus/orcus/blob/master/README.md
-INHERIT=autotools python-single-r1
-IUSE=python +spreadsheet-model test tools python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
-LICENSE=MIT
-RDEPEND=dev-libs/boost:=[zlib(+)] sys-libs/zlib python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) spreadsheet-model? ( dev-libs/libixion:0/0.16 )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
-RESTRICT=!test? ( test )
-SLOT=0/0.16
-SRC_URI=https://kohei.us/files/orcus/src/liborcus-0.16.1.tar.xz
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=a13b6f445c3eb16e829ae325208ad1f3
diff --git a/metadata/md5-cache/dev-libs/liborcus-0.17.2 b/metadata/md5-cache/dev-libs/liborcus-0.17.2
index d7bf2cd7b7ae..55e4174917cb 100644
--- a/metadata/md5-cache/dev-libs/liborcus-0.17.2
+++ b/metadata/md5-cache/dev-libs/liborcus-0.17.2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://gitlab.com/orcus/orcus/blob/master/README.md
 INHERIT=autotools python-single-r1
 IUSE=python +spreadsheet-model test tools python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
 LICENSE=MIT
 RDEPEND=dev-libs/boost:=[zlib(+)] sys-libs/zlib python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) spreadsheet-model? ( dev-libs/libixion:0/0.17 )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.17
 SRC_URI=https://kohei.us/files/orcus/src/liborcus-0.17.2.tar.xz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=0eece93407e98fb9152e0fdbbc7de9fe
+_md5_=d32f7d54413fd6e90d4fde86a5de8018
diff --git a/metadata/md5-cache/dev-libs/libpwquality-1.4.4-r1 b/metadata/md5-cache/dev-libs/libpwquality-1.4.4-r1
index 009b32186618..fe5fd9cc8c18 100644
--- a/metadata/md5-cache/dev-libs/libpwquality-1.4.4-r1
+++ b/metadata/md5-cache/dev-libs/libpwquality-1.4.4-r1
@@ -13,4 +13,4 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 py
 SLOT=0
 SRC_URI=https://github.com/libpwquality/libpwquality/releases/download/libpwquality-1.4.4/libpwquality-1.4.4.tar.bz2
 _eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	usr-ldscript	5c738dce357b54d5a90e30094d2f983c
-_md5_=998ac0abfe4c92c4e73d3682beef1701
+_md5_=099b043a395e8607f9a881de1b793359
diff --git a/metadata/md5-cache/dev-libs/libtomcrypt-1.18.2-r4 b/metadata/md5-cache/dev-libs/libtomcrypt-1.18.2-r4
index a47721e2b58d..446de46dabff 100644
--- a/metadata/md5-cache/dev-libs/libtomcrypt-1.18.2-r4
+++ b/metadata/md5-cache/dev-libs/libtomcrypt-1.18.2-r4
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.libtom.net/LibTomCrypt/ https://github.com/libtom/libtomcrypt
 INHERIT=toolchain-funcs
 IUSE=+gmp +libtommath tomsfastmath
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( WTFPL-2 public-domain )
 RDEPEND=gmp? ( dev-libs/gmp:= ) libtommath? ( dev-libs/libtommath:= ) tomsfastmath? ( dev-libs/tomsfastmath:= )
 REQUIRED_USE=|| ( gmp libtommath tomsfastmath )
 SLOT=0/1
 SRC_URI=https://github.com/libtom/libtomcrypt/releases/download/v1.18.2/crypt-1.18.2.tar.xz -> libtomcrypt-1.18.2.tar.xz
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=1dc413f8341d09bff023e1ae8b791613
+_md5_=ecda465b06396d531f8c1d1206d86d02
diff --git a/metadata/md5-cache/dev-libs/libtraceevent-1.5.2 b/metadata/md5-cache/dev-libs/libtraceevent-1.5.2
new file mode 100644
index 000000000000..695e2d5372f7
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libtraceevent-1.5.2
@@ -0,0 +1,13 @@
+BDEPEND=doc? ( app-text/xmlto app-text/asciidoc )
+DEFINED_PHASES=compile configure install
+DESCRIPTION=Linux kernel trace event library
+EAPI=8
+HOMEPAGE=https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/
+INHERIT=toolchain-funcs
+IUSE=doc
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/snapshot/libtraceevent-1.5.2.tar.gz
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=10ff1eb198050354a48e5b7efdae8104
diff --git a/metadata/md5-cache/dev-libs/libtracefs-1.3.1 b/metadata/md5-cache/dev-libs/libtracefs-1.3.1
new file mode 100644
index 000000000000..5cb220125c88
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libtracefs-1.3.1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig doc? ( app-text/xmlto app-text/asciidoc )
+DEFINED_PHASES=compile configure install
+DEPEND=>=dev-libs/libtraceevent-1.3.0
+DESCRIPTION=Linux kernel trace file system library
+EAPI=8
+HOMEPAGE=https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/
+INHERIT=toolchain-funcs
+IUSE=doc
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-libs/libtraceevent-1.3.0
+SLOT=0
+SRC_URI=https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot/libtracefs-1.3.1.tar.gz
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=74b526cd83f4e5992a1c80788e2dc7a9
diff --git a/metadata/md5-cache/dev-libs/libzip-1.9.0 b/metadata/md5-cache/dev-libs/libzip-1.9.0
new file mode 100644
index 000000000000..a3f5c4440b51
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libzip-1.9.0
@@ -0,0 +1,17 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=sys-libs/zlib bzip2? ( app-arch/bzip2:= ) lzma? ( app-arch/xz-utils ) ssl? ( gnutls? ( dev-libs/nettle:0= >=net-libs/gnutls-3.6.5:= ) !gnutls? ( mbedtls? ( net-libs/mbedtls:= ) !mbedtls? ( dev-libs/openssl:0= ) ) ) zstd? ( app-arch/zstd )
+DESCRIPTION=Library for manipulating zip archives
+EAPI=8
+HOMEPAGE=https://nih.at/libzip/
+INHERIT=cmake multibuild flag-o-matic
+IUSE=bzip2 gnutls lzma mbedtls ssl static-libs test tools zstd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=BSD
+RDEPEND=sys-libs/zlib bzip2? ( app-arch/bzip2:= ) lzma? ( app-arch/xz-utils ) ssl? ( gnutls? ( dev-libs/nettle:0= >=net-libs/gnutls-3.6.5:= ) !gnutls? ( mbedtls? ( net-libs/mbedtls:= ) !mbedtls? ( dev-libs/openssl:0= ) ) ) zstd? ( app-arch/zstd )
+REQUIRED_USE=test? ( tools )
+RESTRICT=!test? ( test )
+SLOT=0/5
+SRC_URI=https://www.nih.at/libzip/libzip-1.9.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=7921a23d79d0cd7d38278a823755da45
diff --git a/metadata/md5-cache/dev-libs/simdjson-2.0.3 b/metadata/md5-cache/dev-libs/simdjson-2.0.4
similarity index 74%
rename from metadata/md5-cache/dev-libs/simdjson-2.0.3
rename to metadata/md5-cache/dev-libs/simdjson-2.0.4
index a2ceae11c27e..b52bb744455e 100644
--- a/metadata/md5-cache/dev-libs/simdjson-2.0.3
+++ b/metadata/md5-cache/dev-libs/simdjson-2.0.4
@@ -11,6 +11,6 @@ LICENSE=Apache-2.0 Boost-1.0 BSD MIT
 REQUIRED_USE=test? ( tools )
 RESTRICT=!test? ( test )
 SLOT=0/9
-SRC_URI=https://github.com/simdjson/simdjson/archive/v2.0.3.tar.gz -> simdjson-2.0.3.tar.gz test? ( https://github.com/simdjson/simdjson-data/archive/a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz -> simdjson-data-2.0.3.tar.gz )
+SRC_URI=https://github.com/simdjson/simdjson/archive/v2.0.4.tar.gz -> simdjson-2.0.4.gh.tar.gz test? ( https://github.com/simdjson/simdjson-data/archive/a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz -> simdjson-data-2.0.4.gh.tar.gz )
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=e114898d74f2714e68e32b91dc84d1f5
+_md5_=b36ded3850e387aadec391f041a0b7ce
diff --git a/metadata/md5-cache/dev-libs/skalibs-2.11.1.0 b/metadata/md5-cache/dev-libs/skalibs-2.11.1.0
deleted file mode 100644
index 097d7ca084bb..000000000000
--- a/metadata/md5-cache/dev-libs/skalibs-2.11.1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure prepare
-DESCRIPTION=General-purpose libraries from skarnet.org
-EAPI=8
-HOMEPAGE=https://www.skarnet.org/software/skalibs/
-INHERIT=toolchain-funcs
-IUSE=doc ipv6 static-libs
-KEYWORDS=amd64 ~arm x86
-LICENSE=ISC
-SLOT=0/2.11
-SRC_URI=https://www.skarnet.org/software/skalibs/skalibs-2.11.1.0.tar.gz
-_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=f10ad5796bc4b076ff2c7ff3bd08aedc
diff --git a/metadata/md5-cache/dev-libs/tlsh-4.8.2 b/metadata/md5-cache/dev-libs/tlsh-4.8.2
index e5e7b50df13f..3483801e7a80 100644
--- a/metadata/md5-cache/dev-libs/tlsh-4.8.2
+++ b/metadata/md5-cache/dev-libs/tlsh-4.8.2
@@ -4,9 +4,9 @@ DESCRIPTION=Fuzzy matching library
 EAPI=8
 HOMEPAGE=https://github.com/trendmicro/tlsh
 INHERIT=cmake
-KEYWORDS=~amd64 ~arm
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=|| ( Apache-2.0 BSD )
 SLOT=0
 SRC_URI=https://github.com/trendmicro/tlsh/archive/4.8.2.tar.gz -> tlsh-4.8.2.tar.gz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=800b86e27cc4a44c7abfee7a4a5ee304
+_md5_=4ca69fe70b87b2e3ca5d7edeafa4768f
diff --git a/metadata/md5-cache/dev-libs/tre-0.8.0_p20210321-r1 b/metadata/md5-cache/dev-libs/tre-0.8.0_p20210321-r1
index eab7cb4e6b7e..f67465baedec 100644
--- a/metadata/md5-cache/dev-libs/tre-0.8.0_p20210321-r1
+++ b/metadata/md5-cache/dev-libs/tre-0.8.0_p20210321-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://laurikari.net/tre/ https://github.com/laurikari/tre
 INHERIT=autotools distutils-r1
 IUSE=+agrep +alloca +approx debug nls profile python 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 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=agrep? ( !app-text/agrep !dev-ruby/amatch !app-misc/glimpse ) python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=agrep? ( approx ) python? ( || ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) || ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/laurikari/tre/archive/6092368aabdd0dbb0fbceb2766a37b98e0ff6911.tar.gz -> tre-0.8.0_p20210321.tar.gz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	distutils-r1	10a93585889c3ca7651cbcd2ee831e47	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=da47067a95b45fcaca802ec50a469422
+_md5_=ee6e1a10cecc81a1fb2917f379f1daea
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 174a500cb384..cf2db412944b 100644
Binary files a/metadata/md5-cache/dev-perl/Manifest.gz and b/metadata/md5-cache/dev-perl/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-perl/Net-Subnet-1.30.0-r2 b/metadata/md5-cache/dev-perl/Net-Subnet-1.30.0-r2
index 6c88f67d8fa3..b00c61a731cf 100644
--- a/metadata/md5-cache/dev-perl/Net-Subnet-1.30.0-r2
+++ b/metadata/md5-cache/dev-perl/Net-Subnet-1.30.0-r2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JU/JUERD/Net-Subnet-1.03.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=03f71b4854de1369ad5baae1adb0fd4d
+_md5_=57e1bf0436feff50a9c43236945da27a
diff --git a/metadata/md5-cache/dev-perl/Specio-0.480.0 b/metadata/md5-cache/dev-perl/Specio-0.480.0
new file mode 100644
index 000000000000..a455aa0caa85
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Specio-0.480.0
@@ -0,0 +1,16 @@
+BDEPEND=!minimal? ( >=dev-perl/Ref-Util-0.112.0 ) virtual/perl-Carp dev-perl/Devel-StackTrace dev-perl/Eval-Closure virtual/perl-Encode virtual/perl-Exporter virtual/perl-IO dev-perl/MRO-Compat dev-perl/Module-Runtime >=dev-perl/Role-Tiny-1.3.3 >=virtual/perl-Scalar-List-Utils-1.330.0 virtual/perl-Storable dev-perl/Sub-Quote dev-perl/Test-Fatal >=virtual/perl-Test-Simple-0.960.0 dev-perl/Try-Tiny dev-perl/XString virtual/perl-parent >=virtual/perl-version-0.830.0 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Spec dev-perl/Test-Needs ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Type constraints and coercions for Perl
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Specio
+INHERIT=perl-module
+IUSE=minimal test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=!minimal? ( >=dev-perl/Ref-Util-0.112.0 ) virtual/perl-Carp dev-perl/Devel-StackTrace dev-perl/Eval-Closure virtual/perl-Encode virtual/perl-Exporter virtual/perl-IO dev-perl/MRO-Compat dev-perl/Module-Runtime >=dev-perl/Role-Tiny-1.3.3 >=virtual/perl-Scalar-List-Utils-1.330.0 virtual/perl-Storable dev-perl/Sub-Quote dev-perl/Test-Fatal >=virtual/perl-Test-Simple-0.960.0 dev-perl/Try-Tiny dev-perl/XString virtual/perl-parent >=virtual/perl-version-0.830.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Specio-0.48.tar.gz
+_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_md5_=fe7a93a19503f44918d2379b3cbe1600
diff --git a/metadata/md5-cache/dev-perl/Sys-Virt-8.4.0 b/metadata/md5-cache/dev-perl/Sys-Virt-8.4.0
new file mode 100644
index 000000000000..7378fc152ae7
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Sys-Virt-8.4.0
@@ -0,0 +1,16 @@
+BDEPEND=>=app-emulation/libvirt-8.4.0 virtual/perl-ExtUtils-CBuilder dev-perl/Module-Build virtual/pkgconfig test? ( dev-perl/CPAN-Changes dev-perl/Test-More-UTF8 dev-perl/Test-Pod-Coverage dev-perl/XML-XPath virtual/perl-Test-Simple virtual/perl-Time-HiRes ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=app-emulation/libvirt-8.4.0 dev-lang/perl
+DESCRIPTION=API for using the libvirt library from Perl
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Sys-Virt
+INHERIT=perl-module
+IUSE=test examples
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=app-emulation/libvirt-8.4.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DA/DANBERR/Sys-Virt-v8.4.0.tar.gz
+_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_md5_=74193792737fd2385407bdeb41911bf9
diff --git a/metadata/md5-cache/dev-perl/Tk-804.36.0 b/metadata/md5-cache/dev-perl/Tk-804.36.0
index 6a27dbafe38d..4138f7a9e881 100644
--- a/metadata/md5-cache/dev-perl/Tk-804.36.0
+++ b/metadata/md5-cache/dev-perl/Tk-804.36.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SR/SREZIC/Tk-804.036.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=cb2b21829e3b9e47c8b8dd7c33b0ed54
+_md5_=01ec2ca06c38d2c6c6220fedc7e0493a
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index 1c04bc12d63f..07e4fae5e4c4 100644
Binary files a/metadata/md5-cache/dev-php/Manifest.gz and b/metadata/md5-cache/dev-php/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-php/libvirt-php-0.5.6 b/metadata/md5-cache/dev-php/libvirt-php-0.5.6
new file mode 100644
index 000000000000..6c401743752a
--- /dev/null
+++ b/metadata/md5-cache/dev-php/libvirt-php-0.5.6
@@ -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 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=app-emulation/libvirt dev-libs/libxml2 dev-libs/libxslt virtual/pkgconfig doc? ( app-text/xhtml1 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+DESCRIPTION=PHP bindings for libvirt
+EAPI=8
+HOMEPAGE=http://libvirt.org/php/
+INHERIT=php-ext-source-r3 autotools
+IUSE=doc php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
+KEYWORDS=~amd64
+LICENSE=LGPL-2.1
+RDEPEND=app-emulation/libvirt dev-libs/libxml2 php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
+SLOT=0
+SRC_URI=http://libvirt.org/sources/php/libvirt-php-0.5.6.tar.xz
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	php-ext-source-r3	3c26d87acac034aedf8bf126f7010c8a	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=0e9472509b882f448c650f9c2364d7e0
diff --git a/metadata/md5-cache/dev-php/pecl-redis-5.3.7 b/metadata/md5-cache/dev-php/pecl-redis-5.3.7
index fb89b10dba57..7f3c12a3688d 100644
--- a/metadata/md5-cache/dev-php/pecl-redis-5.3.7
+++ b/metadata/md5-cache/dev-php/pecl-redis-5.3.7
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://pecl.php.net/redis
 INHERIT=php-ext-pecl-r3
 IUSE=igbinary +json lz4 +session zstd php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
-KEYWORDS=~amd64 ~arm
+KEYWORDS=~amd64 ~arm ~arm64
 LICENSE=PHP-3.01
 RDEPEND=igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php7-4(-)?,php_targets_php8-0(-)?,php_targets_php8-1(-)?] ) lz4? ( app-arch/lz4:= ) zstd? ( app-arch/zstd:= ) !dev-php/pecl-redis:7 php_targets_php7-4? ( dev-lang/php:7.4[json(+)?,session(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[json(+)?,session(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[json(+)?,session(-)?] )
 REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://pecl.php.net/get/redis-5.3.7.tgz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	php-ext-pecl-r3	5db9384543980900b5ecbac76136b6a8	php-ext-source-r3	3c26d87acac034aedf8bf126f7010c8a	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=bf2b9b7265fd362bff0d2ef6df9e84aa
+_md5_=b996ecacc1daf1cc05629af85ecfe673
diff --git a/metadata/md5-cache/dev-python/Babel-2.10.2 b/metadata/md5-cache/dev-python/Babel-2.10.2
new file mode 100644
index 000000000000..1de2cc7e2246
--- /dev/null
+++ b/metadata/md5-cache/dev-python/Babel-2.10.2
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/unzip dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( dev-python/backports-zoneinfo[python_targets_python3_8(-)?] ) test? ( dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta1-r1:3.11[threads(+)] >=dev-python/sphinx-4.4.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.7-r1:0[threads(+)] >=dev-python/sphinx-4.4.0[python_targets_pypy3(-)] ) ) ) test? ( dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( dev-python/backports-zoneinfo[python_targets_python3_8(-)?] ) >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11[threads(+)] ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Collection of tools for internationalizing Python applications
+EAPI=8
+HOMEPAGE=https://babel.pocoo.org/ https://pypi.org/project/Babel/ https://github.com/python-babel/babel/
+INHERIT=distutils-r1
+IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=BSD
+RDEPEND=dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( dev-python/backports-zoneinfo[python_targets_python3_8(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11[threads(+)] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/B/Babel/Babel-2.10.2.tar.gz https://unicode.org/Public/cldr/41/cldr-common-41.0.zip
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=e9cd79118f2c98024dcd88515e7dbbd9
diff --git a/metadata/md5-cache/dev-python/Faker-13.11.1 b/metadata/md5-cache/dev-python/Faker-13.11.1
deleted file mode 100644
index a6fec370c5d1..000000000000
--- a/metadata/md5-cache/dev-python/Faker-13.11.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,tiff] dev-python/random2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/validators[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-ruby/faker >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Python package that generates fake data for you
-EAPI=8
-HOMEPAGE=https://github.com/joke2k/faker/ https://pypi.org/project/Faker/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-ruby/faker python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/F/Faker/Faker-13.11.1.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=5870f482c2f0dde5a13a6dea54a8f32e
diff --git a/metadata/md5-cache/dev-python/Faker-13.12.0 b/metadata/md5-cache/dev-python/Faker-13.12.0
deleted file mode 100644
index b5e2379d1a82..000000000000
--- a/metadata/md5-cache/dev-python/Faker-13.12.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,tiff] dev-python/random2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/validators[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-ruby/faker >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Python package that generates fake data for you
-EAPI=8
-HOMEPAGE=https://github.com/joke2k/faker/ https://pypi.org/project/Faker/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-ruby/faker python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/F/Faker/Faker-13.12.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=f3bf23f934b35863ff1c0a26b844f327
diff --git a/metadata/md5-cache/dev-python/Faker-13.12.1 b/metadata/md5-cache/dev-python/Faker-13.12.1
deleted file mode 100644
index 5f451f74a2f9..000000000000
--- a/metadata/md5-cache/dev-python/Faker-13.12.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,tiff] dev-python/random2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/validators[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-ruby/faker >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Python package that generates fake data for you
-EAPI=8
-HOMEPAGE=https://github.com/joke2k/faker/ https://pypi.org/project/Faker/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-ruby/faker python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/F/Faker/Faker-13.12.1.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=f3bf23f934b35863ff1c0a26b844f327
diff --git a/metadata/md5-cache/dev-python/GridDataFormats-0.7.0 b/metadata/md5-cache/dev-python/GridDataFormats-0.7.0
deleted file mode 100644
index 15c852984705..000000000000
--- a/metadata/md5-cache/dev-python/GridDataFormats-0.7.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mrcfile[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Reading and writing of data on regular grids in Python
-EAPI=8
-HOMEPAGE=https://pypi.org/project/GridDataFormats/ https://github.com/MDAnalysis/GridDataFormats
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=LGPL-3
-RDEPEND=dev-python/mrcfile[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/G/GridDataFormats/GridDataFormats-0.7.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=150e6cb6b524482561fccc0e115812c9
diff --git a/metadata/md5-cache/dev-python/GridDataFormats-1.0.0 b/metadata/md5-cache/dev-python/GridDataFormats-1.0.0
deleted file mode 100644
index 89fa9a91f72a..000000000000
--- a/metadata/md5-cache/dev-python/GridDataFormats-1.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mrcfile[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Reading and writing of data on regular grids in Python
-EAPI=8
-HOMEPAGE=https://pypi.org/project/GridDataFormats/ https://github.com/MDAnalysis/GridDataFormats/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=LGPL-3
-RDEPEND=dev-python/mrcfile[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/G/GridDataFormats/GridDataFormats-1.0.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=0dd8c4c5e17d65208ca8d69f60135eda
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 276dc9904f5e..48e50777f5c0 100644
Binary files a/metadata/md5-cache/dev-python/Manifest.gz and b/metadata/md5-cache/dev-python/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-python/PyPDF2-2.2.0 b/metadata/md5-cache/dev-python/PyPDF2-2.2.0
new file mode 100644
index 000000000000..aa9c33346329
--- /dev/null
+++ b/metadata/md5-cache/dev-python/PyPDF2-2.2.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( python_targets_python3_8? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=Python library to work with PDF files
+EAPI=8
+HOMEPAGE=https://pypi.org/project/PyPDF2/ https://github.com/py-pdf/PyPDF2/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=BSD-2
+RDEPEND=python_targets_python3_8? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/py-pdf/PyPDF2/archive/2.2.0.tar.gz -> PyPDF2-2.2.0.gh.tar.gz test? ( https://github.com/py-pdf/sample-files/archive/41b5cd4f774f8fbd8ac42d93b9962f0376352a15.tar.gz -> PyPDF2-sample-files-41b5cd4f774f8fbd8ac42d93b9962f0376352a15.gh.tar.gz )
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=b0ba32ffceeb41d55ffe341a340208ff
diff --git a/metadata/md5-cache/dev-python/aesara-2.7.2 b/metadata/md5-cache/dev-python/aesara-2.7.2
new file mode 100644
index 000000000000..b0595ddb5b9f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/aesara-2.7.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/cons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/etuples[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/logical-unification[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/minikanren[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.17.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Library for operating on mathematical expressions with multi-dimensional arrays
+EAPI=8
+HOMEPAGE=https://github.com/aesara-devs/aesara/ https://pypi.org/project/aesara/
+INHERIT=distutils-r1 multiprocessing optfeature
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=dev-python/cons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/etuples[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/logical-unification[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/minikanren[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.17.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aesara-devs/aesara/archive/rel-2.7.2.tar.gz -> aesara-rel-2.7.2.gh.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=9faafb6622bb276a52a0b3362cc55d97
diff --git a/metadata/md5-cache/dev-python/aiosignal-1.2.0 b/metadata/md5-cache/dev-python/aiosignal-1.2.0
deleted file mode 100644
index 071d1e35787e..000000000000
--- a/metadata/md5-cache/dev-python/aiosignal-1.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/frozenlist-1.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A list of registered asynchronous callbacks
-EAPI=8
-HOMEPAGE=https://pypi.org/project/aiosignal/ https://github.com/aio-libs/aiosignal/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/frozenlist-1.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aio-libs/aiosignal/archive/v1.2.0.tar.gz -> aiosignal-1.2.0.gh.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=89c2747e5d12f0ceacb503da36f16b21
diff --git a/metadata/md5-cache/dev-python/aiosignal-1.2.0-r1 b/metadata/md5-cache/dev-python/aiosignal-1.2.0-r1
index d3cbeb5b42b3..2d6bf25541bc 100644
--- a/metadata/md5-cache/dev-python/aiosignal-1.2.0-r1
+++ b/metadata/md5-cache/dev-python/aiosignal-1.2.0-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/aiosignal/ https://github.com/aio-libs/aiosignal/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/frozenlist-1.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aio-libs/aiosignal/archive/v1.2.0.tar.gz -> aiosignal-1.2.0.gh.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=f14dbd66c32119d6ebb005b836a4b59a
+_md5_=da13dd8845e963bf2d125848adb60a9d
diff --git a/metadata/md5-cache/dev-python/alabaster-0.7.12 b/metadata/md5-cache/dev-python/alabaster-0.7.12
deleted file mode 100644
index 2b9a47202fd4..000000000000
--- a/metadata/md5-cache/dev-python/alabaster-0.7.12
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A configurable sidebar-enabled Sphinx theme
-EAPI=7
-HOMEPAGE=https://github.com/bitprophet/alabaster
-INHERIT=distutils-r1
-IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris
-LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/a/alabaster/alabaster-0.7.12.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=9c34d1908beeef1e6e6a9f20db7fbfe6
diff --git a/metadata/md5-cache/dev-python/alabaster-0.7.12-r1 b/metadata/md5-cache/dev-python/alabaster-0.7.12-r1
index b1c6346e6b7f..704771482305 100644
--- a/metadata/md5-cache/dev-python/alabaster-0.7.12-r1
+++ b/metadata/md5-cache/dev-python/alabaster-0.7.12-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/bitprophet/alabaster
 INHERIT=distutils-r1
 IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=mirror://pypi/a/alabaster/alabaster-0.7.12.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=7cfd41a4ce0d5344d8a63cd82acb4bc4
+_md5_=bb4b04c24f613c21924e798e7b2ed93b
diff --git a/metadata/md5-cache/dev-python/alagitpull-0.0.23-r2 b/metadata/md5-cache/dev-python/alagitpull-0.0.23-r2
new file mode 100644
index 000000000000..1ca977e1c5df
--- /dev/null
+++ b/metadata/md5-cache/dev-python/alagitpull-0.0.23-r2
@@ -0,0 +1,15 @@
+BDEPEND=<dev-python/alabaster-0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=alabaster sub-theme used on git-pull docs
+EAPI=8
+HOMEPAGE=https://github.com/git-pull/alagitpull
+INHERIT=distutils-r1
+IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=<dev-python/alabaster-0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=https://github.com/git-pull/alagitpull/archive/v0.0.23.tar.gz -> alagitpull-0.0.23.gh.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=e729813bee2086c2af02366da1f6f2d8
diff --git a/metadata/md5-cache/dev-python/ansible-compat-2.0.3 b/metadata/md5-cache/dev-python/ansible-compat-2.0.3
deleted file mode 100644
index 01dda9a0e332..000000000000
--- a/metadata/md5-cache/dev-python/ansible-compat-2.0.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/setuptools_scm-6.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools_scm_git_archive-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-markdown[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-plus[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/ansible-pygments[python_targets_python3_10(-)] dev-python/myst_parser[python_targets_python3_10(-)] dev-python/sphinx_ansible_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/ansible-pygments[python_targets_python3_9(-)] dev-python/myst_parser[python_targets_python3_9(-)] dev-python/sphinx_ansible_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/ansible-pygments[python_targets_python3_8(-)] dev-python/myst_parser[python_targets_python3_8(-)] dev-python/sphinx_ansible_theme[python_targets_python3_8(-)] ) ) ) test? ( >=app-admin/ansible-base-2.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/subprocess-tee-0.3.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Contains functions that facilitate working with various versions of Ansible
-EAPI=8
-HOMEPAGE=https://pypi.org/project/ansible-compat/ https://github.com/ansible/ansible-compat/
-INHERIT=distutils-r1
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~riscv
-LICENSE=MIT
-RDEPEND=>=app-admin/ansible-base-2.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/subprocess-tee-0.3.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/ansible-compat/ansible-compat-2.0.3.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=284840bb2a4fb326455b842b86ef2c8e
diff --git a/metadata/md5-cache/dev-python/ansible-compat-2.0.4 b/metadata/md5-cache/dev-python/ansible-compat-2.0.4
deleted file mode 100644
index 31ec348aea21..000000000000
--- a/metadata/md5-cache/dev-python/ansible-compat-2.0.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/setuptools_scm-6.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools_scm_git_archive-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-markdown[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-plus[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/ansible-pygments[python_targets_python3_10(-)] dev-python/myst_parser[python_targets_python3_10(-)] dev-python/sphinx_ansible_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/ansible-pygments[python_targets_python3_9(-)] dev-python/myst_parser[python_targets_python3_9(-)] dev-python/sphinx_ansible_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/ansible-pygments[python_targets_python3_8(-)] dev-python/myst_parser[python_targets_python3_8(-)] dev-python/sphinx_ansible_theme[python_targets_python3_8(-)] ) ) ) test? ( >=app-admin/ansible-base-2.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/subprocess-tee-0.3.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Contains functions that facilitate working with various versions of Ansible
-EAPI=8
-HOMEPAGE=https://pypi.org/project/ansible-compat/ https://github.com/ansible/ansible-compat/
-INHERIT=distutils-r1
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~riscv
-LICENSE=MIT
-RDEPEND=>=app-admin/ansible-base-2.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/subprocess-tee-0.3.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/ansible-compat/ansible-compat-2.0.4.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=284840bb2a4fb326455b842b86ef2c8e
diff --git a/metadata/md5-cache/dev-python/anyio-3.5.0-r1 b/metadata/md5-cache/dev-python/anyio-3.5.0-r1
deleted file mode 100644
index cf8a35af9f7b..000000000000
--- a/metadata/md5-cache/dev-python/anyio-3.5.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/hypothesis-4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-mock-3.6.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/trio[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/trustme[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] amd64? ( python_targets_python3_8? ( >=dev-python/uvloop-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/uvloop-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/uvloop-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) ) test? ( >=dev-python/idna-2.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sniffio-1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] dev-python/sphinx-autodoc-typehints[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] dev-python/sphinx-autodoc-typehints[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] dev-python/sphinx-autodoc-typehints[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.7-r1:0 >=dev-python/sphinx-4.4.0[python_targets_pypy3(-)] dev-python/sphinx_rtd_theme[python_targets_pypy3(-)] dev-python/sphinx-autodoc-typehints[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Compatibility layer for multiple asynchronous event loop implementations
-EAPI=8
-HOMEPAGE=https://github.com/agronholm/anyio/ https://pypi.org/project/anyio/
-INHERIT=distutils-r1
-IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=>=dev-python/idna-2.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sniffio-1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/anyio/anyio-3.5.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=4cd78657eb8274e2818a3d80f1a60901
diff --git a/metadata/md5-cache/dev-python/anyio-3.6.1 b/metadata/md5-cache/dev-python/anyio-3.6.1
index 7bb8b7bcbd17..a40615ca9579 100644
--- a/metadata/md5-cache/dev-python/anyio-3.6.1
+++ b/metadata/md5-cache/dev-python/anyio-3.6.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/agronholm/anyio/ https://pypi.org/project/anyio/
 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 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/idna-2.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sniffio-1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/anyio/anyio-3.6.1.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=cabbb6d45e5394517b4820f9ded1244e
+_md5_=8644eadf6c6ff515bba8177f43ecbc6e
diff --git a/metadata/md5-cache/dev-python/anyqt-0.0.14 b/metadata/md5-cache/dev-python/anyqt-0.0.14
deleted file mode 100644
index 304a66247cc9..000000000000
--- a/metadata/md5-cache/dev-python/anyqt-0.0.14
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=PyQt4/PyQt5 compatibility layer
-EAPI=8
-HOMEPAGE=https://github.com/ales-erjavec/anyqt
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/ales-erjavec/anyqt/archive/0.0.14.tar.gz -> anyqt-0.0.14.gh.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ebc424b6271d3d5f5fdb646df7d98d1e
diff --git a/metadata/md5-cache/dev-python/anyqt-0.1.1 b/metadata/md5-cache/dev-python/anyqt-0.1.1
new file mode 100644
index 000000000000..cc63d1b3c4c5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/anyqt-0.1.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pyside2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( || ( dev-python/pyside2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=PyQt4/PyQt5 compatibility layer
+EAPI=8
+HOMEPAGE=https://github.com/ales-erjavec/anyqt/ https://pypi.org/project/AnyQt/
+INHERIT=distutils-r1 virtualx
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=|| ( dev-python/pyside2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ales-erjavec/anyqt/archive/0.1.1.tar.gz -> anyqt-0.1.1.gh.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
+_md5_=6d5e2c9c43ee44be1c3dccb000db3692
diff --git a/metadata/md5-cache/dev-python/asteval-0.9.26 b/metadata/md5-cache/dev-python/asteval-0.9.26
deleted file mode 100644
index 25d974560f2d..000000000000
--- a/metadata/md5-cache/dev-python/asteval-0.9.26
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Evaluator of Python expression using ast module
-EAPI=8
-HOMEPAGE=https://newville.github.io/asteval/ https://github.com/newville/asteval
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/asteval/asteval-0.9.26.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=30b64fd90e4e33297bf7bfbdcc3b2550
diff --git a/metadata/md5-cache/dev-python/astroid-2.11.6 b/metadata/md5-cache/dev-python/astroid-2.11.6
new file mode 100644
index 000000000000..b5c65bf54ac3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/astroid-2.11.6
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/lazy-object-proxy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/typing-extensions-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/wrapt-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Abstract Syntax Tree for logilab packages
+EAPI=8
+HOMEPAGE=https://github.com/PyCQA/astroid/ https://pypi.org/project/astroid/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-python/lazy-object-proxy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/typing-extensions-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/wrapt-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/PyCQA/astroid/archive/v2.11.6.tar.gz -> astroid-2.11.6.gh.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=fd7f42465ec4de0e70d5e07bcb5ebc18
diff --git a/metadata/md5-cache/dev-python/asyncstdlib-3.10.4 b/metadata/md5-cache/dev-python/asyncstdlib-3.10.4
deleted file mode 100644
index 2e7fd0e0d524..000000000000
--- a/metadata/md5-cache/dev-python/asyncstdlib-3.10.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=The missing async toolbox
-EAPI=8
-HOMEPAGE=https://github.com/maxfischer2781/asyncstdlib/ https://pypi.org/project/asyncstdlib/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/maxfischer2781/asyncstdlib/archive/v3.10.4.tar.gz -> asyncstdlib-3.10.4.gh.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=d9b7299751baa8032b6000a8b65ba247
diff --git a/metadata/md5-cache/dev-python/authres-1.2.0 b/metadata/md5-cache/dev-python/authres-1.2.0
deleted file mode 100644
index 1522a0c0ab80..000000000000
--- a/metadata/md5-cache/dev-python/authres-1.2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Parse and generate Authentication-Results headers
-EAPI=7
-HOMEPAGE=https://launchpad.net/authentication-results-python https://pypi.org/project/authres/
-INHERIT=distutils-r1
-IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/a/authres/authres-1.2.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=c147086041231419bfef375a221ef4ef
diff --git a/metadata/md5-cache/dev-python/authres-1.2.0-r1 b/metadata/md5-cache/dev-python/authres-1.2.0-r1
index 6743f868fde7..42a0c7b2b96b 100644
--- a/metadata/md5-cache/dev-python/authres-1.2.0-r1
+++ b/metadata/md5-cache/dev-python/authres-1.2.0-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://launchpad.net/authentication-results-python/ https://pypi.org/project/authres/
 INHERIT=distutils-r1
 IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=mirror://pypi/a/authres/authres-1.2.0.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=1647954ac697e3118cda205d5a040e19
+_md5_=7a25f4adfcf96fe0cc8227d6eb92f722
diff --git a/metadata/md5-cache/dev-python/automat-20.2.0 b/metadata/md5-cache/dev-python/automat-20.2.0
deleted file mode 100644
index b8ba24081f02..000000000000
--- a/metadata/md5-cache/dev-python/automat-20.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Self-service finite-state machines for the programmer on the go
-EAPI=7
-HOMEPAGE=https://github.com/glyph/automat https://pypi.org/project/Automat/
-INHERIT=distutils-r1
-IUSE=examples test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=MIT
-RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/A/Automat/Automat-20.2.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=c3e7761d2dd9456b90eeb9203b909268
diff --git a/metadata/md5-cache/dev-python/automat-20.2.0-r1 b/metadata/md5-cache/dev-python/automat-20.2.0-r1
index d690da6aab79..d4e7e1b0d2e7 100644
--- a/metadata/md5-cache/dev-python/automat-20.2.0-r1
+++ b/metadata/md5-cache/dev-python/automat-20.2.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !!dev-python/m2r test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=Self-service finite-state machines for the programmer on the go
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/A/Automat/Automat-20.2.0.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=920adb79825fda1ea07a111ff03f184a
+_md5_=2082333481d7b1a4116c8823967eb8a6
diff --git a/metadata/md5-cache/dev-python/autoprop-4.0.2-r1 b/metadata/md5-cache/dev-python/autoprop-4.0.2-r1
deleted file mode 100644
index d93c657ab322..000000000000
--- a/metadata/md5-cache/dev-python/autoprop-4.0.2-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/signature_dispatch-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flit_core-3.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Infer properties from accessor methods
-EAPI=8
-HOMEPAGE=https://github.com/kalekundert/autoprop/ https://pypi.org/project/autoprop/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-python/signature_dispatch-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/autoprop/autoprop-4.0.2.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=7cf92a27ee3a8f87c96fa2907c11abb5
diff --git a/metadata/md5-cache/dev-python/awxkit-21.0.0 b/metadata/md5-cache/dev-python/awxkit-21.0.0
deleted file mode 100644
index 567ef8951db9..000000000000
--- a/metadata/md5-cache/dev-python/awxkit-21.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/websocket-client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Command line interface for Ansible AWX
-EAPI=8
-HOMEPAGE=https://github.com/ansible/awx
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/websocket-client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ansible/awx/archive/21.0.0.tar.gz -> awxkit-21.0.0.gh.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=326f81e477f5ea783e65aa33e2bd7634
diff --git a/metadata/md5-cache/dev-python/bibtexparser-1.2.0 b/metadata/md5-cache/dev-python/bibtexparser-1.2.0
deleted file mode 100644
index e0912a497e2a..000000000000
--- a/metadata/md5-cache/dev-python/bibtexparser-1.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pyparsing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A BibTeX parser written in python
-EAPI=8
-HOMEPAGE=https://github.com/sciunto-org/python-bibtexparser
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( BSD LGPL-3 )
-RDEPEND=dev-python/pyparsing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/sciunto-org/python-bibtexparser/archive/v1.2.0.tar.gz -> bibtexparser-1.2.0.gh.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=3fbd5587f5304424909f98d53bdee6a4
diff --git a/metadata/md5-cache/dev-python/bleach-5.0.0 b/metadata/md5-cache/dev-python/bleach-5.0.0
deleted file mode 100644
index e646dd4f236f..000000000000
--- a/metadata/md5-cache/dev-python/bleach-5.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/html5lib-1.0.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=An easy whitelist-based HTML-sanitizing tool
-EAPI=8
-HOMEPAGE=https://github.com/mozilla/bleach/ https://pypi.org/project/bleach/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=Apache-2.0
-RDEPEND=dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/html5lib-1.0.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/bleach/bleach-5.0.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=53ff82e5b37ccf0cd47743af61a9b089
diff --git a/metadata/md5-cache/dev-python/bleach-5.0.0-r1 b/metadata/md5-cache/dev-python/bleach-5.0.0-r1
index 2b6ba2bd64da..e9baae67c865 100644
--- a/metadata/md5-cache/dev-python/bleach-5.0.0-r1
+++ b/metadata/md5-cache/dev-python/bleach-5.0.0-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/mozilla/bleach/ https://pypi.org/project/bleach/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/html5lib-1.0.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/bleach/bleach-5.0.0.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=bead68fd0ba641e2a3d9ad0deccdc626
+_md5_=61c2b11fc4c520a8c3ed85c8073f8c14
diff --git a/metadata/md5-cache/dev-python/boto3-1.24.10 b/metadata/md5-cache/dev-python/boto3-1.24.10
new file mode 100644
index 000000000000..242df0a66850
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.24.10
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta1-r1:3.11 >=dev-python/sphinx-4.4.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.27.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=8
+HOMEPAGE=https://github.com/boto/boto3/ https://pypi.org/project/boto3/
+INHERIT=distutils-r1 multiprocessing
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.27.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.24.10.tar.gz -> boto3-1.24.10.gh.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=50e9b19da5bcce80f05fd9be69fe0ff8
diff --git a/metadata/md5-cache/dev-python/boto3-1.24.8 b/metadata/md5-cache/dev-python/boto3-1.24.8
new file mode 100644
index 000000000000..5ab169e51ebe
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.24.8
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta1-r1:3.11 >=dev-python/sphinx-4.4.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.27.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=8
+HOMEPAGE=https://github.com/boto/boto3/ https://pypi.org/project/boto3/
+INHERIT=distutils-r1 multiprocessing
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.27.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.24.8.tar.gz -> boto3-1.24.8.gh.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=50e9b19da5bcce80f05fd9be69fe0ff8
diff --git a/metadata/md5-cache/dev-python/boto3-1.24.9 b/metadata/md5-cache/dev-python/boto3-1.24.9
new file mode 100644
index 000000000000..17b5e9c75177
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.24.9
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta1-r1:3.11 >=dev-python/sphinx-4.4.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.27.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=8
+HOMEPAGE=https://github.com/boto/boto3/ https://pypi.org/project/boto3/
+INHERIT=distutils-r1 multiprocessing
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.27.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.24.9.tar.gz -> boto3-1.24.9.gh.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=50e9b19da5bcce80f05fd9be69fe0ff8
diff --git a/metadata/md5-cache/dev-python/botocore-1.27.10 b/metadata/md5-cache/dev-python/botocore-1.27.10
new file mode 100644
index 000000000000..a48b0bafe645
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.27.10
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta1-r1:3.11 >=dev-python/sphinx-4.4.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=8
+HOMEPAGE=https://github.com/boto/botocore/ https://pypi.org/project/botocore/
+INHERIT=distutils-r1 multiprocessing
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.27.10.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=ee9407b3e9a7645dd37c00caade8c434
diff --git a/metadata/md5-cache/dev-python/botocore-1.27.8 b/metadata/md5-cache/dev-python/botocore-1.27.8
new file mode 100644
index 000000000000..54c3b8cd9bc3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.27.8
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta1-r1:3.11 >=dev-python/sphinx-4.4.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=8
+HOMEPAGE=https://github.com/boto/botocore/ https://pypi.org/project/botocore/
+INHERIT=distutils-r1 multiprocessing
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.27.8.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=ee9407b3e9a7645dd37c00caade8c434
diff --git a/metadata/md5-cache/dev-python/botocore-1.27.9 b/metadata/md5-cache/dev-python/botocore-1.27.9
new file mode 100644
index 000000000000..17647a055db3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.27.9
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta1-r1:3.11 >=dev-python/sphinx-4.4.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=8
+HOMEPAGE=https://github.com/boto/botocore/ https://pypi.org/project/botocore/
+INHERIT=distutils-r1 multiprocessing
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.27.9.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=ee9407b3e9a7645dd37c00caade8c434
diff --git a/metadata/md5-cache/dev-python/brotlicffi-1.0.9.2-r1 b/metadata/md5-cache/dev-python/brotlicffi-1.0.9.2-r1
index a9c079ea7f29..1802693191aa 100644
--- a/metadata/md5-cache/dev-python/brotlicffi-1.0.9.2-r1
+++ b/metadata/md5-cache/dev-python/brotlicffi-1.0.9.2-r1
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://github.com/python-hyper/brotlicffi/ https://pypi.org/project/brotlicffi/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=app-arch/brotli:= python_targets_python3_8? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-hyper/brotlicffi/archive/v1.0.9.2.tar.gz -> brotlicffi-1.0.9.2.gh.tar.gz test? ( https://github.com/google/brotli/archive/46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz -> brotli-46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz )
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=7e94e997397043553f032291eae54fb9
+_md5_=5235e29a6279e239688a730619a98513
diff --git a/metadata/md5-cache/dev-python/cachelib-0.7.0 b/metadata/md5-cache/dev-python/cachelib-0.7.0
index 5415b7569212..a8cb57a7c52d 100644
--- a/metadata/md5-cache/dev-python/cachelib-0.7.0
+++ b/metadata/md5-cache/dev-python/cachelib-0.7.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/cachelib/ https://github.com/pallets-eco/cachelib/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cachelib/cachelib-0.7.0.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=444ef1d014a39bac89a7ee3d6d98d28b
+_md5_=1d9bca5882e6e43e1be1058e703814e2
diff --git a/metadata/md5-cache/dev-python/cachelib-0.6.0 b/metadata/md5-cache/dev-python/cachelib-0.8.0
similarity index 93%
rename from metadata/md5-cache/dev-python/cachelib-0.6.0
rename to metadata/md5-cache/dev-python/cachelib-0.8.0
index 83523fa3654b..5a8efadc593a 100644
--- a/metadata/md5-cache/dev-python/cachelib-0.6.0
+++ b/metadata/md5-cache/dev-python/cachelib-0.8.0
@@ -2,15 +2,15 @@ BDEPEND=test? ( dev-python/pylibmc[python_targets_python3_8(-)?,python_targets_p
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Collection of cache libraries in the same API interface. Extracted from werkzeug
 EAPI=8
-HOMEPAGE=https://pypi.org/project/cachelib/ https://github.com/pallets/cachelib
+HOMEPAGE=https://pypi.org/project/cachelib/ https://github.com/pallets-eco/cachelib/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/c/cachelib/cachelib-0.6.0.tar.gz
+SRC_URI=mirror://pypi/c/cachelib/cachelib-0.8.0.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=08e58ab9450a826233f3098d2c5c44de
+_md5_=444ef1d014a39bac89a7ee3d6d98d28b
diff --git a/metadata/md5-cache/dev-python/cachetools-4.2.4 b/metadata/md5-cache/dev-python/cachetools-4.2.4
deleted file mode 100644
index 392470a5a0d3..000000000000
--- a/metadata/md5-cache/dev-python/cachetools-4.2.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Extensible memoizing collections and decorators
-EAPI=8
-HOMEPAGE=https://pypi.org/project/cachetools/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/c/cachetools/cachetools-4.2.4.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=3447a3c9ce0fbc93101bc1467c07e320
diff --git a/metadata/md5-cache/dev-python/cachetools-5.0.0 b/metadata/md5-cache/dev-python/cachetools-5.0.0
deleted file mode 100644
index d79e82ee6e64..000000000000
--- a/metadata/md5-cache/dev-python/cachetools-5.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Extensible memoizing collections and decorators
-EAPI=8
-HOMEPAGE=https://pypi.org/project/cachetools/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/c/cachetools/cachetools-5.0.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=6c41bcdcb9343ff6288abba4fe7621c3
diff --git a/metadata/md5-cache/dev-python/cachetools-5.1.0 b/metadata/md5-cache/dev-python/cachetools-5.1.0
deleted file mode 100644
index 72d6d6eeec25..000000000000
--- a/metadata/md5-cache/dev-python/cachetools-5.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Extensible memoizing collections and decorators
-EAPI=8
-HOMEPAGE=https://github.com/tkem/cachetools/ https://pypi.org/project/cachetools/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/c/cachetools/cachetools-5.1.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=2e0dc338af8109f5467c8541731dc5c4
diff --git a/metadata/md5-cache/dev-python/cachetools-5.2.0 b/metadata/md5-cache/dev-python/cachetools-5.2.0
index 19caf5430bdf..6946caafdd1f 100644
--- a/metadata/md5-cache/dev-python/cachetools-5.2.0
+++ b/metadata/md5-cache/dev-python/cachetools-5.2.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/tkem/cachetools/ https://pypi.org/project/cachetools/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cachetools/cachetools-5.2.0.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=2e0dc338af8109f5467c8541731dc5c4
+_md5_=493a92dac8f275946818e006709cf297
diff --git a/metadata/md5-cache/dev-python/carbon-1.1.8-r1 b/metadata/md5-cache/dev-python/carbon-1.1.8-r1
deleted file mode 100644
index b37b17beb5d4..000000000000
--- a/metadata/md5-cache/dev-python/carbon-1.1.8-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Backend data caching and persistence daemon for Graphite
-EAPI=8
-HOMEPAGE=https://graphiteapp.org/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/twisted[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cachetools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/whisper-1.1.8*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/c/carbon/carbon-1.1.8.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=12dbe484fe61c76066a400fec4f1ccdb
diff --git a/metadata/md5-cache/dev-python/cerberus-1.3.4 b/metadata/md5-cache/dev-python/cerberus-1.3.4
deleted file mode 100644
index 0c23edbd6991..000000000000
--- a/metadata/md5-cache/dev-python/cerberus-1.3.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A lightweight and extensible data-validation library for Python
-EAPI=8
-HOMEPAGE=https://docs.python-cerberus.org/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~riscv ~x86
-LICENSE=ISC
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pyeve/cerberus/archive/refs/tags/1.3.4.tar.gz -> cerberus-1.3.4.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=f23e22ef0ea549258f6b898370feb76a
diff --git a/metadata/md5-cache/dev-python/cerberus-1.3.4-r1 b/metadata/md5-cache/dev-python/cerberus-1.3.4-r1
index f2c15999b926..d71b2ad5e098 100644
--- a/metadata/md5-cache/dev-python/cerberus-1.3.4-r1
+++ b/metadata/md5-cache/dev-python/cerberus-1.3.4-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://docs.python-cerberus.org/ https://github.com/pyeve/cerberus/ https://pypi.org/project/Cerberus/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=amd64 ~riscv ~x86
 LICENSE=ISC
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pyeve/cerberus/archive/1.3.4.tar.gz -> cerberus-1.3.4.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=d88e448b33c5a50525fb1e7b38eb68c5
+_md5_=617ead8b0fa896530d99df8d572ebe7f
diff --git a/metadata/md5-cache/dev-python/cffi-1.15.0 b/metadata/md5-cache/dev-python/cffi-1.15.0
deleted file mode 100644
index e9a50584aefd..000000000000
--- a/metadata/md5-cache/dev-python/cffi-1.15.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-libs/libffi:= dev-python/pycparser[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] virtual/pkgconfig doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] ) ) ) test? ( dev-libs/libffi:= dev-python/pycparser[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libffi:=
-DESCRIPTION=Foreign Function Interface for Python calling C code
-EAPI=7
-HOMEPAGE=https://cffi.readthedocs.io/ https://pypi.org/project/cffi/
-INHERIT=distutils-r1 toolchain-funcs
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=dev-libs/libffi:= dev-python/pycparser[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0/1.15.0
-SRC_URI=mirror://pypi/c/cffi/cffi-1.15.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=1fd6b8b434fe00bc7dde68dee9be5fea
diff --git a/metadata/md5-cache/dev-python/cffi-1.15.0-r1 b/metadata/md5-cache/dev-python/cffi-1.15.0-r1
index 4b5f1ac5f9d2..c85da1d6b937 100644
--- a/metadata/md5-cache/dev-python/cffi-1.15.0-r1
+++ b/metadata/md5-cache/dev-python/cffi-1.15.0-r1
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://cffi.readthedocs.io/ https://pypi.org/project/cffi/
 INHERIT=distutils-r1 toolchain-funcs
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=dev-libs/libffi:= dev-python/pycparser[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1.15.0
 SRC_URI=mirror://pypi/c/cffi/cffi-1.15.0.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=20a6cc0801c8411df22332b8ee43a44a
+_md5_=d82856448c3c8ae01acb838a523633a7
diff --git a/metadata/md5-cache/dev-python/cgroup-utils-0.8 b/metadata/md5-cache/dev-python/cgroup-utils-0.8
deleted file mode 100644
index 8f6325eb27c6..000000000000
--- a/metadata/md5-cache/dev-python/cgroup-utils-0.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Tools and libraries for control groups of Linux
-EAPI=7
-HOMEPAGE=https://github.com/peo3/cgroup-utils
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/peo3/cgroup-utils/archive/v0.8.tar.gz -> cgroup-utils-0.8.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ef8b21b8730002898fb7ea11bc0a7e43
diff --git a/metadata/md5-cache/dev-python/chump-1.6.0-r1 b/metadata/md5-cache/dev-python/chump-1.6.0-r1
deleted file mode 100644
index 54887fd9e211..000000000000
--- a/metadata/md5-cache/dev-python/chump-1.6.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.7-r1:0 >=dev-python/sphinx-4.4.0[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=API wrapper for Pushover
-EAPI=7
-HOMEPAGE=https://github.com/karanlyons/chump
-INHERIT=distutils-r1
-IUSE=doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/c/chump/chump-1.6.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=a95e09bece1d81cb9aa3d9bdf7c9442d
diff --git a/metadata/md5-cache/dev-python/click-log-0.3.2 b/metadata/md5-cache/dev-python/click-log-0.3.2
deleted file mode 100644
index 82bd7d672c84..000000000000
--- a/metadata/md5-cache/dev-python/click-log-0.3.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DESCRIPTION=Logging integration for Click
-EAPI=7
-HOMEPAGE=https://github.com/click-contrib/click-log https://pypi.org/project/click-log/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/c/click-log/click-log-0.3.2.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=9787cdf3df89aa391ff4b6937a100145
diff --git a/metadata/md5-cache/dev-python/click-threading-0.5.0 b/metadata/md5-cache/dev-python/click-threading-0.5.0
deleted file mode 100644
index afb597c50623..000000000000
--- a/metadata/md5-cache/dev-python/click-threading-0.5.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/click-5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Multithreaded Click apps made easy
-EAPI=7
-HOMEPAGE=https://github.com/click-contrib/click-threading/ https://pypi.org/project/click-threading/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/click-5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/click-contrib/click-threading/archive/0.5.0.tar.gz -> click-threading-0.5.0.gh.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=36f9f070bb9e4d782f6e0201ac96f6d6
diff --git a/metadata/md5-cache/dev-python/cloudpickle-2.0.0 b/metadata/md5-cache/dev-python/cloudpickle-2.0.0
deleted file mode 100644
index 2274de195395..000000000000
--- a/metadata/md5-cache/dev-python/cloudpickle-2.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Extended pickling support for Python objects
-EAPI=8
-HOMEPAGE=https://pypi.org/project/cloudpickle/ https://github.com/cloudpipe/cloudpickle/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/c/cloudpickle/cloudpickle-2.0.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=52ed15985a21f58d6beee592e8fc0bff
diff --git a/metadata/md5-cache/dev-python/cloudpickle-2.0.0-r1 b/metadata/md5-cache/dev-python/cloudpickle-2.0.0-r1
deleted file mode 100644
index c2ce1b4343e2..000000000000
--- a/metadata/md5-cache/dev-python/cloudpickle-2.0.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Extended pickling support for Python objects
-EAPI=8
-HOMEPAGE=https://github.com/cloudpipe/cloudpickle/ https://pypi.org/project/cloudpickle/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/c/cloudpickle/cloudpickle-2.0.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ea4ebb05a682c24257a052eb342f49b0
diff --git a/metadata/md5-cache/dev-python/cloudpickle-2.1.0 b/metadata/md5-cache/dev-python/cloudpickle-2.1.0
index fa174d8467e0..83b3b6353589 100644
--- a/metadata/md5-cache/dev-python/cloudpickle-2.1.0
+++ b/metadata/md5-cache/dev-python/cloudpickle-2.1.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/cloudpipe/cloudpickle/ https://pypi.org/project/cloudpickle/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cloudpickle/cloudpickle-2.1.0.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=9e44cfe30b130b7ba833ce0f927a631b
+_md5_=b7aef71d4e1901b502d6483c1d802ac6
diff --git a/metadata/md5-cache/dev-python/cookies-2.2.1-r1 b/metadata/md5-cache/dev-python/cookies-2.2.1-r1
deleted file mode 100644
index 89263c8609e2..000000000000
--- a/metadata/md5-cache/dev-python/cookies-2.2.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Friendlier RFC 6265-compliant cookie parser/renderer
-EAPI=7
-HOMEPAGE=https://gitlab.com/sashahart/cookies
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/c/cookies/cookies-2.2.1.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=a8860098728a1efa1376989808a7fc35
diff --git a/metadata/md5-cache/dev-python/cookies-2.2.1-r2 b/metadata/md5-cache/dev-python/cookies-2.2.1-r2
index d759a7ae9c12..daa559639569 100644
--- a/metadata/md5-cache/dev-python/cookies-2.2.1-r2
+++ b/metadata/md5-cache/dev-python/cookies-2.2.1-r2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://gitlab.com/sashahart/cookies
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cookies/cookies-2.2.1.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=6f8a43cb99611b134ccb445dba63c149
+_md5_=353867df002707618a3a16046b4de445
diff --git a/metadata/md5-cache/dev-python/coverage-6.4.1 b/metadata/md5-cache/dev-python/coverage-6.4.1
index e1f37af162f8..e194db46a859 100644
--- a/metadata/md5-cache/dev-python/coverage-6.4.1
+++ b/metadata/md5-cache/dev-python/coverage-6.4.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://coverage.readthedocs.io/en/latest/ https://github.com/nedbat/coveragepy/ https://pypi.org/project/coverage/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[threads(+),sqlite(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+),sqlite(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+),sqlite(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+),sqlite(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11[threads(+),sqlite(+)] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/coverage/coverage-6.4.1.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=fd591bf32bf5768ae028e7aa9d524f2c
+_md5_=6bfdfeaa07bceda423eb2f08057b56b4
diff --git a/metadata/md5-cache/dev-python/croniter-1.3.5 b/metadata/md5-cache/dev-python/croniter-1.3.5
index cbc7b473a44a..ee856dfecf39 100644
--- a/metadata/md5-cache/dev-python/croniter-1.3.5
+++ b/metadata/md5-cache/dev-python/croniter-1.3.5
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/kiorky/croniter/ https://pypi.org/project/croniter/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~riscv x86
 LICENSE=MIT
 RDEPEND=dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/croniter/croniter-1.3.5.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=40732b1e454cbc55f4606484a6fcbf0a
+_md5_=ad49028f8a62ac521b009412e57aaf83
diff --git a/metadata/md5-cache/dev-python/cssutils-2.4.2 b/metadata/md5-cache/dev-python/cssutils-2.4.2
index ade0e099d8bc..f19275c8d151 100644
--- a/metadata/md5-cache/dev-python/cssutils-2.4.2
+++ b/metadata/md5-cache/dev-python/cssutils-2.4.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/cssutils/ https://github.com/jaraco/cssutils/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=GPL-3
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cssutils/cssutils-2.4.2.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=1ad2c1a439e47e560931d9a45d8d0074
+_md5_=af9d3a2a1cd3ac1fca2657ab24181216
diff --git a/metadata/md5-cache/dev-python/cython-0.29.30 b/metadata/md5-cache/dev-python/cython-0.29.30
index 1ecd38e1e359..333859ac2f7a 100644
--- a/metadata/md5-cache/dev-python/cython-0.29.30
+++ b/metadata/md5-cache/dev-python/cython-0.29.30
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://cython.org/ https://github.com/cython/cython/ https://pypi.org/project/Cython/
 INHERIT=distutils-r1 toolchain-funcs elisp-common
 IUSE=emacs test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11[threads(+)] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cython/cython/archive/0.29.30.tar.gz -> cython-0.29.30.gh.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	elisp-common	e7aaa047873789f549ea3df2f04b2145	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=17570a0d3926bceba02615f16c22f1c0
+_md5_=bea709f0a390d802340168d175b9a6a0
diff --git a/metadata/md5-cache/dev-python/daemonize-2.5.0 b/metadata/md5-cache/dev-python/daemonize-2.5.0
deleted file mode 100644
index b6d0aadb98e1..000000000000
--- a/metadata/md5-cache/dev-python/daemonize-2.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Library for writing system daemons in Python
-EAPI=7
-HOMEPAGE=https://github.com/thesharp/daemonize
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/thesharp/daemonize/archive/v2.5.0.tar.gz -> daemonize-2.5.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=7f0c0fca32404816f6aabfd999895116
diff --git a/metadata/md5-cache/dev-python/dbus-next-0.2.3 b/metadata/md5-cache/dev-python/dbus-next-0.2.3
deleted file mode 100644
index 947f9726bbf1..000000000000
--- a/metadata/md5-cache/dev-python/dbus-next-0.2.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pygobject[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=The next great DBus library for Python with asyncio support
-EAPI=8
-HOMEPAGE=https://python-dbus-next.readthedocs.io/en/latest/
-INHERIT=distutils-r1 virtualx
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/altdesktop/python-dbus-next/archive/refs/tags/v0.2.3.tar.gz -> dbus-next-0.2.3.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=00ad28b2eea97599f5586dfb5d38c85e
diff --git a/metadata/md5-cache/dev-python/dbus-next-0.2.3-r1 b/metadata/md5-cache/dev-python/dbus-next-0.2.3-r1
index 5838b4ed5ed9..0fcaddf9bbb9 100644
--- a/metadata/md5-cache/dev-python/dbus-next-0.2.3-r1
+++ b/metadata/md5-cache/dev-python/dbus-next-0.2.3-r1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/pygobject[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=test? ( dev-python/pygobject[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=The next great DBus library for Python with asyncio support
 EAPI=8
-HOMEPAGE=https://python-dbus-next.readthedocs.io/en/latest/
+HOMEPAGE=https://python-dbus-next.readthedocs.io/en/latest/ https://github.com/altdesktop/python-dbus-next/ https://pypi.org/project/dbus-next/
 INHERIT=distutils-r1 virtualx
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
 KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-SRC_URI=https://github.com/altdesktop/python-dbus-next/archive/refs/tags/v0.2.3.tar.gz -> dbus-next-0.2.3.tar.gz
+SRC_URI=https://github.com/altdesktop/python-dbus-next/archive/v0.2.3.tar.gz -> dbus-next-0.2.3.gh.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=99372353283a78600cccb32c4e197d13
+_md5_=55ebcfa457ed208b64e0e9e30b33e941
diff --git a/metadata/md5-cache/dev-python/decorator-5.1.1 b/metadata/md5-cache/dev-python/decorator-5.1.1
deleted file mode 100644
index 8f23b52410a6..000000000000
--- a/metadata/md5-cache/dev-python/decorator-5.1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Simplifies the usage of decorators for the average programmer
-EAPI=8
-HOMEPAGE=https://github.com/micheles/decorator https://pypi.org/project/decorator/
-INHERIT=distutils-r1
-IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/d/decorator/decorator-5.1.1.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=9f66778f52ed01ef00174e01a84be512
diff --git a/metadata/md5-cache/dev-python/decorator-5.1.1-r1 b/metadata/md5-cache/dev-python/decorator-5.1.1-r1
index bd8eca119ed0..5f6f6552b157 100644
--- a/metadata/md5-cache/dev-python/decorator-5.1.1-r1
+++ b/metadata/md5-cache/dev-python/decorator-5.1.1-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/micheles/decorator/ https://pypi.org/project/decorator/
 INHERIT=distutils-r1
 IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=mirror://pypi/d/decorator/decorator-5.1.1.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=76511613ed39b8735c3b838ba4e26c66
+_md5_=2041ebaa361bdeb76b50687d721dd1bd
diff --git a/metadata/md5-cache/dev-python/defcon-0.10.1 b/metadata/md5-cache/dev-python/defcon-0.10.1
index f414f7822c5f..60804d34e3de 100644
--- a/metadata/md5-cache/dev-python/defcon-0.10.1
+++ b/metadata/md5-cache/dev-python/defcon-0.10.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/robotools/defcon
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=>=dev-python/fonttools-4.28.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/robotools/defcon/archive/0.10.1.tar.gz -> defcon-0.10.1.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=6f11a8eaf3b40d42085795662badcda4
+_md5_=ce4d309047b9923589d5dff9c980be5c
diff --git a/metadata/md5-cache/dev-python/deprecated-1.2.13 b/metadata/md5-cache/dev-python/deprecated-1.2.13
deleted file mode 100644
index 62e66bcaa603..000000000000
--- a/metadata/md5-cache/dev-python/deprecated-1.2.13
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/wrapt[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python @deprecated decorator to deprecate old API
-EAPI=8
-HOMEPAGE=https://github.com/tantale/deprecated
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86
-LICENSE=MIT
-RDEPEND=dev-python/wrapt[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tantale/deprecated/archive/v1.2.13.tar.gz -> deprecated-1.2.13.gh.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=b3e68d7e8e71a87a0a3689dd8e4f1a90
diff --git a/metadata/md5-cache/dev-python/deprecated-1.2.13-r1 b/metadata/md5-cache/dev-python/deprecated-1.2.13-r1
index c3932a02a85a..b917e4692f99 100644
--- a/metadata/md5-cache/dev-python/deprecated-1.2.13-r1
+++ b/metadata/md5-cache/dev-python/deprecated-1.2.13-r1
@@ -2,10 +2,10 @@ BDEPEND=test? ( dev-python/wrapt[python_targets_pypy3(-)?,python_targets_python3
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python @deprecated decorator to deprecate old API
 EAPI=8
-HOMEPAGE=https://github.com/tantale/deprecated/ https://pypi.org/project/deprecated/
+HOMEPAGE=https://github.com/tantale/deprecated/ https://pypi.org/project/Deprecated/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/wrapt[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tantale/deprecated/archive/v1.2.13.tar.gz -> deprecated-1.2.13.gh.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=402ed6f8ff0a2f87903e3b73f854746c
+_md5_=8605a004d63504e9a36a6ec04e5817a7
diff --git a/metadata/md5-cache/dev-python/discogs-client-2.3.14 b/metadata/md5-cache/dev-python/discogs-client-2.3.15
similarity index 99%
rename from metadata/md5-cache/dev-python/discogs-client-2.3.14
rename to metadata/md5-cache/dev-python/discogs-client-2.3.15
index 785e31943b2b..df55d1a8a803 100644
--- a/metadata/md5-cache/dev-python/discogs-client-2.3.14
+++ b/metadata/md5-cache/dev-python/discogs-client-2.3.15
@@ -11,6 +11,6 @@ RDEPEND=dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/python3-discogs-client/python3-discogs-client-2.3.14.tar.gz
+SRC_URI=mirror://pypi/p/python3-discogs-client/python3-discogs-client-2.3.15.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
 _md5_=32b30bb09119856ad2c91bd047dcc23d
diff --git a/metadata/md5-cache/dev-python/discogs-client-9999 b/metadata/md5-cache/dev-python/discogs-client-9999
index 9f7523f5b075..d19f22b832a0 100644
--- a/metadata/md5-cache/dev-python/discogs-client-9999
+++ b/metadata/md5-cache/dev-python/discogs-client-9999
@@ -2,7 +2,7 @@ BDEPEND=test? ( dev-python/requests[python_targets_python3_8(-)?,python_targets_
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=Continuation of the official Python API client for Discogs
 EAPI=8
-HOMEPAGE=https://github.com/joalla/discogs_client https://pypi.org/project/python3-discogs-client/
+HOMEPAGE=https://github.com/joalla/discogs_client/ https://pypi.org/project/python3-discogs-client/
 INHERIT=distutils-r1 git-r3
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 LICENSE=BSD-2
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=876384773b2e798d3a8419473f8d30a4
+_md5_=32b30bb09119856ad2c91bd047dcc23d
diff --git a/metadata/md5-cache/dev-python/django-cacheops-6.0 b/metadata/md5-cache/dev-python/django-cacheops-6.0
deleted file mode 100644
index 8441905ca909..000000000000
--- a/metadata/md5-cache/dev-python/django-cacheops-6.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/django-1.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/redis-py-2.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/funcy-1.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-db/redis dev-python/dill[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=ORM cache with automatic granular event-driven invalidation for Django
-EAPI=7
-HOMEPAGE=https://github.com/Suor/django-cacheops
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=dev-python/django-1.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/redis-py-2.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/funcy-1.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/d/django-cacheops/django-cacheops-6.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=fed90681b825df36e624fed247aa5134
diff --git a/metadata/md5-cache/dev-python/django-cors-headers-3.12.0 b/metadata/md5-cache/dev-python/django-cors-headers-3.12.0
deleted file mode 100644
index e2d0af2d5650..000000000000
--- a/metadata/md5-cache/dev-python/django-cors-headers-3.12.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-django[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/django-2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Django App that adds CORS (Cross-Origin Resource Sharing) headers to responses
-EAPI=8
-HOMEPAGE=https://github.com/adamchainz/django-cors-headers/ https://pypi.org/project/django-cors-headers/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-python/django-2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/adamchainz/django-cors-headers/archive/3.12.0.tar.gz -> django-cors-headers-3.12.0.gh.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=065a9825b681f6acaf01283f9d47936e
diff --git a/metadata/md5-cache/dev-python/dns-lexicon-3.11.1 b/metadata/md5-cache/dev-python/dns-lexicon-3.11.1
deleted file mode 100644
index cfe1505f094a..000000000000
--- a/metadata/md5-cache/dev-python/dns-lexicon-3.11.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/boto3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zeep[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/vcrpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tldextract[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/poetry-core-1.0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Manipulate DNS records on various DNS providers in a standardized/agnostic way
-EAPI=8
-HOMEPAGE=https://pypi.org/project/dns-lexicon/
-INHERIT=distutils-r1 optfeature
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tldextract[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/AnalogJ/lexicon/archive/v3.11.1.tar.gz -> dns-lexicon-3.11.1.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=316f3018265b413e5ab628f68c7b9b98
diff --git a/metadata/md5-cache/dev-python/docutils-0.17.1 b/metadata/md5-cache/dev-python/docutils-0.17.1
deleted file mode 100644
index f0a93084ae33..000000000000
--- a/metadata/md5-cache/dev-python/docutils-0.17.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python Documentation Utilities
-EAPI=7
-HOMEPAGE=https://docutils.sourceforge.io/ https://pypi.org/project/docutils/
-INHERIT=distutils-r1
-IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD-2 GPL-3 public-domain
-RDEPEND=dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/d/docutils/docutils-0.17.1.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=050d1fb5cb78a8da0572c29fc2cf50ab
diff --git a/metadata/md5-cache/dev-python/docutils-0.17.1-r1 b/metadata/md5-cache/dev-python/docutils-0.17.1-r1
index cfb51d569dfc..d805d7ff45c1 100644
--- a/metadata/md5-cache/dev-python/docutils-0.17.1-r1
+++ b/metadata/md5-cache/dev-python/docutils-0.17.1-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://docutils.sourceforge.io/ https://pypi.org/project/docutils/
 INHERIT=distutils-r1
 IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2 GPL-3 public-domain
 RDEPEND=dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=mirror://pypi/d/docutils/docutils-0.17.1.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ba2f8eb5d335b1dac2c7da2e22bb89d2
+_md5_=2d25f5b185e99d9d105423c9f189a444
diff --git a/metadata/md5-cache/dev-python/docutils-0.18.1 b/metadata/md5-cache/dev-python/docutils-0.18.1
deleted file mode 100644
index 72e0d110777e..000000000000
--- a/metadata/md5-cache/dev-python/docutils-0.18.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python Documentation Utilities
-EAPI=8
-HOMEPAGE=https://docutils.sourceforge.io/ https://pypi.org/project/docutils/
-INHERIT=distutils-r1
-IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD-2 GPL-3 public-domain
-RDEPEND=dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/d/docutils/docutils-0.18.1.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=0f32a806dce60e9eb6b4c0105118142d
diff --git a/metadata/md5-cache/dev-python/docutils-0.18.1-r1 b/metadata/md5-cache/dev-python/docutils-0.18.1-r1
index 76415a8e7f8c..b6a2938eb79e 100644
--- a/metadata/md5-cache/dev-python/docutils-0.18.1-r1
+++ b/metadata/md5-cache/dev-python/docutils-0.18.1-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://docutils.sourceforge.io/ https://pypi.org/project/docutils/
 INHERIT=distutils-r1
 IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2 GPL-3 public-domain
 RDEPEND=dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=mirror://pypi/d/docutils/docutils-0.18.1.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=0fb215df9e5ea5b8cc222aa671ef9ffc
+_md5_=b40a3424854428477b0c081eac19df02
diff --git a/metadata/md5-cache/dev-python/eventlet-0.33.1 b/metadata/md5-cache/dev-python/eventlet-0.33.1
index 4d3a7c915e9c..c359ab8492f8 100644
--- a/metadata/md5-cache/dev-python/eventlet-0.33.1
+++ b/metadata/md5-cache/dev-python/eventlet-0.33.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/eventlet/ https://github.com/eventlet/eventlet/
 INHERIT=distutils-r1
 IUSE=examples test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm ~arm64 ppc ~ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/dnspython-1.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] virtual/python-greenlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/eventlet/eventlet-0.33.1.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=7093dd170748a69df03edf14833b0a68
+_md5_=7b33ef3d0113cb99572ff0fadd02f030
diff --git a/metadata/md5-cache/dev-python/exceptiongroup-1.0.0_rc7 b/metadata/md5-cache/dev-python/exceptiongroup-1.0.0_rc7
deleted file mode 100644
index 41fdea5cb535..000000000000
--- a/metadata/md5-cache/dev-python/exceptiongroup-1.0.0_rc7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flit_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Backport of PEP 654 (exception groups)
-EAPI=8
-HOMEPAGE=https://github.com/agronholm/exceptiongroup/ https://pypi.org/project/exceptiongroup/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT PSF-2.4
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/agronholm/exceptiongroup/archive/1.0.0rc7.tar.gz -> exceptiongroup-1.0.0rc7.gh.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=2f1c194dc915bc37f384aaeee8c3e558
diff --git a/metadata/md5-cache/dev-python/exceptiongroup-1.0.0_rc8 b/metadata/md5-cache/dev-python/exceptiongroup-1.0.0_rc8
index 6669799016be..6ba197ca0261 100644
--- a/metadata/md5-cache/dev-python/exceptiongroup-1.0.0_rc8
+++ b/metadata/md5-cache/dev-python/exceptiongroup-1.0.0_rc8
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/agronholm/exceptiongroup/ https://pypi.org/project/exceptiongroup/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
 LICENSE=MIT PSF-2.4
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/agronholm/exceptiongroup/archive/1.0.0rc8.tar.gz -> exceptiongroup-1.0.0rc8.gh.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=d143ff1665b35bf1ff36ad305ff3d775
+_md5_=29fb38c7b6993ef9f1b5c2e1560c03f9
diff --git a/metadata/md5-cache/dev-python/filelock-3.6.0 b/metadata/md5-cache/dev-python/filelock-3.6.0
deleted file mode 100644
index 8976e3819fa4..000000000000
--- a/metadata/md5-cache/dev-python/filelock-3.6.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A platform independent file lock for Python
-EAPI=8
-HOMEPAGE=https://github.com/tox-dev/py-filelock/ https://pypi.org/project/filelock/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=Unlicense
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tox-dev/py-filelock/archive/3.6.0.tar.gz -> py-filelock-3.6.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=4dc287f46eb29b2c1f72bd2ece987dcc
diff --git a/metadata/md5-cache/dev-python/filelock-3.7.0 b/metadata/md5-cache/dev-python/filelock-3.7.0
deleted file mode 100644
index a45b7b14232f..000000000000
--- a/metadata/md5-cache/dev-python/filelock-3.7.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A platform independent file lock for Python
-EAPI=8
-HOMEPAGE=https://github.com/tox-dev/py-filelock/ https://pypi.org/project/filelock/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
-LICENSE=Unlicense
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tox-dev/py-filelock/archive/3.7.0.tar.gz -> py-filelock-3.7.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=30b02664511450c8c136b4cb81dbdf90
diff --git a/metadata/md5-cache/dev-python/filelock-3.7.1 b/metadata/md5-cache/dev-python/filelock-3.7.1
index 2a65fe0407fb..e4a3a1f9b2b7 100644
--- a/metadata/md5-cache/dev-python/filelock-3.7.1
+++ b/metadata/md5-cache/dev-python/filelock-3.7.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/tox-dev/py-filelock/ https://pypi.org/project/filelock/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=Unlicense
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tox-dev/py-filelock/archive/3.7.1.tar.gz -> py-filelock-3.7.1.gh.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=89ea4380dd27b687cbb6805a09824160
+_md5_=6af6106caa3fdd5e4aa66c8ee98c8ef7
diff --git a/metadata/md5-cache/dev-python/findimports-2.2.0 b/metadata/md5-cache/dev-python/findimports-2.2.0
deleted file mode 100644
index 7ebe01758681..000000000000
--- a/metadata/md5-cache/dev-python/findimports-2.2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python module import analysis tool
-EAPI=8
-HOMEPAGE=https://github.com/mgedmin/findimports
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/mgedmin/findimports/archive/2.2.0.tar.gz -> findimports-2.2.0.gh.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=fd7eb93141c706c61e03ae63f844e65a
diff --git a/metadata/md5-cache/dev-python/flit_scm-1.5.0 b/metadata/md5-cache/dev-python/flit_scm-1.5.0
deleted file mode 100644
index a6ca3a278df3..000000000000
--- a/metadata/md5-cache/dev-python/flit_scm-1.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A PEP 518 build backend combining flit with setuptools_scm
-EAPI=8
-HOMEPAGE=https://gitlab.com/WillDaSilva/flit_scm/ https://pypi.org/project/flit-scm/
-INHERIT=distutils-r1
-IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/flit_core-3.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools_scm-6.4.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/tomli-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=https://gitlab.com/WillDaSilva/flit_scm/-/archive/1.5.0/flit_scm-1.5.0.tar.bz2
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=bf6829122c0a8a01ce797b78cd4bf7d0
diff --git a/metadata/md5-cache/dev-python/flit_scm-1.6.2 b/metadata/md5-cache/dev-python/flit_scm-1.6.2
index cc98d235571e..ae93fa902efe 100644
--- a/metadata/md5-cache/dev-python/flit_scm-1.6.2
+++ b/metadata/md5-cache/dev-python/flit_scm-1.6.2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://gitlab.com/WillDaSilva/flit_scm/ https://pypi.org/project/flit-scm/
 INHERIT=distutils-r1
 IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/flit_core-3.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools_scm-6.4.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/tomli-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://gitlab.com/WillDaSilva/flit_scm/-/archive/1.6.2/flit_scm-1.6.2.tar.bz2
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=0956752827bf4b8afa81558388c8bd32
+_md5_=3815af07ce159379b319269a93b4c7c2
diff --git a/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-3.0 b/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-3.0
new file mode 100644
index 000000000000..01b568cd7ec8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-3.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=OAuth 2.0 plugin for Google Cloud Storage credentials in the Boto library
+EAPI=8
+HOMEPAGE=https://pypi.org/project/gcs-oauth2-boto-plugin/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/boto-2.29.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/google-reauth-python-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/httplib2-0.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oauth2client-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyopenssl-0.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/retry-decorator-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/g/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-3.0.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=fd4984fa8de4b8776a32cb008aab96e6
diff --git a/metadata/md5-cache/dev-python/gmpy-2.1.2-r1 b/metadata/md5-cache/dev-python/gmpy-2.1.2-r1
index 77a1ad8abb89..a86009ab0106 100644
--- a/metadata/md5-cache/dev-python/gmpy-2.1.2-r1
+++ b/metadata/md5-cache/dev-python/gmpy-2.1.2-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/aleaxit/gmpy/ https://pypi.org/project/gmpy2/
 INHERIT=distutils-r1
 IUSE=doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=LGPL-3+
 RDEPEND=>=dev-libs/mpc-1.0.2:= >=dev-libs/mpfr-3.1.2:= dev-libs/gmp:0= python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=2
 SRC_URI=mirror://pypi/g/gmpy2/gmpy2-2.1.2.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=42b1fc540150f95e2f5b750f8701eb4c
+_md5_=91e811df5dc9118818def4541cd91d51
diff --git a/metadata/md5-cache/dev-python/google-api-core-2.8.2 b/metadata/md5-cache/dev-python/google-api-core-2.8.2
new file mode 100644
index 000000000000..f873c6e81ffb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/google-api-core-2.8.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/proto-plus[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/googleapis-common-protos-1.56.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/google-auth-1.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/requests-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/namespace-google >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Core Library for Google Client Libraries
+EAPI=8
+HOMEPAGE=https://github.com/googleapis/python-api-core/ https://pypi.org/project/google-api-core/ https://googleapis.dev/python/google-api-core/latest/index.html
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/googleapis-common-protos-1.56.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/google-auth-1.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/requests-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/namespace-google python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/googleapis/python-api-core/archive/v2.8.2.tar.gz -> python-api-core-2.8.2.gh.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=baccaef6167cab7f81c87a2c5cb5a0f3
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-2.51.0 b/metadata/md5-cache/dev-python/google-api-python-client-2.51.0
new file mode 100644
index 000000000000..c8891e10e876
--- /dev/null
+++ b/metadata/md5-cache/dev-python/google-api-python-client-2.51.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/oauth2client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/httplib2-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/httplib2-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/google-api-core-2.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/google-auth-1.35.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/uritemplate-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Google API Client for Python
+EAPI=8
+HOMEPAGE=https://github.com/googleapis/google-api-python-client/ https://pypi.org/project/google-api-python-client/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/httplib2-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/httplib2-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/google-api-core-2.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/google-auth-1.35.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/uritemplate-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/googleapis/google-api-python-client/archive/v2.51.0.tar.gz -> google-api-python-client-2.51.0.gh.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=30baed68af227d8d50e2ff1fad823f5c
diff --git a/metadata/md5-cache/dev-python/google-apitools-0.5.32 b/metadata/md5-cache/dev-python/google-apitools-0.5.32
deleted file mode 100644
index 324a398a6311..000000000000
--- a/metadata/md5-cache/dev-python/google-apitools-0.5.32
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/mock-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/httplib2-0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/fasteners-0.14[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oauth2client-1.5.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-gflags-3.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python library to manipulate Google APIs
-EAPI=7
-HOMEPAGE=https://github.com/google/apitools
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/httplib2-0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/fasteners-0.14[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oauth2client-1.5.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-gflags-3.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/google/apitools/archive/v0.5.32.tar.gz -> google-apitools-0.5.32.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=f80159060133e2adce95707beb2e4c8a
diff --git a/metadata/md5-cache/dev-python/google-auth-2.8.0 b/metadata/md5-cache/dev-python/google-auth-2.8.0
new file mode 100644
index 000000000000..6d639c4845e0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/google-auth-2.8.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/grpcio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/moto[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-localserver[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyu2f[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( <dev-python/cachetools-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/rsa-3.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/namespace-google >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Google Authentication Library
+EAPI=8
+HOMEPAGE=https://github.com/googleapis/google-auth-library-python/ https://pypi.org/project/google-auth/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=<dev-python/cachetools-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/rsa-3.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/namespace-google python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/g/google-auth/google-auth-2.8.0.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=1872107c91c5a0201cf7ccbf7c7198a8
diff --git a/metadata/md5-cache/dev-python/google-auth-oauthlib-0.5.1 b/metadata/md5-cache/dev-python/google-auth-oauthlib-0.5.1
deleted file mode 100644
index d5be041e0deb..000000000000
--- a/metadata/md5-cache/dev-python/google-auth-oauthlib-0.5.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/click-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/google-auth-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-oauthlib-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Google Authentication Library
-EAPI=8
-HOMEPAGE=https://pypi.org/project/google-auth-oauthlib/ https://github.com/googleapis/google-auth-library-python-oauthlib
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/click-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/google-auth-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-oauthlib-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/googleapis/google-auth-library-python-oauthlib/archive/v0.5.1.tar.gz -> google-auth-library-python-oauthlib-0.5.1.gh.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=79abdf127124e2b49208ce23fbb6d269
diff --git a/metadata/md5-cache/dev-python/googleapis-common-protos-1.56.0-r2 b/metadata/md5-cache/dev-python/googleapis-common-protos-1.56.0-r2
deleted file mode 100644
index 6c349eceaa3b..000000000000
--- a/metadata/md5-cache/dev-python/googleapis-common-protos-1.56.0-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=python classes generated from the common protos in the googleapis repository
-EAPI=8
-HOMEPAGE=https://pypi.org/project/googleapis-common-protos/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/protobuf-python-3.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/namespace-google python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/g/googleapis-common-protos/googleapis-common-protos-1.56.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=62c38e7b2e834490e06b763bf8519324
diff --git a/metadata/md5-cache/dev-python/googleapis-common-protos-1.56.1 b/metadata/md5-cache/dev-python/googleapis-common-protos-1.56.1
deleted file mode 100644
index 126d8be720ac..000000000000
--- a/metadata/md5-cache/dev-python/googleapis-common-protos-1.56.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python classes generated from the common protos in the googleapis repository
-EAPI=8
-HOMEPAGE=https://github.com/googleapis/python-api-common-protos/ https://pypi.org/project/googleapis-common-protos/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/protobuf-python-3.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/namespace-google python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/g/googleapis-common-protos/googleapis-common-protos-1.56.1.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=9b44f38a4d454b64165c0805b6d83d0f
diff --git a/metadata/md5-cache/dev-python/googleapis-common-protos-1.56.2 b/metadata/md5-cache/dev-python/googleapis-common-protos-1.56.2
index 90a9f5bf96f0..ca543ffd3f19 100644
--- a/metadata/md5-cache/dev-python/googleapis-common-protos-1.56.2
+++ b/metadata/md5-cache/dev-python/googleapis-common-protos-1.56.2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/googleapis/python-api-common-protos/ https://pypi.org/project/googleapis-common-protos/
 INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=<dev-python/protobuf-python-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/namespace-google python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/g/googleapis-common-protos/googleapis-common-protos-1.56.2.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=8ae42e2cdb8ed78a021074e3e6d9d304
+_md5_=8e261e52c3bdf2a48d232e948c2190ad
diff --git a/metadata/md5-cache/dev-python/greenlet-1.1.2 b/metadata/md5-cache/dev-python/greenlet-1.1.2
deleted file mode 100644
index f49e972fa9e5..000000000000
--- a/metadata/md5-cache/dev-python/greenlet-1.1.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] ) ) ) test? ( dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Lightweight in-process concurrent programming
-EAPI=8
-HOMEPAGE=https://pypi.org/project/greenlet/
-INHERIT=distutils-r1
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 -hppa -ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/g/greenlet/greenlet-1.1.2.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=4df783c5884e420380dc22c7ec60435d
diff --git a/metadata/md5-cache/dev-python/greenlet-1.1.2-r1 b/metadata/md5-cache/dev-python/greenlet-1.1.2-r1
index f0126715777f..3ee7237cbd8a 100644
--- a/metadata/md5-cache/dev-python/greenlet-1.1.2-r1
+++ b/metadata/md5-cache/dev-python/greenlet-1.1.2-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://greenlet.readthedocs.io/en/latest/ https://github.com/python-greenlet/greenlet/ https://pypi.org/project/greenlet/
 INHERIT=distutils-r1
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 -hppa -ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 -hppa -ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/greenlet/greenlet-1.1.2.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=d626f14a736e1989a2e417ad2ccbd775
+_md5_=e66c89e2cf4c1bb13126797f13c336e6
diff --git a/metadata/md5-cache/dev-python/happybase-0.9_p20210701 b/metadata/md5-cache/dev-python/happybase-0.9_p20210701
deleted file mode 100644
index ed58304a2b32..000000000000
--- a/metadata/md5-cache/dev-python/happybase-0.9_p20210701
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/thriftpy2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A developer-friendly Python library to interact with Apache HBase
-EAPI=7
-HOMEPAGE=https://github.com/python-happybase/happybase https://happybase.readthedocs.io/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT Apache-2.0
-RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/thriftpy2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/python-happybase/happybase/archive/f5b6d104140c2be93e4175c0c844aaf094eb43da.tar.gz -> happybase-0.9_p20210701.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ed98749cbb42e1fd961d89029089e848
diff --git a/metadata/md5-cache/dev-python/snapshottest-0.5.1 b/metadata/md5-cache/dev-python/happybase-1.2.0
similarity index 55%
rename from metadata/md5-cache/dev-python/snapshottest-0.5.1
rename to metadata/md5-cache/dev-python/happybase-1.2.0
index 6074dbdde6e0..8b10c3f51c95 100644
--- a/metadata/md5-cache/dev-python/snapshottest-0.5.1
+++ b/metadata/md5-cache/dev-python/happybase-1.2.0
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/termcolor[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/thriftpy2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Snapshot Testing utils for Python
-EAPI=7
-HOMEPAGE=https://pypi.org/project/snapshottest/ https://github.com/syrusakbary/snapshottest
+DESCRIPTION=A developer-friendly Python library to interact with Apache HBase
+EAPI=8
+HOMEPAGE=https://github.com/python-happybase/happybase https://happybase.readthedocs.io/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/termcolor[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+LICENSE=MIT Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/thriftpy2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
+RESTRICT=test !test? ( test )
 SLOT=0
-SRC_URI=https://github.com/syrusakbary/snapshottest/archive/4ac2b4fb09e9e7728bebb11967c164a914775d1d.tar.gz -> snapshottest-0.5.1.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=a3133acf18108123be30e7177186ef71
+SRC_URI=https://github.com/python-happybase/happybase/archive/1.2.0.tar.gz -> happybase-1.2.0.gh.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=9366a12535046bbe4781c4150a8c9ad3
diff --git a/metadata/md5-cache/dev-python/hatch-vcs-0.2.0 b/metadata/md5-cache/dev-python/hatch-vcs-0.2.0
index c3aeedfd0649..cbec98578698 100644
--- a/metadata/md5-cache/dev-python/hatch-vcs-0.2.0
+++ b/metadata/md5-cache/dev-python/hatch-vcs-0.2.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/hatch-vcs/ https://github.com/ofek/hatch-vcs/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/setuptools_scm-6.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ofek/hatch-vcs/archive/v0.2.0.tar.gz -> hatch-vcs-0.2.0.gh.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=663ed9e8874d53a8c866adc502bd9b5d
+_md5_=4d2e22266cc13f96070dce1b21c8965e
diff --git a/metadata/md5-cache/dev-python/hatchling-0.24.0 b/metadata/md5-cache/dev-python/hatchling-0.24.0
deleted file mode 100644
index 6cd3c1b0eb8c..000000000000
--- a/metadata/md5-cache/dev-python/hatchling-0.24.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/editables-0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pathspec-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pluggy-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-1.2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( python_targets_pypy3? ( dev-python/atomicwrites[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-python/atomicwrites[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/atomicwrites[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/atomicwrites[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) test? ( >=dev-python/editables-0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pathspec-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pluggy-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-1.2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Modern, extensible Python build backend
-EAPI=8
-HOMEPAGE=https://pypi.org/project/hatchling/ https://github.com/pypa/hatch/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=>=dev-python/editables-0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pathspec-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pluggy-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-1.2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pypa/hatch/archive/hatchling-v0.24.0.tar.gz -> hatch-hatchling-v0.24.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=4a900603e006c5b545cd0b962896606f
diff --git a/metadata/md5-cache/dev-python/hatchling-0.25.0 b/metadata/md5-cache/dev-python/hatchling-0.25.0
deleted file mode 100644
index f37a761f4e5e..000000000000
--- a/metadata/md5-cache/dev-python/hatchling-0.25.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/editables-0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pathspec-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pluggy-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-1.2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( python_targets_pypy3? ( dev-python/atomicwrites[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-python/atomicwrites[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/atomicwrites[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/atomicwrites[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) test? ( >=dev-python/editables-0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pathspec-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pluggy-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-1.2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Modern, extensible Python build backend
-EAPI=8
-HOMEPAGE=https://pypi.org/project/hatchling/ https://github.com/pypa/hatch/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/editables-0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pathspec-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pluggy-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-1.2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pypa/hatch/archive/hatchling-v0.25.0.tar.gz -> hatch-hatchling-v0.25.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ecc5a032db1df04783eef3871a9195bb
diff --git a/metadata/md5-cache/dev-python/hatchling-1.0.0 b/metadata/md5-cache/dev-python/hatchling-1.0.0
deleted file mode 100644
index 339763c021c4..000000000000
--- a/metadata/md5-cache/dev-python/hatchling-1.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/editables-0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pathspec-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pluggy-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-1.2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( python_targets_pypy3? ( dev-python/atomicwrites[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( dev-python/atomicwrites[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( dev-python/atomicwrites[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/atomicwrites[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/atomicwrites[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) test? ( >=dev-python/editables-0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pathspec-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pluggy-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-1.2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Modern, extensible Python build backend
-EAPI=8
-HOMEPAGE=https://pypi.org/project/hatchling/ https://github.com/pypa/hatch/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/editables-0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pathspec-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pluggy-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-1.2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pypa/hatch/archive/hatchling-v1.0.0.tar.gz -> hatch-hatchling-v1.0.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=4206d5f1df345832e9c887579616c0a6
diff --git a/metadata/md5-cache/dev-python/hatchling-1.1.0 b/metadata/md5-cache/dev-python/hatchling-1.1.0
deleted file mode 100644
index 52680e1f2d21..000000000000
--- a/metadata/md5-cache/dev-python/hatchling-1.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/editables-0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pathspec-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pluggy-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-1.2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( python_targets_pypy3? ( dev-python/atomicwrites[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( dev-python/atomicwrites[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( dev-python/atomicwrites[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/atomicwrites[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/atomicwrites[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) test? ( >=dev-python/editables-0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pathspec-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pluggy-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-1.2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Modern, extensible Python build backend
-EAPI=8
-HOMEPAGE=https://pypi.org/project/hatchling/ https://github.com/pypa/hatch/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/editables-0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pathspec-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pluggy-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-1.2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pypa/hatch/archive/hatchling-v1.1.0.tar.gz -> hatch-hatchling-v1.1.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=4206d5f1df345832e9c887579616c0a6
diff --git a/metadata/md5-cache/dev-python/hatchling-1.2.0 b/metadata/md5-cache/dev-python/hatchling-1.2.0
deleted file mode 100644
index 36492e1e12d1..000000000000
--- a/metadata/md5-cache/dev-python/hatchling-1.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/editables-0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pathspec-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pluggy-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-1.2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( python_targets_pypy3? ( dev-python/atomicwrites[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( dev-python/atomicwrites[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( dev-python/atomicwrites[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/atomicwrites[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/atomicwrites[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) test? ( >=dev-python/editables-0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pathspec-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pluggy-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-1.2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Modern, extensible Python build backend
-EAPI=8
-HOMEPAGE=https://pypi.org/project/hatchling/ https://github.com/pypa/hatch/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/editables-0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pathspec-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pluggy-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-1.2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pypa/hatch/archive/hatchling-v1.2.0.tar.gz -> hatch-hatchling-v1.2.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=4206d5f1df345832e9c887579616c0a6
diff --git a/metadata/md5-cache/dev-python/hatchling-1.3.0 b/metadata/md5-cache/dev-python/hatchling-1.3.0
deleted file mode 100644
index e17dadff6a4a..000000000000
--- a/metadata/md5-cache/dev-python/hatchling-1.3.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/editables-0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pathspec-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pluggy-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-1.2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( python_targets_pypy3? ( dev-python/atomicwrites[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( dev-python/atomicwrites[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( dev-python/atomicwrites[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/atomicwrites[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/atomicwrites[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) test? ( >=dev-python/editables-0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pathspec-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pluggy-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-1.2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Modern, extensible Python build backend
-EAPI=8
-HOMEPAGE=https://pypi.org/project/hatchling/ https://github.com/pypa/hatch/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/editables-0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pathspec-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pluggy-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-1.2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pypa/hatch/archive/hatchling-v1.3.0.tar.gz -> hatch-hatchling-v1.3.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=4206d5f1df345832e9c887579616c0a6
diff --git a/metadata/md5-cache/dev-python/hatchling-1.3.1 b/metadata/md5-cache/dev-python/hatchling-1.3.1
index f581cf4402c5..c0470a6704e3 100644
--- a/metadata/md5-cache/dev-python/hatchling-1.3.1
+++ b/metadata/md5-cache/dev-python/hatchling-1.3.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/hatchling/ https://github.com/pypa/hatch/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/editables-0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pathspec-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pluggy-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-1.2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/hatch/archive/hatchling-v1.3.1.tar.gz -> hatch-hatchling-v1.3.1.gh.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=53f3da12c31bc9ea210115b30aded090
+_md5_=da299e359e6564651d61be59c734c4c2
diff --git a/metadata/md5-cache/dev-python/httmock-1.4.0 b/metadata/md5-cache/dev-python/httmock-1.4.0
deleted file mode 100644
index e9e7fdebe4af..000000000000
--- a/metadata/md5-cache/dev-python/httmock-1.4.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/requests-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A mocking library for requests
-EAPI=7
-HOMEPAGE=https://github.com/patrys/httmock
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/requests-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/patrys/httmock/archive/1.4.0.tar.gz -> httmock-1.4.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=f45f4b4f4bdcaa0adbca41ef6cb72b86
diff --git a/metadata/md5-cache/dev-python/httpretty-1.1.4 b/metadata/md5-cache/dev-python/httpretty-1.1.4
deleted file mode 100644
index 4bdcb6cb6750..000000000000
--- a/metadata/md5-cache/dev-python/httpretty-1.1.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/boto3-1.17.72[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/httpx-0.18.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sure[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=HTTP client mock for Python
-EAPI=8
-HOMEPAGE=https://github.com/gabrielfalcao/httpretty
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86
-LICENSE=MIT
-RDEPEND=dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/h/httpretty/httpretty-1.1.4.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=32dd384a30211b1e65e138efbd4f9cca
diff --git a/metadata/md5-cache/dev-python/httpretty-1.1.4-r1 b/metadata/md5-cache/dev-python/httpretty-1.1.4-r1
index 059edd736b0a..553ffcaf6833 100644
--- a/metadata/md5-cache/dev-python/httpretty-1.1.4-r1
+++ b/metadata/md5-cache/dev-python/httpretty-1.1.4-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/gabrielfalcao/httpretty/ https://pypi.org/project/httpretty/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/httpretty/httpretty-1.1.4.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=259e35d9301c5963385627d4cbab0327
+_md5_=030959dff00f9adf44fa7e685d56e54b
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.47.2 b/metadata/md5-cache/dev-python/hypothesis-6.47.2
index eb534c359751..4e0f31af9847 100644
--- a/metadata/md5-cache/dev-python/hypothesis-6.47.2
+++ b/metadata/md5-cache/dev-python/hypothesis-6.47.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/HypothesisWorks/hypothesis/ https://pypi.org/project/hypothesis/
 INHERIT=distutils-r1 multiprocessing optfeature
 IUSE=cli test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
 LICENSE=MPL-2.0
 RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[threads(+),sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11[threads(+),sqlite] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.47.2.tar.gz -> hypothesis-hypothesis-python-6.47.2.gh.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=290176aff4d7ccb8cd3824e5687890d5
+_md5_=84d1931ba83681f84a322d0535a77aea
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.47.3 b/metadata/md5-cache/dev-python/hypothesis-6.47.3
new file mode 100644
index 000000000000..851a01cafc48
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-6.47.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[threads(+),sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11[threads(+),sqlite] ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=A library for property based testing
+EAPI=8
+HOMEPAGE=https://github.com/HypothesisWorks/hypothesis/ https://pypi.org/project/hypothesis/
+INHERIT=distutils-r1 multiprocessing optfeature
+IUSE=cli test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+LICENSE=MPL-2.0
+RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[threads(+),sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11[threads(+),sqlite] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.47.3.tar.gz -> hypothesis-hypothesis-python-6.47.3.gh.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=84d1931ba83681f84a322d0535a77aea
diff --git a/metadata/md5-cache/dev-python/ifaddr-0.2.0 b/metadata/md5-cache/dev-python/ifaddr-0.2.0
new file mode 100644
index 000000000000..7f690df52b82
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ifaddr-0.2.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Enumerate IP addresses on the local network adapters
+EAPI=8
+HOMEPAGE=https://github.com/pydron/ifaddr/ https://pypi.org/project/ifaddr/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/i/ifaddr/ifaddr-0.2.0.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=497e5f21316c15ac7730e658c2ed1a96
diff --git a/metadata/md5-cache/dev-python/imageio-2.19.2 b/metadata/md5-cache/dev-python/imageio-2.19.2
deleted file mode 100644
index e0bcc06c7af8..000000000000
--- a/metadata/md5-cache/dev-python/imageio-2.19.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( dev-python/fsspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/imageio-ffmpeg[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tifffile[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/numpy-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-8.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-libs/freeimage >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python library for reading and writing image data
-EAPI=8
-HOMEPAGE=https://imageio.readthedocs.io/en/stable/ https://github.com/imageio/imageio/ https://pypi.org/project/imageio/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-PROPERTIES=test_network
-RDEPEND=>=dev-python/numpy-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-8.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-libs/freeimage python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/imageio/imageio/archive/v2.19.2.tar.gz -> imageio-2.19.2.gh.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=1be6ddbf12ba1226d0caea4060f90b37
diff --git a/metadata/md5-cache/dev-python/imagesize-1.3.0 b/metadata/md5-cache/dev-python/imagesize-1.3.0
deleted file mode 100644
index d74a979c836a..000000000000
--- a/metadata/md5-cache/dev-python/imagesize-1.3.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Pure Python module for getting image size from png/jpeg/jpeg2000/gif files
-EAPI=8
-HOMEPAGE=https://github.com/shibukawa/imagesize_py
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/i/imagesize/imagesize-1.3.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=2f21b8836d9a711aed194417fb5a4342
diff --git a/metadata/md5-cache/dev-python/imagesize-1.3.0-r1 b/metadata/md5-cache/dev-python/imagesize-1.3.0-r1
index ef395c9c5a66..20b0dd16fdd5 100644
--- a/metadata/md5-cache/dev-python/imagesize-1.3.0-r1
+++ b/metadata/md5-cache/dev-python/imagesize-1.3.0-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/shibukawa/imagesize_py
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/imagesize/imagesize-1.3.0.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=420cbd90503a9598dc500b98ec5d1e7c
+_md5_=fb3f4cb5ec56f2d29b03601a367a51c6
diff --git a/metadata/md5-cache/dev-python/importlib_resources-5.8.0 b/metadata/md5-cache/dev-python/importlib_resources-5.8.0
new file mode 100644
index 000000000000..f9ed84da98ab
--- /dev/null
+++ b/metadata/md5-cache/dev-python/importlib_resources-5.8.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( python_targets_pypy3? ( >=dev-python/zipp-3.7.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?] ) python_targets_python3_8? ( >=dev-python/zipp-3.7.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?] ) dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?] >=dev-python/flit_core-3.7.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Read resources from Python packages
+EAPI=7
+HOMEPAGE=https://github.com/python/importlib_resources/ https://pypi.org/project/importlib-resources/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris
+LICENSE=Apache-2.0
+RDEPEND=python_targets_pypy3? ( >=dev-python/zipp-3.7.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?] ) python_targets_python3_8? ( >=dev-python/zipp-3.7.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/i/importlib_resources/importlib_resources-5.8.0.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=7c221611750d2deb9949bb0722a1eda1
diff --git a/metadata/md5-cache/dev-python/inflection-0.5.1 b/metadata/md5-cache/dev-python/inflection-0.5.1
deleted file mode 100644
index f92895bedd58..000000000000
--- a/metadata/md5-cache/dev-python/inflection-0.5.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.7-r1:0 >=dev-python/sphinx-4.4.0[python_targets_pypy3(-)] ) ) ) test? ( >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A port of Ruby on Rails' inflector to Python
-EAPI=7
-HOMEPAGE=https://github.com/jpvanhal/inflection
-INHERIT=distutils-r1
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/i/inflection/inflection-0.5.1.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=d5efe245bcdb4820b79e9a67d6dd1af1
diff --git a/metadata/md5-cache/dev-python/ipykernel-6.14.0 b/metadata/md5-cache/dev-python/ipykernel-6.14.0
new file mode 100644
index 000000000000..d5a34086ac1f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ipykernel-6.14.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/debugpy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-6.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/flaky[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/ipyparallel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/debugpy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-6.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hatchling-0.22.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=IPython Kernel for Jupyter
+EAPI=8
+HOMEPAGE=https://github.com/ipython/ipykernel
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/debugpy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-6.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/i/ipykernel/ipykernel-6.14.0.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=7692b5790079cf49e5534f5f4654dbaa
diff --git a/metadata/md5-cache/dev-python/ipykernel-6.15.0 b/metadata/md5-cache/dev-python/ipykernel-6.15.0
new file mode 100644
index 000000000000..9ff5f0acdcba
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ipykernel-6.15.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/debugpy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-6.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipyparallel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/debugpy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-6.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hatchling-0.22.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=IPython Kernel for Jupyter
+EAPI=8
+HOMEPAGE=https://github.com/ipython/ipykernel
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/debugpy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-6.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/i/ipykernel/ipykernel-6.15.0.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=b8dca97c37f5e4527036b5d4729db0fe
diff --git a/metadata/md5-cache/dev-python/ipyparallel-8.3.0 b/metadata/md5-cache/dev-python/ipyparallel-8.3.0
index d22748616514..7174d4b67a7b 100644
--- a/metadata/md5-cache/dev-python/ipyparallel-8.3.0
+++ b/metadata/md5-cache/dev-python/ipyparallel-8.3.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://ipyparallel.readthedocs.io/
 INHERIT=distutils-r1 optfeature
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=dev-python/entrypoints[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter_client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter_server[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipykernel-4.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tqdm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipyparallel/ipyparallel-8.3.0.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=d3a94030a5a06b181fe51f9b295a37d3
+_md5_=6640260013755a18a004656d80dd10c7
diff --git a/metadata/md5-cache/dev-python/ipython-8.2.0 b/metadata/md5-cache/dev-python/ipython-8.2.0
deleted file mode 100644
index b9fbe6de2e70..000000000000
--- a/metadata/md5-cache/dev-python/ipython-8.2.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( app-text/dvipng[truetype] >=dev-python/ipykernel-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib-inline[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nbformat[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.19[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/testpath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( >=dev-python/ipykernel-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphinx-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/backcall[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jedi-0.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib-inline[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pexpect-4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pickleshare[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/prompt_toolkit-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/prompt_toolkit-3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygments-2.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/stack_data[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] matplotlib? ( dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[readline,sqlite,threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[readline,sqlite,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[readline,sqlite,threads(+)] ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Advanced interactive shell for Python
-EAPI=8
-HOMEPAGE=https://ipython.org/ https://github.com/ipython/ipython/
-INHERIT=distutils-r1 optfeature virtualx
-IUSE=doc examples matplotlib notebook nbconvert qt5 +smp test test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86
-LICENSE=BSD
-PDEPEND=notebook? ( dev-python/notebook[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipywidgets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/widgetsnbextension[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) qt5? ( dev-python/qtconsole[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) smp? ( >=dev-python/ipykernel-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipyparallel-6.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
-RDEPEND=dev-python/backcall[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jedi-0.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib-inline[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pexpect-4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pickleshare[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/prompt_toolkit-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/prompt_toolkit-3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygments-2.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/stack_data[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] matplotlib? ( dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) nbconvert? ( dev-python/nbconvert[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[readline,sqlite,threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[readline,sqlite,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[readline,sqlite,threads(+)] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/i/ipython/ipython-8.2.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=ea25ada68cfce19aaa041fbde09757eb
diff --git a/metadata/md5-cache/dev-python/ipython-8.3.0-r1 b/metadata/md5-cache/dev-python/ipython-8.3.0-r1
index 631e63b0d331..4d84c282cdf5 100644
--- a/metadata/md5-cache/dev-python/ipython-8.3.0-r1
+++ b/metadata/md5-cache/dev-python/ipython-8.3.0-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://ipython.org/ https://github.com/ipython/ipython/
 INHERIT=distutils-r1 optfeature virtualx
 IUSE=doc examples matplotlib notebook nbconvert qt5 +smp test test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 PDEPEND=notebook? ( dev-python/notebook[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipywidgets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/widgetsnbextension[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) qt5? ( dev-python/qtconsole[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) smp? ( >=dev-python/ipykernel-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipyparallel-6.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
 RDEPEND=dev-python/backcall[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jedi-0.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib-inline[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pexpect-4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pickleshare[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/prompt_toolkit-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/prompt_toolkit-3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygments-2.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/stack_data[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] nbconvert? ( dev-python/nbconvert[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[readline,sqlite,threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[readline,sqlite,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[readline,sqlite,threads(+)] )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipython/ipython-8.3.0.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=1b7078443256463e35fe99c0c4279846
+_md5_=ddd0469745f1ec2c41b5279218f685ec
diff --git a/metadata/md5-cache/dev-python/jaraco-collections-3.5.1 b/metadata/md5-cache/dev-python/jaraco-collections-3.5.1
deleted file mode 100644
index 6e074e0b6af2..000000000000
--- a/metadata/md5-cache/dev-python/jaraco-collections-3.5.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/setuptools_scm-1.15.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_10(-)] >=dev-python/rst-linker-1.9[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_9(-)] >=dev-python/rst-linker-1.9[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_8(-)] >=dev-python/rst-linker-1.9[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.7-r1:0 >=dev-python/sphinx-4.4.0[python_targets_pypy3(-)] >=dev-python/jaraco-packaging-3.2[python_targets_pypy3(-)] >=dev-python/rst-linker-1.9[python_targets_pypy3(-)] ) ) ) test? ( dev-python/jaraco-classes[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jaraco-text[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Models and classes to supplement the stdlib collections module
-EAPI=8
-HOMEPAGE=https://github.com/jaraco/jaraco.collections
-INHERIT=distutils-r1
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 ~ia64 ppc ~ppc64 ~riscv x86
-LICENSE=MIT
-RDEPEND=dev-python/jaraco-classes[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jaraco-text[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/j/jaraco.collections/jaraco.collections-3.5.1.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=b51a6f553d52330ed8953a3edbe94726
diff --git a/metadata/md5-cache/dev-python/jaraco-collections-3.5.1-r1 b/metadata/md5-cache/dev-python/jaraco-collections-3.5.1-r1
index b8fc3b89f143..492e5efd73de 100644
--- a/metadata/md5-cache/dev-python/jaraco-collections-3.5.1-r1
+++ b/metadata/md5-cache/dev-python/jaraco-collections-3.5.1-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/jaraco/jaraco.collections
 INHERIT=distutils-r1
 IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ia64 ppc ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=dev-python/jaraco-classes[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jaraco-text[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.collections/jaraco.collections-3.5.1.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=f6fabc9f8dd589574dd6bd4bf6b113c7
+_md5_=69c8d8e6a335c20f0d29e711f3d7c03c
diff --git a/metadata/md5-cache/dev-python/jaraco-stream-3.0.3-r1 b/metadata/md5-cache/dev-python/jaraco-stream-3.0.3-r1
index 0d22a85e0967..6fcdba20ac11 100644
--- a/metadata/md5-cache/dev-python/jaraco-stream-3.0.3-r1
+++ b/metadata/md5-cache/dev-python/jaraco-stream-3.0.3-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/jaraco/jaraco.stream
 INHERIT=distutils-r1
 IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.stream/jaraco.stream-3.0.3.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=25585dbb8f268b3a1ff1cbeb141ba54f
+_md5_=0ff412b4b5fb952fb3f0cc28c6f7e2d2
diff --git a/metadata/md5-cache/dev-python/jaraco-test-5.1.0 b/metadata/md5-cache/dev-python/jaraco-test-5.1.0
index 823d8c6575d0..59ac7ed1bb2e 100644
--- a/metadata/md5-cache/dev-python/jaraco-test-5.1.0
+++ b/metadata/md5-cache/dev-python/jaraco-test-5.1.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/jaraco/jaraco.test/ https://pypi.org/project/jaraco.test/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=MIT
 RDEPEND=dev-python/jaraco-collections[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jaraco-context[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jaraco-functools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/more-itertools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.test/jaraco.test-5.1.0.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=d92fe31bf37ff952d68546fddb326d88
+_md5_=f40b83e7811b9cfeccb171db51ae7a92
diff --git a/metadata/md5-cache/dev-python/jc-1.19.0 b/metadata/md5-cache/dev-python/jc-1.19.0
deleted file mode 100644
index 24398c77bca7..000000000000
--- a/metadata/md5-cache/dev-python/jc-1.19.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Converts the output of popular command-line tools and file-types to JSON
-EAPI=8
-HOMEPAGE=https://github.com/kellyjonbrazil/jc/ https://pypi.org/project/jc/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~ppc64
-LICENSE=MIT
-RDEPEND=dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/kellyjonbrazil/jc/archive/v1.19.0.tar.gz -> jc-1.19.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=4943a04478c0cca223e79e1b5b02f4b0
diff --git a/metadata/md5-cache/dev-python/jc-1.20.0 b/metadata/md5-cache/dev-python/jc-1.20.0
deleted file mode 100644
index fee54022f60b..000000000000
--- a/metadata/md5-cache/dev-python/jc-1.20.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Converts the output of popular command-line tools and file-types to JSON
-EAPI=8
-HOMEPAGE=https://github.com/kellyjonbrazil/jc/ https://pypi.org/project/jc/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~ppc64
-LICENSE=MIT
-RDEPEND=dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/kellyjonbrazil/jc/archive/v1.20.0.tar.gz -> jc-1.20.0.gh.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=db21a030dfc19fad2d42dfc20cd5413b
diff --git a/metadata/md5-cache/dev-python/jc-1.20.1 b/metadata/md5-cache/dev-python/jc-1.20.1
new file mode 100644
index 000000000000..dedad09ce5f0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jc-1.20.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Converts the output of popular command-line tools and file-types to JSON
+EAPI=8
+HOMEPAGE=https://github.com/kellyjonbrazil/jc/ https://pypi.org/project/jc/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~ppc64
+LICENSE=MIT
+RDEPEND=dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/kellyjonbrazil/jc/archive/v1.20.1.tar.gz -> jc-1.20.1.gh.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=dcaea142aab83c7a2b0bf1caf4dfc7ec
diff --git a/metadata/md5-cache/dev-python/jdcal-1.4.1 b/metadata/md5-cache/dev-python/jdcal-1.4.1
deleted file mode 100644
index 1ca646875bc2..000000000000
--- a/metadata/md5-cache/dev-python/jdcal-1.4.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Julian dates from proleptic Gregorian and Julian calendars
-EAPI=7
-HOMEPAGE=https://github.com/phn/jdcal
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/j/jdcal/jdcal-1.4.1.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=954964ef598784b12e84cd929ba97f91
diff --git a/metadata/md5-cache/dev-python/jdcal-1.4.1-r1 b/metadata/md5-cache/dev-python/jdcal-1.4.1-r1
index 73032e31a9db..172bc6044f36 100644
--- a/metadata/md5-cache/dev-python/jdcal-1.4.1-r1
+++ b/metadata/md5-cache/dev-python/jdcal-1.4.1-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/phn/jdcal
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jdcal/jdcal-1.4.1.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=83c70069ab3f51ce94118c9d48b32124
+_md5_=6e50d9292452fd319f974458e51f065a
diff --git a/metadata/md5-cache/dev-python/jikanpy-4.3.2 b/metadata/md5-cache/dev-python/jikanpy-4.3.2
deleted file mode 100644
index 47f878e81e35..000000000000
--- a/metadata/md5-cache/dev-python/jikanpy-4.3.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/vcrpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/simplejson[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/alabaster[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/alabaster[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/alabaster[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python wrapper for jikan.moe API
-EAPI=8
-HOMEPAGE=https://pypi.org/project/jikanpy/
-INHERIT=distutils-r1
-IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/simplejson[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/abhinavk99/jikanpy/archive/v4.3.2.tar.gz -> jikanpy-4.3.2.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=9580a683863061c9a02aa87fec9f1b61
diff --git a/metadata/md5-cache/dev-python/jinja2_pluralize-0.3.0 b/metadata/md5-cache/dev-python/jinja2_pluralize-0.3.0
deleted file mode 100644
index 054757ee3339..000000000000
--- a/metadata/md5-cache/dev-python/jinja2_pluralize-0.3.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/inflect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Jinja2 pluralize filters
-EAPI=7
-HOMEPAGE=https://github.com/audreyr/jinja2_pluralize
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/inflect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/j/jinja2_pluralize/jinja2_pluralize-0.3.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=1db670eb9f89d353f078de045b16985a
diff --git a/metadata/md5-cache/dev-python/js2py-0.71_p20210918 b/metadata/md5-cache/dev-python/js2py-0.71_p20210918
new file mode 100644
index 000000000000..66cbf127bddd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/js2py-0.71_p20210918
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=JavaScript to Python Translator & JavaScript interpreter in Python
+EAPI=8
+HOMEPAGE=http://piter.io/projects/js2py/ https://github.com/PiotrDabkowski/Js2Py/ https://pypi.org/project/Js2Py/
+INHERIT=distutils-r1
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/pyjsparser-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tzlocal-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=https://github.com/PiotrDabkowski/Js2Py/archive/b16d7ce90ac9c03358010c1599c3e87698c9993f.tar.gz -> Js2Py-0.71_p20210918.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=8fc4a9dec6978b7256b252686c65f6c2
diff --git a/metadata/md5-cache/dev-python/jsonmerge-1.8.0 b/metadata/md5-cache/dev-python/jsonmerge-1.8.0
deleted file mode 100644
index 04996e5028ad..000000000000
--- a/metadata/md5-cache/dev-python/jsonmerge-1.8.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Merge a series of JSON documents
-EAPI=7
-HOMEPAGE=https://github.com/avian2/jsonmerge/ https://pypi.org/project/jsonmerge/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/j/jsonmerge/jsonmerge-1.8.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=1c1c3cc741ceec10f34a08f7ce54569d
diff --git a/metadata/md5-cache/dev-python/jsonpickle-2.1.0 b/metadata/md5-cache/dev-python/jsonpickle-2.1.0
deleted file mode 100644
index f69093a2e10e..000000000000
--- a/metadata/md5-cache/dev-python/jsonpickle-2.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/simplejson[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sqlalchemy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ujson[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/feedparser[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/jaraco-packaging[python_targets_python3_10(-)] dev-python/rst-linker[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/jaraco-packaging[python_targets_python3_9(-)] dev-python/rst-linker[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/jaraco-packaging[python_targets_python3_8(-)] dev-python/rst-linker[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python library for serializing any arbitrary object graph into JSON
-EAPI=8
-HOMEPAGE=https://github.com/jsonpickle/jsonpickle/ https://pypi.org/project/jsonpickle/
-INHERIT=distutils-r1 optfeature
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/j/jsonpickle/jsonpickle-2.1.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=8554bf4092eaa097a85c0a4109362e31
diff --git a/metadata/md5-cache/dev-python/jsonxs-0.6 b/metadata/md5-cache/dev-python/jsonxs-0.6
deleted file mode 100644
index bea087dcaa20..000000000000
--- a/metadata/md5-cache/dev-python/jsonxs-0.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Get/set values in JSON and Python datastructures
-EAPI=7
-HOMEPAGE=https://github.com/fboender/jsonxs
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/j/jsonxs/jsonxs-0.6.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=bc02ca1d670597553ecdb506ce0cc955
diff --git a/metadata/md5-cache/dev-python/jupyter_server-1.17.0 b/metadata/md5-cache/dev-python/jupyter_server-1.17.0
index bec269b304a9..2c6b9b4995a1 100644
--- a/metadata/md5-cache/dev-python/jupyter_server-1.17.0
+++ b/metadata/md5-cache/dev-python/jupyter_server-1.17.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://jupyter.org
 INHERIT=distutils-r1
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=BSD
 RDEPEND=>=dev-python/anyio-3.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/anyio-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/argon2-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-6.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_core-4.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nbconvert-6.4.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nbformat-5.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prometheus_client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/send2trash[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/terminado-0.8.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/websocket-client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyter_server/jupyter_server-1.17.0.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=479878848495d3fdf6893033c35d9042
+_md5_=c33030265b5a493c9b0ccc949b278a95
diff --git a/metadata/md5-cache/dev-python/jupyterlab-3.3.4 b/metadata/md5-cache/dev-python/jupyterlab-3.3.4
deleted file mode 100644
index 32a482727d44..000000000000
--- a/metadata/md5-cache/dev-python/jupyterlab-3.3.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/jupyter_packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter_core[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyterlab_server-2.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_server-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nbclassic-0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-libs/nodejs >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_packaging-0.11.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=JupyterLab computational environment
-EAPI=8
-HOMEPAGE=https://jupyter.org/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=BSD MIT GPL-3 Apache-2.0
-RDEPEND=dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter_core[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyterlab_server-2.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_server-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nbclassic-0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-libs/nodejs python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/j/jupyterlab/jupyterlab-3.3.4.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=455f34e3f2a55c5bd57b0d2c72949333
diff --git a/metadata/md5-cache/dev-python/jupyterlab_server-2.13.0 b/metadata/md5-cache/dev-python/jupyterlab_server-2.13.0
deleted file mode 100644
index cab41ceaee07..000000000000
--- a/metadata/md5-cache/dev-python/jupyterlab_server-2.13.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/Babel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/importlib_metadata-3.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-3.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/json5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-3.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_server-1.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/jupyter_server-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Server components for JupyterLab and JupyterLab like applications
-EAPI=8
-HOMEPAGE=https://jupyter.org/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-python/Babel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/importlib_metadata-3.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-3.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/json5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-3.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_server-1.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/jupyter_server-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/j/jupyterlab_server/jupyterlab_server-2.13.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=b9b86ceb4d99a625e7d40cbd7a28066f
diff --git a/metadata/md5-cache/dev-python/k5test-0.10.1 b/metadata/md5-cache/dev-python/k5test-0.10.1
deleted file mode 100644
index 92927419d5f3..000000000000
--- a/metadata/md5-cache/dev-python/k5test-0.10.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Library for testing Python applications in Kerberos 5 environments
-EAPI=8
-HOMEPAGE=https://pypi.org/project/k5test/ https://github.com/pythongssapi/k5test
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 ~riscv x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/k/k5test/k5test-0.10.1.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=a9f575d87942e4b97e363eb13f937ef6
diff --git a/metadata/md5-cache/dev-python/k5test-0.10.1-r1 b/metadata/md5-cache/dev-python/k5test-0.10.1-r1
index 3f4e0164cd64..5d1e7f1104a8 100644
--- a/metadata/md5-cache/dev-python/k5test-0.10.1-r1
+++ b/metadata/md5-cache/dev-python/k5test-0.10.1-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/k5test/ https://github.com/pythongssapi/k5test
 INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~riscv x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=mirror://pypi/k/k5test/k5test-0.10.1.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=affc9a56e713ca6ff7632495d69b29a2
+_md5_=68670e09dab0c766932bc1392f2c5577
diff --git a/metadata/md5-cache/dev-python/kaitaistruct-0.9 b/metadata/md5-cache/dev-python/kaitaistruct-0.9
deleted file mode 100644
index 13e184926027..000000000000
--- a/metadata/md5-cache/dev-python/kaitaistruct-0.9
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Kaitai Struct runtime for Python
-EAPI=7
-HOMEPAGE=https://kaitai.io/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/k/kaitaistruct/kaitaistruct-0.9.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=bb51eb3a9eea7780a93177eaa86bc00a
diff --git a/metadata/md5-cache/dev-python/kaitaistruct-0.9-r1 b/metadata/md5-cache/dev-python/kaitaistruct-0.9-r1
index 75124773a4f8..9b52c761cf5e 100644
--- a/metadata/md5-cache/dev-python/kaitaistruct-0.9-r1
+++ b/metadata/md5-cache/dev-python/kaitaistruct-0.9-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://kaitai.io/
 INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=mirror://pypi/k/kaitaistruct/kaitaistruct-0.9.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=b84041dd2abef99a1ad78cc182f5fb6f
+_md5_=976483bcbc25e9906a2a805ad6928827
diff --git a/metadata/md5-cache/dev-python/keep-2.10.1 b/metadata/md5-cache/dev-python/keep-2.10.1
deleted file mode 100644
index e832ca856dd9..000000000000
--- a/metadata/md5-cache/dev-python/keep-2.10.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Personal shell command keeper and snippets manager
-EAPI=7
-HOMEPAGE=https://pypi.org/project/keep/ https://github.com/orkohunter/keep
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/PyGithub[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/terminaltables[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/k/keep/keep-2.10.1.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=e2c22e62fce0855e3ba2696994be12fa
diff --git a/metadata/md5-cache/dev-python/keep-2.10.1-r1 b/metadata/md5-cache/dev-python/keep-2.10.1-r1
index abdfe6851a13..3da10f782ee1 100644
--- a/metadata/md5-cache/dev-python/keep-2.10.1-r1
+++ b/metadata/md5-cache/dev-python/keep-2.10.1-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/keep/ https://github.com/orkohunter/keep
 INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PyGithub[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/terminaltables[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/k/keep/keep-2.10.1.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=7b01b5dfa0480b3630bb511f6deac423
+_md5_=f27222fa946bb75d4133e1dd3542ce2c
diff --git a/metadata/md5-cache/dev-python/kiwisolver-1.4.3 b/metadata/md5-cache/dev-python/kiwisolver-1.4.3
new file mode 100644
index 000000000000..80b5ef16caba
--- /dev/null
+++ b/metadata/md5-cache/dev-python/kiwisolver-1.4.3
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/cppy-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools_scm-3.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/cppy-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=An efficient C++ implementation of the Cassowary constraint solving algorithm
+EAPI=8
+HOMEPAGE=https://github.com/nucleic/kiwi/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=Clear-BSD
+RDEPEND=>=dev-python/cppy-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/nucleic/kiwi/archive/1.4.3.tar.gz -> kiwi-1.4.3.gh.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=2032b5eb782b7b89ced50deed2ad2656
diff --git a/metadata/md5-cache/dev-python/lazy-object-proxy-1.7.1-r1 b/metadata/md5-cache/dev-python/lazy-object-proxy-1.7.1-r1
index 491a3626d2f0..bc96c8047d99 100644
--- a/metadata/md5-cache/dev-python/lazy-object-proxy-1.7.1-r1
+++ b/metadata/md5-cache/dev-python/lazy-object-proxy-1.7.1-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ionelmc/python-lazy-object-proxy https://pypi.org/project/lazy-object-proxy/ https://python-lazy-object-proxy.readthedocs.org/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/lazy-object-proxy/lazy-object-proxy-1.7.1.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=9be127e1c347393641747b68dee61f8e
+_md5_=311b5d54e13ab4c089667d7017ba2970
diff --git a/metadata/md5-cache/dev-python/manuel-1.10.1 b/metadata/md5-cache/dev-python/manuel-1.10.1
deleted file mode 100644
index e054137fceb1..000000000000
--- a/metadata/md5-cache/dev-python/manuel-1.10.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/zope-testing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Lets you mix and match traditional doctests with custom test syntax
-EAPI=7
-HOMEPAGE=https://github.com/benji-york/manuel/ https://pypi.org/project/manuel/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/m/manuel/manuel-1.10.1.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=b9afd6f4a260fa378aca1bc4fe357a86
diff --git a/metadata/md5-cache/dev-python/manuel-1.10.1-r1 b/metadata/md5-cache/dev-python/manuel-1.10.1-r1
deleted file mode 100644
index 3ebfcd48cdc5..000000000000
--- a/metadata/md5-cache/dev-python/manuel-1.10.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/zope-testing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Lets you mix and match traditional doctests with custom test syntax
-EAPI=8
-HOMEPAGE=https://github.com/benji-york/manuel/ https://pypi.org/project/manuel/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/m/manuel/manuel-1.10.1.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=443a0d45329518e27d809c5cffff0fef
diff --git a/metadata/md5-cache/dev-python/manuel-1.11.2 b/metadata/md5-cache/dev-python/manuel-1.11.2
index 8925d8b813a8..937b85c324c7 100644
--- a/metadata/md5-cache/dev-python/manuel-1.11.2
+++ b/metadata/md5-cache/dev-python/manuel-1.11.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/benji-york/manuel/ https://pypi.org/project/manuel/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/manuel/manuel-1.11.2.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=73d0f1802a3450110094002542e14e38
+_md5_=443a0d45329518e27d809c5cffff0fef
diff --git a/metadata/md5-cache/dev-python/markdown-3.3.6 b/metadata/md5-cache/dev-python/markdown-3.3.6
deleted file mode 100644
index d7d984f7416c..000000000000
--- a/metadata/md5-cache/dev-python/markdown-3.3.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytidylib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python implementation of the markdown markup language
-EAPI=8
-HOMEPAGE=https://python-markdown.github.io/ https://pypi.org/project/Markdown/ https://github.com/Python-Markdown/markdown
-INHERIT=distutils-r1
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/M/Markdown/Markdown-3.3.6.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=181f72c564e9a4c797223ddb8ddc02a2
diff --git a/metadata/md5-cache/dev-python/markdown-3.3.7 b/metadata/md5-cache/dev-python/markdown-3.3.7
index b5917294f3db..4f3d2df6bc92 100644
--- a/metadata/md5-cache/dev-python/markdown-3.3.7
+++ b/metadata/md5-cache/dev-python/markdown-3.3.7
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://python-markdown.github.io/ https://pypi.org/project/Markdown/ https://github.com/Python-Markdown/markdown
 INHERIT=distutils-r1
 IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/M/Markdown/Markdown-3.3.7.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=d99ec64a5dfb53b8fc4d42a3f0d71345
+_md5_=6dd5cd0e44951158a5b0e1d658b88ad5
diff --git a/metadata/md5-cache/dev-python/marshmallow-3.15.0 b/metadata/md5-cache/dev-python/marshmallow-3.15.0
deleted file mode 100644
index 1a0fbd85ec7b..000000000000
--- a/metadata/md5-cache/dev-python/marshmallow-3.15.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/simplejson[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A library for converting to and from native Python datatypes
-EAPI=8
-HOMEPAGE=https://github.com/marshmallow-code/marshmallow/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/m/marshmallow/marshmallow-3.15.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=3d4983ae8921404e944fdf22ff8119dd
diff --git a/metadata/md5-cache/dev-python/metakernel-0.28.2-r1 b/metadata/md5-cache/dev-python/metakernel-0.28.2-r1
deleted file mode 100644
index 25313415757c..000000000000
--- a/metadata/md5-cache/dev-python/metakernel-0.28.2-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/ipykernel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter_core[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pexpect-4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Metakernel for Jupyter
-EAPI=8
-HOMEPAGE=https://github.com/Calysto/metakernel
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-python/ipykernel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter_core[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pexpect-4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/m/metakernel/metakernel-0.28.2.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=f789690f8b31164b71d83233f25ff14c
diff --git a/metadata/md5-cache/dev-python/mkautodoc-0.1.0 b/metadata/md5-cache/dev-python/mkautodoc-0.1.0
deleted file mode 100644
index c0447150861b..000000000000
--- a/metadata/md5-cache/dev-python/mkautodoc-0.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/markdown[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Auto documentation for MkDocs
-EAPI=7
-HOMEPAGE=https://github.com/tomchristie/mkautodoc/ https://pypi.org/project/mkautodoc/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/markdown[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tomchristie/mkautodoc/archive/0.1.0.tar.gz -> mkautodoc-0.1.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=36cc5c62cd591db590072f7726d54258
diff --git a/metadata/md5-cache/dev-python/munkres-1.1.4 b/metadata/md5-cache/dev-python/munkres-1.1.4
deleted file mode 100644
index 3b55203edf26..000000000000
--- a/metadata/md5-cache/dev-python/munkres-1.1.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Module implementing munkres algorithm for the Assignment Problem
-EAPI=8
-HOMEPAGE=https://pypi.org/project/munkres/ https://github.com/bmc/munkres
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/bmc/munkres/archive/release-1.1.4.tar.gz -> munkres-1.1.4.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=6f0ad04293686f0702347f84a9e58893
diff --git a/metadata/md5-cache/dev-python/nbdime-3.1.1 b/metadata/md5-cache/dev-python/nbdime-3.1.1
deleted file mode 100644
index bb03e10185df..000000000000
--- a/metadata/md5-cache/dev-python/nbdime-3.1.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/notebook[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/tabulate[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/recommonmark[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/recommonmark[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/recommonmark[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/GitPython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter_server[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter_server_mathjax[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nbformat[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] www-servers/tornado[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] webtools? ( net-libs/nodejs[npm] ) >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Diff and merge of Jupyter Notebooks
-EAPI=8
-HOMEPAGE=https://jupyter.org
-INHERIT=distutils-r1
-IUSE=webtools doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/GitPython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter_server[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter_server_mathjax[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nbformat[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] www-servers/tornado[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] webtools? ( net-libs/nodejs[npm] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/n/nbdime/nbdime-3.1.1.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ea10e8a6f83af5cfb0bd950606664a3c
diff --git a/metadata/md5-cache/dev-python/neovim-remote-2.5.0 b/metadata/md5-cache/dev-python/neovim-remote-2.5.0
deleted file mode 100644
index cdbb698386c0..000000000000
--- a/metadata/md5-cache/dev-python/neovim-remote-2.5.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( app-editors/neovim ) test? ( dev-python/pynvim[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A tool that helps control neovim processes
-EAPI=8
-HOMEPAGE=https://github.com/mhinz/neovim-remote/ https://pypi.org/project/neovim-remote/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm
-LICENSE=MIT
-RDEPEND=dev-python/pynvim[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mhinz/neovim-remote/archive/v2.5.0.tar.gz -> neovim-remote-2.5.0.gh.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=cb89f8cde0a552b755b26c3f1be88aad
diff --git a/metadata/md5-cache/dev-python/networkx-2.8.4 b/metadata/md5-cache/dev-python/networkx-2.8.4
new file mode 100644
index 000000000000..2e02ed454ecc
--- /dev/null
+++ b/metadata/md5-cache/dev-python/networkx-2.8.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/lxml-4.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-3.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-python/numpy-1.19[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/scipy-1.6.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/numpy-1.19[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/scipy-1.6.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/numpy-1.19[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/scipy-1.6.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) test? ( >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Python tools to manipulate graphs and complex networks
+EAPI=8
+HOMEPAGE=https://networkx.org/ https://github.com/networkx/networkx/ https://pypi.org/project/networkx/
+INHERIT=distutils-r1 optfeature virtualx
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=BSD
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/n/networkx/networkx-2.8.4.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
+_md5_=e9380ad85b00f7e4c337ecdeebf38c15
diff --git a/metadata/md5-cache/dev-python/nuitka-0.7.7 b/metadata/md5-cache/dev-python/nuitka-0.7.7
deleted file mode 100644
index 9f9f962eb415..000000000000
--- a/metadata/md5-cache/dev-python/nuitka-0.7.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/scons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-util/ccache ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python to native compiler
-EAPI=8
-HOMEPAGE=https://www.nuitka.net
-INHERIT=distutils-r1 flag-o-matic optfeature
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~loong ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-util/scons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://nuitka.net/releases/Nuitka-0.7.7.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=a74a9f966bba95c284e57252c51c882a
diff --git a/metadata/md5-cache/dev-python/nuitka-0.8 b/metadata/md5-cache/dev-python/nuitka-0.8
deleted file mode 100644
index a414ad16dde1..000000000000
--- a/metadata/md5-cache/dev-python/nuitka-0.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/scons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-util/ccache ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python to native compiler
-EAPI=8
-HOMEPAGE=https://www.nuitka.net
-INHERIT=distutils-r1 flag-o-matic optfeature
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~loong ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-util/scons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://nuitka.net/releases/Nuitka-0.8.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=a74a9f966bba95c284e57252c51c882a
diff --git a/metadata/md5-cache/dev-python/nuitka-0.8.1 b/metadata/md5-cache/dev-python/nuitka-0.8.1
deleted file mode 100644
index 9910142a49ee..000000000000
--- a/metadata/md5-cache/dev-python/nuitka-0.8.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/scons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-util/ccache ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python to native compiler
-EAPI=8
-HOMEPAGE=https://www.nuitka.net
-INHERIT=distutils-r1 flag-o-matic optfeature
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~loong ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-util/scons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://nuitka.net/releases/Nuitka-0.8.1.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=a74a9f966bba95c284e57252c51c882a
diff --git a/metadata/md5-cache/dev-python/nuitka-0.8.2 b/metadata/md5-cache/dev-python/nuitka-0.8.2
deleted file mode 100644
index a2ae1b438e7d..000000000000
--- a/metadata/md5-cache/dev-python/nuitka-0.8.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/scons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-util/ccache ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python to native compiler
-EAPI=8
-HOMEPAGE=https://www.nuitka.net
-INHERIT=distutils-r1 flag-o-matic optfeature
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~loong ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-util/scons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://nuitka.net/releases/Nuitka-0.8.2.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=a74a9f966bba95c284e57252c51c882a
diff --git a/metadata/md5-cache/dev-python/nuitka-0.8.3 b/metadata/md5-cache/dev-python/nuitka-0.8.3
deleted file mode 100644
index 104df83510af..000000000000
--- a/metadata/md5-cache/dev-python/nuitka-0.8.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/scons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-util/ccache ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python to native compiler
-EAPI=8
-HOMEPAGE=https://www.nuitka.net
-INHERIT=distutils-r1 flag-o-matic optfeature
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~loong ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-util/scons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://nuitka.net/releases/Nuitka-0.8.3.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=a74a9f966bba95c284e57252c51c882a
diff --git a/metadata/md5-cache/dev-python/outcome-1.2.0 b/metadata/md5-cache/dev-python/outcome-1.2.0
new file mode 100644
index 000000000000..0235e3fbd13b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/outcome-1.2.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/async_generator[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/attrs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta1-r1:3.11 >=dev-python/sphinx-4.4.0[python_targets_python3_11(-)] dev-python/sphinxcontrib-trio[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/sphinxcontrib-trio[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/sphinxcontrib-trio[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/sphinxcontrib-trio[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.7-r1:0 >=dev-python/sphinx-4.4.0[python_targets_pypy3(-)] dev-python/sphinxcontrib-trio[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Capture the outcome of Python function calls
+EAPI=8
+HOMEPAGE=https://github.com/python-trio/outcome/ https://pypi.org/project/outcome/
+INHERIT=distutils-r1
+IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=|| ( Apache-2.0 MIT )
+RDEPEND=dev-python/attrs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/python-trio/outcome/archive/v1.2.0.tar.gz -> outcome-1.2.0.gh.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=da02e35713db612027e03923b1ff6ccb
diff --git a/metadata/md5-cache/dev-python/pdm-pep517-0.12.4 b/metadata/md5-cache/dev-python/pdm-pep517-0.12.4
deleted file mode 100644
index b3e1c31b370c..000000000000
--- a/metadata/md5-cache/dev-python/pdm-pep517-0.12.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/cerberus-1.3.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/license-expression[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/packaging-21.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tomli-2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-vcs/git ) test? ( >=dev-python/cerberus-1.3.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/license-expression[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/packaging-21.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tomli-2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A PEP 517 backend for PDM that supports PEP 621 metadata
-EAPI=8
-HOMEPAGE=https://pypi.org/project/pdm-pep517/ https://github.com/pdm-project/pdm-pep517/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/cerberus-1.3.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/license-expression[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/packaging-21.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tomli-2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pdm-project/pdm-pep517/archive/0.12.4.tar.gz -> pdm-pep517-0.12.4.gh.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=538517b48f9260f5ad5d345ed7426a2f
diff --git a/metadata/md5-cache/dev-python/pdm-pep517-0.12.5 b/metadata/md5-cache/dev-python/pdm-pep517-0.12.5
deleted file mode 100644
index 04e39e0446d3..000000000000
--- a/metadata/md5-cache/dev-python/pdm-pep517-0.12.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/cerberus-1.3.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/license-expression[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-vcs/git ) test? ( >=dev-python/cerberus-1.3.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/license-expression[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A PEP 517 backend for PDM that supports PEP 621 metadata
-EAPI=8
-HOMEPAGE=https://pypi.org/project/pdm-pep517/ https://github.com/pdm-project/pdm-pep517/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/cerberus-1.3.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/license-expression[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pdm-project/pdm-pep517/archive/0.12.5.tar.gz -> pdm-pep517-0.12.5.gh.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=1022891ef2d1d303256bde9b20e1b7a9
diff --git a/metadata/md5-cache/dev-python/pefile-2021.9.3 b/metadata/md5-cache/dev-python/pefile-2021.9.3
deleted file mode 100644
index 44bb4c74d81d..000000000000
--- a/metadata/md5-cache/dev-python/pefile-2021.9.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Module to read and work with Portable Executable (PE) files
-EAPI=8
-HOMEPAGE=https://github.com/erocarrera/pefile
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/erocarrera/pefile/releases/download/v2021.9.3/pefile-2021.9.3.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=909080211d176598639ff1f902355c04
diff --git a/metadata/md5-cache/dev-python/pipenv-2022.4.8 b/metadata/md5-cache/dev-python/pipenv-2022.4.8
deleted file mode 100644
index 0256be5c7e3f..000000000000
--- a/metadata/md5-cache/dev-python/pipenv-2022.4.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cached-property[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cerberus-1.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/colorama-0.4.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/idna-3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/iso8601[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pexpect-4.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/virtualenv-20.0.35[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/virtualenv-clone[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.26.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tomli-1.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/tomli-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.26.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.36.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zipp-3.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cached-property[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cerberus-1.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/colorama-0.4.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/idna-3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/iso8601[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pexpect-4.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/virtualenv-20.0.35[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/virtualenv-clone[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.26.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tomli-1.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/tomli-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.26.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.36.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zipp-3.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python Development Workflow for Humans
-EAPI=8
-HOMEPAGE=https://github.com/pypa/pipenv https://pypi.org/project/pipenv/
-INHERIT=distutils-r1 multiprocessing
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cached-property[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cerberus-1.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/colorama-0.4.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/idna-3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/iso8601[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pexpect-4.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/virtualenv-20.0.35[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/virtualenv-clone[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.26.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tomli-1.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/tomli-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.26.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.36.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zipp-3.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pypa/pipenv/archive/v2022.4.8.tar.gz -> pipenv-2022.4.8.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=6068626ba2221ea9adf3da22c37463ed
diff --git a/metadata/md5-cache/dev-python/pipenv-2022.5.2-r1 b/metadata/md5-cache/dev-python/pipenv-2022.5.2-r1
deleted file mode 100644
index 50e3051fc141..000000000000
--- a/metadata/md5-cache/dev-python/pipenv-2022.5.2-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cached-property[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cerberus-1.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/colorama-0.4.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/idna-3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/iso8601[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pexpect-4.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20.0.35[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv-clone[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.26.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-2.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.26.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.36.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/zipp-3.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[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(-)?] ) test? ( dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cached-property[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cerberus-1.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/colorama-0.4.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/idna-3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/iso8601[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pexpect-4.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20.0.35[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv-clone[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.26.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-2.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.26.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.36.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/zipp-3.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python Development Workflow for Humans
-EAPI=8
-HOMEPAGE=https://github.com/pypa/pipenv https://pypi.org/project/pipenv/
-INHERIT=distutils-r1 multiprocessing
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cached-property[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cerberus-1.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/colorama-0.4.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/idna-3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/iso8601[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pexpect-4.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20.0.35[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv-clone[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.26.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-2.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.26.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.36.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/zipp-3.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pypa/pipenv/archive/v2022.5.2.tar.gz -> pipenv-2022.5.2.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=76d608ee96e0e4fb0b9545063f98bcba
diff --git a/metadata/md5-cache/dev-python/pivy-0.6.6-r1 b/metadata/md5-cache/dev-python/pivy-0.6.6-r1
deleted file mode 100644
index 4fe6018aac76..000000000000
--- a/metadata/md5-cache/dev-python/pivy-0.6.6-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/swig dev-util/cmake python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/coin-4.0.0 quarter? ( media-libs/quarter ) soqt? ( >=media-libs/SoQt-1.6.0 )
-DESCRIPTION=Coin3D bindings for Python
-EAPI=8
-HOMEPAGE=https://github.com/coin3d/pivy
-INHERIT=distutils-r1
-IUSE=+quarter soqt python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 x86
-LICENSE=ISC
-RDEPEND=>=media-libs/coin-4.0.0 quarter? ( media-libs/quarter ) soqt? ( >=media-libs/SoQt-1.6.0 ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) || ( quarter soqt ) || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/coin3d/pivy/archive/0.6.6.tar.gz -> pivy-0.6.6.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=23ae234fdbb7f1ae11fdb37f2d3d8040
diff --git a/metadata/md5-cache/dev-python/pivy-0.6.7 b/metadata/md5-cache/dev-python/pivy-0.6.7
index c50e183b84b6..19f096630eaf 100644
--- a/metadata/md5-cache/dev-python/pivy-0.6.7
+++ b/metadata/md5-cache/dev-python/pivy-0.6.7
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/coin3d/pivy
 INHERIT=distutils-r1
 IUSE=+quarter soqt test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=ISC
 RDEPEND=>=media-libs/coin-4.0.0 quarter? ( media-libs/quarter ) soqt? ( >=media-libs/SoQt-1.6.0 ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) || ( quarter soqt ) || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/coin3d/pivy/archive/refs/tags/0.6.7.tar.gz -> pivy-0.6.7.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=a7a58dcd427635e5e78d755f33b9e8af
+_md5_=b75f385d2728896b18d18114f0bd787c
diff --git a/metadata/md5-cache/dev-python/platformdirs-2.5.1 b/metadata/md5-cache/dev-python/platformdirs-2.5.1
deleted file mode 100644
index e3105fc4d6c5..000000000000
--- a/metadata/md5-cache/dev-python/platformdirs-2.5.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/appdirs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A small Python module for determining appropriate platform-specific dirs
-EAPI=8
-HOMEPAGE=https://pypi.org/project/platformdirs/ https://github.com/platformdirs/platformdirs/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/platformdirs/platformdirs/archive/2.5.1.tar.gz -> platformdirs-2.5.1.gh.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=4a6cebed3f8068ceafc123d9cedb05d3
diff --git a/metadata/md5-cache/dev-python/platformdirs-2.5.2 b/metadata/md5-cache/dev-python/platformdirs-2.5.2
index ebb2c4c26206..fa0a39ed80d0 100644
--- a/metadata/md5-cache/dev-python/platformdirs-2.5.2
+++ b/metadata/md5-cache/dev-python/platformdirs-2.5.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/platformdirs/ https://github.com/platformdirs/platformdirs/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/platformdirs/platformdirs/archive/2.5.2.tar.gz -> platformdirs-2.5.2.gh.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=135e03e2d796c025f99d9cee33e54294
+_md5_=9e07f0dfe2fadf634a325b9a670bbea2
diff --git a/metadata/md5-cache/dev-python/plotly-5.7.0 b/metadata/md5-cache/dev-python/plotly-5.7.0
deleted file mode 100644
index 9149e3aeb6d1..000000000000
--- a/metadata/md5-cache/dev-python/plotly-5.7.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( python_targets_python3_8? ( dev-python/backports-tempfile[python_targets_python3_8(-)?] ) dev-python/inflect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipykernel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyterlab[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/statsmodels[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xarray[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/pyshp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/scikit-image[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/shapely[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/tenacity-6.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Browser-based graphing library for Python
-EAPI=8
-HOMEPAGE=https://plotly.com/python/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-python/tenacity-6.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/plotly/plotly-5.7.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=199311e8a0d1b8cae1a1dca039e88a9d
diff --git a/metadata/md5-cache/dev-python/plotly-5.8.0 b/metadata/md5-cache/dev-python/plotly-5.8.0
deleted file mode 100644
index 00a79ef3fd63..000000000000
--- a/metadata/md5-cache/dev-python/plotly-5.8.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( python_targets_python3_8? ( dev-python/backports-tempfile[python_targets_python3_8(-)?] ) dev-python/inflect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipykernel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyterlab[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/statsmodels[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xarray[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/pyshp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/scikit-image[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/shapely[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/tenacity-6.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Browser-based graphing library for Python
-EAPI=8
-HOMEPAGE=https://plotly.com/python/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-python/tenacity-6.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/plotly/plotly-5.8.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=0a503b72c67487b0c801515a158d4a8e
diff --git a/metadata/md5-cache/dev-python/proto-plus-1.20.0 b/metadata/md5-cache/dev-python/proto-plus-1.20.0
deleted file mode 100644
index 6534efa92bfb..000000000000
--- a/metadata/md5-cache/dev-python/proto-plus-1.20.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/google-api-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/grpcio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/protobuf-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Beautiful, Pythonic protocol buffers
-EAPI=8
-HOMEPAGE=https://pypi.org/project/proto-plus/ https://github.com/googleapis/proto-plus-python
-INHERIT=distutils-r1
-IUSE=test doc python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/protobuf-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/googleapis/proto-plus-python/archive/v1.20.0.tar.gz -> proto-plus-1.20.0.gh.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=2d516b8e46bcacfc0213f5f68bd73ac5
diff --git a/metadata/md5-cache/dev-python/proto-plus-1.20.1 b/metadata/md5-cache/dev-python/proto-plus-1.20.1
deleted file mode 100644
index d498f1fe30c5..000000000000
--- a/metadata/md5-cache/dev-python/proto-plus-1.20.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/google-api-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/grpcio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/protobuf-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Beautiful, Pythonic protocol buffers
-EAPI=8
-HOMEPAGE=https://pypi.org/project/proto-plus/ https://github.com/googleapis/proto-plus-python
-INHERIT=distutils-r1
-IUSE=test doc python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/protobuf-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/googleapis/proto-plus-python/archive/v1.20.1.tar.gz -> proto-plus-1.20.1.gh.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=6c74260156cbf32293228f12d5a7b891
diff --git a/metadata/md5-cache/dev-python/proto-plus-1.20.6 b/metadata/md5-cache/dev-python/proto-plus-1.20.6
new file mode 100644
index 000000000000..b1e466fc4ee8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/proto-plus-1.20.6
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/google-api-core-1.31.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/grpcio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( <dev-python/protobuf-python-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Beautiful, Pythonic protocol buffers
+EAPI=8
+HOMEPAGE=https://github.com/googleapis/proto-plus-python/ https://pypi.org/project/proto-plus/
+INHERIT=distutils-r1
+IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=<dev-python/protobuf-python-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/googleapis/proto-plus-python/archive/v1.20.6.tar.gz -> proto-plus-1.20.6.gh.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=e28ede09fc6a9ef63907c50d0599b5b1
diff --git a/metadata/md5-cache/dev-python/psycopg-3.0.15 b/metadata/md5-cache/dev-python/psycopg-3.0.15
new file mode 100644
index 000000000000..edf5d7c88f8d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/psycopg-3.0.15
@@ -0,0 +1,17 @@
+BDEPEND=test? ( >=dev-db/postgresql-8.1[server] dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-db/postgresql-8.1:* python_targets_python3_8? ( >=dev-python/backports-zoneinfo-0.2.0[python_targets_python3_8(-)?] ) python_targets_python3_8? ( >=dev-python/typing-extensions-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/typing-extensions-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-db/postgresql-8.1:*
+DESCRIPTION=PostgreSQL database adapter for Python
+EAPI=8
+HOMEPAGE=https://www.psycopg.org/psycopg3/ https://github.com/psycopg/psycopg/ https://pypi.org/project/psycopg/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+LICENSE=LGPL-3+
+RDEPEND=>=dev-db/postgresql-8.1:* python_targets_python3_8? ( >=dev-python/backports-zoneinfo-0.2.0[python_targets_python3_8(-)?] ) python_targets_python3_8? ( >=dev-python/typing-extensions-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/typing-extensions-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/psycopg/psycopg/archive/3.0.15.tar.gz -> psycopg-3.0.15.gh.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=f664f1488b69ffb22eb5b0ed6aa1e376
diff --git a/metadata/md5-cache/dev-python/pyacoustid-1.2.0 b/metadata/md5-cache/dev-python/pyacoustid-1.2.0
deleted file mode 100644
index 9b238c8e073b..000000000000
--- a/metadata/md5-cache/dev-python/pyacoustid-1.2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python bindings for Chromaprint and the AcoustID web service
-EAPI=7
-HOMEPAGE=https://pypi.org/project/pyacoustid/
-INHERIT=distutils-r1
-IUSE=examples python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/audioread[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] media-libs/chromaprint python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pyacoustid/pyacoustid-1.2.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=78626c35f4571f59d817e46fff644463
diff --git a/metadata/md5-cache/dev-python/pybind11-2.9.2-r1 b/metadata/md5-cache/dev-python/pybind11-2.9.2-r1
index 2ec20a2471ae..c4add52a0985 100644
--- a/metadata/md5-cache/dev-python/pybind11-2.9.2-r1
+++ b/metadata/md5-cache/dev-python/pybind11-2.9.2-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pybind11.readthedocs.io/en/stable/ https://github.com/pybind/pybind11/ https://pypi.org/project/pybind11/
 INHERIT=cmake distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=BSD
 RDEPEND=dev-cpp/eigen:3 python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pybind/pybind11/archive/v2.9.2.tar.gz -> pybind11-2.9.2.tar.gz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	distutils-r1	10a93585889c3ca7651cbcd2ee831e47	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=32ff3f106a81b4303dfde23d1e5ad639
+_md5_=a430abce31c57565482ce51a4db90d35
diff --git a/metadata/md5-cache/dev-python/pybtex-docutils-1.0.1 b/metadata/md5-cache/dev-python/pybtex-docutils-1.0.1
deleted file mode 100644
index 0d414cbeecbd..000000000000
--- a/metadata/md5-cache/dev-python/pybtex-docutils-1.0.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pybtex[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta1-r1:3.11 >=dev-python/sphinx-4.4.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A docutils backend for pybtex
-EAPI=8
-HOMEPAGE=https://github.com/mcmtroffaes/pybtex-docutils
-INHERIT=distutils-r1
-IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pybtex[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pybtex-docutils/pybtex-docutils-1.0.1.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=0ceb2a556bccd4eb9c4d9eb08609de95
diff --git a/metadata/md5-cache/dev-python/pycuda-2019.1.2 b/metadata/md5-cache/dev-python/pycuda-2019.1.2
deleted file mode 100644
index 53a411ec35c6..000000000000
--- a/metadata/md5-cache/dev-python/pycuda-2019.1.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( dev-libs/boost:=[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mako[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytools-2013[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-util/nvidia-cuda-toolkit x11-drivers/nvidia-drivers opengl? ( virtual/opengl ) >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mako[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytools-2013[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-util/nvidia-cuda-toolkit x11-drivers/nvidia-drivers opengl? ( virtual/opengl )
-DESCRIPTION=Python wrapper for NVIDIA CUDA
-EAPI=7
-HOMEPAGE=https://mathema.tician.de/software/pycuda/ https://pypi.org/project/pycuda/
-INHERIT=cuda distutils-r1
-IUSE=examples opengl test test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-libs/boost:=[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mako[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytools-2013[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-util/nvidia-cuda-toolkit x11-drivers/nvidia-drivers opengl? ( virtual/opengl ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=userpriv !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pycuda/pycuda-2019.1.2.tar.gz
-_eclasses_=cuda	15edbf8fd9df209322f42c06ecf59a96	distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=0d597a82ea017d8d365321eef951d0f7
diff --git a/metadata/md5-cache/dev-python/pycurl-7.44.1-r1 b/metadata/md5-cache/dev-python/pycurl-7.44.1-r1
index 5fcd1ac88d5a..12fcfacefd10 100644
--- a/metadata/md5-cache/dev-python/pycurl-7.44.1-r1
+++ b/metadata/md5-cache/dev-python/pycurl-7.44.1-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=http://pycurl.io/ https://github.com/pycurl/pycurl/ https://pypi.org/project/pycurl/
 INHERIT=distutils-r1 toolchain-funcs
 IUSE=curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl test test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=LGPL-2.1
 RDEPEND=>=net-misc/curl-7.25.0-r1:=[ssl=] ssl? ( net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)] curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0:= ) curl_ssl_openssl? ( dev-libs/openssl:= ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycurl/pycurl-7.44.1.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=0c7099e68cd0c57e70faffeb1d6380ae
+_md5_=69bbd44e75d42d1577c5d3228783b6bf
diff --git a/metadata/md5-cache/dev-python/pydantic-1.9.1 b/metadata/md5-cache/dev-python/pydantic-1.9.1
index 7b5ff8bd5cb2..0123043316b8 100644
--- a/metadata/md5-cache/dev-python/pydantic-1.9.1
+++ b/metadata/md5-cache/dev-python/pydantic-1.9.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/samuelcolvin/pydantic
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/typing-extensions[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pydantic/pydantic-1.9.1.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=1fd44456a6de0e413692094e2d09c20a
+_md5_=4750600c18b58c22e986d527f54f3cb7
diff --git a/metadata/md5-cache/dev-python/pydevd-2.8.0-r1 b/metadata/md5-cache/dev-python/pydevd-2.8.0-r1
index 317212f58852..2227983632ce 100644
--- a/metadata/md5-cache/dev-python/pydevd-2.8.0-r1
+++ b/metadata/md5-cache/dev-python/pydevd-2.8.0-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/fabioz/PyDev.Debugger/
 INHERIT=distutils-r1 toolchain-funcs
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=EPL-1.0
 RDEPEND=!<dev-python/debugpy-1.4.2 sys-devel/gdb python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fabioz/PyDev.Debugger/archive/pydev_debugger_2_8_0.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=1cc8213a93f984981662d0dbe3681449
+_md5_=731a526d8db4e05544dd33a0f4c052e3
diff --git a/metadata/md5-cache/dev-python/pydotplus-2.0.2 b/metadata/md5-cache/dev-python/pydotplus-2.0.2
deleted file mode 100644
index 5c01a11c9958..000000000000
--- a/metadata/md5-cache/dev-python/pydotplus-2.0.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pyparsing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-gfx/graphviz dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Improved version of the old pydot project
-EAPI=7
-HOMEPAGE=https://pydotplus.readthedocs.org/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/pyparsing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-gfx/graphviz python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pydotplus/pydotplus-2.0.2.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=010392e3a4088ffe9c74f53c4b511174
diff --git a/metadata/md5-cache/dev-python/pydyf-0.1.2 b/metadata/md5-cache/dev-python/pydyf-0.1.2
deleted file mode 100644
index 61c48250bf88..000000000000
--- a/metadata/md5-cache/dev-python/pydyf-0.1.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( app-text/ghostscript-gpl dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/pyproject2setuppy-22[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A low-level PDF generator
-EAPI=8
-HOMEPAGE=https://pypi.org/project/pydyf/ https://github.com/CourtBouillon/pydyf/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/CourtBouillon/pydyf/archive/v0.1.2.tar.gz -> pydyf-0.1.2.gh.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=fd23dc08e7ae253cb0c004dcf95738c5
diff --git a/metadata/md5-cache/dev-python/pyghmi-1.5.42 b/metadata/md5-cache/dev-python/pyghmi-1.5.42
deleted file mode 100644
index 03bb68e2fa57..000000000000
--- a/metadata/md5-cache/dev-python/pyghmi-1.5.42
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/fixtures-3.0.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/sphinx-1.6.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/subunit-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/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/cryptography-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A pure python implementation of IPMI protocol
-EAPI=8
-HOMEPAGE=https://opendev.org/x/pyghmi/ https://pypi.org/project/pyghmi/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/cryptography-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pyghmi/pyghmi-1.5.42.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=c2f9f76cea3d11599a7bb56cc4ee84ef
diff --git a/metadata/md5-cache/dev-python/pyghmi-1.5.43 b/metadata/md5-cache/dev-python/pyghmi-1.5.43
deleted file mode 100644
index e898487b3a9e..000000000000
--- a/metadata/md5-cache/dev-python/pyghmi-1.5.43
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/fixtures-3.0.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/sphinx-1.6.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/subunit-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/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/cryptography-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A pure python implementation of IPMI protocol
-EAPI=8
-HOMEPAGE=https://opendev.org/x/pyghmi/ https://pypi.org/project/pyghmi/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/cryptography-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pyghmi/pyghmi-1.5.43.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=c2f9f76cea3d11599a7bb56cc4ee84ef
diff --git a/metadata/md5-cache/dev-python/pyghmi-1.5.45 b/metadata/md5-cache/dev-python/pyghmi-1.5.45
deleted file mode 100644
index 707655288dbf..000000000000
--- a/metadata/md5-cache/dev-python/pyghmi-1.5.45
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/fixtures-3.0.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/sphinx-1.6.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/subunit-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/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/cryptography-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A pure python implementation of IPMI protocol
-EAPI=8
-HOMEPAGE=https://opendev.org/x/pyghmi/ https://pypi.org/project/pyghmi/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/cryptography-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pyghmi/pyghmi-1.5.45.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=c2f9f76cea3d11599a7bb56cc4ee84ef
diff --git a/metadata/md5-cache/dev-python/pyghmi-1.5.44 b/metadata/md5-cache/dev-python/pyghmi-1.5.47
similarity index 98%
rename from metadata/md5-cache/dev-python/pyghmi-1.5.44
rename to metadata/md5-cache/dev-python/pyghmi-1.5.47
index b6fbcf78f178..709b2e9bb886 100644
--- a/metadata/md5-cache/dev-python/pyghmi-1.5.44
+++ b/metadata/md5-cache/dev-python/pyghmi-1.5.47
@@ -11,6 +11,6 @@ RDEPEND=>=dev-python/cryptography-2.1[python_targets_python3_8(-)?,python_target
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/pyghmi/pyghmi-1.5.44.tar.gz
+SRC_URI=mirror://pypi/p/pyghmi/pyghmi-1.5.47.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
 _md5_=c2f9f76cea3d11599a7bb56cc4ee84ef
diff --git a/metadata/md5-cache/dev-python/pyglet-1.5.23 b/metadata/md5-cache/dev-python/pyglet-1.5.23
deleted file mode 100644
index a165dd6817d4..000000000000
--- a/metadata/md5-cache/dev-python/pyglet-1.5.23
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-libs/fontconfig ) test? ( virtual/glu virtual/opengl image? ( || ( dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/gtk+:2 ) ) sound? ( || ( media-libs/openal media-sound/pulseaudio ) ) >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Cross-platform windowing and multimedia library for Python
-EAPI=8
-HOMEPAGE=http://pyglet.org/
-INHERIT=distutils-r1 virtualx xdg-utils
-IUSE=examples image +sound test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=virtual/glu virtual/opengl image? ( || ( dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/gtk+:2 ) ) sound? ( || ( media-libs/openal media-sound/pulseaudio ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pyglet/pyglet/archive/v1.5.23.tar.gz -> pyglet-1.5.23.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=08e8b030236345c09eb89aedecd06b39
diff --git a/metadata/md5-cache/dev-python/pyglet-1.5.24 b/metadata/md5-cache/dev-python/pyglet-1.5.24
deleted file mode 100644
index 5337df09f23d..000000000000
--- a/metadata/md5-cache/dev-python/pyglet-1.5.24
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-libs/fontconfig ) test? ( virtual/glu virtual/opengl image? ( || ( dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/gtk+:2 ) ) sound? ( || ( media-libs/openal media-sound/pulseaudio ) ) >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Cross-platform windowing and multimedia library for Python
-EAPI=8
-HOMEPAGE=https://pyglet.org/ https://github.com/pyglet/pyglet/ https://pypi.org/project/pyglet/
-INHERIT=distutils-r1 virtualx xdg-utils
-IUSE=examples image +sound test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=virtual/glu virtual/opengl image? ( || ( dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/gtk+:2 ) ) sound? ( || ( media-libs/openal media-sound/pulseaudio ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pyglet/pyglet/archive/v1.5.24.tar.gz -> pyglet-1.5.24.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=0cc06a0c6d026180f2162a9986965935
diff --git a/metadata/md5-cache/dev-python/pyglet-1.5.26 b/metadata/md5-cache/dev-python/pyglet-1.5.26
index b88c62dc00c2..13eaf09cc323 100644
--- a/metadata/md5-cache/dev-python/pyglet-1.5.26
+++ b/metadata/md5-cache/dev-python/pyglet-1.5.26
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pyglet.org/ https://github.com/pyglet/pyglet/ https://pypi.org/project/pyglet/
 INHERIT=distutils-r1 virtualx xdg-utils
 IUSE=examples image +sound test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=virtual/glu virtual/opengl image? ( || ( dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/gtk+:2 ) ) sound? ( || ( media-libs/openal media-sound/pulseaudio ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pyglet/pyglet/archive/v1.5.26.tar.gz -> pyglet-1.5.26.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=0cc06a0c6d026180f2162a9986965935
+_md5_=3f1bd2f5c0499242ac612ac159206422
diff --git a/metadata/md5-cache/dev-python/pykka-3.0.2 b/metadata/md5-cache/dev-python/pykka-3.0.2
deleted file mode 100644
index f9075df14a00..000000000000
--- a/metadata/md5-cache/dev-python/pykka-3.0.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/pyproject2setuppy-22[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Python implementation of the actor model
-EAPI=8
-HOMEPAGE=https://www.pykka.org/en/latest/ https://github.com/jodal/pykka/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/jodal/pykka/archive/v3.0.2.tar.gz -> pykka-3.0.2.gh.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=1d4de277138c81aedc4f24f686bd22e5
diff --git a/metadata/md5-cache/dev-python/pylint-2.14.2 b/metadata/md5-cache/dev-python/pylint-2.14.2
new file mode 100644
index 000000000000..bbd76dbcfa21
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pylint-2.14.2
@@ -0,0 +1,16 @@
+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/tomli-1.1.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(-)?] ) >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=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/tomli-1.1.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-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pycqa/pylint/archive/v2.14.2.tar.gz -> pylint-2.14.2.gh.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=087284ab0c3a998fd1fdcc3a84a1d61e
diff --git a/metadata/md5-cache/dev-python/pymetar-1.4 b/metadata/md5-cache/dev-python/pymetar-1.4
deleted file mode 100644
index 9a80cd41f11d..000000000000
--- a/metadata/md5-cache/dev-python/pymetar-1.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Downloads and decodes to the weather report for a given station ID
-EAPI=7
-HOMEPAGE=https://www.schwarzvogel.de/software/pymetar/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://www.schwarzvogel.de/pkgs/pymetar-1.4.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=aadde7ef1a2b267d0f055031ff4c4749
diff --git a/metadata/md5-cache/dev-python/pynacl-1.5.0-r1 b/metadata/md5-cache/dev-python/pynacl-1.5.0-r1
index 1873dbd104be..d3e463206c6c 100644
--- a/metadata/md5-cache/dev-python/pynacl-1.5.0-r1
+++ b/metadata/md5-cache/dev-python/pynacl-1.5.0-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pyca/pynacl/ https://pypi.org/project/PyNaCl/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cffi-1.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-libs/libsodium:0/23 python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pyca/pynacl/archive/1.5.0.tar.gz -> pynacl-1.5.0.gh.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=356ba1e949c10890b649322824fe2ed8
+_md5_=d3782d1ff9b7268c2b93daa19b79d11f
diff --git a/metadata/md5-cache/dev-python/pyotp-2.6.0 b/metadata/md5-cache/dev-python/pyotp-2.6.0
deleted file mode 100644
index 4c181249090d..000000000000
--- a/metadata/md5-cache/dev-python/pyotp-2.6.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=PyOTP is a Python library for generating and verifying one-time passwords
-EAPI=7
-HOMEPAGE=https://github.com/pyauth/pyotp https://pypi.org/project/pyotp/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pyotp/pyotp-2.6.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=e2a5a433ba6fe19b456f959a3fbb811f
diff --git a/metadata/md5-cache/dev-python/pyprof2calltree-1.4.5 b/metadata/md5-cache/dev-python/pyprof2calltree-1.4.5
deleted file mode 100644
index f482a4961cb5..000000000000
--- a/metadata/md5-cache/dev-python/pyprof2calltree-1.4.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=convert python profile data to kcachegrind calltree form
-EAPI=7
-HOMEPAGE=https://pypi.org/project/pyprof2calltree/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/pwaller/pyprof2calltree/archive/v1.4.5.tar.gz -> pyprof2calltree-1.4.5.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=26e0a0181a6b85c1762f99511fe87ce0
diff --git a/metadata/md5-cache/dev-python/pypy3-7.3.9 b/metadata/md5-cache/dev-python/pypy3-7.3.9
deleted file mode 100644
index 120503cfe601..000000000000
--- a/metadata/md5-cache/dev-python/pypy3-7.3.9
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=|| ( >=dev-python/pypy3-exe-7.3.9:3.9-7.3.9[bzip2?,ncurses?] >=dev-python/pypy3-exe-bin-7.3.9:3.9-7.3.9 ) dev-lang/python-exec[python_targets_pypy3(-)] dev-libs/openssl:0= gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !<dev-python/pypy3-bin-7.3.0:0 test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) !!dev-python/pytest-forked )
-DESCRIPTION=A fast, compliant alternative implementation of the Python (3.9) language
-EAPI=8
-HOMEPAGE=https://www.pypy.org/
-INHERIT=pax-utils python-any-r1 toolchain-funcs
-IUSE=bzip2 gdbm +jit ncurses sqlite test tk
-KEYWORDS=amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=|| ( >=dev-python/pypy3-exe-7.3.9:3.9-7.3.9[bzip2?,ncurses?] >=dev-python/pypy3-exe-bin-7.3.9:3.9-7.3.9 ) dev-lang/python-exec[python_targets_pypy3(-)] dev-libs/openssl:0= gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !<dev-python/pypy3-bin-7.3.0:0
-RESTRICT=test
-SLOT=0/pypy39-pp73
-SRC_URI=https://buildbot.pypy.org/pypy/pypy3.9-v7.3.9-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/pypy3.9-gentoo-patches-7.3.9.tar.xz
-_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=179aff2f4687690eb0d9e13b56d17773
diff --git a/metadata/md5-cache/dev-python/pypy3-7.3.9_p1 b/metadata/md5-cache/dev-python/pypy3-7.3.9_p1
index e0e802f0a732..3e3c2c0de983 100644
--- a/metadata/md5-cache/dev-python/pypy3-7.3.9_p1
+++ b/metadata/md5-cache/dev-python/pypy3-7.3.9_p1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.pypy.org/
 INHERIT=pax-utils python-any-r1 toolchain-funcs
 IUSE=bzip2 gdbm +jit ncurses sqlite test tk
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=|| ( >=dev-python/pypy3-exe-7.3.9:3.9-7.3.9[bzip2?,ncurses?] >=dev-python/pypy3-exe-bin-7.3.9:3.9-7.3.9 ) dev-lang/python-exec[python_targets_pypy3(-)] dev-libs/openssl:0= gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !<dev-python/pypy3-bin-7.3.0:0
 RESTRICT=test
 SLOT=0/pypy39-pp73
 SRC_URI=https://buildbot.pypy.org/pypy/pypy3.9-v7.3.9-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/pypy3.9-gentoo-patches-7.3.9_p1.tar.xz
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=3534207d80e581c30dad62994c825131
+_md5_=179aff2f4687690eb0d9e13b56d17773
diff --git a/metadata/md5-cache/dev-python/pyquery-1.4.3 b/metadata/md5-cache/dev-python/pyquery-1.4.3
deleted file mode 100644
index 523b22406453..000000000000
--- a/metadata/md5-cache/dev-python/pyquery-1.4.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( >=dev-python/lxml-2.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >dev-python/cssselect-0.7.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/webob-1.1.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=test? ( dev-python/beautifulsoup4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/webtest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
-DESCRIPTION=A jQuery-like library for python
-EAPI=7
-HOMEPAGE=https://github.com/gawel/pyquery
-INHERIT=distutils-r1 optfeature
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=BSD
-RDEPEND=>=dev-python/lxml-2.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >dev-python/cssselect-0.7.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/webob-1.1.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pyquery/pyquery-1.4.3.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=8f6d78ba2154db3aafe510c0b6cb7633
diff --git a/metadata/md5-cache/dev-python/pyquery-1.4.3-r1 b/metadata/md5-cache/dev-python/pyquery-1.4.3-r1
index 6071e31ebe69..8e4dd611a394 100644
--- a/metadata/md5-cache/dev-python/pyquery-1.4.3-r1
+++ b/metadata/md5-cache/dev-python/pyquery-1.4.3-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/gawel/pyquery/ https://pypi.org/project/pyquery/
 INHERIT=distutils-r1 optfeature
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=BSD
 RDEPEND=>=dev-python/lxml-2.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/cssselect-0.7.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/webob-1.1.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyquery/pyquery-1.4.3.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=61048686caed2149b15ad9f1ae8839a8
+_md5_=292f2f65cb85c40b81795ca0213cfe81
diff --git a/metadata/md5-cache/dev-python/pyroute2-0.5.19 b/metadata/md5-cache/dev-python/pyroute2-0.5.19
new file mode 100644
index 000000000000..35a419d2e74f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyroute2-0.5.19
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] ) >=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=A pure Python netlink and Linux network configuration library
+EAPI=8
+HOMEPAGE=https://github.com/svinota/pyroute2
+INHERIT=distutils-r1
+IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/svinota/pyroute2/archive/0.5.19.tar.gz -> pyroute2-0.5.19.gh.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=76659b87ac65109835e427518c437362
diff --git a/metadata/md5-cache/dev-python/pyrsistent-0.18.1-r1 b/metadata/md5-cache/dev-python/pyrsistent-0.18.1-r1
index 27d99f1f854b..010cfbb57541 100644
--- a/metadata/md5-cache/dev-python/pyrsistent-0.18.1-r1
+++ b/metadata/md5-cache/dev-python/pyrsistent-0.18.1-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/tobgu/pyrsistent/ https://pypi.org/project/pyrsistent/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyrsistent/pyrsistent-0.18.1.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=e0cb58533a4b64db8ff508d2b2bbeeef
+_md5_=be22f4f308bbd918f300ca1749a7f1da
diff --git a/metadata/md5-cache/dev-python/pysimdjson-4.0.3-r1 b/metadata/md5-cache/dev-python/pysimdjson-4.0.3-r1
deleted file mode 100644
index ba86fdeb15bd..000000000000
--- a/metadata/md5-cache/dev-python/pysimdjson-4.0.3-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( <dev-libs/simdjson-1.1:= >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=<dev-libs/simdjson-1.1:=
-DESCRIPTION=Python bindings for simdjson
-EAPI=8
-HOMEPAGE=https://github.com/TkTech/pysimdjson/ https://pypi.org/project/pysimdjson/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT Apache-2.0
-RDEPEND=<dev-libs/simdjson-1.1:= python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/TkTech/pysimdjson/archive/v4.0.3.tar.gz -> pysimdjson-4.0.3.gh.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=30684082340d9c8037d4bdc2b24038ef
diff --git a/metadata/md5-cache/dev-python/pysvg-0.2.2_p3 b/metadata/md5-cache/dev-python/pysvg-0.2.2_p3
deleted file mode 100644
index c8d0ccd5f31d..000000000000
--- a/metadata/md5-cache/dev-python/pysvg-0.2.2_p3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python SVG document creation library
-EAPI=7
-HOMEPAGE=https://github.com/alorence/pysvg-py3
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pysvg-py3/pysvg-py3-0.2.2.post3.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=fae5e2b57a0353740b9fbcc000c2bd8f
diff --git a/metadata/md5-cache/dev-python/pytest-codeblocks-0.15.0 b/metadata/md5-cache/dev-python/pytest-codeblocks-0.15.0
deleted file mode 100644
index 688d73fb8364..000000000000
--- a/metadata/md5-cache/dev-python/pytest-codeblocks-0.15.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/pytest-7.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Extract code blocks from markdown
-EAPI=8
-HOMEPAGE=https://github.com/nschloe/pytest-codeblocks/ https://pypi.org/project/pytest_codeblocks/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/nschloe/pytest-codeblocks/archive/v0.15.0.tar.gz -> pytest-codeblocks-0.15.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=529479400e5a1c069686ba3dae49dd10
diff --git a/metadata/md5-cache/dev-python/pytest-codeblocks-0.16.0 b/metadata/md5-cache/dev-python/pytest-codeblocks-0.16.0
deleted file mode 100644
index 8d8b8dc14880..000000000000
--- a/metadata/md5-cache/dev-python/pytest-codeblocks-0.16.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-7.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Extract code blocks from markdown
-EAPI=8
-HOMEPAGE=https://github.com/nschloe/pytest-codeblocks/ https://pypi.org/project/pytest_codeblocks/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/pytest-7.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/nschloe/pytest-codeblocks/archive/v0.16.0.tar.gz -> pytest-codeblocks-0.16.0.gh.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=abdc685c988db5f3fa27d201d532cab5
diff --git a/metadata/md5-cache/dev-python/pytest-describe-2.0.1 b/metadata/md5-cache/dev-python/pytest-describe-2.0.1
deleted file mode 100644
index f6a4a567c1fd..000000000000
--- a/metadata/md5-cache/dev-python/pytest-describe-2.0.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-2.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Describe-style plugin for pytest
-EAPI=8
-HOMEPAGE=https://github.com/pytest-dev/pytest-describe/ https://pypi.org/project/pytest-describe/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=MIT
-RDEPEND=>=dev-python/pytest-2.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pytest-describe/pytest-describe-2.0.1.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=51b6eeb4bc332826784987d4159ac8bf
diff --git a/metadata/md5-cache/dev-python/pytest-describe-2.0.1-r1 b/metadata/md5-cache/dev-python/pytest-describe-2.0.1-r1
index b8b371f2f189..b4e8c239a50d 100644
--- a/metadata/md5-cache/dev-python/pytest-describe-2.0.1-r1
+++ b/metadata/md5-cache/dev-python/pytest-describe-2.0.1-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pytest-dev/pytest-describe/ https://pypi.org/project/pytest-describe/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/pytest-2.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-describe/pytest-describe-2.0.1.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=9e5f919268b6a143eb49485d49cd6fe9
+_md5_=fcd8ceb52b5ea303eedf22008c62f67d
diff --git a/metadata/md5-cache/dev-python/pytest-env-0.6.2 b/metadata/md5-cache/dev-python/pytest-env-0.6.2
deleted file mode 100644
index 7cd29dc83934..000000000000
--- a/metadata/md5-cache/dev-python/pytest-env-0.6.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=py.test plugin that allows you to add environment variables
-EAPI=7
-HOMEPAGE=https://github.com/MobileDynasty/pytest-env
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~hppa ~ppc ~ppc64 x86
-LICENSE=MIT
-RDEPEND=dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pytest-env/pytest-env-0.6.2.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=7b0494376d2361e42f89a67b9213a6b3
diff --git a/metadata/md5-cache/dev-python/pytest-env-0.6.2-r1 b/metadata/md5-cache/dev-python/pytest-env-0.6.2-r1
index 48f2bcedad27..bfee7c0770c4 100644
--- a/metadata/md5-cache/dev-python/pytest-env-0.6.2-r1
+++ b/metadata/md5-cache/dev-python/pytest-env-0.6.2-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/MobileDynasty/pytest-env
 INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~hppa ~ppc ~ppc64 x86
 LICENSE=MIT
 RDEPEND=dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-env/pytest-env-0.6.2.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=a4d1f80155e8b575d9e322a40e3848e2
+_md5_=62242c220600c270f853dc867c08f196
diff --git a/metadata/md5-cache/dev-python/pytest-faulthandler-2.0.1 b/metadata/md5-cache/dev-python/pytest-faulthandler-2.0.1
deleted file mode 100644
index 3da5fc5fa968..000000000000
--- a/metadata/md5-cache/dev-python/pytest-faulthandler-2.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Pytest plugin that activates the fault handler module for tests
-EAPI=7
-HOMEPAGE=https://github.com/pytest-dev/pytest-faulthandler
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=>=dev-python/pytest-5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/pytest-dev/pytest-faulthandler/archive/2.0.1.tar.gz -> pytest-faulthandler-2.0.1.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=2484c7409cfc2b05d32c570540ccfd0e
diff --git a/metadata/md5-cache/dev-python/pytest-faulthandler-2.0.1-r1 b/metadata/md5-cache/dev-python/pytest-faulthandler-2.0.1-r1
index 5daefb013e7b..ec967537c4db 100644
--- a/metadata/md5-cache/dev-python/pytest-faulthandler-2.0.1-r1
+++ b/metadata/md5-cache/dev-python/pytest-faulthandler-2.0.1-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/pytest-dev/pytest-faulthandler
 INHERIT=distutils-r1
 IUSE=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/pytest-5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/pytest-dev/pytest-faulthandler/archive/2.0.1.tar.gz -> pytest-faulthandler-2.0.1.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=66ec3c82d292731778e768351fb74ecb
+_md5_=009e2d15e8523dcaebcd48a4ca5bdf82
diff --git a/metadata/md5-cache/dev-python/pytest-plus-0.2 b/metadata/md5-cache/dev-python/pytest-plus-0.2
deleted file mode 100644
index 96538d61d660..000000000000
--- a/metadata/md5-cache/dev-python/pytest-plus-0.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools_scm_git_archive[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=PyTest Plus Plugin - extends pytest functionality
-EAPI=7
-HOMEPAGE=https://github.com/pytest-dev/pytest-plus
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~riscv
-LICENSE=MIT
-RDEPEND=dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pytest-plus/pytest-plus-0.2.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=a4a6aad7be05322eefb03c1e0b80af5f
diff --git a/metadata/md5-cache/dev-python/pytest-shell-utilities-1.0.5 b/metadata/md5-cache/dev-python/pytest-shell-utilities-1.0.5
deleted file mode 100644
index 033f39868fc1..000000000000
--- a/metadata/md5-cache/dev-python/pytest-shell-utilities-1.0.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/pytest-subtests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-helpers-namespace[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-skip-markers[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=pytest plugin: fixtures and code to help with running shell commands on tests
-EAPI=8
-HOMEPAGE=https://pypi.org/project/pytest-shell-utilities/ https://github.com/saltstack/pytest-shell-utilities
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pytest-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-helpers-namespace[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-skip-markers[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/saltstack/pytest-shell-utilities/archive/refs/tags/1.0.5.tar.gz -> pytest-shell-utilities-1.0.5.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=958a5ecbd053879546521011c64512ba
diff --git a/metadata/md5-cache/dev-python/pytest-shell-utilities-1.1.0 b/metadata/md5-cache/dev-python/pytest-shell-utilities-1.1.0
deleted file mode 100644
index f10a7b6c7d2a..000000000000
--- a/metadata/md5-cache/dev-python/pytest-shell-utilities-1.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/pytest-subtests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-helpers-namespace[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-skip-markers[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=pytest plugin: fixtures and code to help with running shell commands on tests
-EAPI=8
-HOMEPAGE=https://pypi.org/project/pytest-shell-utilities/ https://github.com/saltstack/pytest-shell-utilities
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pytest-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-helpers-namespace[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-skip-markers[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/saltstack/pytest-shell-utilities/archive/1.1.0.tar.gz -> pytest-shell-utilities-1.1.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=de7c07eb5fbc7c2353578712c7c1f8c4
diff --git a/metadata/md5-cache/dev-python/pytest-shell-utilities-1.2.0 b/metadata/md5-cache/dev-python/pytest-shell-utilities-1.2.0
deleted file mode 100644
index 151db2d132c2..000000000000
--- a/metadata/md5-cache/dev-python/pytest-shell-utilities-1.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/pytest-subtests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-helpers-namespace[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-skip-markers[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=pytest plugin: fixtures and code to help with running shell commands on tests
-EAPI=8
-HOMEPAGE=https://pypi.org/project/pytest-shell-utilities/ https://github.com/saltstack/pytest-shell-utilities/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pytest-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-helpers-namespace[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-skip-markers[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/saltstack/pytest-shell-utilities/archive/1.2.0.tar.gz -> pytest-shell-utilities-1.2.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=2a0fd8e6047e554dff78d8ff3e72b187
diff --git a/metadata/md5-cache/dev-python/pytest-shell-utilities-1.2.1 b/metadata/md5-cache/dev-python/pytest-shell-utilities-1.2.1
deleted file mode 100644
index dd0ff017a352..000000000000
--- a/metadata/md5-cache/dev-python/pytest-shell-utilities-1.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/pytest-subtests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-helpers-namespace[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-skip-markers[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=pytest plugin: fixtures and code to help with running shell commands on tests
-EAPI=8
-HOMEPAGE=https://pypi.org/project/pytest-shell-utilities/ https://github.com/saltstack/pytest-shell-utilities/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pytest-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-helpers-namespace[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-skip-markers[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/saltstack/pytest-shell-utilities/archive/1.2.1.tar.gz -> pytest-shell-utilities-1.2.1.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=2a0fd8e6047e554dff78d8ff3e72b187
diff --git a/metadata/md5-cache/dev-python/pytest-shell-utilities-1.3.0 b/metadata/md5-cache/dev-python/pytest-shell-utilities-1.3.0
deleted file mode 100644
index 8603db907db7..000000000000
--- a/metadata/md5-cache/dev-python/pytest-shell-utilities-1.3.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/pytest-subtests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-helpers-namespace[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-skip-markers[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=pytest plugin: fixtures and code to help with running shell commands on tests
-EAPI=8
-HOMEPAGE=https://pypi.org/project/pytest-shell-utilities/ https://github.com/saltstack/pytest-shell-utilities/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pytest-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-helpers-namespace[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-skip-markers[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/saltstack/pytest-shell-utilities/archive/1.3.0.tar.gz -> pytest-shell-utilities-1.3.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=2a0fd8e6047e554dff78d8ff3e72b187
diff --git a/metadata/md5-cache/dev-python/pytest-shell-utilities-1.4.0 b/metadata/md5-cache/dev-python/pytest-shell-utilities-1.4.0
deleted file mode 100644
index 33700d2c99ec..000000000000
--- a/metadata/md5-cache/dev-python/pytest-shell-utilities-1.4.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/pytest-subtests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-helpers-namespace[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-skip-markers[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=pytest plugin: fixtures and code to help with running shell commands on tests
-EAPI=8
-HOMEPAGE=https://pypi.org/project/pytest-shell-utilities/ https://github.com/saltstack/pytest-shell-utilities/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pytest-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-helpers-namespace[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-skip-markers[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/saltstack/pytest-shell-utilities/archive/1.4.0.tar.gz -> pytest-shell-utilities-1.4.0.gh.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=fbfd6478ef3b198defdc92927cfef815
diff --git a/metadata/md5-cache/dev-python/pytest-shell-utilities-1.5.0 b/metadata/md5-cache/dev-python/pytest-shell-utilities-1.5.0
index 459eea2d7988..d29c109bb7c8 100644
--- a/metadata/md5-cache/dev-python/pytest-shell-utilities-1.5.0
+++ b/metadata/md5-cache/dev-python/pytest-shell-utilities-1.5.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/pytest-shell-utilities/ https://github.com/saltstack/pytest-shell-utilities/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pytest-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-helpers-namespace[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-skip-markers[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/saltstack/pytest-shell-utilities/archive/1.5.0.tar.gz -> pytest-shell-utilities-1.5.0.gh.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=fbfd6478ef3b198defdc92927cfef815
+_md5_=580fa8aeb629c7fadefc295fdfb0274d
diff --git a/metadata/md5-cache/dev-python/pytest-subtesthack-0.1.2-r1 b/metadata/md5-cache/dev-python/pytest-subtesthack-0.1.2-r1
deleted file mode 100644
index ee3e5a1e1d35..000000000000
--- a/metadata/md5-cache/dev-python/pytest-subtesthack-0.1.2-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/hypothesis[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
-DESCRIPTION=A hack for test fixtures, needed for hypothesis inside py.test
-EAPI=8
-HOMEPAGE=https://github.com/untitaker/pytest-subtesthack/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
-LICENSE=public-domain
-RDEPEND=dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/untitaker/pytest-subtesthack/archive/0.1.2.tar.gz -> pytest-subtesthack-0.1.2.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=2f7b5b41d0d9664ff82e6f7b0555f893
diff --git a/metadata/md5-cache/dev-python/python-bugzilla-3.2.0 b/metadata/md5-cache/dev-python/python-bugzilla-3.2.0
deleted file mode 100644
index 709f81d8a60b..000000000000
--- a/metadata/md5-cache/dev-python/python-bugzilla-3.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( || ( dev-python/python-magic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-apps/file[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A python module for interacting with Bugzilla over XMLRPC
-EAPI=8
-HOMEPAGE=https://github.com/python-bugzilla/python-bugzilla
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=GPL-2+
-RDEPEND=|| ( dev-python/python-magic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-apps/file[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-bugzilla/python-bugzilla-3.2.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=c1eccc9ef27c5d290d8b1402dbaa6be0
diff --git a/metadata/md5-cache/dev-python/python-bugzilla-3.2.0-r1 b/metadata/md5-cache/dev-python/python-bugzilla-3.2.0-r1
index d855ed8ea838..6a97660edb1e 100644
--- a/metadata/md5-cache/dev-python/python-bugzilla-3.2.0-r1
+++ b/metadata/md5-cache/dev-python/python-bugzilla-3.2.0-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/python-bugzilla/python-bugzilla/ https://pypi.org/project/python-bugzilla/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2+
 RDEPEND=|| ( dev-python/python-magic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-apps/file[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-bugzilla/python-bugzilla-3.2.0.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=97d2cdcbc7405e5c681329450910e6d9
+_md5_=e77322c590bc70c53835f80ae4cb1072
diff --git a/metadata/md5-cache/dev-python/python-cstruct-2.1 b/metadata/md5-cache/dev-python/python-cstruct-2.1
deleted file mode 100644
index 1ca8ea4dfb2d..000000000000
--- a/metadata/md5-cache/dev-python/python-cstruct-2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=C-style structs for Python
-EAPI=8
-HOMEPAGE=https://github.com/andreax79/python-cstruct https://pypi.org/project/cstruct/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/andreax79/python-cstruct/archive/v2.1.tar.gz -> python-cstruct-2.1.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=e6565835cb8bbf453533cc71cfe71c56
diff --git a/metadata/md5-cache/dev-python/python-debian-0.1.44 b/metadata/md5-cache/dev-python/python-debian-0.1.44
new file mode 100644
index 000000000000..f85e71dc01d7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-debian-0.1.44
@@ -0,0 +1,16 @@
+BDEPEND=test? ( app-arch/dpkg ) test? ( dev-python/chardet[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python modules to work with Debian-related data formats
+EAPI=8
+HOMEPAGE=https://salsa.debian.org/python-debian-team/python-debian/ https://pypi.org/project/python-debian/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2 GPL-3
+RDEPEND=dev-python/chardet[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://debian/pool/main/p/python-debian/python-debian_0.1.44.tar.xz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=270fc37b444fc1418f580338b8134944
diff --git a/metadata/md5-cache/dev-python/python-gammu-2.11 b/metadata/md5-cache/dev-python/python-gammu-2.11
deleted file mode 100644
index 90c9acf511f6..000000000000
--- a/metadata/md5-cache/dev-python/python-gammu-2.11
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig test? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) app-mobilephone/gammu[dbi] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-mobilephone/gammu-1.34.0
-DESCRIPTION=Python bindings for Gammu
-EAPI=7
-HOMEPAGE=https://wammu.eu/python-gammu/
-INHERIT=distutils-r1
-IUSE=examples test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=app-mobilephone/gammu-1.34.0 python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-gammu/python-gammu-2.11.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=0ca4e7d67dfbf4cae62dedd14b31a0b3
diff --git a/metadata/md5-cache/dev-python/python-ldap-3.4.0_p20220420 b/metadata/md5-cache/dev-python/python-ldap-3.4.0_p20220420
index 94bfcf085125..fd158f4be989 100644
--- a/metadata/md5-cache/dev-python/python-ldap-3.4.0_p20220420
+++ b/metadata/md5-cache/dev-python/python-ldap-3.4.0_p20220420
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.python-ldap.org/en/latest/ https://pypi.org/project/python-ldap/ https://github.com/python-ldap/python-ldap
 INHERIT=distutils-r1
 IUSE=examples sasl ssl test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc x86 ~x86-solaris
 LICENSE=MIT PSF-2
 RDEPEND=>=dev-python/pyasn1-0.3.7[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyasn1-modules-0.1.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-nds/openldap:=[sasl?,ssl?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-ldap/python-ldap/archive/7f30c4721ea2ca4373ed7860e6467781f0afa758.tar.gz -> python-ldap-3.4.0_p20220420.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=d0bf573cf07cdc90f5dd0cd4bf5431fd
+_md5_=7abfbc9cb6cd2985db7af2498cde3d5a
diff --git a/metadata/md5-cache/dev-python/python-utils-3.3.3 b/metadata/md5-cache/dev-python/python-utils-3.3.3
index 5e2ddcf75332..fc2b4288b010 100644
--- a/metadata/md5-cache/dev-python/python-utils-3.3.3
+++ b/metadata/md5-cache/dev-python/python-utils-3.3.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/WoLpH/python-utils/ https://pypi.org/project/python-utils/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-utils/python-utils-3.3.3.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=b2c08a823fe9f597207b66a006274f25
+_md5_=86f89b5b44ed899dc11785dac7081cac
diff --git a/metadata/md5-cache/dev-python/pytimeparse-1.1.8 b/metadata/md5-cache/dev-python/pytimeparse-1.1.8
deleted file mode 100644
index 6474c6fd42bf..000000000000
--- a/metadata/md5-cache/dev-python/pytimeparse-1.1.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A small Python module to parse various kinds of time expressions
-EAPI=7
-HOMEPAGE=https://github.com/wroberts/pytimeparse https://pypi.org/project/pytimeparse/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~riscv
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pytimeparse/pytimeparse-1.1.8.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=844d9fa11240324b0be657565ffcfb7e
diff --git a/metadata/md5-cache/dev-python/pyx-0.15 b/metadata/md5-cache/dev-python/pyx-0.15
deleted file mode 100644
index ae624c92f7aa..000000000000
--- a/metadata/md5-cache/dev-python/pyx-0.15
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?] virtual/tex-base dev-texlive/texlive-basic doc? ( virtual/latex-base || ( ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/sphinx[latex,python_targets_python3_9(-)] dev-python/sphinx_selective_exclude[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/sphinx[latex,python_targets_python3_8(-)] dev-python/sphinx_selective_exclude[python_targets_python3_8(-)] ) ) ) test? ( dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/sphinx_selective_exclude[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/testfixtures[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 )
-DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=Python package for the generation of encapsulated PostScript figures
-EAPI=7
-HOMEPAGE=https://github.com/pyx-project/pyx https://pyx-project.org/ https://pypi.org/project/PyX/
-INHERIT=distutils-r1
-IUSE=doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?] virtual/tex-base dev-texlive/texlive-basic python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pyx-project/pyx/archive/0.15.tar.gz -> pyx-0.15.gh.tar.gz test? ( https://www.w3.org/Graphics/SVG/Test/20110816/archives/W3C_SVG_11_TestSuite.tar.gz )
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=eec83009cd2cae264908a3a9e58c1d3b
diff --git a/metadata/md5-cache/dev-python/pyyaml-6.0-r1 b/metadata/md5-cache/dev-python/pyyaml-6.0-r1
index b9a7b9eaba02..a09c2128a72f 100644
--- a/metadata/md5-cache/dev-python/pyyaml-6.0-r1
+++ b/metadata/md5-cache/dev-python/pyyaml-6.0-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://pyyaml.org/wiki/PyYAML https://pypi.org/project/PyYAML/ https://github.com/yaml/pyyaml/
 INHERIT=distutils-r1
 IUSE=examples test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=dev-libs/libyaml:= python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/yaml/pyyaml/archive/6.0.tar.gz -> pyyaml-6.0.gh.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=255d11e5848e77e75820d2f6d3b2a126
+_md5_=f39be8b3744044617601d94251d8c0aa
diff --git a/metadata/md5-cache/dev-python/qstylizer-0.2.1 b/metadata/md5-cache/dev-python/qstylizer-0.2.1
deleted file mode 100644
index 9c3cdc6db2e9..000000000000
--- a/metadata/md5-cache/dev-python/qstylizer-0.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-vcs/git test? ( dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/tinycss2-0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/tinycss2-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/inflection-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/inflection-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] dev-python/sphinxcontrib-autoprogram[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] dev-python/sphinxcontrib-autoprogram[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] dev-python/sphinxcontrib-autoprogram[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Stylesheet Generator for PyQt5/PySide2
-EAPI=8
-HOMEPAGE=https://github.com/blambright/qstylizer
-INHERIT=distutils-r1
-IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/tinycss2-0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/tinycss2-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/inflection-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/inflection-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/blambright/qstylizer/archive/refs/tags/0.2.1.tar.gz -> qstylizer-0.2.1.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=fbcffeaec96a923f9749e30d1bad6eb5
diff --git a/metadata/md5-cache/dev-python/qtawesome-1.1.1 b/metadata/md5-cache/dev-python/qtawesome-1.1.1
deleted file mode 100644
index 06898eab2592..000000000000
--- a/metadata/md5-cache/dev-python/qtawesome-1.1.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( media-fonts/fontawesome dev-python/QtPy[pyqt5(+),gui,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta1-r1:3.11 >=dev-python/sphinx-4.4.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/pytest-qt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
-DESCRIPTION=Enables iconic fonts such as Font Awesome in PyQt
-EAPI=8
-HOMEPAGE=https://github.com/spyder-ide/qtawesome/ https://pypi.org/project/QtAwesome/
-INHERIT=distutils-r1 virtualx
-IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=media-fonts/fontawesome dev-python/QtPy[pyqt5(+),gui,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/Q/QtAwesome/QtAwesome-1.1.1.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=721b147846c469f8602f8a864eccd2b8
diff --git a/metadata/md5-cache/dev-python/qtawesome-1.1.1-r1 b/metadata/md5-cache/dev-python/qtawesome-1.1.1-r1
index 3e4e5f423edd..7db06bc5ca52 100644
--- a/metadata/md5-cache/dev-python/qtawesome-1.1.1-r1
+++ b/metadata/md5-cache/dev-python/qtawesome-1.1.1-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/spyder-ide/qtawesome/ https://pypi.org/project/QtAwesome/
 INHERIT=distutils-r1 virtualx
 IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=media-fonts/fontawesome dev-python/QtPy[pyqt5(+),gui,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/Q/QtAwesome/QtAwesome-1.1.1.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=7f858543bf8f7742e728a8ff3299d44e
+_md5_=f0f58006e0a5a2651219966c753589e0
diff --git a/metadata/md5-cache/dev-python/qtconsole-5.2.2 b/metadata/md5-cache/dev-python/qtconsole-5.2.2
deleted file mode 100644
index 6f7754a46f12..000000000000
--- a/metadata/md5-cache/dev-python/qtconsole-5.2.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( dev-python/QtPy[pyqt5,pyside2,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,svg,testlib] ) doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/ipykernel-4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipython_genutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter_core[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-4.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-17.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/QtPy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,gui,printsupport,svg] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Qt-based console for Jupyter with support for rich media output
-EAPI=8
-HOMEPAGE=https://jupyter.org
-INHERIT=distutils-r1
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm64 x86
-LICENSE=BSD
-PDEPEND=dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-RDEPEND=>=dev-python/ipykernel-4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipython_genutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter_core[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-4.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-17.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/QtPy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,gui,printsupport,svg] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/q/qtconsole/qtconsole-5.2.2.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=359e73985992fb392dbe9b784d7e8a11
diff --git a/metadata/md5-cache/dev-python/qtconsole-5.3.0 b/metadata/md5-cache/dev-python/qtconsole-5.3.0
index e8a9d1f0bd5c..433b265a511c 100644
--- a/metadata/md5-cache/dev-python/qtconsole-5.3.0
+++ b/metadata/md5-cache/dev-python/qtconsole-5.3.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://jupyter.org
 INHERIT=distutils-r1
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=BSD
 PDEPEND=dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 RDEPEND=>=dev-python/ipykernel-4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipython_genutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter_core[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-4.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-17.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/QtPy-2.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,gui,printsupport,svg] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/q/qtconsole/qtconsole-5.3.0.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=bfa9acecfc4c2b13b3a3d770871c7480
+_md5_=ee5bac5ae09cff4d84d7cad0b9eb2287
diff --git a/metadata/md5-cache/dev-python/ratelimit-2.2.1 b/metadata/md5-cache/dev-python/ratelimit-2.2.1
deleted file mode 100644
index cdedfd59543e..000000000000
--- a/metadata/md5-cache/dev-python/ratelimit-2.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=An API rate limit decorator for Python
-EAPI=8
-HOMEPAGE=https://github.com/tomasbasham/ratelimit
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tomasbasham/ratelimit/archive/v2.2.1.tar.gz -> ratelimit-2.2.1.gh.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=e46502543e9ff8a506e678b7c8cb877c
diff --git a/metadata/md5-cache/dev-python/re-assert-1.1.0 b/metadata/md5-cache/dev-python/re-assert-1.1.0
deleted file mode 100644
index 0c1107256943..000000000000
--- a/metadata/md5-cache/dev-python/re-assert-1.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/regex[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Show where your regex match assertion failed
-EAPI=7
-HOMEPAGE=https://github.com/asottile/re-assert
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=dev-python/regex[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/asottile/re-assert/archive/v1.1.0.tar.gz -> re-assert-1.1.0.gh.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=b78f6500a791ff7a39f1c50757c58b72
diff --git a/metadata/md5-cache/dev-python/re-assert-1.1.0-r1 b/metadata/md5-cache/dev-python/re-assert-1.1.0-r1
index e1bebe266484..5a2a93dd5fb3 100644
--- a/metadata/md5-cache/dev-python/re-assert-1.1.0-r1
+++ b/metadata/md5-cache/dev-python/re-assert-1.1.0-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/asottile/re-assert/ https://pypi.org/project/re-assert/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-python/regex[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/asottile/re-assert/archive/v1.1.0.tar.gz -> re-assert-1.1.0.gh.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=c253cc405f00d34d4a13fa24dc2a34ba
+_md5_=8135c39f6283f0f9e28e02b49790f6b0
diff --git a/metadata/md5-cache/dev-python/reflink-0.2.1-r1 b/metadata/md5-cache/dev-python/reflink-0.2.1-r1
deleted file mode 100644
index 38dd1ffbd77d..000000000000
--- a/metadata/md5-cache/dev-python/reflink-0.2.1-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/python-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( sys-fs/btrfs-progs ) doc? ( || ( ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] ) ) ) test? ( virtual/python-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/python-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=Python wrapper around the reflink system calls
-EAPI=7
-HOMEPAGE=https://gitlab.com/rubdos/pyreflink
-INHERIT=distutils-r1
-IUSE=doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=virtual/python-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/r/reflink/reflink-0.2.1.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ad9d6a626b2e5732136b7d099175450c
diff --git a/metadata/md5-cache/dev-python/requests-2.27.1 b/metadata/md5-cache/dev-python/requests-2.27.1
deleted file mode 100644
index a0d19f076a5d..000000000000
--- a/metadata/md5-cache/dev-python/requests-2.27.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-httpbin[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/PySocks-1.5.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !alpha? ( !hppa? ( !ia64? ( dev-python/trustme[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) ) ) test? ( >=dev-python/certifi-2017.4.17[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/charset_normalizer[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/idna-4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/urllib3-1.27[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] socks5? ( >=dev-python/PySocks-1.5.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=HTTP library for human beings
-EAPI=7
-HOMEPAGE=https://requests.readthedocs.io/
-INHERIT=distutils-r1
-IUSE=socks5 test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/certifi-2017.4.17[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/charset_normalizer[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/idna-4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/urllib3-1.27[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] socks5? ( >=dev-python/PySocks-1.5.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/r/requests/requests-2.27.1.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=1ac0a2a5f97b7422c197f9172fa3a4c7
diff --git a/metadata/md5-cache/dev-python/requests-2.27.1-r1 b/metadata/md5-cache/dev-python/requests-2.27.1-r1
index a0274e9669b9..6486eeb1b250 100644
--- a/metadata/md5-cache/dev-python/requests-2.27.1-r1
+++ b/metadata/md5-cache/dev-python/requests-2.27.1-r1
@@ -5,7 +5,7 @@ EAPI=7
 HOMEPAGE=https://requests.readthedocs.io/ https://github.com/psf/requests/ https://pypi.org/project/requests/
 INHERIT=distutils-r1
 IUSE=socks5 test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/certifi-2017.4.17[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/charset_normalizer[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/idna-4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/urllib3-1.27[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] socks5? ( >=dev-python/PySocks-1.5.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11[threads(+)] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests/requests-2.27.1.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=58344391e6304ba09984a3c7c2d50802
+_md5_=e2031e1ec4019e0cb37905169d3c1991
diff --git a/metadata/md5-cache/dev-python/rfc3986-2.0.0 b/metadata/md5-cache/dev-python/rfc3986-2.0.0
deleted file mode 100644
index 9128a4026dcf..000000000000
--- a/metadata/md5-cache/dev-python/rfc3986-2.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( idna? ( dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Validating URI References per RFC 3986
-EAPI=8
-HOMEPAGE=https://tools.ietf.org/html/rfc3986 https://github.com/python-hyper/rfc3986 https://rfc3986.rtfd.org
-INHERIT=distutils-r1
-IUSE=idna test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=Apache-2.0
-RDEPEND=idna? ( dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/r/rfc3986/rfc3986-2.0.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=a99ac3b638ecdf4606eb7958abfdf6ac
diff --git a/metadata/md5-cache/dev-python/rfc3986-2.0.0-r1 b/metadata/md5-cache/dev-python/rfc3986-2.0.0-r1
index 27bae31a05c4..55c81a210110 100644
--- a/metadata/md5-cache/dev-python/rfc3986-2.0.0-r1
+++ b/metadata/md5-cache/dev-python/rfc3986-2.0.0-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://rfc3986.rtfd.org/ https://github.com/python-hyper/rfc3986/ https://pypi.org/project/rfc3986/ https://tools.ietf.org/html/rfc3986/
 INHERIT=distutils-r1
 IUSE=idna test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=idna? ( dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rfc3986/rfc3986-2.0.0.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=aef540c1b3ba57cf5df70e5870a99630
+_md5_=5b2428761d9a5285dca5ad96967a3365
diff --git a/metadata/md5-cache/dev-python/rsa-4.8 b/metadata/md5-cache/dev-python/rsa-4.8
deleted file mode 100644
index f0e00f2f9b8c..000000000000
--- a/metadata/md5-cache/dev-python/rsa-4.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pyasn1-0.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/pyproject2setuppy-22[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Pure-Python RSA implementation
-EAPI=8
-HOMEPAGE=https://stuvel.eu/rsa/ https://pypi.org/project/rsa/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 ppc ~ppc64 ~riscv sparc x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pyasn1-0.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/sybrenstuvel/python-rsa/archive/version-4.8.tar.gz -> python-rsa-version-4.8.gh.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=3b270d34340f8aca2798a57bb870dd0f
diff --git a/metadata/md5-cache/dev-python/rsa-4.8-r1 b/metadata/md5-cache/dev-python/rsa-4.8-r1
index f9edde278180..f38cbc6218ce 100644
--- a/metadata/md5-cache/dev-python/rsa-4.8-r1
+++ b/metadata/md5-cache/dev-python/rsa-4.8-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://stuvel.eu/rsa/ https://github.com/sybrenstuvel/python-rsa/ https://pypi.org/project/rsa/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ppc ~ppc64 ~riscv sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pyasn1-0.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sybrenstuvel/python-rsa/archive/version-4.8.tar.gz -> python-rsa-version-4.8.gh.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=af94bd47bcea4c3de18baeded92640a2
+_md5_=5e4bdabc5dfe686a93f1806a523defeb
diff --git a/metadata/md5-cache/dev-python/sarge-0.1.7-r1 b/metadata/md5-cache/dev-python/sarge-0.1.7-r1
deleted file mode 100644
index 1df1d3d4b228..000000000000
--- a/metadata/md5-cache/dev-python/sarge-0.1.7-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=wrapper for subprocess which provides command pipeline functionality
-EAPI=8
-HOMEPAGE=https://docs.red-dove.com/sarge/ https://pypi.org/project/sarge/ https://github.com/vsajip/sarge/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/vsajip/sarge/archive/0.1.7.tar.gz -> sarge-0.1.7.gh.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=6c37b4ab5098fa01372b2e1506e61b71
diff --git a/metadata/md5-cache/dev-python/setuptools-62.4.0 b/metadata/md5-cache/dev-python/setuptools-62.4.0
new file mode 100644
index 000000000000..0f751cbfdf05
--- /dev/null
+++ b/metadata/md5-cache/dev-python/setuptools-62.4.0
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-python/appdirs-1.4.4-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-text-3.7.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/more-itertools-8.12.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nspektr-0.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ordered-set-4.0.2-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_resources-5.4.0-r3[python_targets_python3_8(-)?] ) >=dev-python/wheel-0.37.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( python_targets_pypy3? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[xml(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11[xml(+)] ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Collection of extensions to Distutils
+EAPI=7
+HOMEPAGE=https://github.com/pypa/setuptools/ https://pypi.org/project/setuptools/
+INHERIT=distutils-r1 multiprocessing
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris
+LICENSE=MIT
+PDEPEND=>=dev-python/certifi-2016.9.26[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+RDEPEND=>=dev-python/appdirs-1.4.4-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-text-3.7.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/more-itertools-8.12.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nspektr-0.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ordered-set-4.0.2-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_resources-5.4.0-r3[python_targets_python3_8(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[xml(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11[xml(+)] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/setuptools/setuptools-62.4.0.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=063d1e63df84531a0aaca53d28f071a7
diff --git a/metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.1-r4 b/metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.1-r4
deleted file mode 100644
index ca74c9ace022..000000000000
--- a/metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.1-r4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A setuptools_scm plugin for git archives
-EAPI=7
-HOMEPAGE=https://github.com/Changaco/setuptools_scm_git_archive
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Changaco/setuptools_scm_git_archive/archive/1.1.tar.gz -> setuptools_scm_git_archive-1.1.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=fc44587c8d1a35f03d31dc1c7a6bb5d1
diff --git a/metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.1-r5 b/metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.1-r5
index d1fc16abe835..07046591e425 100644
--- a/metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.1-r5
+++ b/metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.1-r5
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/Changaco/setuptools_scm_git_archive/ https://pypi.org/project/setuptools-scm-git-archive/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Changaco/setuptools_scm_git_archive/archive/1.1.tar.gz -> setuptools_scm_git_archive-1.1.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=4bd6d5d1940c49fdb73611450fc30321
+_md5_=be24e8bb566fd79306ad169d486f4622
diff --git a/metadata/md5-cache/dev-python/sh-1.14.2 b/metadata/md5-cache/dev-python/sh-1.14.2
deleted file mode 100644
index c62135e73d59..000000000000
--- a/metadata/md5-cache/dev-python/sh-1.14.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python subprocess interface
-EAPI=7
-HOMEPAGE=https://github.com/amoffat/sh
-INHERIT=distutils-r1
-IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/s/sh/sh-1.14.2.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=9d6f1c74ee7ccbc78a733f954e45c58c
diff --git a/metadata/md5-cache/dev-python/sh-1.14.2-r1 b/metadata/md5-cache/dev-python/sh-1.14.2-r1
index edc74b98baae..646c4c976566 100644
--- a/metadata/md5-cache/dev-python/sh-1.14.2-r1
+++ b/metadata/md5-cache/dev-python/sh-1.14.2-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/amoffat/sh/ https://pypi.org/project/sh/
 INHERIT=distutils-r1
 IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sh/sh-1.14.2.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=289e47ac3f3fc56175acc13bcaab8a90
+_md5_=befbe4a70c385ce198796afafb585aa5
diff --git a/metadata/md5-cache/dev-python/shiboken2-5.15.2-r1 b/metadata/md5-cache/dev-python/shiboken2-5.15.2-r1
index bd0feb603916..dcd6b5b1aabe 100644
--- a/metadata/md5-cache/dev-python/shiboken2-5.15.2-r1
+++ b/metadata/md5-cache/dev-python/shiboken2-5.15.2-r1
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-5.15.2-src/pyside-setup-opensource-src-5.15.2.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=3d7678e68b66e58ce3e364241a8ea612
+_md5_=ea6a84dfb34b4e0c5328c1d0040a3b17
diff --git a/metadata/md5-cache/dev-python/simplejson-3.17.6 b/metadata/md5-cache/dev-python/simplejson-3.17.6
index b9277596a2ff..279788693719 100644
--- a/metadata/md5-cache/dev-python/simplejson-3.17.6
+++ b/metadata/md5-cache/dev-python/simplejson-3.17.6
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/simplejson/simplejson/ https://pypi.org/project/simplejson/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=|| ( MIT AFL-2.1 )
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/simplejson/simplejson-3.17.6.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=29d524be14aeb3e04d80ec7156a489b4
+_md5_=df5026c17b16b541c3a16a494b6eebcf
diff --git a/metadata/md5-cache/dev-python/sniffio-1.2.0 b/metadata/md5-cache/dev-python/sniffio-1.2.0
deleted file mode 100644
index 50b07f7195a9..000000000000
--- a/metadata/md5-cache/dev-python/sniffio-1.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Sniff out which async library your code is running under
-EAPI=7
-HOMEPAGE=https://github.com/python-trio/sniffio/ https://pypi.org/project/sniffio/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=|| ( Apache-2.0 MIT )
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/python-trio/sniffio/archive/v1.2.0.tar.gz -> sniffio-1.2.0.gh.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=f3d90f78990ac4004b46060ec129223c
diff --git a/metadata/md5-cache/dev-python/sniffio-1.2.0-r1 b/metadata/md5-cache/dev-python/sniffio-1.2.0-r1
index 40d3c58938eb..d065571e6969 100644
--- a/metadata/md5-cache/dev-python/sniffio-1.2.0-r1
+++ b/metadata/md5-cache/dev-python/sniffio-1.2.0-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/python-trio/sniffio/ https://pypi.org/project/sniffio/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=|| ( Apache-2.0 MIT )
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-trio/sniffio/archive/v1.2.0.tar.gz -> sniffio-1.2.0.gh.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ad5d45c3c9dd42671c9dd6af60c5e374
+_md5_=9a44dd3347b303465bf8ee8a00e89f59
diff --git a/metadata/md5-cache/dev-python/snowballstemmer-2.2.0 b/metadata/md5-cache/dev-python/snowballstemmer-2.2.0
deleted file mode 100644
index 560b3d34da42..000000000000
--- a/metadata/md5-cache/dev-python/snowballstemmer-2.2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Stemmer algorithms generated from Snowball algorithms
-EAPI=7
-HOMEPAGE=https://snowballstem.org/ https://github.com/snowballstem/snowball https://pypi.org/project/snowballstemmer/
-INHERIT=distutils-r1
-IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~x64-solaris
-LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/s/snowballstemmer/snowballstemmer-2.2.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=eeeb9a698969756b09773b0e68edabd4
diff --git a/metadata/md5-cache/dev-python/snowballstemmer-2.2.0-r1 b/metadata/md5-cache/dev-python/snowballstemmer-2.2.0-r1
index eedd7f73c88f..4ab3b4b609b0 100644
--- a/metadata/md5-cache/dev-python/snowballstemmer-2.2.0-r1
+++ b/metadata/md5-cache/dev-python/snowballstemmer-2.2.0-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://snowballstem.org/ https://github.com/snowballstem/snowball https://pypi.org/project/snowballstemmer/
 INHERIT=distutils-r1
 IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=mirror://pypi/s/snowballstemmer/snowballstemmer-2.2.0.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=8c30f5aa59dcf32246ccc898625eaf78
+_md5_=786fa6fe47faedf502fb10928bddc30e
diff --git a/metadata/md5-cache/dev-python/stack_data-0.3.0 b/metadata/md5-cache/dev-python/stack_data-0.3.0
new file mode 100644
index 000000000000..d8851a6a18ad
--- /dev/null
+++ b/metadata/md5-cache/dev-python/stack_data-0.3.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typeguard[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/littleutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/asttokens[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/executing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pure_eval[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Extract data from Python tracebacks for informative displays
+EAPI=8
+HOMEPAGE=https://github.com/alexmojaki/stack_data
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-python/asttokens[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/executing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pure_eval[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/stack_data/stack_data-0.3.0.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=205c2b24f7b35d50194cdd34de593aa4
diff --git a/metadata/md5-cache/dev-python/stapler-1.0.0_p20200531-r2 b/metadata/md5-cache/dev-python/stapler-1.0.0_p20200531-r2
deleted file mode 100644
index 7c6021247a63..000000000000
--- a/metadata/md5-cache/dev-python/stapler-1.0.0_p20200531-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/PyPDF2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/pyproject2setuppy-22[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Suite of tools for PDF files manipulation written in Python
-EAPI=8
-HOMEPAGE=https://github.com/hellerbarde/stapler
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/PyPDF2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/hellerbarde/stapler/archive/1cabc85521e2badfc1e0d690086e286e701c2d9e.tar.gz -> stapler-1.0.0_p20200531.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=58ee8504cbc192cffd8c9d32fe936d05
diff --git a/metadata/md5-cache/dev-python/starlette-0.20.0 b/metadata/md5-cache/dev-python/starlette-0.20.0
deleted file mode 100644
index 924297d94795..000000000000
--- a/metadata/md5-cache/dev-python/starlette-0.20.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( || ( dev-python/brotlicffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] app-arch/brotli[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/trio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( <dev-python/anyio-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/anyio-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=The little ASGI framework that shines
-EAPI=8
-HOMEPAGE=https://www.starlette.io/ https://github.com/encode/starlette/ https://pypi.org/project/starlette/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=<dev-python/anyio-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/anyio-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/encode/starlette/archive/0.20.0.tar.gz -> starlette-0.20.0.gh.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=4e0111439e1a7a616de4fcbac1da210f
diff --git a/metadata/md5-cache/dev-python/starlette-0.20.1 b/metadata/md5-cache/dev-python/starlette-0.20.1
deleted file mode 100644
index af7787daceea..000000000000
--- a/metadata/md5-cache/dev-python/starlette-0.20.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( || ( dev-python/brotlicffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] app-arch/brotli[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/trio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <dev-python/anyio-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/anyio-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=The little ASGI framework that shines
-EAPI=8
-HOMEPAGE=https://www.starlette.io/ https://github.com/encode/starlette/ https://pypi.org/project/starlette/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=<dev-python/anyio-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/anyio-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/encode/starlette/archive/0.20.1.tar.gz -> starlette-0.20.1.gh.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=fbeb2f60b51d24c9c1464ed2cbf02788
diff --git a/metadata/md5-cache/dev-python/starlette-0.20.2 b/metadata/md5-cache/dev-python/starlette-0.20.2
deleted file mode 100644
index edeb6a1cd840..000000000000
--- a/metadata/md5-cache/dev-python/starlette-0.20.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( || ( dev-python/brotlicffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] app-arch/brotli[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/trio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <dev-python/anyio-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/anyio-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=The little ASGI framework that shines
-EAPI=8
-HOMEPAGE=https://www.starlette.io/ https://github.com/encode/starlette/ https://pypi.org/project/starlette/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=<dev-python/anyio-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/anyio-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/encode/starlette/archive/0.20.2.tar.gz -> starlette-0.20.2.gh.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=fbeb2f60b51d24c9c1464ed2cbf02788
diff --git a/metadata/md5-cache/dev-python/sure-2.0.0 b/metadata/md5-cache/dev-python/sure-2.0.0
deleted file mode 100644
index 31716808267b..000000000000
--- a/metadata/md5-cache/dev-python/sure-2.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=idiomatic assertion toolkit with human-friendly failure messages
-EAPI=7
-HOMEPAGE=https://github.com/gabrielfalcao/sure
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86
-LICENSE=GPL-3+
-RDEPEND=dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/sure/sure-2.0.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=e80961766187c37ffaff39cf42b9e17e
diff --git a/metadata/md5-cache/dev-python/sure-2.0.0-r1 b/metadata/md5-cache/dev-python/sure-2.0.0-r1
index 946e3fb80ff8..169a1c3b53b7 100644
--- a/metadata/md5-cache/dev-python/sure-2.0.0-r1
+++ b/metadata/md5-cache/dev-python/sure-2.0.0-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/gabrielfalcao/sure/ https://pypi.org/project/sure/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-3+
 RDEPEND=dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sure/sure-2.0.0.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=01cfc4c0577b465bd58129e9c0ccae95
+_md5_=a85746328621df88899cbd39aab3e6d5
diff --git a/metadata/md5-cache/dev-python/svglib-1.2.1 b/metadata/md5-cache/dev-python/svglib-1.2.1
deleted file mode 100644
index 6f0c13b87c14..000000000000
--- a/metadata/md5-cache/dev-python/svglib-1.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/cssselect2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/reportlab[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tinycss2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Pure-Python library for reading and converting SVG
-EAPI=8
-HOMEPAGE=https://pypi.org/project/svglib/ https://github.com/deeplook/svglib
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND=dev-python/cssselect2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/reportlab[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tinycss2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/deeplook/svglib/archive/v.1.2.1.tar.gz -> svglib-1.2.1.gh.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=93209b9f3f002c17b5755617493d3aad
diff --git a/metadata/md5-cache/dev-python/svgwrite-1.4.1 b/metadata/md5-cache/dev-python/svgwrite-1.4.1
deleted file mode 100644
index 0ad4db36fe4b..000000000000
--- a/metadata/md5-cache/dev-python/svgwrite-1.4.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python Package to write SVG files
-EAPI=7
-HOMEPAGE=https://github.com/mozman/svgwrite
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mozman/svgwrite/archive/v1.4.1.tar.gz -> svgwrite-1.4.1.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=b8cb2d394619dc81bc1de2af667754db
diff --git a/metadata/md5-cache/dev-python/svgwrite-1.4.1-r1 b/metadata/md5-cache/dev-python/svgwrite-1.4.1-r1
deleted file mode 100644
index a34395a73e19..000000000000
--- a/metadata/md5-cache/dev-python/svgwrite-1.4.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python Package to write SVG files
-EAPI=8
-HOMEPAGE=https://github.com/mozman/svgwrite/ https://pypi.org/project/svgwrite/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mozman/svgwrite/archive/v1.4.1.tar.gz -> svgwrite-1.4.1.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=06e4f62270b282f8138fc8a74efce196
diff --git a/metadata/md5-cache/dev-python/tappy-3.1 b/metadata/md5-cache/dev-python/tappy-3.1
deleted file mode 100644
index c91b312ce146..000000000000
--- a/metadata/md5-cache/dev-python/tappy-3.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/Babel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Test Anything Protocol (TAP) tools
-EAPI=8
-HOMEPAGE=https://github.com/python-tap/tappy https://pypi.org/project/tap.py/
-INHERIT=distutils-r1 optfeature
-IUSE=test doc 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
-LICENSE=BSD-2
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/t/tap.py/tap.py-3.1.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=f4a3ba1255bf3f82ee654dec0b3f89a5
diff --git a/metadata/md5-cache/dev-python/tappy-3.1-r1 b/metadata/md5-cache/dev-python/tappy-3.1-r1
index 7155309fb918..eee1c686aed3 100644
--- a/metadata/md5-cache/dev-python/tappy-3.1-r1
+++ b/metadata/md5-cache/dev-python/tappy-3.1-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/python-tap/tappy https://pypi.org/project/tap.py/
 INHERIT=distutils-r1 optfeature
 IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD-2
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tap.py/tap.py-3.1.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=b365049941c43b539dbf381ee2216eb0
+_md5_=1ab81e498a3ca06d9df0a94243469878
diff --git a/metadata/md5-cache/dev-python/tekore-4.3.0 b/metadata/md5-cache/dev-python/tekore-4.3.0
deleted file mode 100644
index 06560988093d..000000000000
--- a/metadata/md5-cache/dev-python/tekore-4.3.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-asyncio-0.17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( <dev-python/httpx-0.23[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Spotify Web API client
-EAPI=8
-HOMEPAGE=https://tekore.readthedocs.io https://github.com/felix-hilden/tekore
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=<dev-python/httpx-0.23[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/felix-hilden/tekore/archive/v4.3.0.tar.gz -> tekore-4.3.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=985ced3b524f10f6546a7ae5b95e60d0
diff --git a/metadata/md5-cache/dev-python/tempora-5.0.0 b/metadata/md5-cache/dev-python/tempora-5.0.0
deleted file mode 100644
index e6234eb77c16..000000000000
--- a/metadata/md5-cache/dev-python/tempora-5.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-freezegun[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/jaraco-functools-1.20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_10(-)] >=dev-python/rst-linker-1.9[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_9(-)] >=dev-python/rst-linker-1.9[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_8(-)] >=dev-python/rst-linker-1.9[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.7-r1:0 >=dev-python/sphinx-4.4.0[python_targets_pypy3(-)] >=dev-python/jaraco-packaging-3.2[python_targets_pypy3(-)] >=dev-python/rst-linker-1.9[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Objects and routines pertaining to date and time
-EAPI=8
-HOMEPAGE=https://github.com/jaraco/tempora
-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 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=>=dev-python/jaraco-functools-1.20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/t/tempora/tempora-5.0.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=17d01c0ae66c268c7054c3a16f003389
diff --git a/metadata/md5-cache/dev-python/tempora-5.0.1 b/metadata/md5-cache/dev-python/tempora-5.0.1
index c92cc382f4f6..433376b42126 100644
--- a/metadata/md5-cache/dev-python/tempora-5.0.1
+++ b/metadata/md5-cache/dev-python/tempora-5.0.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/jaraco/tempora
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/jaraco-functools-1.20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tempora/tempora-5.0.1.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ff7e53e49b0cf8c908a0f815d9c4090c
+_md5_=729040bef65de248445a88456ec4a6ab
diff --git a/metadata/md5-cache/dev-python/terminado-0.13.3 b/metadata/md5-cache/dev-python/terminado-0.13.3
deleted file mode 100644
index 111ed5536510..000000000000
--- a/metadata/md5-cache/dev-python/terminado-0.13.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=www-servers/tornado[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( www-servers/tornado[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ptyprocess[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Terminals served to term.js using Tornado websockets
-EAPI=8
-HOMEPAGE=https://pypi.org/project/terminado/ https://github.com/jupyter/terminado
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD-2
-RDEPEND=www-servers/tornado[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ptyprocess[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/t/terminado/terminado-0.13.3.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=23a45447f8e00c7881edaa448aa8ab7f
diff --git a/metadata/md5-cache/dev-python/terminado-0.15.0 b/metadata/md5-cache/dev-python/terminado-0.15.0
index 79056066d65a..08468b33b785 100644
--- a/metadata/md5-cache/dev-python/terminado-0.15.0
+++ b/metadata/md5-cache/dev-python/terminado-0.15.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/jupyter/terminado/ https://pypi.org/project/terminado/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=dev-python/ptyprocess[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] www-servers/tornado[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/terminado/terminado-0.15.0.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=bec467b519267e0d7d3c0a506d26956a
+_md5_=b683093e2d27952fa089191e4bbb9845
diff --git a/metadata/md5-cache/dev-python/texttable-1.6.4 b/metadata/md5-cache/dev-python/texttable-1.6.4
deleted file mode 100644
index 05ff047172a5..000000000000
--- a/metadata/md5-cache/dev-python/texttable-1.6.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/wcwidth[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Module for creating simple ASCII tables
-EAPI=7
-HOMEPAGE=https://github.com/foutaise/texttable https://pypi.org/project/texttable/
-INHERIT=distutils-r1 optfeature
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm64 x86
-LICENSE=MIT
-RDEPEND=dev-python/wcwidth[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/foutaise/texttable/archive/v1.6.4.tar.gz -> texttable-1.6.4.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=935e50b0d8940c5e164f465ba3386617
diff --git a/metadata/md5-cache/dev-python/texttable-1.6.4-r1 b/metadata/md5-cache/dev-python/texttable-1.6.4-r1
index c0b145c54e55..29300c9a412a 100644
--- a/metadata/md5-cache/dev-python/texttable-1.6.4-r1
+++ b/metadata/md5-cache/dev-python/texttable-1.6.4-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/foutaise/texttable https://pypi.org/project/texttable/
 INHERIT=distutils-r1 optfeature
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=MIT
 RDEPEND=dev-python/wcwidth[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/foutaise/texttable/archive/v1.6.4.tar.gz -> texttable-1.6.4.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=d912c33ce299a9038cae2abf3e45b619
+_md5_=0f23c4eb4e98a9dd8755640948551398
diff --git a/metadata/md5-cache/dev-python/thriftpy2-0.4.14 b/metadata/md5-cache/dev-python/thriftpy2-0.4.14
deleted file mode 100644
index 8c3cf166c6e6..000000000000
--- a/metadata/md5-cache/dev-python/thriftpy2-0.4.14
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/ply[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] www-servers/tornado[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Pure python approach of Apache Thrift
-EAPI=7
-HOMEPAGE=https://github.com/Thriftpy/thriftpy2
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Thriftpy/thriftpy2/archive/refs/tags/v0.4.14.tar.gz -> thriftpy2-0.4.14.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=9ebeb03f4149c25e34399264e7d7c8cd
diff --git a/metadata/md5-cache/dev-python/thriftpy2-0.4.14-r1 b/metadata/md5-cache/dev-python/thriftpy2-0.4.14-r1
new file mode 100644
index 000000000000..a90b6cd45ec1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/thriftpy2-0.4.14-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ply[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] www-servers/tornado[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Pure python approach of Apache Thrift
+EAPI=8
+HOMEPAGE=https://github.com/Thriftpy/thriftpy2
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Thriftpy/thriftpy2/archive/refs/tags/v0.4.14.tar.gz -> thriftpy2-0.4.14.gh.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=fd62e8d1de1eef3e6227fe0fc7e777b4
diff --git a/metadata/md5-cache/dev-python/tinycss-0.4 b/metadata/md5-cache/dev-python/tinycss-0.4
deleted file mode 100644
index 0fb1d5e89957..000000000000
--- a/metadata/md5-cache/dev-python/tinycss-0.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A complete yet simple CSS parser for Python
-EAPI=7
-HOMEPAGE=https://github.com/SimonSapin/tinycss/ https://tinycss.readthedocs.io/en/latest/
-INHERIT=distutils-r1
-IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/t/tinycss/tinycss-0.4.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=49560743908cb482414b95deb4ff4f03
diff --git a/metadata/md5-cache/dev-python/tinycss-0.4-r1 b/metadata/md5-cache/dev-python/tinycss-0.4-r1
index baa868d7f07e..4f057f267e83 100644
--- a/metadata/md5-cache/dev-python/tinycss-0.4-r1
+++ b/metadata/md5-cache/dev-python/tinycss-0.4-r1
@@ -2,10 +2,10 @@ BDEPEND=test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_pyth
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A complete yet simple CSS parser for Python
 EAPI=8
-HOMEPAGE=https://github.com/SimonSapin/tinycss/ https://tinycss.readthedocs.io/en/latest/
+HOMEPAGE=https://github.com/Kozea/tinycss/ https://pypi.org/project/tinycss/ https://tinycss.readthedocs.io/en/latest/
 INHERIT=distutils-r1
 IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tinycss/tinycss-0.4.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=36defc16299e71feedbcc93dc281ca6f
+_md5_=2ccc4ea708c948fc991076700cdab521
diff --git a/metadata/md5-cache/dev-python/tlsh-4.8.2 b/metadata/md5-cache/dev-python/tlsh-4.8.2
index 396a5a31b936..b17e19a09532 100644
--- a/metadata/md5-cache/dev-python/tlsh-4.8.2
+++ b/metadata/md5-cache/dev-python/tlsh-4.8.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/python-tlsh/
 INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=|| ( Apache-2.0 BSD )
 RDEPEND=dev-libs/tlsh python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/trendmicro/tlsh/archive/4.8.2.tar.gz -> tlsh-4.8.2.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=6d1c3e1d3f97056b826aafdecf3b081f
+_md5_=edd076796fa6d564caee6cf32eed29f6
diff --git a/metadata/md5-cache/dev-python/toolz-0.11.2 b/metadata/md5-cache/dev-python/toolz-0.11.2
deleted file mode 100644
index 38d77e36c03e..000000000000
--- a/metadata/md5-cache/dev-python/toolz-0.11.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/versioneer[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=List processing tools and functional utilities
-EAPI=8
-HOMEPAGE=https://pypi.org/project/toolz/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/t/toolz/toolz-0.11.2.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=d3605fd0efd410cf12caaaf8121de75b
diff --git a/metadata/md5-cache/dev-python/toolz-0.11.2-r1 b/metadata/md5-cache/dev-python/toolz-0.11.2-r1
index 9a624f27d95c..ed75d1e62d6b 100644
--- a/metadata/md5-cache/dev-python/toolz-0.11.2-r1
+++ b/metadata/md5-cache/dev-python/toolz-0.11.2-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/toolz/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/toolz/toolz-0.11.2.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=9a899abe73054065d6139d29874dd39b
+_md5_=a79aa271c6bc0b121ab0c74b32312567
diff --git a/metadata/md5-cache/dev-python/toposort-1.7 b/metadata/md5-cache/dev-python/toposort-1.7
deleted file mode 100644
index 23572c9d78ea..000000000000
--- a/metadata/md5-cache/dev-python/toposort-1.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/pyproject2setuppy-22[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Implements a topological sort algorithm
-EAPI=8
-HOMEPAGE=https://gitlab.com/ericvsmith/toposort
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/t/toposort/toposort-1.7.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=31b195a6399ebb028a04945958f1be29
diff --git a/metadata/md5-cache/dev-python/translate-toolkit-3.7.0 b/metadata/md5-cache/dev-python/translate-toolkit-3.7.0
new file mode 100644
index 000000000000..e699860869fe
--- /dev/null
+++ b/metadata/md5-cache/dev-python/translate-toolkit-3.7.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/phply[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_8(-)] ) ) ) test? ( !dev-python/pydiff app-text/iso-codes >=dev-python/chardet-3.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cheroot[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/lxml-4.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pycountry-19.8.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-levenshtein-0.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-devel/gettext html? ( dev-python/utidylib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ical? ( dev-python/vobject[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ini? ( >=dev-python/iniparse-0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) subtitles? ( media-video/gaupol[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) yaml? ( dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Toolkit to convert between many translation formats
+EAPI=8
+HOMEPAGE=https://github.com/translate/translate/ https://pypi.org/project/translate-toolkit/
+INHERIT=distutils-r1
+IUSE=+html +ical +ini +subtitles +yaml doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=!dev-python/pydiff app-text/iso-codes >=dev-python/chardet-3.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cheroot[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/lxml-4.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pycountry-19.8.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-levenshtein-0.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-devel/gettext html? ( dev-python/utidylib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ical? ( dev-python/vobject[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ini? ( >=dev-python/iniparse-0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) subtitles? ( media-video/gaupol[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) yaml? ( dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/translate/translate/archive/3.7.0.tar.gz -> translate-3.7.0.gh.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=b91480a09d20b49a6fee0277fe703820
diff --git a/metadata/md5-cache/dev-python/trustme-0.9.0 b/metadata/md5-cache/dev-python/trustme-0.9.0
deleted file mode 100644
index 1f7a87dc0885..000000000000
--- a/metadata/md5-cache/dev-python/trustme-0.9.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pyopenssl[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/service_identity[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=#1 quality TLS certs while you wait, for the discerning tester
-EAPI=8
-HOMEPAGE=https://github.com/python-trio/trustme
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Apache-2.0 MIT )
-RDEPEND=dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/t/trustme/trustme-0.9.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=fe7b27344e5dd8532bb0a921f67843ac
diff --git a/metadata/md5-cache/dev-python/trustme-0.9.0-r1 b/metadata/md5-cache/dev-python/trustme-0.9.0-r1
index 3a3cf69bc1ea..78acd0d6d5dd 100644
--- a/metadata/md5-cache/dev-python/trustme-0.9.0-r1
+++ b/metadata/md5-cache/dev-python/trustme-0.9.0-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/python-trio/trustme/ https://pypi.org/project/trustme/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Apache-2.0 MIT )
 RDEPEND=dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/trustme/trustme-0.9.0.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=dc9a36194f797c3906793f59b832afc4
+_md5_=176d719a497499d07d56b259fc4104ae
diff --git a/metadata/md5-cache/dev-python/tubes-0.2.0-r1 b/metadata/md5-cache/dev-python/tubes-0.2.0-r1
deleted file mode 100644
index 764e9b95d2af..000000000000
--- a/metadata/md5-cache/dev-python/tubes-0.2.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/twisted[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Flow control and backpressure for event-driven applications
-EAPI=7
-HOMEPAGE=https://github.com/twisted/tubes https://pypi.org/project/Tubes/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~riscv
-LICENSE=MIT
-RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/twisted[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/twisted/tubes/archive/v0.2.0.tar.gz -> tubes-0.2.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=c93bc768d9e5aae20874fa38c742ca6e
diff --git a/metadata/md5-cache/dev-python/ubelt-1.0.1 b/metadata/md5-cache/dev-python/ubelt-1.0.1
deleted file mode 100644
index 4f14ad1a8967..000000000000
--- a/metadata/md5-cache/dev-python/ubelt-1.0.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/xdoctest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
-DESCRIPTION=A stdlib like feel, and extra batteries. Hashing, Caching, Timing, Progress
-EAPI=8
-HOMEPAGE=https://github.com/Erotemic/ubelt
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Erotemic/ubelt/archive/v1.0.1.tar.gz -> ubelt-1.0.1.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=da67f6b30446b4549d240277440bf81b
diff --git a/metadata/md5-cache/dev-python/ubelt-1.1.0 b/metadata/md5-cache/dev-python/ubelt-1.1.0
deleted file mode 100644
index 9cab3b5cfae1..000000000000
--- a/metadata/md5-cache/dev-python/ubelt-1.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/numpy-1.19.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygments-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xdoctest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xxhash-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A stdlib like feel, and extra batteries. Hashing, Caching, Timing, Progress
-EAPI=8
-HOMEPAGE=https://github.com/Erotemic/ubelt/ https://pypi.org/project/ubelt/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Erotemic/ubelt/archive/v1.1.0.tar.gz -> ubelt-1.1.0.gh.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=a8214fb34dad84162ed290d206599ee2
diff --git a/metadata/md5-cache/dev-python/ukkonen-1.0.1 b/metadata/md5-cache/dev-python/ukkonen-1.0.1
deleted file mode 100644
index a5d59d938f45..000000000000
--- a/metadata/md5-cache/dev-python/ukkonen-1.0.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( python_targets_python3_8? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Implementation of bounded Levenshtein distance (Ukkonen)
-EAPI=8
-HOMEPAGE=https://pypi.org/project/ukkonen/ https://github.com/asottile/ukkonen/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~hppa ~ppc ~ppc64 ~riscv x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/asottile/ukkonen/archive/v1.0.1.tar.gz -> ukkonen-1.0.1.gh.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=f87046dc30746b31dcada10f73420315
diff --git a/metadata/md5-cache/dev-python/ukkonen-1.0.1-r1 b/metadata/md5-cache/dev-python/ukkonen-1.0.1-r1
index a13af3304b6b..cd2cc89bf610 100644
--- a/metadata/md5-cache/dev-python/ukkonen-1.0.1-r1
+++ b/metadata/md5-cache/dev-python/ukkonen-1.0.1-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/ukkonen/ https://github.com/asottile/ukkonen/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~hppa ~ppc ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/asottile/ukkonen/archive/v1.0.1.tar.gz -> ukkonen-1.0.1.gh.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=8f590d49d55ec737533170f253215315
+_md5_=3942a42c54eb211850250b2fd0f5252f
diff --git a/metadata/md5-cache/dev-python/untangle-1.1.1 b/metadata/md5-cache/dev-python/untangle-1.1.1
deleted file mode 100644
index 757717a541c1..000000000000
--- a/metadata/md5-cache/dev-python/untangle-1.1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Convert XML documents into Python objects
-EAPI=8
-HOMEPAGE=https://github.com/stchris/untangle
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/u/untangle/untangle-1.1.1.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=a9525332a4def6db3ea7ce8119338cae
diff --git a/metadata/md5-cache/dev-python/untangle-1.1.1-r1 b/metadata/md5-cache/dev-python/untangle-1.1.1-r1
index 2c7f3e5f9fd0..83de1bec632b 100644
--- a/metadata/md5-cache/dev-python/untangle-1.1.1-r1
+++ b/metadata/md5-cache/dev-python/untangle-1.1.1-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/stchris/untangle
 INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=mirror://pypi/u/untangle/untangle-1.1.1.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=9cc15436440355aa7d8a0ca28684fe99
+_md5_=ca6e082a2e518fe3b146a507dcfeac10
diff --git a/metadata/md5-cache/dev-python/uritemplate-4.1.1 b/metadata/md5-cache/dev-python/uritemplate-4.1.1
index 7c5e975bf314..d45e906dd43a 100644
--- a/metadata/md5-cache/dev-python/uritemplate-4.1.1
+++ b/metadata/md5-cache/dev-python/uritemplate-4.1.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://uritemplate.readthedocs.io/en/latest/ https://pypi.org/project/uritemplate/ https://github.com/python-hyper/uritemplate/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/uritemplate/uritemplate-4.1.1.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=4f499ee1dd8dc6fe76241da7fdc8ee72
+_md5_=3c8cb5500097a180a395471c82d4adab
diff --git a/metadata/md5-cache/dev-python/urllib3-1.26.9 b/metadata/md5-cache/dev-python/urllib3-1.26.9
deleted file mode 100644
index e4fd9aa4d504..000000000000
--- a/metadata/md5-cache/dev-python/urllib3-1.26.9
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( python_targets_python3_8? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] brotli? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/brotlicffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/trustme-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-4.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] brotli? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/brotlicffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/trustme-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-4.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] brotli? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/brotlicffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/trustme-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-4.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[ssl(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[ssl(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[ssl(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[ssl(+)] ) >=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=HTTP library with thread-safe connection pooling, file post, and more
-EAPI=7
-HOMEPAGE=https://github.com/urllib3/urllib3
-INHERIT=distutils-r1
-IUSE=brotli test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=>=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] brotli? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[ssl(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[ssl(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[ssl(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[ssl(+)] )
-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/u/urllib3/urllib3-1.26.9.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=2c7419cf57aae352f224e8b985e5d626
diff --git a/metadata/md5-cache/dev-python/urllib3-1.26.9-r1 b/metadata/md5-cache/dev-python/urllib3-1.26.9-r1
index 26f7a9f74858..bd47dd6bf96b 100644
--- a/metadata/md5-cache/dev-python/urllib3-1.26.9-r1
+++ b/metadata/md5-cache/dev-python/urllib3-1.26.9-r1
@@ -5,7 +5,7 @@ EAPI=7
 HOMEPAGE=https://github.com/urllib3/urllib3/ https://pypi.org/project/urllib3/
 INHERIT=distutils-r1
 IUSE=brotli test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] brotli? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[ssl(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[ssl(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[ssl(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[ssl(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11[ssl(+)] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/urllib3/urllib3-1.26.9.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=28f5d356f8474722ad1f5542d1321450
+_md5_=54c843e309254d6506c18284ec4487ca
diff --git a/metadata/md5-cache/dev-python/urwid-2.1.2-r1 b/metadata/md5-cache/dev-python/urwid-2.1.2-r1
index a1e5956c798e..e806a64e50af 100644
--- a/metadata/md5-cache/dev-python/urwid-2.1.2-r1
+++ b/metadata/md5-cache/dev-python/urwid-2.1.2-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=http://urwid.org/ https://pypi.org/project/urwid/ https://github.com/urwid/urwid/
 INHERIT=distutils-r1 optfeature
 IUSE=examples doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~mips ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[ncurses] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[ncurses] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/u/urwid/urwid-2.1.2.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=40a488ec68377541ef0da998c9c6f40a
+_md5_=b196329aecd575e2293feea92be7a02a
diff --git a/metadata/md5-cache/dev-python/validators-0.19.0 b/metadata/md5-cache/dev-python/validators-0.19.0
deleted file mode 100644
index c7e8f5278829..000000000000
--- a/metadata/md5-cache/dev-python/validators-0.19.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/decorator-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python Data Validation for Humans
-EAPI=8
-HOMEPAGE=https://github.com/kvesteri/validators
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/decorator-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/v/validators/validators-0.19.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=45f6f8b2d79f5fee24ea9d79d45c124c
diff --git a/metadata/md5-cache/dev-python/vdf-3.4 b/metadata/md5-cache/dev-python/vdf-3.4
deleted file mode 100644
index 7c4e46effae8..000000000000
--- a/metadata/md5-cache/dev-python/vdf-3.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A module for (de)serialization to and from VDF, Valve's key-value text format
-EAPI=7
-HOMEPAGE=https://github.com/ValvePython/vdf
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://codeload.github.com/ValvePython/vdf/tar.gz/v3.4 -> vdf-3.4.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=d6471495d4b87b2dddb6fb3f8baedaba
diff --git a/metadata/md5-cache/dev-python/vdf-3.4-r1 b/metadata/md5-cache/dev-python/vdf-3.4-r1
index 6739d3dc1935..e4a764d3724d 100644
--- a/metadata/md5-cache/dev-python/vdf-3.4-r1
+++ b/metadata/md5-cache/dev-python/vdf-3.4-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ValvePython/vdf
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://codeload.github.com/ValvePython/vdf/tar.gz/v3.4 -> vdf-3.4.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=75ee10be9cacde2af3abb849d76e0b0e
+_md5_=383b327e31aa154d06198bb23ae334f5
diff --git a/metadata/md5-cache/dev-python/vdirsyncer-0.18.0-r3 b/metadata/md5-cache/dev-python/vdirsyncer-0.18.0-r3
deleted file mode 100644
index 641fda7fa85e..000000000000
--- a/metadata/md5-cache/dev-python/vdirsyncer-0.18.0-r3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/hypothesis[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-localserver[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-subtesthack[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/click-log-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/click-threading-0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests-toolbelt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/atomicwrites[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Synchronize calendars and contacts
-EAPI=8
-HOMEPAGE=https://github.com/pimutils/vdirsyncer
-INHERIT=distutils-r1 systemd
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
-LICENSE=BSD
-RDEPEND=dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/click-log-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/click-threading-0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests-toolbelt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/atomicwrites[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/v/vdirsyncer/vdirsyncer-0.18.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=8c20f7322c5c6844070c955aedccd53c
diff --git a/metadata/md5-cache/dev-python/verboselogs-1.7 b/metadata/md5-cache/dev-python/verboselogs-1.7
deleted file mode 100644
index 96577655d0ed..000000000000
--- a/metadata/md5-cache/dev-python/verboselogs-1.7
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.7-r1:0 >=dev-python/sphinx-4.4.0[python_targets_pypy3(-)] ) ) ) test? ( >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
-DESCRIPTION=Verbose logging for Python's logging module
-EAPI=7
-HOMEPAGE=https://pypi.org/project/verboselogs/ https://github.com/xolox/python-verboselogs/
-INHERIT=distutils-r1
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/v/verboselogs/verboselogs-1.7.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=a29036d1157488b432053c862e13ff4c
diff --git a/metadata/md5-cache/dev-python/versioningit-1.1.1 b/metadata/md5-cache/dev-python/versioningit-1.1.1
deleted file mode 100644
index d1cd8cf39894..000000000000
--- a/metadata/md5-cache/dev-python/versioningit-1.1.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pydantic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=versioningit is a setuptools plugin for versioning based on git tags
-EAPI=8
-HOMEPAGE=https://pypi.org/project/versioningit/ https://github.com/jwodder/versioningit
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/v/versioningit/versioningit-1.1.1.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=eb01b956ed5e91388f4212250637a6fa
diff --git a/metadata/md5-cache/dev-python/visitor-0.1.3-r1 b/metadata/md5-cache/dev-python/visitor-0.1.3-r1
deleted file mode 100644
index 7736bbd3405f..000000000000
--- a/metadata/md5-cache/dev-python/visitor-0.1.3-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A tiny pythonic visitor implementation
-EAPI=7
-HOMEPAGE=https://github.com/mbr/visitor
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mbr/visitor/archive/0.1.3.tar.gz -> visitor-0.1.3.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=c86b7c444663d3123a5bd92a8da33afa
diff --git a/metadata/md5-cache/dev-python/vobject-0.9.6.1-r2 b/metadata/md5-cache/dev-python/vobject-0.9.6.1-r2
deleted file mode 100644
index a9ab0fa49318..000000000000
--- a/metadata/md5-cache/dev-python/vobject-0.9.6.1-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/python-dateutil-2.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DESCRIPTION=Python package for parsing and generating vCard and vCalendar files
-EAPI=7
-HOMEPAGE=https://eventable.github.io/vobject/ https://pypi.org/project/vobject/ https://github.com/eventable/vobject
-INHERIT=distutils-r1
-IUSE=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/python-dateutil-2.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/v/vobject/vobject-0.9.6.1.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=debdcbebf54ce2af930e22c470a49229
diff --git a/metadata/md5-cache/dev-python/vobject-0.9.6.1-r3 b/metadata/md5-cache/dev-python/vobject-0.9.6.1-r3
index 5eb910c7b529..b855339836d3 100644
--- a/metadata/md5-cache/dev-python/vobject-0.9.6.1-r3
+++ b/metadata/md5-cache/dev-python/vobject-0.9.6.1-r3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://eventable.github.io/vobject/ https://pypi.org/project/vobject/ https://github.com/eventable/vobject
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/python-dateutil-2.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/v/vobject/vobject-0.9.6.1.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=4f780765442eecac27b4180d7f4372fe
+_md5_=84ffcf7f6b363faf7f8f2fbb8dd6fce1
diff --git a/metadata/md5-cache/dev-python/watchdog-2.1.8 b/metadata/md5-cache/dev-python/watchdog-2.1.8
index 250d342df090..98e2aa90f766 100644
--- a/metadata/md5-cache/dev-python/watchdog-2.1.8
+++ b/metadata/md5-cache/dev-python/watchdog-2.1.8
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/gorakhargosh/watchdog/ https://pypi.org/project/watchdog/
 INHERIT=distutils-r1 optfeature
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gorakhargosh/watchdog/archive/v2.1.8.tar.gz -> watchdog-2.1.8.gh.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=58ec84d9419f6dbf3a5b4a0bf3297e17
+_md5_=253f90170bd99df1bea0edef522f8369
diff --git a/metadata/md5-cache/dev-python/watchfiles-0.13 b/metadata/md5-cache/dev-python/watchfiles-0.13
deleted file mode 100644
index 2e842f9acf22..000000000000
--- a/metadata/md5-cache/dev-python/watchfiles-0.13
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools-rust[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/dirty-equals[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( =dev-python/anyio-3*[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=virtual/rust-1.53 python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=Simple, modern file watching and code reload in Python
-EAPI=8
-HOMEPAGE=https://pypi.org/project/watchfiles/ https://github.com/samuelcolvin/watchfiles/
-INHERIT=cargo distutils-r1
-IUSE=test debug python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=MIT Apache-2.0 Apache-2.0-with-LLVM-exceptions Artistic-2 BSD CC0-1.0 ISC MIT Unlicense
-RDEPEND==dev-python/anyio-3*[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/samuelcolvin/watchfiles/archive/v0.13.tar.gz -> watchfiles-0.13.gh.tar.gz https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/crossbeam-channel/0.4.4/download -> crossbeam-channel-0.4.4.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.3/download -> crossbeam-channel-0.5.3.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.8/download -> crossbeam-utils-0.8.8.crate https://crates.io/api/v1/crates/filetime/0.2.15/download -> filetime-0.2.15.crate https://crates.io/api/v1/crates/fsevent-sys/4.1.0/download -> fsevent-sys-4.1.0.crate https://crates.io/api/v1/crates/indoc/1.0.4/download -> indoc-1.0.4.crate https://crates.io/api/v1/crates/inotify/0.9.6/download -> inotify-0.9.6.crate https://crates.io/api/v1/crates/inotify-sys/0.1.5/download -> inotify-sys-0.1.5.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/kqueue/1.0.4/download -> kqueue-1.0.4.crate https://crates.io/api/v1/crates/kqueue-sys/1.0.3/download -> kqueue-sys-1.0.3.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.120/download -> libc-0.2.120.crate https://crates.io/api/v1/crates/lock_api/0.4.6/download -> lock_api-0.4.6.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/maybe-uninit/2.0.0/download -> maybe-uninit-2.0.0.crate https://crates.io/api/v1/crates/mio/0.8.1/download -> mio-0.8.1.crate https://crates.io/api/v1/crates/miow/0.3.7/download -> miow-0.3.7.crate https://crates.io/api/v1/crates/notify/5.0.0-pre.14/download -> notify-5.0.0-pre.14.crate https://crates.io/api/v1/crates/ntapi/0.3.7/download -> ntapi-0.3.7.crate https://crates.io/api/v1/crates/once_cell/1.10.0/download -> once_cell-1.10.0.crate https://crates.io/api/v1/crates/parking_lot/0.11.2/download -> parking_lot-0.11.2.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.5/download -> parking_lot_core-0.8.5.crate https://crates.io/api/v1/crates/proc-macro2/1.0.36/download -> proc-macro2-1.0.36.crate https://crates.io/api/v1/crates/pyo3/0.16.1/download -> pyo3-0.16.1.crate https://crates.io/api/v1/crates/pyo3-build-config/0.16.1/download -> pyo3-build-config-0.16.1.crate https://crates.io/api/v1/crates/pyo3-ffi/0.16.1/download -> pyo3-ffi-0.16.1.crate https://crates.io/api/v1/crates/pyo3-macros/0.16.1/download -> pyo3-macros-0.16.1.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.16.1/download -> pyo3-macros-backend-0.16.1.crate https://crates.io/api/v1/crates/quote/1.0.15/download -> quote-1.0.15.crate https://crates.io/api/v1/crates/redox_syscall/0.2.11/download -> redox_syscall-0.2.11.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/smallvec/1.8.0/download -> smallvec-1.8.0.crate https://crates.io/api/v1/crates/syn/1.0.88/download -> syn-1.0.88.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/unindent/0.1.8/download -> unindent-0.1.8.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=5699d9bb0dc7659bd1942e29bce23113
diff --git a/metadata/md5-cache/dev-python/watchfiles-0.14 b/metadata/md5-cache/dev-python/watchfiles-0.14
deleted file mode 100644
index c539f3cc687c..000000000000
--- a/metadata/md5-cache/dev-python/watchfiles-0.14
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools-rust[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/dirty-equals[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( =dev-python/anyio-3*[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=virtual/rust-1.53 python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=Simple, modern file watching and code reload in Python
-EAPI=8
-HOMEPAGE=https://pypi.org/project/watchfiles/ https://github.com/samuelcolvin/watchfiles/
-INHERIT=cargo distutils-r1
-IUSE=test debug python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=MIT Apache-2.0 Apache-2.0-with-LLVM-exceptions Artistic-2 BSD CC0-1.0 ISC MIT Unlicense
-RDEPEND==dev-python/anyio-3*[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/samuelcolvin/watchfiles/archive/v0.14.tar.gz -> watchfiles-0.14.gh.tar.gz https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.4/download -> crossbeam-channel-0.5.4.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.8/download -> crossbeam-utils-0.8.8.crate https://crates.io/api/v1/crates/filetime/0.2.16/download -> filetime-0.2.16.crate https://crates.io/api/v1/crates/fsevent-sys/4.1.0/download -> fsevent-sys-4.1.0.crate https://crates.io/api/v1/crates/indoc/1.0.4/download -> indoc-1.0.4.crate https://crates.io/api/v1/crates/inotify/0.9.6/download -> inotify-0.9.6.crate https://crates.io/api/v1/crates/inotify-sys/0.1.5/download -> inotify-sys-0.1.5.crate https://crates.io/api/v1/crates/kqueue/1.0.5/download -> kqueue-1.0.5.crate https://crates.io/api/v1/crates/kqueue-sys/1.0.3/download -> kqueue-sys-1.0.3.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.124/download -> libc-0.2.124.crate https://crates.io/api/v1/crates/lock_api/0.4.7/download -> lock_api-0.4.7.crate https://crates.io/api/v1/crates/log/0.4.16/download -> log-0.4.16.crate https://crates.io/api/v1/crates/mio/0.8.2/download -> mio-0.8.2.crate https://crates.io/api/v1/crates/miow/0.3.7/download -> miow-0.3.7.crate https://crates.io/api/v1/crates/notify/5.0.0-pre.14/download -> notify-5.0.0-pre.14.crate https://crates.io/api/v1/crates/ntapi/0.3.7/download -> ntapi-0.3.7.crate https://crates.io/api/v1/crates/once_cell/1.10.0/download -> once_cell-1.10.0.crate https://crates.io/api/v1/crates/parking_lot/0.12.0/download -> parking_lot-0.12.0.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.2/download -> parking_lot_core-0.9.2.crate https://crates.io/api/v1/crates/proc-macro2/1.0.37/download -> proc-macro2-1.0.37.crate https://crates.io/api/v1/crates/pyo3/0.16.4/download -> pyo3-0.16.4.crate https://crates.io/api/v1/crates/pyo3-build-config/0.16.4/download -> pyo3-build-config-0.16.4.crate https://crates.io/api/v1/crates/pyo3-ffi/0.16.4/download -> pyo3-ffi-0.16.4.crate https://crates.io/api/v1/crates/pyo3-macros/0.16.4/download -> pyo3-macros-0.16.4.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.16.4/download -> pyo3-macros-backend-0.16.4.crate https://crates.io/api/v1/crates/quote/1.0.18/download -> quote-1.0.18.crate https://crates.io/api/v1/crates/redox_syscall/0.2.13/download -> redox_syscall-0.2.13.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/smallvec/1.8.0/download -> smallvec-1.8.0.crate https://crates.io/api/v1/crates/syn/1.0.91/download -> syn-1.0.91.crate https://crates.io/api/v1/crates/target-lexicon/0.12.3/download -> target-lexicon-0.12.3.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/unindent/0.1.8/download -> unindent-0.1.8.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/windows-sys/0.34.0/download -> windows-sys-0.34.0.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.34.0/download -> windows_aarch64_msvc-0.34.0.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.34.0/download -> windows_i686_gnu-0.34.0.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.34.0/download -> windows_i686_msvc-0.34.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.34.0/download -> windows_x86_64_gnu-0.34.0.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.34.0/download -> windows_x86_64_msvc-0.34.0.crate
-_eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=f1e1a6087179fad3c492171bf778376d
diff --git a/metadata/md5-cache/dev-python/weasyprint-54.3 b/metadata/md5-cache/dev-python/weasyprint-54.3
deleted file mode 100644
index 1ec7333c76e1..000000000000
--- a/metadata/md5-cache/dev-python/weasyprint-54.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( <app-text/ghostscript-gpl-9.56 media-fonts/ahem media-fonts/dejavu ) test? ( >=dev-python/cffi-0.6:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cssselect2-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/fonttools-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/html5lib-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-4.0.0[jpeg,jpeg2k,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pydyf-0.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyphen-0.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tinycss2-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/pango >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flit_core-3.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Visual rendering engine for HTML and CSS that can export to PDF
-EAPI=8
-HOMEPAGE=https://weasyprint.org https://github.com/Kozea/WeasyPrint
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/cffi-0.6:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cssselect2-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/fonttools-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/html5lib-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-4.0.0[jpeg,jpeg2k,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pydyf-0.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyphen-0.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tinycss2-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/pango python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/w/weasyprint/weasyprint-54.3.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ec8a2a29c0fb480fad416b6f5771587f
diff --git a/metadata/md5-cache/dev-python/webob-1.8.7 b/metadata/md5-cache/dev-python/webob-1.8.7
deleted file mode 100644
index 721ac6e480fa..000000000000
--- a/metadata/md5-cache/dev-python/webob-1.8.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/alabaster[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/alabaster[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/alabaster[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.7-r1:0 >=dev-python/sphinx-4.4.0[python_targets_pypy3(-)] dev-python/alabaster[python_targets_pypy3(-)] ) ) ) test? ( >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=WSGI request and response object
-EAPI=7
-HOMEPAGE=https://webob.org/
-INHERIT=distutils-r1
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/W/WebOb/WebOb-1.8.7.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=2b82bd391db25d078412a197bfe537d6
diff --git a/metadata/md5-cache/dev-python/webob-1.8.7-r1 b/metadata/md5-cache/dev-python/webob-1.8.7-r1
index c5f3ced4922e..0b912bf6eb5e 100644
--- a/metadata/md5-cache/dev-python/webob-1.8.7-r1
+++ b/metadata/md5-cache/dev-python/webob-1.8.7-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://webob.org/ https://github.com/Pylons/webob/ https://pypi.org/project/WebOb/
 INHERIT=distutils-r1
 IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/WebOb/WebOb-1.8.7.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=8849c8d5743782e644e57378b2fe09e2
+_md5_=2f4d94580707c2afcc418c1b62f73e3d
diff --git a/metadata/md5-cache/dev-python/webtest-3.0.0 b/metadata/md5-cache/dev-python/webtest-3.0.0
deleted file mode 100644
index 58a38517d59b..000000000000
--- a/metadata/md5-cache/dev-python/webtest-3.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/unzip test? ( dev-python/pyquery[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wsgiproxy2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.7-r1:0 >=dev-python/sphinx-4.4.0[python_targets_pypy3(-)] ) ) ) test? ( dev-python/paste[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pastedeploy[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/webob-1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/waitress-0.8.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/beautifulsoup4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Helper to test WSGI applications
-EAPI=8
-HOMEPAGE=https://pypi.org/project/WebTest/
-INHERIT=distutils-r1
-IUSE=test doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=dev-python/paste[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pastedeploy[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/webob-1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/waitress-0.8.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/beautifulsoup4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/W/WebTest/WebTest-3.0.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=50d22be4f1e14ae15690ca513e8fee74
diff --git a/metadata/md5-cache/dev-python/webtest-3.0.0-r1 b/metadata/md5-cache/dev-python/webtest-3.0.0-r1
index ee1fdef6eb2c..7f2117830641 100644
--- a/metadata/md5-cache/dev-python/webtest-3.0.0-r1
+++ b/metadata/md5-cache/dev-python/webtest-3.0.0-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://docs.pylonsproject.org/projects/webtest/en/latest/ https://github.com/Pylons/webtest/ https://pypi.org/project/WebTest/
 INHERIT=distutils-r1
 IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-python/paste[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pastedeploy[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/webob-1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/waitress-0.8.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/beautifulsoup4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/WebTest/WebTest-3.0.0.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=4f45e29087dd09a7a95843118681478a
+_md5_=6f63e3d0cc7b15241522c0d0cb09a8ce
diff --git a/metadata/md5-cache/dev-python/whisper-1.1.8 b/metadata/md5-cache/dev-python/whisper-1.1.8
deleted file mode 100644
index 800c5f96cc3a..000000000000
--- a/metadata/md5-cache/dev-python/whisper-1.1.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Fixed size round-robin style database
-EAPI=8
-HOMEPAGE=https://github.com/graphite-project/whisper
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/graphite-project/whisper/archive/1.1.8.tar.gz -> whisper-1.1.8.gh.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=3252860091347acf3fc1bda63b36518d
diff --git a/metadata/md5-cache/dev-python/whoosh-2.7.4-r2 b/metadata/md5-cache/dev-python/whoosh-2.7.4-r2
index 63fb8a206879..e8952b3ed843 100644
--- a/metadata/md5-cache/dev-python/whoosh-2.7.4-r2
+++ b/metadata/md5-cache/dev-python/whoosh-2.7.4-r2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/Whoosh/
 INHERIT=distutils-r1
 IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris
 LICENSE=BSD-2
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/Whoosh/Whoosh-2.7.4.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=8f6dfc04487350a8c795b45c430af67f
+_md5_=d4315bc9ac07f190fec49497a0574cb3
diff --git a/metadata/md5-cache/dev-python/wrapt-1.14.1 b/metadata/md5-cache/dev-python/wrapt-1.14.1
index fa5ed9b5f01f..ebab52034bfb 100644
--- a/metadata/md5-cache/dev-python/wrapt-1.14.1
+++ b/metadata/md5-cache/dev-python/wrapt-1.14.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/GrahamDumpleton/wrapt/ https://pypi.org/project/wrapt/
 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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/GrahamDumpleton/wrapt/archive/1.14.1.tar.gz -> wrapt-1.14.1.gh.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=5f493c443b9b2215de5c897bead70aa0
+_md5_=93821386d0e8536cb84c05fa444f60c5
diff --git a/metadata/md5-cache/dev-python/wsgiproxy2-0.5.1 b/metadata/md5-cache/dev-python/wsgiproxy2-0.5.1
deleted file mode 100644
index 2f27b560b808..000000000000
--- a/metadata/md5-cache/dev-python/wsgiproxy2-0.5.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/webtest-2.0.17[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.7-r1:0 >=dev-python/sphinx-4.4.0[python_targets_pypy3(-)] ) ) ) test? ( dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/webob[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/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=HTTP proxying tools for WSGI apps
-EAPI=8
-HOMEPAGE=https://pypi.org/project/WSGIProxy2/
-INHERIT=distutils-r1
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/webob[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/W/WSGIProxy2/WSGIProxy2-0.5.1.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=b67475e6c5c6a2824ad572aaa4929bbc
diff --git a/metadata/md5-cache/dev-python/wsgiproxy2-0.5.1-r1 b/metadata/md5-cache/dev-python/wsgiproxy2-0.5.1-r1
index b0cc3ccd2425..07c900600c56 100644
--- a/metadata/md5-cache/dev-python/wsgiproxy2-0.5.1-r1
+++ b/metadata/md5-cache/dev-python/wsgiproxy2-0.5.1-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/gawel/WSGIProxy2/ https://pypi.org/project/WSGIProxy2/
 INHERIT=distutils-r1
 IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/urllib3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/webob[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/WSGIProxy2/WSGIProxy2-0.5.1.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=14091bae6505a6753b672b2280766917
+_md5_=c8ed078143eea0fbbed4c0a68ae182cb
diff --git a/metadata/md5-cache/dev-python/xmlschema-1.10.0 b/metadata/md5-cache/dev-python/xmlschema-1.10.0
deleted file mode 100644
index 88a10b1f46ec..000000000000
--- a/metadata/md5-cache/dev-python/xmlschema-1.10.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/elementpath-2.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=An XML Schema validator and decoder
-EAPI=8
-HOMEPAGE=https://github.com/sissaschool/xmlschema/ https://pypi.org/project/xmlschema/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=>=dev-python/elementpath-2.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/x/xmlschema/xmlschema-1.10.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=efa7c48f3f425b415100d051044d6a5c
diff --git a/metadata/md5-cache/dev-python/xmlschema-1.11.0 b/metadata/md5-cache/dev-python/xmlschema-1.11.0
deleted file mode 100644
index 7199fe8d0ae9..000000000000
--- a/metadata/md5-cache/dev-python/xmlschema-1.11.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/elementpath-2.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=An XML Schema validator and decoder
-EAPI=8
-HOMEPAGE=https://github.com/sissaschool/xmlschema/ https://pypi.org/project/xmlschema/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=>=dev-python/elementpath-2.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/x/xmlschema/xmlschema-1.11.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=835171e4a13260b6ffdc35b18d7e4eb1
diff --git a/metadata/md5-cache/dev-python/xmlschema-1.11.1 b/metadata/md5-cache/dev-python/xmlschema-1.11.1
index e774ed41ffb6..a81eb34f3ee0 100644
--- a/metadata/md5-cache/dev-python/xmlschema-1.11.1
+++ b/metadata/md5-cache/dev-python/xmlschema-1.11.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/sissaschool/xmlschema/ https://pypi.org/project/xmlschema/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/elementpath-2.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xmlschema/xmlschema-1.11.1.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=835171e4a13260b6ffdc35b18d7e4eb1
+_md5_=efa7c48f3f425b415100d051044d6a5c
diff --git a/metadata/md5-cache/dev-python/yara-python-4.2.0 b/metadata/md5-cache/dev-python/yara-python-4.2.0
deleted file mode 100644
index 2561ffc32cce..000000000000
--- a/metadata/md5-cache/dev-python/yara-python-4.2.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) =app-forensics/yara-4.2* dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) =app-forensics/yara-4.2*
-DESCRIPTION=Python interface for a malware identification and classification tool
-EAPI=8
-HOMEPAGE=https://github.com/VirusTotal/yara-python
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) =app-forensics/yara-4.2* python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/virustotal/yara-python/archive/v4.2.0.tar.gz -> yara-python-4.2.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=15544568890692db94c83a536428e10b
diff --git a/metadata/md5-cache/dev-python/yarl-1.7.2-r3 b/metadata/md5-cache/dev-python/yarl-1.7.2-r3
index f43573f6a508..c4ff79174cc8 100644
--- a/metadata/md5-cache/dev-python/yarl-1.7.2-r3
+++ b/metadata/md5-cache/dev-python/yarl-1.7.2-r3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/aio-libs/yarl/ https://pypi.org/project/yarl/
 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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/multidict-4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/idna-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aio-libs/yarl/archive/v1.7.2.tar.gz -> yarl-1.7.2.gh.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=7d513936f66d4c1734e5291c39221afb
+_md5_=109c24132a0a55575b1df83146d652f8
diff --git a/metadata/md5-cache/dev-python/yaxmldiff-0.1.0 b/metadata/md5-cache/dev-python/yaxmldiff-0.1.0
new file mode 100644
index 000000000000..695f1d44db50
--- /dev/null
+++ b/metadata/md5-cache/dev-python/yaxmldiff-0.1.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/lxml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Yet Another XML Differ
+EAPI=8
+HOMEPAGE=https://pypi.org/project/yaxmldiff/ https://github.com/latk/yaxmldiff.py
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/lxml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/latk/yaxmldiff.py/archive/refs/tags/v0.1.0.tar.gz -> yaxmldiff-0.1.0.gh.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=9f567ea8b4ad903ea6a3fb3f4d07655d
diff --git a/metadata/md5-cache/dev-python/zeroconf-0.38.7 b/metadata/md5-cache/dev-python/zeroconf-0.38.7
new file mode 100644
index 000000000000..fd128520d6e2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/zeroconf-0.38.7
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/ifaddr-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)
+EAPI=8
+HOMEPAGE=https://github.com/jstasiak/python-zeroconf/ https://pypi.org/project/zeroconf/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-python/ifaddr-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/jstasiak/python-zeroconf/archive/0.38.7.tar.gz -> python-zeroconf-0.38.7.gh.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=da43d6ee4ad906576a720ebd7c046439
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index 5df12619d1ff..8bc780e54042 100644
Binary files a/metadata/md5-cache/dev-qt/Manifest.gz and b/metadata/md5-cache/dev-qt/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-qt/assistant-5.15.4 b/metadata/md5-cache/dev-qt/assistant-5.15.4
index c02619c0f8e3..93a41eae0d44 100644
--- a/metadata/md5-cache/dev-qt/assistant-5.15.4
+++ b/metadata/md5-cache/dev-qt/assistant-5.15.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=desktop qt5-build xdg-utils
 IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.4*:5= =dev-qt/qtgui-5.15.4*[png] =dev-qt/qthelp-5.15.4* =dev-qt/qtnetwork-5.15.4* =dev-qt/qtprintsupport-5.15.4* =dev-qt/qtsql-5.15.4*[sqlite] =dev-qt/qtwidgets-5.15.4* !dev-qt/assistant:5 !<dev-qt/qtchooser-66-r2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qttools-everywhere-opensource-src-5.15.4.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=476349afb20cfafc9924390a20e84a85
+_md5_=63ebd3440784062a25a1fa997718998f
diff --git a/metadata/md5-cache/dev-qt/designer-5.15.4 b/metadata/md5-cache/dev-qt/designer-5.15.4
index 08556d301059..f4530decf15a 100644
--- a/metadata/md5-cache/dev-qt/designer-5.15.4
+++ b/metadata/md5-cache/dev-qt/designer-5.15.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=desktop qt5-build xdg-utils
 IUSE=declarative debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.4*:5= =dev-qt/qtgui-5.15.4*:5=[png] =dev-qt/qtnetwork-5.15.4* =dev-qt/qtprintsupport-5.15.4* =dev-qt/qtwidgets-5.15.4* =dev-qt/qtxml-5.15.4* declarative? ( =dev-qt/qtdeclarative-5.15.4*[widgets] )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qttools-everywhere-opensource-src-5.15.4.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ebbc963dbd4da66698a3f40dc0aeef2c
+_md5_=b5098cbb0b5f4da79db62c3e28a2d745
diff --git a/metadata/md5-cache/dev-qt/linguist-5.15.4 b/metadata/md5-cache/dev-qt/linguist-5.15.4
index d877a4362f6a..b8d10883442d 100644
--- a/metadata/md5-cache/dev-qt/linguist-5.15.4
+++ b/metadata/md5-cache/dev-qt/linguist-5.15.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=desktop qt5-build xdg-utils
 IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/designer-5.15.4* =dev-qt/qtcore-5.15.4*:5= =dev-qt/qtgui-5.15.4*:5=[png] =dev-qt/qtprintsupport-5.15.4* =dev-qt/qtwidgets-5.15.4* =dev-qt/qtxml-5.15.4* !dev-qt/linguist:5 !<dev-qt/qtchooser-66-r2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qttools-everywhere-opensource-src-5.15.4.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=1a1466a0a4c5b8add89c8c9740adb56a
+_md5_=5c066688743d843ab57c591f740bc18f
diff --git a/metadata/md5-cache/dev-qt/linguist-tools-5.15.4 b/metadata/md5-cache/dev-qt/linguist-tools-5.15.4
index 9412987a726a..ebf6f553745d 100644
--- a/metadata/md5-cache/dev-qt/linguist-tools-5.15.4
+++ b/metadata/md5-cache/dev-qt/linguist-tools-5.15.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt5-build
 IUSE=qml debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.4*:5= =dev-qt/qtxml-5.15.4* qml? ( =dev-qt/qtdeclarative-5.15.4* )
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qttools-everywhere-opensource-src-5.15.4.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=ebe9fc6e49d058d44cc5e823c78df0f4
+_md5_=ca55c2c92c5bcedff3cc185a7785c5d9
diff --git a/metadata/md5-cache/dev-qt/pixeltool-5.15.4 b/metadata/md5-cache/dev-qt/pixeltool-5.15.4
index 98f21fadafa9..0026f22d3e3e 100644
--- a/metadata/md5-cache/dev-qt/pixeltool-5.15.4
+++ b/metadata/md5-cache/dev-qt/pixeltool-5.15.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt5-build
 IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.4*:5= =dev-qt/qtgui-5.15.4*:5=[png] =dev-qt/qtwidgets-5.15.4* !dev-qt/pixeltool:5 !<dev-qt/qtchooser-66-r2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qttools-everywhere-opensource-src-5.15.4.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=335106e174994e5b3a4509e7d978d8ad
+_md5_=044a120a48b8161ec1aa74204e349f88
diff --git a/metadata/md5-cache/dev-qt/qdbus-5.15.4 b/metadata/md5-cache/dev-qt/qdbus-5.15.4
index 100fe91d1dc0..8cf321cde250 100644
--- a/metadata/md5-cache/dev-qt/qdbus-5.15.4
+++ b/metadata/md5-cache/dev-qt/qdbus-5.15.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt5-build
 IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.4* =dev-qt/qtdbus-5.15.4* =dev-qt/qtxml-5.15.4* !dev-qt/qdbus:5 !<dev-qt/qtchooser-66-r2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qttools-everywhere-opensource-src-5.15.4.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=fb475c98913612ed9d7a21d49ba25cf8
+_md5_=31caed7a911b9907cb257c99ca94ae1e
diff --git a/metadata/md5-cache/dev-qt/qdbusviewer-5.15.4 b/metadata/md5-cache/dev-qt/qdbusviewer-5.15.4
index 346f504ab60e..65b5a0f92fc5 100644
--- a/metadata/md5-cache/dev-qt/qdbusviewer-5.15.4
+++ b/metadata/md5-cache/dev-qt/qdbusviewer-5.15.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=desktop qt5-build xdg-utils
 IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.4* =dev-qt/qtdbus-5.15.4* =dev-qt/qtgui-5.15.4* =dev-qt/qtwidgets-5.15.4* =dev-qt/qtxml-5.15.4* !dev-qt/qdbusviewer:5 !<dev-qt/qtchooser-66-r2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qttools-everywhere-opensource-src-5.15.4.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=cebb070e5b30da0f220d547b14bd210b
+_md5_=31420105aa4bacbdce4a941022c39848
diff --git a/metadata/md5-cache/dev-qt/qdoc-5.15.3 b/metadata/md5-cache/dev-qt/qdoc-5.15.3
deleted file mode 100644
index abc420857856..000000000000
--- a/metadata/md5-cache/dev-qt/qdoc-5.15.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-qt/qtcore-5.15.3*:5= sys-devel/clang:= qml? ( =dev-qt/qtdeclarative-5.15.3* ) test? ( =dev-qt/qttest-5.15.3* )
-DESCRIPTION=Qt documentation generator
-EAPI=8
-HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qttools https://community.kde.org/Qt5PatchCollection
-INHERIT=qt5-build
-IUSE=qml debug test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.3*:5= sys-devel/clang:= qml? ( =dev-qt/qtdeclarative-5.15.3* )
-RESTRICT=test
-SLOT=5
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qttools-everywhere-opensource-src-5.15.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.3-gentoo-kde-1.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=fbda7da59db59dffde84b5e07370a566
diff --git a/metadata/md5-cache/dev-qt/qdoc-5.15.4 b/metadata/md5-cache/dev-qt/qdoc-5.15.4
index 9f192149d27f..25a16a1898a3 100644
--- a/metadata/md5-cache/dev-qt/qdoc-5.15.4
+++ b/metadata/md5-cache/dev-qt/qdoc-5.15.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt5-build
 IUSE=qml debug test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.4*:5= sys-devel/clang:= qml? ( =dev-qt/qtdeclarative-5.15.4* )
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qttools-everywhere-opensource-src-5.15.4.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=c3bf28160148944ae4b1eaa2c2ff1c9d
+_md5_=2719bc9d4b84ac9c8203be9d0cc96c9d
diff --git a/metadata/md5-cache/dev-qt/qt3d-5.15.3-r1 b/metadata/md5-cache/dev-qt/qt3d-5.15.3-r1
deleted file mode 100644
index f9c3c112e422..000000000000
--- a/metadata/md5-cache/dev-qt/qt3d-5.15.3-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-qt/qtconcurrent-5.15.3* =dev-qt/qtcore-5.15.3* =dev-qt/qtgui-5.15.3*:5=[vulkan=] =dev-qt/qtnetwork-5.15.3* >=media-libs/assimp-4.0.0:= gamepad? ( =dev-qt/qtgamepad-5.15.3* ) qml? ( =dev-qt/qtdeclarative-5.15.3*[gles2-only=] ) vulkan? ( dev-util/vulkan-headers ) test? ( =dev-qt/qttest-5.15.3* )
-DESCRIPTION=3D rendering module for the Qt5 framework
-EAPI=8
-HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qt3d https://community.kde.org/Qt5PatchCollection
-INHERIT=qt5-build
-IUSE=gamepad gles2-only qml vulkan debug test
-KEYWORDS=amd64 ~arm arm64 ~riscv x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtconcurrent-5.15.3* =dev-qt/qtcore-5.15.3* =dev-qt/qtgui-5.15.3*:5=[vulkan=] =dev-qt/qtnetwork-5.15.3* >=media-libs/assimp-4.0.0:= gamepad? ( =dev-qt/qtgamepad-5.15.3* ) qml? ( =dev-qt/qtdeclarative-5.15.3*[gles2-only=] )
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qt3d-everywhere-opensource-src-5.15.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qt3d-5.15.3-gentoo-kde-1.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=6c853b494e0be6fe5f112f243485360f
diff --git a/metadata/md5-cache/dev-qt/qt3d-5.15.4-r1 b/metadata/md5-cache/dev-qt/qt3d-5.15.4-r1
index ab1439a73c7b..d3cd8ed2d54e 100644
--- a/metadata/md5-cache/dev-qt/qt3d-5.15.4-r1
+++ b/metadata/md5-cache/dev-qt/qt3d-5.15.4-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qt3d https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=gamepad gles2-only qml vulkan debug test
-KEYWORDS=amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtconcurrent-5.15.4* =dev-qt/qtcore-5.15.4* =dev-qt/qtgui-5.15.4*:5=[vulkan=] =dev-qt/qtnetwork-5.15.4* >=media-libs/assimp-4.0.0:= gamepad? ( =dev-qt/qtgamepad-5.15.4* ) qml? ( =dev-qt/qtdeclarative-5.15.4*[gles2-only=] )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qt3d-everywhere-opensource-src-5.15.4.tar.xz https://dev.gentoo.org/~asturm/distfiles/qt3d-5.15.4-gentoo-kde-1.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=465a93d900541ef6253af48f8c1263c8
+_md5_=6c853b494e0be6fe5f112f243485360f
diff --git a/metadata/md5-cache/dev-qt/qtbluetooth-5.15.3 b/metadata/md5-cache/dev-qt/qtbluetooth-5.15.3
deleted file mode 100644
index 4919cf1020ab..000000000000
--- a/metadata/md5-cache/dev-qt/qtbluetooth-5.15.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-qt/qtconcurrent-5.15.3* =dev-qt/qtcore-5.15.3*:5= =dev-qt/qtdbus-5.15.3* =dev-qt/qtnetwork-5.15.3* >=net-wireless/bluez-5:= qml? ( =dev-qt/qtdeclarative-5.15.3* ) test? ( =dev-qt/qttest-5.15.3* )
-DESCRIPTION=Bluetooth support library for the Qt5 framework
-EAPI=8
-HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtconnectivity https://community.kde.org/Qt5PatchCollection
-INHERIT=qt5-build
-IUSE=qml debug test
-KEYWORDS=amd64 arm arm64 ~ppc64 ~riscv x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtconcurrent-5.15.3* =dev-qt/qtcore-5.15.3*:5= =dev-qt/qtdbus-5.15.3* =dev-qt/qtnetwork-5.15.3* >=net-wireless/bluez-5:= qml? ( =dev-qt/qtdeclarative-5.15.3* )
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtconnectivity-everywhere-opensource-src-5.15.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtconnectivity-5.15.3-gentoo-kde-1.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=0cc697441f6ca9b5a642f68826a055ae
diff --git a/metadata/md5-cache/dev-qt/qtbluetooth-5.15.4 b/metadata/md5-cache/dev-qt/qtbluetooth-5.15.4
index 60715a49b2e3..10e99ae30189 100644
--- a/metadata/md5-cache/dev-qt/qtbluetooth-5.15.4
+++ b/metadata/md5-cache/dev-qt/qtbluetooth-5.15.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtconnectivity https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=qml debug test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtconcurrent-5.15.4* =dev-qt/qtcore-5.15.4*:5= =dev-qt/qtdbus-5.15.4* =dev-qt/qtnetwork-5.15.4* >=net-wireless/bluez-5:= qml? ( =dev-qt/qtdeclarative-5.15.4* )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qtconnectivity-everywhere-opensource-src-5.15.4.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtconnectivity-5.15.4-gentoo-kde-1.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=d0f3f51ba491910d7c23befb079542d8
+_md5_=0cc697441f6ca9b5a642f68826a055ae
diff --git a/metadata/md5-cache/dev-qt/qtcharts-5.15.4 b/metadata/md5-cache/dev-qt/qtcharts-5.15.4
index ed5a9a7d0dfa..70b61e02bcde 100644
--- a/metadata/md5-cache/dev-qt/qtcharts-5.15.4
+++ b/metadata/md5-cache/dev-qt/qtcharts-5.15.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt5-build
 IUSE=qml debug test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=GPL-3
 RDEPEND==dev-qt/qtcore-5.15.4* =dev-qt/qtgui-5.15.4* =dev-qt/qtwidgets-5.15.4* qml? ( =dev-qt/qtdeclarative-5.15.4* )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qtcharts-everywhere-opensource-src-5.15.4.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=d8e8c5409f5ad7d270f2eaae704da690
+_md5_=92a79ec0dd2a5ba3bf633095a00a0b0f
diff --git a/metadata/md5-cache/dev-qt/qtconcurrent-5.15.4 b/metadata/md5-cache/dev-qt/qtconcurrent-5.15.4
index 2c8435f843a3..c40952a71e52 100644
--- a/metadata/md5-cache/dev-qt/qtconcurrent-5.15.4
+++ b/metadata/md5-cache/dev-qt/qtconcurrent-5.15.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.4*:5=
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qtbase-everywhere-opensource-src-5.15.4.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.4-gentoo-kde-1.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=78f580c3f3ca95b6f7bd001513277064
+_md5_=67fde0c6d87c39d58251baa5c17d1248
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.15.4-r2 b/metadata/md5-cache/dev-qt/qtcore-5.15.4-r2
index d8514a7bb968..ab009b047a70 100644
--- a/metadata/md5-cache/dev-qt/qtcore-5.15.4-r2
+++ b/metadata/md5-cache/dev-qt/qtcore-5.15.4-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 INHERIT=linux-info flag-o-matic qt5-build
 IUSE=icu old-kernel systemd debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib:= icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= )
 RESTRICT=test
 SLOT=5/5.15.4
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qtbase-everywhere-opensource-src-5.15.4.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.4-gentoo-kde-2.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=81102a9d7eee459d2cfb4cdd03477982
+_md5_=2cf760d3f15d144a5819720c7d1bedd8
diff --git a/metadata/md5-cache/dev-qt/qtdatavis3d-5.15.3 b/metadata/md5-cache/dev-qt/qtdatavis3d-5.15.3
deleted file mode 100644
index 1c9dc1d1021b..000000000000
--- a/metadata/md5-cache/dev-qt/qtdatavis3d-5.15.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-qt/qtcore-5.15.3* =dev-qt/qtgui-5.15.3*[gles2-only=] qml? ( =dev-qt/qtdeclarative-5.15.3*[gles2-only=] ) test? ( =dev-qt/qttest-5.15.3* )
-DESCRIPTION=3D data visualization library for the Qt5 framework
-EAPI=8
-HOMEPAGE=https://www.qt.io/
-INHERIT=qt5-build
-IUSE=gles2-only qml debug test
-KEYWORDS=amd64 ~arm arm64 x86
-LICENSE=GPL-3
-RDEPEND==dev-qt/qtcore-5.15.3* =dev-qt/qtgui-5.15.3*[gles2-only=] qml? ( =dev-qt/qtdeclarative-5.15.3*[gles2-only=] )
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtdatavis3d-everywhere-opensource-src-5.15.3.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=8fe6baee7361c9453de0282f14eff65f
diff --git a/metadata/md5-cache/dev-qt/qtdatavis3d-5.15.4 b/metadata/md5-cache/dev-qt/qtdatavis3d-5.15.4
index 6504c500da98..037d05ab1409 100644
--- a/metadata/md5-cache/dev-qt/qtdatavis3d-5.15.4
+++ b/metadata/md5-cache/dev-qt/qtdatavis3d-5.15.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt5-build
 IUSE=gles2-only qml debug test
-KEYWORDS=amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-3
 RDEPEND==dev-qt/qtcore-5.15.4* =dev-qt/qtgui-5.15.4*[gles2-only=] qml? ( =dev-qt/qtdeclarative-5.15.4*[gles2-only=] )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qtdatavis3d-everywhere-opensource-src-5.15.4.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=61c0f31330bc330c29b5d0634265bf58
+_md5_=8fe6baee7361c9453de0282f14eff65f
diff --git a/metadata/md5-cache/dev-qt/qtdbus-5.15.4 b/metadata/md5-cache/dev-qt/qtdbus-5.15.4
index 41a27979d375..e12d75c79f6b 100644
--- a/metadata/md5-cache/dev-qt/qtdbus-5.15.4
+++ b/metadata/md5-cache/dev-qt/qtdbus-5.15.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.4*:5= sys-apps/dbus
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qtbase-everywhere-opensource-src-5.15.4.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.4-gentoo-kde-1.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=7e4801ddf6b6b8aa012ddf588d1e6bfe
+_md5_=a7a064c1d517e77a1b520dc08348f201
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.15.4 b/metadata/md5-cache/dev-qt/qtdeclarative-5.15.4
index 7723dbde9bd6..2f27cc191fe9 100644
--- a/metadata/md5-cache/dev-qt/qtdeclarative-5.15.4
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-5.15.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtdeclarative https://community.kde.org/Qt5PatchCollection
 INHERIT=python-any-r1 qt5-build
 IUSE=gles2-only +jit localstorage vulkan +widgets debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.4* =dev-qt/qtgui-5.15.4*:5=[gles2-only=,vulkan=] =dev-qt/qtnetwork-5.15.4* =dev-qt/qttest-5.15.4* media-libs/libglvnd localstorage? ( =dev-qt/qtsql-5.15.4* ) widgets? ( =dev-qt/qtwidgets-5.15.4*[gles2-only=] )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qtdeclarative-everywhere-opensource-src-5.15.4.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtdeclarative-5.15.4-gentoo-kde-1.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=d091f4f0e04980871bfc21509ca302d9
+_md5_=3ac55a1b43e6cad6bd7cc593aa8779ea
diff --git a/metadata/md5-cache/dev-qt/qtdiag-5.15.3 b/metadata/md5-cache/dev-qt/qtdiag-5.15.3
deleted file mode 100644
index 0a65afc24679..000000000000
--- a/metadata/md5-cache/dev-qt/qtdiag-5.15.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-qt/qtcore-5.15.3*:5= =dev-qt/qtgui-5.15.3*:5= network? ( =dev-qt/qtnetwork-5.15.3*[ssl] ) widgets? ( =dev-qt/qtwidgets-5.15.3* ) test? ( =dev-qt/qttest-5.15.3* )
-DESCRIPTION=Tool for reporting diagnostic information about Qt and its environment
-EAPI=8
-HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qttools https://community.kde.org/Qt5PatchCollection
-INHERIT=qt5-build
-IUSE=+network +widgets debug test
-KEYWORDS=amd64 ~arm ~hppa ~ppc64 ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.3*:5= =dev-qt/qtgui-5.15.3*:5= network? ( =dev-qt/qtnetwork-5.15.3*[ssl] ) widgets? ( =dev-qt/qtwidgets-5.15.3* )
-RESTRICT=test
-SLOT=5
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qttools-everywhere-opensource-src-5.15.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.3-gentoo-kde-1.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=5dc8d7cd77ddcb1b6dde4bcae368413f
diff --git a/metadata/md5-cache/dev-qt/qtdiag-5.15.4 b/metadata/md5-cache/dev-qt/qtdiag-5.15.4
index 41709ed30921..1dd70e9780f8 100644
--- a/metadata/md5-cache/dev-qt/qtdiag-5.15.4
+++ b/metadata/md5-cache/dev-qt/qtdiag-5.15.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt5-build
 IUSE=+network +widgets debug test
-KEYWORDS=amd64 ~arm ~hppa ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~hppa ~ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.4*:5= =dev-qt/qtgui-5.15.4*:5= network? ( =dev-qt/qtnetwork-5.15.4*[ssl] ) widgets? ( =dev-qt/qtwidgets-5.15.4* )
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qttools-everywhere-opensource-src-5.15.4.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=61e0c71cf584c2af234044c6ad0b17b9
+_md5_=cbc79dfcb7994f1d24ee02d993272ab1
diff --git a/metadata/md5-cache/dev-qt/qtgamepad-5.15.3 b/metadata/md5-cache/dev-qt/qtgamepad-5.15.3
deleted file mode 100644
index 8f935ca03d9c..000000000000
--- a/metadata/md5-cache/dev-qt/qtgamepad-5.15.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-qt/qtcore-5.15.3* =dev-qt/qtgui-5.15.3*[evdev?] evdev? ( virtual/libudev:= ) qml? ( =dev-qt/qtdeclarative-5.15.3* ) sdl? ( media-libs/libsdl2 ) test? ( =dev-qt/qttest-5.15.3* )
-DESCRIPTION=Qt module to support gamepad hardware
-EAPI=8
-HOMEPAGE=https://www.qt.io/
-INHERIT=qt5-build
-IUSE=evdev qml sdl debug test
-KEYWORDS=amd64 ~arm arm64 ~riscv x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.3* =dev-qt/qtgui-5.15.3*[evdev?] evdev? ( virtual/libudev:= ) qml? ( =dev-qt/qtdeclarative-5.15.3* ) sdl? ( media-libs/libsdl2 )
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtgamepad-everywhere-opensource-src-5.15.3.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=708331686dae6f6fcf87086962c63b7d
diff --git a/metadata/md5-cache/dev-qt/qtgamepad-5.15.4 b/metadata/md5-cache/dev-qt/qtgamepad-5.15.4
index 593b2f8b3ee6..8b0452b9c6a3 100644
--- a/metadata/md5-cache/dev-qt/qtgamepad-5.15.4
+++ b/metadata/md5-cache/dev-qt/qtgamepad-5.15.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt5-build
 IUSE=evdev qml sdl debug test
-KEYWORDS=amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.4* =dev-qt/qtgui-5.15.4*[evdev?] evdev? ( virtual/libudev:= ) qml? ( =dev-qt/qtdeclarative-5.15.4* ) sdl? ( media-libs/libsdl2 )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qtgamepad-everywhere-opensource-src-5.15.4.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=7ca0a0e22484b7a42dba8833b0ad4397
+_md5_=708331686dae6f6fcf87086962c63b7d
diff --git a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.15.4 b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.15.4
index 64913851fd47..24a4d7387ba1 100644
--- a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.15.4
+++ b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.15.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt5-build
 IUSE=test debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.4* =dev-qt/qtdeclarative-5.15.4* =dev-qt/qtgui-5.15.4*
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qtgraphicaleffects-everywhere-opensource-src-5.15.4.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=f94d093006a9aa5c645e9d32acd992ce
+_md5_=ab7082ecbb98ef90ace512e87fc3edbe
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.15.4 b/metadata/md5-cache/dev-qt/qtgui-5.15.4
index 269a4fa9ed78..08512feec8c5 100644
--- a/metadata/md5-cache/dev-qt/qtgui-5.15.4
+++ b/metadata/md5-cache/dev-qt/qtgui-5.15.4
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg +libinput linuxfb +png tslib tuio +udev vnc vulkan wayland +X debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PDEPEND=ibus? ( app-i18n/ibus ) wayland? ( =dev-qt/qtwayland-5.15.4* )
 RDEPEND=dev-libs/glib:2 =dev-qt/qtcore-5.15.4*:5= dev-util/gtk-update-icon-cache media-libs/fontconfig media-libs/freetype:2 media-libs/harfbuzz:= sys-libs/zlib:= dbus? ( =dev-qt/qtdbus-5.15.4* ) eglfs? ( media-libs/mesa[gbm(+)] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) jpeg? ( media-libs/libjpeg-turbo:= ) gles2-only? ( media-libs/libglvnd ) !gles2-only? ( media-libs/libglvnd[X] ) libinput? ( dev-libs/libinput:= x11-libs/libxkbcommon ) png? ( media-libs/libpng:= ) tslib? ( >=x11-libs/tslib-1.21 ) tuio? ( =dev-qt/qtnetwork-5.15.4* ) udev? ( virtual/libudev:= ) vnc? ( =dev-qt/qtnetwork-5.15.4* ) vulkan? ( dev-util/vulkan-headers ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb:=[xkb] x11-libs/libxkbcommon[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm )
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=5/5.15.4
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qtbase-everywhere-opensource-src-5.15.4.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.4-gentoo-kde-1.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=15a83e4b06f4df4b05694a22d819774b
+_md5_=7582601bd750773bb5b3b58eada5cac7
diff --git a/metadata/md5-cache/dev-qt/qthelp-5.15.4 b/metadata/md5-cache/dev-qt/qthelp-5.15.4
index 75b6b91541b3..27b87b0abaa3 100644
--- a/metadata/md5-cache/dev-qt/qthelp-5.15.4
+++ b/metadata/md5-cache/dev-qt/qthelp-5.15.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt5-build
 IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.4*:5= =dev-qt/qtgui-5.15.4* =dev-qt/qtsql-5.15.4*[sqlite] =dev-qt/qtwidgets-5.15.4*
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qttools-everywhere-opensource-src-5.15.4.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=7cbf254dac439b3abe74b94f544faf73
+_md5_=ee46465fe5fef065863a7d675627bf35
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.15.4 b/metadata/md5-cache/dev-qt/qtimageformats-5.15.4
index 06275a07c698..fc29ff0182ef 100644
--- a/metadata/md5-cache/dev-qt/qtimageformats-5.15.4
+++ b/metadata/md5-cache/dev-qt/qtimageformats-5.15.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtimageformats https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=mng debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.4* =dev-qt/qtgui-5.15.4* media-libs/libwebp:= media-libs/tiff:0 mng? ( media-libs/libmng:= )
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qtimageformats-everywhere-opensource-src-5.15.4.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtimageformats-5.15.4-gentoo-kde-1.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=28c8a59e6d982b4164b3e548d978f4fd
+_md5_=f335edb8a4488c2c483d5d69699cd520
diff --git a/metadata/md5-cache/dev-qt/qtlocation-5.15.3-r1 b/metadata/md5-cache/dev-qt/qtlocation-5.15.3-r1
deleted file mode 100644
index 15ae2f3464e7..000000000000
--- a/metadata/md5-cache/dev-qt/qtlocation-5.15.3-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-libs/icu:= =dev-qt/qtcore-5.15.3* =dev-qt/qtdeclarative-5.15.3* =dev-qt/qtgui-5.15.3* =dev-qt/qtnetwork-5.15.3* =dev-qt/qtpositioning-5.15.3*[qml] =dev-qt/qtsql-5.15.3* sys-libs/zlib =dev-qt/qtconcurrent-5.15.3* test? ( =dev-qt/qttest-5.15.3* )
-DESCRIPTION=Location (places, maps, navigation) library for the Qt5 framework
-EAPI=8
-HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtlocation https://community.kde.org/Qt5PatchCollection
-INHERIT=qt5-build
-IUSE=debug test
-KEYWORDS=amd64 arm arm64 ~riscv x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=dev-libs/icu:= =dev-qt/qtcore-5.15.3* =dev-qt/qtdeclarative-5.15.3* =dev-qt/qtgui-5.15.3* =dev-qt/qtnetwork-5.15.3* =dev-qt/qtpositioning-5.15.3*[qml] =dev-qt/qtsql-5.15.3* sys-libs/zlib
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtlocation-everywhere-opensource-src-5.15.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtlocation-5.15.3-gentoo-kde-2.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=6a0240e858b42231b4aca00320d3705b
diff --git a/metadata/md5-cache/dev-qt/qtlocation-5.15.4 b/metadata/md5-cache/dev-qt/qtlocation-5.15.4
index 4fc853e13711..82a283c9e1a3 100644
--- a/metadata/md5-cache/dev-qt/qtlocation-5.15.4
+++ b/metadata/md5-cache/dev-qt/qtlocation-5.15.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtlocation https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=dev-libs/icu:= =dev-qt/qtcore-5.15.4* =dev-qt/qtdeclarative-5.15.4* =dev-qt/qtgui-5.15.4* =dev-qt/qtnetwork-5.15.4* =dev-qt/qtpositioning-5.15.4*[qml] =dev-qt/qtsql-5.15.4* sys-libs/zlib
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qtlocation-everywhere-opensource-src-5.15.4.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtlocation-5.15.4-gentoo-kde-1.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=e7b5f6f908a885e1f26b9f18fea0a355
+_md5_=4961ce9fb8bf052e3b75ba9fa2446a3e
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-5.15.4-r1 b/metadata/md5-cache/dev-qt/qtmultimedia-5.15.4-r1
index e55948ed4da4..f73a58d75850 100644
--- a/metadata/md5-cache/dev-qt/qtmultimedia-5.15.4-r1
+++ b/metadata/md5-cache/dev-qt/qtmultimedia-5.15.4-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtmultimedia https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=alsa gles2-only gstreamer openal pulseaudio qml widgets debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.4* =dev-qt/qtgui-5.15.4*[gles2-only=] =dev-qt/qtnetwork-5.15.4* alsa? ( media-libs/alsa-lib ) gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-base:1.0 ) pulseaudio? ( media-sound/pulseaudio[glib] ) qml? ( =dev-qt/qtdeclarative-5.15.4* gles2-only? ( =dev-qt/qtgui-5.15.4*[egl] ) openal? ( media-libs/openal ) ) widgets? ( =dev-qt/qtwidgets-5.15.4*[gles2-only=] media-libs/libglvnd )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qtmultimedia-everywhere-opensource-src-5.15.4.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtmultimedia-5.15.4-gentoo-kde-1.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=4f434ffa5d0cc44fe883b16364b4f6a1
+_md5_=6ce4ee566ee29aec4dc13693bf0dd5f5
diff --git a/metadata/md5-cache/dev-qt/qtnetwork-5.15.4 b/metadata/md5-cache/dev-qt/qtnetwork-5.15.4
index 68b6c31ba938..2b751e745f7c 100644
--- a/metadata/md5-cache/dev-qt/qtnetwork-5.15.4
+++ b/metadata/md5-cache/dev-qt/qtnetwork-5.15.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=connman gssapi libproxy networkmanager sctp +ssl debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.4*:5= sys-libs/zlib:= connman? ( =dev-qt/qtdbus-5.15.4* ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) networkmanager? ( =dev-qt/qtdbus-5.15.4* ) sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) ssl? ( >=dev-libs/openssl-1.1.1:0= ) connman? ( net-misc/connman ) networkmanager? ( net-misc/networkmanager )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qtbase-everywhere-opensource-src-5.15.4.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.4-gentoo-kde-1.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=cf9760923f84dd35bfd1dc21b7f57e58
+_md5_=a65b20551f467198fc93f98a3d9bfdfd
diff --git a/metadata/md5-cache/dev-qt/qtnetworkauth-5.15.3 b/metadata/md5-cache/dev-qt/qtnetworkauth-5.15.3
deleted file mode 100644
index 9626c8079b1a..000000000000
--- a/metadata/md5-cache/dev-qt/qtnetworkauth-5.15.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-qt/qtcore-5.15.3* =dev-qt/qtnetwork-5.15.3* test? ( =dev-qt/qttest-5.15.3* )
-DESCRIPTION=Network authorization library for the Qt5 framework
-EAPI=8
-HOMEPAGE=https://www.qt.io/
-INHERIT=qt5-build
-IUSE=debug test
-KEYWORDS=amd64 arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-3
-RDEPEND==dev-qt/qtcore-5.15.3* =dev-qt/qtnetwork-5.15.3*
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtnetworkauth-everywhere-opensource-src-5.15.3.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=8771aaac50cee9441b703383f6c402fa
diff --git a/metadata/md5-cache/dev-qt/qtnetworkauth-5.15.4 b/metadata/md5-cache/dev-qt/qtnetworkauth-5.15.4
index b7e6ffc1bdd2..1138d78afdef 100644
--- a/metadata/md5-cache/dev-qt/qtnetworkauth-5.15.4
+++ b/metadata/md5-cache/dev-qt/qtnetworkauth-5.15.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt5-build
 IUSE=debug test
-KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-3
 RDEPEND==dev-qt/qtcore-5.15.4* =dev-qt/qtnetwork-5.15.4*
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qtnetworkauth-everywhere-opensource-src-5.15.4.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=247457db9d1951e1f711178776dad935
+_md5_=8771aaac50cee9441b703383f6c402fa
diff --git a/metadata/md5-cache/dev-qt/qtopengl-5.15.4 b/metadata/md5-cache/dev-qt/qtopengl-5.15.4
index 1444d882cf80..c78a5ed3e0c9 100644
--- a/metadata/md5-cache/dev-qt/qtopengl-5.15.4
+++ b/metadata/md5-cache/dev-qt/qtopengl-5.15.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=gles2-only test debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.4*:5= =dev-qt/qtgui-5.15.4*[gles2-only=] =dev-qt/qtwidgets-5.15.4*[gles2-only=]
 RESTRICT=!test? ( test ) test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qtbase-everywhere-opensource-src-5.15.4.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.4-gentoo-kde-1.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=ed8ee55e4a6aae4a389fe45216e93e9c
+_md5_=2e5866d4eb55cecd5a0fc86a73aa169d
diff --git a/metadata/md5-cache/dev-qt/qtpaths-5.15.4 b/metadata/md5-cache/dev-qt/qtpaths-5.15.4
index 73ad9980d685..8ce1228003e6 100644
--- a/metadata/md5-cache/dev-qt/qtpaths-5.15.4
+++ b/metadata/md5-cache/dev-qt/qtpaths-5.15.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt5-build
 IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.4*
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qttools-everywhere-opensource-src-5.15.4.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=f283dd90293b01b1931d2069d80952cc
+_md5_=1c16de0375779c493b7bec2d4a3cd549
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-5.15.4 b/metadata/md5-cache/dev-qt/qtpositioning-5.15.4
index 518b76f93bfa..de6f184dafae 100644
--- a/metadata/md5-cache/dev-qt/qtpositioning-5.15.4
+++ b/metadata/md5-cache/dev-qt/qtpositioning-5.15.4
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt5-build
 IUSE=geoclue +qml debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PDEPEND=geoclue? ( app-misc/geoclue:2.0 )
 RDEPEND==dev-qt/qtcore-5.15.4* geoclue? ( =dev-qt/qtdbus-5.15.4* ) qml? ( =dev-qt/qtdeclarative-5.15.4* )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qtlocation-everywhere-opensource-src-5.15.4.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=2f8558559e6e76bd610914c44c1846aa
+_md5_=89e2e8cf069a2268ab4ea483bdd65bb5
diff --git a/metadata/md5-cache/dev-qt/qtprintsupport-5.15.4 b/metadata/md5-cache/dev-qt/qtprintsupport-5.15.4
index f5e6038fdc2e..ad451efec299 100644
--- a/metadata/md5-cache/dev-qt/qtprintsupport-5.15.4
+++ b/metadata/md5-cache/dev-qt/qtprintsupport-5.15.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=cups gles2-only test debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.4*:5= =dev-qt/qtgui-5.15.4*[gles2-only=] =dev-qt/qtwidgets-5.15.4*[gles2-only=] cups? ( net-print/cups )
 RESTRICT=!test? ( test ) test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qtbase-everywhere-opensource-src-5.15.4.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.4-gentoo-kde-1.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=55880bb63cd2b6e677d1c88a30d467ca
+_md5_=ccd5538912c2b96a157a7a89e760b46d
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols-5.15.4 b/metadata/md5-cache/dev-qt/qtquickcontrols-5.15.4
index 07683d06da70..164a63a58888 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols-5.15.4
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols-5.15.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt5-build
 IUSE=+widgets debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.4* =dev-qt/qtdeclarative-5.15.4* =dev-qt/qtgui-5.15.4* widgets? ( =dev-qt/qtwidgets-5.15.4* )
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qtquickcontrols-everywhere-opensource-src-5.15.4.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=b7759830d6d7c30389498b9942b63d66
+_md5_=482324a50886807c9ced2a6552f9a707
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.3 b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.3
deleted file mode 100644
index 4672572ea1b1..000000000000
--- a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-qt/qtcore-5.15.3* =dev-qt/qtdeclarative-5.15.3* =dev-qt/qtgui-5.15.3* widgets? ( =dev-qt/qtwidgets-5.15.3* ) test? ( =dev-qt/qttest-5.15.3* )
-DESCRIPTION=Set of next generation Qt Quick controls for the Qt5 framework
-EAPI=8
-HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtquickcontrols2 https://community.kde.org/Qt5PatchCollection
-INHERIT=qt5-build
-IUSE=widgets debug test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.3* =dev-qt/qtdeclarative-5.15.3* =dev-qt/qtgui-5.15.3* widgets? ( =dev-qt/qtwidgets-5.15.3* ) =dev-qt/qtgraphicaleffects-5.15.3*
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtquickcontrols2-everywhere-opensource-src-5.15.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtquickcontrols2-5.15.3-gentoo-kde-1.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=473c84fc7df9080d42ac559a76ce87ad
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.4 b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.4
index d512cc4fb3c2..3454ced275d4 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.4
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtquickcontrols2 https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=widgets debug test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.4* =dev-qt/qtdeclarative-5.15.4* =dev-qt/qtgui-5.15.4* widgets? ( =dev-qt/qtwidgets-5.15.4* ) =dev-qt/qtgraphicaleffects-5.15.4*
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qtquickcontrols2-everywhere-opensource-src-5.15.4.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtquickcontrols2-5.15.4-gentoo-kde-1.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=1eb89b5fec37857dd6b7cf5b276347cc
+_md5_=473c84fc7df9080d42ac559a76ce87ad
diff --git a/metadata/md5-cache/dev-qt/qtquicktimeline-5.15.3 b/metadata/md5-cache/dev-qt/qtquicktimeline-5.15.3
deleted file mode 100644
index 75acdfadebc1..000000000000
--- a/metadata/md5-cache/dev-qt/qtquicktimeline-5.15.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-qt/qtcore-5.15.3* =dev-qt/qtdeclarative-5.15.3* test? ( =dev-qt/qttest-5.15.3* )
-DESCRIPTION=Qt module for keyframe-based timeline construction
-EAPI=8
-HOMEPAGE=https://www.qt.io/
-INHERIT=qt5-build
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.3* =dev-qt/qtdeclarative-5.15.3*
-RESTRICT=test
-SLOT=5
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtquicktimeline-everywhere-opensource-src-5.15.3.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=917a488ca9982790149bb74991a7f536
diff --git a/metadata/md5-cache/dev-qt/qtscript-5.15.4 b/metadata/md5-cache/dev-qt/qtscript-5.15.4
index 550aec24425e..5f3c3c79b4cc 100644
--- a/metadata/md5-cache/dev-qt/qtscript-5.15.4
+++ b/metadata/md5-cache/dev-qt/qtscript-5.15.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt5-build
 IUSE=+jit scripttools debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.4* scripttools? ( =dev-qt/qtgui-5.15.4* =dev-qt/qtwidgets-5.15.4* )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qtscript-everywhere-opensource-src-5.15.4.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=31c02d5f98fecc2ade341682d2c6e607
+_md5_=02704831dcd93e1dc708e696b2af608c
diff --git a/metadata/md5-cache/dev-qt/qtscxml-5.15.3 b/metadata/md5-cache/dev-qt/qtscxml-5.15.3
deleted file mode 100644
index b58dae5508bc..000000000000
--- a/metadata/md5-cache/dev-qt/qtscxml-5.15.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-qt/qtcore-5.15.3* =dev-qt/qtdeclarative-5.15.3* test? ( =dev-qt/qttest-5.15.3* )
-DESCRIPTION=State Chart XML (SCXML) support library for the Qt5 framework
-EAPI=8
-HOMEPAGE=https://www.qt.io/
-INHERIT=qt5-build
-IUSE=debug test
-KEYWORDS=amd64 ~arm arm64 ~riscv x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.3* =dev-qt/qtdeclarative-5.15.3*
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtscxml-everywhere-opensource-src-5.15.3.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=75f5b6fd13850b4678a1b605cf2d8f6c
diff --git a/metadata/md5-cache/dev-qt/qtscxml-5.15.4 b/metadata/md5-cache/dev-qt/qtscxml-5.15.4
index e0623ec24cd6..b823e632692d 100644
--- a/metadata/md5-cache/dev-qt/qtscxml-5.15.4
+++ b/metadata/md5-cache/dev-qt/qtscxml-5.15.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt5-build
 IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.4* =dev-qt/qtdeclarative-5.15.4*
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qtscxml-everywhere-opensource-src-5.15.4.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=8c3cd03374ba8d22d3989f0b2c818b78
+_md5_=75f5b6fd13850b4678a1b605cf2d8f6c
diff --git a/metadata/md5-cache/dev-qt/qtsensors-5.15.4 b/metadata/md5-cache/dev-qt/qtsensors-5.15.4
index 6b509d625815..1f8d65d90e55 100644
--- a/metadata/md5-cache/dev-qt/qtsensors-5.15.4
+++ b/metadata/md5-cache/dev-qt/qtsensors-5.15.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt5-build
 IUSE=qml debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.4* =dev-qt/qtdbus-5.15.4* qml? ( =dev-qt/qtdeclarative-5.15.4* )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qtsensors-everywhere-opensource-src-5.15.4.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=5e9ea9d2c2a05212ef9523980b90a884
+_md5_=e5487fcbcd79b014e0d9f1bf37ee26f3
diff --git a/metadata/md5-cache/dev-qt/qtserialport-5.15.4 b/metadata/md5-cache/dev-qt/qtserialport-5.15.4
index 7aa2d399a318..cace53274fcb 100644
--- a/metadata/md5-cache/dev-qt/qtserialport-5.15.4
+++ b/metadata/md5-cache/dev-qt/qtserialport-5.15.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt5-build
 IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.4* virtual/libudev:=
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qtserialport-everywhere-opensource-src-5.15.4.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=736736ce0e33b9ade12802d8e3c8138b
+_md5_=e7dc22311cbe05e6962b088e03758801
diff --git a/metadata/md5-cache/dev-qt/qtspeech-5.15.3 b/metadata/md5-cache/dev-qt/qtspeech-5.15.3
deleted file mode 100644
index 4a310123399f..000000000000
--- a/metadata/md5-cache/dev-qt/qtspeech-5.15.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-accessibility/speech-dispatcher-0.8.7 =dev-qt/qtcore-5.15.3* flite? ( >=app-accessibility/flite-2[alsa?] =dev-qt/qtmultimedia-5.15.3*[alsa?] alsa? ( media-libs/alsa-lib ) ) test? ( =dev-qt/qttest-5.15.3* )
-DESCRIPTION=Text-to-speech library for the Qt5 framework
-EAPI=8
-HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtspeech https://community.kde.org/Qt5PatchCollection
-INHERIT=qt5-build
-IUSE=alsa flite debug test
-KEYWORDS=amd64 arm arm64 ~ppc64 ~riscv x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=>=app-accessibility/speech-dispatcher-0.8.7 =dev-qt/qtcore-5.15.3* flite? ( >=app-accessibility/flite-2[alsa?] =dev-qt/qtmultimedia-5.15.3*[alsa?] alsa? ( media-libs/alsa-lib ) )
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtspeech-everywhere-opensource-src-5.15.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtspeech-5.15.3-gentoo-kde-1.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=fface3820df5be546fa22158e013273a
diff --git a/metadata/md5-cache/dev-qt/qtspeech-5.15.4 b/metadata/md5-cache/dev-qt/qtspeech-5.15.4
index e3e159b550ec..6df08c8b545e 100644
--- a/metadata/md5-cache/dev-qt/qtspeech-5.15.4
+++ b/metadata/md5-cache/dev-qt/qtspeech-5.15.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtspeech https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=alsa flite debug test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=>=app-accessibility/speech-dispatcher-0.8.7 =dev-qt/qtcore-5.15.4* flite? ( >=app-accessibility/flite-2[alsa?] =dev-qt/qtmultimedia-5.15.4*[alsa?] alsa? ( media-libs/alsa-lib ) )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qtspeech-everywhere-opensource-src-5.15.4.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtspeech-5.15.4-gentoo-kde-1.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=95fa144b6782f4cb2e155b9d3556a8a3
+_md5_=fface3820df5be546fa22158e013273a
diff --git a/metadata/md5-cache/dev-qt/qtsql-5.15.4 b/metadata/md5-cache/dev-qt/qtsql-5.15.4
index 675f61e775a3..35e431912856 100644
--- a/metadata/md5-cache/dev-qt/qtsql-5.15.4
+++ b/metadata/md5-cache/dev-qt/qtsql-5.15.4
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=freetds mysql oci8 odbc postgres +sqlite debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.4*:5= freetds? ( dev-db/freetds ) mysql? ( dev-db/mysql-connector-c:= ) oci8? ( dev-db/oracle-instantclient:=[sdk] ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 )
 REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=5/5.15.4
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qtbase-everywhere-opensource-src-5.15.4.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.4-gentoo-kde-1.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=31cccc3e34ca61c1589f151cfff25a4c
+_md5_=47313050d3fcdbcae25cf6915b92bdfc
diff --git a/metadata/md5-cache/dev-qt/qtsvg-5.15.4 b/metadata/md5-cache/dev-qt/qtsvg-5.15.4
index 8c71ae417375..112533f56580 100644
--- a/metadata/md5-cache/dev-qt/qtsvg-5.15.4
+++ b/metadata/md5-cache/dev-qt/qtsvg-5.15.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtsvg https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.4* =dev-qt/qtgui-5.15.4* =dev-qt/qtwidgets-5.15.4* sys-libs/zlib:=
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qtsvg-everywhere-opensource-src-5.15.4.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtsvg-5.15.4-gentoo-kde-1.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=dc23a658d1ee1173c21f619abd53ac1d
+_md5_=265b645fc1c317afa075d516fdd49b9f
diff --git a/metadata/md5-cache/dev-qt/qttest-5.15.4 b/metadata/md5-cache/dev-qt/qttest-5.15.4
index a3a608992872..2a1d286eaffe 100644
--- a/metadata/md5-cache/dev-qt/qttest-5.15.4
+++ b/metadata/md5-cache/dev-qt/qttest-5.15.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=test debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.4*:5=
 RESTRICT=!test? ( test ) test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qtbase-everywhere-opensource-src-5.15.4.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.4-gentoo-kde-1.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=2b4bf60d0a793a74418ec9c3bb20d1df
+_md5_=8f5368024884943ef335608e13de569e
diff --git a/metadata/md5-cache/dev-qt/qttranslations-5.15.4 b/metadata/md5-cache/dev-qt/qttranslations-5.15.4
index ab6c40753ca2..990ed3f673ec 100644
--- a/metadata/md5-cache/dev-qt/qttranslations-5.15.4
+++ b/metadata/md5-cache/dev-qt/qttranslations-5.15.4
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qttranslations https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qttranslations-everywhere-opensource-src-5.15.4.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttranslations-5.15.4-gentoo-kde-1.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=77d1a985c010af025f09a924866b74f2
+_md5_=ae65c04509d58f9780607c1fdae412b7
diff --git a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.3 b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.3
deleted file mode 100644
index 32477e0492e0..000000000000
--- a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-qt/qtcore-5.15.3* =dev-qt/qtdeclarative-5.15.3* =dev-qt/qtgui-5.15.3* =dev-qt/qtsvg-5.15.3* spell? ( app-text/hunspell:= ) X? ( x11-libs/libxcb:= ) test? ( =dev-qt/qttest-5.15.3* )
-DESCRIPTION=Customizable input framework and virtual keyboard for Qt
-EAPI=8
-HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtvirtualkeyboard https://community.kde.org/Qt5PatchCollection
-INHERIT=qt5-build
-IUSE=handwriting +spell +X debug test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.3* =dev-qt/qtdeclarative-5.15.3* =dev-qt/qtgui-5.15.3* =dev-qt/qtsvg-5.15.3* spell? ( app-text/hunspell:= ) X? ( x11-libs/libxcb:= )
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtvirtualkeyboard-everywhere-opensource-src-5.15.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtvirtualkeyboard-5.15.3-gentoo-kde-1.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=f9c8d69778c6ebdddc3b3f82b2805335
diff --git a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.4 b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.4
index 25fa2d8af411..5be40224dfa0 100644
--- a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.4
+++ b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtvirtualkeyboard https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=handwriting +spell +X debug test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.4* =dev-qt/qtdeclarative-5.15.4* =dev-qt/qtgui-5.15.4* =dev-qt/qtsvg-5.15.4* spell? ( app-text/hunspell:= ) X? ( x11-libs/libxcb:= )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qtvirtualkeyboard-everywhere-opensource-src-5.15.4.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtvirtualkeyboard-5.15.4-gentoo-kde-1.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=7e0231f7e897d203a05eae9bb3e3bec9
+_md5_=f9c8d69778c6ebdddc3b3f82b2805335
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.15.4 b/metadata/md5-cache/dev-qt/qtwayland-5.15.4
index ca82e9011d46..be6bb2b05d14 100644
--- a/metadata/md5-cache/dev-qt/qtwayland-5.15.4
+++ b/metadata/md5-cache/dev-qt/qtwayland-5.15.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtwayland https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=vulkan X debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=dev-libs/wayland =dev-qt/qtcore-5.15.4*:5= =dev-qt/qtdeclarative-5.15.4*:5= =dev-qt/qtgui-5.15.4*:5=[egl,libinput,vulkan=,X?] media-libs/libglvnd vulkan? ( dev-util/vulkan-headers ) X? ( =dev-qt/qtgui-5.15.4*[-gles2-only] x11-libs/libX11 x11-libs/libXcomposite )
 RESTRICT=test
 SLOT=5/5.15.4
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qtwayland-everywhere-opensource-src-5.15.4.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtwayland-5.15.4-gentoo-kde-1.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=c1d97f1d91bfcf7aece3c611941384b8
+_md5_=7a0d9dfacd1fce26b900f5e499cc289d
diff --git a/metadata/md5-cache/dev-qt/qtwaylandscanner-5.15.4 b/metadata/md5-cache/dev-qt/qtwaylandscanner-5.15.4
index 6087a34e59fa..5e0eae474c64 100644
--- a/metadata/md5-cache/dev-qt/qtwaylandscanner-5.15.4
+++ b/metadata/md5-cache/dev-qt/qtwaylandscanner-5.15.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt5-build
 IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.4*:5= !<dev-qt/qtwayland-5.15.3:5
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qtwayland-everywhere-opensource-src-5.15.4.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=f652c2def1bb71684412b609a9d876be
+_md5_=40b1a3d0884617eaa9f0a76ba751c15b
diff --git a/metadata/md5-cache/dev-qt/qtwebchannel-5.15.4 b/metadata/md5-cache/dev-qt/qtwebchannel-5.15.4
index 7fda82773ec8..d00034b8cd2d 100644
--- a/metadata/md5-cache/dev-qt/qtwebchannel-5.15.4
+++ b/metadata/md5-cache/dev-qt/qtwebchannel-5.15.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtwebchannel https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=qml debug test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.4* qml? ( =dev-qt/qtdeclarative-5.15.4* )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qtwebchannel-everywhere-opensource-src-5.15.4.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtwebchannel-5.15.4-gentoo-kde-1.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=51f1303b03a54455b87e8fdbad8d53db
+_md5_=d6bf9168ed3c4ecf531fe773827cc636
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.15.3_p20220406 b/metadata/md5-cache/dev-qt/qtwebengine-5.15.3_p20220406
deleted file mode 100644
index 74decde59a53..000000000000
--- a/metadata/md5-cache/dev-qt/qtwebengine-5.15.3_p20220406
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml(+)] >=dev-lang/python-3.9.9-r1:3.9[xml(+)] ) dev-util/gperf dev-util/ninja dev-util/re2c net-libs/nodejs[ssl] sys-devel/bison sys-devel/flex ppc64? ( >=dev-util/gn-0.1807 ) dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= =dev-qt/qtcore-5.15.3* =dev-qt/qtdeclarative-5.15.3* =dev-qt/qtgui-5.15.3* =dev-qt/qtnetwork-5.15.3* =dev-qt/qtprintsupport-5.15.3* =dev-qt/qtwebchannel-5.15.3*[qml] media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc(+)] media-libs/libwebp:= media-libs/opus sys-apps/dbus sys-apps/pciutils sys-libs/zlib[minizip] virtual/libudev x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libxkbfile x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) designer? ( =dev-qt/designer-5.15.3* ) geolocation? ( =dev-qt/qtpositioning-5.15.3* ) kerberos? ( virtual/krb5 ) pulseaudio? ( media-sound/pulseaudio:= ) screencast? ( media-video/pipewire:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( >=dev-libs/icu-69.1:= ) widgets? ( =dev-qt/qtdeclarative-5.15.3*[widgets] =dev-qt/qtwidgets-5.15.3* ) media-libs/libglvnd test? ( =dev-qt/qttest-5.15.3* )
-DESCRIPTION=Library for rendering dynamic web content in Qt5 C++ and QML applications
-EAPI=8
-HOMEPAGE=https://www.qt.io/
-INHERIT=check-reqs estack flag-o-matic multiprocessing python-any-r1 qt5-build toolchain-funcs
-IUSE=alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast +system-ffmpeg +system-icu widgets debug test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= =dev-qt/qtcore-5.15.3* =dev-qt/qtdeclarative-5.15.3* =dev-qt/qtgui-5.15.3* =dev-qt/qtnetwork-5.15.3* =dev-qt/qtprintsupport-5.15.3* =dev-qt/qtwebchannel-5.15.3*[qml] media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc(+)] media-libs/libwebp:= media-libs/opus sys-apps/dbus sys-apps/pciutils sys-libs/zlib[minizip] virtual/libudev x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libxkbfile x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) designer? ( =dev-qt/designer-5.15.3* ) geolocation? ( =dev-qt/qtpositioning-5.15.3* ) kerberos? ( virtual/krb5 ) pulseaudio? ( media-sound/pulseaudio:= ) screencast? ( media-video/pipewire:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( >=dev-libs/icu-69.1:= ) widgets? ( =dev-qt/qtdeclarative-5.15.3*[widgets] =dev-qt/qtwidgets-5.15.3* )
-REQUIRED_USE=designer? ( widgets )
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://dev.gentoo.org/~asturm/distfiles/qtwebengine-5.15.3_p20220406.tar.xz https://dev.gentoo.org/~sam/distfiles/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 https://dev.gentoo.org/~asturm/distfiles/qtwebengine-5.15.3_p20220406-patchset.tar.xz ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz )
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=35b1e5a235523d68cd7ac3f57107a437
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.15.4_p20220505 b/metadata/md5-cache/dev-qt/qtwebengine-5.15.4_p20220505
deleted file mode 100644
index 82205c4c40fe..000000000000
--- a/metadata/md5-cache/dev-qt/qtwebengine-5.15.4_p20220505
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml(+)] >=dev-lang/python-3.9.9-r1:3.9[xml(+)] ) dev-util/gperf dev-util/ninja dev-util/re2c net-libs/nodejs[ssl] sys-devel/bison sys-devel/flex ppc64? ( >=dev-util/gn-0.1807 ) dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= =dev-qt/qtcore-5.15.4* =dev-qt/qtdeclarative-5.15.4* =dev-qt/qtgui-5.15.4* =dev-qt/qtnetwork-5.15.4* =dev-qt/qtprintsupport-5.15.4* =dev-qt/qtwebchannel-5.15.4*[qml] media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc(+)] media-libs/libwebp:= media-libs/opus sys-apps/dbus sys-apps/pciutils sys-libs/zlib[minizip] virtual/libudev x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libxkbfile x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) designer? ( =dev-qt/designer-5.15.4* ) geolocation? ( =dev-qt/qtpositioning-5.15.4* ) kerberos? ( virtual/krb5 ) pulseaudio? ( media-sound/pulseaudio:= ) screencast? ( media-video/pipewire:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( >=dev-libs/icu-69.1:= ) widgets? ( =dev-qt/qtdeclarative-5.15.4*[widgets] =dev-qt/qtwidgets-5.15.4* ) media-libs/libglvnd test? ( =dev-qt/qttest-5.15.4* )
-DESCRIPTION=Library for rendering dynamic web content in Qt5 C++ and QML applications
-EAPI=8
-HOMEPAGE=https://www.qt.io/
-INHERIT=check-reqs estack flag-o-matic multiprocessing python-any-r1 qt5-build toolchain-funcs
-IUSE=alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast +system-ffmpeg +system-icu widgets debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= =dev-qt/qtcore-5.15.4* =dev-qt/qtdeclarative-5.15.4* =dev-qt/qtgui-5.15.4* =dev-qt/qtnetwork-5.15.4* =dev-qt/qtprintsupport-5.15.4* =dev-qt/qtwebchannel-5.15.4*[qml] media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc(+)] media-libs/libwebp:= media-libs/opus sys-apps/dbus sys-apps/pciutils sys-libs/zlib[minizip] virtual/libudev x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libxkbfile x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) designer? ( =dev-qt/designer-5.15.4* ) geolocation? ( =dev-qt/qtpositioning-5.15.4* ) kerberos? ( virtual/krb5 ) pulseaudio? ( media-sound/pulseaudio:= ) screencast? ( media-video/pipewire:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( >=dev-libs/icu-69.1:= ) widgets? ( =dev-qt/qtdeclarative-5.15.4*[widgets] =dev-qt/qtwidgets-5.15.4* )
-REQUIRED_USE=designer? ( widgets )
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://dev.gentoo.org/~asturm/distfiles/qtwebengine-5.15.3_p20220505.tar.xz https://dev.gentoo.org/~sam/distfiles/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 https://dev.gentoo.org/~asturm/distfiles/qtwebengine-5.15.3_p20220406-patchset.tar.xz ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz )
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=98b0ef50cf10c115d06e3d0651464be6
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.15.4_p20220526 b/metadata/md5-cache/dev-qt/qtwebengine-5.15.4_p20220526
index d9921996f39b..11ec48fd4978 100644
--- a/metadata/md5-cache/dev-qt/qtwebengine-5.15.4_p20220526
+++ b/metadata/md5-cache/dev-qt/qtwebengine-5.15.4_p20220526
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=check-reqs estack flag-o-matic multiprocessing python-any-r1 qt5-build toolchain-funcs
 IUSE=alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast +system-ffmpeg +system-icu widgets debug test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= =dev-qt/qtcore-5.15.4* =dev-qt/qtdeclarative-5.15.4* =dev-qt/qtgui-5.15.4* =dev-qt/qtnetwork-5.15.4* =dev-qt/qtprintsupport-5.15.4* =dev-qt/qtwebchannel-5.15.4*[qml] media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc(+)] media-libs/libwebp:= media-libs/opus sys-apps/dbus sys-apps/pciutils sys-libs/zlib[minizip] virtual/libudev x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libxkbfile x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) designer? ( =dev-qt/designer-5.15.4* ) geolocation? ( =dev-qt/qtpositioning-5.15.4* ) kerberos? ( virtual/krb5 ) pulseaudio? ( media-sound/pulseaudio:= ) screencast? ( media-video/pipewire:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( >=dev-libs/icu-69.1:= ) widgets? ( =dev-qt/qtdeclarative-5.15.4*[widgets] =dev-qt/qtwidgets-5.15.4* )
 REQUIRED_USE=designer? ( widgets )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://dev.gentoo.org/~asturm/distfiles/qtwebengine-5.15.4_p20220526.tar.xz https://dev.gentoo.org/~sam/distfiles/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 https://dev.gentoo.org/~asturm/distfiles/qtwebengine-5.15.3_p20220406-patchset.tar.xz ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz )
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=f453af9a0d31e60fa7b665b427d90b60
+_md5_=55d8a98fac371f577d53fa5b6921c6cd
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-5.15.4 b/metadata/md5-cache/dev-qt/qtwebsockets-5.15.4
index 07ec2f048848..80f222a80279 100644
--- a/metadata/md5-cache/dev-qt/qtwebsockets-5.15.4
+++ b/metadata/md5-cache/dev-qt/qtwebsockets-5.15.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtwebsockets https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=qml +ssl debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.4* =dev-qt/qtnetwork-5.15.4*[ssl=] qml? ( =dev-qt/qtdeclarative-5.15.4* )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qtwebsockets-everywhere-opensource-src-5.15.4.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtwebsockets-5.15.4-gentoo-kde-1.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=d10f90edbf07739feed270d25a2ffd6c
+_md5_=9895e156e8f8d8bbb892c9fb236d77fe
diff --git a/metadata/md5-cache/dev-qt/qtwebview-5.15.3 b/metadata/md5-cache/dev-qt/qtwebview-5.15.3
deleted file mode 100644
index 85f3a31ab5f1..000000000000
--- a/metadata/md5-cache/dev-qt/qtwebview-5.15.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-qt/qtcore-5.15.3* =dev-qt/qtdeclarative-5.15.3* =dev-qt/qtgui-5.15.3* =dev-qt/qtwebengine-5.15.3*:5 test? ( =dev-qt/qttest-5.15.3* )
-DESCRIPTION=Module for displaying web content in a QML application using the Qt5 framework
-EAPI=8
-HOMEPAGE=https://www.qt.io/
-INHERIT=qt5-build
-IUSE=debug test
-KEYWORDS=~amd64
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.3* =dev-qt/qtdeclarative-5.15.3* =dev-qt/qtgui-5.15.3* =dev-qt/qtwebengine-5.15.3*:5
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtwebview-everywhere-opensource-src-5.15.3.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=adca26c0fc80c864c3303bc2133c3a3a
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.15.4-r1 b/metadata/md5-cache/dev-qt/qtwidgets-5.15.4-r1
index 23515873161b..49fd4a65b17f 100644
--- a/metadata/md5-cache/dev-qt/qtwidgets-5.15.4-r1
+++ b/metadata/md5-cache/dev-qt/qtwidgets-5.15.4-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=dbus gles2-only gtk +png +X debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.4*:5= =dev-qt/qtgui-5.15.4*:5=[gles2-only=,png=,X?] dbus? ( =dev-qt/qtdbus-5.15.4* ) gtk? ( dev-libs/glib:2 =dev-qt/qtgui-5.15.4*:5=[dbus] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango )
 REQUIRED_USE=gtk? ( dbus )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qtbase-everywhere-opensource-src-5.15.4.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.4-gentoo-kde-2.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=b9c5e44680f9e8c0b9ef17a75211587b
+_md5_=88fb19d313479d54671bf8235b5a298a
diff --git a/metadata/md5-cache/dev-qt/qtx11extras-5.15.4 b/metadata/md5-cache/dev-qt/qtx11extras-5.15.4
index 089c70858ee8..d3ca6bbcf72a 100644
--- a/metadata/md5-cache/dev-qt/qtx11extras-5.15.4
+++ b/metadata/md5-cache/dev-qt/qtx11extras-5.15.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt5-build
 IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.4* =dev-qt/qtgui-5.15.4*[X]
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qtx11extras-everywhere-opensource-src-5.15.4.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=db97e246713c4a7658d90d48ff57c771
+_md5_=77b18efb667971cdda0b3a0a22521168
diff --git a/metadata/md5-cache/dev-qt/qtxml-5.15.4 b/metadata/md5-cache/dev-qt/qtxml-5.15.4
index 2e201122c881..2f28bba1ee63 100644
--- a/metadata/md5-cache/dev-qt/qtxml-5.15.4
+++ b/metadata/md5-cache/dev-qt/qtxml-5.15.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.4*:5=
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qtbase-everywhere-opensource-src-5.15.4.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.4-gentoo-kde-1.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=dc305d03cd8d26968c0f5d3a6951ae6c
+_md5_=d3a46d6a932bc5cef59a8341b34525d1
diff --git a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.4 b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.4
index 9b15cd6b5934..ecaf6e5f1427 100644
--- a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.4
+++ b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt5-build
 IUSE=qml debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.4* =dev-qt/qtnetwork-5.15.4* qml? ( =dev-qt/qtdeclarative-5.15.4* ) !<dev-qt/qtchooser-66-r2
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qtxmlpatterns-everywhere-opensource-src-5.15.4.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=09e37bd32531a7ab7e9ea5aa1a3091df
+_md5_=101ef4f0f98fbf3087d9364f89e27306
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index c8e4a2b83bb4..0b8e64c10fa9 100644
Binary files a/metadata/md5-cache/dev-ruby/Manifest.gz and b/metadata/md5-cache/dev-ruby/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ruby/hiera-eyaml-3.1.1 b/metadata/md5-cache/dev-ruby/hiera-eyaml-3.1.1
index 63f06a74316a..e87adeb5eb20 100644
--- a/metadata/md5-cache/dev-ruby/hiera-eyaml-3.1.1
+++ b/metadata/md5-cache/dev-ruby/hiera-eyaml-3.1.1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/TomPoulton/hiera-eyaml/archive/v3.1.1.tar.gz -> hiera-eyaml-3.1.1.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=e6cea6e67ae1b58e80a5e24f6b247ce9
+_md5_=1d1b86102a0d03737bb006149edb610c
diff --git a/metadata/md5-cache/dev-ruby/hiera-eyaml-3.2.2 b/metadata/md5-cache/dev-ruby/hiera-eyaml-3.2.2
index f57fe6781410..b41ac1c53be9 100644
--- a/metadata/md5-cache/dev-ruby/hiera-eyaml-3.2.2
+++ b/metadata/md5-cache/dev-ruby/hiera-eyaml-3.2.2
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/TomPoulton/hiera-eyaml/archive/v3.2.2.tar.gz -> hiera-eyaml-3.2.2.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=6d497c622e559177fe0a63ed4eaeee74
+_md5_=ad3c14b280e4dfc8078b8cbf42405bb8
diff --git a/metadata/md5-cache/dev-ruby/hiredis-0.6.3-r1 b/metadata/md5-cache/dev-ruby/hiredis-0.6.3-r1
index ce1998499c6c..ee725aebdc7c 100644
--- a/metadata/md5-cache/dev-ruby/hiredis-0.6.3-r1
+++ b/metadata/md5-cache/dev-ruby/hiredis-0.6.3-r1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/redis/hiredis-rb/archive/v0.6.3.tar.gz -> hiredis-rb-0.6.3.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=4d1f75601845bc05e5f1fa1bde2a29de
+_md5_=be8c47a3de392ae330a06d4b83421479
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.16.0 b/metadata/md5-cache/dev-ruby/minitest-5.16.0
new file mode 100644
index 000000000000..0723c1780a89
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/minitest-5.16.0
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=minitest/unit is a small and fast replacement for ruby's huge and slow test/unit
+EAPI=8
+HOMEPAGE=https://github.com/seattlerb/minitest
+INHERIT=ruby-fakegem
+IUSE=doc test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=https://rubygems.org/gems/minitest-5.16.0.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=b1fc05d6b7f39093640361d4dfa5cf1d
diff --git a/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.10-r1 b/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.10-r1
index e023945bc2ed..91a430a3246c 100644
--- a/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.10-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.10-r1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/moumar/ruby-mp3info/archive/v0.8.10.tar.gz -> ruby-mp3info-0.8.10-git.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=d1710dd88e4d1935c97c327bdb84ede1
+_md5_=2b33f20892dae6e58c6a393b35766cbc
diff --git a/metadata/md5-cache/dev-ruby/rubyzip-1.3.0 b/metadata/md5-cache/dev-ruby/rubyzip-1.3.0
index 87d6c3ed4b87..082b6abccd84 100644
--- a/metadata/md5-cache/dev-ruby/rubyzip-1.3.0
+++ b/metadata/md5-cache/dev-ruby/rubyzip-1.3.0
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/rubyzip/rubyzip/archive/v1.3.0.tar.gz -> rubyzip-1.3.0-git.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=c2f7325262f0726e54031236396ac6a9
+_md5_=35c733613a2942527668e0d869b3a725
diff --git a/metadata/md5-cache/dev-ruby/rubyzip-2.3.2-r1 b/metadata/md5-cache/dev-ruby/rubyzip-2.3.2-r1
index 85f2f68f089f..67fbec6d4a9a 100644
--- a/metadata/md5-cache/dev-ruby/rubyzip-2.3.2-r1
+++ b/metadata/md5-cache/dev-ruby/rubyzip-2.3.2-r1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/rubyzip/rubyzip/archive/v2.3.2.tar.gz -> rubyzip-2.3.2-git.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=94549d769bf632a5e3d7664e2a08b70c
+_md5_=acdbfe2d7921bb29052470452270b7e8
diff --git a/metadata/md5-cache/dev-ruby/sassc-2.4.0-r1 b/metadata/md5-cache/dev-ruby/sassc-2.4.0-r1
index c3113fdb5520..2d5988f15dc6 100644
--- a/metadata/md5-cache/dev-ruby/sassc-2.4.0-r1
+++ b/metadata/md5-cache/dev-ruby/sassc-2.4.0-r1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/sassc-2.4.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=a6cf6ec6efa404c9c6c70c86888d3488
+_md5_=1571222536d4276249ac30b69597700b
diff --git a/metadata/md5-cache/dev-ruby/serverengine-2.3.0 b/metadata/md5-cache/dev-ruby/serverengine-2.3.0
new file mode 100644
index 000000000000..bd228b1081c8
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/serverengine-2.3.0
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/sigdump-0.2.2:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/sigdump-0.2.2:0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/bundler[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby26(-)] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby27(-)] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=A framework to implement robust multiprocess servers
+EAPI=8
+HOMEPAGE=https://github.com/fluent/serverengine
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/sigdump-0.2.2:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/sigdump-0.2.2:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/serverengine-2.3.0.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=6de8a8659af658aa294ea2b0eb20ee59
diff --git a/metadata/md5-cache/dev-ruby/sqlite3-1.4.3 b/metadata/md5-cache/dev-ruby/sqlite3-1.4.3
new file mode 100644
index 000000000000..2799e79cc7a4
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/sqlite3-1.4.3
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby26? ( dev-ruby/rake-compiler[ruby_targets_ruby26(-)] doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] dev-ruby/redcloth[ruby_targets_ruby26(-)] ) test? ( dev-ruby/minitest:5[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( dev-ruby/rake-compiler[ruby_targets_ruby27(-)] doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] dev-ruby/redcloth[ruby_targets_ruby27(-)] ) test? ( dev-ruby/minitest:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( dev-ruby/rake-compiler[ruby_targets_ruby30(-)] doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] dev-ruby/redcloth[ruby_targets_ruby30(-)] ) test? ( dev-ruby/minitest:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( dev-ruby/rake-compiler[ruby_targets_ruby31(-)] doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] dev-ruby/redcloth[ruby_targets_ruby31(-)] ) test? ( dev-ruby/minitest:5[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=dev-db/sqlite-3.6.16:3 ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=An extension library to access a SQLite database from Ruby
+EAPI=8
+HOMEPAGE=https://github.com/sparklemotion/sqlite3-ruby
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=>=dev-db/sqlite-3.6.16:3 ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/sqlite3-1.4.3.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=a1211e680119073a9e4022e823299789
diff --git a/metadata/md5-cache/dev-ruby/sqlite3-1.4.4 b/metadata/md5-cache/dev-ruby/sqlite3-1.4.4
new file mode 100644
index 000000000000..68685bbe7e4e
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/sqlite3-1.4.4
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby26? ( dev-ruby/rake-compiler[ruby_targets_ruby26(-)] doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] dev-ruby/redcloth[ruby_targets_ruby26(-)] ) test? ( dev-ruby/minitest:5[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( dev-ruby/rake-compiler[ruby_targets_ruby27(-)] doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] dev-ruby/redcloth[ruby_targets_ruby27(-)] ) test? ( dev-ruby/minitest:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( dev-ruby/rake-compiler[ruby_targets_ruby30(-)] doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] dev-ruby/redcloth[ruby_targets_ruby30(-)] ) test? ( dev-ruby/minitest:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( dev-ruby/rake-compiler[ruby_targets_ruby31(-)] doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] dev-ruby/redcloth[ruby_targets_ruby31(-)] ) test? ( dev-ruby/minitest:5[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=dev-db/sqlite-3.6.16:3 ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=An extension library to access a SQLite database from Ruby
+EAPI=8
+HOMEPAGE=https://github.com/sparklemotion/sqlite3-ruby
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=>=dev-db/sqlite-3.6.16:3 ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/sqlite3-1.4.4.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=3a058cc0a1c68819d1fd4c788080b749
diff --git a/metadata/md5-cache/dev-ruby/zeitwerk-2.6.0 b/metadata/md5-cache/dev-ruby/zeitwerk-2.6.0
new file mode 100644
index 000000000000..c5943539613a
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/zeitwerk-2.6.0
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/bundler[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/bundler[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=Efficient and thread-safe code loader for Ruby
+EAPI=8
+HOMEPAGE=https://github.com/fxn/zeitwerk
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=2
+SRC_URI=https://github.com/fxn/zeitwerk/archive/v2.6.0.tar.gz -> zeitwerk-2.6.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=76f7a0f2ae977a548fe315840d29057a
diff --git a/metadata/md5-cache/dev-scheme/Manifest.gz b/metadata/md5-cache/dev-scheme/Manifest.gz
index 6dc8f735c360..5051ecf268a2 100644
Binary files a/metadata/md5-cache/dev-scheme/Manifest.gz and b/metadata/md5-cache/dev-scheme/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-scheme/kawa-1.14-r2 b/metadata/md5-cache/dev-scheme/kawa-1.14-r2
index 6abae9232e81..9b65f6deab26 100644
--- a/metadata/md5-cache/dev-scheme/kawa-1.14-r2
+++ b/metadata/md5-cache/dev-scheme/kawa-1.14-r2
@@ -11,4 +11,4 @@ RDEPEND=frontend? ( sys-libs/readline:0 ) sax? ( dev-java/sax:0 ) servlets? ( ja
 SLOT=0
 SRC_URI=mirror://gnu/kawa/kawa-1.14.tar.gz xqtests? ( http://www.w3.org/XML/Query/test-suite/XQTS_1_0_3.zip )
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=8abd6a2955c5a8052c8c0d687c58f249
+_md5_=845b0fededa23c6cb17ddeec30800f99
diff --git a/metadata/md5-cache/dev-texlive/Manifest.gz b/metadata/md5-cache/dev-texlive/Manifest.gz
index 12b1621097c2..d68d92987ae5 100644
Binary files a/metadata/md5-cache/dev-texlive/Manifest.gz and b/metadata/md5-cache/dev-texlive/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-texlive/texlive-luatex-2021-r1 b/metadata/md5-cache/dev-texlive/texlive-luatex-2021-r1
new file mode 100644
index 000000000000..cc311045ccb0
--- /dev/null
+++ b/metadata/md5-cache/dev-texlive/texlive-luatex-2021-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=app-text/texlive-core-2021 app-arch/xz-utils
+DEFINED_PHASES=compile install postinst postrm unpack
+DEPEND=!~dev-texlive/texlive-latexextra-2020 >=dev-texlive/texlive-basic-2021
+DESCRIPTION=TeXLive LuaTeX packages
+EAPI=7
+HOMEPAGE=http://www.tug.org/texlive/
+INHERIT=texlive-module
+IUSE=source doc
+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=BSD FDL-1.1 GPL-2 GPL-3+ LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free
+RDEPEND=!~dev-texlive/texlive-latexextra-2020 >=dev-texlive/texlive-basic-2021 dev-texlive/texlive-latexrecommended dev-texlive/texlive-fontsrecommended >=app-text/texlive-core-2021
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-addliga-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-addliga-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-auto-pst-pdf-lua-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-auto-pst-pdf-lua-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-barracuda-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-barracuda-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bezierplot-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bezierplot-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-checkcites-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-checkcites-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chickenize-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chickenize-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chinese-jfm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chinese-jfm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cloze-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cloze-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-combofont-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-combofont-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cstypo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cstypo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctablestack-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ctablestack-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ekdosis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ekdosis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emoji-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emoji-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emojicite-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emojicite-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-enigma-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-enigma-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-innerscript-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-innerscript-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-interpreter-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-interpreter-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kanaparser-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kanaparser-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-typo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-typo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-uca-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-uca-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-uni-algos-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-uni-algos-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-ul-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-ul-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-visual-debug-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-visual-debug-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luacode-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luacode-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luacolor-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luacolor-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luahyphenrules-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luahyphenrules-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaimageembed-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaimageembed-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaindex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaindex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luainputenc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luainputenc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaintro-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaintro-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luakeys-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luakeys-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-math-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-math-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-truncate-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-truncate-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualibs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualibs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luamplib-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luamplib-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaotfload-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaotfload-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luapackageloader-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luapackageloader-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaprogtable-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaprogtable-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luarandom-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luarandom-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatex85-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatex85-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatexbase-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatexbase-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatexko-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatexko-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatextra-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatextra-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luavlna-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luavlna-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaxml-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaxml-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newpax-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newpax-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nodetree-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nodetree-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-odsfile-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-odsfile-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-optex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-optex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfarticle-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfarticle-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-placeat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-placeat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plantuml-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plantuml-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-selnolig-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-selnolig-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spelling-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spelling-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stricttex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stricttex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typewriter-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typewriter-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uninormalize-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uninormalize-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-luatex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-luatex-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-addliga.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-addliga.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-auto-pst-pdf-lua.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-auto-pst-pdf-lua.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-barracuda.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-barracuda.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bezierplot.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bezierplot.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-checkcites.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-checkcites.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chickenize.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chickenize.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chinese-jfm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chinese-jfm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cloze.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cloze.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-combofont.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-combofont.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cstypo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cstypo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctablestack.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ctablestack.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ekdosis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ekdosis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emoji.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emoji.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emojicite.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emojicite.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-enigma.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-enigma.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-innerscript.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-innerscript.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-interpreter.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-interpreter.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kanaparser.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kanaparser.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-typo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-typo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-uca.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-uca.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-uni-algos.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-uni-algos.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-ul.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-ul.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-visual-debug.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-visual-debug.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luacode.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luacode.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luacolor.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luacolor.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luahyphenrules.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luahyphenrules.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaimageembed.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaimageembed.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaindex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaindex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luainputenc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luainputenc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaintro.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaintro.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luakeys.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luakeys.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-doc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-doc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-math.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-math.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-truncate.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-truncate.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualibs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualibs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luamplib.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luamplib.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaotfload.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaotfload.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luapackageloader.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luapackageloader.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaprogtable.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaprogtable.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luarandom.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luarandom.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatex85.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatex85.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatexbase.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatexbase.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatexko.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatexko.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatextra.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatextra.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luavlna.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luavlna.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaxml.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaxml.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newpax.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newpax.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nodetree.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nodetree.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-odsfile.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-odsfile.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-optex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-optex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfarticle.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfarticle.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-placeat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-placeat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plantuml.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plantuml.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-selnolig.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-selnolig.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spelling.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spelling.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stricttex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stricttex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typewriter.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typewriter.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uninormalize.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uninormalize.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chickenize.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chickenize.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cloze.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cloze.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctablestack.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ctablestack.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ekdosis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ekdosis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-innerscript.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-innerscript.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-typo.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-typo.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-ul.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-ul.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luacode.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luacode.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luacolor.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luacolor.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaindex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaindex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luainputenc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luainputenc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-doc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-doc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-math.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-math.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-truncate.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-truncate.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualibs.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualibs.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luamplib.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luamplib.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaotfload.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaotfload.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatex85.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatex85.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatexbase.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatexbase.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatextra.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatextra.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newpax.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newpax.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nodetree.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nodetree.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-placeat.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-placeat.source-2021.tar.xz )
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	texlive-common	c918583cd52e23eacee8a4cb5a623ed0	texlive-module	41a822d187efb5a22ee1118209d0b0a3
+_md5_=7ea6f47100e88fffd2529a486d23c030
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index e0c04fb7b28f..0b42df1a57ee 100644
Binary files a/metadata/md5-cache/dev-util/Manifest.gz and b/metadata/md5-cache/dev-util/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-util/boost-build-1.79.0 b/metadata/md5-cache/dev-util/boost-build-1.79.0
index 3198a887267c..e1a3caac6db6 100644
--- a/metadata/md5-cache/dev-util/boost-build-1.79.0
+++ b/metadata/md5-cache/dev-util/boost-build-1.79.0
@@ -4,10 +4,10 @@ EAPI=8
 HOMEPAGE=https://www.boost.org/build/
 INHERIT=flag-o-matic toolchain-funcs
 IUSE=examples
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+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=Boost-1.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://boostorg.jfrog.io/artifactory/main/release/1.79.0/source/boost_1_79_0.tar.bz2
 _eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=e9be34b8f1a443ef67f50ad483bab969
+_md5_=54468723fce1d6f98d15ef21847c024f
diff --git a/metadata/md5-cache/dev-util/clazy-1.10-r2 b/metadata/md5-cache/dev-util/clazy-1.10-r2
deleted file mode 100644
index a9e7f60f19f7..000000000000
--- a/metadata/md5-cache/dev-util/clazy-1.10-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) ) dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=<sys-devel/clang-14:= !!sys-devel/llvm:0
-DESCRIPTION=Compiler plugin which allows clang to understand Qt semantics
-EAPI=7
-HOMEPAGE=https://apps.kde.org/clazy
-INHERIT=cmake llvm python-any-r1
-IUSE=test
-KEYWORDS=amd64 arm64 x86
-LICENSE=LGPL-2+
-RDEPEND=<sys-devel/clang-14:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://kde/stable/clazy/1.10/src/clazy-1.10.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=3eee3938bdc71eb0eea4c0ac726f7d48
diff --git a/metadata/md5-cache/dev-util/clion-2022.1.1 b/metadata/md5-cache/dev-util/clion-2022.1.1-r1
similarity index 96%
rename from metadata/md5-cache/dev-util/clion-2022.1.1
rename to metadata/md5-cache/dev-util/clion-2022.1.1-r1
index a56f780fb8fa..54a3950a069a 100644
--- a/metadata/md5-cache/dev-util/clion-2022.1.1
+++ b/metadata/md5-cache/dev-util/clion-2022.1.1-r1
@@ -11,4 +11,4 @@ RESTRICT=bindist mirror splitdebug
 SLOT=0
 SRC_URI=https://download.jetbrains.com/cpp/CLion-2022.1.1.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=d63c4dc449abc73056c5e71cd90ab5dd
+_md5_=22564d07971e39240d6a7f93cd73faaa
diff --git a/metadata/md5-cache/dev-util/diffoscope-216 b/metadata/md5-cache/dev-util/diffoscope-216
index 2d180a1b573e..58dfb2eaeb68 100644
--- a/metadata/md5-cache/dev-util/diffoscope-216
+++ b/metadata/md5-cache/dev-util/diffoscope-216
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://diffoscope.org/ https://pypi.org/project/diffoscope/
 INHERIT=distutils-r1
 IUSE=acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma mono opendocument pascal pdf postscript R rpm sqlite squashfs ssh tar test tcpdump zip zlib zstd test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3+
 RDEPEND=dev-python/python-magic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/libarchive-c[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tlsh[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/PyPDF2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[ncurses] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[ncurses] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/diffoscope/diffoscope-216.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=719ce4bebc407ea5cae7f973a75bb75c
+_md5_=59d12709ec29c26c624f49d2af181856
diff --git a/metadata/md5-cache/dev-util/difftastic-0.29.1 b/metadata/md5-cache/dev-util/difftastic-0.29.1
new file mode 100644
index 000000000000..3f92c979e0f1
--- /dev/null
+++ b/metadata/md5-cache/dev-util/difftastic-0.29.1
@@ -0,0 +1,13 @@
+BDEPEND=>=virtual/rust-1.53
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=A structural diff that understands syntax
+EAPI=8
+HOMEPAGE=https://github.com/wilfred/difftastic
+INHERIT=cargo
+IUSE=debug
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 MIT MPL-2.0 Unlicense ZLIB
+SLOT=0
+SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/archery/0.4.0/download -> archery-0.4.0.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/bumpalo/3.9.1/download -> bumpalo-3.9.1.crate https://crates.io/api/v1/crates/bytecount/0.6.2/download -> bytecount-0.6.2.crate https://crates.io/api/v1/crates/cc/1.0.73/download -> cc-1.0.73.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/clap/3.1.18/download -> clap-3.1.18.crate https://crates.io/api/v1/crates/clap_lex/0.2.0/download -> clap_lex-0.2.0.crate https://crates.io/api/v1/crates/const_format/0.2.23/download -> const_format-0.2.23.crate https://crates.io/api/v1/crates/const_format_proc_macros/0.2.22/download -> const_format_proc_macros-0.2.22.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.4/download -> crossbeam-channel-0.5.4.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.1/download -> crossbeam-deque-0.8.1.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.8/download -> crossbeam-epoch-0.9.8.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.8/download -> crossbeam-utils-0.8.8.crate https://crates.io/api/v1/crates/ctor/0.1.22/download -> ctor-0.1.22.crate https://crates.io/api/v1/crates/diff/0.1.12/download -> diff-0.1.12.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/fixedbitset/0.4.1/download -> fixedbitset-0.4.1.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/hashbrown/0.11.2/download -> hashbrown-0.11.2.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/indexmap/1.7.0/download -> indexmap-1.7.0.crate https://crates.io/api/v1/crates/itertools/0.10.3/download -> itertools-0.10.3.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.126/download -> libc-0.2.126.crate https://crates.io/api/v1/crates/libmimalloc-sys/0.1.24/download -> libmimalloc-sys-0.1.24.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/mimalloc/0.1.28/download -> mimalloc-0.1.28.crate https://crates.io/api/v1/crates/minimal-lexical/0.2.1/download -> minimal-lexical-0.2.1.crate https://crates.io/api/v1/crates/nom/7.1.1/download -> nom-7.1.1.crate https://crates.io/api/v1/crates/num_cpus/1.13.1/download -> num_cpus-1.13.1.crate https://crates.io/api/v1/crates/once_cell/1.12.0/download -> once_cell-1.12.0.crate https://crates.io/api/v1/crates/os_str_bytes/6.0.1/download -> os_str_bytes-6.0.1.crate https://crates.io/api/v1/crates/output_vt100/0.1.3/download -> output_vt100-0.1.3.crate https://crates.io/api/v1/crates/owo-colors/3.4.0/download -> owo-colors-3.4.0.crate https://crates.io/api/v1/crates/petgraph/0.6.1/download -> petgraph-0.6.1.crate https://crates.io/api/v1/crates/pretty_assertions/1.2.1/download -> pretty_assertions-1.2.1.crate https://crates.io/api/v1/crates/pretty_env_logger/0.4.0/download -> pretty_env_logger-0.4.0.crate https://crates.io/api/v1/crates/proc-macro2/1.0.39/download -> proc-macro2-1.0.39.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/1.0.18/download -> quote-1.0.18.crate https://crates.io/api/v1/crates/radix-heap/0.4.2/download -> radix-heap-0.4.2.crate https://crates.io/api/v1/crates/rayon/1.5.3/download -> rayon-1.5.3.crate https://crates.io/api/v1/crates/rayon-core/1.9.3/download -> rayon-core-1.9.3.crate https://crates.io/api/v1/crates/regex/1.5.6/download -> regex-1.5.6.crate https://crates.io/api/v1/crates/regex-syntax/0.6.26/download -> regex-syntax-0.6.26.crate https://crates.io/api/v1/crates/rpds/0.10.0/download -> rpds-0.10.0.crate https://crates.io/api/v1/crates/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/syn/1.0.95/download -> syn-1.0.95.crate https://crates.io/api/v1/crates/term_size/0.3.2/download -> term_size-0.3.2.crate https://crates.io/api/v1/crates/termcolor/1.1.3/download -> termcolor-1.1.3.crate https://crates.io/api/v1/crates/terminal_size/0.1.17/download -> terminal_size-0.1.17.crate https://crates.io/api/v1/crates/textwrap/0.15.0/download -> textwrap-0.15.0.crate https://crates.io/api/v1/crates/tree-sitter/0.20.6/download -> tree-sitter-0.20.6.crate https://crates.io/api/v1/crates/tree_magic_mini/3.0.3/download -> tree_magic_mini-3.0.3.crate https://crates.io/api/v1/crates/typed-arena/2.0.1/download -> typed-arena-2.0.1.crate https://crates.io/api/v1/crates/unicode-ident/1.0.0/download -> unicode-ident-1.0.0.crate https://crates.io/api/v1/crates/unicode-xid/0.2.3/download -> unicode-xid-0.2.3.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/wu-diff/0.1.2/download -> wu-diff-0.1.2.crate https://github.com/Wilfred/difftastic/archive/refs/tags/0.29.1.tar.gz -> difftastic-0.29.1.tar.gz
+_eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=8ab265d26622cbe1970d66b52264c130
diff --git a/metadata/md5-cache/dev-util/gcovr-5.1 b/metadata/md5-cache/dev-util/gcovr-5.1
new file mode 100644
index 000000000000..544cae5cae9c
--- /dev/null
+++ b/metadata/md5-cache/dev-util/gcovr-5.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A Python script for summarizing gcov data
+EAPI=8
+HOMEPAGE=https://github.com/gcovr/gcovr
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/gcovr/gcovr/archive/5.1.tar.gz -> gcovr-5.1.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=3f833337e5786dc90d38b28943c46c2b
diff --git a/metadata/md5-cache/dev-util/geany-1.38 b/metadata/md5-cache/dev-util/geany-1.38
index 3739f7dfcf46..34a57c437239 100644
--- a/metadata/md5-cache/dev-util/geany-1.38
+++ b/metadata/md5-cache/dev-util/geany-1.38
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.geany.org
 INHERIT=strip-linguas xdg
 IUSE=+vte
-KEYWORDS=~alpha amd64 arm ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ HPND
 RDEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.0:3 vte? ( x11-libs/vte:2.91 )
 SLOT=0
 SRC_URI=https://download.geany.org/geany-1.38.tar.bz2
 _eclasses_=strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=bdc089de5ffa61e4c390843e58ef67f7
+_md5_=14180e580f731972125f5e273e6371cc
diff --git a/metadata/md5-cache/dev-util/geany-plugins-1.38-r1 b/metadata/md5-cache/dev-util/geany-plugins-1.38-r1
index 81fdc1eef713..b50cd57f9f99 100644
--- a/metadata/md5-cache/dev-util/geany-plugins-1.38-r1
+++ b/metadata/md5-cache/dev-util/geany-plugins-1.38-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://plugins.geany.org
 INHERIT=lua-single
 IUSE=ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope soup workbench +lua_single_target_lua5-1
-KEYWORDS=amd64 arm ~ppc ppc64 ~sparc x86
+KEYWORDS=amd64 arm ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 >=dev-util/geany-1.37[-gtk2(-)] x11-libs/gtk+:3 ctags? ( dev-util/ctags ) debugger? ( x11-libs/vte:2.91 ) enchant? ( app-text/enchant:= ) git? ( <dev-libs/libgit2-1.4.0:= ) gpg? ( app-crypt/gpgme:= ) gtkspell? ( app-text/gtkspell:3= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) markdown? ( app-text/discount net-libs/webkit-gtk:4 ) pretty-printer? ( dev-libs/libxml2:2 ) scope? ( x11-libs/vte:2.91 ) soup? ( net-libs/libsoup:2.4 ) workbench? ( dev-libs/libgit2:= ) scope? ( sys-devel/gdb )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) )
 SLOT=0
 SRC_URI=https://plugins.geany.org/geany-plugins/geany-plugins-1.38.tar.gz
 _eclasses_=lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=6eb75dc0ea2781ef3574df912c7a2c78
+_md5_=5d7c4a9408ee4618eac9ceb7a373414e
diff --git a/metadata/md5-cache/dev-util/hip-5.0.2 b/metadata/md5-cache/dev-util/hip-5.0.2-r1
similarity index 97%
rename from metadata/md5-cache/dev-util/hip-5.0.2
rename to metadata/md5-cache/dev-util/hip-5.0.2-r1
index 5b82d2e6ad9a..66b4247f4a25 100644
--- a/metadata/md5-cache/dev-util/hip-5.0.2
+++ b/metadata/md5-cache/dev-util/hip-5.0.2-r1
@@ -12,4 +12,4 @@ RDEPEND=dev-util/rocminfo:0/5.0 =sys-devel/llvm-roc-5.0.2*[runtime] dev-libs/roc
 SLOT=0/5.0
 SRC_URI=https://github.com/ROCm-Developer-Tools/hipamd/archive/rocm-5.0.2.tar.gz -> rocm-hipamd-5.0.2.tar.gz https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-5.0.2.tar.gz -> rocm-hip-5.0.2.tar.gz https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-5.0.2.tar.gz -> rocclr-5.0.2.tar.gz https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-5.0.2.tar.gz -> rocm-opencl-runtime-5.0.2.tar.gz profile? ( https://github.com/ROCm-Developer-Tools/roctracer/archive/refs/tags/rocm-5.0.2.tar.gz -> rocm-tracer-5.0.2.tar.gz https://github.com/ROCm-Developer-Tools/hipamd/files/8311148/hip_prof_str_diff.gz -> 5.0.2-update-header.patch.gz )
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=fb459f8b18ead3f5da9fb4dbc2389263
+_md5_=4659f2225fd3cfa5e4f41b0c6504921c
diff --git a/metadata/md5-cache/dev-util/kernelshark-2.1.0 b/metadata/md5-cache/dev-util/kernelshark-2.1.0
new file mode 100644
index 000000000000..e36b49a17e0c
--- /dev/null
+++ b/metadata/md5-cache/dev-util/kernelshark-2.1.0
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( media-gfx/graphviz app-doc/doxygen ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-util/trace-cmd-3.0.2 dev-libs/json-c:= dev-qt/qtcore:5= dev-qt/qtnetwork:5= dev-qt/qtwidgets:5= >=media-libs/freeglut-3.0.0:= x11-libs/libXmu:= x11-libs/libXi:= >=dev-libs/libtracefs-1.3 >=dev-libs/libtraceevent-1.5 media-fonts/freefont
+DESCRIPTION=Graphical reader for trace-cmd output
+EAPI=7
+HOMEPAGE=https://kernelshark.org/
+INHERIT=flag-o-matic cmake
+IUSE=custom-optimization doc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=dev-util/trace-cmd-3.0.2 dev-libs/json-c:= dev-qt/qtcore:5= dev-qt/qtnetwork:5= dev-qt/qtwidgets:5= >=media-libs/freeglut-3.0.0:= x11-libs/libXmu:= x11-libs/libXi:= >=dev-libs/libtracefs-1.3 >=dev-libs/libtraceevent-1.5 media-fonts/freefont
+SLOT=0
+SRC_URI=https://git.kernel.org/pub/scm/utils/trace-cmd/kernel-shark.git/snapshot/kernel-shark-kernelshark-v2.1.0.tar.gz -> kernelshark-2.1.0.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=9aca6a31df08c9d195528076b8d00f10
diff --git a/metadata/md5-cache/dev-util/maturin-0.12.18 b/metadata/md5-cache/dev-util/maturin-0.12.18
deleted file mode 100644
index 87a26e757a79..000000000000
--- a/metadata/md5-cache/dev-util/maturin-0.12.18
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools-rust[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] doc? ( app-text/mdbook ) test? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/boltons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=virtual/rust-1.53 python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=Build and publish crates with pyo3, rust-cpython and cffi bindings
-EAPI=8
-HOMEPAGE=https://maturin.rs/
-INHERIT=cargo distutils-r1 flag-o-matic
-IUSE=doc test debug python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD CC0-1.0 ISC MIT MPL-2.0 openssl doc? ( CC-BY-4.0 OFL-1.1 )
-RDEPEND=python_targets_python3_8? ( dev-python/tomli[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/PyO3/maturin/archive/refs/tags/v0.12.18.tar.gz -> maturin-0.12.18.tar.gz https://crates.io/api/v1/crates/addr2line/0.17.0/download -> addr2line-0.17.0.crate https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/aes/0.6.0/download -> aes-0.6.0.crate https://crates.io/api/v1/crates/aes-soft/0.6.4/download -> aes-soft-0.6.4.crate https://crates.io/api/v1/crates/aesni/0.10.0/download -> aesni-0.10.0.crate https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/anyhow/1.0.57/download -> anyhow-1.0.57.crate https://crates.io/api/v1/crates/async-io/1.7.0/download -> async-io-1.7.0.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/backtrace/0.3.65/download -> backtrace-0.3.65.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/block-buffer/0.10.2/download -> block-buffer-0.10.2.crate https://crates.io/api/v1/crates/block-buffer/0.9.0/download -> block-buffer-0.9.0.crate https://crates.io/api/v1/crates/block-modes/0.7.0/download -> block-modes-0.7.0.crate https://crates.io/api/v1/crates/block-padding/0.2.1/download -> block-padding-0.2.1.crate https://crates.io/api/v1/crates/bstr/0.2.17/download -> bstr-0.2.17.crate https://crates.io/api/v1/crates/bumpalo/3.9.1/download -> bumpalo-3.9.1.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/bytes/1.1.0/download -> bytes-1.1.0.crate https://crates.io/api/v1/crates/bytesize/1.1.0/download -> bytesize-1.1.0.crate https://crates.io/api/v1/crates/bzip2/0.4.3/download -> bzip2-0.4.3.crate https://crates.io/api/v1/crates/bzip2-sys/0.1.11+1.0.8/download -> bzip2-sys-0.1.11+1.0.8.crate https://crates.io/api/v1/crates/cab/0.4.0/download -> cab-0.4.0.crate https://crates.io/api/v1/crates/cache-padded/1.2.0/download -> cache-padded-1.2.0.crate https://crates.io/api/v1/crates/camino/1.0.9/download -> camino-1.0.9.crate https://crates.io/api/v1/crates/cargo-options/0.1.4/download -> cargo-options-0.1.4.crate https://crates.io/api/v1/crates/cargo-platform/0.1.2/download -> cargo-platform-0.1.2.crate https://crates.io/api/v1/crates/cargo-xwin/0.8.7/download -> cargo-xwin-0.8.7.crate https://crates.io/api/v1/crates/cargo-zigbuild/0.8.8/download -> cargo-zigbuild-0.8.8.crate https://crates.io/api/v1/crates/cargo_metadata/0.14.2/download -> cargo_metadata-0.14.2.crate https://crates.io/api/v1/crates/cbindgen/0.23.0/download -> cbindgen-0.23.0.crate https://crates.io/api/v1/crates/cc/1.0.73/download -> cc-1.0.73.crate https://crates.io/api/v1/crates/cfb/0.7.0/download -> cfb-0.7.0.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/charset/0.1.3/download -> charset-0.1.3.crate https://crates.io/api/v1/crates/chunked_transfer/1.4.0/download -> chunked_transfer-1.4.0.crate https://crates.io/api/v1/crates/cipher/0.2.5/download -> cipher-0.2.5.crate https://crates.io/api/v1/crates/clap/3.1.18/download -> clap-3.1.18.crate https://crates.io/api/v1/crates/clap_complete/3.1.4/download -> clap_complete-3.1.4.crate https://crates.io/api/v1/crates/clap_complete_fig/3.1.5/download -> clap_complete_fig-3.1.5.crate https://crates.io/api/v1/crates/clap_derive/3.1.18/download -> clap_derive-3.1.18.crate https://crates.io/api/v1/crates/clap_lex/0.2.0/download -> clap_lex-0.2.0.crate https://crates.io/api/v1/crates/cli-table/0.4.7/download -> cli-table-0.4.7.crate https://crates.io/api/v1/crates/combine/4.6.4/download -> combine-4.6.4.crate https://crates.io/api/v1/crates/concurrent-queue/1.2.2/download -> concurrent-queue-1.2.2.crate https://crates.io/api/v1/crates/configparser/3.0.0/download -> configparser-3.0.0.crate https://crates.io/api/v1/crates/console/0.15.0/download -> console-0.15.0.crate https://crates.io/api/v1/crates/core-foundation/0.9.3/download -> core-foundation-0.9.3.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/cpufeatures/0.2.2/download -> cpufeatures-0.2.2.crate https://crates.io/api/v1/crates/crc32fast/1.3.2/download -> crc32fast-1.3.2.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.4/download -> crossbeam-channel-0.5.4.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.1/download -> crossbeam-deque-0.8.1.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.8/download -> crossbeam-epoch-0.9.8.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.8/download -> crossbeam-utils-0.8.8.crate https://crates.io/api/v1/crates/crypto-common/0.1.3/download -> crypto-common-0.1.3.crate https://crates.io/api/v1/crates/crypto-mac/0.10.1/download -> crypto-mac-0.10.1.crate https://crates.io/api/v1/crates/data-encoding/2.3.2/download -> data-encoding-2.3.2.crate https://crates.io/api/v1/crates/derivative/2.2.0/download -> derivative-2.2.0.crate https://crates.io/api/v1/crates/dialoguer/0.10.1/download -> dialoguer-0.10.1.crate https://crates.io/api/v1/crates/digest/0.10.3/download -> digest-0.10.3.crate https://crates.io/api/v1/crates/digest/0.9.0/download -> digest-0.9.0.crate https://crates.io/api/v1/crates/dirs/4.0.0/download -> dirs-4.0.0.crate https://crates.io/api/v1/crates/dirs-sys/0.3.7/download -> dirs-sys-0.3.7.crate https://crates.io/api/v1/crates/dunce/1.0.2/download -> dunce-1.0.2.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/encoding/0.2.33/download -> encoding-0.2.33.crate https://crates.io/api/v1/crates/encoding-index-japanese/1.20141219.5/download -> encoding-index-japanese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-korean/1.20141219.5/download -> encoding-index-korean-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-simpchinese/1.20141219.5/download -> encoding-index-simpchinese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-singlebyte/1.20141219.5/download -> encoding-index-singlebyte-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-tradchinese/1.20141219.5/download -> encoding-index-tradchinese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding_index_tests/0.1.4/download -> encoding_index_tests-0.1.4.crate https://crates.io/api/v1/crates/encoding_rs/0.8.31/download -> encoding_rs-0.8.31.crate https://crates.io/api/v1/crates/enumflags2/0.6.4/download -> enumflags2-0.6.4.crate https://crates.io/api/v1/crates/enumflags2_derive/0.6.4/download -> enumflags2_derive-0.6.4.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/fastrand/1.7.0/download -> fastrand-1.7.0.crate https://crates.io/api/v1/crates/fat-macho/0.4.5/download -> fat-macho-0.4.5.crate https://crates.io/api/v1/crates/filetime/0.2.16/download -> filetime-0.2.16.crate https://crates.io/api/v1/crates/flate2/1.0.24/download -> flate2-1.0.24.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/fs-err/2.7.0/download -> fs-err-2.7.0.crate https://crates.io/api/v1/crates/futures/0.3.21/download -> futures-0.3.21.crate https://crates.io/api/v1/crates/futures-channel/0.3.21/download -> futures-channel-0.3.21.crate https://crates.io/api/v1/crates/futures-core/0.3.21/download -> futures-core-0.3.21.crate https://crates.io/api/v1/crates/futures-executor/0.3.21/download -> futures-executor-0.3.21.crate https://crates.io/api/v1/crates/futures-io/0.3.21/download -> futures-io-0.3.21.crate https://crates.io/api/v1/crates/futures-lite/1.12.0/download -> futures-lite-1.12.0.crate https://crates.io/api/v1/crates/futures-macro/0.3.21/download -> futures-macro-0.3.21.crate https://crates.io/api/v1/crates/futures-sink/0.3.21/download -> futures-sink-0.3.21.crate https://crates.io/api/v1/crates/futures-task/0.3.21/download -> futures-task-0.3.21.crate https://crates.io/api/v1/crates/futures-util/0.3.21/download -> futures-util-0.3.21.crate https://crates.io/api/v1/crates/generic-array/0.14.5/download -> generic-array-0.14.5.crate https://crates.io/api/v1/crates/getrandom/0.2.6/download -> getrandom-0.2.6.crate https://crates.io/api/v1/crates/gimli/0.26.1/download -> gimli-0.26.1.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/globset/0.4.8/download -> globset-0.4.8.crate https://crates.io/api/v1/crates/goblin/0.5.1/download -> goblin-0.5.1.crate https://crates.io/api/v1/crates/hashbrown/0.11.2/download -> hashbrown-0.11.2.crate https://crates.io/api/v1/crates/heck/0.4.0/download -> heck-0.4.0.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/hkdf/0.10.0/download -> hkdf-0.10.0.crate https://crates.io/api/v1/crates/hmac/0.10.1/download -> hmac-0.10.1.crate https://crates.io/api/v1/crates/human-panic/1.0.3/download -> human-panic-1.0.3.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/idna/0.2.3/download -> idna-0.2.3.crate https://crates.io/api/v1/crates/ignore/0.4.18/download -> ignore-0.4.18.crate https://crates.io/api/v1/crates/indexmap/1.8.2/download -> indexmap-1.8.2.crate https://crates.io/api/v1/crates/indicatif/0.17.0-rc.6/download -> indicatif-0.17.0-rc.6.crate https://crates.io/api/v1/crates/indoc/1.0.6/download -> indoc-1.0.6.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/itertools/0.10.3/download -> itertools-0.10.3.crate https://crates.io/api/v1/crates/itoa/1.0.2/download -> itoa-1.0.2.crate https://crates.io/api/v1/crates/js-sys/0.3.57/download -> js-sys-0.3.57.crate https://crates.io/api/v1/crates/keyring/1.1.2/download -> keyring-1.1.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lddtree/0.2.9/download -> lddtree-0.2.9.crate https://crates.io/api/v1/crates/libc/0.2.126/download -> libc-0.2.126.crate https://crates.io/api/v1/crates/lock_api/0.4.7/download -> lock_api-0.4.7.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/lzxd/0.1.4/download -> lzxd-0.1.4.crate https://crates.io/api/v1/crates/mailparse/0.13.8/download -> mailparse-0.13.8.crate https://crates.io/api/v1/crates/matchers/0.1.0/download -> matchers-0.1.0.crate https://crates.io/api/v1/crates/matches/0.1.9/download -> matches-0.1.9.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/mime/0.3.16/download -> mime-0.3.16.crate https://crates.io/api/v1/crates/mime_guess/2.0.4/download -> mime_guess-2.0.4.crate https://crates.io/api/v1/crates/minijinja/0.15.0/download -> minijinja-0.15.0.crate https://crates.io/api/v1/crates/miniz_oxide/0.5.1/download -> miniz_oxide-0.5.1.crate https://crates.io/api/v1/crates/msi/0.5.0/download -> msi-0.5.0.crate https://crates.io/api/v1/crates/multipart/0.18.0/download -> multipart-0.18.0.crate https://crates.io/api/v1/crates/native-tls/0.2.10/download -> native-tls-0.2.10.crate https://crates.io/api/v1/crates/nb-connect/1.2.0/download -> nb-connect-1.2.0.crate https://crates.io/api/v1/crates/nix/0.17.0/download -> nix-0.17.0.crate https://crates.io/api/v1/crates/num/0.3.1/download -> num-0.3.1.crate https://crates.io/api/v1/crates/num-bigint/0.3.3/download -> num-bigint-0.3.3.crate https://crates.io/api/v1/crates/num-complex/0.3.1/download -> num-complex-0.3.1.crate https://crates.io/api/v1/crates/num-integer/0.1.45/download -> num-integer-0.1.45.crate https://crates.io/api/v1/crates/num-iter/0.1.43/download -> num-iter-0.1.43.crate https://crates.io/api/v1/crates/num-rational/0.3.2/download -> num-rational-0.3.2.crate https://crates.io/api/v1/crates/num-traits/0.2.15/download -> num-traits-0.2.15.crate https://crates.io/api/v1/crates/num_cpus/1.13.1/download -> num_cpus-1.13.1.crate https://crates.io/api/v1/crates/num_threads/0.1.6/download -> num_threads-0.1.6.crate https://crates.io/api/v1/crates/number_prefix/0.4.0/download -> number_prefix-0.4.0.crate https://crates.io/api/v1/crates/object/0.28.4/download -> object-0.28.4.crate https://crates.io/api/v1/crates/once_cell/1.12.0/download -> once_cell-1.12.0.crate https://crates.io/api/v1/crates/opaque-debug/0.3.0/download -> opaque-debug-0.3.0.crate https://crates.io/api/v1/crates/openssl/0.10.40/download -> openssl-0.10.40.crate https://crates.io/api/v1/crates/openssl-macros/0.1.0/download -> openssl-macros-0.1.0.crate https://crates.io/api/v1/crates/openssl-probe/0.1.5/download -> openssl-probe-0.1.5.crate https://crates.io/api/v1/crates/openssl-src/111.20.0+1.1.1o/download -> openssl-src-111.20.0+1.1.1o.crate https://crates.io/api/v1/crates/openssl-sys/0.9.73/download -> openssl-sys-0.9.73.crate https://crates.io/api/v1/crates/os_str_bytes/6.1.0/download -> os_str_bytes-6.1.0.crate https://crates.io/api/v1/crates/os_type/2.4.0/download -> os_type-2.4.0.crate https://crates.io/api/v1/crates/parking/2.0.0/download -> parking-2.0.0.crate https://crates.io/api/v1/crates/parking_lot/0.12.0/download -> parking_lot-0.12.0.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.3/download -> parking_lot_core-0.9.3.crate https://crates.io/api/v1/crates/path-slash/0.1.4/download -> path-slash-0.1.4.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.9/download -> pin-project-lite-0.2.9.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.25/download -> pkg-config-0.3.25.crate https://crates.io/api/v1/crates/plain/0.2.3/download -> plain-0.2.3.crate https://crates.io/api/v1/crates/platform-info/0.2.0/download -> platform-info-0.2.0.crate https://crates.io/api/v1/crates/polling/2.2.0/download -> polling-2.2.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.16/download -> ppv-lite86-0.2.16.crate https://crates.io/api/v1/crates/pretty_env_logger/0.4.0/download -> pretty_env_logger-0.4.0.crate https://crates.io/api/v1/crates/proc-macro-crate/0.1.5/download -> proc-macro-crate-0.1.5.crate https://crates.io/api/v1/crates/proc-macro-crate/1.1.3/download -> proc-macro-crate-1.1.3.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro2/1.0.39/download -> proc-macro2-1.0.39.crate https://crates.io/api/v1/crates/pyproject-toml/0.3.1/download -> pyproject-toml-0.3.1.crate https://crates.io/api/v1/crates/python-pkginfo/0.5.4/download -> python-pkginfo-0.5.4.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/1.0.18/download -> quote-1.0.18.crate https://crates.io/api/v1/crates/quoted_printable/0.4.5/download -> quoted_printable-0.4.5.crate https://crates.io/api/v1/crates/rand/0.8.5/download -> rand-0.8.5.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.6.3/download -> rand_core-0.6.3.crate https://crates.io/api/v1/crates/rayon/1.5.3/download -> rayon-1.5.3.crate https://crates.io/api/v1/crates/rayon-core/1.9.3/download -> rayon-core-1.9.3.crate https://crates.io/api/v1/crates/redox_syscall/0.2.13/download -> redox_syscall-0.2.13.crate https://crates.io/api/v1/crates/redox_users/0.4.3/download -> redox_users-0.4.3.crate https://crates.io/api/v1/crates/regex/1.5.6/download -> regex-1.5.6.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.26/download -> regex-syntax-0.6.26.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rfc2047-decoder/0.1.2/download -> rfc2047-decoder-0.1.2.crate https://crates.io/api/v1/crates/ring/0.16.20/download -> ring-0.16.20.crate https://crates.io/api/v1/crates/rpassword/6.0.1/download -> rpassword-6.0.1.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.21/download -> rustc-demangle-0.1.21.crate https://crates.io/api/v1/crates/rustc_version/0.4.0/download -> rustc_version-0.4.0.crate https://crates.io/api/v1/crates/rustls/0.20.6/download -> rustls-0.20.6.crate https://crates.io/api/v1/crates/ryu/1.0.10/download -> ryu-1.0.10.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/schannel/0.1.20/download -> schannel-0.1.20.crate https://crates.io/api/v1/crates/scoped-tls/1.0.0/download -> scoped-tls-1.0.0.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/scroll/0.11.0/download -> scroll-0.11.0.crate https://crates.io/api/v1/crates/scroll_derive/0.11.0/download -> scroll_derive-0.11.0.crate https://crates.io/api/v1/crates/sct/0.7.0/download -> sct-0.7.0.crate https://crates.io/api/v1/crates/secret-service/2.0.1/download -> secret-service-2.0.1.crate https://crates.io/api/v1/crates/security-framework/2.6.1/download -> security-framework-2.6.1.crate https://crates.io/api/v1/crates/security-framework-sys/2.6.1/download -> security-framework-sys-2.6.1.crate https://crates.io/api/v1/crates/semver/1.0.9/download -> semver-1.0.9.crate https://crates.io/api/v1/crates/serde/1.0.137/download -> serde-1.0.137.crate https://crates.io/api/v1/crates/serde_derive/1.0.137/download -> serde_derive-1.0.137.crate https://crates.io/api/v1/crates/serde_json/1.0.81/download -> serde_json-1.0.81.crate https://crates.io/api/v1/crates/serde_repr/0.1.8/download -> serde_repr-0.1.8.crate https://crates.io/api/v1/crates/sha2/0.10.2/download -> sha2-0.10.2.crate https://crates.io/api/v1/crates/sha2/0.9.9/download -> sha2-0.9.9.crate https://crates.io/api/v1/crates/sharded-slab/0.1.4/download -> sharded-slab-0.1.4.crate https://crates.io/api/v1/crates/shlex/1.1.0/download -> shlex-1.1.0.crate https://crates.io/api/v1/crates/slab/0.4.6/download -> slab-0.4.6.crate https://crates.io/api/v1/crates/smallvec/1.8.0/download -> smallvec-1.8.0.crate https://crates.io/api/v1/crates/smawk/0.3.1/download -> smawk-0.3.1.crate https://crates.io/api/v1/crates/socket2/0.4.4/download -> socket2-0.4.4.crate https://crates.io/api/v1/crates/socks/0.3.4/download -> socks-0.3.4.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/subtle/2.4.1/download -> subtle-2.4.1.crate https://crates.io/api/v1/crates/syn/1.0.95/download -> syn-1.0.95.crate https://crates.io/api/v1/crates/tar/0.4.38/download -> tar-0.4.38.crate https://crates.io/api/v1/crates/target-lexicon/0.12.4/download -> target-lexicon-0.12.4.crate https://crates.io/api/v1/crates/tempfile/3.3.0/download -> tempfile-3.3.0.crate https://crates.io/api/v1/crates/termcolor/1.1.3/download -> termcolor-1.1.3.crate https://crates.io/api/v1/crates/terminal_size/0.1.17/download -> terminal_size-0.1.17.crate https://crates.io/api/v1/crates/textwrap/0.15.0/download -> textwrap-0.15.0.crate https://crates.io/api/v1/crates/thiserror/1.0.31/download -> thiserror-1.0.31.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.31/download -> thiserror-impl-1.0.31.crate https://crates.io/api/v1/crates/thread_local/1.1.4/download -> thread_local-1.1.4.crate https://crates.io/api/v1/crates/time/0.3.9/download -> time-0.3.9.crate https://crates.io/api/v1/crates/time-macros/0.2.4/download -> time-macros-0.2.4.crate https://crates.io/api/v1/crates/tinyvec/1.6.0/download -> tinyvec-1.6.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/toml/0.5.9/download -> toml-0.5.9.crate https://crates.io/api/v1/crates/toml_edit/0.14.4/download -> toml_edit-0.14.4.crate https://crates.io/api/v1/crates/tracing/0.1.34/download -> tracing-0.1.34.crate https://crates.io/api/v1/crates/tracing-attributes/0.1.21/download -> tracing-attributes-0.1.21.crate https://crates.io/api/v1/crates/tracing-core/0.1.26/download -> tracing-core-0.1.26.crate https://crates.io/api/v1/crates/tracing-serde/0.1.3/download -> tracing-serde-0.1.3.crate https://crates.io/api/v1/crates/tracing-subscriber/0.3.11/download -> tracing-subscriber-0.3.11.crate https://crates.io/api/v1/crates/twox-hash/1.6.3/download -> twox-hash-1.6.3.crate https://crates.io/api/v1/crates/typenum/1.15.0/download -> typenum-1.15.0.crate https://crates.io/api/v1/crates/unicase/2.6.0/download -> unicase-2.6.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.8/download -> unicode-bidi-0.3.8.crate https://crates.io/api/v1/crates/unicode-ident/1.0.0/download -> unicode-ident-1.0.0.crate https://crates.io/api/v1/crates/unicode-linebreak/0.1.2/download -> unicode-linebreak-0.1.2.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.19/download -> unicode-normalization-0.1.19.crate https://crates.io/api/v1/crates/unicode-width/0.1.9/download -> unicode-width-0.1.9.crate https://crates.io/api/v1/crates/untrusted/0.7.1/download -> untrusted-0.7.1.crate https://crates.io/api/v1/crates/ureq/2.4.0/download -> ureq-2.4.0.crate https://crates.io/api/v1/crates/url/2.2.2/download -> url-2.2.2.crate https://crates.io/api/v1/crates/uuid/0.8.2/download -> uuid-0.8.2.crate https://crates.io/api/v1/crates/uuid/1.1.0/download -> uuid-1.1.0.crate https://crates.io/api/v1/crates/valuable/0.1.0/download -> valuable-0.1.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/waker-fn/1.1.0/download -> waker-fn-1.1.0.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.80/download -> wasm-bindgen-0.2.80.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.80/download -> wasm-bindgen-backend-0.2.80.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.80/download -> wasm-bindgen-macro-0.2.80.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.80/download -> wasm-bindgen-macro-support-0.2.80.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.80/download -> wasm-bindgen-shared-0.2.80.crate https://crates.io/api/v1/crates/web-sys/0.3.57/download -> web-sys-0.3.57.crate https://crates.io/api/v1/crates/webpki/0.22.0/download -> webpki-0.22.0.crate https://crates.io/api/v1/crates/webpki-roots/0.22.3/download -> webpki-roots-0.22.3.crate https://crates.io/api/v1/crates/wepoll-ffi/0.1.2/download -> wepoll-ffi-0.1.2.crate https://crates.io/api/v1/crates/which/4.2.5/download -> which-4.2.5.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/windows-sys/0.36.1/download -> windows-sys-0.36.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.36.1/download -> windows_aarch64_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.36.1/download -> windows_i686_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.36.1/download -> windows_i686_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.36.1/download -> windows_x86_64_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.36.1/download -> windows_x86_64_msvc-0.36.1.crate https://crates.io/api/v1/crates/xattr/0.2.3/download -> xattr-0.2.3.crate https://crates.io/api/v1/crates/xwin/0.2.4/download -> xwin-0.2.4.crate https://crates.io/api/v1/crates/zbus/1.9.1/download -> zbus-1.9.1.crate https://crates.io/api/v1/crates/zbus_macros/1.9.1/download -> zbus_macros-1.9.1.crate https://crates.io/api/v1/crates/zip/0.6.2/download -> zip-0.6.2.crate https://crates.io/api/v1/crates/zvariant/2.10.0/download -> zvariant-2.10.0.crate https://crates.io/api/v1/crates/zvariant_derive/2.10.0/download -> zvariant_derive-2.10.0.crate test? ( https://crates.io/api/v1/crates/libc/0.2.119/download -> libc-0.2.119.crate https://crates.io/api/v1/crates/libc/0.2.125/download -> libc-0.2.125.crate https://crates.io/api/v1/crates/once_cell/1.10.0/download -> once_cell-1.10.0.crate https://crates.io/api/v1/crates/once_cell/1.11.0/download -> once_cell-1.11.0.crate https://crates.io/api/v1/crates/once_cell/1.9.0/download -> once_cell-1.9.0.crate https://crates.io/api/v1/crates/proc-macro2/1.0.38/download -> proc-macro2-1.0.38.crate https://crates.io/api/v1/crates/pyo3/0.16.5/download -> pyo3-0.16.5.crate https://crates.io/api/v1/crates/pyo3-build-config/0.16.0/download -> pyo3-build-config-0.16.0.crate https://crates.io/api/v1/crates/pyo3-build-config/0.16.5/download -> pyo3-build-config-0.16.5.crate https://crates.io/api/v1/crates/pyo3-ffi/0.16.0/download -> pyo3-ffi-0.16.0.crate https://crates.io/api/v1/crates/pyo3-ffi/0.16.5/download -> pyo3-ffi-0.16.5.crate https://crates.io/api/v1/crates/pyo3-macros/0.16.5/download -> pyo3-macros-0.16.5.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.16.5/download -> pyo3-macros-backend-0.16.5.crate https://crates.io/api/v1/crates/python3-dll-a/0.2.3/download -> python3-dll-a-0.2.3.crate https://crates.io/api/v1/crates/syn/1.0.94/download -> syn-1.0.94.crate https://crates.io/api/v1/crates/target-lexicon/0.12.3/download -> target-lexicon-0.12.3.crate https://crates.io/api/v1/crates/unicode-xid/0.2.3/download -> unicode-xid-0.2.3.crate https://crates.io/api/v1/crates/unindent/0.1.9/download -> unindent-0.1.9.crate )
-_eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	distutils-r1	10a93585889c3ca7651cbcd2ee831e47	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=3a28c94e2e28f6b5aff0247ac3f63fc1
diff --git a/metadata/md5-cache/dev-util/maturin-0.12.20 b/metadata/md5-cache/dev-util/maturin-0.12.20
new file mode 100644
index 000000000000..1b1b0b9db17a
--- /dev/null
+++ b/metadata/md5-cache/dev-util/maturin-0.12.20
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools-rust[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] doc? ( app-text/mdbook ) test? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/boltons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=virtual/rust-1.53 python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=Build and publish crates with pyo3, rust-cpython and cffi bindings
+EAPI=8
+HOMEPAGE=https://maturin.rs/
+INHERIT=cargo distutils-r1 flag-o-matic
+IUSE=doc test debug python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD CC0-1.0 ISC MIT MPL-2.0 openssl doc? ( CC-BY-4.0 OFL-1.1 )
+RDEPEND=python_targets_python3_8? ( dev-python/tomli[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/PyO3/maturin/archive/refs/tags/v0.12.20.tar.gz -> maturin-0.12.20.tar.gz https://crates.io/api/v1/crates/addr2line/0.17.0/download -> addr2line-0.17.0.crate https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/aes/0.6.0/download -> aes-0.6.0.crate https://crates.io/api/v1/crates/aes-soft/0.6.4/download -> aes-soft-0.6.4.crate https://crates.io/api/v1/crates/aesni/0.10.0/download -> aesni-0.10.0.crate https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/anyhow/1.0.57/download -> anyhow-1.0.57.crate https://crates.io/api/v1/crates/async-io/1.7.0/download -> async-io-1.7.0.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/backtrace/0.3.65/download -> backtrace-0.3.65.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/block-buffer/0.10.2/download -> block-buffer-0.10.2.crate https://crates.io/api/v1/crates/block-buffer/0.9.0/download -> block-buffer-0.9.0.crate https://crates.io/api/v1/crates/block-modes/0.7.0/download -> block-modes-0.7.0.crate https://crates.io/api/v1/crates/block-padding/0.2.1/download -> block-padding-0.2.1.crate https://crates.io/api/v1/crates/bstr/0.2.17/download -> bstr-0.2.17.crate https://crates.io/api/v1/crates/bumpalo/3.10.0/download -> bumpalo-3.10.0.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/bytes/1.1.0/download -> bytes-1.1.0.crate https://crates.io/api/v1/crates/bytesize/1.1.0/download -> bytesize-1.1.0.crate https://crates.io/api/v1/crates/bzip2/0.4.3/download -> bzip2-0.4.3.crate https://crates.io/api/v1/crates/bzip2-sys/0.1.11+1.0.8/download -> bzip2-sys-0.1.11+1.0.8.crate https://crates.io/api/v1/crates/cab/0.4.0/download -> cab-0.4.0.crate https://crates.io/api/v1/crates/cache-padded/1.2.0/download -> cache-padded-1.2.0.crate https://crates.io/api/v1/crates/camino/1.0.9/download -> camino-1.0.9.crate https://crates.io/api/v1/crates/cargo-options/0.1.4/download -> cargo-options-0.1.4.crate https://crates.io/api/v1/crates/cargo-platform/0.1.2/download -> cargo-platform-0.1.2.crate https://crates.io/api/v1/crates/cargo-xwin/0.8.7/download -> cargo-xwin-0.8.7.crate https://crates.io/api/v1/crates/cargo-zigbuild/0.9.0/download -> cargo-zigbuild-0.9.0.crate https://crates.io/api/v1/crates/cargo_metadata/0.14.2/download -> cargo_metadata-0.14.2.crate https://crates.io/api/v1/crates/cbindgen/0.24.3/download -> cbindgen-0.24.3.crate https://crates.io/api/v1/crates/cc/1.0.73/download -> cc-1.0.73.crate https://crates.io/api/v1/crates/cfb/0.7.0/download -> cfb-0.7.0.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/charset/0.1.3/download -> charset-0.1.3.crate https://crates.io/api/v1/crates/chunked_transfer/1.4.0/download -> chunked_transfer-1.4.0.crate https://crates.io/api/v1/crates/cipher/0.2.5/download -> cipher-0.2.5.crate https://crates.io/api/v1/crates/clap/3.2.4/download -> clap-3.2.4.crate https://crates.io/api/v1/crates/clap_complete/3.2.1/download -> clap_complete-3.2.1.crate https://crates.io/api/v1/crates/clap_complete_fig/3.2.1/download -> clap_complete_fig-3.2.1.crate https://crates.io/api/v1/crates/clap_derive/3.2.4/download -> clap_derive-3.2.4.crate https://crates.io/api/v1/crates/clap_lex/0.2.2/download -> clap_lex-0.2.2.crate https://crates.io/api/v1/crates/cli-table/0.4.7/download -> cli-table-0.4.7.crate https://crates.io/api/v1/crates/combine/4.6.4/download -> combine-4.6.4.crate https://crates.io/api/v1/crates/concurrent-queue/1.2.2/download -> concurrent-queue-1.2.2.crate https://crates.io/api/v1/crates/configparser/3.0.0/download -> configparser-3.0.0.crate https://crates.io/api/v1/crates/console/0.15.0/download -> console-0.15.0.crate https://crates.io/api/v1/crates/core-foundation/0.9.3/download -> core-foundation-0.9.3.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/cpufeatures/0.2.2/download -> cpufeatures-0.2.2.crate https://crates.io/api/v1/crates/crc32fast/1.3.2/download -> crc32fast-1.3.2.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.4/download -> crossbeam-channel-0.5.4.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.1/download -> crossbeam-deque-0.8.1.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.8/download -> crossbeam-epoch-0.9.8.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.8/download -> crossbeam-utils-0.8.8.crate https://crates.io/api/v1/crates/crypto-common/0.1.3/download -> crypto-common-0.1.3.crate https://crates.io/api/v1/crates/crypto-mac/0.10.1/download -> crypto-mac-0.10.1.crate https://crates.io/api/v1/crates/data-encoding/2.3.2/download -> data-encoding-2.3.2.crate https://crates.io/api/v1/crates/derivative/2.2.0/download -> derivative-2.2.0.crate https://crates.io/api/v1/crates/dialoguer/0.10.1/download -> dialoguer-0.10.1.crate https://crates.io/api/v1/crates/digest/0.10.3/download -> digest-0.10.3.crate https://crates.io/api/v1/crates/digest/0.9.0/download -> digest-0.9.0.crate https://crates.io/api/v1/crates/dirs/4.0.0/download -> dirs-4.0.0.crate https://crates.io/api/v1/crates/dirs-sys/0.3.7/download -> dirs-sys-0.3.7.crate https://crates.io/api/v1/crates/dunce/1.0.2/download -> dunce-1.0.2.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/encoding/0.2.33/download -> encoding-0.2.33.crate https://crates.io/api/v1/crates/encoding-index-japanese/1.20141219.5/download -> encoding-index-japanese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-korean/1.20141219.5/download -> encoding-index-korean-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-simpchinese/1.20141219.5/download -> encoding-index-simpchinese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-singlebyte/1.20141219.5/download -> encoding-index-singlebyte-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-tradchinese/1.20141219.5/download -> encoding-index-tradchinese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding_index_tests/0.1.4/download -> encoding_index_tests-0.1.4.crate https://crates.io/api/v1/crates/encoding_rs/0.8.31/download -> encoding_rs-0.8.31.crate https://crates.io/api/v1/crates/enumflags2/0.6.4/download -> enumflags2-0.6.4.crate https://crates.io/api/v1/crates/enumflags2_derive/0.6.4/download -> enumflags2_derive-0.6.4.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/fastrand/1.7.0/download -> fastrand-1.7.0.crate https://crates.io/api/v1/crates/fat-macho/0.4.5/download -> fat-macho-0.4.5.crate https://crates.io/api/v1/crates/filetime/0.2.16/download -> filetime-0.2.16.crate https://crates.io/api/v1/crates/flate2/1.0.24/download -> flate2-1.0.24.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/fs-err/2.7.0/download -> fs-err-2.7.0.crate https://crates.io/api/v1/crates/futures/0.3.21/download -> futures-0.3.21.crate https://crates.io/api/v1/crates/futures-channel/0.3.21/download -> futures-channel-0.3.21.crate https://crates.io/api/v1/crates/futures-core/0.3.21/download -> futures-core-0.3.21.crate https://crates.io/api/v1/crates/futures-executor/0.3.21/download -> futures-executor-0.3.21.crate https://crates.io/api/v1/crates/futures-io/0.3.21/download -> futures-io-0.3.21.crate https://crates.io/api/v1/crates/futures-lite/1.12.0/download -> futures-lite-1.12.0.crate https://crates.io/api/v1/crates/futures-macro/0.3.21/download -> futures-macro-0.3.21.crate https://crates.io/api/v1/crates/futures-sink/0.3.21/download -> futures-sink-0.3.21.crate https://crates.io/api/v1/crates/futures-task/0.3.21/download -> futures-task-0.3.21.crate https://crates.io/api/v1/crates/futures-util/0.3.21/download -> futures-util-0.3.21.crate https://crates.io/api/v1/crates/generic-array/0.14.5/download -> generic-array-0.14.5.crate https://crates.io/api/v1/crates/getrandom/0.2.7/download -> getrandom-0.2.7.crate https://crates.io/api/v1/crates/gimli/0.26.1/download -> gimli-0.26.1.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/globset/0.4.9/download -> globset-0.4.9.crate https://crates.io/api/v1/crates/goblin/0.5.2/download -> goblin-0.5.2.crate https://crates.io/api/v1/crates/hashbrown/0.11.2/download -> hashbrown-0.11.2.crate https://crates.io/api/v1/crates/heck/0.4.0/download -> heck-0.4.0.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/hkdf/0.10.0/download -> hkdf-0.10.0.crate https://crates.io/api/v1/crates/hmac/0.10.1/download -> hmac-0.10.1.crate https://crates.io/api/v1/crates/human-panic/1.0.3/download -> human-panic-1.0.3.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/idna/0.2.3/download -> idna-0.2.3.crate https://crates.io/api/v1/crates/ignore/0.4.18/download -> ignore-0.4.18.crate https://crates.io/api/v1/crates/indexmap/1.8.2/download -> indexmap-1.8.2.crate https://crates.io/api/v1/crates/indicatif/0.17.0-rc.6/download -> indicatif-0.17.0-rc.6.crate https://crates.io/api/v1/crates/indoc/1.0.6/download -> indoc-1.0.6.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/itertools/0.10.3/download -> itertools-0.10.3.crate https://crates.io/api/v1/crates/itoa/1.0.2/download -> itoa-1.0.2.crate https://crates.io/api/v1/crates/js-sys/0.3.58/download -> js-sys-0.3.58.crate https://crates.io/api/v1/crates/keyring/1.1.2/download -> keyring-1.1.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lddtree/0.2.9/download -> lddtree-0.2.9.crate https://crates.io/api/v1/crates/libc/0.2.126/download -> libc-0.2.126.crate https://crates.io/api/v1/crates/lock_api/0.4.7/download -> lock_api-0.4.7.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/lzxd/0.1.4/download -> lzxd-0.1.4.crate https://crates.io/api/v1/crates/mailparse/0.13.8/download -> mailparse-0.13.8.crate https://crates.io/api/v1/crates/matchers/0.1.0/download -> matchers-0.1.0.crate https://crates.io/api/v1/crates/matches/0.1.9/download -> matches-0.1.9.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/mime/0.3.16/download -> mime-0.3.16.crate https://crates.io/api/v1/crates/mime_guess/2.0.4/download -> mime_guess-2.0.4.crate https://crates.io/api/v1/crates/minijinja/0.15.0/download -> minijinja-0.15.0.crate https://crates.io/api/v1/crates/miniz_oxide/0.5.3/download -> miniz_oxide-0.5.3.crate https://crates.io/api/v1/crates/msi/0.5.0/download -> msi-0.5.0.crate https://crates.io/api/v1/crates/multipart/0.18.0/download -> multipart-0.18.0.crate https://crates.io/api/v1/crates/native-tls/0.2.10/download -> native-tls-0.2.10.crate https://crates.io/api/v1/crates/nb-connect/1.2.0/download -> nb-connect-1.2.0.crate https://crates.io/api/v1/crates/nix/0.17.0/download -> nix-0.17.0.crate https://crates.io/api/v1/crates/num/0.3.1/download -> num-0.3.1.crate https://crates.io/api/v1/crates/num-bigint/0.3.3/download -> num-bigint-0.3.3.crate https://crates.io/api/v1/crates/num-complex/0.3.1/download -> num-complex-0.3.1.crate https://crates.io/api/v1/crates/num-integer/0.1.45/download -> num-integer-0.1.45.crate https://crates.io/api/v1/crates/num-iter/0.1.43/download -> num-iter-0.1.43.crate https://crates.io/api/v1/crates/num-rational/0.3.2/download -> num-rational-0.3.2.crate https://crates.io/api/v1/crates/num-traits/0.2.15/download -> num-traits-0.2.15.crate https://crates.io/api/v1/crates/num_cpus/1.13.1/download -> num_cpus-1.13.1.crate https://crates.io/api/v1/crates/num_threads/0.1.6/download -> num_threads-0.1.6.crate https://crates.io/api/v1/crates/number_prefix/0.4.0/download -> number_prefix-0.4.0.crate https://crates.io/api/v1/crates/object/0.28.4/download -> object-0.28.4.crate https://crates.io/api/v1/crates/once_cell/1.12.0/download -> once_cell-1.12.0.crate https://crates.io/api/v1/crates/opaque-debug/0.3.0/download -> opaque-debug-0.3.0.crate https://crates.io/api/v1/crates/openssl/0.10.40/download -> openssl-0.10.40.crate https://crates.io/api/v1/crates/openssl-macros/0.1.0/download -> openssl-macros-0.1.0.crate https://crates.io/api/v1/crates/openssl-probe/0.1.5/download -> openssl-probe-0.1.5.crate https://crates.io/api/v1/crates/openssl-src/111.20.0+1.1.1o/download -> openssl-src-111.20.0+1.1.1o.crate https://crates.io/api/v1/crates/openssl-sys/0.9.74/download -> openssl-sys-0.9.74.crate https://crates.io/api/v1/crates/os_str_bytes/6.1.0/download -> os_str_bytes-6.1.0.crate https://crates.io/api/v1/crates/os_type/2.4.0/download -> os_type-2.4.0.crate https://crates.io/api/v1/crates/parking/2.0.0/download -> parking-2.0.0.crate https://crates.io/api/v1/crates/parking_lot/0.12.1/download -> parking_lot-0.12.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.3/download -> parking_lot_core-0.9.3.crate https://crates.io/api/v1/crates/path-slash/0.1.4/download -> path-slash-0.1.4.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.9/download -> pin-project-lite-0.2.9.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.25/download -> pkg-config-0.3.25.crate https://crates.io/api/v1/crates/plain/0.2.3/download -> plain-0.2.3.crate https://crates.io/api/v1/crates/platform-info/0.2.0/download -> platform-info-0.2.0.crate https://crates.io/api/v1/crates/polling/2.2.0/download -> polling-2.2.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.16/download -> ppv-lite86-0.2.16.crate https://crates.io/api/v1/crates/pretty_env_logger/0.4.0/download -> pretty_env_logger-0.4.0.crate https://crates.io/api/v1/crates/proc-macro-crate/0.1.5/download -> proc-macro-crate-0.1.5.crate https://crates.io/api/v1/crates/proc-macro-crate/1.1.3/download -> proc-macro-crate-1.1.3.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro2/1.0.39/download -> proc-macro2-1.0.39.crate https://crates.io/api/v1/crates/pyproject-toml/0.3.1/download -> pyproject-toml-0.3.1.crate https://crates.io/api/v1/crates/python-pkginfo/0.5.4/download -> python-pkginfo-0.5.4.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/1.0.18/download -> quote-1.0.18.crate https://crates.io/api/v1/crates/quoted_printable/0.4.5/download -> quoted_printable-0.4.5.crate https://crates.io/api/v1/crates/rand/0.8.5/download -> rand-0.8.5.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.6.3/download -> rand_core-0.6.3.crate https://crates.io/api/v1/crates/rayon/1.5.3/download -> rayon-1.5.3.crate https://crates.io/api/v1/crates/rayon-core/1.9.3/download -> rayon-core-1.9.3.crate https://crates.io/api/v1/crates/redox_syscall/0.2.13/download -> redox_syscall-0.2.13.crate https://crates.io/api/v1/crates/redox_users/0.4.3/download -> redox_users-0.4.3.crate https://crates.io/api/v1/crates/regex/1.5.6/download -> regex-1.5.6.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.26/download -> regex-syntax-0.6.26.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rfc2047-decoder/0.1.2/download -> rfc2047-decoder-0.1.2.crate https://crates.io/api/v1/crates/ring/0.16.20/download -> ring-0.16.20.crate https://crates.io/api/v1/crates/rpassword/6.0.1/download -> rpassword-6.0.1.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.21/download -> rustc-demangle-0.1.21.crate https://crates.io/api/v1/crates/rustc_version/0.4.0/download -> rustc_version-0.4.0.crate https://crates.io/api/v1/crates/rustls/0.20.6/download -> rustls-0.20.6.crate https://crates.io/api/v1/crates/ryu/1.0.10/download -> ryu-1.0.10.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/schannel/0.1.20/download -> schannel-0.1.20.crate https://crates.io/api/v1/crates/scoped-tls/1.0.0/download -> scoped-tls-1.0.0.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/scroll/0.11.0/download -> scroll-0.11.0.crate https://crates.io/api/v1/crates/scroll_derive/0.11.0/download -> scroll_derive-0.11.0.crate https://crates.io/api/v1/crates/sct/0.7.0/download -> sct-0.7.0.crate https://crates.io/api/v1/crates/secret-service/2.0.1/download -> secret-service-2.0.1.crate https://crates.io/api/v1/crates/security-framework/2.6.1/download -> security-framework-2.6.1.crate https://crates.io/api/v1/crates/security-framework-sys/2.6.1/download -> security-framework-sys-2.6.1.crate https://crates.io/api/v1/crates/semver/1.0.10/download -> semver-1.0.10.crate https://crates.io/api/v1/crates/serde/1.0.137/download -> serde-1.0.137.crate https://crates.io/api/v1/crates/serde_derive/1.0.137/download -> serde_derive-1.0.137.crate https://crates.io/api/v1/crates/serde_json/1.0.81/download -> serde_json-1.0.81.crate https://crates.io/api/v1/crates/serde_repr/0.1.8/download -> serde_repr-0.1.8.crate https://crates.io/api/v1/crates/sha2/0.10.2/download -> sha2-0.10.2.crate https://crates.io/api/v1/crates/sha2/0.9.9/download -> sha2-0.9.9.crate https://crates.io/api/v1/crates/sharded-slab/0.1.4/download -> sharded-slab-0.1.4.crate https://crates.io/api/v1/crates/shlex/1.1.0/download -> shlex-1.1.0.crate https://crates.io/api/v1/crates/slab/0.4.6/download -> slab-0.4.6.crate https://crates.io/api/v1/crates/smallvec/1.8.0/download -> smallvec-1.8.0.crate https://crates.io/api/v1/crates/smawk/0.3.1/download -> smawk-0.3.1.crate https://crates.io/api/v1/crates/socket2/0.4.4/download -> socket2-0.4.4.crate https://crates.io/api/v1/crates/socks/0.3.4/download -> socks-0.3.4.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/subtle/2.4.1/download -> subtle-2.4.1.crate https://crates.io/api/v1/crates/syn/1.0.96/download -> syn-1.0.96.crate https://crates.io/api/v1/crates/tar/0.4.38/download -> tar-0.4.38.crate https://crates.io/api/v1/crates/target-lexicon/0.12.4/download -> target-lexicon-0.12.4.crate https://crates.io/api/v1/crates/tempfile/3.3.0/download -> tempfile-3.3.0.crate https://crates.io/api/v1/crates/termcolor/1.1.3/download -> termcolor-1.1.3.crate https://crates.io/api/v1/crates/terminal_size/0.1.17/download -> terminal_size-0.1.17.crate https://crates.io/api/v1/crates/textwrap/0.15.0/download -> textwrap-0.15.0.crate https://crates.io/api/v1/crates/thiserror/1.0.31/download -> thiserror-1.0.31.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.31/download -> thiserror-impl-1.0.31.crate https://crates.io/api/v1/crates/thread_local/1.1.4/download -> thread_local-1.1.4.crate https://crates.io/api/v1/crates/time/0.3.9/download -> time-0.3.9.crate https://crates.io/api/v1/crates/time-macros/0.2.4/download -> time-macros-0.2.4.crate https://crates.io/api/v1/crates/tinyvec/1.6.0/download -> tinyvec-1.6.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/toml/0.5.9/download -> toml-0.5.9.crate https://crates.io/api/v1/crates/toml_edit/0.14.4/download -> toml_edit-0.14.4.crate https://crates.io/api/v1/crates/tracing/0.1.35/download -> tracing-0.1.35.crate https://crates.io/api/v1/crates/tracing-attributes/0.1.21/download -> tracing-attributes-0.1.21.crate https://crates.io/api/v1/crates/tracing-core/0.1.27/download -> tracing-core-0.1.27.crate https://crates.io/api/v1/crates/tracing-serde/0.1.3/download -> tracing-serde-0.1.3.crate https://crates.io/api/v1/crates/tracing-subscriber/0.3.11/download -> tracing-subscriber-0.3.11.crate https://crates.io/api/v1/crates/twox-hash/1.6.3/download -> twox-hash-1.6.3.crate https://crates.io/api/v1/crates/typenum/1.15.0/download -> typenum-1.15.0.crate https://crates.io/api/v1/crates/unicase/2.6.0/download -> unicase-2.6.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.8/download -> unicode-bidi-0.3.8.crate https://crates.io/api/v1/crates/unicode-ident/1.0.1/download -> unicode-ident-1.0.1.crate https://crates.io/api/v1/crates/unicode-linebreak/0.1.2/download -> unicode-linebreak-0.1.2.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.19/download -> unicode-normalization-0.1.19.crate https://crates.io/api/v1/crates/unicode-width/0.1.9/download -> unicode-width-0.1.9.crate https://crates.io/api/v1/crates/untrusted/0.7.1/download -> untrusted-0.7.1.crate https://crates.io/api/v1/crates/ureq/2.4.0/download -> ureq-2.4.0.crate https://crates.io/api/v1/crates/url/2.2.2/download -> url-2.2.2.crate https://crates.io/api/v1/crates/uuid/0.8.2/download -> uuid-0.8.2.crate https://crates.io/api/v1/crates/uuid/1.1.2/download -> uuid-1.1.2.crate https://crates.io/api/v1/crates/valuable/0.1.0/download -> valuable-0.1.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/waker-fn/1.1.0/download -> waker-fn-1.1.0.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.81/download -> wasm-bindgen-0.2.81.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.81/download -> wasm-bindgen-backend-0.2.81.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.81/download -> wasm-bindgen-macro-0.2.81.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.81/download -> wasm-bindgen-macro-support-0.2.81.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.81/download -> wasm-bindgen-shared-0.2.81.crate https://crates.io/api/v1/crates/web-sys/0.3.58/download -> web-sys-0.3.58.crate https://crates.io/api/v1/crates/webpki/0.22.0/download -> webpki-0.22.0.crate https://crates.io/api/v1/crates/webpki-roots/0.22.3/download -> webpki-roots-0.22.3.crate https://crates.io/api/v1/crates/wepoll-ffi/0.1.2/download -> wepoll-ffi-0.1.2.crate https://crates.io/api/v1/crates/which/4.2.5/download -> which-4.2.5.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/windows-sys/0.36.1/download -> windows-sys-0.36.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.36.1/download -> windows_aarch64_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.36.1/download -> windows_i686_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.36.1/download -> windows_i686_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.36.1/download -> windows_x86_64_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.36.1/download -> windows_x86_64_msvc-0.36.1.crate https://crates.io/api/v1/crates/xattr/0.2.3/download -> xattr-0.2.3.crate https://crates.io/api/v1/crates/xwin/0.2.4/download -> xwin-0.2.4.crate https://crates.io/api/v1/crates/zbus/1.9.1/download -> zbus-1.9.1.crate https://crates.io/api/v1/crates/zbus_macros/1.9.1/download -> zbus_macros-1.9.1.crate https://crates.io/api/v1/crates/zip/0.6.2/download -> zip-0.6.2.crate https://crates.io/api/v1/crates/zvariant/2.10.0/download -> zvariant-2.10.0.crate https://crates.io/api/v1/crates/zvariant_derive/2.10.0/download -> zvariant_derive-2.10.0.crate test? ( https://crates.io/api/v1/crates/libc/0.2.119/download -> libc-0.2.119.crate https://crates.io/api/v1/crates/libc/0.2.125/download -> libc-0.2.125.crate https://crates.io/api/v1/crates/once_cell/1.10.0/download -> once_cell-1.10.0.crate https://crates.io/api/v1/crates/once_cell/1.11.0/download -> once_cell-1.11.0.crate https://crates.io/api/v1/crates/once_cell/1.9.0/download -> once_cell-1.9.0.crate https://crates.io/api/v1/crates/parking_lot/0.12.0/download -> parking_lot-0.12.0.crate https://crates.io/api/v1/crates/proc-macro2/1.0.38/download -> proc-macro2-1.0.38.crate https://crates.io/api/v1/crates/pyo3/0.16.5/download -> pyo3-0.16.5.crate https://crates.io/api/v1/crates/pyo3-build-config/0.16.0/download -> pyo3-build-config-0.16.0.crate https://crates.io/api/v1/crates/pyo3-build-config/0.16.5/download -> pyo3-build-config-0.16.5.crate https://crates.io/api/v1/crates/pyo3-ffi/0.16.0/download -> pyo3-ffi-0.16.0.crate https://crates.io/api/v1/crates/pyo3-ffi/0.16.5/download -> pyo3-ffi-0.16.5.crate https://crates.io/api/v1/crates/pyo3-macros/0.16.5/download -> pyo3-macros-0.16.5.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.16.5/download -> pyo3-macros-backend-0.16.5.crate https://crates.io/api/v1/crates/python3-dll-a/0.2.3/download -> python3-dll-a-0.2.3.crate https://crates.io/api/v1/crates/syn/1.0.94/download -> syn-1.0.94.crate https://crates.io/api/v1/crates/syn/1.0.95/download -> syn-1.0.95.crate https://crates.io/api/v1/crates/target-lexicon/0.12.3/download -> target-lexicon-0.12.3.crate https://crates.io/api/v1/crates/unicode-ident/1.0.0/download -> unicode-ident-1.0.0.crate https://crates.io/api/v1/crates/unicode-xid/0.2.3/download -> unicode-xid-0.2.3.crate https://crates.io/api/v1/crates/unindent/0.1.9/download -> unindent-0.1.9.crate )
+_eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	distutils-r1	10a93585889c3ca7651cbcd2ee831e47	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=f690ed0c58f1d443a7dcc323537cb86f
diff --git a/metadata/md5-cache/dev-util/mdds-1.7.0 b/metadata/md5-cache/dev-util/mdds-1.7.0
deleted file mode 100644
index ee661918589a..000000000000
--- a/metadata/md5-cache/dev-util/mdds-1.7.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen dev-python/sphinx ) valgrind? ( dev-util/valgrind ) 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 prepare pretend setup test
-DEPEND=dev-libs/boost:=
-DESCRIPTION=Collection of multi-dimensional data structure and indexing algorithm
-EAPI=7
-HOMEPAGE=https://gitlab.com/mdds/mdds
-INHERIT=autotools toolchain-funcs
-IUSE=doc openmp valgrind test
-KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-libs/boost:=
-RESTRICT=!test? ( test )
-SLOT=1/1.5
-SRC_URI=https://kohei.us/files/mdds/src/mdds-1.7.0.tar.xz
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=b165f5909e42da059f01c7796706bcf4
diff --git a/metadata/md5-cache/dev-util/mdds-2.0.3 b/metadata/md5-cache/dev-util/mdds-2.0.3
index 5c6c268145e8..de7de885f67a 100644
--- a/metadata/md5-cache/dev-util/mdds-2.0.3
+++ b/metadata/md5-cache/dev-util/mdds-2.0.3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://gitlab.com/mdds/mdds
 INHERIT=autotools toolchain-funcs
 IUSE=doc openmp valgrind test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-libs/boost:=
 RESTRICT=!test? ( test )
 SLOT=1/2.0
 SRC_URI=https://kohei.us/files/mdds/src/mdds-2.0.3.tar.xz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=22b82ff581d4c987001175cf2c15a727
+_md5_=2ad06e4b26bed8a2fa2bd677d1d26229
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.5.1-r1 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.5.1-r1
index 430fec319b55..0558f1d080f6 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.5.1-r1
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.5.1-r1
@@ -11,4 +11,4 @@ RESTRICT=bindist mirror
 SLOT=0/11.5.1
 SRC_URI=https://developer.download.nvidia.com/compute/cuda/11.5.1/local_installers/cuda_11.5.1_495.29.05_linux.run
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	unpacker	697382d119fd3d195f110b7979184285
-_md5_=42ca32ffb26c8bc63c38b324ef76eba3
+_md5_=915a250cc9edebe3d7b899934c37590d
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.6.0 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.6.0
index e78655527704..5ef772409fea 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.6.0
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.6.0
@@ -11,4 +11,4 @@ RESTRICT=bindist mirror
 SLOT=0/11.6.0
 SRC_URI=https://developer.download.nvidia.com/compute/cuda/11.6.0/local_installers/cuda_11.6.0_510.39.01_linux.run
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	unpacker	697382d119fd3d195f110b7979184285
-_md5_=2371068f5b24d1d95e1d21492ee1e9df
+_md5_=15e65838c999be5c763f409d1151656e
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.6.1 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.6.1
index c4d58bb7750c..7f09a7d5e9b2 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.6.1
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.6.1
@@ -11,4 +11,4 @@ RESTRICT=bindist mirror
 SLOT=0/11.6.1
 SRC_URI=https://developer.download.nvidia.com/compute/cuda/11.6.1/local_installers/cuda_11.6.1_510.47.03_linux.run
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	unpacker	697382d119fd3d195f110b7979184285
-_md5_=05d7c21ec7ebccb5ecbd24f91f1b3eb3
+_md5_=d35349bb791e78bd62afe75396de57bd
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.6.2 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.6.2
index 9fd51ae46bfd..c0c212910acb 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.6.2
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.6.2
@@ -11,4 +11,4 @@ RESTRICT=bindist mirror
 SLOT=0/11.6.2
 SRC_URI=https://developer.download.nvidia.com/compute/cuda/11.6.2/local_installers/cuda_11.6.2_510.47.03_linux.run
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	unpacker	697382d119fd3d195f110b7979184285
-_md5_=05d7c21ec7ebccb5ecbd24f91f1b3eb3
+_md5_=d35349bb791e78bd62afe75396de57bd
diff --git a/metadata/md5-cache/dev-util/packer-1.7.10 b/metadata/md5-cache/dev-util/packer-1.7.10
index 96617693e4de..bd8875ad10f2 100644
--- a/metadata/md5-cache/dev-util/packer-1.7.10
+++ b/metadata/md5-cache/dev-util/packer-1.7.10
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile install unpack
 DESCRIPTION=A tool to create identical machine images for multiple platforms
 EAPI=7
 HOMEPAGE=https://www.packer.io
-KEYWORDS=~amd64 ~riscv
+INHERIT=go-module
+KEYWORDS=~amd64 ~arm64 ~riscv
 LICENSE=Apache-2.0 BSD-2 BSD-4 MIT MPL-2.0 unicode
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/hashicorp/packer/archive/v1.7.10.tar.gz -> packer-1.7.10.tar.gz https://gentoofiles.s3.eu-central-1.amazonaws.com/packer-1.7.10-deps.tar.xz
 _eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
-_md5_=c6345bf36bbea4ecfb8bb8154311853b
+_md5_=17b336e4c9fabe57dd2105b91e57d4c6
diff --git a/metadata/md5-cache/dev-util/perf-5.15-r1 b/metadata/md5-cache/dev-util/perf-5.15-r1
index efbe66551d49..459bbcb07b34 100644
--- a/metadata/md5-cache/dev-util/perf-5.15-r1
+++ b/metadata/md5-cache/dev-util/perf-5.15-r1
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	llvm	6f88d422e49b917bf254b2594f3d903c	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=0fd2896e81c910bf0524730acedabc57
+_md5_=dea666f368911d20f6dfbce1af3ba880
diff --git a/metadata/md5-cache/dev-util/perf-5.17.1 b/metadata/md5-cache/dev-util/perf-5.17.1
index f3411f188e6e..3c840b5c3f46 100644
--- a/metadata/md5-cache/dev-util/perf-5.17.1
+++ b/metadata/md5-cache/dev-util/perf-5.17.1
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.17.1.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.17.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	llvm	6f88d422e49b917bf254b2594f3d903c	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=27e46f04106d32ecd785f3437502af1a
+_md5_=05a769bb8e365d101f4e8948e4bef30a
diff --git a/metadata/md5-cache/dev-util/perf-5.18 b/metadata/md5-cache/dev-util/perf-5.18
index 87cd4701cc0a..62ca49ad7f4e 100644
--- a/metadata/md5-cache/dev-util/perf-5.18
+++ b/metadata/md5-cache/dev-util/perf-5.18
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.18.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	llvm	6f88d422e49b917bf254b2594f3d903c	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=27e46f04106d32ecd785f3437502af1a
+_md5_=05a769bb8e365d101f4e8948e4bef30a
diff --git a/metadata/md5-cache/dev-util/pkgdev-0.1.9 b/metadata/md5-cache/dev-util/pkgdev-0.1.9
deleted file mode 100644
index 2877c78d3c06..000000000000
--- a/metadata/md5-cache/dev-util/pkgdev-0.1.9
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest ) doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-util/pkgcheck-0.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sys-apps/pkgcore-0.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-vcs/git ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Collection of tools for Gentoo development
-EAPI=8
-HOMEPAGE=https://github.com/pkgcore/pkgdev
-INHERIT=distutils-r1
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86 ~x64-macos
-LICENSE=BSD MIT
-RDEPEND=>=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-util/pkgcheck-0.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sys-apps/pkgcore-0.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-vcs/git python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pkgdev/pkgdev-0.1.9.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=e7e54e7547ace69925aac049b8e0fc65
diff --git a/metadata/md5-cache/dev-util/pkgdev-0.2.0 b/metadata/md5-cache/dev-util/pkgdev-0.2.0
deleted file mode 100644
index 40b9ac7d8eb3..000000000000
--- a/metadata/md5-cache/dev-util/pkgdev-0.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest ) doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-util/pkgcheck-0.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sys-apps/pkgcore-0.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-vcs/git ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Collection of tools for Gentoo development
-EAPI=8
-HOMEPAGE=https://github.com/pkgcore/pkgdev
-INHERIT=distutils-r1
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
-LICENSE=BSD MIT
-RDEPEND=>=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-util/pkgcheck-0.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sys-apps/pkgcore-0.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-vcs/git python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pkgdev/pkgdev-0.2.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=bd524751f342a80f93c3be9c221cdd26
diff --git a/metadata/md5-cache/dev-util/pkgdev-0.2.1 b/metadata/md5-cache/dev-util/pkgdev-0.2.1
deleted file mode 100644
index d0a9f6cdd86f..000000000000
--- a/metadata/md5-cache/dev-util/pkgdev-0.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest ) doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-util/pkgcheck-0.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sys-apps/pkgcore-0.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-vcs/git ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Collection of tools for Gentoo development
-EAPI=8
-HOMEPAGE=https://github.com/pkgcore/pkgdev
-INHERIT=distutils-r1
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
-LICENSE=BSD MIT
-RDEPEND=>=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-util/pkgcheck-0.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sys-apps/pkgcore-0.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-vcs/git python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pkgdev/pkgdev-0.2.1.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=bd524751f342a80f93c3be9c221cdd26
diff --git a/metadata/md5-cache/dev-util/pkgdev-0.2.1-r1 b/metadata/md5-cache/dev-util/pkgdev-0.2.1-r1
index dc91925ce93d..1d4e0e207473 100644
--- a/metadata/md5-cache/dev-util/pkgdev-0.2.1-r1
+++ b/metadata/md5-cache/dev-util/pkgdev-0.2.1-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pkgcore/pkgdev
 INHERIT=distutils-r1
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+KEYWORDS=amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=BSD MIT
 RDEPEND=>=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-util/pkgcheck-0.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sys-apps/pkgcore-0.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-vcs/git python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkgdev/pkgdev-0.2.1.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=30483db9448adbd1241064a90db5446d
+_md5_=3a289e9123da017aef5fe4bf0e6b6653
diff --git a/metadata/md5-cache/dev-util/ply-2.1.1-r1 b/metadata/md5-cache/dev-util/ply-2.1.1-r1
index 1db7c2ff1300..018ebc9ff9d0 100644
--- a/metadata/md5-cache/dev-util/ply-2.1.1-r1
+++ b/metadata/md5-cache/dev-util/ply-2.1.1-r1
@@ -11,4 +11,4 @@ RDEPEND=!sys-boot/plymouth
 SLOT=0
 SRC_URI=https://github.com/iovisor/ply/archive/2.1.1.tar.gz -> ply-2.1.1.tar.gz https://github.com/iovisor/ply/commit/1bc183af8703023e377f92716ecd3f339ffffd11.patch -> ply-2.1.1-arm-build-fix.patch
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=0fa8b798a12d26b9e9ac6c861fe84256
+_md5_=31336905a2e5f5ce7a5ac774fdeb49e7
diff --git a/metadata/md5-cache/dev-util/pycharm-community-2021.3.3 b/metadata/md5-cache/dev-util/pycharm-community-2022.1.2
similarity index 69%
rename from metadata/md5-cache/dev-util/pycharm-community-2021.3.3
rename to metadata/md5-cache/dev-util/pycharm-community-2022.1.2
index f4c063d63682..2d639abe82b3 100644
--- a/metadata/md5-cache/dev-util/pycharm-community-2021.3.3
+++ b/metadata/md5-cache/dev-util/pycharm-community-2022.1.2
@@ -3,12 +3,13 @@ DEFINED_PHASES=install postinst postrm prepare
 DESCRIPTION=Intelligent Python IDE with unique code assistance and analysis
 EAPI=7
 HOMEPAGE=http://www.jetbrains.com/pycharm/
+INHERIT=desktop readme.gentoo-r1 wrapper xdg-utils
 IUSE=+bundled-jdk
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0 BSD CDDL MIT-with-advertising
-RDEPEND=!bundled-jdk? ( >=virtual/jre-1.8 ) app-arch/brotli app-arch/zstd app-crypt/p11-kit dev-libs/fribidi dev-libs/glib dev-libs/json-c dev-libs/libbsd dev-libs/libdbusmenu dev-libs/nss dev-python/pip media-fonts/dejavu media-gfx/graphite2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2= media-libs/harfbuzz media-libs/libglvnd media-libs/libpng:0= net-libs/gnutls net-print/cups sys-apps/dbus sys-libs/libcap sys-libs/zlib virtual/jpeg:0= x11-libs/libX11 x11-libs/libxcb x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango
+RDEPEND=!bundled-jdk? ( >=virtual/jre-1.8 ) app-arch/brotli app-arch/zstd app-crypt/p11-kit dev-libs/fribidi dev-libs/glib dev-libs/json-c dev-libs/libbsd dev-libs/libdbusmenu dev-libs/nss dev-python/pip media-fonts/dejavu media-gfx/graphite2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2= media-libs/harfbuzz media-libs/libglvnd media-libs/libjpeg-turbo:0= media-libs/libpng:0= net-libs/gnutls net-print/cups sys-apps/dbus sys-libs/libcap sys-libs/zlib x11-libs/libX11 x11-libs/libxcb x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango
 RESTRICT=mirror
 SLOT=0
-SRC_URI=http://download.jetbrains.com/python/pycharm-community-2021.3.3.tar.gz
+SRC_URI=http://download.jetbrains.com/python/pycharm-community-2022.1.2.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=3b49fdde58caa759a09e4d5c6f828fe4
+_md5_=6cd1e44759b2d5b344c3bc83f589750c
diff --git a/metadata/md5-cache/dev-util/rocprofiler-4.3.0 b/metadata/md5-cache/dev-util/rocprofiler-4.3.0
new file mode 100644
index 000000000000..e38a6bdc75b9
--- /dev/null
+++ b/metadata/md5-cache/dev-util/rocprofiler-4.3.0
@@ -0,0 +1,14 @@
+BDEPEND=|| ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/CppHeaderParser[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/CppHeaderParser[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/CppHeaderParser[python_targets_python3_8(-)] ) ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/rocr-runtime:0/4.3 dev-util/roctracer:0/4.3
+DESCRIPTION=Callback/Activity Library for Performance tracing AMD GPU's
+EAPI=8
+HOMEPAGE=https://github.com/ROCm-Developer-Tools/roctracer.git
+INHERIT=cmake python-any-r1
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-libs/rocr-runtime:0/4.3 dev-util/roctracer:0/4.3
+SLOT=0/4.3
+SRC_URI=https://github.com/ROCm-Developer-Tools/rocprofiler/archive/rocm-4.3.0.tar.gz -> rocprofiler-4.3.0.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=ecb67b339d639deca12edca7a143d9f7
diff --git a/metadata/md5-cache/dev-util/rocprofiler-5.0.2 b/metadata/md5-cache/dev-util/rocprofiler-5.0.2
new file mode 100644
index 000000000000..02739a71908c
--- /dev/null
+++ b/metadata/md5-cache/dev-util/rocprofiler-5.0.2
@@ -0,0 +1,14 @@
+BDEPEND=|| ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/CppHeaderParser[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/CppHeaderParser[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/CppHeaderParser[python_targets_python3_8(-)] ) ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/rocr-runtime:0/5.0 dev-util/roctracer:0/5.0
+DESCRIPTION=Callback/Activity Library for Performance tracing AMD GPU's
+EAPI=7
+HOMEPAGE=https://github.com/ROCm-Developer-Tools/roctracer.git
+INHERIT=cmake python-any-r1
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-libs/rocr-runtime:0/5.0 dev-util/roctracer:0/5.0
+SLOT=0/5.0
+SRC_URI=https://github.com/ROCm-Developer-Tools/rocprofiler/archive/rocm-5.0.2.tar.gz -> rocprofiler-5.0.2.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=a9402269c110c79b1aa74f3fe2177c5c
diff --git a/metadata/md5-cache/dev-util/roctracer-4.3.0-r1 b/metadata/md5-cache/dev-util/roctracer-4.3.0-r2
similarity index 50%
rename from metadata/md5-cache/dev-util/roctracer-4.3.0-r1
rename to metadata/md5-cache/dev-util/roctracer-4.3.0-r2
index cb4fbf0ef35d..3a810989215e 100644
--- a/metadata/md5-cache/dev-util/roctracer-4.3.0-r1
+++ b/metadata/md5-cache/dev-util/roctracer-4.3.0-r2
@@ -1,14 +1,14 @@
-BDEPEND=|| ( ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/CppHeaderParser[python_targets_python3_9(-)] dev-python/ply[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/CppHeaderParser[python_targets_python3_8(-)] dev-python/ply[python_targets_python3_8(-)] ) ) dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=|| ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/CppHeaderParser[python_targets_python3_10(-)] dev-python/ply[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/CppHeaderParser[python_targets_python3_8(-)] dev-python/ply[python_targets_python3_8(-)] ) ) dev-util/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-libs/rocr-runtime:0/4.3 dev-util/hip:0/4.3
 DESCRIPTION=Callback/Activity Library for Performance tracing AMD GPU's
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/ROCm-Developer-Tools/roctracer.git
 INHERIT=cmake prefix python-any-r1
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=dev-libs/rocr-runtime:0/4.3 dev-util/hip:0/4.3
 SLOT=0/4.3
-SRC_URI=https://github.com/ROCm-Developer-Tools/roctracer/archive/rocm-4.3.0.tar.gz -> rocm-tracer-4.3.0.tar.gz https://github.com/ROCm-Developer-Tools/rocprofiler/archive/rocm-4.3.0.tar.gz -> rocprofiler-4.3.0.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=27a8413f17eaa0331deb0daba4101387
+SRC_URI=https://github.com/ROCm-Developer-Tools/roctracer/archive/rocm-4.3.0.tar.gz -> rocm-tracer-4.3.0.tar.gz https://github.com/ROCm-Developer-Tools/rocprofiler/archive/rocm-4.3.0.tar.gz -> rocprofiler-4.3.0.tar.gz https://github.com/ROCmSoftwarePlatform/hsa-class/archive/master.tar.gz -> hsa-class-4.3.0.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=a003f4b842a450d400cacb137c1f00fa
diff --git a/metadata/md5-cache/dev-util/roctracer-5.0.2 b/metadata/md5-cache/dev-util/roctracer-5.0.2
index d832d4df7a5b..05304501d261 100644
--- a/metadata/md5-cache/dev-util/roctracer-5.0.2
+++ b/metadata/md5-cache/dev-util/roctracer-5.0.2
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/CppHeaderParser[python_targets_python3_9(-)] dev-python/ply[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/CppHeaderParser[python_targets_python3_8(-)] dev-python/ply[python_targets_python3_8(-)] ) ) dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=|| ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/CppHeaderParser[python_targets_python3_10(-)] dev-python/ply[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/CppHeaderParser[python_targets_python3_9(-)] dev-python/ply[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/CppHeaderParser[python_targets_python3_8(-)] dev-python/ply[python_targets_python3_8(-)] ) ) dev-util/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-libs/rocr-runtime:0/5.0 dev-util/hip:0/5.0
 DESCRIPTION=Callback/Activity Library for Performance tracing AMD GPU's
@@ -9,6 +9,6 @@ KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=dev-libs/rocr-runtime:0/5.0 dev-util/hip:0/5.0
 SLOT=0/5.0
-SRC_URI=https://github.com/ROCm-Developer-Tools/roctracer/archive/rocm-5.0.2.tar.gz -> rocm-tracer-5.0.2.tar.gz https://github.com/ROCm-Developer-Tools/rocprofiler/archive/rocm-5.0.2.tar.gz -> rocprofiler-5.0.2.tar.gz
+SRC_URI=https://github.com/ROCm-Developer-Tools/roctracer/archive/rocm-5.0.2.tar.gz -> rocm-tracer-5.0.2.tar.gz https://github.com/ROCm-Developer-Tools/rocprofiler/archive/rocm-5.0.2.tar.gz -> rocprofiler-5.0.2.tar.gz https://github.com/ROCmSoftwarePlatform/hsa-class/archive/f8b387043b9f510afdf2e72e38a011900360d6ab.tar.gz -> hsa-class-f8b3870.tar.gz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=1c5205c634958509342f67b432ff0038
+_md5_=87ea5364870381decbf9899edd7a5652
diff --git a/metadata/md5-cache/dev-util/systemtap-4.5-r1 b/metadata/md5-cache/dev-util/systemtap-4.5-r1
index a80910d89837..429d743fd91b 100644
--- a/metadata/md5-cache/dev-util/systemtap-4.5-r1
+++ b/metadata/md5-cache/dev-util/systemtap-4.5-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.sourceware.org/systemtap
 INHERIT=autotools linux-info python-single-r1
 IUSE=libvirt selinux sqlite +ssl test zeroconf python_single_target_pypy3 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-libs/elfutils-0.142 dev-libs/json-c:= sys-libs/ncurses:0= sys-libs/readline:0= libvirt? ( >=app-emulation/libvirt-1.0.2 ) selinux? ( sys-libs/libselinux ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/nspr dev-libs/nss ) zeroconf? ( net-dns/avahi ) acct-group/stapdev acct-group/stapsys acct-group/stapusr
 REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.sourceware.org/systemtap/ftp/releases/systemtap-4.5.tar.gz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=6b89df98562b9beda2b327baadc89e4a
+_md5_=63349b73cb6667166a40e62f73516f27
diff --git a/metadata/md5-cache/dev-util/trace-cmd-3.0.2 b/metadata/md5-cache/dev-util/trace-cmd-3.0.2
new file mode 100644
index 000000000000..d09b6ff61132
--- /dev/null
+++ b/metadata/md5-cache/dev-util/trace-cmd-3.0.2
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig python? ( dev-lang/swig ) doc? ( app-text/asciidoc )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=audit? ( sys-process/audit ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) ) udis86? ( dev-libs/udis86 ) zstd? ( >=app-arch/zstd-1.4 ) >=dev-libs/libtracefs-1.3 >=dev-libs/libtraceevent-1.5 sys-kernel/linux-headers test? ( dev-util/cunit )
+DESCRIPTION=User-space front-end for Ftrace
+EAPI=8
+HOMEPAGE=https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git
+INHERIT=linux-info bash-completion-r1 python-r1 toolchain-funcs
+IUSE=+audit doc python test udis86 +zstd python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=audit? ( sys-process/audit ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) ) udis86? ( dev-libs/udis86 ) zstd? ( >=app-arch/zstd-1.4 ) >=dev-libs/libtracefs-1.3 >=dev-libs/libtraceevent-1.5
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
+RESTRICT=!test? ( test ) test
+SLOT=0/3.0.2
+SRC_URI=https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-v3.0.2.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=cb1fc053cbafe5016e9872225a1ae79a
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 5da498605345..c2ad4ee849dc 100644
Binary files a/metadata/md5-cache/dev-vcs/Manifest.gz and b/metadata/md5-cache/dev-vcs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-vcs/cvs-1.12.12-r14 b/metadata/md5-cache/dev-vcs/cvs-1.12.12-r14
index d6f3d4319d76..7b41e1ec5290 100644
--- a/metadata/md5-cache/dev-vcs/cvs-1.12.12-r14
+++ b/metadata/md5-cache/dev-vcs/cvs-1.12.12-r14
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cvs-1.12.12.tar.bz2 doc? ( mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.html.tar.bz2 mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.pdf mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.ps )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=7359f5a105b71a3ed5cddbd447315fa0
+_md5_=aeabd332c1a45a04aaf6fcaba0e80710
diff --git a/metadata/md5-cache/dev-vcs/git-2.37.0_rc0 b/metadata/md5-cache/dev-vcs/git-2.37.0_rc0
new file mode 100644
index 000000000000..32cf2de4cc27
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/git-2.37.0_rc0
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) gnome-keyring? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre2:= ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) iconv? ( virtual/libiconv )
+DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
+EAPI=8
+HOMEPAGE=https://www.git-scm.com/
+INHERIT=toolchain-funcs perl-module bash-completion-r1 plocale python-single-r1 systemd
+IUSE=+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+LICENSE=GPL-2
+RDEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre2:= ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL >=virtual/perl-libnet-3.110.0-r4[ssl] cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso(-),perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) selinux? ( sec-policy/selinux-git )
+REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) perforce? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) subversion? ( perl ) webdav? ( curl )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/software/scm/git/testing/git-2.37.0.rc0.tar.xz https://www.kernel.org/pub/software/scm/git/testing/git-manpages-2.37.0.rc0.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/testing/git-htmldocs-2.37.0.rc0.tar.xz )
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	plocale	7ce00136a77130df46fbbd5966f98a61	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=91987e6ca32721a42c14b3e156d56420
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.14.1 b/metadata/md5-cache/dev-vcs/subversion-1.14.1
index b77da2e0edb8..8af720cafb4e 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.14.1
+++ b/metadata/md5-cache/dev-vcs/subversion-1.14.1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/subversion/subversion-1.14.1.tar.bz2 https://dev.gentoo.org/~polynomial-c/subversion-1.10.0_rc1-patches-1.tar.xz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	db-use	867a9246a45efc09934e0f8e3380c813	depend.apache	416d1c5005c5f4594e79812fb7323f0d	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=69c0f9102a052b3d42276aeb68f3a24f
+_md5_=c4ef27a9b976006e0daccb41aaefb5db
diff --git a/metadata/md5-cache/games-action/Manifest.gz b/metadata/md5-cache/games-action/Manifest.gz
index fa371e464d16..5ce05b4d5871 100644
Binary files a/metadata/md5-cache/games-action/Manifest.gz and b/metadata/md5-cache/games-action/Manifest.gz differ
diff --git a/metadata/md5-cache/games-action/noiz2sa-0.51a-r1 b/metadata/md5-cache/games-action/noiz2sa-0.51a-r2
similarity index 61%
rename from metadata/md5-cache/games-action/noiz2sa-0.51a-r1
rename to metadata/md5-cache/games-action/noiz2sa-0.51a-r2
index 073ae5d23225..0f8f11b518c5 100644
--- a/metadata/md5-cache/games-action/noiz2sa-0.51a-r1
+++ b/metadata/md5-cache/games-action/noiz2sa-0.51a-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=install prepare
-DEPEND=>=dev-libs/libbulletml-0.0.3 media-libs/sdl-mixer[vorbis] virtual/opengl
+DEPEND=>=dev-libs/libbulletml-0.0.3 media-libs/libsdl[joystick] media-libs/sdl-mixer[vorbis] virtual/opengl
 DESCRIPTION=Abstract Shooting Game
 EAPI=7
 HOMEPAGE=https://www.asahi-net.or.jp/~cs8k-cyu/windows/noiz2sa_e.html https://sourceforge.net/projects/noiz2sa/
 INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-libs/libbulletml-0.0.3 media-libs/sdl-mixer[vorbis] virtual/opengl
+RDEPEND=>=dev-libs/libbulletml-0.0.3 media-libs/libsdl[joystick] media-libs/sdl-mixer[vorbis] virtual/opengl
 SLOT=0
 SRC_URI=mirror://sourceforge/noiz2sa/noiz2sa-0.51a.tar.gz
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=a84cb893c5bd68aa1a42d9c2b8ee01aa
+_md5_=368e5c7c9317ae201f495b4059ac6bad
diff --git a/metadata/md5-cache/games-arcade/Manifest.gz b/metadata/md5-cache/games-arcade/Manifest.gz
index e3ac5e316125..c11de66135cf 100644
Binary files a/metadata/md5-cache/games-arcade/Manifest.gz and b/metadata/md5-cache/games-arcade/Manifest.gz differ
diff --git a/metadata/md5-cache/games-arcade/cdogs-sdl-1.2.0 b/metadata/md5-cache/games-arcade/cdogs-sdl-1.2.0
deleted file mode 100644
index 0cf6c57a53dc..000000000000
--- a/metadata/md5-cache/games-arcade/cdogs-sdl-1.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=media-libs/libsdl2[haptic,opengl] media-libs/sdl2-image[png] media-libs/sdl2-mixer[vorbis,wav] net-libs/enet:1.3=
-DESCRIPTION=Classic overhead run-and-gun game
-EAPI=8
-HOMEPAGE=https://cxong.github.io/cdogs-sdl/
-INHERIT=cmake xdg
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ BSD-2 CC0-1.0 CC-BY-3.0 CC-BY-SA-3.0 XMAME
-RDEPEND=media-libs/libsdl2[haptic,opengl] media-libs/sdl2-image[png] media-libs/sdl2-mixer[vorbis,wav] net-libs/enet:1.3=
-SLOT=0
-SRC_URI=https://github.com/cxong/cdogs-sdl/archive/1.2.0.tar.gz -> cdogs-sdl-1.2.0.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=2b0a067dd3774b42e0cdc6fc92ad1cba
diff --git a/metadata/md5-cache/games-arcade/cdogs-sdl-1.3.0 b/metadata/md5-cache/games-arcade/cdogs-sdl-1.3.1
similarity index 91%
rename from metadata/md5-cache/games-arcade/cdogs-sdl-1.3.0
rename to metadata/md5-cache/games-arcade/cdogs-sdl-1.3.1
index 05d69669303b..05a44e0c4d7f 100644
--- a/metadata/md5-cache/games-arcade/cdogs-sdl-1.3.0
+++ b/metadata/md5-cache/games-arcade/cdogs-sdl-1.3.1
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+ BSD-2 CC-BY-3.0 CC-BY-4.0 CC-BY-SA-3.0 CC0-1.0 WTFPL-2 XMAME
 RDEPEND=media-libs/libsdl2[haptic,opengl] media-libs/sdl2-image[png] media-libs/sdl2-mixer[mp3,vorbis,wav] net-libs/enet:1.3=
 SLOT=0
-SRC_URI=https://github.com/cxong/cdogs-sdl/archive/1.3.0.tar.gz -> cdogs-sdl-1.3.0.tar.gz
+SRC_URI=https://github.com/cxong/cdogs-sdl/archive/1.3.1.tar.gz -> cdogs-sdl-1.3.1.tar.gz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=83ed8c2d0fc23c37733080b68e897c43
diff --git a/metadata/md5-cache/games-board/Manifest.gz b/metadata/md5-cache/games-board/Manifest.gz
index 896487a298b7..ccdd62617fdd 100644
Binary files a/metadata/md5-cache/games-board/Manifest.gz and b/metadata/md5-cache/games-board/Manifest.gz differ
diff --git a/metadata/md5-cache/games-board/tablebase-syzygy-0_pre20131213-r101 b/metadata/md5-cache/games-board/tablebase-syzygy-0_pre20131213-r101
new file mode 100644
index 000000000000..8a17baf71287
--- /dev/null
+++ b/metadata/md5-cache/games-board/tablebase-syzygy-0_pre20131213-r101
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install nofetch pretend setup unpack
+DESCRIPTION=Syzygy chess endgame tablebases for up to 6 pieces
+EAPI=8
+HOMEPAGE=http://tablebase.sesse.net/ https://kirill-kryukov.com/chess/tablebases-online/
+INHERIT=check-reqs
+IUSE=6-pieces
+KEYWORDS=~amd64 ~x86
+LICENSE=public-domain
+RDEPEND=!games-board/tablebase-syzygy:nofetch
+RESTRICT=fetch
+SLOT=0
+SRC_URI=mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQvKQ.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQQvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQQvKQ.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQQQvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQQvKR.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQQRvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQQvKB.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQQBvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQQvKN.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQQNvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQQvKP.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQQPvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQvKR.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQRvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQRvKQ.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQRvKR.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQRRvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQRvKB.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQRBvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQRvKN.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQRNvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQRvKP.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQRPvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQvKB.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQBvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQBvKQ.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQBvKR.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQBvKB.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQBBvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQBvKN.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQBNvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQBvKP.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQBPvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQvKN.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQNvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQNvKQ.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQNvKR.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQNvKB.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQNvKN.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQNNvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQNvKP.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQNPvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQvKP.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQPvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQPvKQ.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQPvKR.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQPvKB.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQPvKN.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQPvKP.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQPPvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRvKR.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRRvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRRvKQ.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRRvKR.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRRRvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRRvKB.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRRBvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRRvKN.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRRNvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRRvKP.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRRPvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRvKB.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRBvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRBvKQ.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRBvKR.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRBvKB.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRBBvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRBvKN.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRBNvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRBvKP.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRBPvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRvKN.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRNvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRNvKQ.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRNvKR.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRNvKB.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRNvKN.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRNNvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRNvKP.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRNPvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRvKP.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRPvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRPvKQ.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRPvKR.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRPvKB.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRPvKN.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRPvKP.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRPPvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBvKB.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBBvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBBvKQ.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBBvKR.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBBvKB.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBBBvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBBvKN.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBBNvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBBvKP.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBBPvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBvKN.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBNvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBNvKQ.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBNvKR.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBNvKB.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBNvKN.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBNNvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBNvKP.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBNPvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBvKP.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBPvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBPvKQ.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBPvKR.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBPvKB.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBPvKN.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBPvKP.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBPPvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KNvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KNvKN.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KNNvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KNNvKQ.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KNNvKR.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KNNvKB.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KNNvKN.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KNNNvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KNNvKP.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KNNPvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KNvKP.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KNPvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KNPvKQ.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KNPvKR.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KNPvKB.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KNPvKN.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KNPvKP.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KNPPvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KPvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KPvKP.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KPPvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KPPvKQ.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KPPvKR.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KPPvKB.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KPPvKN.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KPPvKP.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KPPPvK.rtbw mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQvKQ.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQQvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQQvKQ.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQQQvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQQvKR.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQQRvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQQvKB.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQQBvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQQvKN.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQQNvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQQvKP.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQQPvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQvKR.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQRvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQRvKQ.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQRvKR.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQRRvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQRvKB.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQRBvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQRvKN.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQRNvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQRvKP.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQRPvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQvKB.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQBvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQBvKQ.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQBvKR.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQBvKB.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQBBvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQBvKN.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQBNvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQBvKP.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQBPvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQvKN.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQNvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQNvKQ.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQNvKR.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQNvKB.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQNvKN.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQNNvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQNvKP.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQNPvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQvKP.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQPvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQPvKQ.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQPvKR.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQPvKB.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQPvKN.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQPvKP.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KQPPvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRvKR.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRRvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRRvKQ.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRRvKR.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRRRvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRRvKB.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRRBvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRRvKN.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRRNvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRRvKP.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRRPvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRvKB.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRBvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRBvKQ.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRBvKR.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRBvKB.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRBBvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRBvKN.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRBNvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRBvKP.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRBPvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRvKN.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRNvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRNvKQ.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRNvKR.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRNvKB.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRNvKN.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRNNvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRNvKP.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRNPvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRvKP.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRPvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRPvKQ.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRPvKR.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRPvKB.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRPvKN.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRPvKP.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KRPPvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBvKB.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBBvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBBvKQ.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBBvKR.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBBvKB.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBBBvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBBvKN.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBBNvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBBvKP.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBBPvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBvKN.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBNvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBNvKQ.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBNvKR.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBNvKB.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBNvKN.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBNNvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBNvKP.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBNPvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBvKP.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBPvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBPvKQ.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBPvKR.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBPvKB.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBPvKN.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBPvKP.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KBPPvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KNvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KNvKN.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KNNvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KNNvKQ.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KNNvKR.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KNNvKB.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KNNvKN.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KNNNvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KNNvKP.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KNNPvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KNvKP.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KNPvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KNPvKQ.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KNPvKR.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KNPvKB.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KNPvKN.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KNPvKP.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KNPPvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KPvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KPvKP.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KPPvK.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KPPvKQ.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KPPvKR.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KPPvKB.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KPPvKN.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KPPvKP.rtbz mirror+http://tablebase.sesse.net/syzygy/3-4-5/KPPPvK.rtbz 6-pieces? ( KQQvKQQ.rtbw KQQvKQR.rtbw KQQvKQB.rtbw KQQvKQN.rtbw KQQvKQP.rtbw KQQQvKQ.rtbw KQQQQvK.rtbw KQQQvKR.rtbw KQQQRvK.rtbw KQQQvKB.rtbw KQQQBvK.rtbw KQQQvKN.rtbw KQQQNvK.rtbw KQQQvKP.rtbw KQQQPvK.rtbw KQQvKRR.rtbw KQQvKRB.rtbw KQQvKRN.rtbw KQQvKRP.rtbw KQQRvKQ.rtbw KQQRvKR.rtbw KQQRRvK.rtbw KQQRvKB.rtbw KQQRBvK.rtbw KQQRvKN.rtbw KQQRNvK.rtbw KQQRvKP.rtbw KQQRPvK.rtbw KQQvKBB.rtbw KQQvKBN.rtbw KQQvKBP.rtbw KQQBvKQ.rtbw KQQBvKR.rtbw KQQBvKB.rtbw KQQBBvK.rtbw KQQBvKN.rtbw KQQBNvK.rtbw KQQBvKP.rtbw KQQBPvK.rtbw KQQvKNN.rtbw KQQvKNP.rtbw KQQNvKQ.rtbw KQQNvKR.rtbw KQQNvKB.rtbw KQQNvKN.rtbw KQQNNvK.rtbw KQQNvKP.rtbw KQQNPvK.rtbw KQQvKPP.rtbw KQQPvKQ.rtbw KQQPvKR.rtbw KQQPvKB.rtbw KQQPvKN.rtbw KQQPvKP.rtbw KQQPPvK.rtbw KQRvKQR.rtbw KQRvKQB.rtbw KQRvKQN.rtbw KQRvKQP.rtbw KQRvKRR.rtbw KQRvKRB.rtbw KQRvKRN.rtbw KQRvKRP.rtbw KQRRvKQ.rtbw KQRRvKR.rtbw KQRRRvK.rtbw KQRRvKB.rtbw KQRRBvK.rtbw KQRRvKN.rtbw KQRRNvK.rtbw KQRRvKP.rtbw KQRRPvK.rtbw KQRvKBB.rtbw KQRvKBN.rtbw KQRvKBP.rtbw KQRBvKQ.rtbw KQRBvKR.rtbw KQRBvKB.rtbw KQRBBvK.rtbw KQRBvKN.rtbw KQRBNvK.rtbw KQRBvKP.rtbw KQRBPvK.rtbw KQRvKNN.rtbw KQRvKNP.rtbw KQRNvKQ.rtbw KQRNvKR.rtbw KQRNvKB.rtbw KQRNvKN.rtbw KQRNNvK.rtbw KQRNvKP.rtbw KQRNPvK.rtbw KQRvKPP.rtbw KQRPvKQ.rtbw KQRPvKR.rtbw KQRPvKB.rtbw KQRPvKN.rtbw KQRPvKP.rtbw KQRPPvK.rtbw KQBvKQB.rtbw KQBvKQN.rtbw KQBvKQP.rtbw KQBvKRR.rtbw KQBvKRB.rtbw KQBvKRN.rtbw KQBvKRP.rtbw KQBvKBB.rtbw KQBvKBN.rtbw KQBvKBP.rtbw KQBBvKQ.rtbw KQBBvKR.rtbw KQBBvKB.rtbw KQBBBvK.rtbw KQBBvKN.rtbw KQBBNvK.rtbw KQBBvKP.rtbw KQBBPvK.rtbw KQBvKNN.rtbw KQBvKNP.rtbw KQBNvKQ.rtbw KQBNvKR.rtbw KQBNvKB.rtbw KQBNvKN.rtbw KQBNNvK.rtbw KQBNvKP.rtbw KQBNPvK.rtbw KQBvKPP.rtbw KQBPvKQ.rtbw KQBPvKR.rtbw KQBPvKB.rtbw KQBPvKN.rtbw KQBPvKP.rtbw KQBPPvK.rtbw KQNvKQN.rtbw KQNvKQP.rtbw KQNvKRR.rtbw KQNvKRB.rtbw KQNvKRN.rtbw KQNvKRP.rtbw KQNvKBB.rtbw KQNvKBN.rtbw KQNvKBP.rtbw KQNvKNN.rtbw KQNvKNP.rtbw KQNNvKQ.rtbw KQNNvKR.rtbw KQNNvKB.rtbw KQNNvKN.rtbw KQNNNvK.rtbw KQNNvKP.rtbw KQNNPvK.rtbw KQNvKPP.rtbw KQNPvKQ.rtbw KQNPvKR.rtbw KQNPvKB.rtbw KQNPvKN.rtbw KQNPvKP.rtbw KQNPPvK.rtbw KQPvKQP.rtbw KQPvKRR.rtbw KQPvKRB.rtbw KQPvKRN.rtbw KQPvKRP.rtbw KQPvKBB.rtbw KQPvKBN.rtbw KQPvKBP.rtbw KQPvKNN.rtbw KQPvKNP.rtbw KQPvKPP.rtbw KQPPvKQ.rtbw KQPPvKR.rtbw KQPPvKB.rtbw KQPPvKN.rtbw KQPPvKP.rtbw KQPPPvK.rtbw KRRvKRR.rtbw KRRvKRB.rtbw KRRvKRN.rtbw KRRvKRP.rtbw KRRRvKQ.rtbw KRRRvKR.rtbw KRRRRvK.rtbw KRRRvKB.rtbw KRRRBvK.rtbw KRRRvKN.rtbw KRRRNvK.rtbw KRRRvKP.rtbw KRRRPvK.rtbw KRRvKBB.rtbw KRRvKBN.rtbw KRRvKBP.rtbw KRRBvKQ.rtbw KRRBvKR.rtbw KRRBvKB.rtbw KRRBBvK.rtbw KRRBvKN.rtbw KRRBNvK.rtbw KRRBvKP.rtbw KRRBPvK.rtbw KRRvKNN.rtbw KRRvKNP.rtbw KRRNvKQ.rtbw KRRNvKR.rtbw KRRNvKB.rtbw KRRNvKN.rtbw KRRNNvK.rtbw KRRNvKP.rtbw KRRNPvK.rtbw KRRvKPP.rtbw KRRPvKQ.rtbw KRRPvKR.rtbw KRRPvKB.rtbw KRRPvKN.rtbw KRRPvKP.rtbw KRRPPvK.rtbw KRBvKRB.rtbw KRBvKRN.rtbw KRBvKRP.rtbw KRBvKBB.rtbw KRBvKBN.rtbw KRBvKBP.rtbw KRBBvKQ.rtbw KRBBvKR.rtbw KRBBvKB.rtbw KRBBBvK.rtbw KRBBvKN.rtbw KRBBNvK.rtbw KRBBvKP.rtbw KRBBPvK.rtbw KRBvKNN.rtbw KRBvKNP.rtbw KRBNvKQ.rtbw KRBNvKR.rtbw KRBNvKB.rtbw KRBNvKN.rtbw KRBNNvK.rtbw KRBNvKP.rtbw KRBNPvK.rtbw KRBvKPP.rtbw KRBPvKQ.rtbw KRBPvKR.rtbw KRBPvKB.rtbw KRBPvKN.rtbw KRBPvKP.rtbw KRBPPvK.rtbw KRNvKRN.rtbw KRNvKRP.rtbw KRNvKBB.rtbw KRNvKBN.rtbw KRNvKBP.rtbw KRNvKNN.rtbw KRNvKNP.rtbw KRNNvKQ.rtbw KRNNvKR.rtbw KRNNvKB.rtbw KRNNvKN.rtbw KRNNNvK.rtbw KRNNvKP.rtbw KRNNPvK.rtbw KRNvKPP.rtbw KRNPvKQ.rtbw KRNPvKR.rtbw KRNPvKB.rtbw KRNPvKN.rtbw KRNPvKP.rtbw KRNPPvK.rtbw KRPvKRP.rtbw KRPvKBB.rtbw KRPvKBN.rtbw KRPvKBP.rtbw KRPvKNN.rtbw KRPvKNP.rtbw KRPvKPP.rtbw KRPPvKQ.rtbw KRPPvKR.rtbw KRPPvKB.rtbw KRPPvKN.rtbw KRPPvKP.rtbw KRPPPvK.rtbw KBBvKBB.rtbw KBBvKBN.rtbw KBBvKBP.rtbw KBBBvKQ.rtbw KBBBvKR.rtbw KBBBvKB.rtbw KBBBBvK.rtbw KBBBvKN.rtbw KBBBNvK.rtbw KBBBvKP.rtbw KBBBPvK.rtbw KBBvKNN.rtbw KBBvKNP.rtbw KBBNvKQ.rtbw KBBNvKR.rtbw KBBNvKB.rtbw KBBNvKN.rtbw KBBNNvK.rtbw KBBNvKP.rtbw KBBNPvK.rtbw KBBvKPP.rtbw KBBPvKQ.rtbw KBBPvKR.rtbw KBBPvKB.rtbw KBBPvKN.rtbw KBBPvKP.rtbw KBBPPvK.rtbw KBNvKBN.rtbw KBNvKBP.rtbw KBNvKNN.rtbw KBNvKNP.rtbw KBNNvKQ.rtbw KBNNvKR.rtbw KBNNvKB.rtbw KBNNvKN.rtbw KBNNNvK.rtbw KBNNvKP.rtbw KBNNPvK.rtbw KBNvKPP.rtbw KBNPvKQ.rtbw KBNPvKR.rtbw KBNPvKB.rtbw KBNPvKN.rtbw KBNPvKP.rtbw KBNPPvK.rtbw KBPvKBP.rtbw KBPvKNN.rtbw KBPvKNP.rtbw KBPvKPP.rtbw KBPPvKQ.rtbw KBPPvKR.rtbw KBPPvKB.rtbw KBPPvKN.rtbw KBPPvKP.rtbw KBPPPvK.rtbw KNNvKNN.rtbw KNNvKNP.rtbw KNNNvKQ.rtbw KNNNvKR.rtbw KNNNvKB.rtbw KNNNvKN.rtbw KNNNNvK.rtbw KNNNvKP.rtbw KNNNPvK.rtbw KNNvKPP.rtbw KNNPvKQ.rtbw KNNPvKR.rtbw KNNPvKB.rtbw KNNPvKN.rtbw KNNPvKP.rtbw KNNPPvK.rtbw KNPvKNP.rtbw KNPvKPP.rtbw KNPPvKQ.rtbw KNPPvKR.rtbw KNPPvKB.rtbw KNPPvKN.rtbw KNPPvKP.rtbw KNPPPvK.rtbw KPPvKPP.rtbw KPPPvKQ.rtbw KPPPvKR.rtbw KPPPvKB.rtbw KPPPvKN.rtbw KPPPvKP.rtbw KPPPPvK.rtbw KQQvKQQ.rtbz KQQvKQR.rtbz KQQvKQB.rtbz KQQvKQN.rtbz KQQvKQP.rtbz KQQQvKQ.rtbz KQQQQvK.rtbz KQQQvKR.rtbz KQQQRvK.rtbz KQQQvKB.rtbz KQQQBvK.rtbz KQQQvKN.rtbz KQQQNvK.rtbz KQQQvKP.rtbz KQQQPvK.rtbz KQQvKRR.rtbz KQQvKRB.rtbz KQQvKRN.rtbz KQQvKRP.rtbz KQQRvKQ.rtbz KQQRvKR.rtbz KQQRRvK.rtbz KQQRvKB.rtbz KQQRBvK.rtbz KQQRvKN.rtbz KQQRNvK.rtbz KQQRvKP.rtbz KQQRPvK.rtbz KQQvKBB.rtbz KQQvKBN.rtbz KQQvKBP.rtbz KQQBvKQ.rtbz KQQBvKR.rtbz KQQBvKB.rtbz KQQBBvK.rtbz KQQBvKN.rtbz KQQBNvK.rtbz KQQBvKP.rtbz KQQBPvK.rtbz KQQvKNN.rtbz KQQvKNP.rtbz KQQNvKQ.rtbz KQQNvKR.rtbz KQQNvKB.rtbz KQQNvKN.rtbz KQQNNvK.rtbz KQQNvKP.rtbz KQQNPvK.rtbz KQQvKPP.rtbz KQQPvKQ.rtbz KQQPvKR.rtbz KQQPvKB.rtbz KQQPvKN.rtbz KQQPvKP.rtbz KQQPPvK.rtbz KQRvKQR.rtbz KQRvKQB.rtbz KQRvKQN.rtbz KQRvKQP.rtbz KQRvKRR.rtbz KQRvKRB.rtbz KQRvKRN.rtbz KQRvKRP.rtbz KQRRvKQ.rtbz KQRRvKR.rtbz KQRRRvK.rtbz KQRRvKB.rtbz KQRRBvK.rtbz KQRRvKN.rtbz KQRRNvK.rtbz KQRRvKP.rtbz KQRRPvK.rtbz KQRvKBB.rtbz KQRvKBN.rtbz KQRvKBP.rtbz KQRBvKQ.rtbz KQRBvKR.rtbz KQRBvKB.rtbz KQRBBvK.rtbz KQRBvKN.rtbz KQRBNvK.rtbz KQRBvKP.rtbz KQRBPvK.rtbz KQRvKNN.rtbz KQRvKNP.rtbz KQRNvKQ.rtbz KQRNvKR.rtbz KQRNvKB.rtbz KQRNvKN.rtbz KQRNNvK.rtbz KQRNvKP.rtbz KQRNPvK.rtbz KQRvKPP.rtbz KQRPvKQ.rtbz KQRPvKR.rtbz KQRPvKB.rtbz KQRPvKN.rtbz KQRPvKP.rtbz KQRPPvK.rtbz KQBvKQB.rtbz KQBvKQN.rtbz KQBvKQP.rtbz KQBvKRR.rtbz KQBvKRB.rtbz KQBvKRN.rtbz KQBvKRP.rtbz KQBvKBB.rtbz KQBvKBN.rtbz KQBvKBP.rtbz KQBBvKQ.rtbz KQBBvKR.rtbz KQBBvKB.rtbz KQBBBvK.rtbz KQBBvKN.rtbz KQBBNvK.rtbz KQBBvKP.rtbz KQBBPvK.rtbz KQBvKNN.rtbz KQBvKNP.rtbz KQBNvKQ.rtbz KQBNvKR.rtbz KQBNvKB.rtbz KQBNvKN.rtbz KQBNNvK.rtbz KQBNvKP.rtbz KQBNPvK.rtbz KQBvKPP.rtbz KQBPvKQ.rtbz KQBPvKR.rtbz KQBPvKB.rtbz KQBPvKN.rtbz KQBPvKP.rtbz KQBPPvK.rtbz KQNvKQN.rtbz KQNvKQP.rtbz KQNvKRR.rtbz KQNvKRB.rtbz KQNvKRN.rtbz KQNvKRP.rtbz KQNvKBB.rtbz KQNvKBN.rtbz KQNvKBP.rtbz KQNvKNN.rtbz KQNvKNP.rtbz KQNNvKQ.rtbz KQNNvKR.rtbz KQNNvKB.rtbz KQNNvKN.rtbz KQNNNvK.rtbz KQNNvKP.rtbz KQNNPvK.rtbz KQNvKPP.rtbz KQNPvKQ.rtbz KQNPvKR.rtbz KQNPvKB.rtbz KQNPvKN.rtbz KQNPvKP.rtbz KQNPPvK.rtbz KQPvKQP.rtbz KQPvKRR.rtbz KQPvKRB.rtbz KQPvKRN.rtbz KQPvKRP.rtbz KQPvKBB.rtbz KQPvKBN.rtbz KQPvKBP.rtbz KQPvKNN.rtbz KQPvKNP.rtbz KQPvKPP.rtbz KQPPvKQ.rtbz KQPPvKR.rtbz KQPPvKB.rtbz KQPPvKN.rtbz KQPPvKP.rtbz KQPPPvK.rtbz KRRvKRR.rtbz KRRvKRB.rtbz KRRvKRN.rtbz KRRvKRP.rtbz KRRRvKQ.rtbz KRRRvKR.rtbz KRRRRvK.rtbz KRRRvKB.rtbz KRRRBvK.rtbz KRRRvKN.rtbz KRRRNvK.rtbz KRRRvKP.rtbz KRRRPvK.rtbz KRRvKBB.rtbz KRRvKBN.rtbz KRRvKBP.rtbz KRRBvKQ.rtbz KRRBvKR.rtbz KRRBvKB.rtbz KRRBBvK.rtbz KRRBvKN.rtbz KRRBNvK.rtbz KRRBvKP.rtbz KRRBPvK.rtbz KRRvKNN.rtbz KRRvKNP.rtbz KRRNvKQ.rtbz KRRNvKR.rtbz KRRNvKB.rtbz KRRNvKN.rtbz KRRNNvK.rtbz KRRNvKP.rtbz KRRNPvK.rtbz KRRvKPP.rtbz KRRPvKQ.rtbz KRRPvKR.rtbz KRRPvKB.rtbz KRRPvKN.rtbz KRRPvKP.rtbz KRRPPvK.rtbz KRBvKRB.rtbz KRBvKRN.rtbz KRBvKRP.rtbz KRBvKBB.rtbz KRBvKBN.rtbz KRBvKBP.rtbz KRBBvKQ.rtbz KRBBvKR.rtbz KRBBvKB.rtbz KRBBBvK.rtbz KRBBvKN.rtbz KRBBNvK.rtbz KRBBvKP.rtbz KRBBPvK.rtbz KRBvKNN.rtbz KRBvKNP.rtbz KRBNvKQ.rtbz KRBNvKR.rtbz KRBNvKB.rtbz KRBNvKN.rtbz KRBNNvK.rtbz KRBNvKP.rtbz KRBNPvK.rtbz KRBvKPP.rtbz KRBPvKQ.rtbz KRBPvKR.rtbz KRBPvKB.rtbz KRBPvKN.rtbz KRBPvKP.rtbz KRBPPvK.rtbz KRNvKRN.rtbz KRNvKRP.rtbz KRNvKBB.rtbz KRNvKBN.rtbz KRNvKBP.rtbz KRNvKNN.rtbz KRNvKNP.rtbz KRNNvKQ.rtbz KRNNvKR.rtbz KRNNvKB.rtbz KRNNvKN.rtbz KRNNNvK.rtbz KRNNvKP.rtbz KRNNPvK.rtbz KRNvKPP.rtbz KRNPvKQ.rtbz KRNPvKR.rtbz KRNPvKB.rtbz KRNPvKN.rtbz KRNPvKP.rtbz KRNPPvK.rtbz KRPvKRP.rtbz KRPvKBB.rtbz KRPvKBN.rtbz KRPvKBP.rtbz KRPvKNN.rtbz KRPvKNP.rtbz KRPvKPP.rtbz KRPPvKQ.rtbz KRPPvKR.rtbz KRPPvKB.rtbz KRPPvKN.rtbz KRPPvKP.rtbz KRPPPvK.rtbz KBBvKBB.rtbz KBBvKBN.rtbz KBBvKBP.rtbz KBBBvKQ.rtbz KBBBvKR.rtbz KBBBvKB.rtbz KBBBBvK.rtbz KBBBvKN.rtbz KBBBNvK.rtbz KBBBvKP.rtbz KBBBPvK.rtbz KBBvKNN.rtbz KBBvKNP.rtbz KBBNvKQ.rtbz KBBNvKR.rtbz KBBNvKB.rtbz KBBNvKN.rtbz KBBNNvK.rtbz KBBNvKP.rtbz KBBNPvK.rtbz KBBvKPP.rtbz KBBPvKQ.rtbz KBBPvKR.rtbz KBBPvKB.rtbz KBBPvKN.rtbz KBBPvKP.rtbz KBBPPvK.rtbz KBNvKBN.rtbz KBNvKBP.rtbz KBNvKNN.rtbz KBNvKNP.rtbz KBNNvKQ.rtbz KBNNvKR.rtbz KBNNvKB.rtbz KBNNvKN.rtbz KBNNNvK.rtbz KBNNvKP.rtbz KBNNPvK.rtbz KBNvKPP.rtbz KBNPvKQ.rtbz KBNPvKR.rtbz KBNPvKB.rtbz KBNPvKN.rtbz KBNPvKP.rtbz KBNPPvK.rtbz KBPvKBP.rtbz KBPvKNN.rtbz KBPvKNP.rtbz KBPvKPP.rtbz KBPPvKQ.rtbz KBPPvKR.rtbz KBPPvKB.rtbz KBPPvKN.rtbz KBPPvKP.rtbz KBPPPvK.rtbz KNNvKNN.rtbz KNNvKNP.rtbz KNNNvKQ.rtbz KNNNvKR.rtbz KNNNvKB.rtbz KNNNvKN.rtbz KNNNNvK.rtbz KNNNvKP.rtbz KNNNPvK.rtbz KNNvKPP.rtbz KNNPvKQ.rtbz KNNPvKR.rtbz KNNPvKB.rtbz KNNPvKN.rtbz KNNPvKP.rtbz KNNPPvK.rtbz KNPvKNP.rtbz KNPvKPP.rtbz KNPPvKQ.rtbz KNPPvKR.rtbz KNPPvKB.rtbz KNPPvKN.rtbz KNPPvKP.rtbz KNPPPvK.rtbz KPPvKPP.rtbz KPPPvKQ.rtbz KPPPvKR.rtbz KPPPvKB.rtbz KPPPvKN.rtbz KPPPvKP.rtbz KPPPPvK.rtbz )
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c
+_md5_=7da5b905dac19545799b4bcead2bbc45
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index b678ea1197db..b49d0026ba67 100644
Binary files a/metadata/md5-cache/games-emulation/Manifest.gz and b/metadata/md5-cache/games-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/games-emulation/mgba-0.9.2 b/metadata/md5-cache/games-emulation/mgba-0.9.2
index 3989fb180bf5..8014e192116b 100644
--- a/metadata/md5-cache/games-emulation/mgba-0.9.2
+++ b/metadata/md5-cache/games-emulation/mgba-0.9.2
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( qt5 sdl ) qt5? ( opengl )
 SLOT=0
 SRC_URI=https://github.com/mgba-emu/mgba/archive/0.9.2.tar.gz -> mgba-0.9.2.tar.gz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=4dd94f5cc3f8be6012af7d3f373401ef
+_md5_=f44ede5575a10211da8f51a2de7b42ed
diff --git a/metadata/md5-cache/games-emulation/mgba-0.9.3 b/metadata/md5-cache/games-emulation/mgba-0.9.3
index 3cdc537ae768..c7d2904e0565 100644
--- a/metadata/md5-cache/games-emulation/mgba-0.9.3
+++ b/metadata/md5-cache/games-emulation/mgba-0.9.3
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( qt5 sdl ) qt5? ( opengl )
 SLOT=0
 SRC_URI=https://github.com/mgba-emu/mgba/archive/0.9.3.tar.gz -> mgba-0.9.3.tar.gz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c525aa3a2d3700bbca9bedd8bc6b447d
+_md5_=db5c517667073775ef99ba1f6b69047a
diff --git a/metadata/md5-cache/games-emulation/mgba-0.9.3-r1 b/metadata/md5-cache/games-emulation/mgba-0.9.3-r1
index 3232549b5715..7ea3c82816f0 100644
--- a/metadata/md5-cache/games-emulation/mgba-0.9.3-r1
+++ b/metadata/md5-cache/games-emulation/mgba-0.9.3-r1
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( qt5 sdl ) qt5? ( opengl )
 SLOT=0
 SRC_URI=https://github.com/mgba-emu/mgba/archive/0.9.3.tar.gz -> mgba-0.9.3.tar.gz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=36327c770747e8821a067fa326a3bcb0
+_md5_=fbe3fe4a92f251607de811caa7b95163
diff --git a/metadata/md5-cache/games-emulation/mgba-9999 b/metadata/md5-cache/games-emulation/mgba-9999
index bcd777b1667a..1f4266a4a300 100644
--- a/metadata/md5-cache/games-emulation/mgba-9999
+++ b/metadata/md5-cache/games-emulation/mgba-9999
@@ -12,4 +12,4 @@ RDEPEND=media-libs/libpng:0= sys-libs/zlib[minizip] debug? ( dev-libs/libedit )
 REQUIRED_USE=|| ( qt5 sdl ) qt5? ( opengl )
 SLOT=0
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c525aa3a2d3700bbca9bedd8bc6b447d
+_md5_=db5c517667073775ef99ba1f6b69047a
diff --git a/metadata/md5-cache/games-fps/Manifest.gz b/metadata/md5-cache/games-fps/Manifest.gz
index c26459930665..338f6b3a9753 100644
Binary files a/metadata/md5-cache/games-fps/Manifest.gz and b/metadata/md5-cache/games-fps/Manifest.gz differ
diff --git a/metadata/md5-cache/games-fps/yamagi-quake2-8.01 b/metadata/md5-cache/games-fps/yamagi-quake2-8.01
index 2c6b9ff9e6a8..910249242fc9 100644
--- a/metadata/md5-cache/games-fps/yamagi-quake2-8.01
+++ b/metadata/md5-cache/games-fps/yamagi-quake2-8.01
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.yamagi.org/quake2/
 INHERIT=desktop toolchain-funcs wrapper
 IUSE=+client ctf dedicated openal +opengl rogue softrender vulkan xatrix
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=client? ( media-libs/libsdl2[opengl?,video,vulkan?] net-misc/curl openal? ( media-libs/openal ) !openal? ( media-libs/libsdl2[sound] ) opengl? ( virtual/opengl ) )
 REQUIRED_USE=|| ( client dedicated ) client? ( || ( opengl softrender vulkan ) )
 SLOT=0
 SRC_URI=https://deponie.yamagi.org/quake2/quake2-8.01.tar.xz ctf? ( https://deponie.yamagi.org/quake2/quake2-ctf-1.08.tar.xz ) rogue? ( https://deponie.yamagi.org/quake2/quake2-rogue-2.08.tar.xz ) xatrix? ( https://deponie.yamagi.org/quake2/quake2-xatrix-2.09.tar.xz ) vulkan? ( https://github.com/yquake2/ref_vk/archive/refs/tags/v1.0.1.tar.gz -> quake2-ref_vk-1.0.1.tar.gz )
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a467047436e7fb436e84634c0749a280
+_md5_=f5d4cd4d62d7208e90ba2a36f9ff3252
diff --git a/metadata/md5-cache/games-util/Manifest.gz b/metadata/md5-cache/games-util/Manifest.gz
index 4104b43ca196..67310ef65456 100644
Binary files a/metadata/md5-cache/games-util/Manifest.gz and b/metadata/md5-cache/games-util/Manifest.gz differ
diff --git a/metadata/md5-cache/games-util/pyfa-2.33.0 b/metadata/md5-cache/games-util/pyfa-2.33.0
deleted file mode 100644
index e8f8340e89f3..000000000000
--- a/metadata/md5-cache/games-util/pyfa-2.33.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-arch/zip
-DEFINED_PHASES=install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python3_8? ( >=dev-python/cryptography-2.3[python_targets_python3_8(-)] >=dev-python/logbook-1.0.0[python_targets_python3_8(-)] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_8(-)] >=dev-python/wxpython-4.0.6[webkit,python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/cryptography-2.3[python_targets_python3_9(-)] >=dev-python/logbook-1.0.0[python_targets_python3_9(-)] >=dev-python/pyyaml-5.1[python_targets_python3_9(-)] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_9(-)] >=dev-python/wxpython-4.0.6[webkit,python_targets_python3_9(-)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Python Fitting Assistant - a ship fitting application for EVE Online
-EAPI=7
-HOMEPAGE=https://github.com/pyfa-org/Pyfa
-INHERIT=desktop edos2unix python-single-r1 xdg
-IUSE=python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+ all-rights-reserved
-RDEPEND=python_single_target_python3_8? ( >=dev-python/cryptography-2.3[python_targets_python3_8(-)] >=dev-python/logbook-1.0.0[python_targets_python3_8(-)] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_8(-)] >=dev-python/wxpython-4.0.6[webkit,python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/cryptography-2.3[python_targets_python3_9(-)] >=dev-python/logbook-1.0.0[python_targets_python3_9(-)] >=dev-python/pyyaml-5.1[python_targets_python3_9(-)] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_9(-)] >=dev-python/wxpython-4.0.6[webkit,python_targets_python3_9(-)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_single_target_python3_8? ( >=dev-python/beautifulsoup4-4.6.0[python_targets_python3_8(-)] >=dev-python/markdown2-2.3.5[python_targets_python3_8(-)] >=dev-python/numpy-1.19.2[python_targets_python3_8(-)] >=dev-python/packaging-16.8[python_targets_python3_8(-)] dev-python/python-dateutil[python_targets_python3_8(-)] >=dev-python/requests-2.0.0[python_targets_python3_8(-)] >=dev-python/roman-2.0.0[python_targets_python3_8(-)] >=dev-python/matplotlib-3.1.2[wxwidgets,python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/beautifulsoup4-4.6.0[python_targets_python3_9(-)] >=dev-python/markdown2-2.3.5[python_targets_python3_9(-)] >=dev-python/numpy-1.19.2[python_targets_python3_9(-)] >=dev-python/packaging-16.8[python_targets_python3_9(-)] dev-python/python-dateutil[python_targets_python3_9(-)] >=dev-python/requests-2.0.0[python_targets_python3_9(-)] >=dev-python/roman-2.0.0[python_targets_python3_9(-)] >=dev-python/matplotlib-3.1.2[wxwidgets,python_targets_python3_9(-)] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=mirror bindist
-SLOT=0
-SRC_URI=https://github.com/pyfa-org/Pyfa/archive/v2.33.0.tar.gz -> pyfa-2.33.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=0d35ffa0e6e142436044308aee1d66b1
diff --git a/metadata/md5-cache/games-util/pyfa-2.37.0 b/metadata/md5-cache/games-util/pyfa-2.37.0
deleted file mode 100644
index e95abd783697..000000000000
--- a/metadata/md5-cache/games-util/pyfa-2.37.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-arch/zip
-DEFINED_PHASES=install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python3_8? ( >=dev-python/cryptography-2.3[python_targets_python3_8(-)] >=dev-python/logbook-1.0.0[python_targets_python3_8(-)] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_8(-)] >=dev-python/wxpython-4.0.6[webkit,python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/cryptography-2.3[python_targets_python3_9(-)] >=dev-python/logbook-1.0.0[python_targets_python3_9(-)] >=dev-python/pyyaml-5.1[python_targets_python3_9(-)] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_9(-)] >=dev-python/wxpython-4.0.6[webkit,python_targets_python3_9(-)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Python Fitting Assistant - a ship fitting application for EVE Online
-EAPI=7
-HOMEPAGE=https://github.com/pyfa-org/Pyfa
-INHERIT=desktop edos2unix python-single-r1 xdg
-IUSE=python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+ all-rights-reserved
-RDEPEND=python_single_target_python3_8? ( >=dev-python/cryptography-2.3[python_targets_python3_8(-)] >=dev-python/logbook-1.0.0[python_targets_python3_8(-)] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_8(-)] >=dev-python/wxpython-4.0.6[webkit,python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/cryptography-2.3[python_targets_python3_9(-)] >=dev-python/logbook-1.0.0[python_targets_python3_9(-)] >=dev-python/pyyaml-5.1[python_targets_python3_9(-)] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_9(-)] >=dev-python/wxpython-4.0.6[webkit,python_targets_python3_9(-)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_single_target_python3_8? ( >=dev-python/beautifulsoup4-4.6.0[python_targets_python3_8(-)] >=dev-python/markdown2-2.3.5[python_targets_python3_8(-)] >=dev-python/numpy-1.19.2[python_targets_python3_8(-)] >=dev-python/packaging-16.8[python_targets_python3_8(-)] dev-python/python-dateutil[python_targets_python3_8(-)] >=dev-python/requests-2.0.0[python_targets_python3_8(-)] >=dev-python/roman-2.0.0[python_targets_python3_8(-)] >=dev-python/matplotlib-3.2.2[wxwidgets,python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/beautifulsoup4-4.6.0[python_targets_python3_9(-)] >=dev-python/markdown2-2.3.5[python_targets_python3_9(-)] >=dev-python/numpy-1.19.2[python_targets_python3_9(-)] >=dev-python/packaging-16.8[python_targets_python3_9(-)] dev-python/python-dateutil[python_targets_python3_9(-)] >=dev-python/requests-2.0.0[python_targets_python3_9(-)] >=dev-python/roman-2.0.0[python_targets_python3_9(-)] >=dev-python/matplotlib-3.2.2[wxwidgets,python_targets_python3_9(-)] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=mirror bindist
-SLOT=0
-SRC_URI=https://github.com/pyfa-org/Pyfa/archive/v2.37.0.tar.gz -> pyfa-2.37.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b330fc279d1ae65313e4192fc507348b
diff --git a/metadata/md5-cache/games-util/pyfa-2.43.0 b/metadata/md5-cache/games-util/pyfa-2.43.0
new file mode 100644
index 000000000000..aa0116a12a1d
--- /dev/null
+++ b/metadata/md5-cache/games-util/pyfa-2.43.0
@@ -0,0 +1,17 @@
+BDEPEND=app-arch/zip
+DEFINED_PHASES=install postinst postrm preinst prepare setup
+DEPEND=python_single_target_python3_8? ( >=dev-python/cryptography-2.3[python_targets_python3_8(-)] >=dev-python/logbook-1.0.0[python_targets_python3_8(-)] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)] >=dev-python/sqlalchemy-1.3.23[python_targets_python3_8(-)] >=dev-python/wxpython-4.0.6[webkit,python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/cryptography-2.3[python_targets_python3_9(-)] >=dev-python/logbook-1.0.0[python_targets_python3_9(-)] >=dev-python/pyyaml-5.1[python_targets_python3_9(-)] >=dev-python/sqlalchemy-1.3.23[python_targets_python3_9(-)] >=dev-python/wxpython-4.0.6[webkit,python_targets_python3_9(-)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] )
+DESCRIPTION=Python Fitting Assistant - a ship fitting application for EVE Online
+EAPI=8
+HOMEPAGE=https://github.com/pyfa-org/Pyfa
+INHERIT=desktop edos2unix python-single-r1 xdg
+IUSE=python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+ all-rights-reserved
+RDEPEND=python_single_target_python3_8? ( >=dev-python/cryptography-2.3[python_targets_python3_8(-)] >=dev-python/logbook-1.0.0[python_targets_python3_8(-)] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)] >=dev-python/sqlalchemy-1.3.23[python_targets_python3_8(-)] >=dev-python/wxpython-4.0.6[webkit,python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/cryptography-2.3[python_targets_python3_9(-)] >=dev-python/logbook-1.0.0[python_targets_python3_9(-)] >=dev-python/pyyaml-5.1[python_targets_python3_9(-)] >=dev-python/sqlalchemy-1.3.23[python_targets_python3_9(-)] >=dev-python/wxpython-4.0.6[webkit,python_targets_python3_9(-)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_single_target_python3_8? ( >=dev-python/beautifulsoup4-4.6.0[python_targets_python3_8(-)] >=dev-python/markdown2-2.3.5[python_targets_python3_8(-)] >=dev-python/numpy-1.19.2[python_targets_python3_8(-)] >=dev-python/packaging-16.8[python_targets_python3_8(-)] dev-python/python-dateutil[python_targets_python3_8(-)] >=dev-python/python-jose-3.0.1[python_targets_python3_8(-)] >=dev-python/requests-2.0.0[python_targets_python3_8(-)] >=dev-python/requests-cache-0.8.1[python_targets_python3_8(-)] >=dev-python/roman-2.0.0[python_targets_python3_8(-)] >=dev-python/matplotlib-3.2.2[wxwidgets,python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/beautifulsoup4-4.6.0[python_targets_python3_9(-)] >=dev-python/markdown2-2.3.5[python_targets_python3_9(-)] >=dev-python/numpy-1.19.2[python_targets_python3_9(-)] >=dev-python/packaging-16.8[python_targets_python3_9(-)] dev-python/python-dateutil[python_targets_python3_9(-)] >=dev-python/python-jose-3.0.1[python_targets_python3_9(-)] >=dev-python/requests-2.0.0[python_targets_python3_9(-)] >=dev-python/requests-cache-0.8.1[python_targets_python3_9(-)] >=dev-python/roman-2.0.0[python_targets_python3_9(-)] >=dev-python/matplotlib-3.2.2[wxwidgets,python_targets_python3_9(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=mirror bindist
+SLOT=0
+SRC_URI=https://github.com/pyfa-org/Pyfa/archive/v2.43.0.tar.gz -> pyfa-2.43.0.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=29b64475daf5a1e3a25656419e79f02e
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index 2f0579de7709..f144e6b77da3 100644
Binary files a/metadata/md5-cache/gnome-base/Manifest.gz and b/metadata/md5-cache/gnome-base/Manifest.gz differ
diff --git a/metadata/md5-cache/gnome-base/gdm-42.0 b/metadata/md5-cache/gnome-base/gdm-42.0
index ee602b29769c..2b8da53cc167 100644
--- a/metadata/md5-cache/gnome-base/gdm-42.0
+++ b/metadata/md5-cache/gnome-base/gdm-42.0
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gdm/42/gdm-42.0.tar.xz branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=5078de917b23e6c851dc8d78d5b0cf69
+_md5_=b8a8ef1aba5a8d484a03daa7e0c704d5
diff --git a/metadata/md5-cache/gnome-base/gnome-desktop-42.1-r300 b/metadata/md5-cache/gnome-base/gnome-desktop-42.1-r300
index 2350b638619c..60e1d37088d9 100644
--- a/metadata/md5-cache/gnome-base/gnome-desktop-42.1-r300
+++ b/metadata/md5-cache/gnome-base/gnome-desktop-42.1-r300
@@ -12,4 +12,4 @@ RDEPEND=>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?] >=x11-libs/gtk+-3.3.6:3[i
 SLOT=3/19
 SRC_URI=mirror://gnome/sources/gnome-desktop/42/gnome-desktop-42.1.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=df129a3320d79122391277b94f4802bf
+_md5_=9fac462aea8a475b53881ead749dec0c
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index 432e5eb3c357..c83152230c56 100644
Binary files a/metadata/md5-cache/gnome-extra/Manifest.gz and b/metadata/md5-cache/gnome-extra/Manifest.gz differ
diff --git a/metadata/md5-cache/gnome-extra/gnome-calendar-42.2 b/metadata/md5-cache/gnome-extra/gnome-calendar-42.2
new file mode 100644
index 000000000000..bc315fb17545
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-calendar-42.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-libs/appstream-glib dev-libs/libxml2:2 dev-util/gdbus-codegen dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst test
+DEPEND=>=dev-libs/libical-1.0.1:0= >=gnome-base/gsettings-desktop-schemas-3.21.2 >=gnome-extra/evolution-data-server-3.33.2:=[gtk] net-libs/libsoup:2.4 >=gui-libs/libadwaita-1.0.0:1= >=dev-libs/glib-2.67.5:2 >=gui-libs/gtk-4.6.0:4 >=dev-libs/libgweather-4.0.0:4= >=app-misc/geoclue-2.4:2.0 >=sci-geosciences/geocode-glib-3.23
+DESCRIPTION=Manage your online calendars with simple and modern interface
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Calendar
+INHERIT=gnome.org gnome2-utils meson virtualx xdg
+IUSE=test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-libs/libical-1.0.1:0= >=gnome-base/gsettings-desktop-schemas-3.21.2 >=gnome-extra/evolution-data-server-3.33.2:=[gtk] net-libs/libsoup:2.4 >=gui-libs/libadwaita-1.0.0:1= >=dev-libs/glib-2.67.5:2 >=gui-libs/gtk-4.6.0:4 >=dev-libs/libgweather-4.0.0:4= >=app-misc/geoclue-2.4:2.0 >=sci-geosciences/geocode-glib-3.23
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-calendar/42/gnome-calendar-42.2.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=3f1136ee944a3adabae684ae7d5137b8
diff --git a/metadata/md5-cache/gnustep-libs/Manifest.gz b/metadata/md5-cache/gnustep-libs/Manifest.gz
index 146c7f43c7f4..d4ff625a290d 100644
Binary files a/metadata/md5-cache/gnustep-libs/Manifest.gz and b/metadata/md5-cache/gnustep-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/gnustep-libs/dbuskit-0.1.1-r1 b/metadata/md5-cache/gnustep-libs/dbuskit-0.1.1-r1
index 075af44f03d6..09699bfcbc29 100644
--- a/metadata/md5-cache/gnustep-libs/dbuskit-0.1.1-r1
+++ b/metadata/md5-cache/gnustep-libs/dbuskit-0.1.1-r1
@@ -11,4 +11,4 @@ RDEPEND=>=sys-apps/dbus-1.2.1 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-ba
 SLOT=0
 SRC_URI=https://github.com/gnustep/libs-dbuskit/archive/0.1.1.tar.gz -> dbuskit-0.1.1.tar.gz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	gnustep-2	e62084c6f8a47a695801af9119a20761	gnustep-base	9572b3101ddfc57358483561c0439981	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=97178d85ba4b0277f1b6ab78e84f36da
+_md5_=df5b133e2b6b8f45c2b3b7f751f3d68d
diff --git a/metadata/md5-cache/gui-apps/Manifest.gz b/metadata/md5-cache/gui-apps/Manifest.gz
index 9dd4b5c6466c..c3f85f5c8d06 100644
Binary files a/metadata/md5-cache/gui-apps/Manifest.gz and b/metadata/md5-cache/gui-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/gui-apps/wf-recorder-0.3.0-r1 b/metadata/md5-cache/gui-apps/wf-recorder-0.3.0-r1
new file mode 100644
index 000000000000..d770d11f0251
--- /dev/null
+++ b/metadata/md5-cache/gui-apps/wf-recorder-0.3.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-libs/wayland-protocols dev-util/wayland-scanner virtual/pkgconfig >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install test
+DEPEND=dev-libs/wayland media-sound/pulseaudio media-video/ffmpeg[pulseaudio,x264]
+DESCRIPTION=Screen recorder for wlroots-based compositors
+EAPI=8
+HOMEPAGE=https://github.com/ammen99/wf-recorder
+INHERIT=meson
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-libs/wayland media-sound/pulseaudio media-video/ffmpeg[pulseaudio,x264]
+SLOT=0
+SRC_URI=https://github.com/ammen99/wf-recorder/releases/download/v0.3.0/wf-recorder-0.3.0.tar.xz
+_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=b0b96b22e4f6382478d3818434b048ce
diff --git a/metadata/md5-cache/gui-apps/wf-recorder-9999 b/metadata/md5-cache/gui-apps/wf-recorder-9999
index 894ae83665b3..84842278f2e4 100644
--- a/metadata/md5-cache/gui-apps/wf-recorder-9999
+++ b/metadata/md5-cache/gui-apps/wf-recorder-9999
@@ -1,14 +1,13 @@
-BDEPEND=virtual/pkgconfig dev-libs/wayland-protocols man? ( >=app-text/scdoc-1.9.3 ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig dev-libs/wayland-protocols >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install test unpack
-DEPEND=dev-libs/wayland pulseaudio? ( media-sound/pulseaudio ) media-video/ffmpeg[opencl?,pulseaudio?,x264] opencl? ( virtual/opencl )
+DEPEND=dev-libs/wayland media-sound/pulseaudio media-video/ffmpeg[pulseaudio,x264]
 DESCRIPTION=Screen recorder for wlroots-based compositors
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/ammen99/wf-recorder
 INHERIT=meson git-r3
-IUSE=+man pulseaudio opencl
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=dev-libs/wayland pulseaudio? ( media-sound/pulseaudio ) media-video/ffmpeg[opencl?,pulseaudio?,x264] opencl? ( virtual/opencl )
+RDEPEND=dev-libs/wayland media-sound/pulseaudio media-video/ffmpeg[pulseaudio,x264]
 SLOT=0
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=99f5952a813d1d6eff03a315a5f025ff
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=f1713a52f58e011eaa50bfeb180a9727
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index 55153cabff9a..b82e7dacc16e 100644
Binary files a/metadata/md5-cache/gui-libs/Manifest.gz and b/metadata/md5-cache/gui-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/gui-libs/gtksourceview-5.4.2 b/metadata/md5-cache/gui-libs/gtksourceview-5.4.2
new file mode 100644
index 000000000000..dca999ba7f50
--- /dev/null
+++ b/metadata/md5-cache/gui-libs/gtksourceview-5.4.2
@@ -0,0 +1,17 @@
+BDEPEND=dev-util/glib-utils gtk-doc? ( dev-util/gi-docgen ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56 dev-lang/vala:0.54 dev-lang/vala:0.52 dev-lang/vala:0.50 ) ) app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.70:2 >=gui-libs/gtk-4.5:4[introspection?] >=dev-libs/libxml2-2.6:2 introspection? ( >=dev-libs/gobject-introspection-1.70.0:= ) >=dev-libs/fribidi-0.19.7 media-libs/fontconfig x11-libs/pango[introspection?] >=dev-libs/libpcre2-10.21:=[-recursion-limit(-)] sysprof? ( dev-util/sysprof-capture:4 )
+DESCRIPTION=A text widget implementing syntax highlighting and other features
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Projects/GtkSourceView
+INHERIT=gnome.org meson vala virtualx xdg
+IUSE=gtk-doc +introspection sysprof +vala test
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.70:2 >=gui-libs/gtk-4.5:4[introspection?] >=dev-libs/libxml2-2.6:2 introspection? ( >=dev-libs/gobject-introspection-1.70.0:= ) >=dev-libs/fribidi-0.19.7 media-libs/fontconfig x11-libs/pango[introspection?] >=dev-libs/libpcre2-10.21:=[-recursion-limit(-)] sysprof? ( dev-util/sysprof-capture:4 )
+REQUIRED_USE=gtk-doc? ( introspection ) vala? ( introspection )
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://gnome/sources/gtksourceview/5.4/gtksourceview-5.4.2.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=9d7afca02bb05c44bb88cc325c7edd04
diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index 723f735d8b93..9a8f04cf0fe3 100644
Binary files a/metadata/md5-cache/kde-frameworks/Manifest.gz and b/metadata/md5-cache/kde-frameworks/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-frameworks/attica-5.94.0 b/metadata/md5-cache/kde-frameworks/attica-5.94.0
deleted file mode 100644
index 7733e25eef22..000000000000
--- a/metadata/md5-cache/kde-frameworks/attica-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtnetwork-5.15.3:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing access to Open Collaboration Services
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtnetwork-5.15.3:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/attica-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=bb24b0443eda26ddbbbaafcaf6b01cd1
diff --git a/metadata/md5-cache/kde-frameworks/baloo-5.94.0 b/metadata/md5-cache/kde-frameworks/baloo-5.94.0
deleted file mode 100644
index d50c91ec5e1c..000000000000
--- a/metadata/md5-cache/kde-frameworks/baloo-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-db/lmdb-0.9.17 >=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/kcrash-5.94*:5 =kde-frameworks/kdbusaddons-5.94*:5 =kde-frameworks/kfilemetadata-5.94*:5 =kde-frameworks/ki18n-5.94*:5 =kde-frameworks/kidletime-5.94*:5 =kde-frameworks/kio-5.94*:5 =kde-frameworks/solid-5.94*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for searching and managing metadata
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-db/lmdb-0.9.17 >=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/kcrash-5.94*:5 =kde-frameworks/kdbusaddons-5.94*:5 =kde-frameworks/kfilemetadata-5.94*:5 =kde-frameworks/ki18n-5.94*:5 =kde-frameworks/kidletime-5.94*:5 =kde-frameworks/kio-5.94*:5 =kde-frameworks/solid-5.94*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=test !test? ( test ) !test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/baloo-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ebc7795335ec8df986f31f0c6ea3a187
diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.94.0 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.94.0
deleted file mode 100644
index 52c2cb73a47c..000000000000
--- a/metadata/md5-cache/kde-frameworks/bluez-qt-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5 virtual/pkgconfig
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtnetwork-5.15.3:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Qt wrapper for Bluez 5 DBus API
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org udev
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtnetwork-5.15.3:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/bluez-qt-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=f77290100fdd5610e6025673a353b535
diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.95.0 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.95.0-r1
similarity index 97%
rename from metadata/md5-cache/kde-frameworks/bluez-qt-5.95.0
rename to metadata/md5-cache/kde-frameworks/bluez-qt-5.95.0-r1
index ba5bdecaf60b..bebe881a935d 100644
--- a/metadata/md5-cache/kde-frameworks/bluez-qt-5.95.0
+++ b/metadata/md5-cache/kde-frameworks/bluez-qt-5.95.0-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.95
 SRC_URI=mirror://kde/stable/frameworks/5.95/bluez-qt-5.95.0.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=f77290100fdd5610e6025673a353b535
+_md5_=b177321eb7c7f9d351c57c1ea0c8d6d8
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-5.94.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-5.94.0
deleted file mode 100644
index c3a4d550b46e..000000000000
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-5.94.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/lxml[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/lxml[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/lxml[python_targets_python3_8(-)] ) ) dev-qt/qtcore:5 >=kde-frameworks/extra-cmake-modules-5.94:5 test? ( app-misc/fdupes ) dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install nofetch postinst postrm prepare setup test unpack
-DEPEND=test? ( dev-qt/qttest:5 )
-DESCRIPTION=Breeze SVG icon theme
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=cmake kde.org python-any-r1 xdg-utils
-IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-3
-RESTRICT=!test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/breeze-icons-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=bdc1f4addcf6205004c3e00d597b5676
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.94.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.94.0
deleted file mode 100644
index 419b7d5737f5..000000000000
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.94.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/lxml[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/lxml[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/lxml[python_targets_python3_8(-)] ) ) dev-qt/qtcore:5 >=kde-frameworks/extra-cmake-modules-5.94:5 test? ( app-misc/fdupes ) dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install nofetch prepare setup test unpack
-DEPEND=test? ( dev-qt/qttest:5 )
-DESCRIPTION=Breeze SVG icon theme binary resource
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=cmake kde.org python-any-r1
-IUSE=test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-3
-RESTRICT=!test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/breeze-icons-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=abc3d44bee6ad88f40f2e6715357e4a3
diff --git a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.94.0 b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.94.0
deleted file mode 100644
index 1907b84b4ecb..000000000000
--- a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.94.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) >=dev-qt/qthelp-5.15.3:5 ) test? ( >=dev-qt/linguist-tools-5.15.3:5 >=dev-qt/qtcore-5.15.3:5 ) dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install nofetch prepare setup test unpack
-DESCRIPTION=Extra modules and scripts for CMake
-EAPI=8
-HOMEPAGE=https://invent.kde.org/frameworks/extra-cmake-modules
-INHERIT=cmake kde.org python-any-r1
-IUSE=doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86
-LICENSE=BSD
-RDEPEND=app-arch/libarchive[bzip2]
-RESTRICT=!test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/extra-cmake-modules-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=202d56cf23baee519c0e728bc7c74542
diff --git a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.94.0 b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.94.0
deleted file mode 100644
index 2bfa9b1e153f..000000000000
--- a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kconfigwidgets-5.94*:5 =kde-frameworks/ki18n-5.94*:5 =kde-frameworks/kiconthemes-5.94*:5 =kde-frameworks/knewstuff-5.94*:5 =kde-frameworks/knotifications-5.94*:5 =kde-frameworks/kpackage-5.94*:5 =kde-frameworks/kwidgetsaddons-5.94*:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for integrating Qt applications with KDE Plasma workspaces
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kconfigwidgets-5.94*:5 =kde-frameworks/ki18n-5.94*:5 =kde-frameworks/kiconthemes-5.94*:5 =kde-frameworks/knewstuff-5.94*:5 =kde-frameworks/knotifications-5.94*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=test !test? ( test ) !test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/frameworkintegration-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=cdb70893b38c31478af85d1c26b073db
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-5.94.0 b/metadata/md5-cache/kde-frameworks/kactivities-5.94.0
deleted file mode 100644
index fdd9559a43c8..000000000000
--- a/metadata/md5-cache/kde-frameworks/kactivities-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5[widgets] >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtsql-5.15.3:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 >=dev-libs/boost-1.54 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for working with KDE activities
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 )
-RDEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5[widgets] >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtsql-5.15.3:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 >=kde-plasma/kactivitymanagerd-5.16.5:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/kactivities-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d5a9dae1764b0b2c68bb7e2ad408ae01
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.94.0 b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.94.0
deleted file mode 100644
index d7050035d02a..000000000000
--- a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtsql-5.15.3:5 =kde-frameworks/kactivities-5.94*:5 =kde-frameworks/kconfig-5.94*:5 test? ( >=dev-libs/boost-1.54 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for getting the usage statistics collected by the activities service
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtsql-5.15.3:5 =kde-frameworks/kactivities-5.94*:5 =kde-frameworks/kconfig-5.94*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/kactivities-stats-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=9277d71e6bc40da06794edd90b0bf357
diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.94.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.94.0
deleted file mode 100644
index f05f0af24c9f..000000000000
--- a/metadata/md5-cache/kde-frameworks/kapidox-5.94.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-42.0.2[python_targets_python3_10(-)] )
-DEFINED_PHASES=compile configure install nofetch prepare setup test unpack
-DESCRIPTION=Framework for building KDE API documentation in a standard format and style
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=kde.org distutils-r1
-IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=BSD-2
-RDEPEND=app-doc/doxygen python_single_target_python3_8? ( dev-python/jinja[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/jinja[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/jinja[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] ) media-gfx/graphviz[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/kapidox-5.94.0.tar.xz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	kde.org	916c61efa7151f09c7701328b88cafc1	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=854ddfa7cabb24b12375ed0573f47663
diff --git a/metadata/md5-cache/kde-frameworks/karchive-5.94.0 b/metadata/md5-cache/kde-frameworks/karchive-5.94.0
deleted file mode 100644
index 5b1cc840f7ad..000000000000
--- a/metadata/md5-cache/kde-frameworks/karchive-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=zstd? ( virtual/pkgconfig ) dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=app-arch/bzip2 app-arch/xz-utils sys-libs/zlib zstd? ( app-arch/zstd:= ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for reading, creation, and manipulation of various archive formats
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=+zstd debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=app-arch/bzip2 app-arch/xz-utils sys-libs/zlib zstd? ( app-arch/zstd:= ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/karchive-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=f7a1b4ffc19613f517e8557ea40ddcce
diff --git a/metadata/md5-cache/kde-frameworks/kauth-5.94.0 b/metadata/md5-cache/kde-frameworks/kauth-5.94.0
deleted file mode 100644
index 1592fa792a01..000000000000
--- a/metadata/md5-cache/kde-frameworks/kauth-5.94.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.3:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 =kde-frameworks/kcoreaddons-5.94*:5 policykit? ( >=sys-auth/polkit-qt-0.113.0 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework to let applications perform actions as a privileged user
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=nls +policykit test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2.1+
-PDEPEND=policykit? ( kde-plasma/polkit-kde-agent )
-RDEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 =kde-frameworks/kcoreaddons-5.94*:5 policykit? ( >=sys-auth/polkit-qt-0.113.0 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/kauth-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a39ab68b63b1d8178b27f9a8a1273d13
diff --git a/metadata/md5-cache/kde-frameworks/kbookmarks-5.94.0 b/metadata/md5-cache/kde-frameworks/kbookmarks-5.94.0
deleted file mode 100644
index 65732ccca83f..000000000000
--- a/metadata/md5-cache/kde-frameworks/kbookmarks-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.3:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=dev-qt/qtxml-5.15.3:5 =kde-frameworks/kcodecs-5.94*:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/kiconthemes-5.94*:5 =kde-frameworks/kwidgetsaddons-5.94*:5 =kde-frameworks/kxmlgui-5.94*:5 >=kde-frameworks/kconfigwidgets-5.94:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for managing bookmarks stored in XBEL format
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=dev-qt/qtxml-5.15.3:5 =kde-frameworks/kcodecs-5.94*:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/kiconthemes-5.94*:5 =kde-frameworks/kwidgetsaddons-5.94*:5 =kde-frameworks/kxmlgui-5.94*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/kbookmarks-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a517e5452e3304af051939ebc06e0bb8
diff --git a/metadata/md5-cache/kde-frameworks/kcalendarcore-5.94.0 b/metadata/md5-cache/kde-frameworks/kcalendarcore-5.94.0
deleted file mode 100644
index 04de72e72d02..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcalendarcore-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/bison dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/libical-3.0.5:= >=dev-qt/qtgui-5.15.3:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for interfacing with calendars
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2+ test? ( LGPL-3+ )
-RDEPEND=>=dev-libs/libical-3.0.5:= >=dev-qt/qtgui-5.15.3:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=test !test? ( test ) !test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/kcalendarcore-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d9486d533f576f57d48cfd9ffa94a606
diff --git a/metadata/md5-cache/kde-frameworks/kcmutils-5.94.0 b/metadata/md5-cache/kde-frameworks/kcmutils-5.94.0
deleted file mode 100644
index bf1b974fad3b..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcmutils-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5[widgets] >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 =kde-frameworks/kauth-5.94*:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kconfigwidgets-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/kdeclarative-5.94*:5 =kde-frameworks/kguiaddons-5.94*:5 =kde-frameworks/ki18n-5.94*:5 =kde-frameworks/kitemviews-5.94*:5 =kde-frameworks/kservice-5.94*:5 =kde-frameworks/kwidgetsaddons-5.94*:5 =kde-frameworks/kxmlgui-5.94*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework to work with KDE System Settings modules
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5[widgets] >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 =kde-frameworks/kauth-5.94*:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kconfigwidgets-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/kdeclarative-5.94*:5 =kde-frameworks/kguiaddons-5.94*:5 =kde-frameworks/ki18n-5.94*:5 =kde-frameworks/kitemviews-5.94*:5 =kde-frameworks/kservice-5.94*:5 =kde-frameworks/kwidgetsaddons-5.94*:5 =kde-frameworks/kxmlgui-5.94*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/kcmutils-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=09858a07fcdfcf11559cd2af451e07b3
diff --git a/metadata/md5-cache/kde-frameworks/kcodecs-5.94.0 b/metadata/md5-cache/kde-frameworks/kcodecs-5.94.0
deleted file mode 100644
index 035c984a0b3a..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcodecs-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/gperf nls? ( >=dev-qt/linguist-tools-5.15.3:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for manipulating strings using various encodings
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=nls debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2+ LGPL-2+
-RDEPEND=>=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/kcodecs-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=351f1f7474bd4222f19b9b95fa0e7789
diff --git a/metadata/md5-cache/kde-frameworks/kcompletion-5.94.0 b/metadata/md5-cache/kde-frameworks/kcompletion-5.94.0
deleted file mode 100644
index 6f250703621a..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcompletion-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.3:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kwidgetsaddons-5.94*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for common completion tasks such as filename or URL completion
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=nls test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kwidgetsaddons-5.94*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/kcompletion-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d850be123c7830053d9cf7dee85e80a8
diff --git a/metadata/md5-cache/kde-frameworks/kconfig-5.94.0 b/metadata/md5-cache/kde-frameworks/kconfig-5.94.0
deleted file mode 100644
index 9e38aabaca9f..000000000000
--- a/metadata/md5-cache/kde-frameworks/kconfig-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.3:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtxml-5.15.3:5 dbus? ( >=dev-qt/qtdbus-5.15.3:5 ) qml? ( >=dev-qt/qtdeclarative-5.15.3:5 ) test? ( >=dev-qt/qtconcurrent-5.15.3:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for reading and writing configuration
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=dbus nls qml test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtxml-5.15.3:5 dbus? ( >=dev-qt/qtdbus-5.15.3:5 ) qml? ( >=dev-qt/qtdeclarative-5.15.3:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=test !test? ( test ) !test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/kconfig-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=e54cfadf257b6d9208699063ec067c5d
diff --git a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.94.0 b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.94.0
deleted file mode 100644
index c84fbc48eb10..000000000000
--- a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=man? ( >=kde-frameworks/kdoctools-5.94:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 =kde-frameworks/kauth-5.94*:5 =kde-frameworks/kcodecs-5.94*:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/kguiaddons-5.94*:5 =kde-frameworks/ki18n-5.94*:5 =kde-frameworks/kwidgetsaddons-5.94*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing an assortment of configuration-related widgets
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=+man test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 =kde-frameworks/kauth-5.94*:5 =kde-frameworks/kcodecs-5.94*:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/kguiaddons-5.94*:5 =kde-frameworks/ki18n-5.94*:5 =kde-frameworks/kwidgetsaddons-5.94*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/kconfigwidgets-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=bfa00cb72a9f81c6c2658df471cdc29f
diff --git a/metadata/md5-cache/kde-frameworks/kcontacts-5.94.0 b/metadata/md5-cache/kde-frameworks/kcontacts-5.94.0
deleted file mode 100644
index 58df22089fd0..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcontacts-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.3:5 =kde-frameworks/kcodecs-5.94*:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/ki18n-5.94*:5 test? ( >=dev-qt/qtdeclarative-5.15.3:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Address book API based on KDE Frameworks
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.3:5 =kde-frameworks/kcodecs-5.94*:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/ki18n-5.94*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/kcontacts-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=7f6ef7cce072199d0c100d382763c9cf
diff --git a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.94.0 b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.94.0
deleted file mode 100644
index c22bedfa1ea8..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.3:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtcore-5.15.3:5[icu] fam? ( virtual/fam ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for solving common problems such as caching, randomisation, and more
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org xdg-utils
-IUSE=fam nls debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtcore-5.15.3:5[icu] fam? ( virtual/fam ) nls? ( >=dev-qt/qttranslations-5.15.3:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/kcoreaddons-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=419019e277ba5f0d5ee0d9a2206a3d0b
diff --git a/metadata/md5-cache/kde-frameworks/kcrash-5.94.0 b/metadata/md5-cache/kde-frameworks/kcrash-5.94.0
deleted file mode 100644
index 72a9c4cd9cda..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcrash-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.3:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.3:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/kwindowsystem-5.94*:5 X? ( >=dev-qt/qtx11extras-5.15.3:5 x11-libs/libX11 ) X? ( x11-base/xorg-proto ) test? ( >=dev-qt/qtwidgets-5.15.3:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for intercepting and handling application crashes
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=nls X test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.3:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/kwindowsystem-5.94*:5 X? ( >=dev-qt/qtx11extras-5.15.3:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=test !test? ( test ) !test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/kcrash-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=654bb43b2bbe370943025238955390c0
diff --git a/metadata/md5-cache/kde-frameworks/kdav-5.94.0 b/metadata/md5-cache/kde-frameworks/kdav-5.94.0
deleted file mode 100644
index 7d10ef2ef646..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdav-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtxml-5.15.3:5 >=kde-frameworks/kcoreaddons-5.94:5 >=kde-frameworks/ki18n-5.94:5 >=kde-frameworks/kio-5.94:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=DAV protocol implemention with KJobs
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtxml-5.15.3:5 >=kde-frameworks/kcoreaddons-5.94:5 >=kde-frameworks/ki18n-5.94:5 >=kde-frameworks/kio-5.94:5 !kde-apps/kdav:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/kdav-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=f071219c37bda9dfe6aca4ed58a1ee87
diff --git a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.94.0 b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.94.0
deleted file mode 100644
index 41b22b2a8957..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.3:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.3:5 X? ( >=dev-qt/qtx11extras-5.15.3:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for registering services and applications per freedesktop standards
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=nls X debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.3:5 X? ( >=dev-qt/qtx11extras-5.15.3:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/kdbusaddons-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=0da3badd9c1c8bd7a934202f9d485d75
diff --git a/metadata/md5-cache/kde-frameworks/kdeclarative-5.94.0 b/metadata/md5-cache/kde-frameworks/kdeclarative-5.94.0
deleted file mode 100644
index 2697177f5175..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdeclarative-5.94.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtnetwork-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/kglobalaccel-5.94*:5 =kde-frameworks/ki18n-5.94*:5 =kde-frameworks/kiconthemes-5.94*:5 =kde-frameworks/kio-5.94*:5 =kde-frameworks/knotifications-5.94*:5 =kde-frameworks/kpackage-5.94*:5 =kde-frameworks/kservice-5.94*:5 =kde-frameworks/kwidgetsaddons-5.94*:5 =kde-frameworks/kwindowsystem-5.94*:5 media-libs/libepoxy doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing integration of QML and KDE work spaces
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtnetwork-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/kglobalaccel-5.94*:5 =kde-frameworks/ki18n-5.94*:5 =kde-frameworks/kiconthemes-5.94*:5 =kde-frameworks/kio-5.94*:5 =kde-frameworks/knotifications-5.94*:5 =kde-frameworks/kpackage-5.94*:5 =kde-frameworks/kservice-5.94*:5 =kde-frameworks/kwidgetsaddons-5.94*:5 =kde-frameworks/kwindowsystem-5.94*:5 media-libs/libepoxy >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/kdeclarative-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=bbb3e944e6b0deaab6ef7490a096249e
diff --git a/metadata/md5-cache/kde-frameworks/kded-5.94.0 b/metadata/md5-cache/kde-frameworks/kded-5.94.0
deleted file mode 100644
index 54da195a0e27..000000000000
--- a/metadata/md5-cache/kde-frameworks/kded-5.94.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=man? ( >=kde-frameworks/kdoctools-5.94:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/kcrash-5.94*:5 =kde-frameworks/kdbusaddons-5.94*:5 =kde-frameworks/kinit-5.94*:5 =kde-frameworks/kservice-5.94*:5 dev-qt/qtcore:5
-DESCRIPTION=Central daemon of KDE workspaces
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=+man debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/kcrash-5.94*:5 =kde-frameworks/kdbusaddons-5.94*:5 =kde-frameworks/kinit-5.94*:5 =kde-frameworks/kservice-5.94*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/kded-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a9a8618aaa6f2907d4d3b609d92b0fc6
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.94.0 b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.94.0
deleted file mode 100644
index ba6681d2a43f..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl dev-perl/URI dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.94:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=app-text/docbook-xml-dtd:4.2 dev-libs/openssl:0 >=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtnetwork-5.15.3:5[ssl] >=dev-qt/qtprintsupport-5.15.3:5 >=dev-qt/qtsvg-5.15.3:5 >=dev-qt/qttest-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 =kde-frameworks/kauth-5.94*:5 =kde-frameworks/kcodecs-5.94*:5 =kde-frameworks/kcompletion-5.94*:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kconfigwidgets-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/kcrash-5.94*:5 =kde-frameworks/kdbusaddons-5.94*:5 >=kde-frameworks/kded-5.94:5 =kde-frameworks/kdoctools-5.94*:5 =kde-frameworks/kemoticons-5.94*:5 =kde-frameworks/kglobalaccel-5.94*:5 =kde-frameworks/kguiaddons-5.94*:5 =kde-frameworks/ki18n-5.94*:5 =kde-frameworks/kiconthemes-5.94*:5 =kde-frameworks/kio-5.94*:5 =kde-frameworks/kitemviews-5.94*:5 =kde-frameworks/kjobwidgets-5.94*:5 =kde-frameworks/knotifications-5.94*:5[X=] =kde-frameworks/kparts-5.94*:5 =kde-frameworks/kservice-5.94*:5 =kde-frameworks/ktextwidgets-5.94*:5 =kde-frameworks/kunitconversion-5.94*:5 =kde-frameworks/kwidgetsaddons-5.94*:5 =kde-frameworks/kwindowsystem-5.94*:5[X=] =kde-frameworks/kxmlgui-5.94*:5 =kde-frameworks/solid-5.94*:5 virtual/libintl X? ( >=dev-qt/qtx11extras-5.15.3:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb ) test? ( >=dev-qt/qtconcurrent-5.15.3:5 ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework easing the development transition from KDELibs 4 to KF 5
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=X test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=app-text/docbook-xml-dtd:4.2 dev-libs/openssl:0 >=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtnetwork-5.15.3:5[ssl] >=dev-qt/qtprintsupport-5.15.3:5 >=dev-qt/qtsvg-5.15.3:5 >=dev-qt/qttest-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 =kde-frameworks/kauth-5.94*:5 =kde-frameworks/kcodecs-5.94*:5 =kde-frameworks/kcompletion-5.94*:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kconfigwidgets-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/kcrash-5.94*:5 =kde-frameworks/kdbusaddons-5.94*:5 >=kde-frameworks/kded-5.94:5 =kde-frameworks/kdoctools-5.94*:5 =kde-frameworks/kemoticons-5.94*:5 =kde-frameworks/kglobalaccel-5.94*:5 =kde-frameworks/kguiaddons-5.94*:5 =kde-frameworks/ki18n-5.94*:5 =kde-frameworks/kiconthemes-5.94*:5 =kde-frameworks/kio-5.94*:5 =kde-frameworks/kitemviews-5.94*:5 =kde-frameworks/kjobwidgets-5.94*:5 =kde-frameworks/knotifications-5.94*:5[X=] =kde-frameworks/kparts-5.94*:5 =kde-frameworks/kservice-5.94*:5 =kde-frameworks/ktextwidgets-5.94*:5 =kde-frameworks/kunitconversion-5.94*:5 =kde-frameworks/kwidgetsaddons-5.94*:5 =kde-frameworks/kwindowsystem-5.94*:5[X=] =kde-frameworks/kxmlgui-5.94*:5 =kde-frameworks/solid-5.94*:5 virtual/libintl X? ( >=dev-qt/qtx11extras-5.15.3:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb ) >=dev-qt/qtxml-5.15.3:5 >=kde-frameworks/countryflags-5.94:5 =kde-frameworks/kinit-5.94*:5 =kde-frameworks/kitemmodels-5.94*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=test !test? ( test ) !test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/portingAids/kdelibs4support-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=4f5b1561cfc89b45f64626569e220ce6
diff --git a/metadata/md5-cache/kde-frameworks/kdesu-5.94.0 b/metadata/md5-cache/kde-frameworks/kdesu-5.94.0
deleted file mode 100644
index 90b04a32106e..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdesu-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/ki18n-5.94*:5 =kde-frameworks/kpty-5.94*:5 X? ( x11-libs/libX11 ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework to handle super user actions
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=X debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2
-RDEPEND==kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/ki18n-5.94*:5 =kde-frameworks/kpty-5.94*:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/kdesu-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=6b6fc495ae1a09108ce62b81cfa93825
diff --git a/metadata/md5-cache/kde-frameworks/kdnssd-5.94.0 b/metadata/md5-cache/kde-frameworks/kdnssd-5.94.0
deleted file mode 100644
index 1494915984bf..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdnssd-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.3:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtnetwork-5.15.3:5 zeroconf? ( >=dev-qt/qtdbus-5.15.3:5 net-dns/avahi[mdnsresponder-compat] ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for network service discovery using Zeroconf
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=nls zeroconf debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtnetwork-5.15.3:5 zeroconf? ( >=dev-qt/qtdbus-5.15.3:5 net-dns/avahi[mdnsresponder-compat] ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/kdnssd-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ba90345bc111e1d38aca76f233beb437
diff --git a/metadata/md5-cache/kde-frameworks/kdoctools-5.94.0 b/metadata/md5-cache/kde-frameworks/kdoctools-5.94.0
deleted file mode 100644
index 399bfc2d86e4..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdoctools-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl dev-perl/URI nls? ( >=kde-frameworks/ki18n-5.94:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt =kde-frameworks/karchive-5.94*:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Tools to generate documentation in various formats from DocBook files
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=nls debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt =kde-frameworks/karchive-5.94*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/kdoctools-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=46a22001b50adc620fa41c7e769aed5c
diff --git a/metadata/md5-cache/kde-frameworks/kemoticons-5.94.0 b/metadata/md5-cache/kde-frameworks/kemoticons-5.94.0
deleted file mode 100644
index 751f46e2e793..000000000000
--- a/metadata/md5-cache/kde-frameworks/kemoticons-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtxml-5.15.3:5 =kde-frameworks/karchive-5.94*:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/kservice-5.94*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for converting text emoticons to graphical representations
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtxml-5.15.3:5 =kde-frameworks/karchive-5.94*:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/kservice-5.94*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=test !test? ( test ) !test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/kemoticons-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d836cc8e95ab01787a34a24b2bd9b107
diff --git a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.94.0 b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.94.0
deleted file mode 100644
index cc0f306bc847..000000000000
--- a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) ) dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtxml-5.15.3:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/ki18n-5.94*:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( media-video/ffmpeg:0= ) mobi? ( kde-apps/kdegraphics-mobipocket:5 ) office? ( =kde-frameworks/karchive-5.94*:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) kernel_linux? ( sys-apps/attr ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for extracting file metadata
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org optfeature python-any-r1
-IUSE=epub exif ffmpeg mobi office pdf taglib debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtxml-5.15.3:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/ki18n-5.94*:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( media-video/ffmpeg:0= ) mobi? ( kde-apps/kdegraphics-mobipocket:5 ) office? ( =kde-frameworks/karchive-5.94*:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=test !test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/kfilemetadata-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b02662834de33d5efb9fd4dad8942215
diff --git a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.94.0 b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.94.0
deleted file mode 100644
index 20db9ffc2c49..000000000000
--- a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.3:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=dev-qt/qtx11extras-5.15.3:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/kcrash-5.94*:5 =kde-frameworks/kdbusaddons-5.94*:5 =kde-frameworks/kwindowsystem-5.94*:5[X] x11-libs/libxcb x11-libs/xcb-util-keysyms test? ( >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtquickcontrols2-5.15.3:5 =kde-frameworks/kdeclarative-5.94*:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework to handle global shortcuts
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=dev-qt/qtx11extras-5.15.3:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/kcrash-5.94*:5 =kde-frameworks/kdbusaddons-5.94*:5 =kde-frameworks/kwindowsystem-5.94*:5[X] x11-libs/libxcb x11-libs/xcb-util-keysyms >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=test !test? ( test ) !test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/kglobalaccel-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=61cf43d90501e5e633104bacc02f053e
diff --git a/metadata/md5-cache/kde-frameworks/kguiaddons-5.94.0 b/metadata/md5-cache/kde-frameworks/kguiaddons-5.94.0
deleted file mode 100644
index bf6e256456e3..000000000000
--- a/metadata/md5-cache/kde-frameworks/kguiaddons-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=wayland? ( >=dev-qt/qtwaylandscanner-5.15.3:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.3:5 wayland? ( dev-libs/wayland >=dev-qt/qtgui-5.15.3:5=[wayland] >=dev-qt/qtwayland-5.15.3:5 ) X? ( >=dev-qt/qtx11extras-5.15.3:5 x11-libs/libX11 ) x11-base/xorg-proto wayland? ( >=dev-libs/plasma-wayland-protocols-1.7.0 ) X? ( x11-libs/libxcb ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing assorted high-level user interface components
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=wayland X test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.3:5 wayland? ( dev-libs/wayland >=dev-qt/qtgui-5.15.3:5=[wayland] >=dev-qt/qtwayland-5.15.3:5 ) X? ( >=dev-qt/qtx11extras-5.15.3:5 x11-libs/libX11 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/kguiaddons-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c11053cd6bb310c78ba6105eab5c9f4a
diff --git a/metadata/md5-cache/kde-frameworks/kholidays-5.94.0 b/metadata/md5-cache/kde-frameworks/kholidays-5.94.0
deleted file mode 100644
index c1bb0d972272..000000000000
--- a/metadata/md5-cache/kde-frameworks/kholidays-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.3:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.3:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library to determine holidays and other special events for a geographical region
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=nls debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtdeclarative-5.15.3:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/kholidays-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=0701d7a6e4bd4a8f7ff319ba8a99eae9
diff --git a/metadata/md5-cache/kde-frameworks/khtml-5.94.0 b/metadata/md5-cache/kde-frameworks/khtml-5.94.0
deleted file mode 100644
index 5d48e296a40e..000000000000
--- a/metadata/md5-cache/kde-frameworks/khtml-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl dev-util/gperf dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/openssl:0 >=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtnetwork-5.15.3:5[ssl] >=dev-qt/qtprintsupport-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=dev-qt/qtxml-5.15.3:5 =kde-frameworks/karchive-5.94*:5 =kde-frameworks/kcodecs-5.94*:5 =kde-frameworks/kcompletion-5.94*:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kconfigwidgets-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/kglobalaccel-5.94*:5 =kde-frameworks/ki18n-5.94*:5 =kde-frameworks/kiconthemes-5.94*:5 =kde-frameworks/kio-5.94*:5 =kde-frameworks/kjobwidgets-5.94*:5 =kde-frameworks/kjs-5.94*:5 =kde-frameworks/knotifications-5.94*:5 =kde-frameworks/kparts-5.94*:5 =kde-frameworks/kservice-5.94*:5 =kde-frameworks/ktextwidgets-5.94*:5 =kde-frameworks/kwallet-5.94*:5 =kde-frameworks/kwidgetsaddons-5.94*:5 =kde-frameworks/kwindowsystem-5.94*:5 =kde-frameworks/kxmlgui-5.94*:5 =kde-frameworks/sonnet-5.94*:5 media-libs/giflib:= media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/phonon-4.11.0 sys-libs/zlib X? ( >=dev-qt/qtx11extras-5.15.3:5 x11-libs/libX11 ) test? ( >=dev-qt/qtx11extras-5.15.3:5 ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KHTML web rendering engine
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=X test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2
-RDEPEND=dev-libs/openssl:0 >=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtnetwork-5.15.3:5[ssl] >=dev-qt/qtprintsupport-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=dev-qt/qtxml-5.15.3:5 =kde-frameworks/karchive-5.94*:5 =kde-frameworks/kcodecs-5.94*:5 =kde-frameworks/kcompletion-5.94*:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kconfigwidgets-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/kglobalaccel-5.94*:5 =kde-frameworks/ki18n-5.94*:5 =kde-frameworks/kiconthemes-5.94*:5 =kde-frameworks/kio-5.94*:5 =kde-frameworks/kjobwidgets-5.94*:5 =kde-frameworks/kjs-5.94*:5 =kde-frameworks/knotifications-5.94*:5 =kde-frameworks/kparts-5.94*:5 =kde-frameworks/kservice-5.94*:5 =kde-frameworks/ktextwidgets-5.94*:5 =kde-frameworks/kwallet-5.94*:5 =kde-frameworks/kwidgetsaddons-5.94*:5 =kde-frameworks/kwindowsystem-5.94*:5 =kde-frameworks/kxmlgui-5.94*:5 =kde-frameworks/sonnet-5.94*:5 media-libs/giflib:= media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/phonon-4.11.0 sys-libs/zlib X? ( >=dev-qt/qtx11extras-5.15.3:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/portingAids/khtml-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=f0d8d7b46861056d341e41a7affab4a1
diff --git a/metadata/md5-cache/kde-frameworks/ki18n-5.94.0 b/metadata/md5-cache/kde-frameworks/ki18n-5.94.0
deleted file mode 100644
index b92287cb8bd8..000000000000
--- a/metadata/md5-cache/kde-frameworks/ki18n-5.94.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-qt/qtdeclarative-5.15.3:5 sys-devel/gettext virtual/libintl test? ( >=dev-qt/qtconcurrent-5.15.3:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework based on Gettext for internationalizing user interface text
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org python-single-r1
-IUSE=debug doc test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-qt/qtdeclarative-5.15.3:5 sys-devel/gettext virtual/libintl app-text/iso-codes >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/ki18n-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=4d4556a20de87dbd42fc84f5a934072c
diff --git a/metadata/md5-cache/kde-frameworks/kiconthemes-5.94.0 b/metadata/md5-cache/kde-frameworks/kiconthemes-5.94.0
deleted file mode 100644
index 23377b2cea54..000000000000
--- a/metadata/md5-cache/kde-frameworks/kiconthemes-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtsvg-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 =kde-frameworks/karchive-5.94*:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kconfigwidgets-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/ki18n-5.94*:5 =kde-frameworks/kitemviews-5.94*:5 =kde-frameworks/kwidgetsaddons-5.94*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for icon theming and configuration
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtsvg-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 =kde-frameworks/karchive-5.94*:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kconfigwidgets-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/ki18n-5.94*:5 =kde-frameworks/kitemviews-5.94*:5 =kde-frameworks/kwidgetsaddons-5.94*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=test !test? ( test ) !test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/kiconthemes-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=973d13170038bb96266be3520fc6a003
diff --git a/metadata/md5-cache/kde-frameworks/kidletime-5.94.0 b/metadata/md5-cache/kde-frameworks/kidletime-5.94.0
deleted file mode 100644
index 7286fa0e8a44..000000000000
--- a/metadata/md5-cache/kde-frameworks/kidletime-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.3:5 X? ( >=dev-qt/qtx11extras-5.15.3:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.15.3:5 x11-libs/libXScrnSaver ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for detection and notification of device idle time
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=X xscreensaver debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.3:5 X? ( >=dev-qt/qtx11extras-5.15.3:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.15.3:5 x11-libs/libXScrnSaver ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-REQUIRED_USE=xscreensaver? ( X )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/kidletime-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=8d0159b8767a9e40bf54e75218d915b7
diff --git a/metadata/md5-cache/kde-frameworks/kimageformats-5.94.0 b/metadata/md5-cache/kde-frameworks/kimageformats-5.94.0
deleted file mode 100644
index 3662bfa56bb7..000000000000
--- a/metadata/md5-cache/kde-frameworks/kimageformats-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.3:5 =kde-frameworks/karchive-5.94*:5 avif? ( >=media-libs/libavif-0.8.2:= ) eps? ( >=dev-qt/qtprintsupport-5.15.3:5 ) heif? ( >=media-libs/libheif-1.10.0:= ) jpegxl? ( media-libs/libjxl ) openexr? ( >=media-libs/openexr-3:= ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing additional format plugins for Qt's image I/O system
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=avif eps heif jpegxl openexr test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.3:5 =kde-frameworks/karchive-5.94*:5 avif? ( >=media-libs/libavif-0.8.2:= ) eps? ( >=dev-qt/qtprintsupport-5.15.3:5 ) heif? ( >=media-libs/libheif-1.10.0:= ) jpegxl? ( media-libs/libjxl ) openexr? ( >=media-libs/openexr-3:= ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/kimageformats-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=020f88b9e8893ac73ad9f4a3d72e6ff2
diff --git a/metadata/md5-cache/kde-frameworks/kinit-5.94.0 b/metadata/md5-cache/kde-frameworks/kinit-5.94.0
deleted file mode 100644
index d844da48a165..000000000000
--- a/metadata/md5-cache/kde-frameworks/kinit-5.94.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=man? ( >=kde-frameworks/kdoctools-5.94:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/kcrash-5.94*:5 =kde-frameworks/kdbusaddons-5.94*:5 =kde-frameworks/ki18n-5.94*:5 =kde-frameworks/kio-5.94*:5 =kde-frameworks/kservice-5.94*:5 =kde-frameworks/kwindowsystem-5.94*:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) X? ( x11-base/xorg-proto ) dev-qt/qtcore:5
-DESCRIPTION=Helper library to speed up start of applications on KDE work spaces
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=+caps +man X debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/kcrash-5.94*:5 =kde-frameworks/kdbusaddons-5.94*:5 =kde-frameworks/ki18n-5.94*:5 =kde-frameworks/kio-5.94*:5 =kde-frameworks/kservice-5.94*:5 =kde-frameworks/kwindowsystem-5.94*:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/kinit-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=936e8d466046196b81cb127a94dda4d2
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.94.0 b/metadata/md5-cache/kde-frameworks/kio-5.94.0
deleted file mode 100644
index 3131216ebff8..000000000000
--- a/metadata/md5-cache/kde-frameworks/kio-5.94.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtnetwork-5.15.3:5[ssl] >=dev-qt/qtwidgets-5.15.3:5 >=dev-qt/qtxml-5.15.3:5 =kde-frameworks/kauth-5.94*:5 =kde-frameworks/karchive-5.94*:5 =kde-frameworks/kbookmarks-5.94*:5 =kde-frameworks/kcodecs-5.94*:5 =kde-frameworks/kcompletion-5.94*:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kconfigwidgets-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/kcrash-5.94*:5 =kde-frameworks/kdbusaddons-5.94*:5 =kde-frameworks/kguiaddons-5.94*:5 =kde-frameworks/ki18n-5.94*:5 =kde-frameworks/kiconthemes-5.94*:5 =kde-frameworks/kitemviews-5.94*:5 =kde-frameworks/kjobwidgets-5.94*:5 =kde-frameworks/knotifications-5.94*:5 =kde-frameworks/kservice-5.94*:5 =kde-frameworks/ktextwidgets-5.94*:5 =kde-frameworks/kwidgetsaddons-5.94*:5 =kde-frameworks/kwindowsystem-5.94*:5 =kde-frameworks/kxmlgui-5.94*:5 =kde-frameworks/solid-5.94*:5 acl? ( sys-apps/attr virtual/acl ) handbook? ( =kde-frameworks/kdoctools-5.94*:5 ) kerberos? ( virtual/krb5 ) kwallet? ( =kde-frameworks/kwallet-5.94*:5 ) X? ( >=dev-qt/qtx11extras-5.15.3:5 ) >=dev-qt/qtconcurrent-5.15.3:5 test? ( sys-libs/zlib ) X? ( x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing transparent file and data management
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org xdg-utils
-IUSE=acl +handbook kerberos +kwallet X test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-PDEPEND=>=kde-frameworks/kded-5.94:5
-RDEPEND=dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtnetwork-5.15.3:5[ssl] >=dev-qt/qtwidgets-5.15.3:5 >=dev-qt/qtxml-5.15.3:5 =kde-frameworks/kauth-5.94*:5 =kde-frameworks/karchive-5.94*:5 =kde-frameworks/kbookmarks-5.94*:5 =kde-frameworks/kcodecs-5.94*:5 =kde-frameworks/kcompletion-5.94*:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kconfigwidgets-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/kcrash-5.94*:5 =kde-frameworks/kdbusaddons-5.94*:5 =kde-frameworks/kguiaddons-5.94*:5 =kde-frameworks/ki18n-5.94*:5 =kde-frameworks/kiconthemes-5.94*:5 =kde-frameworks/kitemviews-5.94*:5 =kde-frameworks/kjobwidgets-5.94*:5 =kde-frameworks/knotifications-5.94*:5 =kde-frameworks/kservice-5.94*:5 =kde-frameworks/ktextwidgets-5.94*:5 =kde-frameworks/kwidgetsaddons-5.94*:5 =kde-frameworks/kwindowsystem-5.94*:5 =kde-frameworks/kxmlgui-5.94*:5 =kde-frameworks/solid-5.94*:5 acl? ( sys-apps/attr virtual/acl ) handbook? ( =kde-frameworks/kdoctools-5.94*:5 ) kerberos? ( virtual/krb5 ) kwallet? ( =kde-frameworks/kwallet-5.94*:5 ) X? ( >=dev-qt/qtx11extras-5.15.3:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=test !test? ( test ) !test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/kio-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d16722431a1cc42eb19e27a695ec429e
diff --git a/metadata/md5-cache/kde-frameworks/kirigami-5.94.0 b/metadata/md5-cache/kde-frameworks/kirigami-5.94.0
deleted file mode 100644
index 238c079e4244..000000000000
--- a/metadata/md5-cache/kde-frameworks/kirigami-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-qt/linguist-tools-5.15.3:5 dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtconcurrent-5.15.3:5 >=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtnetwork-5.15.3:5 >=dev-qt/qtquickcontrols2-5.15.3:5 >=dev-qt/qtsvg-5.15.3:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Lightweight user interface framework for mobile and convergent applications
-EAPI=8
-HOMEPAGE=https://techbase.kde.org/Kirigami
-INHERIT=ecm kde.org
-IUSE=debug examples test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtconcurrent-5.15.3:5 >=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtnetwork-5.15.3:5 >=dev-qt/qtquickcontrols2-5.15.3:5 >=dev-qt/qtsvg-5.15.3:5 >=dev-qt/qtgraphicaleffects-5.15.3:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=test !test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/kirigami2-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=bb5df9ba4400779b1bd28f7dc7f35b61
diff --git a/metadata/md5-cache/kde-frameworks/kitemmodels-5.94.0 b/metadata/md5-cache/kde-frameworks/kitemmodels-5.94.0
deleted file mode 100644
index 6c87b94706ae..000000000000
--- a/metadata/md5-cache/kde-frameworks/kitemmodels-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=qml? ( >=dev-qt/qtdeclarative-5.15.3:5 ) test? ( >=dev-qt/qtwidgets-5.15.3:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing data models to help with tasks such as sorting and filtering
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=qml test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=qml? ( >=dev-qt/qtdeclarative-5.15.3:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/kitemmodels-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a1ff56892c2c8f6fd69a313b44b27a4f
diff --git a/metadata/md5-cache/kde-frameworks/kitemviews-5.94.0 b/metadata/md5-cache/kde-frameworks/kitemviews-5.94.0
deleted file mode 100644
index f68b278dfe06..000000000000
--- a/metadata/md5-cache/kde-frameworks/kitemviews-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.3:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing additional widgets for item models
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=nls test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/kitemviews-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=29ce28f698176fd33210dc4edfc4b4f2
diff --git a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.94.0 b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.94.0
deleted file mode 100644
index 716949c49eb8..000000000000
--- a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.3:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/kwidgetsaddons-5.94*:5 X? ( >=dev-qt/qtx11extras-5.15.3:5 ) X? ( x11-base/xorg-proto x11-libs/libX11 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing assorted widgets for showing the progress of jobs
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=nls X debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/kwidgetsaddons-5.94*:5 X? ( >=dev-qt/qtx11extras-5.15.3:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/kjobwidgets-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=9613278ba3eaaafc3981e56e0efdb6a9
diff --git a/metadata/md5-cache/kde-frameworks/kjs-5.94.0 b/metadata/md5-cache/kde-frameworks/kjs-5.94.0
deleted file mode 100644
index 19c75ade443a..000000000000
--- a/metadata/md5-cache/kde-frameworks/kjs-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.94:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libpcre test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=ECMAScipt compatible parser and engine
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=BSD-2 LGPL-2+
-RDEPEND=dev-libs/libpcre >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/portingAids/kjs-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=327f38b60e1602264b990c8573a3b4e5
diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.94.0-r1 b/metadata/md5-cache/kde-frameworks/knewstuff-5.94.0-r1
deleted file mode 100644
index c74550c68039..000000000000
--- a/metadata/md5-cache/kde-frameworks/knewstuff-5.94.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtnetwork-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=dev-qt/qtxml-5.15.3:5 =kde-frameworks/attica-5.94*:5 =kde-frameworks/karchive-5.94*:5 =kde-frameworks/kcompletion-5.94*:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/ki18n-5.94*:5 =kde-frameworks/kiconthemes-5.94*:5 =kde-frameworks/kio-5.94*:5 =kde-frameworks/kitemviews-5.94*:5 =kde-frameworks/kpackage-5.94*:5 =kde-frameworks/kservice-5.94*:5 =kde-frameworks/ktextwidgets-5.94*:5 =kde-frameworks/kwidgetsaddons-5.94*:5 =kde-frameworks/kxmlgui-5.94*:5 opds? ( =kde-frameworks/syndication-5.94*:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for downloading and sharing additional application data
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=opds debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtnetwork-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=dev-qt/qtxml-5.15.3:5 =kde-frameworks/attica-5.94*:5 =kde-frameworks/karchive-5.94*:5 =kde-frameworks/kcompletion-5.94*:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/ki18n-5.94*:5 =kde-frameworks/kiconthemes-5.94*:5 =kde-frameworks/kio-5.94*:5 =kde-frameworks/kitemviews-5.94*:5 =kde-frameworks/kpackage-5.94*:5 =kde-frameworks/kservice-5.94*:5 =kde-frameworks/ktextwidgets-5.94*:5 =kde-frameworks/kwidgetsaddons-5.94*:5 =kde-frameworks/kxmlgui-5.94*:5 opds? ( =kde-frameworks/syndication-5.94*:5 ) >=kde-frameworks/kirigami-5.94:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/knewstuff-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=fd8307df58357e583bdd73662e67fff1
diff --git a/metadata/md5-cache/kde-frameworks/knotifications-5.94.0 b/metadata/md5-cache/kde-frameworks/knotifications-5.94.0
deleted file mode 100644
index 9343c8f51f30..000000000000
--- a/metadata/md5-cache/kde-frameworks/knotifications-5.94.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.3:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/kwindowsystem-5.94*:5[X=] dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) !phonon? ( media-libs/libcanberra ) phonon? ( >=media-libs/phonon-4.11.0 ) qml? ( >=dev-qt/qtdeclarative-5.15.3:5 ) speech? ( >=dev-qt/qtspeech-5.15.3:5 ) X? ( >=dev-qt/qtx11extras-5.15.3:5 x11-libs/libX11 x11-libs/libXtst ) X? ( x11-base/xorg-proto ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for notifying the user of an event
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=dbus nls phonon qml speech X debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/kwindowsystem-5.94*:5[X=] dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) !phonon? ( media-libs/libcanberra ) phonon? ( >=media-libs/phonon-4.11.0 ) qml? ( >=dev-qt/qtdeclarative-5.15.3:5 ) speech? ( >=dev-qt/qtspeech-5.15.3:5 ) X? ( >=dev-qt/qtx11extras-5.15.3:5 x11-libs/libX11 x11-libs/libXtst ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/knotifications-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=f4a2cb509ede14fb851fe64a05f51b56
diff --git a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.94.0 b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.94.0
deleted file mode 100644
index c611ca49821d..000000000000
--- a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.94.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 =kde-frameworks/kcompletion-5.94*:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/ki18n-5.94*:5 =kde-frameworks/kio-5.94*:5 !phonon? ( media-libs/libcanberra ) phonon? ( >=media-libs/phonon-4.11.0 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for configuring desktop notifications
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=phonon debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 =kde-frameworks/kcompletion-5.94*:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/ki18n-5.94*:5 =kde-frameworks/kio-5.94*:5 !phonon? ( media-libs/libcanberra ) phonon? ( >=media-libs/phonon-4.11.0 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/knotifyconfig-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d05f5dc434d19fe2d526e18b26e5944f
diff --git a/metadata/md5-cache/kde-frameworks/kpackage-5.94.0 b/metadata/md5-cache/kde-frameworks/kpackage-5.94.0
deleted file mode 100644
index d83af44ee97e..000000000000
--- a/metadata/md5-cache/kde-frameworks/kpackage-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=man? ( >=kde-frameworks/kdoctools-5.94:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.3:5 =kde-frameworks/karchive-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/ki18n-5.94*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework to install and load packages of non binary content
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=man debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.3:5 =kde-frameworks/karchive-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/ki18n-5.94*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/kpackage-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b685d96c081d8e8dfc8fbddef2d3df4f
diff --git a/metadata/md5-cache/kde-frameworks/kparts-5.94.0 b/metadata/md5-cache/kde-frameworks/kparts-5.94.0
deleted file mode 100644
index 25c5a99c49e1..000000000000
--- a/metadata/md5-cache/kde-frameworks/kparts-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=dev-qt/qtxml-5.15.3:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/ki18n-5.94*:5 =kde-frameworks/kiconthemes-5.94*:5 =kde-frameworks/kio-5.94*:5 =kde-frameworks/kjobwidgets-5.94*:5 =kde-frameworks/kservice-5.94*:5 =kde-frameworks/kwidgetsaddons-5.94*:5 =kde-frameworks/kxmlgui-5.94*:5 >=kde-frameworks/ktextwidgets-5.94:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing elaborate user-interface components
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=dev-qt/qtxml-5.15.3:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/ki18n-5.94*:5 =kde-frameworks/kiconthemes-5.94*:5 =kde-frameworks/kio-5.94*:5 =kde-frameworks/kjobwidgets-5.94*:5 =kde-frameworks/kservice-5.94*:5 =kde-frameworks/kwidgetsaddons-5.94*:5 =kde-frameworks/kxmlgui-5.94*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/kparts-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=50d7e1b3cf7e6011ea8f07411471c3e2
diff --git a/metadata/md5-cache/kde-frameworks/kpeople-5.94.0 b/metadata/md5-cache/kde-frameworks/kpeople-5.94.0
deleted file mode 100644
index 93d76abe88e8..000000000000
--- a/metadata/md5-cache/kde-frameworks/kpeople-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtsql-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/ki18n-5.94*:5 =kde-frameworks/kitemviews-5.94*:5 =kde-frameworks/kwidgetsaddons-5.94*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE contact person abstraction library
-EAPI=8
-HOMEPAGE=https://invent.kde.org/frameworks/kpeople
-INHERIT=ecm kde.org
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtsql-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/ki18n-5.94*:5 =kde-frameworks/kitemviews-5.94*:5 =kde-frameworks/kwidgetsaddons-5.94*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/kpeople-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=4d13d085407836ca0b90888ed38ed59f
diff --git a/metadata/md5-cache/kde-frameworks/kplotting-5.94.0 b/metadata/md5-cache/kde-frameworks/kplotting-5.94.0
deleted file mode 100644
index 3f5b44148c21..000000000000
--- a/metadata/md5-cache/kde-frameworks/kplotting-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing easy data-plotting functions
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/kplotting-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=faa8c85f70497a831a32bdeba7c87397
diff --git a/metadata/md5-cache/kde-frameworks/kpty-5.94.0 b/metadata/md5-cache/kde-frameworks/kpty-5.94.0
deleted file mode 100644
index d4b9c0d63267..000000000000
--- a/metadata/md5-cache/kde-frameworks/kpty-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/ki18n-5.94*:5 sys-libs/libutempter test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for pseudo terminal devices and running child processes
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND==kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/ki18n-5.94*:5 sys-libs/libutempter >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/kpty-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=bc2430a226a7bf433567f07f50f2ef04
diff --git a/metadata/md5-cache/kde-frameworks/kquickcharts-5.94.0 b/metadata/md5-cache/kde-frameworks/kquickcharts-5.94.0
deleted file mode 100644
index 1db6b6967e48..000000000000
--- a/metadata/md5-cache/kde-frameworks/kquickcharts-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtquickcontrols2-5.15.3:5 examples? ( >=dev-qt/qtwidgets-5.15.3:5 =kde-frameworks/kdeclarative-5.94*:5 =kde-frameworks/kirigami-5.94*:5 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=QtQuick plugin providing high-performance charts
-EAPI=8
-HOMEPAGE=https://invent.kde.org/frameworks/kquickcharts
-INHERIT=ecm kde.org
-IUSE=test debug examples test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtquickcontrols2-5.15.3:5 examples? ( >=dev-qt/qtwidgets-5.15.3:5 =kde-frameworks/kdeclarative-5.94*:5 =kde-frameworks/kirigami-5.94*:5 ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/kquickcharts-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=83e4763bb6726724681d35856699e8b8
diff --git a/metadata/md5-cache/kde-frameworks/kross-5.94.0 b/metadata/md5-cache/kde-frameworks/kross-5.94.0
deleted file mode 100644
index aaf0b9f2d60d..000000000000
--- a/metadata/md5-cache/kde-frameworks/kross-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.94:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtscript-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=dev-qt/qtxml-5.15.3:5 =kde-frameworks/kcompletion-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/ki18n-5.94*:5 =kde-frameworks/kiconthemes-5.94*:5 =kde-frameworks/kio-5.94*:5 =kde-frameworks/kparts-5.94*:5 =kde-frameworks/kwidgetsaddons-5.94*:5 =kde-frameworks/kxmlgui-5.94*:5 >=dev-qt/designer-5.15.3:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for embedding scripting into applications
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtscript-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=dev-qt/qtxml-5.15.3:5 =kde-frameworks/kcompletion-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/ki18n-5.94*:5 =kde-frameworks/kiconthemes-5.94*:5 =kde-frameworks/kio-5.94*:5 =kde-frameworks/kparts-5.94*:5 =kde-frameworks/kwidgetsaddons-5.94*:5 =kde-frameworks/kxmlgui-5.94*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/portingAids/kross-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=59664132bda0802a69cca90f41d0e460
diff --git a/metadata/md5-cache/kde-frameworks/krunner-5.94.0 b/metadata/md5-cache/kde-frameworks/krunner-5.94.0
deleted file mode 100644
index 3c229a7a4c6e..000000000000
--- a/metadata/md5-cache/kde-frameworks/krunner-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/ki18n-5.94*:5 =kde-frameworks/kio-5.94*:5 =kde-frameworks/kservice-5.94*:5 =kde-frameworks/plasma-5.94*:5 =kde-frameworks/solid-5.94*:5 =kde-frameworks/threadweaver-5.94*:5 activities? ( =kde-frameworks/kactivities-5.94*:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for providing different actions given a string query
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=activities test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/ki18n-5.94*:5 =kde-frameworks/kio-5.94*:5 =kde-frameworks/kservice-5.94*:5 =kde-frameworks/plasma-5.94*:5 =kde-frameworks/solid-5.94*:5 =kde-frameworks/threadweaver-5.94*:5 activities? ( =kde-frameworks/kactivities-5.94*:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/krunner-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d22966bb1d078f4aa5d74611f5073290
diff --git a/metadata/md5-cache/kde-frameworks/kservice-5.94.0 b/metadata/md5-cache/kde-frameworks/kservice-5.94.0
deleted file mode 100644
index 02dcc2ad077f..000000000000
--- a/metadata/md5-cache/kde-frameworks/kservice-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/bison sys-devel/flex man? ( >=kde-frameworks/kdoctools-5.94:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtxml-5.15.3:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/kdbusaddons-5.94*:5 =kde-frameworks/ki18n-5.94*:5 test? ( >=dev-qt/qtconcurrent-5.15.3:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Advanced plugin and service introspection
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=+man debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2 LGPL-2.1+
-RDEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtxml-5.15.3:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/kdbusaddons-5.94*:5 =kde-frameworks/ki18n-5.94*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=test !test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/kservice-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=850bff606039ef06761203f231910439
diff --git a/metadata/md5-cache/kde-frameworks/ktexteditor-5.94.0 b/metadata/md5-cache/kde-frameworks/ktexteditor-5.94.0
deleted file mode 100644
index 632bb1721ce5..000000000000
--- a/metadata/md5-cache/kde-frameworks/ktexteditor-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=kde-frameworks/kservice-5.94:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtprintsupport-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=dev-qt/qtxml-5.15.3:5 =kde-frameworks/karchive-5.94*:5 =kde-frameworks/kauth-5.94*:5 =kde-frameworks/kcodecs-5.94*:5 =kde-frameworks/kcompletion-5.94*:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kconfigwidgets-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/kguiaddons-5.94*:5 =kde-frameworks/ki18n-5.94*:5 =kde-frameworks/kiconthemes-5.94*:5 =kde-frameworks/kio-5.94*:5 =kde-frameworks/kitemviews-5.94*:5 =kde-frameworks/kjobwidgets-5.94*:5 =kde-frameworks/kparts-5.94*:5 =kde-frameworks/ktextwidgets-5.94*:5 =kde-frameworks/kwidgetsaddons-5.94*:5 =kde-frameworks/kxmlgui-5.94*:5 =kde-frameworks/sonnet-5.94*:5 =kde-frameworks/syntax-highlighting-5.94*:5 editorconfig? ( app-text/editorconfig-core-c ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing a full text editor component
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=+editorconfig test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtprintsupport-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=dev-qt/qtxml-5.15.3:5 =kde-frameworks/karchive-5.94*:5 =kde-frameworks/kauth-5.94*:5 =kde-frameworks/kcodecs-5.94*:5 =kde-frameworks/kcompletion-5.94*:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kconfigwidgets-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/kguiaddons-5.94*:5 =kde-frameworks/ki18n-5.94*:5 =kde-frameworks/kiconthemes-5.94*:5 =kde-frameworks/kio-5.94*:5 =kde-frameworks/kitemviews-5.94*:5 =kde-frameworks/kjobwidgets-5.94*:5 =kde-frameworks/kparts-5.94*:5 =kde-frameworks/ktextwidgets-5.94*:5 =kde-frameworks/kwidgetsaddons-5.94*:5 =kde-frameworks/kxmlgui-5.94*:5 =kde-frameworks/sonnet-5.94*:5 =kde-frameworks/syntax-highlighting-5.94*:5 editorconfig? ( app-text/editorconfig-core-c ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=test !test? ( test ) !test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/ktexteditor-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=3c1838798ed9f5316404b51f7016c30d
diff --git a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.94.0 b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.94.0
deleted file mode 100644
index ca41dc389ee9..000000000000
--- a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 =kde-frameworks/kcompletion-5.94*:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kconfigwidgets-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/ki18n-5.94*:5 =kde-frameworks/kservice-5.94*:5 =kde-frameworks/kwidgetsaddons-5.94*:5 =kde-frameworks/sonnet-5.94*:5 speech? ( >=dev-qt/qtspeech-5.15.3:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing an assortment of widgets for displaying and editing text
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=speech test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+ LGPL-2.1+
-RDEPEND=>=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 =kde-frameworks/kcompletion-5.94*:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kconfigwidgets-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/ki18n-5.94*:5 =kde-frameworks/kservice-5.94*:5 =kde-frameworks/kwidgetsaddons-5.94*:5 =kde-frameworks/sonnet-5.94*:5 speech? ( >=dev-qt/qtspeech-5.15.3:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/ktextwidgets-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=4bcc90996479ee2c1ae0ddcdf92bf768
diff --git a/metadata/md5-cache/kde-frameworks/kunitconversion-5.94.0 b/metadata/md5-cache/kde-frameworks/kunitconversion-5.94.0
deleted file mode 100644
index 05a3b38dd5ab..000000000000
--- a/metadata/md5-cache/kde-frameworks/kunitconversion-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtnetwork-5.15.3:5 =kde-frameworks/ki18n-5.94*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for converting units
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtnetwork-5.15.3:5 =kde-frameworks/ki18n-5.94*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/kunitconversion-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=cac79c3f26ab713f65c35d411ada1437
diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.94.0 b/metadata/md5-cache/kde-frameworks/kwallet-5.94.0
deleted file mode 100644
index d9e0af130c1f..000000000000
--- a/metadata/md5-cache/kde-frameworks/kwallet-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=man? ( >=kde-frameworks/kdoctools-5.94:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libgcrypt:0= >=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kconfigwidgets-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/kdbusaddons-5.94*:5 =kde-frameworks/ki18n-5.94*:5 =kde-frameworks/knotifications-5.94*:5 =kde-frameworks/kservice-5.94*:5 =kde-frameworks/kwidgetsaddons-5.94*:5 =kde-frameworks/kwindowsystem-5.94*:5 gpg? ( >=app-crypt/gpgme-1.7.1:=[cxx,qt5] ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing desktop-wide storage for passwords
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org optfeature
-IUSE=gpg +man debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=dev-libs/libgcrypt:0= >=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kconfigwidgets-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/kdbusaddons-5.94*:5 =kde-frameworks/ki18n-5.94*:5 =kde-frameworks/knotifications-5.94*:5 =kde-frameworks/kservice-5.94*:5 =kde-frameworks/kwidgetsaddons-5.94*:5 =kde-frameworks/kwindowsystem-5.94*:5 gpg? ( >=app-crypt/gpgme-1.7.1:=[cxx,qt5] ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/kwallet-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=4d08285261ebb5e1c02741ec23823ac5
diff --git a/metadata/md5-cache/kde-frameworks/kwayland-5.94.0 b/metadata/md5-cache/kde-frameworks/kwayland-5.94.0
deleted file mode 100644
index ee4fccf95ef1..000000000000
--- a/metadata/md5-cache/kde-frameworks/kwayland-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-qt/qtwaylandscanner-5.15.3:5 >=dev-util/wayland-scanner-1.19.0 dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/wayland-1.15.0 >=dev-qt/qtconcurrent-5.15.3:5 >=dev-qt/qtgui-5.15.3:5=[egl] >=dev-qt/qtwayland-5.15.3:5 media-libs/libglvnd >=dev-libs/plasma-wayland-protocols-1.7.0 >=dev-libs/wayland-protocols-1.15 sys-kernel/linux-headers test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Qt-style client and server library wrapper for Wayland libraries
-EAPI=8
-HOMEPAGE=https://invent.kde.org/frameworks/kwayland
-INHERIT=ecm kde.org
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/wayland-1.15.0 >=dev-qt/qtconcurrent-5.15.3:5 >=dev-qt/qtgui-5.15.3:5=[egl] >=dev-qt/qtwayland-5.15.3:5 media-libs/libglvnd >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=test !test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/kwayland-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=9363ca2288fc701fcdef12732e8268af
diff --git a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.94.0 b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.94.0
deleted file mode 100644
index a1a77ae0df65..000000000000
--- a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.3:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=An assortment of high-level widgets for common tasks
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=nls test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/kwidgetsaddons-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=bbd6c6165e983655ad2cd0199b16c416
diff --git a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.94.0 b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.94.0
deleted file mode 100644
index 89ee33021006..000000000000
--- a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.3:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.3:5 X? ( >=dev-qt/qtx11extras-5.15.3:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) X? ( x11-base/xorg-proto ) test? ( >=dev-qt/qtwidgets-5.15.3:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing access to properties and features of the window manager
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=nls X test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 ) MIT
-RDEPEND=>=dev-qt/qtgui-5.15.3:5 X? ( >=dev-qt/qtx11extras-5.15.3:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=test !test? ( test ) !test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/kwindowsystem-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=18e9ba0d3bfcc932a7d7f51e665db45f
diff --git a/metadata/md5-cache/kde-frameworks/kxmlgui-5.94.0 b/metadata/md5-cache/kde-frameworks/kxmlgui-5.94.0
deleted file mode 100644
index e103669a864b..000000000000
--- a/metadata/md5-cache/kde-frameworks/kxmlgui-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtcore-5.15.3:5= >=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtnetwork-5.15.3:5[ssl] >=dev-qt/qtprintsupport-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=dev-qt/qtxml-5.15.3:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kconfigwidgets-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/kglobalaccel-5.94*:5 =kde-frameworks/kguiaddons-5.94*:5 =kde-frameworks/ki18n-5.94*:5 =kde-frameworks/kiconthemes-5.94*:5 =kde-frameworks/kitemviews-5.94*:5 =kde-frameworks/kwidgetsaddons-5.94*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for managing menu and toolbar actions in an abstract way
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtcore-5.15.3:5= >=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtnetwork-5.15.3:5[ssl] >=dev-qt/qtprintsupport-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=dev-qt/qtxml-5.15.3:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kconfigwidgets-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/kglobalaccel-5.94*:5 =kde-frameworks/kguiaddons-5.94*:5 =kde-frameworks/ki18n-5.94*:5 =kde-frameworks/kiconthemes-5.94*:5 =kde-frameworks/kitemviews-5.94*:5 =kde-frameworks/kwidgetsaddons-5.94*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/kxmlgui-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=f0be8d491004d1ca1bf4950f3e2fb30b
diff --git a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.94.0 b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.94.0
deleted file mode 100644
index 6d21d0a07a17..000000000000
--- a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtxml-5.15.3:5 net-misc/modemmanager test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=ModemManager bindings for Qt
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtxml-5.15.3:5 net-misc/modemmanager >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=test !test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/modemmanager-qt-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=1f4f5cb8317c2f4f86aecb88c8886d09
diff --git a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.94.0 b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.94.0
deleted file mode 100644
index 1447e5f3bb41..000000000000
--- a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/glib:2 >=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtnetwork-5.15.3:5 >=net-misc/networkmanager-1.4.0-r1[teamd=] test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=NetworkManager bindings for Qt
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=teamd debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2
-RDEPEND=dev-libs/glib:2 >=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtnetwork-5.15.3:5 >=net-misc/networkmanager-1.4.0-r1[teamd=] || ( >=net-misc/networkmanager-1.4.0-r1[elogind] >=net-misc/networkmanager-1.4.0-r1[systemd] ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/networkmanager-qt-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=683a0180f2a095ca3bd4d3286fa61619
diff --git a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.94.0 b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.94.0
deleted file mode 100644
index d9550165c446..000000000000
--- a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.94.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-qt/qtcore-5.15.3:5 >=kde-frameworks/extra-cmake-modules-5.94:5 test? ( app-misc/fdupes ) dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND=test? ( >=dev-qt/qttest-5.15.3:5 )
-DESCRIPTION=Oxygen SVG icon theme
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=cmake kde.org xdg-utils
-IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
-LICENSE=LGPL-3
-RESTRICT=!test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/oxygen-icons5-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=78b3bc5944861d62497c184b5edd43e0
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.94.0 b/metadata/md5-cache/kde-frameworks/plasma-5.94.0
deleted file mode 100644
index e2071bbdfa4e..000000000000
--- a/metadata/md5-cache/kde-frameworks/plasma-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=man? ( >=kde-frameworks/kdoctools-5.94:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5[gles2-only=,X=] >=dev-qt/qtquickcontrols-5.15.3:5 >=dev-qt/qtsql-5.15.3:5 >=dev-qt/qtsvg-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 =kde-frameworks/kactivities-5.94*:5 =kde-frameworks/karchive-5.94*:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kconfigwidgets-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/kdeclarative-5.94*:5 =kde-frameworks/kglobalaccel-5.94*:5 =kde-frameworks/kguiaddons-5.94*:5 =kde-frameworks/ki18n-5.94*:5 =kde-frameworks/kiconthemes-5.94*:5 =kde-frameworks/kio-5.94*:5 =kde-frameworks/kirigami-5.94*:5 =kde-frameworks/knotifications-5.94*:5 =kde-frameworks/kpackage-5.94*:5 =kde-frameworks/kservice-5.94*:5 =kde-frameworks/kwidgetsaddons-5.94*:5 =kde-frameworks/kwindowsystem-5.94*:5 =kde-frameworks/kxmlgui-5.94*:5 !gles2-only? ( media-libs/libglvnd[X?] ) wayland? ( =kde-frameworks/kwayland-5.94*:5 media-libs/libglvnd ) X? ( >=dev-qt/qtx11extras-5.15.3:5 x11-libs/libX11 x11-libs/libxcb ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Plasma framework
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=gles2-only man wayland X test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5[gles2-only=,X=] >=dev-qt/qtquickcontrols-5.15.3:5 >=dev-qt/qtsql-5.15.3:5 >=dev-qt/qtsvg-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 =kde-frameworks/kactivities-5.94*:5 =kde-frameworks/karchive-5.94*:5 =kde-frameworks/kconfig-5.94*:5 =kde-frameworks/kconfigwidgets-5.94*:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/kdeclarative-5.94*:5 =kde-frameworks/kglobalaccel-5.94*:5 =kde-frameworks/kguiaddons-5.94*:5 =kde-frameworks/ki18n-5.94*:5 =kde-frameworks/kiconthemes-5.94*:5 =kde-frameworks/kio-5.94*:5 =kde-frameworks/kirigami-5.94*:5 =kde-frameworks/knotifications-5.94*:5 =kde-frameworks/kpackage-5.94*:5 =kde-frameworks/kservice-5.94*:5 =kde-frameworks/kwidgetsaddons-5.94*:5 =kde-frameworks/kwindowsystem-5.94*:5 =kde-frameworks/kxmlgui-5.94*:5 !gles2-only? ( media-libs/libglvnd[X?] ) wayland? ( =kde-frameworks/kwayland-5.94*:5 media-libs/libglvnd ) X? ( >=dev-qt/qtx11extras-5.15.3:5 x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=test !test? ( test ) !test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/plasma-framework-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a28b880f32a9babdf74a76be68eece44
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.95.0-r2 b/metadata/md5-cache/kde-frameworks/plasma-5.95.0-r3
similarity index 98%
rename from metadata/md5-cache/kde-frameworks/plasma-5.95.0-r2
rename to metadata/md5-cache/kde-frameworks/plasma-5.95.0-r3
index ed4b6cad9687..36ec38b60ee5 100644
--- a/metadata/md5-cache/kde-frameworks/plasma-5.95.0-r2
+++ b/metadata/md5-cache/kde-frameworks/plasma-5.95.0-r3
@@ -13,4 +13,4 @@ RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=5/5.95
 SRC_URI=mirror://kde/stable/frameworks/5.95/plasma-framework-5.95.0.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=348ed8ac58a9550b0e16274c5d630077
+_md5_=36cc46a277381fef67561ffc74d9c327
diff --git a/metadata/md5-cache/kde-frameworks/prison-5.94.0 b/metadata/md5-cache/kde-frameworks/prison-5.94.0
deleted file mode 100644
index b6f04b36b7a9..000000000000
--- a/metadata/md5-cache/kde-frameworks/prison-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtmultimedia-5.15.3:5 media-gfx/qrencode:= media-libs/libdmtx media-libs/zxing-cpp qml? ( >=dev-qt/qtdeclarative-5.15.3:5 ) test? ( >=dev-qt/qtwidgets-5.15.3:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=QRCode and data matrix barcode library
-EAPI=8
-HOMEPAGE=https://invent.kde.org/frameworks/prison
-INHERIT=ecm kde.org
-IUSE=qml debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtmultimedia-5.15.3:5 media-gfx/qrencode:= media-libs/libdmtx media-libs/zxing-cpp qml? ( >=dev-qt/qtdeclarative-5.15.3:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/prison-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=e9a7b13dff98ca50de5ad6a641165b0f
diff --git a/metadata/md5-cache/kde-frameworks/purpose-5.94.0 b/metadata/md5-cache/kde-frameworks/purpose-5.94.0
deleted file mode 100644
index 7d73b28cace0..000000000000
--- a/metadata/md5-cache/kde-frameworks/purpose-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtnetwork-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/ki18n-5.94*:5 =kde-frameworks/kio-5.94*:5 =kde-frameworks/kirigami-5.94*:5 =kde-frameworks/knotifications-5.94*:5 =kde-frameworks/prison-5.94*:5 kaccounts? ( >=kde-apps/kaccounts-integration-19.04.3:5 net-libs/accounts-qt ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for providing abstractions to get the developer's purposes fulfilled
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org optfeature xdg-utils
-IUSE=bluetooth +kaccounts debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtnetwork-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 =kde-frameworks/kcoreaddons-5.94*:5 =kde-frameworks/ki18n-5.94*:5 =kde-frameworks/kio-5.94*:5 =kde-frameworks/kirigami-5.94*:5 =kde-frameworks/knotifications-5.94*:5 =kde-frameworks/prison-5.94*:5 kaccounts? ( >=kde-apps/kaccounts-integration-19.04.3:5 net-libs/accounts-qt ) >=dev-qt/qtquickcontrols-5.15.3:5 >=dev-qt/qtquickcontrols2-5.15.3:5 >=kde-frameworks/kdeclarative-5.94:5 bluetooth? ( =kde-frameworks/bluez-qt-5.94*:5 ) kaccounts? ( net-libs/accounts-qml ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=test !test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/purpose-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=7c9a780d7be64220cd2fc207893e115b
diff --git a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.94.0 b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.94.0
deleted file mode 100644
index ef637812f58e..000000000000
--- a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.3:5= >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 =kde-frameworks/kconfigwidgets-5.94*:5 =kde-frameworks/kiconthemes-5.94*:5 =kde-frameworks/kirigami-5.94*:5 =kde-frameworks/sonnet-5.94*:5[qml] test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Style for QtQuickControls 2 that uses QWidget's QStyle for painting
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=|| ( GPL-2+ LGPL-3+ )
-RDEPEND=>=dev-qt/qtdeclarative-5.15.3:5= >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 =kde-frameworks/kconfigwidgets-5.94*:5 =kde-frameworks/kiconthemes-5.94*:5 =kde-frameworks/kirigami-5.94*:5 =kde-frameworks/sonnet-5.94*:5[qml] >=dev-qt/qtgraphicaleffects-5.15.3:5 >=dev-qt/qtquickcontrols2-5.15.3:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/qqc2-desktop-style-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=81532f0207d701123e1ddbf9b77eb9b1
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.94.0 b/metadata/md5-cache/kde-frameworks/solid-5.94.0
deleted file mode 100644
index bd9a6e6cb6b3..000000000000
--- a/metadata/md5-cache/kde-frameworks/solid-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/bison sys-devel/flex nls? ( >=dev-qt/linguist-tools-5.15.3:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtxml-5.15.3:5 sys-apps/util-linux sys-fs/udisks:2 virtual/libudev:= ios? ( app-pda/libimobiledevice:= app-pda/libplist:= ) test? ( >=dev-qt/qtconcurrent-5.15.3:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Provider for platform independent hardware discovery, abstraction and management
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org optfeature
-IUSE=ios nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtxml-5.15.3:5 sys-apps/util-linux sys-fs/udisks:2 virtual/libudev:= ios? ( app-pda/libimobiledevice:= app-pda/libplist:= ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/solid-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=8299605932b62ccc7c039d73e46b57e0
diff --git a/metadata/md5-cache/kde-frameworks/sonnet-5.94.0 b/metadata/md5-cache/kde-frameworks/sonnet-5.94.0
deleted file mode 100644
index e47a034c56ac..000000000000
--- a/metadata/md5-cache/kde-frameworks/sonnet-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.3:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) qml? ( >=dev-qt/qtdeclarative-5.15.3:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for providing spell-checking through abstraction of popular backends
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=aspell +hunspell nls qml test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+ LGPL-2.1+
-RDEPEND=>=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) qml? ( >=dev-qt/qtdeclarative-5.15.3:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/sonnet-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=8062e7a8fe5d45bcb69a0cf59051a547
diff --git a/metadata/md5-cache/kde-frameworks/syndication-5.94.0 b/metadata/md5-cache/kde-frameworks/syndication-5.94.0
deleted file mode 100644
index dfde4e6f508c..000000000000
--- a/metadata/md5-cache/kde-frameworks/syndication-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtxml-5.15.3:5 =kde-frameworks/kcodecs-5.94*:5 test? ( >=dev-qt/qtnetwork-5.15.3:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for parsing RSS and Atom feeds
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtxml-5.15.3:5 =kde-frameworks/kcodecs-5.94*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/syndication-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=e3668ad94afbb6b73d81ddb450ad6e64
diff --git a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.94.0 b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.94.0
deleted file mode 100644
index 7e6282b3a8ba..000000000000
--- a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl nls? ( >=dev-qt/linguist-tools-5.15.3:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtnetwork-5.15.3:5 >=dev-qt/qtxmlpatterns-5.15.3:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for syntax highlighting
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=nls debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=>=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtnetwork-5.15.3:5 >=dev-qt/qtxmlpatterns-5.15.3:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/syntax-highlighting-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=9305cfa0f7bef92fae4aba44e5173e50
diff --git a/metadata/md5-cache/kde-frameworks/threadweaver-5.94.0 b/metadata/md5-cache/kde-frameworks/threadweaver-5.94.0
deleted file mode 100644
index ff1567739044..000000000000
--- a/metadata/md5-cache/kde-frameworks/threadweaver-5.94.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for managing threads using job and queue-based interfaces
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-INHERIT=ecm kde.org
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/threadweaver-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=977c251f2baf55c3e99aec9d249c6bf4
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index f520917cac87..f68d66728cb3 100644
Binary files a/metadata/md5-cache/kde-plasma/Manifest.gz and b/metadata/md5-cache/kde-plasma/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-plasma/bluedevil-5.25.0 b/metadata/md5-cache/kde-plasma/bluedevil-5.25.0
new file mode 100644
index 000000000000..d47ed7301bd6
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/bluedevil-5.25.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.94.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=kde-frameworks/bluez-qt-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kdeclarative-5.94.0:5 >=kde-frameworks/kdbusaddons-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kio-5.94.0:5 >=kde-frameworks/knotifications-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 >=kde-frameworks/kwindowsystem-5.94.0:5 >=kde-frameworks/plasma-5.94.0:5 dev-qt/qtcore:5
+DESCRIPTION=Bluetooth stack for KDE Plasma
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/bluedevil
+INHERIT=ecm kde.org
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=kde-frameworks/bluez-qt-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kdeclarative-5.94.0:5 >=kde-frameworks/kdbusaddons-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kio-5.94.0:5 >=kde-frameworks/knotifications-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 >=kde-frameworks/kwindowsystem-5.94.0:5 >=kde-frameworks/plasma-5.94.0:5 >=dev-qt/qtquickcontrols2-5.15.3:5 >=kde-frameworks/kirigami-5.94.0:5 >=kde-plasma/kde-cli-tools-5.25.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.25.0/bluedevil-5.25.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=4900ad967004d46d04af0d78c6eae3a7
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.25.0 b/metadata/md5-cache/kde-plasma/breeze-5.25.0
new file mode 100644
index 000000000000..5a2f00a6c478
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-5.25.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.94.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=dev-qt/qtx11extras-5.15.3:5 >=kde-frameworks/frameworkintegration-5.94.0:5 >=kde-frameworks/kcmutils-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kguiaddons-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kiconthemes-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 >=kde-frameworks/kwindowsystem-5.94.0:5 >=kde-plasma/kdecoration-5.25.0:5 X? ( x11-libs/libxcb ) dev-qt/qtcore:5
+DESCRIPTION=Breeze visual style for the Plasma desktop
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/breeze
+INHERIT=ecm kde.org
+IUSE=X debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+PDEPEND=>=kde-frameworks/breeze-icons-5.94.0:5 >=kde-plasma/kde-cli-tools-5.25.0:5
+RDEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=dev-qt/qtx11extras-5.15.3:5 >=kde-frameworks/frameworkintegration-5.94.0:5 >=kde-frameworks/kcmutils-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kguiaddons-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kiconthemes-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 >=kde-frameworks/kwindowsystem-5.94.0:5 >=kde-plasma/kdecoration-5.25.0:5 X? ( x11-libs/libxcb ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.25.0/breeze-5.25.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=4758ef45f6417ba3e15d0f0348fc8319
diff --git a/metadata/md5-cache/kde-plasma/breeze-grub-5.25.0 b/metadata/md5-cache/kde-plasma/breeze-grub-5.25.0
new file mode 100644
index 000000000000..25d9ce658e4e
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-grub-5.25.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install nofetch prepare unpack
+DESCRIPTION=Breeze theme for GRUB
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+INHERIT=kde.org
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-3+
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.25.0/breeze-grub-5.25.0.tar.xz
+_eclasses_=kde.org	916c61efa7151f09c7701328b88cafc1
+_md5_=bac7fc1ec788f5e9e86adc06cf0f3f14
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.25.0 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.25.0
new file mode 100644
index 000000000000..c7ad117285d2
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-gtk-5.25.0
@@ -0,0 +1,15 @@
+BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) dev-lang/sassc || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/pycairo[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/pycairo[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/pycairo[python_targets_python3_8(-)] ) ) >=kde-plasma/breeze-5.25.0:5 dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.82.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-qt/qtcore:5
+DESCRIPTION=Official GTK+ port of Plasma's Breeze widget style
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/breeze-gtk
+INHERIT=ecm kde.org python-any-r1
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=|| ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.25.0/breeze-gtk-5.25.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=02d0f724ee67355eb292d5c94b8bf7f7
diff --git a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.25.0 b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.25.0
new file mode 100644
index 000000000000..a33161af56b8
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.25.0
@@ -0,0 +1,14 @@
+BDEPEND=>=kde-frameworks/extra-cmake-modules-5.94.0:5 dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install nofetch prepare test unpack
+DEPEND=sys-boot/plymouth
+DESCRIPTION=Breeze theme for Plymouth
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+INHERIT=cmake kde.org
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+ GPL-3+
+RDEPEND=sys-boot/plymouth
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.25.0/breeze-plymouth-5.25.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=94f0c4ddea58f9f05d305c1ad5166bc7
diff --git a/metadata/md5-cache/kde-plasma/discover-5.25.0 b/metadata/md5-cache/kde-plasma/discover-5.25.0
new file mode 100644
index 000000000000..298387d3d523
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/discover-5.25.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.94.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtconcurrent-5.15.3:5 >=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtnetwork-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=dev-qt/qtx11extras-5.15.3:5 >=dev-qt/qtxml-5.15.3:5 >=kde-frameworks/attica-5.94.0:5 >=kde-frameworks/kcmutils-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kcrash-5.94.0:5 >=kde-frameworks/kdbusaddons-5.94.0:5 >=kde-frameworks/kdeclarative-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kidletime-5.94.0:5 >=kde-frameworks/kio-5.94.0:5 >=kde-frameworks/kirigami-5.94.0:5 >=kde-frameworks/kitemmodels-5.94.0:5 >=kde-frameworks/knewstuff-5.94.0:5 >=kde-frameworks/knotifications-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 >=kde-frameworks/kxmlgui-5.94.0:5 firmware? ( >=sys-apps/fwupd-1.5.0 ) flatpak? ( >=dev-libs/appstream-0.14.4:= sys-apps/flatpak ) telemetry? ( dev-libs/kuserfeedback:5 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma resources management GUI
+EAPI=8
+HOMEPAGE=https://userbase.kde.org/Discover
+INHERIT=ecm kde.org
+IUSE=+firmware flatpak telemetry test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtconcurrent-5.15.3:5 >=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtnetwork-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=dev-qt/qtx11extras-5.15.3:5 >=dev-qt/qtxml-5.15.3:5 >=kde-frameworks/attica-5.94.0:5 >=kde-frameworks/kcmutils-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kcrash-5.94.0:5 >=kde-frameworks/kdbusaddons-5.94.0:5 >=kde-frameworks/kdeclarative-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kidletime-5.94.0:5 >=kde-frameworks/kio-5.94.0:5 >=kde-frameworks/kirigami-5.94.0:5 >=kde-frameworks/kitemmodels-5.94.0:5 >=kde-frameworks/knewstuff-5.94.0:5 >=kde-frameworks/knotifications-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 >=kde-frameworks/kxmlgui-5.94.0:5 firmware? ( >=sys-apps/fwupd-1.5.0 ) flatpak? ( >=dev-libs/appstream-0.14.4:= sys-apps/flatpak ) telemetry? ( dev-libs/kuserfeedback:5 ) >=dev-qt/qtquickcontrols2-5.15.3:5 >=kde-frameworks/kirigami-5.94.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.25.0/discover-5.25.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=c211f5d4399ff732c5048500c534969e
diff --git a/metadata/md5-cache/kde-plasma/drkonqi-5.25.0 b/metadata/md5-cache/kde-plasma/drkonqi-5.25.0
new file mode 100644
index 000000000000..f8de0403b92e
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/drkonqi-5.25.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.94.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=dev-qt/qtxml-5.15.3:5 >=kde-frameworks/kcompletion-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kcrash-5.94.0:5 >=kde-frameworks/kdeclarative-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kidletime-5.94.0:5 >=kde-frameworks/kio-5.94.0:5 >=kde-frameworks/kjobwidgets-5.94.0:5 >=kde-frameworks/knotifications-5.94.0:5 >=kde-frameworks/kwallet-5.94.0:5 >=kde-frameworks/kwayland-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 >=kde-frameworks/kwindowsystem-5.94.0:5 >=kde-frameworks/syntax-highlighting-5.94.0:5 >=dev-qt/qtconcurrent-5.15.3:5 dev-qt/qtcore:5
+DESCRIPTION=Plasma crash handler, gives the user feedback if a program crashed
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+INHERIT=ecm kde.org
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=dev-qt/qtxml-5.15.3:5 >=kde-frameworks/kcompletion-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kcrash-5.94.0:5 >=kde-frameworks/kdeclarative-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kidletime-5.94.0:5 >=kde-frameworks/kio-5.94.0:5 >=kde-frameworks/kjobwidgets-5.94.0:5 >=kde-frameworks/knotifications-5.94.0:5 >=kde-frameworks/kwallet-5.94.0:5 >=kde-frameworks/kwayland-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 >=kde-frameworks/kwindowsystem-5.94.0:5 >=kde-frameworks/syntax-highlighting-5.94.0:5 >=kde-frameworks/kirigami-5.94.0:5 >=kde-frameworks/kitemmodels-5.94.0:5[qml] || ( sys-devel/gdb dev-util/lldb ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.25.0/drkonqi-5.25.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=3ae131b28319fa600bf2153cc2298f65
diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.25.0 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.25.0
new file mode 100644
index 000000000000..5762978d47ff
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.25.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.94.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtsql-5.15.3:5[sqlite] >=dev-qt/qtwidgets-5.15.3:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kcrash-5.94.0:5 >=kde-frameworks/kdbusaddons-5.94.0:5 >=kde-frameworks/kglobalaccel-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kio-5.94.0:5 >=kde-frameworks/kservice-5.94.0:5 >=kde-frameworks/kwindowsystem-5.94.0:5 >=kde-frameworks/kxmlgui-5.94.0:5 dev-libs/boost dev-qt/qtcore:5
+DESCRIPTION=System service to manage user's activities, track the usage patterns etc.
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+INHERIT=ecm kde.org
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=|| ( GPL-2 GPL-3 )
+RDEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtsql-5.15.3:5[sqlite] >=dev-qt/qtwidgets-5.15.3:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kcrash-5.94.0:5 >=kde-frameworks/kdbusaddons-5.94.0:5 >=kde-frameworks/kglobalaccel-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kio-5.94.0:5 >=kde-frameworks/kservice-5.94.0:5 >=kde-frameworks/kwindowsystem-5.94.0:5 >=kde-frameworks/kxmlgui-5.94.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.25.0/kactivitymanagerd-5.25.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=8caef10256a3353bec507f94c79e5d03
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.25.0 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.25.0
new file mode 100644
index 000000000000..bf93637684c9
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.25.0
@@ -0,0 +1,17 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.94.0:5 ) >=kde-frameworks/extra-cmake-modules-5.94.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtsvg-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=kde-frameworks/kactivities-5.94.0:5 >=kde-frameworks/kcmutils-5.94.0:5 >=kde-frameworks/kcompletion-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kiconthemes-5.94.0:5 >=kde-frameworks/kio-5.94.0:5 >=kde-frameworks/kparts-5.94.0:5 >=kde-frameworks/kservice-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 >=kde-frameworks/kwindowsystem-5.94.0:5 >=kde-plasma/libkworkspace-5.25.0:5 kdesu? ( >=kde-frameworks/kdesu-5.94.0:5 ) X? ( >=dev-qt/qtx11extras-5.15.3:5 x11-libs/libX11 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Tools based on KDE Frameworks 5 to better interact with the system
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/kde-cli-tools
+INHERIT=ecm kde.org
+IUSE=kdesu X test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtsvg-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=kde-frameworks/kactivities-5.94.0:5 >=kde-frameworks/kcmutils-5.94.0:5 >=kde-frameworks/kcompletion-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kiconthemes-5.94.0:5 >=kde-frameworks/kio-5.94.0:5 >=kde-frameworks/kparts-5.94.0:5 >=kde-frameworks/kservice-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 >=kde-frameworks/kwindowsystem-5.94.0:5 >=kde-plasma/libkworkspace-5.25.0:5 kdesu? ( >=kde-frameworks/kdesu-5.94.0:5 ) X? ( >=dev-qt/qtx11extras-5.15.3:5 x11-libs/libX11 ) kdesu? ( sys-apps/dbus[X] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=kdesu? ( X )
+RESTRICT=test !test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.25.0/kde-cli-tools-5.25.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=e6de34214712fe94201ebe0d081d76e7
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.25.0 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.25.0
new file mode 100644
index 000000000000..75fe7d1e83e9
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.25.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/sassc dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.94.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-cpp/glibmm:2 dev-libs/glib:2 >=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtsvg-5.15.3:5 gnome-base/gsettings-desktop-schemas >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kdbusaddons-5.94.0:5 >=kde-frameworks/kguiaddons-5.94.0:5 >=kde-plasma/kdecoration-5.25.0:5 x11-libs/gtk+:3 dev-qt/qtcore:5
+DESCRIPTION=Syncs KDE Plasma theme settings to GTK applications
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/kde-gtk-config
+INHERIT=ecm kde.org
+IUSE=test debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-3
+RDEPEND=dev-cpp/glibmm:2 dev-libs/glib:2 >=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtsvg-5.15.3:5 gnome-base/gsettings-desktop-schemas >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kdbusaddons-5.94.0:5 >=kde-frameworks/kguiaddons-5.94.0:5 >=kde-plasma/kdecoration-5.25.0:5 x11-libs/gtk+:3 >=kde-plasma/kde-cli-tools-5.25.0:5 x11-misc/xsettingsd || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.25.0/kde-gtk-config-5.25.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=55b6e74710e679fa23fe0bb61cdf3251
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.25.0 b/metadata/md5-cache/kde-plasma/kdecoration-5.25.0
new file mode 100644
index 000000000000..2fd5533a5ba7
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kdecoration-5.25.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.94.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.3:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Plugin based library to create window decorations
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+INHERIT=ecm kde.org
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 )
+RDEPEND=>=dev-qt/qtgui-5.15.3:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.25.0/kdecoration-5.25.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=3a186756eb67729ed556da03d698cc5d
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.25.0 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.25.0
new file mode 100644
index 000000000000..bcf3d0408613
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.25.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.94.0:5 ) >=kde-frameworks/extra-cmake-modules-5.94.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=kde-frameworks/karchive-5.94.0:5 >=kde-frameworks/kcmutils-5.94.0:5 >=kde-frameworks/kcompletion-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kdeclarative-5.94.0:5 >=kde-frameworks/kholidays-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kio-5.94.0:5 >=kde-frameworks/knewstuff-5.94.0:5 >=kde-frameworks/knotifications-5.94.0:5 >=kde-frameworks/kpackage-5.94.0:5 >=kde-frameworks/krunner-5.94.0:5 >=kde-frameworks/kservice-5.94.0:5 >=kde-frameworks/kunitconversion-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 >=kde-frameworks/kwindowsystem-5.94.0:5 >=kde-frameworks/kxmlgui-5.94.0:5 >=kde-frameworks/plasma-5.94.0:5 >=kde-frameworks/sonnet-5.94.0:5 share? ( >=kde-frameworks/purpose-5.94.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.15.3:5 ) dev-qt/qtcore:5
+DESCRIPTION=Extra Plasma applets and engines
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+INHERIT=ecm kde.org optfeature
+IUSE=share webengine test debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2 LGPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=kde-frameworks/karchive-5.94.0:5 >=kde-frameworks/kcmutils-5.94.0:5 >=kde-frameworks/kcompletion-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kdeclarative-5.94.0:5 >=kde-frameworks/kholidays-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kio-5.94.0:5 >=kde-frameworks/knewstuff-5.94.0:5 >=kde-frameworks/knotifications-5.94.0:5 >=kde-frameworks/kpackage-5.94.0:5 >=kde-frameworks/krunner-5.94.0:5 >=kde-frameworks/kservice-5.94.0:5 >=kde-frameworks/kunitconversion-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 >=kde-frameworks/kwindowsystem-5.94.0:5 >=kde-frameworks/kxmlgui-5.94.0:5 >=kde-frameworks/plasma-5.94.0:5 >=kde-frameworks/sonnet-5.94.0:5 share? ( >=kde-frameworks/purpose-5.94.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.15.3:5 ) >=dev-qt/qtquickcontrols-5.15.3:5 >=dev-qt/qtquickcontrols2-5.15.3:5 >=kde-plasma/plasma-workspace-5.25.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=test !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.25.0/kdeplasma-addons-5.25.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=551d75c36227139ffefce5f01fd23223
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.25.0 b/metadata/md5-cache/kde-plasma/kgamma-5.25.0
new file mode 100644
index 000000000000..a095d7e222b9
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kgamma-5.25.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.94.0:5 ) >=kde-frameworks/extra-cmake-modules-5.94.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 x11-libs/libX11 x11-libs/libXxf86vm x11-base/xorg-proto dev-qt/qtcore:5
+DESCRIPTION=Screen gamma values kcontrol module
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+INHERIT=ecm kde.org
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 x11-libs/libX11 x11-libs/libXxf86vm || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.25.0/kgamma5-5.25.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=e4aa8738a343117d275f1aa071f6d5dd
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.25.0 b/metadata/md5-cache/kde-plasma/khotkeys-5.25.0
new file mode 100644
index 000000000000..8c7b1d691ece
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/khotkeys-5.25.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.94.0:5 ) >=kde-frameworks/extra-cmake-modules-5.94.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=dev-qt/qtx11extras-5.15.3:5 >=kde-frameworks/kcompletion-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kdbusaddons-5.94.0:5 >=kde-frameworks/kdelibs4support-5.94.0:5[X] >=kde-frameworks/kglobalaccel-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kio-5.94.0:5 >=kde-frameworks/kservice-5.94.0:5 >=kde-frameworks/ktextwidgets-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 >=kde-frameworks/kwindowsystem-5.94.0:5 >=kde-frameworks/kxmlgui-5.94.0:5 >=kde-plasma/libkworkspace-5.25.0:5 x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto x11-libs/libxcb x11-libs/libXtst dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma workspace hotkey module
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+INHERIT=ecm kde.org
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=dev-qt/qtx11extras-5.15.3:5 >=kde-frameworks/kcompletion-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kdbusaddons-5.94.0:5 >=kde-frameworks/kdelibs4support-5.94.0:5[X] >=kde-frameworks/kglobalaccel-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kio-5.94.0:5 >=kde-frameworks/kservice-5.94.0:5 >=kde-frameworks/ktextwidgets-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 >=kde-frameworks/kwindowsystem-5.94.0:5 >=kde-frameworks/kxmlgui-5.94.0:5 >=kde-plasma/libkworkspace-5.25.0:5 x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kded-5.94.0:5 >=kde-plasma/kde-cli-tools-5.25.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.25.0/khotkeys-5.25.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=4d71cdd66edd29ab33b23e2bd2005b61
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.25.0 b/metadata/md5-cache/kde-plasma/kinfocenter-5.25.0
new file mode 100644
index 000000000000..d3ba0b9ed309
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-5.25.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.94.0:5 ) >=kde-frameworks/extra-cmake-modules-5.94.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5[gles2-only=] >=dev-qt/qtwidgets-5.15.3:5 >=kde-frameworks/kcmutils-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kdeclarative-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kio-5.94.0:5 >=kde-frameworks/kpackage-5.94.0:5 >=kde-frameworks/kservice-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 >=kde-frameworks/solid-5.94.0:5 gles2-only? ( media-libs/mesa[gles2] ) usb? ( virtual/libusb:1 ) dev-qt/qtcore:5
+DESCRIPTION=Utility providing information about the computer hardware
+EAPI=8
+HOMEPAGE=https://userbase.kde.org/KInfoCenter
+INHERIT=ecm kde.org optfeature
+IUSE=gles2-only usb debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5[gles2-only=] >=dev-qt/qtwidgets-5.15.3:5 >=kde-frameworks/kcmutils-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kdeclarative-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kio-5.94.0:5 >=kde-frameworks/kpackage-5.94.0:5 >=kde-frameworks/kservice-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 >=kde-frameworks/solid-5.94.0:5 gles2-only? ( media-libs/mesa[gles2] ) usb? ( virtual/libusb:1 ) >=dev-qt/qtquickcontrols2-5.15.3:5 >=kde-frameworks/kirigami-5.94.0:5 >=kde-plasma/kde-cli-tools-5.25.0:5 >=kde-plasma/systemsettings-5.25.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.25.0/kinfocenter-5.25.0.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=58481076d7bc09107c1c9ab9336283a2
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.25.0 b/metadata/md5-cache/kde-plasma/kmenuedit-5.25.0
new file mode 100644
index 000000000000..7e564fe611ba
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kmenuedit-5.25.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.94.0:5 ) >=kde-frameworks/extra-cmake-modules-5.94.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=dev-qt/qtxml-5.15.3:5 >=kde-frameworks/kcompletion-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kdbusaddons-5.94.0:5 >=kde-frameworks/kglobalaccel-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kiconthemes-5.94.0:5 >=kde-frameworks/kitemviews-5.94.0:5 >=kde-frameworks/kio-5.94.0:5 >=kde-frameworks/kservice-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 >=kde-frameworks/kwindowsystem-5.94.0:5 >=kde-frameworks/kxmlgui-5.94.0:5 >=kde-frameworks/sonnet-5.94.0:5 dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma menu editor
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/kmenuedit
+INHERIT=ecm kde.org
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=dev-qt/qtxml-5.15.3:5 >=kde-frameworks/kcompletion-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kdbusaddons-5.94.0:5 >=kde-frameworks/kglobalaccel-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kiconthemes-5.94.0:5 >=kde-frameworks/kitemviews-5.94.0:5 >=kde-frameworks/kio-5.94.0:5 >=kde-frameworks/kservice-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 >=kde-frameworks/kwindowsystem-5.94.0:5 >=kde-frameworks/kxmlgui-5.94.0:5 >=kde-frameworks/sonnet-5.94.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.25.0/kmenuedit-5.25.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=2bf07a382e39955cacd9088340c59ba4
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.24.5-r2 b/metadata/md5-cache/kde-plasma/kscreen-5.24.5-r2
index 160182c4569c..ca8cab9de6bd 100644
--- a/metadata/md5-cache/kde-plasma/kscreen-5.24.5-r2
+++ b/metadata/md5-cache/kde-plasma/kscreen-5.24.5-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://invent.kde.org/plasma/kscreen
 INHERIT=ecm kde.org
 IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsensors-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kglobalaccel-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kiconthemes-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kxmlgui-5.90.0:5 >=kde-frameworks/plasma-5.90.0:5 >=kde-plasma/libkscreen-5.24.5:5 >=dev-qt/qtgraphicaleffects-5.15.2:5 >=kde-plasma/kde-cli-tools-5.24.5:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=test !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.5/kscreen-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=617ff0645b92e7346ae73b95befe2f3a
+_md5_=fd6c584e4dbe6486a4a0244bcb7193f1
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.25.0 b/metadata/md5-cache/kde-plasma/kscreen-5.25.0
new file mode 100644
index 000000000000..248a886d7820
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kscreen-5.25.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.94.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5[widgets] >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtsensors-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=kde-frameworks/kcmutils-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kdeclarative-5.94.0:5 >=kde-frameworks/kdbusaddons-5.94.0:5 >=kde-frameworks/kglobalaccel-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kiconthemes-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 >=kde-frameworks/kxmlgui-5.94.0:5 >=kde-frameworks/plasma-5.94.0:5 >=kde-plasma/libkscreen-5.25.0:5 x11-libs/libX11 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma screen management
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/kscreen
+INHERIT=ecm kde.org
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5[widgets] >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtsensors-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=kde-frameworks/kcmutils-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kdeclarative-5.94.0:5 >=kde-frameworks/kdbusaddons-5.94.0:5 >=kde-frameworks/kglobalaccel-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kiconthemes-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 >=kde-frameworks/kxmlgui-5.94.0:5 >=kde-frameworks/plasma-5.94.0:5 >=kde-plasma/libkscreen-5.25.0:5 x11-libs/libX11 >=dev-qt/qtgraphicaleffects-5.15.3:5 >=kde-plasma/kde-cli-tools-5.25.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=test !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.25.0/kscreen-5.25.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=50009114b5a5f34ba1e6bbfccfad4e24
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.25.0 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.25.0
new file mode 100644
index 000000000000..151a71eae7e0
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kscreenlocker-5.25.0
@@ -0,0 +1,17 @@
+BDEPEND=dev-util/wayland-scanner dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.94.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtnetwork-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=dev-qt/qtx11extras-5.15.3:5 >=kde-frameworks/kcmutils-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5[qml] >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kcrash-5.94.0:5 >=kde-frameworks/kdeclarative-5.94.0:5 >=kde-frameworks/kglobalaccel-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kidletime-5.94.0:5 >=kde-frameworks/knotifications-5.94.0:5 >=kde-frameworks/kpackage-5.94.0:5 >=kde-frameworks/kwayland-5.94.0:5 >=kde-frameworks/kwindowsystem-5.94.0:5 >=kde-frameworks/kxmlgui-5.94.0:5 >=kde-frameworks/solid-5.94.0:5 >=kde-plasma/layer-shell-qt-5.25.0:5 x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( sys-libs/pam ) x11-base/xorg-proto test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library and components for secure lock screen architecture
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+INHERIT=ecm kde.org pam
+IUSE=+pam test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+PDEPEND=>=kde-plasma/kde-cli-tools-5.25.0:5
+RDEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtnetwork-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=dev-qt/qtx11extras-5.15.3:5 >=kde-frameworks/kcmutils-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5[qml] >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kcrash-5.94.0:5 >=kde-frameworks/kdeclarative-5.94.0:5 >=kde-frameworks/kglobalaccel-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kidletime-5.94.0:5 >=kde-frameworks/knotifications-5.94.0:5 >=kde-frameworks/kpackage-5.94.0:5 >=kde-frameworks/kwayland-5.94.0:5 >=kde-frameworks/kwindowsystem-5.94.0:5 >=kde-frameworks/kxmlgui-5.94.0:5 >=kde-frameworks/solid-5.94.0:5 >=kde-plasma/layer-shell-qt-5.25.0:5 x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( sys-libs/pam ) >=dev-qt/qtquickcontrols2-5.15.3:5 >=kde-frameworks/kirigami-5.94.0:5 >=kde-frameworks/plasma-5.94.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=test !test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.25.0/kscreenlocker-5.25.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pam	e44a1dd98f13e1ad76de01e919bde1f1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=aeba54814d46f96d301bf1406838fffb
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.25.0 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.25.0
new file mode 100644
index 000000000000..f70a46f8a8de
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/ksshaskpass-5.25.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.94.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtwidgets-5.15.3:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kwallet-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 dev-qt/qtcore:5
+DESCRIPTION=Implementation of ssh-askpass with KDE Wallet integration
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop https://invent.kde.org/plasma/ksshaskpass
+INHERIT=ecm kde.org
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtwidgets-5.15.3:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kwallet-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.25.0/ksshaskpass-5.25.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=9d53f340bd74677a6ed6852e75c86590
diff --git a/metadata/md5-cache/kde-plasma/ksystemstats-5.25.0 b/metadata/md5-cache/kde-plasma/ksystemstats-5.25.0
new file mode 100644
index 000000000000..d6454783b46c
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/ksystemstats-5.25.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.94.0:5 ) >=kde-frameworks/extra-cmake-modules-5.94.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/libnl:3 >=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtnetwork-5.15.3:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kdbusaddons-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kio-5.94.0:5 >=kde-frameworks/solid-5.94.0:5 >=kde-plasma/libksysguard-5.25.0:5 net-libs/libpcap sys-apps/lm-sensors:= sys-libs/libcap virtual/libudev:= networkmanager? ( >=kde-frameworks/networkmanager-qt-5.94.0:5 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Plugin-based system monitoring daemon
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+INHERIT=ecm kde.org
+IUSE=networkmanager test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/libnl:3 >=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtnetwork-5.15.3:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kdbusaddons-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kio-5.94.0:5 >=kde-frameworks/solid-5.94.0:5 >=kde-plasma/libksysguard-5.25.0:5 net-libs/libpcap sys-apps/lm-sensors:= sys-libs/libcap virtual/libudev:= networkmanager? ( >=kde-frameworks/networkmanager-qt-5.94.0:5 ) !<kde-plasma/ksysguard-5.21.90:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.25.0/ksystemstats-5.25.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=0767790c05b9d659f30da62b84776f53
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.25.0 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.25.0
new file mode 100644
index 000000000000..cf0468237723
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwallet-pam-5.25.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.94.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/libgcrypt:0= >=kde-frameworks/kwallet-5.94.0:5 sys-libs/pam dev-qt/qtcore:5
+DESCRIPTION=PAM module to not enter KWallet password again after login
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+INHERIT=ecm kde.org
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/libgcrypt:0= >=kde-frameworks/kwallet-5.94.0:5 sys-libs/pam net-misc/socat || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.25.0/kwallet-pam-5.25.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=ac0f2c71cf3a66b79e5dedca5791cdc6
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.25.0 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.25.0
new file mode 100644
index 000000000000..7bdee83ad8e5
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwayland-integration-5.25.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-qt/qtwaylandscanner-5.15.3:5 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.94.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/wayland-1.15 || ( >=dev-qt/qtgui-5.15.3:5[libinput] >=dev-qt/qtgui-5.15.3:5[X] ) >=dev-qt/qtwidgets-5.15.3:5 >=dev-qt/qtwayland-5.15.3:5= >=kde-frameworks/kidletime-5.94.0:5= >=kde-frameworks/kwayland-5.94.0:5 >=kde-frameworks/kwindowsystem-5.94.0:5= x11-libs/libxkbcommon test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Provides integration plugins for various KDE frameworks for Wayland
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/kwayland-integration
+INHERIT=ecm kde.org
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-libs/wayland-1.15 || ( >=dev-qt/qtgui-5.15.3:5[libinput] >=dev-qt/qtgui-5.15.3:5[X] ) >=dev-qt/qtwidgets-5.15.3:5 >=dev-qt/qtwayland-5.15.3:5= >=kde-frameworks/kidletime-5.94.0:5= >=kde-frameworks/kwayland-5.94.0:5 >=kde-frameworks/kwindowsystem-5.94.0:5= x11-libs/libxkbcommon || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=test !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.25.0/kwayland-integration-5.25.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=44607c6c4c97b787f2aa4572f5ed02f2
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.25.0 b/metadata/md5-cache/kde-plasma/kwin-5.25.0
new file mode 100644
index 000000000000..b2ad3b77f741
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwin-5.25.0
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-qt/qtwaylandscanner-5.15.3:5 dev-util/wayland-scanner dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.94.0:5 ) >=kde-frameworks/extra-cmake-modules-5.94.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/libinput-1.19 >=dev-libs/wayland-1.20.0 >=dev-qt/qtconcurrent-5.15.3:5 >=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5=[egl,gles2-only=,libinput] >=dev-qt/qtwayland-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=dev-qt/qtx11extras-5.15.3:5 >=kde-frameworks/kactivities-5.94.0:5 >=kde-frameworks/kauth-5.94.0:5 >=kde-frameworks/kcmutils-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5[qml] >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kcrash-5.94.0:5 >=kde-frameworks/kdbusaddons-5.94.0:5 >=kde-frameworks/kdeclarative-5.94.0:5 >=kde-frameworks/kglobalaccel-5.94.0:5= >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kidletime-5.94.0:5= >=kde-frameworks/kitemviews-5.94.0:5 >=kde-frameworks/knewstuff-5.94.0:5 >=kde-frameworks/knotifications-5.94.0:5 >=kde-frameworks/kpackage-5.94.0:5 >=kde-frameworks/kservice-5.94.0:5 >=kde-frameworks/kwayland-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 >=kde-frameworks/kwindowsystem-5.94.0:5=[X] >=kde-frameworks/kxmlgui-5.94.0:5 >=kde-frameworks/plasma-5.94.0:5 >=kde-plasma/breeze-5.25.0:5 >=kde-plasma/kdecoration-5.25.0:5 media-libs/fontconfig media-libs/freetype media-libs/lcms:2 media-libs/libepoxy media-libs/libglvnd >=media-libs/mesa-21.1[egl(+),gbm(+),wayland,X] virtual/libudev:= x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxcvt-0.1.1 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm accessibility? ( media-libs/libqaccessibilityclient:5 ) caps? ( sys-libs/libcap ) gles2-only? ( media-libs/mesa[gles2] ) lock? ( >=kde-plasma/kscreenlocker-5.25.0:5 ) plasma? ( >=kde-frameworks/krunner-5.94.0:5 ) screencast? ( >=media-video/pipewire-0.3:= ) dev-libs/plasma-wayland-protocols >=dev-libs/wayland-protocols-1.25 >=dev-qt/designer-5.15.3:5 >=dev-qt/qtconcurrent-5.15.3:5 x11-base/xorg-proto test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Flexible, composited Window Manager for windowing systems on Linux
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+INHERIT=ecm kde.org optfeature
+IUSE=accessibility caps gles2-only lock multimedia plasma screencast test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+
+PDEPEND=>=kde-plasma/kde-cli-tools-5.25.0:5
+RDEPEND=>=dev-libs/libinput-1.19 >=dev-libs/wayland-1.20.0 >=dev-qt/qtconcurrent-5.15.3:5 >=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5=[egl,gles2-only=,libinput] >=dev-qt/qtwayland-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=dev-qt/qtx11extras-5.15.3:5 >=kde-frameworks/kactivities-5.94.0:5 >=kde-frameworks/kauth-5.94.0:5 >=kde-frameworks/kcmutils-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5[qml] >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kcrash-5.94.0:5 >=kde-frameworks/kdbusaddons-5.94.0:5 >=kde-frameworks/kdeclarative-5.94.0:5 >=kde-frameworks/kglobalaccel-5.94.0:5= >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kidletime-5.94.0:5= >=kde-frameworks/kitemviews-5.94.0:5 >=kde-frameworks/knewstuff-5.94.0:5 >=kde-frameworks/knotifications-5.94.0:5 >=kde-frameworks/kpackage-5.94.0:5 >=kde-frameworks/kservice-5.94.0:5 >=kde-frameworks/kwayland-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 >=kde-frameworks/kwindowsystem-5.94.0:5=[X] >=kde-frameworks/kxmlgui-5.94.0:5 >=kde-frameworks/plasma-5.94.0:5 >=kde-plasma/breeze-5.25.0:5 >=kde-plasma/kdecoration-5.25.0:5 media-libs/fontconfig media-libs/freetype media-libs/lcms:2 media-libs/libepoxy media-libs/libglvnd >=media-libs/mesa-21.1[egl(+),gbm(+),wayland,X] virtual/libudev:= x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxcvt-0.1.1 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm accessibility? ( media-libs/libqaccessibilityclient:5 ) caps? ( sys-libs/libcap ) gles2-only? ( media-libs/mesa[gles2] ) lock? ( >=kde-plasma/kscreenlocker-5.25.0:5 ) plasma? ( >=kde-frameworks/krunner-5.94.0:5 ) screencast? ( >=media-video/pipewire-0.3:= ) !kde-plasma/kwayland-server >=dev-qt/qtquickcontrols-5.15.3:5 >=dev-qt/qtquickcontrols2-5.15.3:5 >=dev-qt/qtvirtualkeyboard-5.15.3:5 >=kde-frameworks/kirigami-5.94.0:5 >=kde-frameworks/kitemmodels-5.94.0:5[qml] sys-apps/hwdata x11-base/xwayland multimedia? ( >=dev-qt/qtmultimedia-5.15.3:5[gstreamer,qml] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=test !test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.25.0/kwin-5.25.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=0221120aa5a1cbeedbbdeb356e1a0507
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.25.0 b/metadata/md5-cache/kde-plasma/kwrited-5.25.0
new file mode 100644
index 000000000000..cddac0a8005e
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwrited-5.25.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.94.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.3:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kdbusaddons-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/knotifications-5.94.0:5 >=kde-frameworks/kpty-5.94.0:5 dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma daemon listening for wall and write messages
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+INHERIT=ecm kde.org
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.15.3:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kdbusaddons-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/knotifications-5.94.0:5 >=kde-frameworks/kpty-5.94.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.25.0/kwrited-5.25.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=0e277aa241875d927d0937d514d3c977
diff --git a/metadata/md5-cache/kde-plasma/layer-shell-qt-5.25.0 b/metadata/md5-cache/kde-plasma/layer-shell-qt-5.25.0
new file mode 100644
index 000000000000..6dc92d989490
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/layer-shell-qt-5.25.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-qt/qtwaylandscanner-5.15.3:5 dev-util/wayland-scanner virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.94.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdeclarative-5.15.3:5 || ( >=dev-qt/qtgui-5.15.3:5[libinput] >=dev-qt/qtgui-5.15.3:5[X] ) >=dev-qt/qtwayland-5.15.3:5= x11-libs/libxkbcommon dev-libs/wayland-protocols dev-qt/qtcore:5
+DESCRIPTION=Qt component to allow applications make use of Wayland wl-layer-shell protocol
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+INHERIT=ecm kde.org
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-3+
+RDEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdeclarative-5.15.3:5 || ( >=dev-qt/qtgui-5.15.3:5[libinput] >=dev-qt/qtgui-5.15.3:5[X] ) >=dev-qt/qtwayland-5.15.3:5= x11-libs/libxkbcommon || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.25.0/layer-shell-qt-5.25.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=75c680cae44bdce0ceb859d9cb3ba8a9
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.25.0 b/metadata/md5-cache/kde-plasma/libkscreen-5.25.0
new file mode 100644
index 000000000000..05b6c884d799
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/libkscreen-5.25.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-qt/qtwaylandscanner-5.15.3:5 dev-util/wayland-scanner dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.94.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtx11extras-5.15.3:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kwayland-5.94.0:5 x11-libs/libxcb >=dev-libs/plasma-wayland-protocols-1.6.0 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Plasma screen management library
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+INHERIT=ecm kde.org
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtx11extras-5.15.3:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kwayland-5.94.0:5 x11-libs/libxcb || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=test !test? ( test ) !test? ( test )
+SLOT=5/7
+SRC_URI=mirror://kde/stable/plasma/5.25.0/libkscreen-5.25.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=eeee6d9e5114a298aec13a27cec664ff
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.25.0 b/metadata/md5-cache/kde-plasma/libksysguard-5.25.0
new file mode 100644
index 000000000000..66660d004ac6
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/libksysguard-5.25.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) >=kde-frameworks/extra-cmake-modules-5.94.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/libnl:3 >=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtnetwork-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=kde-frameworks/kauth-5.94.0:5 >=kde-frameworks/kcompletion-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5[qml] >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kjobwidgets-5.94.0:5 >=kde-frameworks/knewstuff-5.94.0:5 >=kde-frameworks/kpackage-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 >=kde-frameworks/kwindowsystem-5.94.0:5 net-libs/libpcap sys-apps/lm-sensors:= sys-libs/libcap sys-libs/zlib webengine? ( >=dev-qt/qtwebchannel-5.15.3:5 >=dev-qt/qtwebengine-5.15.3:5 ) X? ( >=dev-qt/qtx11extras-5.15.3:5 x11-libs/libX11 x11-libs/libXres ) >=kde-frameworks/kiconthemes-5.94.0:5 X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Task management and system monitoring library
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+INHERIT=ecm kde.org
+IUSE=webengine X test debug designer test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=dev-libs/libnl:3 >=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtnetwork-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=kde-frameworks/kauth-5.94.0:5 >=kde-frameworks/kcompletion-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5[qml] >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kjobwidgets-5.94.0:5 >=kde-frameworks/knewstuff-5.94.0:5 >=kde-frameworks/kpackage-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 >=kde-frameworks/kwindowsystem-5.94.0:5 net-libs/libpcap sys-apps/lm-sensors:= sys-libs/libcap sys-libs/zlib webengine? ( >=dev-qt/qtwebchannel-5.15.3:5 >=dev-qt/qtwebengine-5.15.3:5 ) X? ( >=dev-qt/qtx11extras-5.15.3:5 x11-libs/libX11 x11-libs/libXres ) !<kde-plasma/ksysguard-5.21.90:5 !<kde-plasma/plasma-workspace-5.18.80:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/9
+SRC_URI=mirror://kde/stable/plasma/5.25.0/libksysguard-5.25.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=595f11c924d85eff7e0b3f37f0927835
diff --git a/metadata/md5-cache/kde-plasma/libkworkspace-5.25.0 b/metadata/md5-cache/kde-plasma/libkworkspace-5.25.0
new file mode 100644
index 000000000000..a51742b885ad
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/libkworkspace-5.25.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.94.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtx11extras-5.15.3:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kwindowsystem-5.94.0:5 >=kde-plasma/kscreenlocker-5.25.0:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau >=kde-frameworks/kinit-5.94.0:5 >=kde-plasma/kwin-5.25.0:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Workspace library to interact with the Plasma session manager
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+INHERIT=ecm kde.org
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtx11extras-5.15.3:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kwindowsystem-5.94.0:5 >=kde-plasma/kscreenlocker-5.25.0:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.25.0/plasma-workspace-5.25.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=cfa0596cc9dbfdcda464a94ae18c66ff
diff --git a/metadata/md5-cache/kde-plasma/milou-5.25.0 b/metadata/md5-cache/kde-plasma/milou-5.25.0
new file mode 100644
index 000000000000..778c7a7d5e65
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/milou-5.25.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.94.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kdeclarative-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kitemmodels-5.94.0:5 >=kde-frameworks/krunner-5.94.0:5 >=kde-frameworks/kservice-5.94.0:5 >=kde-frameworks/plasma-5.94.0:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Dedicated search application built on top of Baloo
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/milou
+INHERIT=ecm kde.org
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kdeclarative-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kitemmodels-5.94.0:5 >=kde-frameworks/krunner-5.94.0:5 >=kde-frameworks/kservice-5.94.0:5 >=kde-frameworks/plasma-5.94.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.25.0/milou-5.25.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=14b06710c771cddffe0b7b5d8e058671
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.25.0 b/metadata/md5-cache/kde-plasma/oxygen-5.25.0
new file mode 100644
index 000000000000..121a31f35de5
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/oxygen-5.25.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.94.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=dev-qt/qtx11extras-5.15.3:5 >=kde-frameworks/frameworkintegration-5.94.0:5 >=kde-frameworks/kcmutils-5.94.0:5 >=kde-frameworks/kcompletion-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kguiaddons-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 >=kde-frameworks/kwindowsystem-5.94.0:5 >=kde-plasma/kdecoration-5.25.0:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.94.0:5 ) >=kde-frameworks/kservice-5.94.0:5 dev-qt/qtcore:5
+DESCRIPTION=Oxygen visual style for the Plasma desktop
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/oxygen
+INHERIT=ecm kde.org
+IUSE=wayland debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+PDEPEND=>=kde-plasma/kde-cli-tools-5.25.0:5
+RDEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=dev-qt/qtx11extras-5.15.3:5 >=kde-frameworks/frameworkintegration-5.94.0:5 >=kde-frameworks/kcmutils-5.94.0:5 >=kde-frameworks/kcompletion-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kguiaddons-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 >=kde-frameworks/kwindowsystem-5.94.0:5 >=kde-plasma/kdecoration-5.25.0:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.94.0:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.25.0/oxygen-5.25.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=1020215c78696040339f01e6ac31bb4b
diff --git a/metadata/md5-cache/kde-frameworks/countryflags-5.94.0 b/metadata/md5-cache/kde-plasma/oxygen-sounds-5.25.0
similarity index 56%
rename from metadata/md5-cache/kde-frameworks/countryflags-5.94.0
rename to metadata/md5-cache/kde-plasma/oxygen-sounds-5.25.0
index 1901a2328aab..cad26f7a2de6 100644
--- a/metadata/md5-cache/kde-frameworks/countryflags-5.94.0
+++ b/metadata/md5-cache/kde-plasma/oxygen-sounds-5.25.0
@@ -1,15 +1,15 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.94:5
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.94.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=dev-qt/qtcore:5
-DESCRIPTION=Icons of flags for various countries
+DESCRIPTION=Oxygen sound theme for the Plasma desktop
 EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
+HOMEPAGE=https://invent.kde.org/plasma/oxygen-sounds
 INHERIT=ecm kde.org
 IUSE=debug
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=!<kde-frameworks/kdelibs4support-5.90.0:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5/5.94
-SRC_URI=mirror://kde/stable/frameworks/5.94/portingAids/kdelibs4support-5.94.0.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=0348dd7a57f452f2fe56ce59eb47601d
+LICENSE=GPL-2+
+RDEPEND=!<kde-plasma/oxygen-5.24.80 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.25.0/oxygen-sounds-5.25.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=75b9c0fa64af26933459797865ceb8c1
diff --git a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.25.0 b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.25.0
new file mode 100644
index 000000000000..1ffacdbd1583
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.25.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.94.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=kde-frameworks/kactivities-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kcrash-5.94.0:5 >=kde-frameworks/kdbusaddons-5.94.0:5 >=kde-frameworks/kfilemetadata-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kio-5.94.0:5 >=kde-frameworks/kjobwidgets-5.94.0:5 >=kde-frameworks/knotifications-5.94.0:5 >=kde-frameworks/krunner-5.94.0:5 >=kde-frameworks/purpose-5.94.0:5 >=kde-plasma/plasma-workspace-5.25.0:5 dev-qt/qtcore:5
+DESCRIPTION=Integrate Chrome/Firefox better into Plasma through browser extensions
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop https://community.kde.org/Plasma/Browser_Integration
+INHERIT=ecm kde.org
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=kde-frameworks/kactivities-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kcrash-5.94.0:5 >=kde-frameworks/kdbusaddons-5.94.0:5 >=kde-frameworks/kfilemetadata-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kio-5.94.0:5 >=kde-frameworks/kjobwidgets-5.94.0:5 >=kde-frameworks/knotifications-5.94.0:5 >=kde-frameworks/krunner-5.94.0:5 >=kde-frameworks/purpose-5.94.0:5 >=kde-plasma/plasma-workspace-5.25.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.25.0/plasma-browser-integration-5.25.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=30be4a6f40d137486ba2950b56b18beb
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.25.0 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.25.0
new file mode 100644
index 000000000000..d60cbc7afef3
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.25.0
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.94.0:5 ) >=kde-frameworks/extra-cmake-modules-5.94.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtconcurrent-5.15.3:5 >=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtnetwork-5.15.3:5 >=dev-qt/qtprintsupport-5.15.3:5 >=dev-qt/qtsql-5.15.3:5 >=dev-qt/qtsvg-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=dev-qt/qtx11extras-5.15.3:5 >=dev-qt/qtxml-5.15.3:5 >=kde-frameworks/attica-5.94.0:5 >=kde-frameworks/kactivities-5.94.0:5 >=kde-frameworks/kactivities-stats-5.94.0:5 >=kde-frameworks/karchive-5.94.0:5 >=kde-frameworks/kauth-5.94.0:5 >=kde-frameworks/kbookmarks-5.94.0:5 >=kde-frameworks/kcmutils-5.94.0:5 >=kde-frameworks/kcodecs-5.94.0:5 >=kde-frameworks/kcompletion-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kcrash-5.94.0:5 >=kde-frameworks/kdbusaddons-5.94.0:5 >=kde-frameworks/kdeclarative-5.94.0:5 >=kde-frameworks/kded-5.94.0:5 >=kde-frameworks/kdelibs4support-5.94.0:5 >=kde-frameworks/kglobalaccel-5.94.0:5 >=kde-frameworks/kguiaddons-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kiconthemes-5.94.0:5 >=kde-frameworks/kio-5.94.0:5 >=kde-frameworks/kitemmodels-5.94.0:5 >=kde-frameworks/kitemviews-5.94.0:5 >=kde-frameworks/kjobwidgets-5.94.0:5 >=kde-frameworks/knewstuff-5.94.0:5 >=kde-frameworks/knotifications-5.94.0:5 >=kde-frameworks/knotifyconfig-5.94.0:5 >=kde-frameworks/kparts-5.94.0:5 >=kde-frameworks/krunner-5.94.0:5 >=kde-frameworks/kservice-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 >=kde-frameworks/kwindowsystem-5.94.0:5 >=kde-frameworks/kxmlgui-5.94.0:5 >=kde-frameworks/plasma-5.94.0:5 >=kde-frameworks/solid-5.94.0:5 >=kde-frameworks/sonnet-5.94.0:5 >=kde-plasma/kwin-5.25.0:5 >=kde-plasma/libksysguard-5.25.0:5 >=kde-plasma/libkworkspace-5.25.0:5 >=kde-plasma/plasma-workspace-5.25.0:5 >=media-libs/phonon-4.11.0 x11-libs/libX11 x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb[xkb] x11-libs/libxkbfile emoji? ( app-i18n/ibus[emoji] dev-libs/glib:2 media-fonts/noto-emoji ) ibus? ( app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtx11extras-5.15.3:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) kaccounts? ( kde-apps/kaccounts-integration:5 net-libs/accounts-qt ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.94.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) dev-libs/boost x11-base/xorg-proto test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma desktop
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+INHERIT=ecm kde.org optfeature
+IUSE=emoji ibus +kaccounts scim +semantic-desktop telemetry test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtconcurrent-5.15.3:5 >=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtnetwork-5.15.3:5 >=dev-qt/qtprintsupport-5.15.3:5 >=dev-qt/qtsql-5.15.3:5 >=dev-qt/qtsvg-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=dev-qt/qtx11extras-5.15.3:5 >=dev-qt/qtxml-5.15.3:5 >=kde-frameworks/attica-5.94.0:5 >=kde-frameworks/kactivities-5.94.0:5 >=kde-frameworks/kactivities-stats-5.94.0:5 >=kde-frameworks/karchive-5.94.0:5 >=kde-frameworks/kauth-5.94.0:5 >=kde-frameworks/kbookmarks-5.94.0:5 >=kde-frameworks/kcmutils-5.94.0:5 >=kde-frameworks/kcodecs-5.94.0:5 >=kde-frameworks/kcompletion-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kcrash-5.94.0:5 >=kde-frameworks/kdbusaddons-5.94.0:5 >=kde-frameworks/kdeclarative-5.94.0:5 >=kde-frameworks/kded-5.94.0:5 >=kde-frameworks/kdelibs4support-5.94.0:5 >=kde-frameworks/kglobalaccel-5.94.0:5 >=kde-frameworks/kguiaddons-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kiconthemes-5.94.0:5 >=kde-frameworks/kio-5.94.0:5 >=kde-frameworks/kitemmodels-5.94.0:5 >=kde-frameworks/kitemviews-5.94.0:5 >=kde-frameworks/kjobwidgets-5.94.0:5 >=kde-frameworks/knewstuff-5.94.0:5 >=kde-frameworks/knotifications-5.94.0:5 >=kde-frameworks/knotifyconfig-5.94.0:5 >=kde-frameworks/kparts-5.94.0:5 >=kde-frameworks/krunner-5.94.0:5 >=kde-frameworks/kservice-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 >=kde-frameworks/kwindowsystem-5.94.0:5 >=kde-frameworks/kxmlgui-5.94.0:5 >=kde-frameworks/plasma-5.94.0:5 >=kde-frameworks/solid-5.94.0:5 >=kde-frameworks/sonnet-5.94.0:5 >=kde-plasma/kwin-5.25.0:5 >=kde-plasma/libksysguard-5.25.0:5 >=kde-plasma/libkworkspace-5.25.0:5 >=kde-plasma/plasma-workspace-5.25.0:5 >=media-libs/phonon-4.11.0 x11-libs/libX11 x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb[xkb] x11-libs/libxkbfile emoji? ( app-i18n/ibus[emoji] dev-libs/glib:2 media-fonts/noto-emoji ) ibus? ( app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtx11extras-5.15.3:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) kaccounts? ( kde-apps/kaccounts-integration:5 net-libs/accounts-qt ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.94.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) !kde-plasma/user-manager >=dev-qt/qtgraphicaleffects-5.15.3:5 >=dev-qt/qtquickcontrols2-5.15.3:5 >=kde-frameworks/kirigami-5.94.0:5 >=kde-frameworks/qqc2-desktop-style-5.94.0:5 >=kde-plasma/kde-cli-tools-5.25.0:5 >=kde-plasma/oxygen-5.25.0:5 sys-apps/util-linux x11-apps/setxkbmap x11-misc/xdg-user-dirs kaccounts? ( net-libs/signon-oauth2 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.25.0/plasma-desktop-5.25.0.tar.xz https://dev.gentoo.org/~asturm/distfiles/plasma-desktop-override-include-dirs-1.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=311bb86da4a565e797cfdacd5ad114be
diff --git a/metadata/md5-cache/kde-plasma/plasma-disks-5.25.0 b/metadata/md5-cache/kde-plasma/plasma-disks-5.25.0
new file mode 100644
index 000000000000..8109f0e9b38a
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-disks-5.25.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.94.0:5 ) >=kde-frameworks/extra-cmake-modules-5.94.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=kde-frameworks/kauth-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kdbusaddons-5.94.0:5 >=kde-frameworks/kdeclarative-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kio-5.94.0:5 >=kde-frameworks/kjobwidgets-5.94.0:5 >=kde-frameworks/knotifications-5.94.0:5 >=kde-frameworks/kservice-5.94.0:5 >=kde-frameworks/solid-5.94.0:5 sys-apps/smartmontools dev-qt/qtcore:5
+DESCRIPTION=Monitors S.M.A.R.T. capable devices for imminent failure
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/plasma-disks
+INHERIT=ecm kde.org
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=|| ( GPL-3 GPL-2 )
+RDEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=kde-frameworks/kauth-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kdbusaddons-5.94.0:5 >=kde-frameworks/kdeclarative-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kio-5.94.0:5 >=kde-frameworks/kjobwidgets-5.94.0:5 >=kde-frameworks/knotifications-5.94.0:5 >=kde-frameworks/kservice-5.94.0:5 >=kde-frameworks/solid-5.94.0:5 sys-apps/smartmontools kde-plasma/kinfocenter:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.25.0/plasma-disks-5.25.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=2a34827b54f1a6bf04fbe3bff96f5aee
diff --git a/metadata/md5-cache/kde-plasma/plasma-firewall-5.25.0 b/metadata/md5-cache/kde-plasma/plasma-firewall-5.25.0
new file mode 100644
index 000000000000..7f58c9b92de9
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-firewall-5.25.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.94.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtnetwork-5.15.3:5 >=dev-qt/qtx11extras-5.15.3:5 >=dev-qt/qtxml-5.15.3:5 >=kde-frameworks/kauth-5.94.0:5 >=kde-frameworks/kcmutils-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kdeclarative-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 dev-qt/qtcore:5
+DESCRIPTION=Plasma frontend for Firewalld or UFW
+EAPI=8
+HOMEPAGE=https://invent.kde.org/network/plasma-firewall
+INHERIT=ecm kde.org python-single-r1
+IUSE=firewalld +ufw debug python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtnetwork-5.15.3:5 >=dev-qt/qtx11extras-5.15.3:5 >=dev-qt/qtxml-5.15.3:5 >=kde-frameworks/kauth-5.94.0:5 >=kde-frameworks/kcmutils-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kdeclarative-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) firewalld? ( net-firewall/firewalld ) ufw? ( net-firewall/ufw ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) || ( firewalld ufw )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.25.0/plasma-firewall-5.25.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=b6b8e4b6ba7aaf1e99da4d216e7238cd
diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.25.0 b/metadata/md5-cache/kde-plasma/plasma-integration-5.25.0
new file mode 100644
index 000000000000..09adbbfdb5f4
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-integration-5.25.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-qt/qtwaylandscanner-5.15.3:5 dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.94.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5=[dbus] >=dev-qt/qtquickcontrols2-5.15.3:5 >=dev-qt/qtwayland-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=dev-qt/qtx11extras-5.15.3:5 >=kde-frameworks/kcompletion-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kiconthemes-5.94.0:5 >=kde-frameworks/kio-5.94.0:5 >=kde-frameworks/kjobwidgets-5.94.0:5 >=kde-frameworks/knotifications-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 >=kde-frameworks/kwindowsystem-5.94.0:5 >=kde-frameworks/kxmlgui-5.94.0:5 >=kde-plasma/breeze-5.25.0:5 x11-libs/libXcursor x11-libs/libxcb >=dev-libs/plasma-wayland-protocols-1.6.0 dev-qt/qtcore:5
+DESCRIPTION=Qt Platform Theme integration plugins for the Plasma workspaces
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+INHERIT=ecm kde.org
+IUSE=test debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5=[dbus] >=dev-qt/qtquickcontrols2-5.15.3:5 >=dev-qt/qtwayland-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=dev-qt/qtx11extras-5.15.3:5 >=kde-frameworks/kcompletion-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kiconthemes-5.94.0:5 >=kde-frameworks/kio-5.94.0:5 >=kde-frameworks/kjobwidgets-5.94.0:5 >=kde-frameworks/knotifications-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 >=kde-frameworks/kwindowsystem-5.94.0:5 >=kde-frameworks/kxmlgui-5.94.0:5 >=kde-plasma/breeze-5.25.0:5 x11-libs/libXcursor x11-libs/libxcb media-fonts/hack media-fonts/noto || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=test !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.25.0/plasma-integration-5.25.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=175b0b91a1ae39c778a4b30e113f2f36
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.25.0 b/metadata/md5-cache/kde-plasma/plasma-meta-5.25.0
new file mode 100644
index 000000000000..2f98b31da871
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-meta-5.25.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=postinst
+DESCRIPTION=Merge this to pull in all Plasma 5 packages
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop/
+IUSE=accessibility bluetooth +browser-integration colord +crash-handler crypt +desktop-portal discover +display-manager +elogind +firewall grub gtk +handbook +kwallet +legacy-systray +networkmanager plymouth pulseaudio +sddm sdk +smart systemd thunderbolt +wallpapers
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-plasma/breeze-5.25.0:5 >=kde-plasma/kactivitymanagerd-5.25.0:5 >=kde-plasma/kde-cli-tools-5.25.0:5 >=kde-plasma/kdecoration-5.25.0:5 >=kde-plasma/kdeplasma-addons-5.25.0:5 >=kde-plasma/kgamma-5.25.0:5 >=kde-plasma/khotkeys-5.25.0:5 >=kde-plasma/kinfocenter-5.25.0:5 >=kde-plasma/kmenuedit-5.25.0:5 >=kde-plasma/kscreen-5.25.0:5 >=kde-plasma/kscreenlocker-5.25.0:5 >=kde-plasma/ksshaskpass-5.25.0:5 >=kde-plasma/ksystemstats-5.25.0:5 >=kde-plasma/kwayland-integration-5.25.0:5 >=kde-plasma/kwin-5.25.0:5[lock] >=kde-plasma/kwrited-5.25.0:5 >=kde-plasma/layer-shell-qt-5.25.0:5 >=kde-plasma/libkscreen-5.25.0:5 >=kde-plasma/libksysguard-5.25.0:5 >=kde-plasma/milou-5.25.0:5 >=kde-plasma/oxygen-5.25.0:5 >=kde-plasma/oxygen-sounds-5.25.0:5 >=kde-plasma/plasma-desktop-5.25.0:5 >=kde-plasma/plasma-integration-5.25.0:5 >=kde-plasma/plasma-systemmonitor-5.25.0:5 >=kde-plasma/plasma-workspace-5.25.0:5 >=kde-plasma/polkit-kde-agent-5.25.0:5 >=kde-plasma/powerdevil-5.25.0:5 >=kde-plasma/systemsettings-5.25.0:5 sys-apps/dbus[elogind?,systemd?] sys-auth/polkit[systemd?] sys-fs/udisks:2[elogind?,systemd?] bluetooth? ( >=kde-plasma/bluedevil-5.25.0:5 ) browser-integration? ( >=kde-plasma/plasma-browser-integration-5.25.0:5 ) colord? ( x11-misc/colord ) crash-handler? ( >=kde-plasma/drkonqi-5.25.0:5 ) crypt? ( >=kde-plasma/plasma-vault-5.25.0:5 ) desktop-portal? ( >=kde-plasma/xdg-desktop-portal-kde-5.25.0:5 ) discover? ( >=kde-plasma/discover-5.25.0:5 ) display-manager? ( sddm? ( >=kde-plasma/sddm-kcm-5.25.0:5 x11-misc/sddm[elogind?,systemd?] ) !sddm? ( x11-misc/lightdm ) ) elogind? ( sys-auth/elogind[pam] ) grub? ( >=kde-plasma/breeze-grub-5.25.0:5 ) gtk? ( >=kde-plasma/breeze-gtk-5.25.0:5 >=kde-plasma/kde-gtk-config-5.25.0:5 x11-misc/appmenu-gtk-module ) handbook? ( kde-apps/khelpcenter:5 ) kwallet? ( >=kde-plasma/kwallet-pam-5.25.0:5 ) legacy-systray? ( >=kde-plasma/xembed-sni-proxy-5.25.0:5 ) networkmanager? ( >=kde-plasma/plasma-nm-5.25.0:5 net-misc/networkmanager[elogind?,systemd?] ) plymouth? ( >=kde-plasma/breeze-plymouth-5.25.0:5 >=kde-plasma/plymouth-kcm-5.25.0:5 ) pulseaudio? ( >=kde-plasma/plasma-pa-5.25.0:5 ) sdk? ( >=kde-plasma/plasma-sdk-5.25.0:5 ) smart? ( >=kde-plasma/plasma-disks-5.25.0:5 ) systemd? ( sys-apps/systemd[pam] firewall? ( >=kde-plasma/plasma-firewall-5.25.0:5 ) ) thunderbolt? ( >=kde-plasma/plasma-thunderbolt-5.25.0:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.25.0:5 ) accessibility? ( app-accessibility/orca )
+REQUIRED_USE=^^ ( elogind systemd )
+SLOT=5
+_md5_=9c9d5b85d35ef1b4adace2b1da43550a
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.25.0 b/metadata/md5-cache/kde-plasma/plasma-nm-5.25.0
new file mode 100644
index 000000000000..70683b0f3223
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-nm-5.25.0
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.94.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=app-crypt/qca-2.3.0:2 >=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5[widgets] >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtnetwork-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=kde-frameworks/kcompletion-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kdbusaddons-5.94.0:5 >=kde-frameworks/kdeclarative-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kio-5.94.0:5 >=kde-frameworks/kitemviews-5.94.0:5 >=kde-frameworks/knotifications-5.94.0:5 >=kde-frameworks/kservice-5.94.0:5 >=kde-frameworks/kwallet-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 >=kde-frameworks/kwindowsystem-5.94.0:5 >=kde-frameworks/kxmlgui-5.94.0:5 >=kde-frameworks/networkmanager-qt-5.94.0:5[teamd=] >=kde-frameworks/plasma-5.94.0:5 >=kde-frameworks/solid-5.94.0:5 net-misc/networkmanager[teamd=] modemmanager? ( >=dev-qt/qtxml-5.15.3:5 >=kde-frameworks/modemmanager-qt-5.94.0:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.15.3:5 net-vpn/networkmanager-openconnect net-vpn/openconnect:= ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma applet for NetworkManager
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+INHERIT=ecm kde.org
+IUSE=modemmanager openconnect teamd debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=app-crypt/qca-2.3.0:2 >=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5[widgets] >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtnetwork-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=kde-frameworks/kcompletion-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kdbusaddons-5.94.0:5 >=kde-frameworks/kdeclarative-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kio-5.94.0:5 >=kde-frameworks/kitemviews-5.94.0:5 >=kde-frameworks/knotifications-5.94.0:5 >=kde-frameworks/kservice-5.94.0:5 >=kde-frameworks/kwallet-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 >=kde-frameworks/kwindowsystem-5.94.0:5 >=kde-frameworks/kxmlgui-5.94.0:5 >=kde-frameworks/networkmanager-qt-5.94.0:5[teamd=] >=kde-frameworks/plasma-5.94.0:5 >=kde-frameworks/solid-5.94.0:5 net-misc/networkmanager[teamd=] modemmanager? ( >=dev-qt/qtxml-5.15.3:5 >=kde-frameworks/modemmanager-qt-5.94.0:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.15.3:5 net-vpn/networkmanager-openconnect net-vpn/openconnect:= ) >=dev-qt/qtquickcontrols-5.15.3:5 >=dev-qt/qtquickcontrols2-5.15.3:5 >=kde-frameworks/kirigami-5.94.0:5 >=kde-plasma/kde-cli-tools-5.25.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.25.0/plasma-nm-5.25.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=d01aa93f19690f3dcffd921319d99ea3
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.25.0 b/metadata/md5-cache/kde-plasma/plasma-pa-5.25.0
new file mode 100644
index 000000000000..0274e1935c60
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-pa-5.25.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.94.0:5 ) >=kde-frameworks/extra-cmake-modules-5.94.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/glib:2 >=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kdeclarative-5.94.0:5 >=kde-frameworks/kglobalaccel-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/plasma-5.94.0:5 media-libs/libcanberra media-sound/pulseaudio dev-qt/qtcore:5
+DESCRIPTION=Plasma applet for audio volume management using PulseAudio
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+INHERIT=ecm kde.org
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 >=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kdeclarative-5.94.0:5 >=kde-frameworks/kglobalaccel-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/plasma-5.94.0:5 media-libs/libcanberra media-sound/pulseaudio >=dev-qt/qtquickcontrols2-5.15.3:5 >=kde-frameworks/kirigami-5.94.0:5 || ( media-video/pipewire media-sound/pulseaudio-daemon media-sound/pulseaudio[daemon(+)] ) x11-themes/sound-theme-freedesktop || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.25.0/plasma-pa-5.25.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=2e0dcf7195a2d49b8c17214cbdea23f7
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.25.0 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.25.0
new file mode 100644
index 000000000000..4c78811a3576
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-sdk-5.25.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.94.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=dev-qt/qtxml-5.15.3:5 >=kde-frameworks/karchive-5.94.0:5 >=kde-frameworks/kcompletion-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kdbusaddons-5.94.0:5 >=kde-frameworks/kdeclarative-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kiconthemes-5.94.0:5 >=kde-frameworks/kio-5.94.0:5 >=kde-frameworks/kpackage-5.94.0:5 >=kde-frameworks/kservice-5.94.0:5 >=kde-frameworks/ktexteditor-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 >=kde-frameworks/plasma-5.94.0:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Useful applications for Plasma development
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+INHERIT=ecm kde.org
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=dev-qt/qtxml-5.15.3:5 >=kde-frameworks/karchive-5.94.0:5 >=kde-frameworks/kcompletion-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kdbusaddons-5.94.0:5 >=kde-frameworks/kdeclarative-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kiconthemes-5.94.0:5 >=kde-frameworks/kio-5.94.0:5 >=kde-frameworks/kpackage-5.94.0:5 >=kde-frameworks/kservice-5.94.0:5 >=kde-frameworks/ktexteditor-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 >=kde-frameworks/plasma-5.94.0:5 >=dev-qt/qtquickcontrols-5.15.3:5 >=dev-qt/qtquickcontrols2-5.15.3:5 >=kde-frameworks/kirigami-5.94.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.25.0/plasma-sdk-5.25.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=1226f41ea55964768084253377e7f02f
diff --git a/metadata/md5-cache/kde-plasma/plasma-systemmonitor-5.25.0 b/metadata/md5-cache/kde-plasma/plasma-systemmonitor-5.25.0
new file mode 100644
index 000000000000..9cecf034bc56
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-systemmonitor-5.25.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.94.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kdbusaddons-5.94.0:5 >=kde-frameworks/kdeclarative-5.94.0:5 >=kde-frameworks/kglobalaccel-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kio-5.94.0:5 >=kde-frameworks/kitemmodels-5.94.0:5 >=kde-frameworks/knewstuff-5.94.0:5 >=kde-frameworks/kservice-5.94.0:5 >=kde-plasma/libksysguard-5.25.0:5 dev-qt/qtcore:5
+DESCRIPTION=Monitor system sensors, process information and other system resources
+EAPI=8
+HOMEPAGE=https://apps.kde.org/plasma-systemmonitor/
+INHERIT=ecm kde.org
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=|| ( GPL-3 GPL-2 )
+RDEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kdbusaddons-5.94.0:5 >=kde-frameworks/kdeclarative-5.94.0:5 >=kde-frameworks/kglobalaccel-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kio-5.94.0:5 >=kde-frameworks/kitemmodels-5.94.0:5 >=kde-frameworks/knewstuff-5.94.0:5 >=kde-frameworks/kservice-5.94.0:5 >=kde-plasma/libksysguard-5.25.0:5 >=dev-qt/qtquickcontrols2-5.15.3:5 >=kde-frameworks/kirigami-5.94.0:5 >=kde-frameworks/kitemmodels-5.94.0:5[qml] >=kde-frameworks/kquickcharts-5.94.0:5 >=kde-plasma/ksystemstats-5.25.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.25.0/plasma-systemmonitor-5.25.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=19175d2298a648de9a1d9ca8575ec16a
diff --git a/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.25.0 b/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.25.0
new file mode 100644
index 000000000000..90df021bfc2a
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.25.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.94.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=kde-frameworks/kcmutils-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kdbusaddons-5.94.0:5 >=kde-frameworks/kdeclarative-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/knotifications-5.94.0:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Plasma integration for controlling Thunderbolt devices
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/plasma-thunderbolt
+INHERIT=ecm kde.org
+IUSE=debug test
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=|| ( GPL-2 GPL-3+ )
+RDEPEND=>=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=kde-frameworks/kcmutils-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kdbusaddons-5.94.0:5 >=kde-frameworks/kdeclarative-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/knotifications-5.94.0:5 >=dev-qt/qtquickcontrols2-5.15.3:5 >=kde-frameworks/kirigami-5.94.0:5 sys-apps/bolt || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=test !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.25.0/plasma-thunderbolt-5.25.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=6d9bfc8b45dffcf62c0d1707afbadfc0
diff --git a/metadata/md5-cache/kde-plasma/plasma-vault-5.25.0 b/metadata/md5-cache/kde-plasma/plasma-vault-5.25.0
new file mode 100644
index 000000000000..b96c4238b7df
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-vault-5.25.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.94.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=kde-frameworks/kactivities-5.94.0:5 >=kde-frameworks/kcodecs-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kdbusaddons-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kio-5.94.0:5 >=kde-frameworks/plasma-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 >=kde-plasma/libksysguard-5.25.0:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.94.0:5 ) dev-qt/qtcore:5
+DESCRIPTION=Plasma applet and services for creating encrypted vaults
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop https://cukic.co/2017/02/03/vaults-encryption-in-plasma/
+INHERIT=ecm kde.org
+IUSE=networkmanager debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-3
+RDEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=kde-frameworks/kactivities-5.94.0:5 >=kde-frameworks/kcodecs-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kdbusaddons-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kio-5.94.0:5 >=kde-frameworks/plasma-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 >=kde-plasma/libksysguard-5.25.0:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.94.0:5 ) >=dev-qt/qtquickcontrols2-5.15.3:5 || ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.25.0/plasma-vault-5.25.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=29c3a1606fee178381624409eee03687
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.25.0 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.25.0
new file mode 100644
index 000000000000..975368ca8de5
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.25.0
@@ -0,0 +1,18 @@
+BDEPEND=>=dev-qt/qtwaylandscanner-5.15.3:5 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.94.0:5 ) >=kde-frameworks/extra-cmake-modules-5.94.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5[widgets] >=dev-qt/qtgui-5.15.3:5=[jpeg,libinput] >=dev-qt/qtnetwork-5.15.3:5 >=dev-qt/qtsql-5.15.3:5 >=dev-qt/qtsvg-5.15.3:5 >=dev-qt/qtwayland-5.15.3:5= >=dev-qt/qtwidgets-5.15.3:5 >=dev-qt/qtx11extras-5.15.3:5 >=dev-qt/qtxml-5.15.3:5 >=kde-frameworks/kactivities-5.94.0:5 >=kde-frameworks/kactivities-stats-5.94.0:5 >=kde-frameworks/karchive-5.94.0:5 >=kde-frameworks/kauth-5.94.0:5 >=kde-frameworks/kbookmarks-5.94.0:5 >=kde-frameworks/kcompletion-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kcrash-5.94.0:5 >=kde-frameworks/kdbusaddons-5.94.0:5 >=kde-frameworks/kdeclarative-5.94.0:5 >=kde-frameworks/kded-5.94.0:5 >=kde-frameworks/kglobalaccel-5.94.0:5 >=kde-frameworks/kguiaddons-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kiconthemes-5.94.0:5 >=kde-frameworks/kidletime-5.94.0:5 >=kde-frameworks/kinit-5.94.0:5 >=kde-frameworks/kio-5.94.0:5 >=kde-frameworks/kitemmodels-5.94.0:5 >=kde-frameworks/kitemviews-5.94.0:5 >=kde-frameworks/kjobwidgets-5.94.0:5 >=kde-frameworks/knewstuff-5.94.0:5 >=kde-frameworks/knotifications-5.94.0:5 >=kde-frameworks/knotifyconfig-5.94.0:5 >=kde-frameworks/kpackage-5.94.0:5 >=kde-frameworks/kpeople-5.94.0:5 >=kde-frameworks/krunner-5.94.0:5 >=kde-frameworks/kservice-5.94.0:5 >=kde-frameworks/ktexteditor-5.94.0:5 >=kde-frameworks/ktextwidgets-5.94.0:5 >=kde-frameworks/kunitconversion-5.94.0:5 >=kde-frameworks/kwallet-5.94.0:5 >=kde-frameworks/kwayland-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 >=kde-frameworks/kwindowsystem-5.94.0:5 >=kde-frameworks/kxmlgui-5.94.0:5 >=kde-frameworks/plasma-5.94.0:5 >=kde-frameworks/prison-5.94.0:5[qml] >=kde-frameworks/solid-5.94.0:5 >=kde-plasma/breeze-5.25.0:5 >=kde-plasma/kscreenlocker-5.25.0:5 >=kde-plasma/kwin-5.25.0:5 >=kde-plasma/layer-shell-qt-5.25.0:5 >=kde-plasma/libkscreen-5.25.0:5 >=kde-plasma/libksysguard-5.25.0:5 >=kde-plasma/libkworkspace-5.25.0:5 >=media-libs/phonon-4.11.0 sci-libs/libqalculate:= sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-frameworks/kholidays-5.94.0:5 ) fontconfig? ( >=dev-qt/qtprintsupport-5.15.3:5 media-libs/fontconfig x11-libs/libXft x11-libs/xcb-util-image ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.94.0:5 ) gps? ( sci-geosciences/gpsd ) policykit? ( virtual/libcrypt:= ) screencast? ( >=dev-qt/qtgui-5.15.3:5=[egl] media-libs/libglvnd >=media-video/pipewire-0.3:= x11-libs/libdrm ) semantic-desktop? ( >=kde-frameworks/baloo-5.94.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) >=dev-libs/plasma-wayland-protocols-1.6.0 >=dev-qt/qtconcurrent-5.15.3:5 >=dev-util/wayland-scanner-1.19.0 x11-base/xorg-proto fontconfig? ( x11-libs/libXrender ) test? ( >=dev-libs/wayland-protocols-1.24 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma workspace
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+INHERIT=ecm kde.org
+IUSE=appstream +calendar +fontconfig geolocation gps +policykit screencast +semantic-desktop telemetry test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+PDEPEND=>=kde-plasma/kde-cli-tools-5.25.0:5
+RDEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5[widgets] >=dev-qt/qtgui-5.15.3:5=[jpeg,libinput] >=dev-qt/qtnetwork-5.15.3:5 >=dev-qt/qtsql-5.15.3:5 >=dev-qt/qtsvg-5.15.3:5 >=dev-qt/qtwayland-5.15.3:5= >=dev-qt/qtwidgets-5.15.3:5 >=dev-qt/qtx11extras-5.15.3:5 >=dev-qt/qtxml-5.15.3:5 >=kde-frameworks/kactivities-5.94.0:5 >=kde-frameworks/kactivities-stats-5.94.0:5 >=kde-frameworks/karchive-5.94.0:5 >=kde-frameworks/kauth-5.94.0:5 >=kde-frameworks/kbookmarks-5.94.0:5 >=kde-frameworks/kcompletion-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kcrash-5.94.0:5 >=kde-frameworks/kdbusaddons-5.94.0:5 >=kde-frameworks/kdeclarative-5.94.0:5 >=kde-frameworks/kded-5.94.0:5 >=kde-frameworks/kglobalaccel-5.94.0:5 >=kde-frameworks/kguiaddons-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kiconthemes-5.94.0:5 >=kde-frameworks/kidletime-5.94.0:5 >=kde-frameworks/kinit-5.94.0:5 >=kde-frameworks/kio-5.94.0:5 >=kde-frameworks/kitemmodels-5.94.0:5 >=kde-frameworks/kitemviews-5.94.0:5 >=kde-frameworks/kjobwidgets-5.94.0:5 >=kde-frameworks/knewstuff-5.94.0:5 >=kde-frameworks/knotifications-5.94.0:5 >=kde-frameworks/knotifyconfig-5.94.0:5 >=kde-frameworks/kpackage-5.94.0:5 >=kde-frameworks/kpeople-5.94.0:5 >=kde-frameworks/krunner-5.94.0:5 >=kde-frameworks/kservice-5.94.0:5 >=kde-frameworks/ktexteditor-5.94.0:5 >=kde-frameworks/ktextwidgets-5.94.0:5 >=kde-frameworks/kunitconversion-5.94.0:5 >=kde-frameworks/kwallet-5.94.0:5 >=kde-frameworks/kwayland-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 >=kde-frameworks/kwindowsystem-5.94.0:5 >=kde-frameworks/kxmlgui-5.94.0:5 >=kde-frameworks/plasma-5.94.0:5 >=kde-frameworks/prison-5.94.0:5[qml] >=kde-frameworks/solid-5.94.0:5 >=kde-plasma/breeze-5.25.0:5 >=kde-plasma/kscreenlocker-5.25.0:5 >=kde-plasma/kwin-5.25.0:5 >=kde-plasma/layer-shell-qt-5.25.0:5 >=kde-plasma/libkscreen-5.25.0:5 >=kde-plasma/libksysguard-5.25.0:5 >=kde-plasma/libkworkspace-5.25.0:5 >=media-libs/phonon-4.11.0 sci-libs/libqalculate:= sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-frameworks/kholidays-5.94.0:5 ) fontconfig? ( >=dev-qt/qtprintsupport-5.15.3:5 media-libs/fontconfig x11-libs/libXft x11-libs/xcb-util-image ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.94.0:5 ) gps? ( sci-geosciences/gpsd ) policykit? ( virtual/libcrypt:= ) screencast? ( >=dev-qt/qtgui-5.15.3:5=[egl] media-libs/libglvnd >=media-video/pipewire-0.3:= x11-libs/libdrm ) semantic-desktop? ( >=kde-frameworks/baloo-5.94.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) app-text/iso-codes >=dev-qt/qdbus-5.15.3:* >=dev-qt/qtgraphicaleffects-5.15.3:5 >=dev-qt/qtpaths-5.15.3:5 >=dev-qt/qtquickcontrols-5.15.3:5[widgets] >=dev-qt/qtquickcontrols2-5.15.3:5 kde-apps/kio-extras:5 >=kde-frameworks/kirigami-5.94.0:5 >=kde-frameworks/kquickcharts-5.94.0:5 >=kde-plasma/milou-5.25.0:5 >=kde-plasma/plasma-integration-5.25.0:5 sys-apps/dbus x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xsetroot !<kde-plasma/breeze-5.22.90:5 !<kde-plasma/plasma-desktop-5.23.90:5 policykit? ( sys-apps/accountsservice ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=gps? ( geolocation )
+RESTRICT=test !test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.25.0/plasma-workspace-5.25.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=7c48490eff15fb73af3bd45afbf65c64
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.25.0 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.25.0
new file mode 100644
index 000000000000..10e0ef89480f
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.25.0
@@ -0,0 +1,12 @@
+BDEPEND=dev-qt/qtcore:5 kde-frameworks/extra-cmake-modules:5 dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install nofetch prepare test unpack
+DESCRIPTION=Wallpapers for the Plasma workspace
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+INHERIT=cmake kde.org
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.25.0/plasma-workspace-wallpapers-5.25.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=70fa623e6493a4982988b1535537e46e
diff --git a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.25.0 b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.25.0
new file mode 100644
index 000000000000..6e6ba705d985
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.25.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.94.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtquickcontrols-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=kde-frameworks/karchive-5.94.0:5 >=kde-frameworks/kauth-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kdeclarative-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kio-5.94.0:5 >=kde-frameworks/knewstuff-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 sys-boot/plymouth dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma control module for Plymouth
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/plymouth-kcm
+INHERIT=ecm kde.org
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtquickcontrols-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=kde-frameworks/karchive-5.94.0:5 >=kde-frameworks/kauth-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kdeclarative-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kio-5.94.0:5 >=kde-frameworks/knewstuff-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 sys-boot/plymouth >=kde-plasma/kde-cli-tools-5.25.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.25.0/plymouth-kcm-5.25.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=754a8bbcd620bca9b5b79d5d65551bd6
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.25.0 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.25.0
new file mode 100644
index 000000000000..1231b7af4b7b
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.25.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.94.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kcrash-5.94.0:5 >=kde-frameworks/kdbusaddons-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kiconthemes-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 >=kde-frameworks/kwindowsystem-5.94.0:5 >=sys-auth/polkit-qt-0.113.0 dev-qt/qtcore:5
+DESCRIPTION=PolKit agent module for KDE Plasma
+EAPI=8
+HOMEPAGE=https://kde.org/
+INHERIT=ecm kde.org
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kcrash-5.94.0:5 >=kde-frameworks/kdbusaddons-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kiconthemes-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 >=kde-frameworks/kwindowsystem-5.94.0:5 >=sys-auth/polkit-qt-0.113.0 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.25.0/polkit-kde-agent-1-5.25.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=24d976557237951101b341052881dcc6
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.25.0 b/metadata/md5-cache/kde-plasma/powerdevil-5.25.0
new file mode 100644
index 000000000000..8dd56e24bdad
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/powerdevil-5.25.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.94.0:5 ) >=kde-frameworks/extra-cmake-modules-5.94.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=dev-qt/qtx11extras-5.15.3:5 >=kde-frameworks/kactivities-5.94.0:5 >=kde-frameworks/kauth-5.94.0:5[policykit] >=kde-frameworks/kcompletion-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kcrash-5.94.0:5 >=kde-frameworks/kdbusaddons-5.94.0:5 >=kde-frameworks/kglobalaccel-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kidletime-5.94.0:5 >=kde-frameworks/kio-5.94.0:5 >=kde-frameworks/kirigami-5.94.0:5 >=kde-frameworks/knotifications-5.94.0:5 >=kde-frameworks/knotifyconfig-5.94.0:5 >=kde-frameworks/kservice-5.94.0:5 >=kde-frameworks/kwayland-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 >=kde-frameworks/kxmlgui-5.94.0:5 >=kde-frameworks/solid-5.94.0:5 >=kde-plasma/libkscreen-5.25.0:5 >=kde-plasma/libkworkspace-5.25.0:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil:= ) caps? ( sys-libs/libcap ) wireless? ( >=kde-frameworks/bluez-qt-5.94.0:5 >=kde-frameworks/networkmanager-qt-5.94.0:5 ) dev-qt/qtcore:5
+DESCRIPTION=Power management for KDE Plasma Shell
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/powerdevil
+INHERIT=ecm kde.org
+IUSE=brightness-control caps +wireless debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=dev-qt/qtx11extras-5.15.3:5 >=kde-frameworks/kactivities-5.94.0:5 >=kde-frameworks/kauth-5.94.0:5[policykit] >=kde-frameworks/kcompletion-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kcrash-5.94.0:5 >=kde-frameworks/kdbusaddons-5.94.0:5 >=kde-frameworks/kglobalaccel-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kidletime-5.94.0:5 >=kde-frameworks/kio-5.94.0:5 >=kde-frameworks/kirigami-5.94.0:5 >=kde-frameworks/knotifications-5.94.0:5 >=kde-frameworks/knotifyconfig-5.94.0:5 >=kde-frameworks/kservice-5.94.0:5 >=kde-frameworks/kwayland-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 >=kde-frameworks/kxmlgui-5.94.0:5 >=kde-frameworks/solid-5.94.0:5 >=kde-plasma/libkscreen-5.25.0:5 >=kde-plasma/libkworkspace-5.25.0:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil:= ) caps? ( sys-libs/libcap ) wireless? ( >=kde-frameworks/bluez-qt-5.94.0:5 >=kde-frameworks/networkmanager-qt-5.94.0:5 ) >=kde-plasma/kde-cli-tools-5.25.0:5 >=sys-power/upower-0.9.23 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.25.0/powerdevil-5.25.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=6a1f01188b0cc36a28db4f83e733f6c5
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.25.0 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.25.0
new file mode 100644
index 000000000000..ff7016135ff8
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/sddm-kcm-5.25.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.94.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.3:5[widgets] >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=kde-frameworks/karchive-5.94.0:5 >=kde-frameworks/kauth-5.94.0:5 >=kde-frameworks/kcmutils-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kdeclarative-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kio-5.94.0:5 >=kde-frameworks/knewstuff-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma control module for SDDM
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/sddm-kcm
+INHERIT=ecm kde.org
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-qt/qtdeclarative-5.15.3:5[widgets] >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=kde-frameworks/karchive-5.94.0:5 >=kde-frameworks/kauth-5.94.0:5 >=kde-frameworks/kcmutils-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kdeclarative-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kio-5.94.0:5 >=kde-frameworks/knewstuff-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 >=dev-qt/qtquickcontrols2-5.15.3:5 >=kde-frameworks/kirigami-5.94.0:5 >=kde-frameworks/kitemmodels-5.94.0:5[qml] >=kde-plasma/kde-cli-tools-5.25.0:5 x11-misc/sddm || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.25.0/sddm-kcm-5.25.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=5e959df009ba1ab3c1780a71cfc7c5cd
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.25.0 b/metadata/md5-cache/kde-plasma/systemsettings-5.25.0
new file mode 100644
index 000000000000..3598625a1ae1
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/systemsettings-5.25.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.94.0:5 ) >=kde-frameworks/extra-cmake-modules-5.94.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5[widgets] >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=kde-frameworks/kactivities-5.94.0:5 >=kde-frameworks/kactivities-stats-5.94.0:5 >=kde-frameworks/kauth-5.94.0:5 >=kde-frameworks/kcmutils-5.94.0:5 >=kde-frameworks/kcompletion-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kcrash-5.94.0:5 >=kde-frameworks/kdbusaddons-5.94.0:5 >=kde-frameworks/kguiaddons-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kiconthemes-5.94.0:5 >=kde-frameworks/kio-5.94.0:5 >=kde-frameworks/kirigami-5.94.0:5 >=kde-frameworks/kitemmodels-5.94.0:5 >=kde-frameworks/kitemviews-5.94.0:5 >=kde-frameworks/knotifications-5.94.0:5 >=kde-frameworks/kpackage-5.94.0:5 >=kde-frameworks/krunner-5.94.0:5 >=kde-frameworks/kservice-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 >=kde-frameworks/kwindowsystem-5.94.0:5 >=kde-frameworks/kxmlgui-5.94.0:5 >=kde-plasma/libkworkspace-5.25.0:5 dev-qt/qtcore:5
+DESCRIPTION=Control Center to configure KDE Plasma desktop
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+INHERIT=ecm kde.org optfeature
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5[widgets] >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtwidgets-5.15.3:5 >=kde-frameworks/kactivities-5.94.0:5 >=kde-frameworks/kactivities-stats-5.94.0:5 >=kde-frameworks/kauth-5.94.0:5 >=kde-frameworks/kcmutils-5.94.0:5 >=kde-frameworks/kcompletion-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kconfigwidgets-5.94.0:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kcrash-5.94.0:5 >=kde-frameworks/kdbusaddons-5.94.0:5 >=kde-frameworks/kguiaddons-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kiconthemes-5.94.0:5 >=kde-frameworks/kio-5.94.0:5 >=kde-frameworks/kirigami-5.94.0:5 >=kde-frameworks/kitemmodels-5.94.0:5 >=kde-frameworks/kitemviews-5.94.0:5 >=kde-frameworks/knotifications-5.94.0:5 >=kde-frameworks/kpackage-5.94.0:5 >=kde-frameworks/krunner-5.94.0:5 >=kde-frameworks/kservice-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 >=kde-frameworks/kwindowsystem-5.94.0:5 >=kde-frameworks/kxmlgui-5.94.0:5 >=kde-plasma/libkworkspace-5.25.0:5 >=dev-qt/qtquickcontrols2-5.15.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.25.0/systemsettings-5.25.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=e7d16013e53cd92db234ac47dee4eb45
diff --git a/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.24.5-r2 b/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.24.5-r2
index 6c8499d4999a..0b0462e2cb3f 100644
--- a/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.24.5-r2
+++ b/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.24.5-r2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://kde.org/plasma-desktop
 INHERIT=ecm kde.org
 IUSE=debug
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5[cups] >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kirigami-5.90.0:5 >=kde-frameworks/knotifications-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 >=kde-frameworks/kwayland-5.90.0:5 >=kde-frameworks/plasma-5.90.0:5 sys-apps/xdg-desktop-portal || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.5/xdg-desktop-portal-kde-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b75650c7475199f9049fc097636d869b
+_md5_=92efc4e5aee5e069bbe919a37c8f751e
diff --git a/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.25.0 b/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.25.0
new file mode 100644
index 000000000000..c36f830b296a
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.25.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-qt/qtwaylandscanner-5.15.3:5 dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.94.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtprintsupport-5.15.3:5[cups] >=dev-qt/qtwidgets-5.15.3:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kdeclarative-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kiconthemes-5.94.0:5 >=kde-frameworks/kio-5.94.0:5 >=kde-frameworks/kirigami-5.94.0:5 >=kde-frameworks/knotifications-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 >=kde-frameworks/kwindowsystem-5.94.0:5 >=kde-frameworks/kwayland-5.94.0:5 >=kde-frameworks/plasma-5.94.0:5 >=dev-libs/plasma-wayland-protocols-1.7.0 >=dev-qt/qtconcurrent-5.15.3:5 dev-qt/qtcore:5
+DESCRIPTION=Backend implementation for xdg-desktop-portal that is using Qt/KDE Frameworks
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+INHERIT=ecm kde.org
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtprintsupport-5.15.3:5[cups] >=dev-qt/qtwidgets-5.15.3:5 >=kde-frameworks/kcoreaddons-5.94.0:5 >=kde-frameworks/kconfig-5.94.0:5 >=kde-frameworks/kdeclarative-5.94.0:5 >=kde-frameworks/ki18n-5.94.0:5 >=kde-frameworks/kiconthemes-5.94.0:5 >=kde-frameworks/kio-5.94.0:5 >=kde-frameworks/kirigami-5.94.0:5 >=kde-frameworks/knotifications-5.94.0:5 >=kde-frameworks/kwidgetsaddons-5.94.0:5 >=kde-frameworks/kwindowsystem-5.94.0:5 >=kde-frameworks/kwayland-5.94.0:5 >=kde-frameworks/plasma-5.94.0:5 kde-misc/kio-fuse:5 sys-apps/xdg-desktop-portal || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.25.0/xdg-desktop-portal-kde-5.25.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=a7c79399e950b9e978bfd204478beaea
diff --git a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.25.0 b/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.25.0
new file mode 100644
index 000000000000..055a6cb15917
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.25.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install nofetch prepare test unpack
+DEPEND=>=dev-qt/qtcore-5.15.3:5 >=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtx11extras-5.15.3:5 >=kde-frameworks/extra-cmake-modules-5.94.0:5 >=kde-frameworks/kwindowsystem-5.94.0:5[X] x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image
+DESCRIPTION=Legacy xembed tray icons support for SNI-only system trays
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/plasma-workspace/-/blob/master/xembed-sni-proxy/Readme.md
+INHERIT=cmake kde.org
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtcore-5.15.3:5 >=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtx11extras-5.15.3:5 >=kde-frameworks/extra-cmake-modules-5.94.0:5 >=kde-frameworks/kwindowsystem-5.94.0:5[X] x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image !kde-plasma/xembed-sni-proxy:0
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.25.0/plasma-workspace-5.25.0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=6e7ef095756f4f4ca67effe930dc7e92
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index c5c541ec63b9..50c1bdffe907 100644
Binary files a/metadata/md5-cache/mail-client/Manifest.gz and b/metadata/md5-cache/mail-client/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-client/neomutt-20211029 b/metadata/md5-cache/mail-client/neomutt-20211029
index d2aa0b3df0e2..b0f76a85a2aa 100644
--- a/metadata/md5-cache/mail-client/neomutt-20211029
+++ b/metadata/md5-cache/mail-client/neomutt-20211029
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/neomutt/neomutt/archive/20211029.tar.gz -> neomutt-20211029.tar.gz test? ( https://github.com/neomutt/neomutt-test-files/archive/8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz -> neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz )
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=014a2f00a0a9ee79b97cc90d5d598c27
+_md5_=95e18df939a2c2ccc1549b705d0fd85f
diff --git a/metadata/md5-cache/mail-client/neomutt-20211029-r1 b/metadata/md5-cache/mail-client/neomutt-20211029-r1
index d2050bd3392f..f3bd22521e3b 100644
--- a/metadata/md5-cache/mail-client/neomutt-20211029-r1
+++ b/metadata/md5-cache/mail-client/neomutt-20211029-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/neomutt/neomutt/archive/20211029.tar.gz -> neomutt-20211029.tar.gz test? ( https://github.com/neomutt/neomutt-test-files/archive/8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz -> neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz )
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=566373c6603dd41ea5b7b1e97c47b4a0
+_md5_=b0fbec9d0d71eb04d873eb4a7d15d432
diff --git a/metadata/md5-cache/mail-client/neomutt-20220408 b/metadata/md5-cache/mail-client/neomutt-20220408
index 2bfd5606bdac..fec1ca3488d6 100644
--- a/metadata/md5-cache/mail-client/neomutt-20220408
+++ b/metadata/md5-cache/mail-client/neomutt-20220408
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/neomutt/neomutt/archive/20220408.tar.gz -> neomutt-20220408.tar.gz test? ( https://github.com/neomutt/neomutt-test-files/archive/8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz -> neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz )
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ac3e62db1847c2d3205fb99b0a08898b
+_md5_=c344e530614628e51a9dff24d37f8199
diff --git a/metadata/md5-cache/mail-client/neomutt-20220415 b/metadata/md5-cache/mail-client/neomutt-20220415
index fc55c001b417..6bec10b0d326 100644
--- a/metadata/md5-cache/mail-client/neomutt-20220415
+++ b/metadata/md5-cache/mail-client/neomutt-20220415
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/neomutt/neomutt/archive/20220415.tar.gz -> neomutt-20220415.tar.gz test? ( https://github.com/neomutt/neomutt-test-files/archive/8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz -> neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz )
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ac3e62db1847c2d3205fb99b0a08898b
+_md5_=c344e530614628e51a9dff24d37f8199
diff --git a/metadata/md5-cache/mail-client/neomutt-20220429 b/metadata/md5-cache/mail-client/neomutt-20220429
index f3fd2befbc87..dd20cf6c34be 100644
--- a/metadata/md5-cache/mail-client/neomutt-20220429
+++ b/metadata/md5-cache/mail-client/neomutt-20220429
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/neomutt/neomutt/archive/20220429.tar.gz -> neomutt-20220429.tar.gz test? ( https://github.com/neomutt/neomutt-test-files/archive/8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz -> neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz )
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ac3e62db1847c2d3205fb99b0a08898b
+_md5_=c344e530614628e51a9dff24d37f8199
diff --git a/metadata/md5-cache/mail-client/neomutt-99999999 b/metadata/md5-cache/mail-client/neomutt-99999999
index 4ba6d4a20075..15334d7d7799 100644
--- a/metadata/md5-cache/mail-client/neomutt-99999999
+++ b/metadata/md5-cache/mail-client/neomutt-99999999
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=test? ( https://github.com/neomutt/neomutt-test-files/archive/8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz -> neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz )
 _eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ac3e62db1847c2d3205fb99b0a08898b
+_md5_=c344e530614628e51a9dff24d37f8199
diff --git a/metadata/md5-cache/mail-client/roundcube-1.6_rc b/metadata/md5-cache/mail-client/roundcube-1.6_rc
new file mode 100644
index 000000000000..e760ca193561
--- /dev/null
+++ b/metadata/md5-cache/mail-client/roundcube-1.6_rc
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst prerm setup unpack
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) app-admin/webapp-config
+DESCRIPTION=A browser-based multilingual IMAP client with an application-like user interface
+EAPI=7
+HOMEPAGE=https://roundcube.net
+INHERIT=webapp
+IUSE=change-password enigma exif fileinfo ldap mysql postgres sqlite ssl spell zip vhosts
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain
+RDEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=dev-lang/php-7.3.0[exif?,fileinfo?,filter,gd,iconv,intl,json(+),ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml,zip?] virtual/httpd-php change-password? ( dev-lang/php[sockets] ) enigma? ( app-crypt/gnupg ) mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) ) spell? ( dev-lang/php[curl,spell] ) app-admin/webapp-config
+REQUIRED_USE=|| ( mysql postgres sqlite )
+SLOT=1.6_rc
+SRC_URI=https://github.com/roundcube/roundcubemail/releases/download/1.6-rc/roundcubemail-1.6-rc-complete.tar.gz
+_eclasses_=webapp	d872f28d7595b70dd46545199ef35fb0
+_md5_=599e10f20d44bced818462c8f18bbcfa
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index 9684f073803c..07e188288320 100644
Binary files a/metadata/md5-cache/media-fonts/Manifest.gz and b/metadata/md5-cache/media-fonts/Manifest.gz differ
diff --git a/metadata/md5-cache/media-fonts/monafont-2.90-r2 b/metadata/md5-cache/media-fonts/monafont-2.90-r2
index 2944162c8920..2be39ebe52d9 100644
--- a/metadata/md5-cache/media-fonts/monafont-2.90-r2
+++ b/metadata/md5-cache/media-fonts/monafont-2.90-r2
@@ -11,4 +11,4 @@ RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=mirror://sourceforge/monafont/monafont-2.90.tar.bz2 truetype? ( mirror://sourceforge/monafont/monafont-ttf-2.90.zip )
 _eclasses_=font	d31f12a0f6e13d56dc3062e76ae58a61
-_md5_=3ec284c3d1c02189af200adc3b58fcb5
+_md5_=a83ba2df9099a814afe719f24650a7f9
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index d24d26fe3ae8..697f24b0bb8c 100644
Binary files a/metadata/md5-cache/media-gfx/Manifest.gz and b/metadata/md5-cache/media-gfx/Manifest.gz differ
diff --git a/metadata/md5-cache/media-gfx/asymptote-2.70-r1 b/metadata/md5-cache/media-gfx/asymptote-2.70-r1
deleted file mode 100644
index b4c0382157fd..000000000000
--- a/metadata/md5-cache/media-gfx/asymptote-2.70-r1
+++ /dev/null
@@ -1,17 +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 virtual/latex-base >=sys-apps/texinfo-4.2-r5
-DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=>=sys-libs/ncurses-5.4-r5:0= >=sys-libs/readline-4.3-r5:0= net-libs/libtirpc:= imagemagick? ( media-gfx/imagemagick[png] ) opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm ) offscreen? ( media-libs/mesa[osmesa] ) svg? ( app-text/dvisvgm ) sigsegv? ( dev-libs/libsigsegv ) boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) fftw? ( >=sci-libs/fftw-3.0.1:= ) gsl? ( sci-libs/gsl:= ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) ) curl? ( net-misc/curl ) X? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,gui,widgets,svg] dev-python/numpy dev-python/pycson >=gnome-base/librsvg-2.40 ) latex? ( virtual/latex-base >=dev-texlive/texlive-latexextra-2013 ) context? ( dev-texlive/texlive-context ) emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) dev-lang/perl doc? ( media-gfx/imagemagick[png] virtual/texi2dvi virtual/latex-base app-text/ghostscript-gpl ) test? ( app-text/ghostscript-gpl )
-DESCRIPTION=A vector graphics language that provides a framework for technical drawing
-EAPI=7
-HOMEPAGE=https://asymptote.sourceforge.io/
-INHERIT=autotools elisp-common latex-package python-r1
-IUSE=+boehm-gc context curl doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax X python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-3
-RDEPEND=>=sys-libs/ncurses-5.4-r5:0= >=sys-libs/readline-4.3-r5:0= net-libs/libtirpc:= imagemagick? ( media-gfx/imagemagick[png] ) opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm ) offscreen? ( media-libs/mesa[osmesa] ) svg? ( app-text/dvisvgm ) sigsegv? ( dev-libs/libsigsegv ) boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) fftw? ( >=sci-libs/fftw-3.0.1:= ) gsl? ( sci-libs/gsl:= ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) ) curl? ( net-misc/curl ) X? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,gui,widgets,svg] dev-python/numpy dev-python/pycson >=gnome-base/librsvg-2.40 ) latex? ( virtual/latex-base >=dev-texlive/texlive-latexextra-2013 ) context? ( dev-texlive/texlive-context ) emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) virtual/latex-base
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) offscreen? ( opengl ) doc? ( boehm-gc )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/asymptote/asymptote-2.70.src.tgz
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	e7aaa047873789f549ea3df2f04b2145	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	latex-package	c20e442c3953c765f636630631c96194	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=53672f28fa2679607fbed68a6f25e2a9
diff --git a/metadata/md5-cache/media-gfx/asymptote-2.77 b/metadata/md5-cache/media-gfx/asymptote-2.77
deleted file mode 100644
index d0487e363dd2..000000000000
--- a/metadata/md5-cache/media-gfx/asymptote-2.77
+++ /dev/null
@@ -1,17 +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 virtual/latex-base >=sys-apps/texinfo-4.2-r5
-DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=>=sys-libs/ncurses-5.4-r5:0= >=sys-libs/readline-4.3-r5:0= net-libs/libtirpc:= imagemagick? ( media-gfx/imagemagick[png] ) opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm ) offscreen? ( media-libs/mesa[osmesa] ) svg? ( app-text/dvisvgm ) sigsegv? ( dev-libs/libsigsegv ) boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) fftw? ( >=sci-libs/fftw-3.0.1:= ) gsl? ( sci-libs/gsl:= ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) curl? ( net-misc/curl ) lsp? ( dev-libs/boost dev-libs/rapidjson dev-libs/utfcpp ) X? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,gui,widgets,svg] dev-python/numpy dev-python/pycson >=gnome-base/librsvg-2.40 ) latex? ( virtual/latex-base >=dev-texlive/texlive-latexextra-2013 ) context? ( dev-texlive/texlive-context ) emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) dev-lang/perl doc? ( media-gfx/imagemagick[png] virtual/texi2dvi virtual/latex-base app-text/ghostscript-gpl ) test? ( app-text/ghostscript-gpl )
-DESCRIPTION=A vector graphics language that provides a framework for technical drawing
-EAPI=7
-HOMEPAGE=https://asymptote.sourceforge.io/
-INHERIT=autotools elisp-common latex-package python-r1
-IUSE=+boehm-gc context curl doc emacs examples fftw gsl +imagemagick latex lsp offscreen +opengl python sigsegv svg test vim-syntax X python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-3
-RDEPEND=>=sys-libs/ncurses-5.4-r5:0= >=sys-libs/readline-4.3-r5:0= net-libs/libtirpc:= imagemagick? ( media-gfx/imagemagick[png] ) opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm ) offscreen? ( media-libs/mesa[osmesa] ) svg? ( app-text/dvisvgm ) sigsegv? ( dev-libs/libsigsegv ) boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) fftw? ( >=sci-libs/fftw-3.0.1:= ) gsl? ( sci-libs/gsl:= ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) curl? ( net-misc/curl ) lsp? ( dev-libs/boost dev-libs/rapidjson dev-libs/utfcpp ) X? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,gui,widgets,svg] dev-python/numpy dev-python/pycson >=gnome-base/librsvg-2.40 ) latex? ( virtual/latex-base >=dev-texlive/texlive-latexextra-2013 ) context? ( dev-texlive/texlive-context ) emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) virtual/latex-base
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) offscreen? ( opengl ) doc? ( boehm-gc )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/asymptote/asymptote-2.77.src.tgz
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	e7aaa047873789f549ea3df2f04b2145	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	latex-package	c20e442c3953c765f636630631c96194	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=c1ba88d824da171f73a2e1ad6a9f8121
diff --git a/metadata/md5-cache/media-gfx/blender-2.93.0-r1 b/metadata/md5-cache/media-gfx/blender-2.93.0-r1
index df84e13e7c27..f41456d1004e 100644
--- a/metadata/md5-cache/media-gfx/blender-2.93.0-r1
+++ b/metadata/md5-cache/media-gfx/blender-2.93.0-r1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2.93
 SRC_URI=https://download.blender.org/source/blender-2.93.0.tar.xz test? ( https://dev.gentoo.org/~sam/distfiles/media-gfx/blender/blender-2.93.0-tests.tar.bz2 )
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	90e2b29417d53718328f3a95227137a0	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b208b55f20daebd8841025e70a864b16
+_md5_=d6366f42b989ae421d9d1ca7805c10cd
diff --git a/metadata/md5-cache/media-gfx/blender-2.93.6 b/metadata/md5-cache/media-gfx/blender-2.93.6
index 6f16e0f3b43f..b4b800920276 100644
--- a/metadata/md5-cache/media-gfx/blender-2.93.6
+++ b/metadata/md5-cache/media-gfx/blender-2.93.6
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2.93
 SRC_URI=https://download.blender.org/source/blender-2.93.6.tar.xz test? ( https://dev.gentoo.org/~sam/distfiles/media-gfx/blender/blender-2.93.0-tests.tar.bz2 )
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	90e2b29417d53718328f3a95227137a0	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=58731b0ac7ea6780bd96ca58c4d72ffb
+_md5_=99f80f3ee5a0ba579e709e179c1ee40f
diff --git a/metadata/md5-cache/media-gfx/blender-2.93.8-r4 b/metadata/md5-cache/media-gfx/blender-2.93.8-r4
index 92f2b111f374..f7f2b2824083 100644
--- a/metadata/md5-cache/media-gfx/blender-2.93.8-r4
+++ b/metadata/md5-cache/media-gfx/blender-2.93.8-r4
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2.93
 SRC_URI=https://download.blender.org/source/blender-2.93.8.tar.xz test? ( https://dev.gentoo.org/~sam/distfiles/media-gfx/blender/blender-2.93.0-tests.tar.bz2 )
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	90e2b29417d53718328f3a95227137a0	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=303e57f44600585e655e01eb28b97f3e
+_md5_=360738bc4d822301b8f6f08144f30500
diff --git a/metadata/md5-cache/media-gfx/blender-2.93.8-r5 b/metadata/md5-cache/media-gfx/blender-2.93.8-r5
index a2fdecc6ba01..5c6a3985867f 100644
--- a/metadata/md5-cache/media-gfx/blender-2.93.8-r5
+++ b/metadata/md5-cache/media-gfx/blender-2.93.8-r5
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2.93
 SRC_URI=https://download.blender.org/source/blender-2.93.8.tar.xz https://dev.gentoo.org/~sam/distfiles/media-gfx/blender/blender-3.0.1-ffmpeg-5.0.patch.bz2 test? ( https://dev.gentoo.org/~sam/distfiles/media-gfx/blender/blender-2.93.0-tests.tar.bz2 )
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	90e2b29417d53718328f3a95227137a0	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a8c2108867df601aae2ef9bd89e1d55f
+_md5_=0a092064d6c4b4857426c003e8cfa526
diff --git a/metadata/md5-cache/media-gfx/blender-2.93.9 b/metadata/md5-cache/media-gfx/blender-2.93.9
index 7ac118176d14..f920425c6718 100644
--- a/metadata/md5-cache/media-gfx/blender-2.93.9
+++ b/metadata/md5-cache/media-gfx/blender-2.93.9
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2.93
 SRC_URI=https://download.blender.org/source/blender-2.93.9.tar.xz https://dev.gentoo.org/~sam/distfiles/media-gfx/blender/blender-3.0.1-ffmpeg-5.0.patch.bz2 test? ( https://dev.gentoo.org/~sam/distfiles/media-gfx/blender/blender-2.93.0-tests.tar.bz2 )
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	90e2b29417d53718328f3a95227137a0	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=1a03cd46ccdd9a0037b1285fc46f2b87
+_md5_=abba0163fbc08393e899f71b33a8002d
diff --git a/metadata/md5-cache/media-gfx/blender-3.0.0-r1 b/metadata/md5-cache/media-gfx/blender-3.0.0-r1
index e05b3a6bef06..c30a3f012a40 100644
--- a/metadata/md5-cache/media-gfx/blender-3.0.0-r1
+++ b/metadata/md5-cache/media-gfx/blender-3.0.0-r1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=3.0
 SRC_URI=https://download.blender.org/source/blender-3.0.0.tar.xz test? ( https://dev.gentoo.org/~sam/distfiles/media-gfx/blender/blender-3.0.0-tests.tar.bz2 )
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	90e2b29417d53718328f3a95227137a0	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=530ee399e6b4966078a487f9f6741f80
+_md5_=55bcd49517de7522c9a0d31188b9ab05
diff --git a/metadata/md5-cache/media-gfx/blender-3.0.1-r4 b/metadata/md5-cache/media-gfx/blender-3.0.1-r4
index e13e8cbf8891..989fa625293d 100644
--- a/metadata/md5-cache/media-gfx/blender-3.0.1-r4
+++ b/metadata/md5-cache/media-gfx/blender-3.0.1-r4
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=3.0
 SRC_URI=https://download.blender.org/source/blender-3.0.1.tar.xz test? ( https://dev.gentoo.org/~sam/distfiles/media-gfx/blender/blender-3.0.0-tests.tar.bz2 )
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	90e2b29417d53718328f3a95227137a0	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=0d5dff9ee025e6dff0cda6836f3a0e3d
+_md5_=6c5fc6f748f4c46aafc4774957c91d84
diff --git a/metadata/md5-cache/media-gfx/blender-3.0.1-r5 b/metadata/md5-cache/media-gfx/blender-3.0.1-r5
index bb7022b312ab..869a429f3acb 100644
--- a/metadata/md5-cache/media-gfx/blender-3.0.1-r5
+++ b/metadata/md5-cache/media-gfx/blender-3.0.1-r5
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=3.0
 SRC_URI=https://download.blender.org/source/blender-3.0.1.tar.xz https://dev.gentoo.org/~sam/distfiles/media-gfx/blender/blender-3.0.1-ffmpeg-5.0.patch.bz2 test? ( https://dev.gentoo.org/~sam/distfiles/media-gfx/blender/blender-3.0.0-tests.tar.bz2 )
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	90e2b29417d53718328f3a95227137a0	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=3cf6b70cf97393fcf15ec1115e2a53f5
+_md5_=f8b4f46fef3774fb81f2c9cb88e2b98e
diff --git a/metadata/md5-cache/media-gfx/blender-3.1.0 b/metadata/md5-cache/media-gfx/blender-3.1.0
index 65eae6bfc2c2..5d0a053e536c 100644
--- a/metadata/md5-cache/media-gfx/blender-3.1.0
+++ b/metadata/md5-cache/media-gfx/blender-3.1.0
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=3.1
 SRC_URI=https://download.blender.org/source/blender-3.1.0.tar.xz test? ( https://dev.gentoo.org/~sam/distfiles/media-gfx/blender/blender-3.1.0-tests.tar.bz2 )
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=18c0609b17e9317d6b6ea69036c7dab6
+_md5_=cd3b33a06a0c4c778ebb151171108bb1
diff --git a/metadata/md5-cache/media-gfx/blender-3.1.1 b/metadata/md5-cache/media-gfx/blender-3.1.1
index 345e1740ccb8..2ba4b63d7d69 100644
--- a/metadata/md5-cache/media-gfx/blender-3.1.1
+++ b/metadata/md5-cache/media-gfx/blender-3.1.1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=3.1
 SRC_URI=https://download.blender.org/source/blender-3.1.1.tar.xz test? ( https://dev.gentoo.org/~sam/distfiles/media-gfx/blender/blender-3.1.0-tests.tar.bz2 )
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=18c0609b17e9317d6b6ea69036c7dab6
+_md5_=cd3b33a06a0c4c778ebb151171108bb1
diff --git a/metadata/md5-cache/media-gfx/blender-3.1.2 b/metadata/md5-cache/media-gfx/blender-3.1.2
index f781d6edb0f6..68cba31eab9b 100644
--- a/metadata/md5-cache/media-gfx/blender-3.1.2
+++ b/metadata/md5-cache/media-gfx/blender-3.1.2
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=3.1
 SRC_URI=https://download.blender.org/source/blender-3.1.2.tar.xz test? ( https://dev.gentoo.org/~sam/distfiles/media-gfx/blender/blender-3.1.0-tests.tar.bz2 )
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d8382d68713a45f7e21b9929435b95db
+_md5_=4e5d648d0639f94d7f209a9363c8840d
diff --git a/metadata/md5-cache/media-gfx/blender-3.2.0 b/metadata/md5-cache/media-gfx/blender-3.2.0
new file mode 100644
index 000000000000..6b3e82bcdc92
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/blender-3.2.0
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen[dot] dev-python/sphinx[latex] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) nls? ( sys-devel/gettext ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) dev-libs/boost:=[nls?,threads(+)] dev-libs/lzo:2= python_single_target_python3_10? ( dev-python/cython[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/zstandard[python_targets_python3_10(-)] ) media-libs/freetype:= media-libs/glew:* media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libsamplerate sys-libs/zlib:= virtual/glu virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( >=media-libs/opencolorio-2.1.1-r7:= ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) embree? ( >=media-libs/embree-3.10.0[raymask] ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) oidn? ( >=media-libs/oidn-1.4.1 ) openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= ) openexr? ( >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=] ) openvdb? ( >=media-gfx/openvdb-9.0.0:=[nanovdb?] dev-libs/c-blosc:= ) osl? ( >=media-libs/osl-1.11.16.0-r3:= ) pdf? ( media-libs/libharu ) potrace? ( media-gfx/potrace ) pugixml? ( dev-libs/pugixml ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb:= ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind ) dev-cpp/eigen:=
+DESCRIPTION=3D Creation/Animation/Publishing System
+EAPI=8
+HOMEPAGE=https://www.blender.org
+INHERIT=check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs xdg-utils
+IUSE=+bullet +dds +fluid +openexr +tbb alembic collada +color-management cuda +cycles debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv +openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile test +tiff valgrind +python_single_target_python3_10
+KEYWORDS=~amd64 ~arm ~arm64
+LICENSE=|| ( GPL-3 BL )
+RDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) dev-libs/boost:=[nls?,threads(+)] dev-libs/lzo:2= python_single_target_python3_10? ( dev-python/cython[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/zstandard[python_targets_python3_10(-)] ) media-libs/freetype:= media-libs/glew:* media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libsamplerate sys-libs/zlib:= virtual/glu virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( >=media-libs/opencolorio-2.1.1-r7:= ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) embree? ( >=media-libs/embree-3.10.0[raymask] ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) oidn? ( >=media-libs/oidn-1.4.1 ) openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= ) openexr? ( >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=] ) openvdb? ( >=media-gfx/openvdb-9.0.0:=[nanovdb?] dev-libs/c-blosc:= ) osl? ( >=media-libs/osl-1.11.16.0-r3:= ) pdf? ( media-libs/libharu ) potrace? ( media-gfx/potrace ) pugixml? ( dev-libs/pugixml ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb:= ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind )
+REQUIRED_USE=^^ ( python_single_target_python3_10 ) alembic? ( openexr ) cuda? ( cycles ) cycles? ( openexr tiff openimageio ) fluid? ( tbb ) openvdb? ( tbb ) osl? ( cycles ) test? ( color-management )
+RESTRICT=!test? ( test )
+SLOT=3.2
+SRC_URI=https://download.blender.org/source/blender-3.2.0.tar.xz test? ( https://dev.gentoo.org/~sam/distfiles/media-gfx/blender/blender-3.2.0-tests.tar.xz )
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=323f3ab1e566b9d8c2561bcb9cf930f1
diff --git a/metadata/md5-cache/media-gfx/blender-9999 b/metadata/md5-cache/media-gfx/blender-9999
index 554fc9c76761..c85725a5b72a 100644
--- a/metadata/md5-cache/media-gfx/blender-9999
+++ b/metadata/md5-cache/media-gfx/blender-9999
@@ -13,4 +13,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 ) alembic? ( openexr ) cuda? (
 RESTRICT=!test? ( test )
 SLOT=9999
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	90e2b29417d53718328f3a95227137a0	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	subversion	dee31e56422214d05644c2a3c900a148	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=707eac97407360d9de6f31ce0a7d3b4a
+_md5_=d8a6eda3782479c20620c187ea8ca28a
diff --git a/metadata/md5-cache/media-gfx/feh-3.6 b/metadata/md5-cache/media-gfx/feh-3.6
deleted file mode 100644
index 22f6b7725fd6..000000000000
--- a/metadata/md5-cache/media-gfx/feh-3.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm setup
-DEPEND=media-libs/imlib2[X] >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? ( net-misc/curl ) exif? ( media-libs/libexif ) xinerama? ( x11-libs/libXinerama ) x11-base/xorg-proto x11-libs/libXt test? ( >=dev-lang/perl-5.10 dev-perl/Test-Command media-libs/imlib2[gif,jpeg,png] )
-DESCRIPTION=A fast, lightweight imageviewer using imlib2
-EAPI=7
-HOMEPAGE=https://feh.finalrewind.org/
-INHERIT=toolchain-funcs xdg-utils
-IUSE=debug curl exif test xinerama
-KEYWORDS=amd64 ~arm ~arm64 ~mips ppc ppc64 x86
-LICENSE=feh
-RDEPEND=media-libs/imlib2[X] >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? ( net-misc/curl ) exif? ( media-libs/libexif ) xinerama? ( x11-libs/libXinerama ) virtual/jpeg:0
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://feh.finalrewind.org/feh-3.6.tar.bz2
-_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=bfb82569ecdaf43e90867aa515e14235
diff --git a/metadata/md5-cache/media-gfx/feh-3.6.1 b/metadata/md5-cache/media-gfx/feh-3.6.1
deleted file mode 100644
index 80e24f255959..000000000000
--- a/metadata/md5-cache/media-gfx/feh-3.6.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm setup
-DEPEND=media-libs/imlib2[X] >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? ( net-misc/curl ) exif? ( media-libs/libexif ) xinerama? ( x11-libs/libXinerama ) x11-base/xorg-proto x11-libs/libXt test? ( >=dev-lang/perl-5.10 dev-perl/Test-Command media-libs/imlib2[gif,jpeg,png] )
-DESCRIPTION=A fast, lightweight imageviewer using imlib2
-EAPI=7
-HOMEPAGE=https://feh.finalrewind.org/
-INHERIT=toolchain-funcs xdg-utils
-IUSE=debug curl exif test xinerama
-KEYWORDS=amd64 ~arm ~arm64 ~mips ppc ppc64 x86
-LICENSE=feh
-RDEPEND=media-libs/imlib2[X] >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? ( net-misc/curl ) exif? ( media-libs/libexif ) xinerama? ( x11-libs/libXinerama ) virtual/jpeg:0
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://feh.finalrewind.org/feh-3.6.1.tar.bz2
-_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=bfb82569ecdaf43e90867aa515e14235
diff --git a/metadata/md5-cache/media-gfx/feh-3.6.2 b/metadata/md5-cache/media-gfx/feh-3.6.2
deleted file mode 100644
index daa6d1f5f948..000000000000
--- a/metadata/md5-cache/media-gfx/feh-3.6.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm setup
-DEPEND=media-libs/imlib2[X] >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? ( net-misc/curl ) exif? ( media-libs/libexif ) xinerama? ( x11-libs/libXinerama ) x11-base/xorg-proto x11-libs/libXt test? ( >=dev-lang/perl-5.10 dev-perl/Test-Command media-libs/imlib2[gif,jpeg,png] )
-DESCRIPTION=A fast, lightweight imageviewer using imlib2
-EAPI=7
-HOMEPAGE=https://feh.finalrewind.org/
-INHERIT=toolchain-funcs xdg-utils
-IUSE=debug curl exif test xinerama inotify
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86
-LICENSE=feh
-RDEPEND=media-libs/imlib2[X] >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? ( net-misc/curl ) exif? ( media-libs/libexif ) xinerama? ( x11-libs/libXinerama ) virtual/jpeg:0
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://feh.finalrewind.org/feh-3.6.2.tar.bz2
-_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=db2d56f4c454c11eecd2ee12df6b6c11
diff --git a/metadata/md5-cache/media-gfx/feh-3.7 b/metadata/md5-cache/media-gfx/feh-3.7
deleted file mode 100644
index abfba5692fef..000000000000
--- a/metadata/md5-cache/media-gfx/feh-3.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm setup
-DEPEND=media-libs/imlib2[X] >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? ( net-misc/curl ) exif? ( media-libs/libexif ) xinerama? ( x11-libs/libXinerama ) x11-base/xorg-proto x11-libs/libXt test? ( >=dev-lang/perl-5.10 dev-perl/Test-Command media-libs/imlib2[gif,jpeg,png] )
-DESCRIPTION=A fast, lightweight imageviewer using imlib2
-EAPI=7
-HOMEPAGE=https://feh.finalrewind.org/
-INHERIT=toolchain-funcs xdg-utils
-IUSE=debug curl exif test xinerama inotify
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86
-LICENSE=feh
-RDEPEND=media-libs/imlib2[X] >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? ( net-misc/curl ) exif? ( media-libs/libexif ) xinerama? ( x11-libs/libXinerama ) virtual/jpeg:0
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://feh.finalrewind.org/feh-3.7.tar.bz2
-_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=22f11047223baff2fe7e6a8509756f02
diff --git a/metadata/md5-cache/media-gfx/feh-3.7.1 b/metadata/md5-cache/media-gfx/feh-3.7.1
deleted file mode 100644
index 6b29bd7ec7a9..000000000000
--- a/metadata/md5-cache/media-gfx/feh-3.7.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm setup
-DEPEND=media-libs/imlib2[X] >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? ( net-misc/curl ) exif? ( media-libs/libexif ) xinerama? ( x11-libs/libXinerama ) x11-base/xorg-proto x11-libs/libXt test? ( >=dev-lang/perl-5.10 dev-perl/Test-Command media-libs/imlib2[gif,jpeg,png] )
-DESCRIPTION=A fast, lightweight imageviewer using imlib2
-EAPI=7
-HOMEPAGE=https://feh.finalrewind.org/
-INHERIT=toolchain-funcs xdg-utils
-IUSE=debug curl exif test xinerama inotify
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86
-LICENSE=feh
-RDEPEND=media-libs/imlib2[X] >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? ( net-misc/curl ) exif? ( media-libs/libexif ) xinerama? ( x11-libs/libXinerama ) virtual/jpeg:0
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://feh.finalrewind.org/feh-3.7.1.tar.bz2
-_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=22f11047223baff2fe7e6a8509756f02
diff --git a/metadata/md5-cache/media-gfx/feh-3.6.3 b/metadata/md5-cache/media-gfx/feh-3.9-r1
similarity index 79%
rename from metadata/md5-cache/media-gfx/feh-3.6.3
rename to metadata/md5-cache/media-gfx/feh-3.9-r1
index 56742059fd51..71f15dae304c 100644
--- a/metadata/md5-cache/media-gfx/feh-3.6.3
+++ b/metadata/md5-cache/media-gfx/feh-3.9-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile install postinst postrm setup
 DEPEND=media-libs/imlib2[X] >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? ( net-misc/curl ) exif? ( media-libs/libexif ) xinerama? ( x11-libs/libXinerama ) x11-base/xorg-proto x11-libs/libXt test? ( >=dev-lang/perl-5.10 dev-perl/Test-Command media-libs/imlib2[gif,jpeg,png] )
 DESCRIPTION=A fast, lightweight imageviewer using imlib2
-EAPI=7
+EAPI=8
 HOMEPAGE=https://feh.finalrewind.org/
 INHERIT=toolchain-funcs xdg-utils
 IUSE=debug curl exif test xinerama inotify
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86
 LICENSE=feh
-RDEPEND=media-libs/imlib2[X] >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? ( net-misc/curl ) exif? ( media-libs/libexif ) xinerama? ( x11-libs/libXinerama ) virtual/jpeg:0
+RDEPEND=media-libs/imlib2[X] >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? ( net-misc/curl ) exif? ( media-libs/libexif ) xinerama? ( x11-libs/libXinerama ) media-libs/libjpeg-turbo:0
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://feh.finalrewind.org/feh-3.6.3.tar.bz2
+SRC_URI=https://feh.finalrewind.org/feh-3.9.tar.bz2
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=db2d56f4c454c11eecd2ee12df6b6c11
+_md5_=5fb60cef6101e707d0f54e8887e9a964
diff --git a/metadata/md5-cache/media-gfx/gimp-2.10.32 b/metadata/md5-cache/media-gfx/gimp-2.10.32
new file mode 100644
index 000000000000..1c0a6e2223d5
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/gimp-2.10.32
@@ -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 app-arch/xz-utils test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=app-text/poppler-0.50[cairo] >=app-text/poppler-data-0.4.7 >=dev-libs/atk-2.2.0 >=dev-libs/glib-2.56.2:2 >=dev-libs/json-glib-1.2.6 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.6:2 >=media-gfx/mypaint-brushes-2.0.2:= >=media-libs/babl-0.1.88 >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.1.7 >=media-libs/gegl-0.4.34:0.4[cairo] >=media-libs/gexiv2-0.10.6 >=media-libs/harfbuzz-0.9.19:= >=media-libs/lcms-2.8:2 media-libs/libjpeg-turbo >=media-libs/libmypaint-1.6.1:= >=media-libs/libpng-1.6.25:0= >=media-libs/tiff-3.5.7:0 net-libs/glib-networking[ssl] sys-libs/zlib >=x11-libs/cairo-1.12.2 >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/gtk+-2.24.32:2 x11-libs/libXcursor >=x11-libs/pango-1.29.4 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.9.1:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-1.6.1:= ) postscript? ( app-text/ghostscript-gpl ) udev? ( dev-libs/libgudev:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) >=dev-lang/perl-5.10.0 dev-libs/appstream-glib dev-util/gtk-update-icon-cache >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.19 >=sys-devel/libtool-2.2 virtual/pkgconfig
+DESCRIPTION=GNU Image Manipulation Program
+EAPI=8
+HOMEPAGE=https://www.gimp.org/
+INHERIT=autotools gnome2 toolchain-funcs virtualx
+IUSE=aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-3 LGPL-3
+RDEPEND=>=app-text/poppler-0.50[cairo] >=app-text/poppler-data-0.4.7 >=dev-libs/atk-2.2.0 >=dev-libs/glib-2.56.2:2 >=dev-libs/json-glib-1.2.6 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.6:2 >=media-gfx/mypaint-brushes-2.0.2:= >=media-libs/babl-0.1.88 >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.1.7 >=media-libs/gegl-0.4.34:0.4[cairo] >=media-libs/gexiv2-0.10.6 >=media-libs/harfbuzz-0.9.19:= >=media-libs/lcms-2.8:2 media-libs/libjpeg-turbo >=media-libs/libmypaint-1.6.1:= >=media-libs/libpng-1.6.25:0= >=media-libs/tiff-3.5.7:0 net-libs/glib-networking[ssl] sys-libs/zlib >=x11-libs/cairo-1.12.2 >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/gtk+-2.24.32:2 x11-libs/libXcursor >=x11-libs/pango-1.29.4 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.9.1:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-1.6.1:= ) postscript? ( app-text/ghostscript-gpl ) udev? ( dev-libs/libgudev:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) x11-themes/hicolor-icon-theme gnome? ( gnome-base/gvfs )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0/2
+SRC_URI=mirror://gimp/v2.10/gimp-2.10.32.tar.bz2
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=23257a68c04b86eb1ff295ce20ccef17
diff --git a/metadata/md5-cache/media-gfx/graphicsmagick-1.3.38 b/metadata/md5-cache/media-gfx/graphicsmagick-1.3.38
index a0ee50501707..1eb1386b6315 100644
--- a/metadata/md5-cache/media-gfx/graphicsmagick-1.3.38
+++ b/metadata/md5-cache/media-gfx/graphicsmagick-1.3.38
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://www.graphicsmagick.org/ http://hg.code.sf.net/p/graphicsmagick/code/
 INHERIT=autotools toolchain-funcs verify-sig
 IUSE=bzip2 +cxx debug dynamic-loading fpx heif imagemagick jbig jpeg jpegxl lcms lzma openmp perl png postscript q16 q32 static-libs svg threads tiff truetype webp wmf X zlib verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-libs/libltdl bzip2? ( app-arch/bzip2 ) fpx? ( media-libs/libfpx ) heif? ( media-libs/libheif:= ) imagemagick? ( !media-gfx/imagemagick ) jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg ) jpegxl? ( media-libs/libjxl:= ) lcms? ( media-libs/lcms:2 ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:= ) postscript? ( app-text/ghostscript-gpl ) svg? ( dev-libs/libxml2 ) tiff? ( media-libs/tiff ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libSM x11-libs/libXext ) zlib? ( sys-libs/zlib )
 SLOT=0/1.3
 SRC_URI=mirror://sourceforge/graphicsmagick/GraphicsMagick-1.3.38.tar.xz verify-sig? ( mirror://sourceforge/graphicsmagick/GraphicsMagick-1.3.38.tar.xz.sig )
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=9c0cd3be661d9c1f032a1e9194ae3de5
+_md5_=d5fa072316d98a1e07616f307b13915f
diff --git a/metadata/md5-cache/media-gfx/jpeg2ps-1.9-r2 b/metadata/md5-cache/media-gfx/jpeg2ps-1.9-r3
similarity index 71%
rename from metadata/md5-cache/media-gfx/jpeg2ps-1.9-r2
rename to metadata/md5-cache/media-gfx/jpeg2ps-1.9-r3
index b465977f7558..c47d0b6822f8 100644
--- a/metadata/md5-cache/media-gfx/jpeg2ps-1.9-r2
+++ b/metadata/md5-cache/media-gfx/jpeg2ps-1.9-r3
@@ -1,12 +1,13 @@
 DEFINED_PHASES=compile install postinst
 DESCRIPTION=Convert JPEG images to Postscript using a wrapper
-EAPI=7
+EAPI=8
 HOMEPAGE=https://web.archive.org/web/20131003144811/http://www.pdflib.com/download/free-software/jpeg2ps/
 INHERIT=toolchain-funcs readme.gentoo-r1
 IUSE=metric
 KEYWORDS=amd64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=free-noncomm
+LICENSE=jpeg2ps
+RESTRICT=mirror
 SLOT=0
-SRC_URI=https://web.archive.org/web/20131003165952/http://www.pdflib.com/fileadmin/pdflib/products/more/jpeg2ps/jpeg2ps-1.9.tar.gz
+SRC_URI=https://distfiles.macports.org/jpeg2ps/jpeg2ps-1.9.tar.gz
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=0bf01e340a678af5cb28fba8a2a7cafe
+_md5_=848262a406c73b254dc73d5b83a0ac96
diff --git a/metadata/md5-cache/media-gfx/krita-5.0.2 b/metadata/md5-cache/media-gfx/krita-5.0.2
deleted file mode 100644
index 7f91949705d9..000000000000
--- a/metadata/md5-cache/media-gfx/krita-5.0.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-cpp/eigen:3 dev-lang/perl sys-devel/gettext dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) dev-libs/boost:= dev-libs/quazip:0= python_single_target_python3_8? ( dev-python/PyQt5[declarative,gui,widgets,python_targets_python3_8(-)] dev-python/sip:=[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[declarative,gui,widgets,python_targets_python3_9(-)] dev-python/sip:=[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/PyQt5[declarative,gui,widgets,python_targets_python3_10(-)] dev-python/sip:=[python_targets_python3_10(-)] ) >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[-gles2-only] >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kguiaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kitemmodels-5.82.0:5 >=kde-frameworks/kitemviews-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 media-gfx/exiv2:= media-libs/lcms media-libs/libpng:0= media-libs/tiff:0 sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libXi color-management? ( >=media-libs/opencolorio-2.0.0 ) fftw? ( sci-libs/fftw:3.0= ) gif? ( media-libs/giflib ) gsl? ( sci-libs/gsl:= ) jpeg? ( virtual/jpeg:0 ) heif? ( >=media-libs/libheif-1.11:= ) mypaint-brush-engine? ( media-libs/libmypaint:= ) openexr? ( media-libs/openexr:= ) pdf? ( app-text/poppler[qt5] ) qtmedia? ( >=dev-qt/qtmultimedia-5.15.2:5 ) raw? ( media-libs/libraw:= ) webp? ( >=media-libs/libwebp-1.2.0:= ) vc? ( >=dev-libs/vc-1.1.0 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Free digital painting application. Digital Painting, Creative Freedom!
-EAPI=8
-HOMEPAGE=https://apps.kde.org/krita/ https://krita.org/en/
-INHERIT=ecm kde.org python-single-r1
-IUSE=color-management fftw gif +gsl heif +jpeg +mypaint-brush-engine openexr pdf qtmedia +raw vc webp test debug test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) dev-libs/boost:= dev-libs/quazip:0= python_single_target_python3_8? ( dev-python/PyQt5[declarative,gui,widgets,python_targets_python3_8(-)] dev-python/sip:=[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[declarative,gui,widgets,python_targets_python3_9(-)] dev-python/sip:=[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/PyQt5[declarative,gui,widgets,python_targets_python3_10(-)] dev-python/sip:=[python_targets_python3_10(-)] ) >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[-gles2-only] >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kguiaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kitemmodels-5.82.0:5 >=kde-frameworks/kitemviews-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 media-gfx/exiv2:= media-libs/lcms media-libs/libpng:0= media-libs/tiff:0 sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libXi color-management? ( >=media-libs/opencolorio-2.0.0 ) fftw? ( sci-libs/fftw:3.0= ) gif? ( media-libs/giflib ) gsl? ( sci-libs/gsl:= ) jpeg? ( virtual/jpeg:0 ) heif? ( >=media-libs/libheif-1.11:= ) mypaint-brush-engine? ( media-libs/libmypaint:= ) openexr? ( media-libs/openexr:= ) pdf? ( app-text/poppler[qt5] ) qtmedia? ( >=dev-qt/qtmultimedia-5.15.2:5 ) raw? ( media-libs/libraw:= ) webp? ( >=media-libs/libwebp-1.2.0:= ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-RESTRICT=test !test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/krita/5.0.2/krita-5.0.2.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=2f519d22a80cedcbdccf945a9d416d7f
diff --git a/metadata/md5-cache/media-gfx/krita-5.0.8 b/metadata/md5-cache/media-gfx/krita-5.0.8
index 93af1706f7c9..0f10e0ae57cb 100644
--- a/metadata/md5-cache/media-gfx/krita-5.0.8
+++ b/metadata/md5-cache/media-gfx/krita-5.0.8
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://apps.kde.org/krita/ https://krita.org/en/
 INHERIT=ecm kde.org python-single-r1
 IUSE=color-management fftw gif +gsl heif +jpeg +mypaint-brush-engine openexr pdf qtmedia +raw vc webp test debug test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-3
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) dev-libs/boost:= dev-libs/quazip:0= python_single_target_python3_8? ( dev-python/PyQt5[declarative,gui,widgets,python_targets_python3_8(-)] dev-python/sip:=[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[declarative,gui,widgets,python_targets_python3_9(-)] dev-python/sip:=[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/PyQt5[declarative,gui,widgets,python_targets_python3_10(-)] dev-python/sip:=[python_targets_python3_10(-)] ) >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[-gles2-only] >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kguiaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kitemmodels-5.82.0:5 >=kde-frameworks/kitemviews-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 media-gfx/exiv2:= media-libs/lcms media-libs/libpng:0= media-libs/tiff:0 sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libXi color-management? ( >=media-libs/opencolorio-2.0.0 ) fftw? ( sci-libs/fftw:3.0= ) gif? ( media-libs/giflib ) gsl? ( sci-libs/gsl:= ) jpeg? ( media-libs/libjpeg-turbo:= ) heif? ( >=media-libs/libheif-1.11:= ) mypaint-brush-engine? ( media-libs/libmypaint:= ) openexr? ( media-libs/openexr:= ) pdf? ( app-text/poppler[qt5] ) qtmedia? ( >=dev-qt/qtmultimedia-5.15.2:5 ) raw? ( media-libs/libraw:= ) webp? ( >=media-libs/libwebp-1.2.0:= ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/krita/5.0.8/krita-5.0.8.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=cde7b779426b87c09c7a885b96f6198e
+_md5_=817483461191c113d6e898f892d66a38
diff --git a/metadata/md5-cache/media-gfx/povray-3.7.0.0-r1 b/metadata/md5-cache/media-gfx/povray-3.7.0.0-r1
index b50d8102d5fd..6e7c079b8860 100644
--- a/metadata/md5-cache/media-gfx/povray-3.7.0.0-r1
+++ b/metadata/md5-cache/media-gfx/povray-3.7.0.0-r1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/POV-Ray/povray/archive/v3.7.0.0.tar.gz -> povray-3.7.0.0.tar.gz https://dev.gentoo.org/~soap/distfiles/povray-3.7.0.0_p20160914-fix-c++14.patch.bz2
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=1a603a1696e95fba0f0b1de8a9fda4e8
+_md5_=b8e3dbbf316c5879715e300093758209
diff --git a/metadata/md5-cache/media-gfx/povray-3.7.0.0-r2 b/metadata/md5-cache/media-gfx/povray-3.7.0.0-r2
index 6ac22a3105ed..5be36b7741bd 100644
--- a/metadata/md5-cache/media-gfx/povray-3.7.0.0-r2
+++ b/metadata/md5-cache/media-gfx/povray-3.7.0.0-r2
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/POV-Ray/povray/archive/v3.7.0.0.tar.gz -> povray-3.7.0.0.tar.gz https://dev.gentoo.org/~soap/distfiles/povray-3.7.0.0_p20160914-fix-c++14.patch.bz2
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=23f126aa1444ac1a5be7752595b05878
+_md5_=af297901f595eb4f7253c2a3f975d71a
diff --git a/metadata/md5-cache/media-gfx/tuxpaint-0.9.27 b/metadata/md5-cache/media-gfx/tuxpaint-0.9.27
index 6e6d96c6820f..c773ca801cbd 100644
--- a/metadata/md5-cache/media-gfx/tuxpaint-0.9.27
+++ b/metadata/md5-cache/media-gfx/tuxpaint-0.9.27
@@ -11,4 +11,4 @@ RDEPEND=app-text/libpaper dev-libs/fribidi gnome-base/librsvg:2 >=media-libs/lib
 SLOT=0
 SRC_URI=mirror://sourceforge/tuxpaint/tuxpaint-0.9.27.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4fbbbc98f236f1b43acd99476bc3cd85	optfeature	d524f291c80f9d21ad80fe978e3ca760	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=1efa21029a53834dcc29f202aa49391e
+_md5_=ddd36e61455e2343a327664466ebb700
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 073fa318b955..59a2222ac8a7 100644
Binary files a/metadata/md5-cache/media-libs/Manifest.gz and b/metadata/md5-cache/media-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/media-libs/fcft-3.0.0 b/metadata/md5-cache/media-libs/fcft-3.0.0
deleted file mode 100644
index ba539b261f45..000000000000
--- a/metadata/md5-cache/media-libs/fcft-3.0.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) app-text/scdoc examples? ( dev-util/wayland-scanner ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=media-libs/fontconfig media-libs/freetype x11-libs/pixman examples? ( dev-libs/libutf8proc:= dev-libs/wayland ) harfbuzz? ( media-libs/harfbuzz:= ) libutf8proc? ( dev-libs/libutf8proc:= ) app-i18n/unicode-data dev-libs/tllist examples? ( dev-libs/wayland-protocols ) test? ( dev-libs/check harfbuzz? ( media-fonts/noto-emoji ) )
-DESCRIPTION=Simple library for font loading and glyph rasterization
-EAPI=8
-HOMEPAGE=https://codeberg.org/dnkl/fcft
-INHERIT=meson python-any-r1
-IUSE=examples +harfbuzz +libutf8proc test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=media-libs/fontconfig media-libs/freetype x11-libs/pixman examples? ( dev-libs/libutf8proc:= dev-libs/wayland ) harfbuzz? ( media-libs/harfbuzz:= ) libutf8proc? ( dev-libs/libutf8proc:= )
-REQUIRED_USE=libutf8proc? ( harfbuzz ) examples? ( libutf8proc )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://codeberg.org/dnkl/fcft/archive/3.0.0.tar.gz -> fcft-3.0.0.tar.gz
-_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=712ebe3944edd0cde0c6d0d1dc6bcca9
diff --git a/metadata/md5-cache/media-libs/fcft-3.0.1 b/metadata/md5-cache/media-libs/fcft-3.0.1
deleted file mode 100644
index ce6adf731549..000000000000
--- a/metadata/md5-cache/media-libs/fcft-3.0.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) app-text/scdoc examples? ( dev-util/wayland-scanner ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=media-libs/fontconfig media-libs/freetype x11-libs/pixman examples? ( dev-libs/libutf8proc:= dev-libs/wayland ) harfbuzz? ( media-libs/harfbuzz:= ) libutf8proc? ( dev-libs/libutf8proc:= ) app-i18n/unicode-data dev-libs/tllist examples? ( dev-libs/wayland-protocols ) test? ( dev-libs/check harfbuzz? ( media-fonts/noto-emoji ) )
-DESCRIPTION=Simple library for font loading and glyph rasterization
-EAPI=8
-HOMEPAGE=https://codeberg.org/dnkl/fcft
-INHERIT=meson python-any-r1
-IUSE=examples +harfbuzz +libutf8proc test
-KEYWORDS=~amd64 ~arm64
-LICENSE=MIT
-RDEPEND=media-libs/fontconfig media-libs/freetype x11-libs/pixman examples? ( dev-libs/libutf8proc:= dev-libs/wayland ) harfbuzz? ( media-libs/harfbuzz:= ) libutf8proc? ( dev-libs/libutf8proc:= )
-REQUIRED_USE=libutf8proc? ( harfbuzz ) examples? ( libutf8proc )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://codeberg.org/dnkl/fcft/archive/3.0.1.tar.gz -> fcft-3.0.1.tar.gz
-_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=851493fb67d0191fe1ad0ceee233f272
diff --git a/metadata/md5-cache/media-libs/fcft-3.1.1 b/metadata/md5-cache/media-libs/fcft-3.1.1
deleted file mode 100644
index 6572d1c24002..000000000000
--- a/metadata/md5-cache/media-libs/fcft-3.1.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) app-text/scdoc examples? ( dev-util/wayland-scanner ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=media-libs/fontconfig media-libs/freetype x11-libs/pixman examples? ( dev-libs/libutf8proc:= dev-libs/wayland ) harfbuzz? ( media-libs/harfbuzz:= ) libutf8proc? ( dev-libs/libutf8proc:= ) app-i18n/unicode-data dev-libs/tllist examples? ( dev-libs/wayland-protocols ) test? ( dev-libs/check harfbuzz? ( media-fonts/noto-emoji ) )
-DESCRIPTION=Simple library for font loading and glyph rasterization
-EAPI=8
-HOMEPAGE=https://codeberg.org/dnkl/fcft
-INHERIT=meson python-any-r1
-IUSE=examples +harfbuzz +libutf8proc test
-KEYWORDS=~amd64 ~arm64
-LICENSE=MIT ZLIB
-RDEPEND=media-libs/fontconfig media-libs/freetype x11-libs/pixman examples? ( dev-libs/libutf8proc:= dev-libs/wayland ) harfbuzz? ( media-libs/harfbuzz:= ) libutf8proc? ( dev-libs/libutf8proc:= )
-REQUIRED_USE=libutf8proc? ( harfbuzz ) examples? ( libutf8proc )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://codeberg.org/dnkl/fcft/archive/3.1.1.tar.gz -> fcft-3.1.1.tar.gz
-_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=3fc61e6baeca391395350c0171ba168f
diff --git a/metadata/md5-cache/media-libs/fcft-3.1.2 b/metadata/md5-cache/media-libs/fcft-3.1.2-r1
similarity index 62%
rename from metadata/md5-cache/media-libs/fcft-3.1.2
rename to metadata/md5-cache/media-libs/fcft-3.1.2-r1
index 20932dbc7e28..88ca6eb61f12 100644
--- a/metadata/md5-cache/media-libs/fcft-3.1.2
+++ b/metadata/md5-cache/media-libs/fcft-3.1.2-r1
@@ -1,6 +1,6 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) app-text/scdoc examples? ( dev-util/wayland-scanner ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta1-r1:3.11 >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) app-text/scdoc virtual/pkgconfig examples? ( dev-util/wayland-scanner ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=media-libs/fontconfig media-libs/freetype x11-libs/pixman examples? ( dev-libs/libutf8proc:= dev-libs/wayland ) harfbuzz? ( media-libs/harfbuzz:= ) libutf8proc? ( dev-libs/libutf8proc:= ) app-i18n/unicode-data dev-libs/tllist examples? ( dev-libs/wayland-protocols ) test? ( dev-libs/check harfbuzz? ( media-fonts/noto-emoji ) )
+DEPEND=media-libs/fontconfig media-libs/freetype x11-libs/pixman examples? ( dev-libs/libutf8proc:= dev-libs/wayland ) harfbuzz? ( media-libs/harfbuzz:=[truetype] ) libutf8proc? ( dev-libs/libutf8proc:= ) app-i18n/unicode-data dev-libs/tllist examples? ( dev-libs/wayland-protocols ) test? ( dev-libs/check harfbuzz? ( media-fonts/noto-emoji ) )
 DESCRIPTION=Simple library for font loading and glyph rasterization
 EAPI=8
 HOMEPAGE=https://codeberg.org/dnkl/fcft
@@ -8,10 +8,10 @@ INHERIT=meson python-any-r1
 IUSE=examples +harfbuzz +libutf8proc test
 KEYWORDS=~amd64 ~arm64
 LICENSE=MIT ZLIB
-RDEPEND=media-libs/fontconfig media-libs/freetype x11-libs/pixman examples? ( dev-libs/libutf8proc:= dev-libs/wayland ) harfbuzz? ( media-libs/harfbuzz:= ) libutf8proc? ( dev-libs/libutf8proc:= )
+RDEPEND=media-libs/fontconfig media-libs/freetype x11-libs/pixman examples? ( dev-libs/libutf8proc:= dev-libs/wayland ) harfbuzz? ( media-libs/harfbuzz:=[truetype] ) libutf8proc? ( dev-libs/libutf8proc:= )
 REQUIRED_USE=libutf8proc? ( harfbuzz ) examples? ( libutf8proc )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://codeberg.org/dnkl/fcft/archive/3.1.2.tar.gz -> fcft-3.1.2.tar.gz
 _eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=3fc61e6baeca391395350c0171ba168f
+_md5_=aa29e59fa8cb1a8ac80bfc4eab8c2447
diff --git a/metadata/md5-cache/media-libs/harfbuzz-4.2.1 b/metadata/md5-cache/media-libs/harfbuzz-4.2.1
index 680a12818a60..dc4a34700db9 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-4.2.1
+++ b/metadata/md5-cache/media-libs/harfbuzz-4.2.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz
 INHERIT=flag-o-matic meson-multilib python-any-r1 xdg-utils
 IUSE=+cairo debug doc experimental +glib +graphite icu +introspection test +truetype abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Old-MIT ISC icu
 RDEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=introspection? ( glib )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/4.0.0
 SRC_URI=https://github.com/harfbuzz/harfbuzz/archive/4.2.1.tar.gz -> harfbuzz-4.2.1.tar.gz
 _eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=f87f03085438eb9a5f1c016fc0a2d3e3
+_md5_=61bce6c4804a8671047b994dc4b25356
diff --git a/metadata/md5-cache/media-libs/libjxl-0.7.0_pre20220329 b/metadata/md5-cache/media-libs/libjxl-0.7.0_pre20220329
index 3d228a4bd1eb..ea576db364f7 100644
--- a/metadata/md5-cache/media-libs/libjxl-0.7.0_pre20220329
+++ b/metadata/md5-cache/media-libs/libjxl-0.7.0_pre20220329
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/libjxl/libjxl
 INHERIT=cmake-multilib
 IUSE=examples openexr abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86
 LICENSE=BSD
 RDEPEND=app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-cpp/gflags:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/highway-0.16.0[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/giflib:=[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/lcms-2.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(-)?] media-libs/libpng:=[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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-misc/shared-mime-info-2.2 openexr? ( media-libs/openexr:= )
 SLOT=0
 SRC_URI=https://api.github.com/repos/libjxl/libjxl/tarball/fde214c5f4dc5ffd0360401a68df33182edf9226 -> libjxl-0.7.0_pre20220329.tar.gz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=f1a1c8570c130b8f91cd5007660e58a9
+_md5_=30b528876deb7128a6eadb13d25760b7
diff --git a/metadata/md5-cache/media-libs/libpulse-16.0 b/metadata/md5-cache/media-libs/libpulse-16.0
index 08a7007fd736..36609caf1fa5 100644
--- a/metadata/md5-cache/media-libs/libpulse-16.0
+++ b/metadata/md5-cache/media-libs/libpulse-16.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-lang/perl dev-perl/XML-Parser sys-devel/gettext sys-devel/m4 virtual/libiconv virtual/libintl virtual/pkgconfig doc? ( app-doc/doxygen ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libc asyncns? ( >=net-libs/libasyncns-0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( >=sys-apps/dbus-1.4.12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.28.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( x11-libs/gtk+:3 ) selinux? ( sec-policy/selinux-pulseaudio ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) valgrind? ( dev-util/valgrind ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) || ( elibc_glibc? ( virtual/libc ) dev-libs/libpcre:3 ) !<media-sound/pulseaudio-15.0-r100 test? ( >=dev-libs/check-0.9.10 ) X? ( x11-base/xorg-proto )
+DEPEND=dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libc asyncns? ( >=net-libs/libasyncns-0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( >=sys-apps/dbus-1.4.12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.28.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( x11-libs/gtk+:3 ) selinux? ( sec-policy/selinux-pulseaudio ) systemd? ( sys-apps/systemd:= ) valgrind? ( dev-util/valgrind ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) || ( elibc_glibc? ( virtual/libc ) dev-libs/libpcre:3 ) !<media-sound/pulseaudio-15.0-r100 test? ( >=dev-libs/check-0.9.10 ) X? ( x11-base/xorg-proto )
 DESCRIPTION=Libraries for PulseAudio clients
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/PulseAudio/
 INHERIT=bash-completion-r1 gnome2-utils meson-multilib optfeature systemd udev
-IUSE=+asyncns dbus doc +glib gtk selinux systemd tcpd test valgrind X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+IUSE=+asyncns dbus doc +glib gtk selinux systemd test valgrind X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libc asyncns? ( >=net-libs/libasyncns-0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( >=sys-apps/dbus-1.4.12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.28.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( x11-libs/gtk+:3 ) selinux? ( sec-policy/selinux-pulseaudio ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) valgrind? ( dev-util/valgrind ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) || ( elibc_glibc? ( virtual/libc ) dev-libs/libpcre:3 ) !<media-sound/pulseaudio-15.0-r100
+RDEPEND=dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libc asyncns? ( >=net-libs/libasyncns-0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( >=sys-apps/dbus-1.4.12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.28.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( x11-libs/gtk+:3 ) selinux? ( sec-policy/selinux-pulseaudio ) systemd? ( sys-apps/systemd:= ) valgrind? ( dev-util/valgrind ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) || ( elibc_glibc? ( virtual/libc ) dev-libs/libpcre:3 ) !<media-sound/pulseaudio-15.0-r100
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-16.0.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=0deb03deb33fea11b98aca6f3d35606d
+_md5_=a40c41eacfd39ab0d6bb48060aca2109
diff --git a/metadata/md5-cache/media-libs/libvmaf-2.3.0-r2 b/metadata/md5-cache/media-libs/libvmaf-2.3.0-r2
index a3a8593f58c7..dbdd78de5065 100644
--- a/metadata/md5-cache/media-libs/libvmaf-2.3.0-r2
+++ b/metadata/md5-cache/media-libs/libvmaf-2.3.0-r2
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Netflix/vmaf/archive/v2.3.0.tar.gz -> libvmaf-2.3.0.tar.gz
 _eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=5c56052cfab7be4bb629f712b1781f37
+_md5_=e44af70baa74b1582857aab8614e9495
diff --git a/metadata/md5-cache/media-libs/mesa-22.0.5 b/metadata/md5-cache/media-libs/mesa-22.0.5
index 6ede4e28af86..0615917fe0f3 100644
--- a/metadata/md5-cache/media-libs/mesa-22.0.5
+++ b/metadata/md5-cache/media-libs/mesa-22.0.5
@@ -1,17 +1,17 @@
 BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex virtual/pkgconfig || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/mako-0.8.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/mako-0.8.0[python_targets_python3_8(-)] ) ) wayland? ( dev-util/wayland-scanner ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install pretend setup test
-DEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libdrm-2.4.109[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] vulkan-overlay? ( dev-util/glslang:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.109[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.109[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.109[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.109[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.109[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-14:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-14:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-14:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-14:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-14:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-14:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-14:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-14:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) valgrind? ( dev-util/valgrind ) wayland? ( >=dev-libs/wayland-protocols-1.24 ) X? ( x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto ) !!sys-devel/llvm:0
+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
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libdrm-2.4.109[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] vulkan-overlay? ( dev-util/glslang:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.109[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.109[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.109[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.109[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.109[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-14:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-14:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-14:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-14:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-14:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-14:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-14:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-14:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) )
+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	dcbf4f67bc38bee48e9d69a4344e8059	llvm	6f88d422e49b917bf254b2594f3d903c	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=524cbdbcb314b69834889a0c1c786e8f
+_md5_=13a3fec93d1e8449f4d3499a4102b623
diff --git a/metadata/md5-cache/media-libs/sdl2-mixer-2.0.4 b/metadata/md5-cache/media-libs/sdl2-mixer-2.0.4
index 71a7e3d891dd..6374d1de6507 100644
--- a/metadata/md5-cache/media-libs/sdl2-mixer-2.0.4
+++ b/metadata/md5-cache/media-libs/sdl2-mixer-2.0.4
@@ -13,4 +13,4 @@ REQUIRED_USE=midi? ( || ( timidity fluidsynth ) ) timidity? ( midi ) fluidsynth?
 SLOT=0
 SRC_URI=https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-2.0.4.tar.gz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=04974715fc12225254d40167f57e8c2b
+_md5_=f08ecdc028eab1f35a9ee6ebbfee0d2b
diff --git a/metadata/md5-cache/media-libs/sdl2-mixer-2.0.4-r1 b/metadata/md5-cache/media-libs/sdl2-mixer-2.0.4-r1
index 2bf0e72a37a1..c3cd0cdc4b01 100644
--- a/metadata/md5-cache/media-libs/sdl2-mixer-2.0.4-r1
+++ b/metadata/md5-cache/media-libs/sdl2-mixer-2.0.4-r1
@@ -13,4 +13,4 @@ REQUIRED_USE=midi? ( || ( timidity fluidsynth ) ) timidity? ( midi ) fluidsynth?
 SLOT=0
 SRC_URI=https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-2.0.4.tar.gz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=0a12d6147e1e8ec2d4989a3bcf405226
+_md5_=a4ee2e1b33468bc6cdd5254548854754
diff --git a/metadata/md5-cache/media-libs/woff2-1.0.2-r5 b/metadata/md5-cache/media-libs/woff2-1.0.2-r5
index d81e0697169c..6324701ec41a 100644
--- a/metadata/md5-cache/media-libs/woff2-1.0.2-r5
+++ b/metadata/md5-cache/media-libs/woff2-1.0.2-r5
@@ -11,4 +11,4 @@ RDEPEND=app-arch/brotli:=
 SLOT=0
 SRC_URI=https://github.com/google/woff2/archive/v1.0.2.tar.gz -> woff2-1.0.2.tar.gz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a100b7899b6d2af0e60f5387f7ddea1b
+_md5_=a883d9acb43a82d5db3edf851a938686
diff --git a/metadata/md5-cache/media-libs/zxing-cpp-1.3.0 b/metadata/md5-cache/media-libs/zxing-cpp-1.3.0
index 721dca0936bd..f06f53cf595f 100644
--- a/metadata/md5-cache/media-libs/zxing-cpp-1.3.0
+++ b/metadata/md5-cache/media-libs/zxing-cpp-1.3.0
@@ -4,9 +4,9 @@ DESCRIPTION=C++ Multi-format 1D/2D barcode image processing library
 EAPI=8
 HOMEPAGE=https://github.com/nu-book/zxing-cpp
 INHERIT=cmake
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/nu-book/zxing-cpp/archive/v1.3.0.tar.gz -> zxing-cpp-1.3.0.tar.gz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=f3a3078246c327b880661a176d4fe2fb
+_md5_=a44f5e7891473e5687f876e60f60a572
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 0b83c7cf2380..b6fcb3168262 100644
Binary files a/metadata/md5-cache/media-sound/Manifest.gz and b/metadata/md5-cache/media-sound/Manifest.gz differ
diff --git a/metadata/md5-cache/media-sound/abcmidi-2022.06.14 b/metadata/md5-cache/media-sound/abcmidi-2022.06.14
new file mode 100644
index 000000000000..f4625d2c24da
--- /dev/null
+++ b/metadata/md5-cache/media-sound/abcmidi-2022.06.14
@@ -0,0 +1,13 @@
+BDEPEND=app-arch/unzip sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=install prepare
+DESCRIPTION=Programs for processing ABC music notation files
+EAPI=8
+HOMEPAGE=https://ifdo.ca/~seymour/runabc/top.html
+INHERIT=autotools
+IUSE=examples
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://ifdo.ca/~seymour/runabc/abcMIDI-2022.06.14.zip
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=6472bf39705eebc0d5dee53ab12c1973
diff --git a/metadata/md5-cache/media-sound/klick-0.12.2-r3 b/metadata/md5-cache/media-sound/klick-0.12.2-r3
new file mode 100644
index 000000000000..c2d1969402ce
--- /dev/null
+++ b/metadata/md5-cache/media-sound/klick-0.12.2-r3
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-util/scons[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-util/scons[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-util/scons[python_targets_python3_8(-)] ) )
+DEFINED_PHASES=compile configure install setup
+DEPEND=media-libs/libsamplerate media-libs/libsndfile virtual/jack osc? ( media-libs/liblo ) rubberband? ( media-libs/rubberband ) dev-libs/boost
+DESCRIPTION=An advanced command-line based metronome for JACK
+EAPI=7
+HOMEPAGE=http://das.nasophon.de/klick
+INHERIT=python-any-r1 scons-utils toolchain-funcs
+IUSE=debug osc rubberband
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2+
+RDEPEND=media-libs/libsamplerate media-libs/libsndfile virtual/jack osc? ( media-libs/liblo ) rubberband? ( media-libs/rubberband )
+SLOT=0
+SRC_URI=http://das.nasophon.de/download/klick-0.12.2.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	scons-utils	c30e32d0d48c308fe47706846020fdfa	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=e47ee3dcbd71534e98478878ccc3cf7f
diff --git a/metadata/md5-cache/media-sound/mixxx-2.3.2 b/metadata/md5-cache/media-sound/mixxx-2.3.2
index 855d2cf437d0..abae470c6dd4 100644
--- a/metadata/md5-cache/media-sound/mixxx-2.3.2
+++ b/metadata/md5-cache/media-sound/mixxx-2.3.2
@@ -12,4 +12,4 @@ RDEPEND=dev-db/sqlite dev-libs/glib:2 dev-libs/protobuf:0= dev-qt/qtcore:5 dev-q
 SLOT=0
 SRC_URI=https://github.com/mixxxdj/mixxx/archive/refs/tags/2.3.2.tar.gz -> mixxx-2.3.2.tar.gz l10n_ca? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-ca.pdf ) l10n_cs? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-cs.pdf ) l10n_de? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-de.pdf ) l10n_en? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-en.pdf ) l10n_es? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-es.pdf ) l10n_fi? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-fi.pdf ) l10n_fr? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-fr.pdf ) l10n_gl? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-gl.pdf ) l10n_id? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-id.pdf ) l10n_it? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-it.pdf ) l10n_ja? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-ja-JP.pdf ) l10n_kn? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-kn.pdf ) l10n_nl? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-nl.pdf ) l10n_pl? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-pl.pdf ) l10n_pt? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-pt.pdf ) l10n_ro? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-ro.pdf ) l10n_ru? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-ru.pdf ) l10n_sl? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-sl.pdf ) l10n_sq? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-sq.pdf ) l10n_sr? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-sr.pdf ) l10n_tr? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-tr.pdf ) l10n_zh-CN? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-zh-CN.pdf ) l10n_zh-TW? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-zh-TW.pdf ) https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-en.pdf
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=75325ba07d15ef3b68dacd514d3185cd
+_md5_=68d533fe4079ec3ddd58b9629b0e11cb
diff --git a/metadata/md5-cache/media-sound/mixxx-2.3.9999 b/metadata/md5-cache/media-sound/mixxx-2.3.9999
index 7fb8c3fd0ad0..a6d2c3c6cf78 100644
--- a/metadata/md5-cache/media-sound/mixxx-2.3.9999
+++ b/metadata/md5-cache/media-sound/mixxx-2.3.9999
@@ -12,4 +12,4 @@ RDEPEND=dev-db/sqlite dev-libs/glib:2 dev-libs/protobuf:0= dev-qt/qtcore:5 dev-q
 SLOT=0
 SRC_URI=l10n_ca? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-ca.pdf ) l10n_cs? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-cs.pdf ) l10n_de? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-de.pdf ) l10n_en? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-en.pdf ) l10n_es? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-es.pdf ) l10n_fi? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-fi.pdf ) l10n_fr? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-fr.pdf ) l10n_gl? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-gl.pdf ) l10n_id? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-id.pdf ) l10n_it? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-it.pdf ) l10n_ja? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-ja-JP.pdf ) l10n_kn? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-kn.pdf ) l10n_nl? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-nl.pdf ) l10n_pl? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-pl.pdf ) l10n_pt? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-pt.pdf ) l10n_ro? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-ro.pdf ) l10n_ru? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-ru.pdf ) l10n_sl? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-sl.pdf ) l10n_sq? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-sq.pdf ) l10n_sr? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-sr.pdf ) l10n_tr? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-tr.pdf ) l10n_zh-CN? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-zh-CN.pdf ) l10n_zh-TW? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-zh-TW.pdf ) https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-en.pdf
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=74dc6a4fa2fac9f6e9a3f9353c91f5c0
+_md5_=a5cde88c55acdd370540dca51c419c07
diff --git a/metadata/md5-cache/media-sound/pms-0.42_p20170508-r1 b/metadata/md5-cache/media-sound/pms-0.42_p20170508-r1
index 8b8e2a00984f..e060a51e1fd2 100644
--- a/metadata/md5-cache/media-sound/pms-0.42_p20170508-r1
+++ b/metadata/md5-cache/media-sound/pms-0.42_p20170508-r1
@@ -12,4 +12,4 @@ RDEPEND=sys-libs/ncurses:=[unicode(+)] media-libs/libmpdclient
 SLOT=0
 SRC_URI=https://github.com/ambientsound/pms/archive/8c8918488a4a22924ee04442dc5e5216783d51ff.tar.gz -> pms-0.42_p20170508.tar.gz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vcs-snapshot	19dc666868420457132a7514d4621476	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=cf9545c04d001f9bc0a40ba922eeec2c
+_md5_=4632dfbe6806239a8e7ee08202acda9b
diff --git a/metadata/md5-cache/media-sound/pms-9999 b/metadata/md5-cache/media-sound/pms-9999
deleted file mode 100644
index 58ab43f01979..000000000000
--- a/metadata/md5-cache/media-sound/pms-9999
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-text/pandoc ) dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sys-libs/ncurses:=[unicode(+)] media-libs/libmpdclient
-DESCRIPTION=Practical Music Search: an open source ncurses client for mpd, written in C++
-EAPI=7
-HOMEPAGE=https://ambientsound.github.io/pms
-INHERIT=cmake git-r3
-IUSE=+regex doc
-LICENSE=GPL-3+
-PROPERTIES=live
-RDEPEND=sys-libs/ncurses:=[unicode(+)] media-libs/libmpdclient
-SLOT=0
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=108bfffe3fb236cd22380f0f4a923a84
diff --git a/metadata/md5-cache/media-sound/pulseaudio-daemon-16.0-r1 b/metadata/md5-cache/media-sound/pulseaudio-daemon-16.0-r1
index 174b43205563..da432807f159 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-daemon-16.0-r1
+++ b/metadata/md5-cache/media-sound/pulseaudio-daemon-16.0-r1
@@ -1,6 +1,6 @@
 BDEPEND=dev-lang/perl dev-perl/XML-Parser sys-devel/gettext virtual/libiconv virtual/libintl virtual/pkgconfig orc? ( >=dev-lang/orc-0.4.15 ) system-wide? ( dev-util/unifdef ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=media-libs/libpulse-16.0[dbus?,glib?,systemd?,tcpd?,valgrind?,X?] dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20 >=media-libs/speexdsp-1.2 || ( elibc_glibc? ( virtual/libc ) dev-libs/libpcre:3 ) alsa? ( >=media-libs/alsa-lib-1.0.24 ) aptx? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) asyncns? ( >=net-libs/libasyncns-0.1 ) bluetooth? ( >=net-wireless/bluez-5 media-libs/sbc ) dev-libs/libltdl sys-kernel/linux-headers >=sys-libs/libcap-2.22-r2 dbus? ( >=sys-apps/dbus-1.4.12 ) elogind? ( sys-auth/elogind ) equalizer? ( sci-libs/fftw:3.0= ) fftw? ( sci-libs/fftw:3.0= ) gdbm? ( sys-libs/gdbm:= ) glib? ( >=dev-libs/glib-2.28.0:2 ) gstreamer? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) gtk? ( x11-libs/gtk+:3 ) jack? ( virtual/jack ) ldac? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) lirc? ( app-misc/lirc ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) selinux? ( sec-policy/selinux-pulseaudio ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) udev? ( >=virtual/udev-143[hwdb(+)] ) valgrind? ( dev-util/valgrind ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 ) X? ( >=x11-libs/libxcb-1.6 x11-libs/libICE x11-libs/libSM >=x11-libs/libX11-1.4.0 >=x11-libs/libXtst-1.0.99.2 ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) !<media-sound/pulseaudio-15.0-r100 test? ( >=dev-libs/check-0.9.10 ) X? ( x11-base/xorg-proto )
+DEPEND=>=media-libs/libpulse-16.0[dbus?,glib?,systemd?,tcpd(+)?,valgrind?,X?] dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20 >=media-libs/speexdsp-1.2 || ( elibc_glibc? ( virtual/libc ) dev-libs/libpcre:3 ) alsa? ( >=media-libs/alsa-lib-1.0.24 ) aptx? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) asyncns? ( >=net-libs/libasyncns-0.1 ) bluetooth? ( >=net-wireless/bluez-5 media-libs/sbc ) dev-libs/libltdl sys-kernel/linux-headers >=sys-libs/libcap-2.22-r2 dbus? ( >=sys-apps/dbus-1.4.12 ) elogind? ( sys-auth/elogind ) equalizer? ( sci-libs/fftw:3.0= ) fftw? ( sci-libs/fftw:3.0= ) gdbm? ( sys-libs/gdbm:= ) glib? ( >=dev-libs/glib-2.28.0:2 ) gstreamer? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) gtk? ( x11-libs/gtk+:3 ) jack? ( virtual/jack ) ldac? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) lirc? ( app-misc/lirc ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) selinux? ( sec-policy/selinux-pulseaudio ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) udev? ( >=virtual/udev-143[hwdb(+)] ) valgrind? ( dev-util/valgrind ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 ) X? ( >=x11-libs/libxcb-1.6 x11-libs/libICE x11-libs/libSM >=x11-libs/libX11-1.4.0 >=x11-libs/libXtst-1.0.99.2 ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) !<media-sound/pulseaudio-15.0-r100 test? ( >=dev-libs/check-0.9.10 ) X? ( x11-base/xorg-proto )
 DESCRIPTION=A networked sound server with an advanced plugin system
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/PulseAudio/
@@ -9,10 +9,10 @@ IUSE=+alsa +alsa-plugin aptx +asyncns bluetooth dbus elogind equalizer fftw +gdb
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )
 PDEPEND=alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio] ) )
-RDEPEND=>=media-libs/libpulse-16.0[dbus?,glib?,systemd?,tcpd?,valgrind?,X?] dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20 >=media-libs/speexdsp-1.2 || ( elibc_glibc? ( virtual/libc ) dev-libs/libpcre:3 ) alsa? ( >=media-libs/alsa-lib-1.0.24 ) aptx? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) asyncns? ( >=net-libs/libasyncns-0.1 ) bluetooth? ( >=net-wireless/bluez-5 media-libs/sbc ) dev-libs/libltdl sys-kernel/linux-headers >=sys-libs/libcap-2.22-r2 dbus? ( >=sys-apps/dbus-1.4.12 ) elogind? ( sys-auth/elogind ) equalizer? ( sci-libs/fftw:3.0= ) fftw? ( sci-libs/fftw:3.0= ) gdbm? ( sys-libs/gdbm:= ) glib? ( >=dev-libs/glib-2.28.0:2 ) gstreamer? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) gtk? ( x11-libs/gtk+:3 ) jack? ( virtual/jack ) ldac? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) lirc? ( app-misc/lirc ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) selinux? ( sec-policy/selinux-pulseaudio ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) udev? ( >=virtual/udev-143[hwdb(+)] ) valgrind? ( dev-util/valgrind ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 ) X? ( >=x11-libs/libxcb-1.6 x11-libs/libICE x11-libs/libSM >=x11-libs/libX11-1.4.0 >=x11-libs/libXtst-1.0.99.2 ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) !<media-sound/pulseaudio-15.0-r100 system-wide? ( alsa? ( media-sound/alsa-utils ) acct-user/pulse acct-group/audio acct-group/pulse-access ) bluetooth? ( ldac? ( media-plugins/gst-plugins-ldac ) aptx? ( media-plugins/gst-plugins-openaptx ) ) virtual/tmpfiles
+RDEPEND=>=media-libs/libpulse-16.0[dbus?,glib?,systemd?,tcpd(+)?,valgrind?,X?] dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20 >=media-libs/speexdsp-1.2 || ( elibc_glibc? ( virtual/libc ) dev-libs/libpcre:3 ) alsa? ( >=media-libs/alsa-lib-1.0.24 ) aptx? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) asyncns? ( >=net-libs/libasyncns-0.1 ) bluetooth? ( >=net-wireless/bluez-5 media-libs/sbc ) dev-libs/libltdl sys-kernel/linux-headers >=sys-libs/libcap-2.22-r2 dbus? ( >=sys-apps/dbus-1.4.12 ) elogind? ( sys-auth/elogind ) equalizer? ( sci-libs/fftw:3.0= ) fftw? ( sci-libs/fftw:3.0= ) gdbm? ( sys-libs/gdbm:= ) glib? ( >=dev-libs/glib-2.28.0:2 ) gstreamer? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) gtk? ( x11-libs/gtk+:3 ) jack? ( virtual/jack ) ldac? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) lirc? ( app-misc/lirc ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) selinux? ( sec-policy/selinux-pulseaudio ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) udev? ( >=virtual/udev-143[hwdb(+)] ) valgrind? ( dev-util/valgrind ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 ) X? ( >=x11-libs/libxcb-1.6 x11-libs/libICE x11-libs/libSM >=x11-libs/libX11-1.4.0 >=x11-libs/libXtst-1.0.99.2 ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) !<media-sound/pulseaudio-15.0-r100 system-wide? ( alsa? ( media-sound/alsa-utils ) acct-user/pulse acct-group/audio acct-group/pulse-access ) bluetooth? ( ldac? ( media-plugins/gst-plugins-ldac ) aptx? ( media-plugins/gst-plugins-openaptx ) ) virtual/tmpfiles
 REQUIRED_USE=?? ( elogind systemd ) alsa-plugin? ( alsa ) aptx? ( bluetooth ) bluetooth? ( dbus ) equalizer? ( dbus ) ldac? ( bluetooth ) ofono-headset? ( bluetooth ) udev? ( || ( alsa oss ) ) zeroconf? ( dbus )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-16.0.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=8909176327d8c67223b2368e42c6705d
+_md5_=e3407e1da1537dcb5ba2d2e9ca4f59b9
diff --git a/metadata/md5-cache/media-sound/pulseaudio-daemon-16.0-r4 b/metadata/md5-cache/media-sound/pulseaudio-daemon-16.0-r4
new file mode 100644
index 000000000000..982692eb6d82
--- /dev/null
+++ b/metadata/md5-cache/media-sound/pulseaudio-daemon-16.0-r4
@@ -0,0 +1,18 @@
+BDEPEND=dev-lang/perl dev-perl/XML-Parser sys-devel/gettext virtual/libiconv virtual/libintl virtual/pkgconfig orc? ( >=dev-lang/orc-0.4.15 ) system-wide? ( dev-util/unifdef ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=media-libs/libpulse-16.0[dbus?,glib?,systemd?,valgrind?,X?] dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20 >=media-libs/speexdsp-1.2 || ( elibc_glibc? ( virtual/libc ) dev-libs/libpcre:3 ) alsa? ( >=media-libs/alsa-lib-1.0.24 ) aptx? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) asyncns? ( >=net-libs/libasyncns-0.1 ) bluetooth? ( >=net-wireless/bluez-5 media-libs/sbc ) dev-libs/libltdl sys-kernel/linux-headers >=sys-libs/libcap-2.22-r2 dbus? ( >=sys-apps/dbus-1.4.12 ) elogind? ( sys-auth/elogind ) equalizer? ( sci-libs/fftw:3.0= ) fftw? ( sci-libs/fftw:3.0= ) gdbm? ( sys-libs/gdbm:= ) glib? ( >=dev-libs/glib-2.28.0:2 ) gstreamer? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 >=dev-libs/glib-2.26.0:2 ) jack? ( virtual/jack ) ldac? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) lirc? ( app-misc/lirc ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) selinux? ( sec-policy/selinux-pulseaudio ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) udev? ( >=virtual/udev-143[hwdb(+)] ) valgrind? ( dev-util/valgrind ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 ) X? ( >=x11-libs/libxcb-1.6 x11-libs/libICE x11-libs/libSM >=x11-libs/libX11-1.4.0 >=x11-libs/libXtst-1.0.99.2 ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) !<media-sound/pulseaudio-15.0-r100 test? ( >=dev-libs/check-0.9.10 ) X? ( x11-base/xorg-proto )
+DESCRIPTION=A networked sound server with an advanced plugin system
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/PulseAudio/
+INHERIT=bash-completion-r1 gnome2-utils meson optfeature systemd tmpfiles udev
+IUSE=+alsa +alsa-plugin aptx +asyncns bluetooth dbus elogind equalizer fftw +gdbm +glib gstreamer jack ldac lirc ofono-headset +orc oss selinux sox ssl systemd system-wide tcpd test +udev valgrind +webrtc-aec +X zeroconf
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )
+PDEPEND=alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio] ) )
+RDEPEND=>=media-libs/libpulse-16.0[dbus?,glib?,systemd?,valgrind?,X?] dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20 >=media-libs/speexdsp-1.2 || ( elibc_glibc? ( virtual/libc ) dev-libs/libpcre:3 ) alsa? ( >=media-libs/alsa-lib-1.0.24 ) aptx? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) asyncns? ( >=net-libs/libasyncns-0.1 ) bluetooth? ( >=net-wireless/bluez-5 media-libs/sbc ) dev-libs/libltdl sys-kernel/linux-headers >=sys-libs/libcap-2.22-r2 dbus? ( >=sys-apps/dbus-1.4.12 ) elogind? ( sys-auth/elogind ) equalizer? ( sci-libs/fftw:3.0= ) fftw? ( sci-libs/fftw:3.0= ) gdbm? ( sys-libs/gdbm:= ) glib? ( >=dev-libs/glib-2.28.0:2 ) gstreamer? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 >=dev-libs/glib-2.26.0:2 ) jack? ( virtual/jack ) ldac? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) lirc? ( app-misc/lirc ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) selinux? ( sec-policy/selinux-pulseaudio ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) udev? ( >=virtual/udev-143[hwdb(+)] ) valgrind? ( dev-util/valgrind ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 ) X? ( >=x11-libs/libxcb-1.6 x11-libs/libICE x11-libs/libSM >=x11-libs/libX11-1.4.0 >=x11-libs/libXtst-1.0.99.2 ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) !<media-sound/pulseaudio-15.0-r100 system-wide? ( alsa? ( media-sound/alsa-utils ) acct-user/pulse acct-group/audio acct-group/pulse-access ) bluetooth? ( ldac? ( media-plugins/gst-plugins-ldac ) aptx? ( media-plugins/gst-plugins-openaptx ) ) virtual/tmpfiles
+REQUIRED_USE=?? ( elogind systemd ) alsa-plugin? ( alsa ) aptx? ( bluetooth ) bluetooth? ( dbus ) equalizer? ( dbus ) ldac? ( bluetooth ) ofono-headset? ( bluetooth ) udev? ( || ( alsa oss ) ) zeroconf? ( dbus )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-16.0.tar.xz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=75fa6241d8ae1516bd071d082e27da75
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index 198582970ccc..b136fb7de92a 100644
Binary files a/metadata/md5-cache/media-tv/Manifest.gz and b/metadata/md5-cache/media-tv/Manifest.gz differ
diff --git a/metadata/md5-cache/media-tv/kodi-19.4-r1 b/metadata/md5-cache/media-tv/kodi-19.4-r1
new file mode 100644
index 000000000000..7f619d77d34f
--- /dev/null
+++ b/metadata/md5-cache/media-tv/kodi-19.4-r1
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-libs/lzo-2.04 >=dev-libs/flatbuffers-1.12.0:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= dev-lang/swig dev-util/cmake media-libs/giflib >=dev-libs/flatbuffers-1.11.0 >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= virtual/pkgconfig virtual/jre 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-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/lzo-2.04 >=dev-libs/flatbuffers-1.12.0:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite,ssl] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite,ssl] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite,ssl] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/crossguid >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycryptodome[python_targets_python3_10(-)] ) >=dev-libs/libcdio-2.1.0[cxx] >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp gbm? ( >=dev-libs/libinput-1.10.5 media-libs/mesa[gbm(+)] x11-libs/libxkbcommon ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.3.2:=[dav1d?,encode,postproc] =media-video/ffmpeg-4*[openssl] ) !system-ffmpeg? ( app-arch/bzip2 dav1d? ( media-libs/dav1d ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) !gles? ( media-libs/glu ) >=dev-libs/openssl-1.1.1k:0= raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl(+),gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva-vdpau-driver ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 >=x11-libs/libxkbcommon-0.4.1 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( media-libs/mesa[X] !gles? ( media-libs/libglvnd[X] ) x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.9.4 ) zeroconf? ( net-dns/avahi[dbus] ) dev-libs/rapidjson test? ( >=dev-cpp/gtest-1.10.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A free and open source media-player and entertainment hub
+EAPI=7
+HOMEPAGE=https://kodi.tv/ https://kodi.wiki/
+INHERIT=autotools cmake desktop linux-info pax-utils python-single-r1 xdg
+IUSE=airplay alsa bluetooth bluray caps cec +css dav1d dbus eventclients gbm gles lcms libusb lirc mariadb mysql nfs +optical power-control pulseaudio raspberry-pi samba +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/lzo-2.04 >=dev-libs/flatbuffers-1.12.0:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite,ssl] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite,ssl] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite,ssl] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/crossguid >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycryptodome[python_targets_python3_10(-)] ) >=dev-libs/libcdio-2.1.0[cxx] >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp gbm? ( >=dev-libs/libinput-1.10.5 media-libs/mesa[gbm(+)] x11-libs/libxkbcommon ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.3.2:=[dav1d?,encode,postproc] =media-video/ffmpeg-4*[openssl] ) !system-ffmpeg? ( app-arch/bzip2 dav1d? ( media-libs/dav1d ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) !gles? ( media-libs/glu ) >=dev-libs/openssl-1.1.1k:0= raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl(+),gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva-vdpau-driver ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 >=x11-libs/libxkbcommon-0.4.1 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( media-libs/mesa[X] !gles? ( media-libs/libglvnd[X] ) x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.9.4 ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( app-misc/lirc ) power-control? ( || ( sys-apps/systemd sys-auth/elogind ) ) udisks? ( sys-fs/udisks:2 ) upower? ( sys-power/upower )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) || ( gbm wayland X ) ?? ( mariadb mysql ) bluray? ( udf ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus ) power-control? ( dbus ) vdpau? ( X !gles !gbm ) zeroconf? ( dbus )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz -> libdvdcss-1.4.2-Leia-Beta-5.tar.gz https://github.com/xbmc/libdvdread/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdread-6.0.0-Leia-Alpha-3.tar.gz https://github.com/xbmc/libdvdnav/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdnav-6.0.0-Leia-Alpha-3.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/4.3.2-Matrix-19.1.tar.gz -> ffmpeg-kodi-4.3.2-Matrix-19.1.tar.gz ) https://github.com/xbmc/xbmc/archive/19.4-Matrix.tar.gz -> kodi-19.4-Matrix.tar.gz
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	cmake	90e2b29417d53718328f3a95227137a0	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=553af200ab2738d1266d326373104d15
diff --git a/metadata/md5-cache/media-tv/kodi-19.9999 b/metadata/md5-cache/media-tv/kodi-19.9999
index 5ac82c4fd3d1..3626151bbdf5 100644
--- a/metadata/md5-cache/media-tv/kodi-19.9999
+++ b/metadata/md5-cache/media-tv/kodi-19.9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-libs/lzo-2.04 >=dev-libs/flatbuffers-1.12.0:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= dev-lang/swig dev-util/cmake media-libs/giflib >=dev-libs/flatbuffers-1.11.0 >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= virtual/pkgconfig virtual/jre >=dev-vcs/git-1.8.2.1[curl] 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-util/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/lzo-2.04 >=dev-libs/flatbuffers-1.12.0:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite,ssl] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite,ssl] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite,ssl] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/crossguid >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycryptodome[python_targets_python3_10(-)] ) >=dev-libs/libcdio-2.1.0[cxx] >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp gbm? ( >=dev-libs/libinput-1.10.5 media-libs/mesa[gbm(+)] x11-libs/libxkbcommon ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.3.2:=[dav1d?,encode,postproc] =media-video/ffmpeg-4*[openssl] ) !system-ffmpeg? ( app-arch/bzip2 dav1d? ( media-libs/dav1d ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) !gles? ( media-libs/glu ) >=dev-libs/openssl-1.1.1k:0= raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl(+),gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= !gles? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva-vdpau-driver ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 >=x11-libs/libxkbcommon-0.4.1 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( media-libs/mesa[X] !gles? ( media-libs/libglvnd[X] ) x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.9.4 ) zeroconf? ( net-dns/avahi[dbus] ) dev-libs/rapidjson test? ( >=dev-cpp/gtest-1.10.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/lzo-2.04 >=dev-libs/flatbuffers-1.12.0:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite,ssl] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite,ssl] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite,ssl] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/crossguid >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycryptodome[python_targets_python3_10(-)] ) >=dev-libs/libcdio-2.1.0[cxx] >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp gbm? ( >=dev-libs/libinput-1.10.5 media-libs/mesa[gbm(+)] x11-libs/libxkbcommon ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.3.2:=[dav1d?,encode,postproc] =media-video/ffmpeg-4*[openssl] ) !system-ffmpeg? ( app-arch/bzip2 dav1d? ( media-libs/dav1d ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) !gles? ( media-libs/glu ) >=dev-libs/openssl-1.1.1k:0= raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl(+),gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva-vdpau-driver ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 >=x11-libs/libxkbcommon-0.4.1 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( media-libs/mesa[X] !gles? ( media-libs/libglvnd[X] ) x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.9.4 ) zeroconf? ( net-dns/avahi[dbus] ) dev-libs/rapidjson test? ( >=dev-cpp/gtest-1.10.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A free and open source media-player and entertainment hub
 EAPI=7
 HOMEPAGE=https://kodi.tv/ https://kodi.wiki/
@@ -8,10 +8,10 @@ INHERIT=git-r3 autotools cmake desktop linux-info pax-utils python-single-r1 xdg
 IUSE=airplay alsa bluetooth bluray caps cec +css dav1d dbus eventclients gbm gles lcms libusb lirc mariadb mysql nfs +optical power-control pulseaudio raspberry-pi samba +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 LICENSE=GPL-2+
 PROPERTIES=live
-RDEPEND=>=dev-libs/lzo-2.04 >=dev-libs/flatbuffers-1.12.0:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite,ssl] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite,ssl] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite,ssl] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/crossguid >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycryptodome[python_targets_python3_10(-)] ) >=dev-libs/libcdio-2.1.0[cxx] >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp gbm? ( >=dev-libs/libinput-1.10.5 media-libs/mesa[gbm(+)] x11-libs/libxkbcommon ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.3.2:=[dav1d?,encode,postproc] =media-video/ffmpeg-4*[openssl] ) !system-ffmpeg? ( app-arch/bzip2 dav1d? ( media-libs/dav1d ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) !gles? ( media-libs/glu ) >=dev-libs/openssl-1.1.1k:0= raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl(+),gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= !gles? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva-vdpau-driver ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 >=x11-libs/libxkbcommon-0.4.1 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( media-libs/mesa[X] !gles? ( media-libs/libglvnd[X] ) x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.9.4 ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( app-misc/lirc ) power-control? ( || ( sys-apps/systemd sys-auth/elogind ) ) udisks? ( sys-fs/udisks:2 ) upower? ( sys-power/upower )
+RDEPEND=>=dev-libs/lzo-2.04 >=dev-libs/flatbuffers-1.12.0:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite,ssl] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite,ssl] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite,ssl] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/crossguid >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycryptodome[python_targets_python3_10(-)] ) >=dev-libs/libcdio-2.1.0[cxx] >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp gbm? ( >=dev-libs/libinput-1.10.5 media-libs/mesa[gbm(+)] x11-libs/libxkbcommon ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.3.2:=[dav1d?,encode,postproc] =media-video/ffmpeg-4*[openssl] ) !system-ffmpeg? ( app-arch/bzip2 dav1d? ( media-libs/dav1d ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) !gles? ( media-libs/glu ) >=dev-libs/openssl-1.1.1k:0= raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl(+),gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva-vdpau-driver ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 >=x11-libs/libxkbcommon-0.4.1 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( media-libs/mesa[X] !gles? ( media-libs/libglvnd[X] ) x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.9.4 ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( app-misc/lirc ) power-control? ( || ( sys-apps/systemd sys-auth/elogind ) ) udisks? ( sys-fs/udisks:2 ) upower? ( sys-power/upower )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) || ( gbm wayland X ) ?? ( mariadb mysql ) bluray? ( udf ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus ) power-control? ( dbus ) vdpau? ( X !gles !gbm ) zeroconf? ( dbus )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz -> libdvdcss-1.4.2-Leia-Beta-5.tar.gz https://github.com/xbmc/libdvdread/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdread-6.0.0-Leia-Alpha-3.tar.gz https://github.com/xbmc/libdvdnav/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdnav-6.0.0-Leia-Alpha-3.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/4.3.2-Matrix-19.1.tar.gz -> ffmpeg-kodi-4.3.2-Matrix-19.1.tar.gz )
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	cmake	90e2b29417d53718328f3a95227137a0	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=207fea5bd95d4f4fb95513f0f4b82667
+_md5_=553af200ab2738d1266d326373104d15
diff --git a/metadata/md5-cache/media-tv/kodi-9999 b/metadata/md5-cache/media-tv/kodi-9999
index d447958dace3..0feffa0dafa8 100644
--- a/metadata/md5-cache/media-tv/kodi-9999
+++ b/metadata/md5-cache/media-tv/kodi-9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-libs/lzo-2.04 >=dev-libs/flatbuffers-1.11.0:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= dev-lang/swig dev-util/cmake media-libs/giflib >=dev-libs/flatbuffers-1.11.0 >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= virtual/pkgconfig virtual/jre >=dev-vcs/git-1.8.2.1[curl] 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-util/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/lzo-2.04 >=dev-libs/flatbuffers-1.11.0:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite,ssl] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite,ssl] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite,ssl] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/crossguid >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycryptodome[python_targets_python3_10(-)] ) >=dev-libs/libcdio-2.1.0[cxx] >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp gbm? ( >=dev-libs/libinput-1.10.5 media-libs/mesa[gbm(+)] x11-libs/libxkbcommon ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/freetype-2.10.1 >=media-libs/libass-0.15.1 !raspberry-pi? ( media-libs/mesa[egl(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.4:=[dav1d?,encode,postproc] media-video/ffmpeg[openssl] ) !system-ffmpeg? ( app-arch/bzip2 dav1d? ( media-libs/dav1d ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) !gles? ( media-libs/glu ) >=dev-libs/openssl-1.1.0:0= raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl(+),gles2,video_cards_vc4] ) ) pipewire? ( media-video/pipewire ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= !gles? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva-vdpau-driver ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 >=x11-libs/libxkbcommon-0.4.1 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( media-libs/mesa[X] !gles? ( media-libs/libglvnd[X] ) x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.9.4 ) zeroconf? ( net-dns/avahi[dbus] ) dev-libs/rapidjson test? ( >=dev-cpp/gtest-1.10.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/lzo-2.04 >=dev-libs/flatbuffers-1.11.0:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite,ssl] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite,ssl] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite,ssl] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/crossguid >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycryptodome[python_targets_python3_10(-)] ) >=dev-libs/libcdio-2.1.0[cxx] >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp gbm? ( >=dev-libs/libinput-1.10.5 media-libs/mesa[gbm(+)] x11-libs/libxkbcommon ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/freetype-2.10.1 >=media-libs/libass-0.15.1 !raspberry-pi? ( media-libs/mesa[egl(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.4.1:=[dav1d?,encode,postproc] media-video/ffmpeg[openssl] ) !system-ffmpeg? ( app-arch/bzip2 dav1d? ( media-libs/dav1d ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) !gles? ( media-libs/glu ) >=dev-libs/openssl-1.1.0:0= raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl(+),gles2,video_cards_vc4] ) ) pipewire? ( media-video/pipewire ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva-vdpau-driver ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 >=x11-libs/libxkbcommon-0.4.1 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( media-libs/mesa[X] !gles? ( media-libs/libglvnd[X] ) x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.9.4 ) zeroconf? ( net-dns/avahi[dbus] ) dev-libs/rapidjson test? ( >=dev-cpp/gtest-1.10.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A free and open source media-player and entertainment hub
 EAPI=7
 HOMEPAGE=https://kodi.tv/ https://kodi.wiki/
@@ -8,10 +8,10 @@ INHERIT=git-r3 autotools cmake desktop linux-info pax-utils python-single-r1 xdg
 IUSE=airplay alsa bluetooth bluray caps cec +css dav1d dbus eventclients gbm gles lcms libusb lirc mariadb mysql nfs +optical pipewire power-control pulseaudio raspberry-pi samba +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 LICENSE=GPL-2+
 PROPERTIES=live
-RDEPEND=>=dev-libs/lzo-2.04 >=dev-libs/flatbuffers-1.11.0:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite,ssl] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite,ssl] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite,ssl] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/crossguid >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycryptodome[python_targets_python3_10(-)] ) >=dev-libs/libcdio-2.1.0[cxx] >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp gbm? ( >=dev-libs/libinput-1.10.5 media-libs/mesa[gbm(+)] x11-libs/libxkbcommon ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/freetype-2.10.1 >=media-libs/libass-0.15.1 !raspberry-pi? ( media-libs/mesa[egl(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.4:=[dav1d?,encode,postproc] media-video/ffmpeg[openssl] ) !system-ffmpeg? ( app-arch/bzip2 dav1d? ( media-libs/dav1d ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) !gles? ( media-libs/glu ) >=dev-libs/openssl-1.1.0:0= raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl(+),gles2,video_cards_vc4] ) ) pipewire? ( media-video/pipewire ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= !gles? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva-vdpau-driver ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 >=x11-libs/libxkbcommon-0.4.1 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( media-libs/mesa[X] !gles? ( media-libs/libglvnd[X] ) x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.9.4 ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( app-misc/lirc ) power-control? ( || ( sys-apps/systemd sys-auth/elogind ) ) udisks? ( sys-fs/udisks:2 ) upower? ( sys-power/upower )
+RDEPEND=>=dev-libs/lzo-2.04 >=dev-libs/flatbuffers-1.11.0:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite,ssl] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite,ssl] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite,ssl] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/crossguid >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycryptodome[python_targets_python3_10(-)] ) >=dev-libs/libcdio-2.1.0[cxx] >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp gbm? ( >=dev-libs/libinput-1.10.5 media-libs/mesa[gbm(+)] x11-libs/libxkbcommon ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/freetype-2.10.1 >=media-libs/libass-0.15.1 !raspberry-pi? ( media-libs/mesa[egl(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.4.1:=[dav1d?,encode,postproc] media-video/ffmpeg[openssl] ) !system-ffmpeg? ( app-arch/bzip2 dav1d? ( media-libs/dav1d ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) !gles? ( media-libs/glu ) >=dev-libs/openssl-1.1.0:0= raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl(+),gles2,video_cards_vc4] ) ) pipewire? ( media-video/pipewire ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva-vdpau-driver ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 >=x11-libs/libxkbcommon-0.4.1 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( media-libs/mesa[X] !gles? ( media-libs/libglvnd[X] ) x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.9.4 ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( app-misc/lirc ) power-control? ( || ( sys-apps/systemd sys-auth/elogind ) ) udisks? ( sys-fs/udisks:2 ) upower? ( sys-power/upower )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) || ( gbm wayland X ) ?? ( mariadb mysql ) bluray? ( udf ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus ) power-control? ( dbus ) vdpau? ( X !gles !gbm ) zeroconf? ( dbus )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz -> libdvdcss-1.4.2-Leia-Beta-5.tar.gz https://github.com/xbmc/libdvdread/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdread-6.0.0-Leia-Alpha-3.tar.gz https://github.com/xbmc/libdvdnav/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdnav-6.0.0-Leia-Alpha-3.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/4.4-N-Alpha1.tar.gz -> ffmpeg-kodi-4.4-N-Alpha1.tar.gz )
+SRC_URI=https://github.com/xbmc/libdvdcss/archive/1.4.3-Next-Nexus-Alpha2.tar.gz -> libdvdcss-1.4.3-Next-Nexus-Alpha2.tar.gz https://github.com/xbmc/libdvdread/archive/6.1.3-Next-Nexus-Alpha2.tar.gz -> libdvdread-6.1.3-Next-Nexus-Alpha2.tar.gz https://github.com/xbmc/libdvdnav/archive/6.1.1-Next-Nexus-Alpha2.tar.gz -> libdvdnav-6.1.1-Next-Nexus-Alpha2.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/4.4.1-Nexus-Alpha1.tar.gz -> ffmpeg-kodi-4.4.1-Nexus-Alpha1.tar.gz )
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	cmake	90e2b29417d53718328f3a95227137a0	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c856f922a136d30a5c514c5ed9586c7b
+_md5_=ca26a5b8ad7cda9003b00d87f10ece54
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 63e5430374df..e6e40ec1a81a 100644
Binary files a/metadata/md5-cache/media-video/Manifest.gz and b/metadata/md5-cache/media-video/Manifest.gz differ
diff --git a/metadata/md5-cache/media-video/baka-mplayer-2.0.4-r1 b/metadata/md5-cache/media-video/baka-mplayer-2.0.4-r1
index ff31b25d946a..27ef16a40694 100644
--- a/metadata/md5-cache/media-video/baka-mplayer-2.0.4-r1
+++ b/metadata/md5-cache/media-video/baka-mplayer-2.0.4-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Cross-platform libmpv-based multimedia player with uncluttered desig
 EAPI=7
 HOMEPAGE=http://bakamplayer.u8sand.net/
 INHERIT=qmake-utils xdg-utils
-KEYWORDS=amd64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/mpv[libmpv] x11-libs/libX11
 SLOT=0
 SRC_URI=https://github.com/u8sand/Baka-MPlayer/archive/v2.0.4.tar.gz -> baka-mplayer-2.0.4.tar.gz
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=10ff08b164ea7f077792c519bf5b3984
+_md5_=9c146e7784189e5cdd51f7bf454de1f5
diff --git a/metadata/md5-cache/media-video/jellyfin-media-player-1.6.1 b/metadata/md5-cache/media-video/jellyfin-media-player-1.7.0
similarity index 76%
rename from metadata/md5-cache/media-video/jellyfin-media-player-1.6.1
rename to metadata/md5-cache/media-video/jellyfin-media-player-1.7.0
index ae6c125ae9d3..8ff2ebc62896 100644
--- a/metadata/md5-cache/media-video/jellyfin-media-player-1.6.1
+++ b/metadata/md5-cache/media-video/jellyfin-media-player-1.7.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta1-r1:3.11 >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-libs/libcec dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5 dev-qt/qtwidgets:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/libsdl2 media-video/mpv[libmpv] sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libXrandr dbus? ( dev-qt/qtdbus:5 )
 DESCRIPTION=Jellyfin Desktop Client based on Plex Media Player
@@ -8,8 +8,8 @@ INHERIT=cmake python-any-r1
 IUSE=+dbus
 KEYWORDS=~amd64
 LICENSE=GPL-2 BSD MIT
-RDEPEND=dev-libs/libcec dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5 dev-qt/qtwidgets:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/libsdl2 media-video/mpv[libmpv] sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libXrandr dbus? ( dev-qt/qtdbus:5 ) media-video/jellyfin-web-jmp-bin !dbus? ( x11-misc/xdg-utils )
+RDEPEND=dev-libs/libcec dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5 dev-qt/qtwidgets:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/libsdl2 media-video/mpv[libmpv] sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libXrandr dbus? ( dev-qt/qtdbus:5 ) ~media-video/jellyfin-web-jmp-bin-10.8.0 !dbus? ( x11-misc/xdg-utils )
 SLOT=0
-SRC_URI=https://github.com/jellyfin/jellyfin-media-player/archive/refs/tags/v1.6.1.tar.gz -> jellyfin-media-player-1.6.1.tar.gz
+SRC_URI=https://github.com/jellyfin/jellyfin-media-player/archive/refs/tags/v1.7.0.tar.gz -> jellyfin-media-player-1.7.0.tar.gz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=532c1e6dd7f2f77f016529af650aa08d
+_md5_=bcf3d979e4a301561db264824b5803d5
diff --git a/metadata/md5-cache/media-video/jellyfin-web-jmp-bin-10.7.6 b/metadata/md5-cache/media-video/jellyfin-web-jmp-bin-10.8.0
similarity index 74%
rename from metadata/md5-cache/media-video/jellyfin-web-jmp-bin-10.7.6
rename to metadata/md5-cache/media-video/jellyfin-web-jmp-bin-10.8.0
index 1fdb707532e6..a430237ec0d7 100644
--- a/metadata/md5-cache/media-video/jellyfin-web-jmp-bin-10.7.6
+++ b/metadata/md5-cache/media-video/jellyfin-web-jmp-bin-10.8.0
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/jellyfin/jellyfin-media-player
 KEYWORDS=~amd64
 LICENSE=GPL-2
 SLOT=0
-SRC_URI=https://github.com/iwalton3/jellyfin-web-jmp/releases/download/jwc-10.7.6/dist.zip -> jellyfin-web-jmp-bin-10.7.6.zip
-_md5_=955e1c8822508616acc53bcda1545f15
+SRC_URI=https://github.com/iwalton3/jellyfin-web-jmp/releases/download/jwc-10.8.0/dist.zip -> jellyfin-web-jmp-bin-10.8.0.zip
+_md5_=62118152c297129b8d82d75922af3f8c
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.49-r1 b/metadata/md5-cache/media-video/pipewire-0.3.49-r2
similarity index 99%
rename from metadata/md5-cache/media-video/pipewire-0.3.49-r1
rename to metadata/md5-cache/media-video/pipewire-0.3.49-r2
index 0a132d5299bb..f8d743a6857d 100644
--- a/metadata/md5-cache/media-video/pipewire-0.3.49-r1
+++ b/metadata/md5-cache/media-video/pipewire-0.3.49-r2
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.4
 SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.49/pipewire-0.3.49.tar.gz
 _eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712
-_md5_=d5525800edc9a261f3e96a607702423d
+_md5_=6e046c8ca457602ee8a16cb55cafc73e
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.50-r3 b/metadata/md5-cache/media-video/pipewire-0.3.50-r3
deleted file mode 100644
index f9625e6ac926..000000000000
--- a/metadata/md5-cache/media-video/pipewire-0.3.50-r3
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=>=dev-util/meson-0.59 virtual/pkgconfig || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/docutils[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/docutils[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/docutils[python_targets_python3_8(-)] ) ) doc? ( app-doc/doxygen media-gfx/graphviz ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:= sys-libs/ncurses:=[unicode(+)] 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(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/sbc >=net-wireless/bluez-4.101:= virtual/libusb:1 ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) lv2? ( media-libs/lilv ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) !pipewire-alsa? ( media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire ) udev? ( virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l ) X? ( media-libs/libcanberra x11-libs/libX11 x11-libs/libXfixes ) zeroconf? ( net-dns/avahi )
-DESCRIPTION=Multimedia processing graphs
-EAPI=8
-HOMEPAGE=https://pipewire.org/
-INHERIT=flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev
-IUSE=bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2 pipewire-alsa ssl system-service systemd test udev v4l X zeroconf abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=MIT LGPL-2.1+ GPL-2
-PDEPEND=>=media-video/wireplumber-0.4.8-r3
-RDEPEND=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:= sys-libs/ncurses:=[unicode(+)] 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(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/sbc >=net-wireless/bluez-4.101:= virtual/libusb:1 ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) lv2? ( media-libs/lilv ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) !pipewire-alsa? ( media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire ) udev? ( virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l ) X? ( media-libs/libcanberra x11-libs/libX11 x11-libs/libXfixes ) zeroconf? ( net-dns/avahi )
-REQUIRED_USE=jack-sdk? ( !jack-client ) system-service? ( systemd )
-RESTRICT=!test? ( test )
-SLOT=0/0.4
-SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.50/pipewire-0.3.50.tar.gz
-_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712
-_md5_=d8d162e561da86a0e06b0d2fba9aebb5
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.51-r1 b/metadata/md5-cache/media-video/pipewire-0.3.51-r2
similarity index 98%
rename from metadata/md5-cache/media-video/pipewire-0.3.51-r1
rename to metadata/md5-cache/media-video/pipewire-0.3.51-r2
index b18f3eb2b7ec..dc41b42b8f55 100644
--- a/metadata/md5-cache/media-video/pipewire-0.3.51-r1
+++ b/metadata/md5-cache/media-video/pipewire-0.3.51-r2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://pipewire.org/
 INHERIT=flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev
 IUSE=bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2 pipewire-alsa ssl system-service systemd test udev v4l X zeroconf abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=MIT LGPL-2.1+ GPL-2
 PDEPEND=>=media-video/wireplumber-0.4.8-r3
 RDEPEND=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:= sys-libs/ncurses:=[unicode(+)] 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(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/sbc >=net-wireless/bluez-4.101:= virtual/libusb:1 ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) lv2? ( media-libs/lilv ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !pipewire-alsa? ( media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire ) udev? ( virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l ) X? ( media-libs/libcanberra x11-libs/libX11 x11-libs/libXfixes ) zeroconf? ( net-dns/avahi )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.4
 SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.51/pipewire-0.3.51.tar.gz
 _eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712
-_md5_=afe27fa27c59ebb06d94b6f90bef8b06
+_md5_=0a315090f6b74046c3e0a18e1027b9f3
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.52 b/metadata/md5-cache/media-video/pipewire-0.3.52-r1
similarity index 99%
rename from metadata/md5-cache/media-video/pipewire-0.3.52
rename to metadata/md5-cache/media-video/pipewire-0.3.52-r1
index 05488c997308..728e0426ab04 100644
--- a/metadata/md5-cache/media-video/pipewire-0.3.52
+++ b/metadata/md5-cache/media-video/pipewire-0.3.52-r1
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.4
 SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.52/pipewire-0.3.52.tar.gz
 _eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712
-_md5_=8e5e7a447c32f924b28b1c9f931cc3ce
+_md5_=f45ea9b87c50a05f093329255ebad9a8
diff --git a/metadata/md5-cache/media-video/pipewire-9999 b/metadata/md5-cache/media-video/pipewire-9999
index 7687c00aed89..c8a276c8ce11 100644
--- a/metadata/md5-cache/media-video/pipewire-9999
+++ b/metadata/md5-cache/media-video/pipewire-9999
@@ -14,4 +14,4 @@ REQUIRED_USE=jack-sdk? ( !jack-client ) system-service? ( systemd )
 RESTRICT=!test? ( test )
 SLOT=0/0.4
 _eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712
-_md5_=c2076aef0da5080bd7fb70300a58d165
+_md5_=a9f3971ea6ad36e626a6e6de40bb7879
diff --git a/metadata/md5-cache/media-video/vdr-2.2.0-r6 b/metadata/md5-cache/media-video/vdr-2.2.0-r6
index 0fe6e46a243e..4280b97627a3 100644
--- a/metadata/md5-cache/media-video/vdr-2.2.0-r6
+++ b/metadata/md5-cache/media-video/vdr-2.2.0-r6
@@ -12,4 +12,4 @@ RDEPEND=virtual/jpeg:* sys-libs/libcap >=media-libs/fontconfig-2.4.2 >=media-lib
 SLOT=0
 SRC_URI=ftp://ftp.tvdr.de/vdr/vdr-2.2.0.tar.bz2 mirror://gentoo/extpng-vdr-2.2.0-gentoo-edition-v1.patch.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=bb060b5d12c1e9a26e0fa64a3bdce301
+_md5_=22aa102c90a0a4b71cde40668a43e488
diff --git a/metadata/md5-cache/media-video/vdr-2.2.0-r7 b/metadata/md5-cache/media-video/vdr-2.2.0-r7
index 19af076f074f..63d4c88b3421 100644
--- a/metadata/md5-cache/media-video/vdr-2.2.0-r7
+++ b/metadata/md5-cache/media-video/vdr-2.2.0-r7
@@ -12,4 +12,4 @@ RDEPEND=virtual/jpeg:* sys-libs/libcap >=media-libs/fontconfig-2.4.2 >=media-lib
 SLOT=0
 SRC_URI=ftp://ftp.tvdr.de/vdr/vdr-2.2.0.tar.bz2 mirror://gentoo/extpng-vdr-2.2.0-gentoo-edition-v1.patch.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ef37860f5e994df9c12a02ef372c30b9
+_md5_=519b031ddb43174d4e2aeeefe4463d84
diff --git a/metadata/md5-cache/media-video/vdr-2.4.7-r1 b/metadata/md5-cache/media-video/vdr-2.4.7-r1
index 5f07714eb336..52cb98ff52e2 100644
--- a/metadata/md5-cache/media-video/vdr-2.4.7-r1
+++ b/metadata/md5-cache/media-video/vdr-2.4.7-r1
@@ -13,4 +13,4 @@ REQUIRED_USE=pinplugin? ( !mainmenuhooks ) permashift? ( !naludump !pinplugin )
 SLOT=0
 SRC_URI=http://git.tvdr.de/?p=vdr.git;a=snapshot;h=refs/tags/2.4.7;sf=tbz2 -> vdr-2.4.7.tbz2 mainmenuhooks? ( http://vdr.websitec.de/download/vdr/vdr-2.4.1/vdr-2.4.1_mainmenuhook-1.0.1.patch.bz2 ) menuorg? ( https://projects.vdr-developer.org/projects/plg-menuorg/repository/revisions/master/raw/vdr-patch/vdr-menuorg-2.3.x.diff ) naludump? ( https://www.udo-richter.de/vdr/files/vdr-2.1.5-naludump-0.1.diff ) pinplugin? ( http://vdr.websitec.de/download/vdr/vdr-2.4.6/vdr-2.4.6_pinplugin.patch.bz2 ) ttxtsubs? ( http://vdr.websitec.de/download/vdr/vdr-2.4.6/vdr-2.4.6_ttxtsubs_v2.patch.bz2 ) permashift? ( http://vdr.websitec.de/download/vdr/vdr-2.4.6/vdr-2.4-patch-for-permashift.diff.bz2 )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=43db4ace2e2fb48378c4fc1b8ef97482
+_md5_=ad385a212f590db0688c1922a8095caa
diff --git a/metadata/md5-cache/media-video/wireplumber-0.4.10-r1 b/metadata/md5-cache/media-video/wireplumber-0.4.10-r1
index 451475eb827f..c4b3d585127b 100644
--- a/metadata/md5-cache/media-video/wireplumber-0.4.10-r1
+++ b/metadata/md5-cache/media-video/wireplumber-0.4.10-r1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.4
 SRC_URI=https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/0.4.10/wireplumber-0.4.10.tar.gz
 _eclasses_=lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=fa2e0232cc7ac9b42e6d159221316661
+_md5_=1a3ea1a654ca0d6619b5ae4e52f76400
diff --git a/metadata/md5-cache/media-video/wireplumber-0.4.10-r3 b/metadata/md5-cache/media-video/wireplumber-0.4.10-r3
index 1866d2645299..f493368e2809 100644
--- a/metadata/md5-cache/media-video/wireplumber-0.4.10-r3
+++ b/metadata/md5-cache/media-video/wireplumber-0.4.10-r3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://gitlab.freedesktop.org/pipewire/wireplumber
 INHERIT=lua-single meson systemd
 IUSE=elogind system-service systemd test lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=MIT
 RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) >=dev-libs/glib-2.62 >=media-video/pipewire-0.3.48:= virtual/libc virtual/libintl elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire )
 REQUIRED_USE=^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) ?? ( elogind systemd ) system-service? ( systemd )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.4
 SRC_URI=https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/0.4.10/wireplumber-0.4.10.tar.gz
 _eclasses_=lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=67dc5638d87e217d84b5bcfb9b079958
+_md5_=49bf19207127fb7bab536c62a55d6bb8
diff --git a/metadata/md5-cache/media-video/wireplumber-0.4.9 b/metadata/md5-cache/media-video/wireplumber-0.4.9
index 2a6e76f8beaa..4d5469727271 100644
--- a/metadata/md5-cache/media-video/wireplumber-0.4.9
+++ b/metadata/md5-cache/media-video/wireplumber-0.4.9
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.4
 SRC_URI=https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/0.4.9/wireplumber-0.4.9.tar.gz
 _eclasses_=lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=54872929a3877696f0edecc65d53ecc1
+_md5_=cf9d895ca9b25e9f44835cb2b756cf35
diff --git a/metadata/md5-cache/media-video/wireplumber-0.4.9-r1 b/metadata/md5-cache/media-video/wireplumber-0.4.9-r1
index 3b6b6b29eeaf..516022d2d9f3 100644
--- a/metadata/md5-cache/media-video/wireplumber-0.4.9-r1
+++ b/metadata/md5-cache/media-video/wireplumber-0.4.9-r1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.4
 SRC_URI=https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/0.4.9/wireplumber-0.4.9.tar.gz
 _eclasses_=lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=77718bf98013254860cdb258a0e4637e
+_md5_=dbb011c084682693bae3d96dafc65b6b
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index de58ec392b59..6852502787b4 100644
Binary files a/metadata/md5-cache/net-analyzer/Manifest.gz and b/metadata/md5-cache/net-analyzer/Manifest.gz differ
diff --git a/metadata/md5-cache/net-analyzer/icinga2-2.13.2-r3 b/metadata/md5-cache/net-analyzer/icinga2-2.13.2-r3
deleted file mode 100644
index ba56cdb23bbd..000000000000
--- a/metadata/md5-cache/net-analyzer/icinga2-2.13.2-r3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/bison >=sys-devel/flex-2.5.35 dev-util/ninja >=dev-util/cmake-3.20.5 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-libs/openssl:0= >=dev-libs/boost-1.66.0:=[context] console? ( dev-libs/libedit ) mariadb? ( dev-db/mariadb-connector-c:= ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) dev-libs/yajl:= acct-user/icinga acct-group/icinga acct-group/icingacmd
-DESCRIPTION=Distributed, general purpose, network monitoring engine
-EAPI=7
-HOMEPAGE=https://icinga.com/
-INHERIT=cmake systemd
-IUSE=console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/openssl:0= >=dev-libs/boost-1.66.0:=[context] console? ( dev-libs/libedit ) mariadb? ( dev-db/mariadb-connector-c:= ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) dev-libs/yajl:= acct-user/icinga acct-group/icinga acct-group/icingacmd plugins? ( || ( net-analyzer/monitoring-plugins net-analyzer/nagios-plugins ) ) mail? ( virtual/mailx ) acct-group/nagios
-REQUIRED_USE=!minimal? ( || ( mariadb mysql postgres ) )
-SLOT=0
-SRC_URI=https://github.com/Icinga/icinga2/archive/v2.13.2.tar.gz -> icinga2-2.13.2.tar.gz https://github.com/Icinga/icinga2/commit/8cde21ddfd66a0fcfac704544a0fd7990cfc94ec.patch -> icinga2-2.13.2-9092.patch
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=f49ef1c0a22036e648e460b17b239130
diff --git a/metadata/md5-cache/net-analyzer/ipguard-1.04-r1 b/metadata/md5-cache/net-analyzer/ipguard-1.04-r1
index bb20f6cd5707..3194424a1fb0 100644
--- a/metadata/md5-cache/net-analyzer/ipguard-1.04-r1
+++ b/metadata/md5-cache/net-analyzer/ipguard-1.04-r1
@@ -11,4 +11,4 @@ RDEPEND=net-libs/libnet:1.1 net-libs/libpcap
 SLOT=0
 SRC_URI=http://ipguard.deep.perm.ru/files/ipguard-1.04.tar.gz
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=3712ff795df4b1dfd127e62f9dc9cd19
+_md5_=338def3627db317489a45b4cc72aef03
diff --git a/metadata/md5-cache/net-analyzer/wireshark-3.6.6 b/metadata/md5-cache/net-analyzer/wireshark-3.6.6
new file mode 100644
index 000000000000..d69c841ff5dc
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/wireshark-3.6.6
@@ -0,0 +1,17 @@
+BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) dev-lang/perl 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.0_p1-r1:3.10 dev-python/pytest[python_targets_python3_10(-)] dev-python/pytest-xdist[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/pytest[python_targets_python3_9(-)] dev-python/pytest-xdist[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/pytest[python_targets_python3_8(-)] dev-python/pytest-xdist[python_targets_python3_8(-)] ) ) ) dev-util/ninja >=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.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:= )
+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
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+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 )
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) ) plugin-ifdemo? ( plugins )
+RESTRICT=!test? ( test )
+SLOT=0/3.6.6
+SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-3.6.6.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	fcaps	babe6282ea5c195981bd302af1adaf3a	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=0d5af4071eec1154cdf912162b0358a9
diff --git a/metadata/md5-cache/net-analyzer/xprobe-0.3-r1 b/metadata/md5-cache/net-analyzer/xprobe-0.3-r1
index 7db6bfbadc15..d1828b2e482a 100644
--- a/metadata/md5-cache/net-analyzer/xprobe-0.3-r1
+++ b/metadata/md5-cache/net-analyzer/xprobe-0.3-r1
@@ -10,4 +10,4 @@ RDEPEND=net-libs/libpcap
 SLOT=0
 SRC_URI=mirror://sourceforge/xprobe/xprobe2-0.3.tar.gz
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=6a4a468414f8c1d8d6d16955e9173aa4
+_md5_=66dae62e5cfbabb5abe737cdee74cfd0
diff --git a/metadata/md5-cache/net-dialup/Manifest.gz b/metadata/md5-cache/net-dialup/Manifest.gz
index 8a5033424ac5..b5868af9581d 100644
Binary files a/metadata/md5-cache/net-dialup/Manifest.gz and b/metadata/md5-cache/net-dialup/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dialup/ppp-2.4.9-r8 b/metadata/md5-cache/net-dialup/ppp-2.4.9-r8
index e54f955e53bd..4865e1299723 100644
--- a/metadata/md5-cache/net-dialup/ppp-2.4.9-r8
+++ b/metadata/md5-cache/net-dialup/ppp-2.4.9-r8
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://ppp.samba.org/
 INHERIT=linux-info pam toolchain-funcs
 IUSE=activefilter atm dhcp +eap-tls gtk ipv6 pam radius systemd
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD GPL-2
 PDEPEND=net-dialup/ppp-scripts
 RDEPEND=dev-libs/openssl:0= virtual/libcrypt:= activefilter? ( net-libs/libpcap ) atm? ( net-dialup/linux-atm ) gtk? ( x11-libs/gtk+:2 ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd ) !<net-misc/netifrc-0.7.1-r2
 SLOT=0/2.4.9
 SRC_URI=https://github.com/paulusmack/ppp/archive/ppp-2.4.9.tar.gz https://dev.gentoo.org/~polynomial-c/ppp-2.4.9-patches-03.tar.xz http://www.netservers.net.uk/gpl/ppp-dhcpc.tgz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=e3e8940f0708bc4418156684a86982a8
+_md5_=c372c685da71ed2b30369b7343055a74
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 3ec82e6fdae5..41bd22bf2cfe 100644
Binary files a/metadata/md5-cache/net-dns/Manifest.gz and b/metadata/md5-cache/net-dns/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dns/bind-9.16.30 b/metadata/md5-cache/net-dns/bind-9.16.30
new file mode 100644
index 000000000000..a77ebfcd9478
--- /dev/null
+++ b/metadata/md5-cache/net-dns/bind-9.16.30
@@ -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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) dev-python/ply[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-libs/libuv:=
+DESCRIPTION=Berkeley Internet Name Domain - Name Server
+EAPI=8
+HOMEPAGE=https://www.isc.org/software/bind
+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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) dev-python/ply[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-libs/libuv:= selinux? ( sec-policy/selinux-bind ) sys-process/psmisc virtual/tmpfiles
+REQUIRED_USE=postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz ) odbc? ( dlz ) ldap? ( dlz ) dnsrps? ( dlz ) python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://downloads.isc.org/isc/bind9/9.16.30/bind-9.16.30.tar.xz doc? ( mirror://gentoo/dyndns-samples.tbz2 )
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	db-use	867a9246a45efc09934e0f8e3380c813	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=cef88b35d3ecbc8ba6634859967e7592
diff --git a/metadata/md5-cache/net-dns/bind-tools-9.16.30 b/metadata/md5-cache/net-dns/bind-tools-9.16.30
new file mode 100644
index 000000000000..c43c87c8ef4f
--- /dev/null
+++ b/metadata/md5-cache/net-dns/bind-tools-9.16.30
@@ -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
+INHERIT=autotools flag-o-matic multiprocessing toolchain-funcs
+IUSE=+caps doc gssapi idn ipv6 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.30/bind-9.16.30.tar.xz
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=29af6a45e3cba6aeb3d0689e320ba31c
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index 1b3f8abb475e..b73bdfbff812 100644
Binary files a/metadata/md5-cache/net-fs/Manifest.gz and b/metadata/md5-cache/net-fs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-fs/libnfs-5.0.1 b/metadata/md5-cache/net-fs/libnfs-5.0.1
index 7fdf135223ab..03e0cf1ff518 100644
--- a/metadata/md5-cache/net-fs/libnfs-5.0.1
+++ b/metadata/md5-cache/net-fs/libnfs-5.0.1
@@ -5,9 +5,9 @@ EAPI=7
 HOMEPAGE=https://github.com/sahlberg/libnfs
 INHERIT=autotools
 IUSE=examples static-libs utils
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 x86
 LICENSE=LGPL-2.1 GPL-3
 SLOT=0/14
 SRC_URI=https://github.com/sahlberg/libnfs/archive/libnfs-5.0.1.tar.gz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=b51da7b7d1acc4e73a0b3e3fb21d0551
+_md5_=4f00af04c947b16a75dc99e685d75012
diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz
index 43b33dec48f0..d599abbe1be9 100644
Binary files a/metadata/md5-cache/net-ftp/Manifest.gz and b/metadata/md5-cache/net-ftp/Manifest.gz differ
diff --git a/metadata/md5-cache/net-ftp/lftp-4.9.2 b/metadata/md5-cache/net-ftp/lftp-4.9.2
index 82613d99fb15..9774068071d0 100644
--- a/metadata/md5-cache/net-ftp/lftp-4.9.2
+++ b/metadata/md5-cache/net-ftp/lftp-4.9.2
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://lftp.yar.ru/ftp/lftp-4.9.2.tar.xz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=98b72d7eff3189675d8e3d6f2415c525
+_md5_=20b844769f0516e26a500806d905641a
diff --git a/metadata/md5-cache/net-ftp/lftp-9999 b/metadata/md5-cache/net-ftp/lftp-9999
index 64b75e4702fa..429e557c7545 100644
--- a/metadata/md5-cache/net-ftp/lftp-9999
+++ b/metadata/md5-cache/net-ftp/lftp-9999
@@ -11,4 +11,4 @@ PROPERTIES=live
 RDEPEND=>=sys-libs/ncurses-5.1:= >=sys-libs/readline-5.1:= dev-libs/expat sys-libs/zlib convert-mozilla-cookies? ( dev-perl/DBI ) idn? ( net-dns/libidn2:= ) socks5? ( >=net-proxy/dante-1.1.12 sys-libs/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3:0= ) !gnutls? ( dev-libs/openssl:0= ) ) verify-file? ( dev-perl/String-CRC32 virtual/perl-Digest-MD5 )
 SLOT=0
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=f28104e859decd808c144aaa628f632b
+_md5_=a669861dcdddfeda885eaa56d8c44a0d
diff --git a/metadata/md5-cache/net-ftp/pure-ftpd-1.0.51 b/metadata/md5-cache/net-ftp/pure-ftpd-1.0.51
new file mode 100644
index 000000000000..841a8ceffb1a
--- /dev/null
+++ b/metadata/md5-cache/net-ftp/pure-ftpd-1.0.51
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/autoconf-archive
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=dev-libs/libsodium:= virtual/libcrypt:= caps? ( sys-libs/libcap ) ldap? ( >=net-nds/openldap-2.0.25:= ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) ssl? ( dev-libs/openssl:0=[-bindist(-)] ) sysquota? ( sys-fs/quota[-rpc] ) xinetd? ( virtual/inetd )
+DESCRIPTION=Fast, production-quality, standard-conformant FTP server
+EAPI=8
+HOMEPAGE=https://www.pureftpd.org/project/pure-ftpd/
+INHERIT=flag-o-matic
+IUSE=anondel anonperm anonren anonres caps implicittls ldap mysql noiplog pam paranoidmsg postgres resolveids selinux ssl sysquota vchroot xinetd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=BSD GPL-2
+RDEPEND=dev-libs/libsodium:= virtual/libcrypt:= caps? ( sys-libs/libcap ) ldap? ( >=net-nds/openldap-2.0.25:= ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) ssl? ( dev-libs/openssl:0=[-bindist(-)] ) sysquota? ( sys-fs/quota[-rpc] ) xinetd? ( virtual/inetd ) net-ftp/ftpbase selinux? ( sec-policy/selinux-ftp )
+REQUIRED_USE=implicittls? ( ssl )
+SLOT=0
+SRC_URI=ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.51.tar.bz2 http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.51.tar.bz2
+_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=318dd23542724b3f09022af65bd690e5
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index d7e9c28f67fe..335ce41821c7 100644
Binary files a/metadata/md5-cache/net-im/Manifest.gz and b/metadata/md5-cache/net-im/Manifest.gz differ
diff --git a/metadata/md5-cache/net-im/toxic-0.10.1-r1 b/metadata/md5-cache/net-im/toxic-0.10.1-r1
deleted file mode 100644
index 3ebd9682f3a0..000000000000
--- a/metadata/md5-cache/net-im/toxic-0.10.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-libs/libconfig
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=net-libs/tox:= net-misc/curl sys-libs/ncurses:= sys-kernel/linux-headers audio-notify? ( media-libs/freealut media-libs/openal ) notification? ( x11-libs/libnotify ) debug? ( llvm? ( sys-devel/llvm:* ) ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) qrcode? ( media-gfx/qrencode:= png? ( media-libs/libpng ) ) sound? ( media-libs/openal net-libs/tox:=[av] ) X? ( x11-base/xorg-proto x11-libs/libX11 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A curses-based client for Tox
-EAPI=7
-HOMEPAGE=https://github.com/JFreegman/toxic
-INHERIT=python-single-r1 xdg
-IUSE=+audio-notify debug doc llvm notification png python qrcode +sound +video +X python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=net-libs/tox:= net-misc/curl sys-libs/ncurses:= sys-kernel/linux-headers audio-notify? ( media-libs/freealut media-libs/openal ) notification? ( x11-libs/libnotify ) debug? ( llvm? ( sys-devel/llvm:* ) ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) qrcode? ( media-gfx/qrencode:= png? ( media-libs/libpng ) ) sound? ( media-libs/openal net-libs/tox:=[av] ) X? ( x11-base/xorg-proto x11-libs/libX11 )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) video? ( sound X )
-SLOT=0
-SRC_URI=https://github.com/JFreegman/toxic/archive/v0.10.1.tar.gz -> toxic-0.10.1.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=15651175bdaedc24af738f8520449987
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index e691bbc324bf..f5ac2f765411 100644
Binary files a/metadata/md5-cache/net-irc/Manifest.gz and b/metadata/md5-cache/net-irc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-irc/ngircd-26.1-r5 b/metadata/md5-cache/net-irc/ngircd-26.1-r5
new file mode 100644
index 000000000000..8382b23f89dd
--- /dev/null
+++ b/metadata/md5-cache/net-irc/ngircd-26.1-r5
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-tcltk/expect net-misc/netkit-telnetd ) verify-sig? ( sec-keys/openpgp-keys-alexbarton ) virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=configure install postinst prepare unpack
+DEPEND=acct-user/ngircd irc-plus? ( virtual/libiconv ) ident? ( net-libs/libident ) pam? ( sys-libs/pam ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) ) tcpd? ( sys-apps/tcp-wrappers ) zlib? ( sys-libs/zlib )
+DESCRIPTION=An IRC server written from scratch
+EAPI=8
+HOMEPAGE=https://ngircd.barton.de/
+INHERIT=tmpfiles systemd verify-sig
+IUSE=debug gnutls ident irc-plus +ipv6 pam +ssl strict-rfc tcpd test zlib verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~x64-macos
+LICENSE=GPL-2
+RDEPEND=acct-user/ngircd irc-plus? ( virtual/libiconv ) ident? ( net-libs/libident ) pam? ( sys-libs/pam ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) ) tcpd? ( sys-apps/tcp-wrappers ) zlib? ( sys-libs/zlib ) virtual/tmpfiles
+RESTRICT=test
+SLOT=0
+SRC_URI=https://arthur.barton.de/pub/ngircd/ngircd-26.1.tar.xz verify-sig? ( https://arthur.barton.de/pub/ngircd/ngircd-26.1.tar.xz.sig )
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=590f337dec681fe6a87c8f8c54ecad7e
diff --git a/metadata/md5-cache/net-irc/znc-clientbuffer-1.0.48 b/metadata/md5-cache/net-irc/znc-clientbuffer-1.0.48
index b159dc0fa0c4..5e2ebbd568e1 100644
--- a/metadata/md5-cache/net-irc/znc-clientbuffer-1.0.48
+++ b/metadata/md5-cache/net-irc/znc-clientbuffer-1.0.48
@@ -8,4 +8,4 @@ LICENSE=Apache-2.0
 RDEPEND=net-irc/znc:=
 SLOT=0
 SRC_URI=https://github.com/CyberShadow/znc-clientbuffer/archive/v1.0.48.tar.gz -> znc-clientbuffer-1.0.48.tar.gz
-_md5_=b03b85e14133f1dd03ab75cc839b4d07
+_md5_=42737844ff2a2d5d7a69c7f7e1cc08d0
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 69ec4a0ac1ef..da7acc638fe1 100644
Binary files a/metadata/md5-cache/net-libs/Manifest.gz and b/metadata/md5-cache/net-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-libs/gloox-1.0.24-r1 b/metadata/md5-cache/net-libs/gloox-1.0.24-r1
new file mode 100644
index 000000000000..0e9577863095
--- /dev/null
+++ b/metadata/md5-cache/net-libs/gloox-1.0.24-r1
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=idn? ( net-dns/libidn:= ) gnutls? ( net-libs/gnutls:= ) ssl? ( dev-libs/openssl:0= ) zlib? ( sys-libs/zlib )
+DESCRIPTION=A portable high-level Jabber/XMPP library for C++
+EAPI=8
+HOMEPAGE=https://camaya.net/gloox/
+INHERIT=autotools
+IUSE=debug gnutls idn ssl static-libs test zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=idn? ( net-dns/libidn:= ) gnutls? ( net-libs/gnutls:= ) ssl? ( dev-libs/openssl:0= ) zlib? ( sys-libs/zlib )
+RESTRICT=!test? ( test )
+SLOT=0/18
+SRC_URI=https://camaya.net/download/gloox-1.0.24.tar.bz2
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=ca4093869e811ecd304d231c5d0506a9
diff --git a/metadata/md5-cache/net-libs/gnutls-3.7.6 b/metadata/md5-cache/net-libs/gnutls-3.7.6
index ce2978f8dc06..b907e9261a33 100644
--- a/metadata/md5-cache/net-libs/gnutls-3.7.6
+++ b/metadata/md5-cache/net-libs/gnutls-3.7.6
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://www.gnutls.org/
 INHERIT=libtool multilib-minimal verify-sig
 IUSE=brotli +cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3 LGPL-2.1+
 RDEPEND=>=dev-libs/libtasn1-4.9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libunistring:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nettle-3.6:=[gmp,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/gmp-5.1.3-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] brotli? ( >=app-arch/brotli-1.0.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dane? ( >=net-dns/unbound-1.4.20:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) guile? ( >=dev-scheme/guile-2:=[networking] ) nls? ( >=virtual/libintl-0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.23.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( >=net-dns/libidn2-0.16-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( >=app-arch/zstd-1.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/30.30
 SRC_URI=mirror://gnupg/gnutls/v3.7/gnutls-3.7.6.tar.xz verify-sig? ( mirror://gnupg/gnutls/v3.7/gnutls-3.7.6.tar.xz.sig )
 _eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=24481e76308521ee4f756337d0ddc912
+_md5_=885dac8964ee9781d36a0f6e0ddc35f7
diff --git a/metadata/md5-cache/net-libs/libad9361-iio-0.2-r1 b/metadata/md5-cache/net-libs/libad9361-iio-0.2-r1
new file mode 100644
index 000000000000..f2fd3b95e93f
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libad9361-iio-0.2-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=net-libs/libiio:=
+DESCRIPTION=IIO AD9361 library for filter design and handling, multi-chip sync, etc
+EAPI=8
+HOMEPAGE=https://github.com/analogdevicesinc/libad9361-iio
+INHERIT=cmake
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=LGPL-2.1
+RDEPEND=net-libs/libiio:=
+SLOT=0/0.2
+SRC_URI=https://github.com/analogdevicesinc/libad9361-iio/archive/v0.2.tar.gz -> libad9361-iio-0.2.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=0b35eaa961bd951861625acec2474258
diff --git a/metadata/md5-cache/net-libs/libad9361-iio-9999 b/metadata/md5-cache/net-libs/libad9361-iio-9999
index 6f8b53229de1..ad3fbfe98356 100644
--- a/metadata/md5-cache/net-libs/libad9361-iio-9999
+++ b/metadata/md5-cache/net-libs/libad9361-iio-9999
@@ -1,13 +1,13 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=net-libs/libiio:=
-DESCRIPTION=IIO AD9361 library for filter design and handling, multi-chip sync, etc.
-EAPI=7
+DESCRIPTION=IIO AD9361 library for filter design and handling, multi-chip sync, etc
+EAPI=8
 HOMEPAGE=https://github.com/analogdevicesinc/libad9361-iio
 INHERIT=cmake git-r3
 LICENSE=LGPL-2.1
 PROPERTIES=live
 RDEPEND=net-libs/libiio:=
 SLOT=0/9999
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ba2eccc990c0fee01154f87649347ee7
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=0b35eaa961bd951861625acec2474258
diff --git a/metadata/md5-cache/net-libs/libnftnl-1.2.2-r1 b/metadata/md5-cache/net-libs/libnftnl-1.2.2-r1
new file mode 100644
index 000000000000..49c58e545a79
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libnftnl-1.2.2-r1
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( sec-keys/openpgp-keys-netfilter ) virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=configure install prepare setup unpack
+DEPEND=>=net-libs/libmnl-1.0.4:=
+DESCRIPTION=Netlink API to the in-kernel nf_tables subsystem
+EAPI=7
+HOMEPAGE=https://netfilter.org/projects/nftables/
+INHERIT=linux-info usr-ldscript verify-sig
+IUSE=examples static-libs test split-usr verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-libs/libmnl-1.0.4:=
+RESTRICT=!test? ( test )
+SLOT=0/11
+SRC_URI=https://netfilter.org/projects/libnftnl/files/libnftnl-1.2.2.tar.bz2 https://dev.gentoo.org/~sam/distfiles/net-libs/libnftnl/libnftnl-1.2.2-clang-fortify-source.patch.xz verify-sig? ( https://netfilter.org/projects/libnftnl/files/libnftnl-1.2.2.tar.bz2.sig )
+_eclasses_=linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=2f495e7debb2643ff3f6c69923e6c46b
diff --git a/metadata/md5-cache/media-libs/zxing-cpp-1.2.0 b/metadata/md5-cache/net-libs/libnipper-0.12.6-r2
similarity index 66%
rename from metadata/md5-cache/media-libs/zxing-cpp-1.2.0
rename to metadata/md5-cache/net-libs/libnipper-0.12.6-r2
index cb0dded540c7..18c514f6df4a 100644
--- a/metadata/md5-cache/media-libs/zxing-cpp-1.2.0
+++ b/metadata/md5-cache/net-libs/libnipper-0.12.6-r2
@@ -1,12 +1,12 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=C++ Multi-format 1D/2D barcode image processing library
+DESCRIPTION=A router configuration security analysis library
 EAPI=7
-HOMEPAGE=https://github.com/nu-book/zxing-cpp
+HOMEPAGE=http://nipper.titania.co.uk/
 INHERIT=cmake
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=Apache-2.0
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
 SLOT=0
-SRC_URI=https://github.com/nu-book/zxing-cpp/archive/v1.2.0.tar.gz -> zxing-cpp-1.2.0.tar.gz
+SRC_URI=mirror://sourceforge/nipper/libnipper-0.12.6.tgz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c7d5d6d99b0089970550260ce7d61022
+_md5_=808f16aff19f007d1c163705f7212836
diff --git a/metadata/md5-cache/net-libs/libnma-1.8.40 b/metadata/md5-cache/net-libs/libnma-1.8.40
new file mode 100644
index 000000000000..69b0bf035732
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libnma-1.8.40
@@ -0,0 +1,16 @@
+BDEPEND=dev-libs/libxml2 >=sys-devel/gettext-0.19.8 virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.3 ) vala? ( || ( dev-lang/vala:0.56 dev-lang/vala:0.54 dev-lang/vala:0.52 dev-lang/vala:0.50 ) net-misc/networkmanager[vala] ) app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=gui-libs/gtk-4.0:4 app-text/iso-codes net-misc/mobile-broadband-provider-info >=dev-libs/glib-2.38:2 >=x11-libs/gtk+-3.12:3[introspection?] >=net-misc/networkmanager-1.7[introspection?] pkcs11? ( >=app-crypt/gcr-3.14:= ) introspection? ( >=dev-libs/gobject-introspection-1.56:= )
+DESCRIPTION=NetworkManager GUI library
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
+INHERIT=gnome.org gnome2-utils meson xdg vala
+IUSE=gtk-doc +introspection +pkcs11 vala
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=gui-libs/gtk-4.0:4 app-text/iso-codes net-misc/mobile-broadband-provider-info >=dev-libs/glib-2.38:2 >=x11-libs/gtk+-3.12:3[introspection?] >=net-misc/networkmanager-1.7[introspection?] pkcs11? ( >=app-crypt/gcr-3.14:= ) introspection? ( >=dev-libs/gobject-introspection-1.56:= ) !<gnome-extra/nm-applet-1.16.0
+REQUIRED_USE=vala? ( introspection )
+SLOT=0
+SRC_URI=mirror://gnome/sources/libnma/1.8/libnma-1.8.40.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=9d0e826ef165050586b91b6ca71ab951
diff --git a/metadata/md5-cache/net-libs/libnsl-2.0.0-r1 b/metadata/md5-cache/net-libs/libnsl-2.0.0-r1
index b78204390058..f67363c03b20 100644
--- a/metadata/md5-cache/net-libs/libnsl-2.0.0-r1
+++ b/metadata/md5-cache/net-libs/libnsl-2.0.0-r1
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://github.com/thkukuk/libnsl
 INHERIT=multilib-minimal preserve-libs
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=>=net-libs/libtirpc-1.2.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<sys-libs/glibc-2.26
 SLOT=0/3
 SRC_URI=https://github.com/thkukuk/libnsl/releases/download/v2.0.0/libnsl-2.0.0.tar.xz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=6d25332f9c0082f6de4b41bb8926780f
+_md5_=05e72241d233fa7a0c7921dac41e1a5b
diff --git a/metadata/md5-cache/net-libs/nodejs-14.19.0 b/metadata/md5-cache/net-libs/nodejs-14.19.0
deleted file mode 100644
index 5fc36164b2cc..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-14.19.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] >=dev-lang/python-3.9.9-r1:3.9[threads(+)] >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) sys-apps/coreutils virtual/pkgconfig systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax-kernel? ( sys-apps/elfix )
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=>=app-arch/brotli-1.0.9:= >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.17.2:= >=net-libs/nghttp2-1.41.0:= sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= <dev-libs/openssl-3.0.0_beta1:0= )
-DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
-EAPI=7
-HOMEPAGE=https://nodejs.org/
-INHERIT=bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
-IUSE=cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl systemtap test
-KEYWORDS=amd64 arm arm64 ppc64 -riscv x86 ~amd64-linux ~x64-macos
-LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=>=app-arch/brotli-1.0.9:= >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.17.2:= >=net-libs/nghttp2-1.41.0:= sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= <dev-libs/openssl-3.0.0_beta1:0= )
-REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-icu? ( icu ) system-ssl? ( ssl )
-RESTRICT=!test? ( test )
-SLOT=0/14
-SRC_URI=https://nodejs.org/dist/v14.19.0/node-v14.19.0.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c7fc642e1bc1cee5a1ef6e506e195324
diff --git a/metadata/md5-cache/net-libs/nodejs-16.14.2 b/metadata/md5-cache/net-libs/nodejs-16.14.2
deleted file mode 100644
index 27f2d44627da..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-16.14.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] >=dev-lang/python-3.9.9-r1:3.9[threads(+)] >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) sys-apps/coreutils virtual/pkgconfig systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax-kernel? ( sys-apps/elfix )
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=>=app-arch/brotli-1.0.9:= >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.17.2:= >=net-libs/nghttp2-1.41.0:= sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
-EAPI=8
-HOMEPAGE=https://nodejs.org/
-INHERIT=bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
-IUSE=cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl systemtap test
-KEYWORDS=amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x64-macos
-LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=>=app-arch/brotli-1.0.9:= >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.17.2:= >=net-libs/nghttp2-1.41.0:= sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-icu? ( icu ) system-ssl? ( ssl )
-RESTRICT=!test? ( test )
-SLOT=0/16
-SRC_URI=https://nodejs.org/dist/v16.14.2/node-v16.14.2.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=8b1fb6a5de2a11ed12c6159c658722ab
diff --git a/metadata/md5-cache/net-libs/pjproject-2.12.1 b/metadata/md5-cache/net-libs/pjproject-2.12.1
new file mode 100644
index 000000000000..41c0844ff355
--- /dev/null
+++ b/metadata/md5-cache/net-libs/pjproject-2.12.1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare
+DEPEND=net-libs/libsrtp:= alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) ffmpeg? ( media-video/ffmpeg:= ) g729? ( media-libs/bcg729 ) gsm? ( media-sound/gsm ) ilbc? ( media-libs/libilbc ) openh264? ( media-libs/openh264 ) opus? ( media-libs/opus ) portaudio? ( media-libs/portaudio ) resample? ( media-libs/libsamplerate ) sdl? ( media-libs/libsdl ) speex? ( media-libs/speex media-libs/speexdsp ) ssl? ( dev-libs/openssl:0= )
+DESCRIPTION=Open source SIP, Media, and NAT Traversal Library
+EAPI=8
+HOMEPAGE=https://www.pjsip.org/
+INHERIT=autotools flag-o-matic toolchain-funcs
+IUSE=amr debug epoll examples ipv6 opus resample silk ssl static-libs webrtc g711 g722 g7221 gsm ilbc speex l16 g729 sdl ffmpeg v4l2 openh264 libyuv vpx alsa portaudio
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=net-libs/libsrtp:= alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) ffmpeg? ( media-video/ffmpeg:= ) g729? ( media-libs/bcg729 ) gsm? ( media-sound/gsm ) ilbc? ( media-libs/libilbc ) openh264? ( media-libs/openh264 ) opus? ( media-libs/opus ) portaudio? ( media-libs/portaudio ) resample? ( media-libs/libsamplerate ) sdl? ( media-libs/libsdl ) speex? ( media-libs/speex media-libs/speexdsp ) ssl? ( dev-libs/openssl:0= )
+SLOT=0/2.12.1
+SRC_URI=https://github.com/pjsip/pjproject/archive/2.12.1.tar.gz -> pjproject-2.12.1.tar.gz
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=6568de12369b3c4de4c65d96c92712bb
diff --git a/metadata/md5-cache/net-libs/tox-0.2.12-r1 b/metadata/md5-cache/net-libs/tox-0.2.12-r1
deleted file mode 100644
index 1427d091745e..000000000000
--- a/metadata/md5-cache/net-libs/tox-0.2.12-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>dev-libs/libsodium-0.6.1:=[asm,urandom,-minimal] av? ( media-libs/libvpx:= media-libs/opus ) daemon? ( dev-libs/libconfig:= )
-DESCRIPTION=Encrypted P2P, messaging, and audio/video calling platform
-EAPI=7
-HOMEPAGE=https://tox.chat https://github.com/TokTok/c-toxcore
-INHERIT=cmake systemd
-IUSE=+av daemon dht-node ipv6 log-debug +log-error log-info log-trace log-warn static-libs test
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-3+
-RDEPEND=>dev-libs/libsodium-0.6.1:=[asm,urandom,-minimal] av? ( media-libs/libvpx:= media-libs/opus ) daemon? ( dev-libs/libconfig:= ) daemon? ( acct-group/tox acct-user/tox )
-REQUIRED_USE=?? ( log-debug log-error log-info log-trace log-warn ) daemon? ( dht-node )
-RESTRICT=!test? ( test )
-SLOT=0/0.2
-SRC_URI=https://github.com/TokTok/c-toxcore/archive/v0.2.12.tar.gz -> c-toxcore-0.2.12.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=bcd42211e49a6324393cb30e9ae67829
diff --git a/metadata/md5-cache/net-libs/tox-0.2.18 b/metadata/md5-cache/net-libs/tox-0.2.18
new file mode 100644
index 000000000000..851f9a87b6e2
--- /dev/null
+++ b/metadata/md5-cache/net-libs/tox-0.2.18
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-libs/libsodium:=[asm,urandom,-minimal] dev-libs/msgpack av? ( media-libs/libvpx:= media-libs/opus ) daemon? ( dev-libs/libconfig:= )
+DESCRIPTION=Encrypted P2P, messaging, and audio/video calling platform
+EAPI=8
+HOMEPAGE=https://tox.chat https://github.com/TokTok/c-toxcore
+INHERIT=cmake systemd
+IUSE=+av debug daemon dht-node ipv6 key-utils log-debug +log-error log-info log-trace log-warn test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-libs/libsodium:=[asm,urandom,-minimal] dev-libs/msgpack av? ( media-libs/libvpx:= media-libs/opus ) daemon? ( dev-libs/libconfig:= ) daemon? ( acct-group/tox acct-user/tox ) key-utils? ( || ( sys-devel/gcc[openmp] sys-devel/clang-runtime[openmp] ) )
+REQUIRED_USE=?? ( log-debug log-error log-info log-trace log-warn ) daemon? ( dht-node )
+RESTRICT=!test? ( test )
+SLOT=0/0.2
+SRC_URI=https://github.com/TokTok/c-toxcore/releases/download/v0.2.18/c-toxcore-0.2.18.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=a61a5e0893aee499fbdf3d5c570b9234
diff --git a/metadata/md5-cache/net-libs/tox-9999 b/metadata/md5-cache/net-libs/tox-9999
index 268c4bd28a8c..b51255a98bb0 100644
--- a/metadata/md5-cache/net-libs/tox-9999
+++ b/metadata/md5-cache/net-libs/tox-9999
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl] virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=dev-libs/libsodium:=[asm,urandom,-minimal] av? ( media-libs/libvpx:= media-libs/opus ) daemon? ( dev-libs/libconfig:= )
+DEPEND=dev-libs/libsodium:=[asm,urandom,-minimal] dev-libs/msgpack av? ( media-libs/libvpx:= media-libs/opus ) daemon? ( dev-libs/libconfig:= )
 DESCRIPTION=Encrypted P2P, messaging, and audio/video calling platform
 EAPI=8
 HOMEPAGE=https://tox.chat
 INHERIT=cmake git-r3 systemd
-IUSE=+av daemon dht-node ipv6 log-debug +log-error log-info log-trace log-warn test
+IUSE=+av debug daemon dht-node ipv6 key-utils log-debug +log-error log-info log-trace log-warn test
 LICENSE=GPL-3+
 PROPERTIES=live
-RDEPEND=dev-libs/libsodium:=[asm,urandom,-minimal] av? ( media-libs/libvpx:= media-libs/opus ) daemon? ( dev-libs/libconfig:= ) daemon? ( acct-group/tox acct-user/tox )
+RDEPEND=dev-libs/libsodium:=[asm,urandom,-minimal] dev-libs/msgpack av? ( media-libs/libvpx:= media-libs/opus ) daemon? ( dev-libs/libconfig:= ) daemon? ( acct-group/tox acct-user/tox ) key-utils? ( || ( sys-devel/gcc[openmp] sys-devel/clang-runtime[openmp] ) )
 REQUIRED_USE=?? ( log-debug log-error log-info log-trace log-warn ) daemon? ( dht-node )
 RESTRICT=!test? ( test )
 SLOT=0/0.2
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=7f84ccd09efb1a6ef91775120f08c13c
+_md5_=3b4aa1ed038f5fd02f881318c715f467
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.36.3 b/metadata/md5-cache/net-libs/webkit-gtk-2.36.3
index 944c1781c805..94bd7ad58873 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.36.3
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.36.3
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_beta1-r1:3.11[xml(+)] >=dev-lang/python-3.10.0_p1-r1:3.10[xml(+)] >=dev-lang/python-3.9.9-r1:3.9[xml(+)] >=dev-lang/python-3.8.12_p1-r1:3.8[xml(+)] ) || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP gtk-doc? ( >=dev-util/gtk-doc-1.32 ) geolocation? ( dev-util/gdbus-codegen ) >=dev-util/cmake-3.10 >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta1-r1:3.11[xml(+)] >=dev-lang/python-3.10.0_p1-r1:3.10[xml(+)] >=dev-lang/python-3.9.9-r1:3.9[xml(+)] >=dev-lang/python-3.8.12_p1-r1:3.8[xml(+)] ) || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP gtk-doc? ( >=dev-util/gtk-doc-1.32 ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
 DEPEND=>=x11-libs/cairo-1.16.0:=[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.16.0 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Open source web browser engine
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://www.webkitgtk.org
 INHERIT=check-reqs flag-o-matic gnome2 python-any-r1 ruby-single toolchain-funcs cmake
 IUSE=aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=LGPL-2+ BSD
 RDEPEND=>=x11-libs/cairo-1.16.0:=[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.16.0 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
 REQUIRED_USE=gles2-only? ( egl ) gstreamer? ( egl ) wayland? ( egl ) || ( aqua wayland X )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=4/37
 SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.36.3.tar.xz
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	90e2b29417d53718328f3a95227137a0	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b9415c902348b255535d3ab63bd347da
+_md5_=fa379ad9774acce2e89699e75ab036ac
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 575ed6b5e60e..87c3e8c9d116 100644
Binary files a/metadata/md5-cache/net-mail/Manifest.gz and b/metadata/md5-cache/net-mail/Manifest.gz differ
diff --git a/metadata/md5-cache/net-mail/automx2-2022.0 b/metadata/md5-cache/net-mail/automx2-2022.0
index af1c405dc261..243ac1b2056a 100644
--- a/metadata/md5-cache/net-mail/automx2-2022.0
+++ b/metadata/md5-cache/net-mail/automx2-2022.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rseichter/automx2/archive/2022.0.tar.gz -> automx2-2022.0.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=b5a36466a5f24e44d89d29bd041ca42a
+_md5_=4bb643b5c5846d4dbad3ed4bdf1ef982
diff --git a/metadata/md5-cache/net-mail/automx2-2022.1 b/metadata/md5-cache/net-mail/automx2-2022.1
index cd1689dc07b8..964fe8732fe1 100644
--- a/metadata/md5-cache/net-mail/automx2-2022.1
+++ b/metadata/md5-cache/net-mail/automx2-2022.1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rseichter/automx2/archive/2022.1.tar.gz -> automx2-2022.1.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=bc1cda53e5d5aadaee8e3a7fb0bec269
+_md5_=0e907ea6e9397b6f4d04bfa3e4c49d1e
diff --git a/metadata/md5-cache/net-mail/dovecot-2.3.18-r2 b/metadata/md5-cache/net-mail/dovecot-2.3.18-r2
deleted file mode 100644
index 4f7cc9ec4256..000000000000
--- a/metadata/md5-cache/net-mail/dovecot-2.3.18-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=app-arch/bzip2 app-arch/xz-utils dev-libs/icu:= dev-libs/openssl:0= sys-libs/zlib:= virtual/libiconv argon2? ( dev-libs/libsodium:= ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) lucene? ( >=dev-cpp/clucene-2.3 ) lz4? ( app-arch/lz4 ) mysql? ( dev-db/mysql-connector-c:0= ) pam? ( sys-libs/pam:= ) postgres? ( dev-db/postgresql:* ) rpc? ( net-libs/libtirpc:= net-libs/rpcsvc-proto ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) stemmer? ( dev-libs/snowball-stemmer:= ) suid? ( acct-group/mail ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) unwind? ( sys-libs/libunwind:= ) zstd? ( app-arch/zstd:= ) virtual/libcrypt:=
-DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
-EAPI=8
-HOMEPAGE=https://www.dovecot.org/
-INHERIT=autotools flag-o-matic lua-single ssl-cert systemd toolchain-funcs
-IUSE=kerberos ldap lua mysql pam postgres sqlite lz4 zstd argon2 caps doc ipv6 lucene managesieve rpc selinux sieve solr static-libs stemmer suid systemd tcpd textcat unwind lua_single_target_lua5-1 lua_single_target_lua5-3
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=LGPL-2.1 MIT
-RDEPEND=app-arch/bzip2 app-arch/xz-utils dev-libs/icu:= dev-libs/openssl:0= sys-libs/zlib:= virtual/libiconv argon2? ( dev-libs/libsodium:= ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) lucene? ( >=dev-cpp/clucene-2.3 ) lz4? ( app-arch/lz4 ) mysql? ( dev-db/mysql-connector-c:0= ) pam? ( sys-libs/pam:= ) postgres? ( dev-db/postgresql:* ) rpc? ( net-libs/libtirpc:= net-libs/rpcsvc-proto ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) stemmer? ( dev-libs/snowball-stemmer:= ) suid? ( acct-group/mail ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) unwind? ( sys-libs/libunwind:= ) zstd? ( app-arch/zstd:= ) virtual/libcrypt:= acct-group/dovecot acct-group/dovenull acct-user/dovecot acct-user/dovenull net-mail/mailbase
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 ) )
-SLOT=0
-SRC_URI=https://dovecot.org/releases/2.3/dovecot-2.3.18.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.18.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.18.tar.gz )
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ssl-cert	6dbe6a8a3dccb3d2f28f8404cd02c7d7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=7f3b0f20fea993b2a673587f60461a04
diff --git a/metadata/md5-cache/net-mail/dovecot-2.3.19 b/metadata/md5-cache/net-mail/dovecot-2.3.19.1
similarity index 92%
rename from metadata/md5-cache/net-mail/dovecot-2.3.19
rename to metadata/md5-cache/net-mail/dovecot-2.3.19.1
index 58a9928ef89e..d7816fb30564 100644
--- a/metadata/md5-cache/net-mail/dovecot-2.3.19
+++ b/metadata/md5-cache/net-mail/dovecot-2.3.19.1
@@ -11,6 +11,6 @@ LICENSE=LGPL-2.1 MIT
 RDEPEND=app-arch/bzip2 app-arch/xz-utils dev-libs/icu:= dev-libs/openssl:0= sys-libs/zlib:= virtual/libiconv argon2? ( dev-libs/libsodium:= ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) lucene? ( >=dev-cpp/clucene-2.3 ) lz4? ( app-arch/lz4 ) mysql? ( dev-db/mysql-connector-c:0= ) pam? ( sys-libs/pam:= ) postgres? ( dev-db/postgresql:* ) rpc? ( net-libs/libtirpc:= net-libs/rpcsvc-proto ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) stemmer? ( dev-libs/snowball-stemmer:= ) suid? ( acct-group/mail ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) unwind? ( sys-libs/libunwind:= ) zstd? ( app-arch/zstd:= ) virtual/libcrypt:= acct-group/dovecot acct-group/dovenull acct-user/dovecot acct-user/dovenull net-mail/mailbase
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 ) )
 SLOT=0
-SRC_URI=https://dovecot.org/releases/2.3/dovecot-2.3.19.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.19.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.19.tar.gz )
+SRC_URI=https://dovecot.org/releases/2.3/dovecot-2.3.19.1.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.19.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.19.tar.gz )
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ssl-cert	6dbe6a8a3dccb3d2f28f8404cd02c7d7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
 _md5_=3df8a5969125bd3d501d20156a84056c
diff --git a/metadata/md5-cache/net-mail/postfix-logwatch-1.40.05 b/metadata/md5-cache/net-mail/postfix-logwatch-1.40.05
new file mode 100644
index 000000000000..82b975dc0c7c
--- /dev/null
+++ b/metadata/md5-cache/net-mail/postfix-logwatch-1.40.05
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=A log analyzer for postfix
+EAPI=8
+HOMEPAGE=http://michael.orlitzky.com/code/postfix-logwatch.xhtml
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-lang/perl
+SLOT=0
+SRC_URI=http://michael.orlitzky.com/code/releases/postfix-logwatch-1.40.05.tar.xz
+_md5_=348748b354d961a3aa9bd5513fabb511
diff --git a/metadata/md5-cache/net-mail/relay-ctrl-3.1.1-r2 b/metadata/md5-cache/net-mail/relay-ctrl-3.1.1-r2
index 25560909837f..19319233486d 100644
--- a/metadata/md5-cache/net-mail/relay-ctrl-3.1.1-r2
+++ b/metadata/md5-cache/net-mail/relay-ctrl-3.1.1-r2
@@ -9,4 +9,4 @@ RDEPEND=sys-apps/ucspi-tcp virtual/daemontools
 SLOT=0
 SRC_URI=http://untroubled.org/relay-ctrl/archive/relay-ctrl-3.1.1.tar.gz
 _eclasses_=fixheadtails	1721997ed44d035654efe12da50797ef	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=768509cb8dbd985d2a05f7a0a68c4aaa
+_md5_=888310d779c135f15748a6adbef6ab06
diff --git a/metadata/md5-cache/net-mail/relay-ctrl-3.1.1-r3 b/metadata/md5-cache/net-mail/relay-ctrl-3.1.1-r3
index 854ccb3032b7..c27e80c21bc0 100644
--- a/metadata/md5-cache/net-mail/relay-ctrl-3.1.1-r3
+++ b/metadata/md5-cache/net-mail/relay-ctrl-3.1.1-r3
@@ -9,4 +9,4 @@ RDEPEND=sys-apps/ucspi-tcp virtual/daemontools
 SLOT=0
 SRC_URI=http://untroubled.org/relay-ctrl/archive/relay-ctrl-3.1.1.tar.gz
 _eclasses_=fixheadtails	1721997ed44d035654efe12da50797ef	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=094cf0c8dd745ec29dc57ca62aa90fbf
+_md5_=e7bc78a4b5f3395551777647eb1fdf8e
diff --git a/metadata/md5-cache/net-mail/relay-ctrl-3.2 b/metadata/md5-cache/net-mail/relay-ctrl-3.2
index ea6515f1dc1d..d8d4731fec1a 100644
--- a/metadata/md5-cache/net-mail/relay-ctrl-3.2
+++ b/metadata/md5-cache/net-mail/relay-ctrl-3.2
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/bglibs sys-apps/ucspi-tcp virtual/daemontools
 SLOT=0
 SRC_URI=http://untroubled.org/relay-ctrl/archive/relay-ctrl-3.2.tar.gz
 _eclasses_=fixheadtails	1721997ed44d035654efe12da50797ef	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=e98a51af4c1c7d0b8c7142fc69e88a34
+_md5_=43860a08349215c5ba5f991764fc1ab5
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 6025c9c0ba40..8afd0e6e81ca 100644
Binary files a/metadata/md5-cache/net-misc/Manifest.gz and b/metadata/md5-cache/net-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-misc/batctl-2021.4 b/metadata/md5-cache/net-misc/batctl-2022.1
similarity index 87%
rename from metadata/md5-cache/net-misc/batctl-2021.4
rename to metadata/md5-cache/net-misc/batctl-2022.1
index ba06d1013f51..245c402e42c2 100644
--- a/metadata/md5-cache/net-misc/batctl-2021.4
+++ b/metadata/md5-cache/net-misc/batctl-2022.1
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 MIT ISC
 RDEPEND=dev-libs/libnl:3
 SLOT=0
-SRC_URI=https://downloads.open-mesh.org/batman/releases/batman-adv-2021.4/batctl-2021.4.tar.gz
+SRC_URI=https://downloads.open-mesh.org/batman/releases/batman-adv-2022.1/batctl-2022.1.tar.gz
 _eclasses_=linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=57e42f04d73d560778659678632d2673
+_md5_=42dd17d34edfbec7601b2dc32e1f9783
diff --git a/metadata/md5-cache/net-misc/dropbox-147.4.4800 b/metadata/md5-cache/net-misc/dropbox-147.4.4800
deleted file mode 100644
index bba31a56ec8b..000000000000
--- a/metadata/md5-cache/net-misc/dropbox-147.4.4800
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/patchelf virtual/pkgconfig
-DEFINED_PHASES=install postinst postrm preinst prepare unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Dropbox daemon (pretends to be GUI-less)
-EAPI=7
-HOMEPAGE=https://www.dropbox.com/
-INHERIT=desktop pax-utils systemd xdg
-IUSE=selinux X
-KEYWORDS=amd64 x86 ~x86-linux
-LICENSE=BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox
-RDEPEND=X? ( x11-themes/hicolor-icon-theme ) selinux? ( sec-policy/selinux-dropbox ) app-arch/bzip2 dev-libs/glib:2 dev-libs/libffi-compat:6 media-libs/fontconfig media-libs/freetype net-misc/wget sys-libs/zlib sys-libs/ncurses-compat:5 virtual/opengl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXrender x11-libs/libxcb
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-147.4.4800.tar.gz ) x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-147.4.4800.tar.gz ) https://www.dropbox.com/sh/42f8d4kq6yt5lte/AAD69lhaw6gy46W8HfQAm0GSa/Glyph/Dropbox/SVG/DropboxGlyph_Blue.svg
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=cdb19545ad826af714aab528e785e528
diff --git a/metadata/md5-cache/net-misc/dropbox-148.4.4519 b/metadata/md5-cache/net-misc/dropbox-148.4.4519
deleted file mode 100644
index a73de7cc347e..000000000000
--- a/metadata/md5-cache/net-misc/dropbox-148.4.4519
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/patchelf virtual/pkgconfig
-DEFINED_PHASES=install postinst postrm preinst prepare unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Dropbox daemon (pretends to be GUI-less)
-EAPI=7
-HOMEPAGE=https://www.dropbox.com/
-INHERIT=desktop pax-utils systemd xdg
-IUSE=selinux X
-KEYWORDS=~amd64 ~x86 ~x86-linux
-LICENSE=BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox
-RDEPEND=X? ( x11-themes/hicolor-icon-theme ) selinux? ( sec-policy/selinux-dropbox ) app-arch/bzip2 dev-libs/glib:2 dev-libs/libffi-compat:6 media-libs/fontconfig media-libs/freetype net-misc/wget sys-libs/zlib sys-libs/ncurses-compat:5 virtual/opengl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXrender x11-libs/libxcb
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-148.4.4519.tar.gz ) x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-148.4.4519.tar.gz ) https://www.dropbox.com/sh/42f8d4kq6yt5lte/AAD69lhaw6gy46W8HfQAm0GSa/Glyph/Dropbox/SVG/DropboxGlyph_Blue.svg
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ee732e48347e53dbbd1fe14a25fb7a9e
diff --git a/metadata/md5-cache/net-misc/dropbox-150.4.5000 b/metadata/md5-cache/net-misc/dropbox-150.4.5000
index c22761f67408..57d3ecd46a80 100644
--- a/metadata/md5-cache/net-misc/dropbox-150.4.5000
+++ b/metadata/md5-cache/net-misc/dropbox-150.4.5000
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.dropbox.com/
 INHERIT=desktop pax-utils systemd xdg
 IUSE=selinux X
-KEYWORDS=~amd64 ~x86 ~x86-linux
+KEYWORDS=amd64 x86 ~x86-linux
 LICENSE=BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox
 RDEPEND=X? ( x11-themes/hicolor-icon-theme ) selinux? ( sec-policy/selinux-dropbox ) app-arch/bzip2 dev-libs/glib:2 dev-libs/libffi-compat:6 media-libs/fontconfig media-libs/freetype net-misc/wget sys-libs/zlib sys-libs/ncurses-compat:5 virtual/opengl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXrender x11-libs/libxcb
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-150.4.5000.tar.gz ) x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-150.4.5000.tar.gz ) https://www.dropbox.com/sh/42f8d4kq6yt5lte/AAD69lhaw6gy46W8HfQAm0GSa/Glyph/Dropbox/SVG/DropboxGlyph_Blue.svg
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ee732e48347e53dbbd1fe14a25fb7a9e
+_md5_=cdb19545ad826af714aab528e785e528
diff --git a/metadata/md5-cache/net-misc/ntpsec-1.2.1-r6 b/metadata/md5-cache/net-misc/ntpsec-1.2.1-r6
index 80ccdbc690c2..4f48ebf34c96 100644
--- a/metadata/md5-cache/net-misc/ntpsec-1.2.1-r6
+++ b/metadata/md5-cache/net-misc/ntpsec-1.2.1-r6
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 SLOT=0
 SRC_URI=ftp://ftp.ntpsec.org/pub/releases/ntpsec-1.2.1.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	waf-utils	e8ae5118de0d41a51336b4317cdcd2d5	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=415d39c954164d6b09ef56e7bf957c94
+_md5_=103200317a6b4df61304f3ce447b2833
diff --git a/metadata/md5-cache/net-misc/omniORB-4.3.0 b/metadata/md5-cache/net-misc/omniORB-4.3.0
new file mode 100644
index 000000000000..9e219175f602
--- /dev/null
+++ b/metadata/md5-cache/net-misc/omniORB-4.3.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ssl? ( dev-libs/openssl:= )
+DESCRIPTION=A robust, high-performance CORBA 2 ORB
+EAPI=7
+HOMEPAGE=http://omniorb.sourceforge.net/
+INHERIT=python-single-r1
+IUSE=doc ipv6 ssl python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2 GPL-2
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ssl? ( dev-libs/openssl:= )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+SLOT=0
+SRC_URI=mirror://sourceforge/omniorb/omniORB-4.3.0.tar.bz2
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=7a0157e772426c4a077ec9c8b67aade5
diff --git a/metadata/md5-cache/net-misc/r8125-9.008.00 b/metadata/md5-cache/net-misc/r8125-9.008.00
index 65f2c4dd593e..e35be81aa888 100644
--- a/metadata/md5-cache/net-misc/r8125-9.008.00
+++ b/metadata/md5-cache/net-misc/r8125-9.008.00
@@ -11,4 +11,4 @@ RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:
 SLOT=0
 SRC_URI=http://rtitwww.realtek.com/rtdrivers/cn/nic1/r8125-9.008.00.tar.bz2
 _eclasses_=linux-info	dcbf4f67bc38bee48e9d69a4344e8059	linux-mod	6ff232574f0bcad33767903505553e8d	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=248066d64f3ef3a4ee3ca3c01e1572cf
+_md5_=23a5e12e892efd6f61ca5e460c952345
diff --git a/metadata/md5-cache/net-misc/r8125-9.009.01 b/metadata/md5-cache/net-misc/r8125-9.009.01
new file mode 100644
index 000000000000..ba74c7ee9098
--- /dev/null
+++ b/metadata/md5-cache/net-misc/r8125-9.009.01
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup
+DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=r8125 vendor driver for Realtek RTL8125 PCI-E NICs
+EAPI=8
+HOMEPAGE=https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software
+INHERIT=linux-info linux-mod
+IUSE=+multi-tx-q ptp +rss use-firmware dist-kernel
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
+SLOT=0
+SRC_URI=http://rtitwww.realtek.com/rtdrivers/cn/nic1/r8125-9.009.01.tar.bz2
+_eclasses_=linux-info	dcbf4f67bc38bee48e9d69a4344e8059	linux-mod	6ff232574f0bcad33767903505553e8d	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=277b84845d030e9f1cbcb24547b640a3
diff --git a/metadata/md5-cache/net-misc/spice-gtk-0.40 b/metadata/md5-cache/net-misc/spice-gtk-0.40
index e78401d69dc3..2238b7fae983 100644
--- a/metadata/md5-cache/net-misc/spice-gtk-0.40
+++ b/metadata/md5-cache/net-misc/spice-gtk-0.40
@@ -12,4 +12,4 @@ RDEPEND=>=dev-libs/glib-2.46:2 dev-libs/json-glib:0= media-libs/gst-plugins-base
 SLOT=0
 SRC_URI=https://www.spice-space.org/download/gtk/spice-gtk-0.40.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a98d2b29fc7b0e73ad3de6a1168e6c6b
+_md5_=7408715a184b395eaf9ddbfdd57853ee
diff --git a/metadata/md5-cache/net-misc/spice-gtk-9999 b/metadata/md5-cache/net-misc/spice-gtk-9999
index 4c19cd1d3556..62b514fbb67b 100644
--- a/metadata/md5-cache/net-misc/spice-gtk-9999
+++ b/metadata/md5-cache/net-misc/spice-gtk-9999
@@ -11,4 +11,4 @@ PROPERTIES=live
 RDEPEND=>=dev-libs/glib-2.46:2 dev-libs/json-glib:0= media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0[introspection?] media-libs/opus media-libs/libjpeg-turbo:= sys-libs/zlib >=x11-libs/cairo-1.2 >=x11-libs/pixman-0.17.7 x11-libs/libX11 gtk3? ( x11-libs/gtk+:3[introspection?] ) introspection? ( dev-libs/gobject-introspection ) dev-libs/openssl:= lz4? ( app-arch/lz4 ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/qemu[smartcard] ) usbredir? ( sys-apps/hwdata >=sys-apps/usbredir-0.4.2 virtual/libusb:1 policykit? ( sys-apps/acl >=sys-auth/polkit-0.110-r1 ) ) webdav? ( net-libs/phodav:2.0 >=net-libs/libsoup-2.49.91:2.4 ) amd64? ( x11-libs/libva:= ) arm64? ( x11-libs/libva:= ) x86? ( x11-libs/libva:= )
 SLOT=0
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=589b1db7c958431e3d42d1d7a59094cc
+_md5_=7408715a184b395eaf9ddbfdd57853ee
diff --git a/metadata/md5-cache/net-misc/tigervnc-1.12.0-r6 b/metadata/md5-cache/net-misc/tigervnc-1.12.0-r6
index b52a9c831512..7e17302e3ac8 100644
--- a/metadata/md5-cache/net-misc/tigervnc-1.12.0-r6
+++ b/metadata/md5-cache/net-misc/tigervnc-1.12.0-r6
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.tigervnc.org
 INHERIT=autotools cmake flag-o-matic java-pkg-opt-2 optfeature systemd xdg
 IUSE=dri3 +drm gnutls java nls +opengl +server xinerama java
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libjpeg-turbo:= sys-libs/zlib:= x11-libs/fltk:1 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/pixman gnutls? ( net-libs/gnutls:= ) nls? ( virtual/libiconv ) server? ( dev-libs/libbsd dev-libs/openssl:0= sys-libs/pam x11-libs/libXau x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXfixes x11-libs/libXfont2 x11-libs/libXtst x11-libs/pixman x11-libs/xtrans x11-apps/xauth x11-apps/xinit x11-apps/xkbcomp x11-apps/xsetroot x11-misc/xkeyboard-config opengl? ( media-libs/libglvnd[X] ) ) java? ( virtual/jre:1.8 ) server? ( dev-lang/perl sys-process/psmisc ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=dri3? ( drm ) opengl? ( server )
 SLOT=0
 SRC_URI=https://github.com/TigerVNC/tigervnc/archive/v1.12.0.tar.gz -> tigervnc-1.12.0.tar.gz server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-21.1.1.tar.xz https://github.com/TigerVNC/tigervnc/commit/0c5a2b2e7759c2829c07186cfce4d24aa9b5274e.patch -> tigervnc-1.12.0-xserver-21.patch )
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b06c2a4969d45cea6bbaa55742eb33c1
+_md5_=c3e32763e23e934eecb1c460448aed3e
diff --git a/metadata/md5-cache/net-misc/tigervnc-xorg-module-1.12.0 b/metadata/md5-cache/net-misc/tigervnc-xorg-module-1.12.0
index ec46692d12f8..7bb18f0abc56 100644
--- a/metadata/md5-cache/net-misc/tigervnc-xorg-module-1.12.0
+++ b/metadata/md5-cache/net-misc/tigervnc-xorg-module-1.12.0
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Metapackage for the xorg module provided by tigervnc
 EAPI=8
 HOMEPAGE=https://www.tigervnc.org
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=metapackage
 RDEPEND=~net-misc/tigervnc-1.12.0[server] =x11-base/xorg-server-21.1*
 SLOT=0
-_md5_=cbe43af905ab942020a9a6608a782e33
+_md5_=3a6c7c2a2f4da771b565cc43cf5c7f4f
diff --git a/metadata/md5-cache/net-misc/turbovnc-3.0 b/metadata/md5-cache/net-misc/turbovnc-3.0
new file mode 100644
index 000000000000..7d4c9d80e891
--- /dev/null
+++ b/metadata/md5-cache/net-misc/turbovnc-3.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=app-arch/bzip2 media-libs/freetype >=media-libs/libjpeg-turbo-2.0.0:=[java?] sys-libs/pam sys-libs/zlib virtual/opengl x11-apps/xauth x11-libs/libfontenc x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfont2 x11-libs/libxkbfile x11-libs/pixman x11-misc/xkeyboard-config java? ( >=virtual/jdk-1.8:* x11-libs/libXi ) ssl? ( dev-libs/openssl:= ) !net-misc/tigervnc x11-libs/xtrans java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=A fast replacement for TigerVNC
+EAPI=8
+HOMEPAGE=https://www.turbovnc.org/
+INHERIT=cmake desktop java-pkg-opt-2
+IUSE=+ssl java
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=app-arch/bzip2 media-libs/freetype >=media-libs/libjpeg-turbo-2.0.0:=[java?] sys-libs/pam sys-libs/zlib virtual/opengl x11-apps/xauth x11-libs/libfontenc x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfont2 x11-libs/libxkbfile x11-libs/pixman x11-misc/xkeyboard-config java? ( >=virtual/jdk-1.8:* x11-libs/libXi ) ssl? ( dev-libs/openssl:= ) !net-misc/tigervnc x11-apps/xkbcomp java? ( >=dev-java/java-config-2.2.0-r3 )
+SLOT=0
+SRC_URI=https://sourceforge.net/projects/turbovnc/files/3.0/turbovnc-3.0.tar.gz/download -> turbovnc-3.0.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=77f8e8fad025b86a9097d20ba769816f
diff --git a/metadata/md5-cache/net-misc/yt-dlp-2022.4.8 b/metadata/md5-cache/net-misc/yt-dlp-2022.4.8
deleted file mode 100644
index be70cdd907e8..000000000000
--- a/metadata/md5-cache/net-misc/yt-dlp-2022.4.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !net-misc/youtube-dl[-yt-dlp(-)] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=youtube-dl fork with additional features and fixes
-EAPI=8
-HOMEPAGE=https://github.com/yt-dlp/yt-dlp
-INHERIT=bash-completion-r1 distutils-r1 optfeature
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv x86 ~x64-macos
-LICENSE=Unlicense
-RDEPEND=dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !net-misc/youtube-dl[-yt-dlp(-)] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/y/yt-dlp/yt-dlp-2022.4.8.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=7da78e20b21d918d7c1545c5b81fadbb
diff --git a/metadata/md5-cache/net-news/Manifest.gz b/metadata/md5-cache/net-news/Manifest.gz
index 64d2802c6a67..dc1481e636a0 100644
Binary files a/metadata/md5-cache/net-news/Manifest.gz and b/metadata/md5-cache/net-news/Manifest.gz differ
diff --git a/metadata/md5-cache/net-news/sfeed-1.5 b/metadata/md5-cache/net-news/sfeed-1.5
new file mode 100644
index 000000000000..ecc90d1f0d1a
--- /dev/null
+++ b/metadata/md5-cache/net-news/sfeed-1.5
@@ -0,0 +1,16 @@
+BDEPEND=ncurses? ( virtual/pkgconfig )
+DEFINED_PHASES=compile configure install postinst
+DEPEND=ncurses? ( sys-libs/ncurses:= )
+DESCRIPTION=simple RSS and Atom parser
+EAPI=7
+HOMEPAGE=https://codemadness.org/sfeed-simple-feed-parser.html
+INHERIT=toolchain-funcs savedconfig optfeature
+IUSE=+ncurses +theme-mono theme-mono-highlight theme-newsboat theme-templeos savedconfig
+KEYWORDS=~amd64
+LICENSE=ISC
+RDEPEND=ncurses? ( sys-libs/ncurses:= )
+REQUIRED_USE=ncurses? ( ^^ ( theme-mono theme-mono-highlight theme-newsboat theme-templeos ) )
+SLOT=0
+SRC_URI=https://codemadness.org/releases/sfeed/sfeed-1.5.tar.gz
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	optfeature	d524f291c80f9d21ad80fe978e3ca760	portability	d33a77692bb47e8227f27e17fb9c3c05	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=51e9b1a774b0099c102f5abf371053c6
diff --git a/metadata/md5-cache/net-news/snownews-1.9-r1 b/metadata/md5-cache/net-news/snownews-1.9-r1
new file mode 100644
index 000000000000..9d90b246514c
--- /dev/null
+++ b/metadata/md5-cache/net-news/snownews-1.9-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=compile configure prepare
+DEPEND=dev-libs/libxml2 dev-libs/openssl:= net-misc/curl sys-libs/ncurses:=[unicode(+)]
+DESCRIPTION=Command-line RSS feed reader
+EAPI=8
+HOMEPAGE=https://github.com/msharov/snownews
+INHERIT=toolchain-funcs
+IUSE=debug
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=dev-libs/libxml2 dev-libs/openssl:= net-misc/curl sys-libs/ncurses:=[unicode(+)]
+SLOT=0
+SRC_URI=https://github.com/msharov/snownews/archive/refs/tags/v1.9.tar.gz -> snownews-1.9.tar.gz
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=cc52e9d2fe709d9d3e0c040d7b29f1e9
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index b31cc8b984dd..471b7ed62a26 100644
Binary files a/metadata/md5-cache/net-p2p/Manifest.gz and b/metadata/md5-cache/net-p2p/Manifest.gz differ
diff --git a/metadata/md5-cache/net-p2p/nicotine+-3.2.2-r1 b/metadata/md5-cache/net-p2p/nicotine+-3.2.2-r1
index a7ad53ba277d..8c7e2e274bf5 100644
--- a/metadata/md5-cache/net-p2p/nicotine+-3.2.2-r1
+++ b/metadata/md5-cache/net-p2p/nicotine+-3.2.2-r1
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://github.com/Nicotine-Plus/nicotine-plus
 INHERIT=distutils-r1 xdg-utils
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-3 LGPL-3
 RDEPEND=dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/gtk+:3[introspection] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Nicotine-Plus/nicotine-plus/archive/3.2.2.tar.gz -> nicotine+-3.2.2.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=6f11b60bdd06775e282791a43b71934c
+_md5_=b495db339992285bc26b02d992e00894
diff --git a/metadata/md5-cache/net-p2p/transmission-3.00-r1 b/metadata/md5-cache/net-p2p/transmission-3.00-r1
index 82453861ad70..234976538e23 100644
--- a/metadata/md5-cache/net-p2p/transmission-3.00-r1
+++ b/metadata/md5-cache/net-p2p/transmission-3.00-r1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://transmissionbt.com/
 INHERIT=cmake systemd xdg-utils
 IUSE=appindicator cli gtk lightweight nls mbedtls qt5 systemd test
-KEYWORDS=amd64 ~arm ~arm64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux
+KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT
 RDEPEND=>=dev-libs/libevent-2.0.10:= !mbedtls? ( dev-libs/openssl:0= ) mbedtls? ( net-libs/mbedtls:0= ) net-libs/libnatpmp >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.16.3[ssl] sys-libs/zlib:= nls? ( virtual/libintl ) gtk? ( >=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4:3 appindicator? ( >=dev-libs/libappindicator-0.4.30:3 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 dev-qt/qtdbus:5 ) systemd? ( >=sys-apps/systemd-209:= ) acct-group/transmission acct-user/transmission
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~floppym/dist/transmission-3.00.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=6b28cb991832719ee42305ae043ab984
+_md5_=4f0fbea36af9f0274839ea6cea3a30cf
diff --git a/metadata/md5-cache/net-p2p/transmission-3.00-r4 b/metadata/md5-cache/net-p2p/transmission-3.00-r4
index 6a7e2ebf11cd..a4aefdf23214 100644
--- a/metadata/md5-cache/net-p2p/transmission-3.00-r4
+++ b/metadata/md5-cache/net-p2p/transmission-3.00-r4
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://transmissionbt.com/
 INHERIT=cmake systemd xdg-utils
 IUSE=appindicator cli gtk lightweight nls mbedtls qt5 systemd test
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT
 RDEPEND=>=dev-libs/libevent-2.0.10:= !mbedtls? ( dev-libs/openssl:0= ) mbedtls? ( net-libs/mbedtls:0= ) net-libs/libnatpmp >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.16.3[ssl] sys-libs/zlib:= nls? ( virtual/libintl ) gtk? ( >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4:3 appindicator? ( >=dev-libs/libappindicator-0.4.30:3 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 dev-qt/qtdbus:5 ) systemd? ( >=sys-apps/systemd-209:= ) acct-group/transmission acct-user/transmission
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~floppym/dist/transmission-3.00.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=80866a4181844558d52518b36291904f
+_md5_=f7099e4a0fb9e9fb97e1aa85ea8c2613
diff --git a/metadata/md5-cache/net-p2p/transmission-9999 b/metadata/md5-cache/net-p2p/transmission-9999
index 54589022b160..2ab0083659ec 100644
--- a/metadata/md5-cache/net-p2p/transmission-9999
+++ b/metadata/md5-cache/net-p2p/transmission-9999
@@ -12,4 +12,4 @@ RDEPEND=>=dev-libs/libevent-2.0.10:= !mbedtls? ( dev-libs/openssl:0= ) mbedtls?
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c686215d0441f8f1b883875119a574cd
+_md5_=169d5983bde2db3702d3b3feb3571433
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index f58fc9a3c486..bc2ba617e3b8 100644
Binary files a/metadata/md5-cache/net-print/Manifest.gz and b/metadata/md5-cache/net-print/Manifest.gz differ
diff --git a/metadata/md5-cache/net-print/cnijfilter2-5.90 b/metadata/md5-cache/net-print/cnijfilter2-5.90
index 4e36f718e299..7726dd7904be 100644
--- a/metadata/md5-cache/net-print/cnijfilter2-5.90
+++ b/metadata/md5-cache/net-print/cnijfilter2-5.90
@@ -11,4 +11,4 @@ RDEPEND=virtual/libusb:1 dev-libs/libxml2 net-print/cups
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~tupone/distfiles/cnijfilter2-source-5.90-1.tar.gz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=d78d017a664df2adf48c6826a7852829
+_md5_=3857ef60d0beb8a5bfdf448685d8c804
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index 6de135dd0591..3aaa64b2bea9 100644
Binary files a/metadata/md5-cache/net-proxy/Manifest.gz and b/metadata/md5-cache/net-proxy/Manifest.gz differ
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.4.14 b/metadata/md5-cache/net-proxy/haproxy-2.4.14
index dc2e73e6c186..dc176692ee49 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.4.14
+++ b/metadata/md5-cache/net-proxy/haproxy-2.4.14
@@ -13,4 +13,4 @@ REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) lua? ( ^^
 SLOT=0/2.4
 SRC_URI=http://haproxy.1wt.eu/download/2.4/src/haproxy-2.4.14.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=d88b6f73782759a488c513e7e3ea3656
+_md5_=c81654a71a6b1f03ccf0ac3c2ef28a05
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.4.17 b/metadata/md5-cache/net-proxy/haproxy-2.4.17
index 2c0a05ef6cf5..58b203b5bf57 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.4.17
+++ b/metadata/md5-cache/net-proxy/haproxy-2.4.17
@@ -13,4 +13,4 @@ REQUIRED_USE=pcre-jit? ( pcre ) lua? ( ^^ ( lua_single_target_lua5-3 ) ) ?? ( sl
 SLOT=0/2.4
 SRC_URI=http://haproxy.1wt.eu/download/2.4/src/haproxy-2.4.17.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=62b877f4ce1d764d63638766df007d7e
+_md5_=9f7dcc1fff2321fe8969e04f22f971d4
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.4.9999 b/metadata/md5-cache/net-proxy/haproxy-2.4.9999
index 4733605e2352..50487f965a7d 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.4.9999
+++ b/metadata/md5-cache/net-proxy/haproxy-2.4.9999
@@ -12,4 +12,4 @@ RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre2:= pcre-jit? ( de
 REQUIRED_USE=pcre-jit? ( pcre ) lua? ( ^^ ( lua_single_target_lua5-3 ) ) ?? ( slz zlib )
 SLOT=0/2.4
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=62b877f4ce1d764d63638766df007d7e
+_md5_=9f7dcc1fff2321fe8969e04f22f971d4
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.5.4 b/metadata/md5-cache/net-proxy/haproxy-2.5.4
index 63fe17853003..4507fdab9040 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.5.4
+++ b/metadata/md5-cache/net-proxy/haproxy-2.5.4
@@ -13,4 +13,4 @@ REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) lua? ( ^^
 SLOT=0/2.5
 SRC_URI=http://haproxy.1wt.eu/download/2.5/src/haproxy-2.5.4.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=d88b6f73782759a488c513e7e3ea3656
+_md5_=c81654a71a6b1f03ccf0ac3c2ef28a05
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.5.7 b/metadata/md5-cache/net-proxy/haproxy-2.5.7
index a696c623c6ee..724e3331a748 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.5.7
+++ b/metadata/md5-cache/net-proxy/haproxy-2.5.7
@@ -13,4 +13,4 @@ REQUIRED_USE=pcre-jit? ( pcre ) lua? ( ^^ ( lua_single_target_lua5-3 ) ) ?? ( sl
 SLOT=0/2.5
 SRC_URI=http://haproxy.1wt.eu/download/2.5/src/haproxy-2.5.7.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=62b877f4ce1d764d63638766df007d7e
+_md5_=9f7dcc1fff2321fe8969e04f22f971d4
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.5.9999 b/metadata/md5-cache/net-proxy/haproxy-2.5.9999
index 782afbb2f159..94ec683cdad7 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.5.9999
+++ b/metadata/md5-cache/net-proxy/haproxy-2.5.9999
@@ -12,4 +12,4 @@ RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre2:= pcre-jit? ( de
 REQUIRED_USE=pcre-jit? ( pcre ) lua? ( ^^ ( lua_single_target_lua5-3 ) ) ?? ( slz zlib )
 SLOT=0/2.5
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=62b877f4ce1d764d63638766df007d7e
+_md5_=9f7dcc1fff2321fe8969e04f22f971d4
diff --git a/metadata/md5-cache/net-proxy/haproxy-9999 b/metadata/md5-cache/net-proxy/haproxy-9999
index 5222aff06ed1..d795f3c30c37 100644
--- a/metadata/md5-cache/net-proxy/haproxy-9999
+++ b/metadata/md5-cache/net-proxy/haproxy-9999
@@ -12,4 +12,4 @@ RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre2:= pcre-jit? ( de
 REQUIRED_USE=pcre-jit? ( pcre ) lua? ( ^^ ( lua_single_target_lua5-3 ) ) ?? ( slz zlib )
 SLOT=0/9999
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a8e527b62167581d0d93a95a73a00243
+_md5_=1a315206d3bd54244126ef51055451ba
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index efd2e5f8f6f2..cfce0d312b51 100644
Binary files a/metadata/md5-cache/net-wireless/Manifest.gz and b/metadata/md5-cache/net-wireless/Manifest.gz differ
diff --git a/metadata/md5-cache/net-wireless/dump1090-6.1 b/metadata/md5-cache/net-wireless/dump1090-6.1
index e058dea8c1ee..67baa47f6223 100644
--- a/metadata/md5-cache/net-wireless/dump1090-6.1
+++ b/metadata/md5-cache/net-wireless/dump1090-6.1
@@ -12,4 +12,4 @@ RDEPEND=sys-libs/ncurses:=[tinfo] bladerf? ( net-wireless/bladerf:= virtual/libu
 SLOT=0
 SRC_URI=https://github.com/flightaware/dump1090/archive/v6.1.tar.gz -> dump1090-6.1.tar.gz
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=2182729910fd7f098d9ac50e54fefe82
+_md5_=102c1100d501559168f1c98355763a36
diff --git a/metadata/md5-cache/net-wireless/gr-ieee802154-0.0_p20200812 b/metadata/md5-cache/net-wireless/gr-ieee802154-0.0_p20200812
index df2f78578c98..08c663a434f8 100644
--- a/metadata/md5-cache/net-wireless/gr-ieee802154-0.0_p20200812
+++ b/metadata/md5-cache/net-wireless/gr-ieee802154-0.0_p20200812
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND==net-wireless/gnuradio-3.8*:0=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-libs/boost:=[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python_targets_python3_9(-)] ) dev-libs/gmp sci-libs/volk:= python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) dev-lang/swig:0
+DEPEND==net-wireless/gnuradio-3.8*:0=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-libs/boost:=[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[python_targets_python3_10(-)] ) dev-libs/gmp sci-libs/volk:= python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) dev-lang/swig:0
 DESCRIPTION=IEEE 802.15.4 ZigBee Transceiver
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/bastibl/gr-ieee802-15-4
 INHERIT=cmake python-single-r1
-IUSE=python_single_target_python3_8 python_single_target_python3_9
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND==net-wireless/gnuradio-3.8*:0=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-libs/boost:=[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python_targets_python3_9(-)] ) dev-libs/gmp sci-libs/volk:= python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND==net-wireless/gnuradio-3.8*:0=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-libs/boost:=[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[python_targets_python3_10(-)] ) dev-libs/gmp sci-libs/volk:= python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0/0.0_p20200812
 SRC_URI=https://github.com/bastibl/gr-ieee802-15-4/archive/c5e55146fadffa9288ed6de52c6c3ccc936688af.tar.gz -> gr-ieee802154-0.0_p20200812.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=44863c7f3958f7815dce6bad96551476
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=405781b28f349dc53c3e6ae6274c7be4
diff --git a/metadata/md5-cache/net-wireless/gr-rds-0.0_p20200807 b/metadata/md5-cache/net-wireless/gr-rds-0.0_p20200807
index cfef6280dc87..e2efea9559d2 100644
--- a/metadata/md5-cache/net-wireless/gr-rds-0.0_p20200807
+++ b/metadata/md5-cache/net-wireless/gr-rds-0.0_p20200807
@@ -1,16 +1,16 @@
 BDEPEND=dev-lang/swig:0 dev-util/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_8? ( dev-libs/boost:=[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python_targets_python3_9(-)] ) =net-wireless/gnuradio-3.8*:0=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_8? ( dev-libs/boost:=[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[python_targets_python3_10(-)] ) =net-wireless/gnuradio-3.8*:0=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?]
 DESCRIPTION=GNU Radio FM RDS Receiver
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/bastibl/gr-rds
 INHERIT=cmake python-single-r1
-IUSE=python_single_target_python3_8 python_single_target_python3_9
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_8? ( dev-libs/boost:=[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python_targets_python3_9(-)] ) =net-wireless/gnuradio-3.8*:0=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_8? ( dev-libs/boost:=[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[python_targets_python3_10(-)] ) =net-wireless/gnuradio-3.8*:0=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?]
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0/0.0_p20200807
 SRC_URI=https://github.com/bastibl/gr-rds/archive/ffbe3ea302c32a621f14329b7fcc09e868305e78.tar.gz -> gr-rds-0.0_p20200807.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=0ee7119333a218ca5fb517140455ffbe
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=d09b447bf4eb236a362347e91c543b9e
diff --git a/metadata/md5-cache/net-wireless/gr-rds-9999 b/metadata/md5-cache/net-wireless/gr-rds-9999
index 8069ce2284c5..d9a2fcdb9967 100644
--- a/metadata/md5-cache/net-wireless/gr-rds-9999
+++ b/metadata/md5-cache/net-wireless/gr-rds-9999
@@ -1,15 +1,15 @@
 BDEPEND=dev-lang/swig:0 >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_8? ( dev-libs/boost:=[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python_targets_python3_9(-)] ) =net-wireless/gnuradio-3.8*:0=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_8? ( dev-libs/boost:=[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[python_targets_python3_10(-)] ) =net-wireless/gnuradio-3.8*:0=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?]
 DESCRIPTION=GNU Radio FM RDS Receiver
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/bastibl/gr-rds
 INHERIT=git-r3 cmake python-single-r1
-IUSE=python_single_target_python3_8 python_single_target_python3_9
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_8? ( dev-libs/boost:=[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python_targets_python3_9(-)] ) =net-wireless/gnuradio-3.8*:0=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_8? ( dev-libs/boost:=[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[python_targets_python3_10(-)] ) =net-wireless/gnuradio-3.8*:0=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?]
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0/9999
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=0ee7119333a218ca5fb517140455ffbe
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=d09b447bf4eb236a362347e91c543b9e
diff --git a/metadata/md5-cache/net-wireless/iwgtk-0.4 b/metadata/md5-cache/net-wireless/iwgtk-0.4
deleted file mode 100644
index 327687054a42..000000000000
--- a/metadata/md5-cache/net-wireless/iwgtk-0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=dev-libs/atk:0 dev-libs/glib:2 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango:0 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Lightweight, graphical wifi management utility for Linux
-EAPI=7
-HOMEPAGE=https://github.com/J-Lentz/iwgtk
-KEYWORDS=~amd64
-LICENSE=GPL-3+
-RDEPEND=dev-libs/atk:0 dev-libs/glib:2 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango:0 net-wireless/iwd
-SLOT=0
-SRC_URI=https://github.com/J-Lentz/iwgtk/archive/v0.4.tar.gz -> iwgtk-0.4.tar.gz
-_eclasses_=xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=9c9cfd82d744b36c34727b6164e4ef5d
diff --git a/metadata/md5-cache/net-wireless/iwgtk-0.5 b/metadata/md5-cache/net-wireless/iwgtk-0.6
similarity index 83%
rename from metadata/md5-cache/net-wireless/iwgtk-0.5
rename to metadata/md5-cache/net-wireless/iwgtk-0.6
index f83c7af512f0..5e16328457d1 100644
--- a/metadata/md5-cache/net-wireless/iwgtk-0.5
+++ b/metadata/md5-cache/net-wireless/iwgtk-0.6
@@ -8,6 +8,6 @@ KEYWORDS=~amd64
 LICENSE=GPL-3+
 RDEPEND=dev-libs/atk:0 dev-libs/glib:2 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 gui-libs/gtk:4 x11-libs/pango:0 net-wireless/iwd
 SLOT=0
-SRC_URI=https://github.com/J-Lentz/iwgtk/archive/v0.5.tar.gz -> iwgtk-0.5.tar.gz
+SRC_URI=https://github.com/J-Lentz/iwgtk/archive/v0.6.tar.gz -> iwgtk-0.6.tar.gz
 _eclasses_=xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=5c785566496d632074fe0f0dfe5551d2
+_md5_=41f3b4ec281333444fe8a77463b66ba1
diff --git a/metadata/md5-cache/net-wireless/rtl-sdr-0.6.0_p2020802-r1 b/metadata/md5-cache/net-wireless/rtl-sdr-0.6.0_p2020802-r1
new file mode 100644
index 000000000000..f0ed13168fcf
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/rtl-sdr-0.6.0_p2020802-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=virtual/libusb:1
+DESCRIPTION=Turns your Realtek RTL2832 based DVB dongle into a SDR receiver
+EAPI=8
+HOMEPAGE=https://sdr.osmocom.org/trac/wiki/rtl-sdr
+INHERIT=cmake
+IUSE=+zerocopy
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/libusb:1
+SLOT=0
+SRC_URI=https://github.com/osmocom/rtl-sdr/archive/ed0317e6a58c098874ac58b769cf2e609c18d9a5.tar.gz -> rtl-sdr-0.6.0_p2020802.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=7f43e4c8d35612b6543ee919434ef235
diff --git a/metadata/md5-cache/net-wireless/rtl-sdr-9999 b/metadata/md5-cache/net-wireless/rtl-sdr-9999
index 2b4293f985aa..ba6a5928e700 100644
--- a/metadata/md5-cache/net-wireless/rtl-sdr-9999
+++ b/metadata/md5-cache/net-wireless/rtl-sdr-9999
@@ -1,14 +1,14 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare test unpack
 DEPEND=virtual/libusb:1
-DESCRIPTION=turns your Realtek RTL2832 based DVB dongle into a SDR receiver
-EAPI=7
+DESCRIPTION=Turns your Realtek RTL2832 based DVB dongle into a SDR receiver
+EAPI=8
 HOMEPAGE=https://sdr.osmocom.org/trac/wiki/rtl-sdr
-INHERIT=cmake multilib git-r3
+INHERIT=cmake git-r3
 IUSE=+zerocopy
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=virtual/libusb:1
 SLOT=0
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=50dfb29394a1fb980b42e6ef152e6ea0
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=7f43e4c8d35612b6543ee919434ef235
diff --git a/metadata/md5-cache/sci-biology/Manifest.gz b/metadata/md5-cache/sci-biology/Manifest.gz
index c215535ce067..0a242ffb3afe 100644
Binary files a/metadata/md5-cache/sci-biology/Manifest.gz and b/metadata/md5-cache/sci-biology/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-biology/mosaik-2.2.30 b/metadata/md5-cache/sci-biology/mosaik-2.2.30
index a30c076ab8e4..b36a07d23831 100644
--- a/metadata/md5-cache/sci-biology/mosaik-2.2.30
+++ b/metadata/md5-cache/sci-biology/mosaik-2.2.30
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/wanpinglee/MOSAIK/archive/5c25216d3522d6a33e53875cd76a6d65001e4e67.tar.gz -> mosaik-2.2.30.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vcs-snapshot	19dc666868420457132a7514d4621476	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=986f3a07cbf0dd1e4d247e0f7a43eb56
+_md5_=b275a0e18dbe85d2a2e24cebc796c134
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index 169e2bc1c4d7..d88913e3824a 100644
Binary files a/metadata/md5-cache/sci-chemistry/Manifest.gz and b/metadata/md5-cache/sci-chemistry/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-chemistry/molequeue-0.9.0-r1 b/metadata/md5-cache/sci-chemistry/molequeue-0.9.0-r1
index 243835d7f96a..c76085a98425 100644
--- a/metadata/md5-cache/sci-chemistry/molequeue-0.9.0-r1
+++ b/metadata/md5-cache/sci-chemistry/molequeue-0.9.0-r1
@@ -1,17 +1,17 @@
 BDEPEND=doc? ( app-doc/doxygen ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 zeromq? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) net-libs/cppzmq:0= )
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 zeromq? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) net-libs/cppzmq:0= )
 DESCRIPTION=Abstract, manage and coordinate execution of tasks
 EAPI=7
 HOMEPAGE=https://www.openchemistry.org/projects/molequeue/
 INHERIT=cmake python-r1 virtualx
-IUSE=+client doc server test +zeromq python_targets_python3_8 python_targets_python3_9 test
+IUSE=+client doc server test +zeromq python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 zeromq? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) net-libs/cppzmq:0= )
-REQUIRED_USE=server? ( client ) test? ( server ) zeromq? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 zeromq? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) net-libs/cppzmq:0= )
+REQUIRED_USE=server? ( client ) test? ( server ) zeromq? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/OpenChemistry/molequeue/archive/0.9.0.tar.gz -> molequeue-0.9.0.tar.gz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=dd52a07ec2949eea740c8d0996a84e76
+_md5_=e2f5be501f8ecc33d529ef6371edbe5d
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index b99238671e99..6ae76c9f3bc0 100644
Binary files a/metadata/md5-cache/sci-electronics/Manifest.gz and b/metadata/md5-cache/sci-electronics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-electronics/systemc-2.3.4-r2 b/metadata/md5-cache/sci-electronics/systemc-2.3.4-r2
new file mode 100644
index 000000000000..d066e682d6b6
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/systemc-2.3.4-r2
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DESCRIPTION=A C++ based modeling platform for VLSI and system-level co-design
+EAPI=8
+HOMEPAGE=https://systemc.org https://github.com/accellera-official/systemc
+INHERIT=autotools toolchain-funcs
+IUSE=debug doc examples static-libs
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+REQUIRED_USE=examples? ( doc )
+SLOT=0
+SRC_URI=https://github.com/accellera-official/systemc/archive/2.3.4_pub_rev_20190614.tar.gz -> systemc-2.3.4.tar.gz
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=70cec3eba5b695cdc12ce8dec96012da
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 840bb349dee5..8e8f12394d26 100644
Binary files a/metadata/md5-cache/sci-geosciences/Manifest.gz and b/metadata/md5-cache/sci-geosciences/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-geosciences/grass-8.0.2 b/metadata/md5-cache/sci-geosciences/grass-8.0.2
index 2b1ec97e6ed9..e0bc0c480b73 100644
--- a/metadata/md5-cache/sci-geosciences/grass-8.0.2
+++ b/metadata/md5-cache/sci-geosciences/grass-8.0.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://grass.osgeo.org/
 INHERIT=autotools desktop python-single-r1 toolchain-funcs wxwidgets xdg
 IUSE=blas cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X zstd python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] ) >=app-admin/eselect-1.2 python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] ) sci-libs/gdal:= sys-libs/gdbm:= sys-libs/ncurses:0= sci-libs/proj:= sci-libs/xdrfile sys-libs/zlib media-libs/libglvnd media-libs/glu blas? ( virtual/cblas[eselect-ldso(+)] virtual/blas[eselect-ldso(+)] ) fftw? ( sci-libs/fftw:3.0= ) geos? ( sci-libs/geos:= ) lapack? ( virtual/lapack[eselect-ldso(+)] ) las? ( sci-geosciences/liblas ) mysql? ( dev-db/mysql-connector-c:= ) netcdf? ( sci-libs/netcdf:= ) odbc? ( dev-db/unixODBC ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:0= ) postgres? ( >=dev-db/postgresql-8.4:= ) readline? ( sys-libs/readline:0= ) sqlite? ( dev-db/sqlite:3 ) tiff? ( media-libs/tiff:0= ) truetype? ( media-libs/freetype:2 ) X? ( dev-python/wxpython:4.0 x11-libs/cairo[X,opengl?] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXt ) zstd? ( app-arch/zstd )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) opengl? ( X )
 SLOT=0/8.0
 SRC_URI=https://grass.osgeo.org/grass80/source/grass-8.0.2.tar.gz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=26f17703dd5d4c387735c603b3b7d618
+_md5_=72181be90fee90f0947d343220c6ef2a
diff --git a/metadata/md5-cache/sci-geosciences/routino-3.3.3 b/metadata/md5-cache/sci-geosciences/routino-3.3.3
deleted file mode 100644
index a55e4ce3c58e..000000000000
--- a/metadata/md5-cache/sci-geosciences/routino-3.3.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) dev-lang/swig[pcre] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Routing application based on openstreetmap data
-EAPI=7
-HOMEPAGE=https://routino.org/
-INHERIT=toolchain-funcs distutils-r1
-IUSE=python test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=AGPL-3+
-RDEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 )
-REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) || ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://routino.org/download/routino-3.3.3.tgz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=6aa407f6d7b0240d4f1fc893ea9a148f
diff --git a/metadata/md5-cache/sci-geosciences/routino-3.3.3-r1 b/metadata/md5-cache/sci-geosciences/routino-3.3.3-r1
deleted file mode 100644
index 33cd2960da0d..000000000000
--- a/metadata/md5-cache/sci-geosciences/routino-3.3.3-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) dev-lang/swig[pcre] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Routing application based on openstreetmap data
-EAPI=8
-HOMEPAGE=https://routino.org/
-INHERIT=toolchain-funcs distutils-r1
-IUSE=python test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 x86
-LICENSE=AGPL-3+
-RDEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://routino.org/download/routino-3.3.3.tgz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=9d5feb97ea6069c7f99460664f515069
diff --git a/metadata/md5-cache/sci-geosciences/routino-3.3.3-r2 b/metadata/md5-cache/sci-geosciences/routino-3.3.3-r2
index ca289b8e76d0..e009effbdf41 100644
--- a/metadata/md5-cache/sci-geosciences/routino-3.3.3-r2
+++ b/metadata/md5-cache/sci-geosciences/routino-3.3.3-r2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://routino.org/
 INHERIT=toolchain-funcs distutils-r1
 IUSE=python test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=AGPL-3+
 RDEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://routino.org/download/routino-3.3.3.tgz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=b5988a8a5190d1a09c599deaf71d05dc
+_md5_=ecc4a4207787d3113c47945fa533756f
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index cd36b9143ac9..f4618e803317 100644
Binary files a/metadata/md5-cache/sci-libs/Manifest.gz and b/metadata/md5-cache/sci-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-libs/foxi-2021.05.27 b/metadata/md5-cache/sci-libs/foxi-2021.05.27
new file mode 100644
index 000000000000..a2e56bd4fcc5
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/foxi-2021.05.27
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=ONNXIFI with Facebook Extension
+EAPI=8
+HOMEPAGE=https://github.com/houseroad/foxi/
+INHERIT=cmake
+KEYWORDS=~amd64
+LICENSE=MIT
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/houseroad/foxi/archive/c278588e34e535f0bb8f00df3880d26928038cad.tar.gz -> foxi-2021.05.27.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=2c18d069b99edfb08c66fedbc3bd5e9b
diff --git a/metadata/md5-cache/sci-libs/gmsh-4.10.3 b/metadata/md5-cache/sci-libs/gmsh-4.10.3
index 330bbb701084..7a3802873533 100644
--- a/metadata/md5-cache/sci-libs/gmsh-4.10.3
+++ b/metadata/md5-cache/sci-libs/gmsh-4.10.3
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 virtual/fortran
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=virtual/fortran X? ( x11-libs/fltk:1[xft] ) alglib? ( sci-libs/alglib ) blas? ( virtual/blas virtual/lapack sci-libs/fftw:3.0 ) cgns? ( sci-libs/cgnslib sci-libs/hdf5[mpi=] ) eigen? ( dev-cpp/eigen ) gmm? ( sci-mathematics/gmm ) jpeg? ( media-libs/libjpeg-turbo ) med? ( sci-libs/med[mpi=] sci-libs/hdf5[mpi=] ) mpi? ( virtual/mpi[cxx] ) mumps? ( sci-libs/mumps[mpi=] ) opencascade? ( sci-libs/opencascade:* ) pdf? ( app-text/poppler:= ) png? ( media-libs/libpng:0 ) petsc? ( sci-mathematics/petsc[mpi=] ) slepc? ( sci-mathematics/slepc[mpi=] ) voro? ( sci-libs/voro++ ) zlib? ( sys-libs/zlib ) || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) virtual/pkgconfig python? ( dev-lang/swig:0 ) virtual/fortran
-DESCRIPTION=A three-dimensional finite element mesh generator
+DEPEND=virtual/fortran X? ( x11-libs/fltk:1[xft] ) alglib? ( sci-libs/alglib ) blas? ( virtual/blas virtual/lapack sci-libs/fftw:3.0 ) cgns? ( sci-libs/cgnslib sci-libs/hdf5[mpi=] ) eigen? ( dev-cpp/eigen ) gmm? ( sci-mathematics/gmm ) jpeg? ( media-libs/libjpeg-turbo ) med? ( sci-libs/med[mpi=] sci-libs/hdf5[mpi=] ) mpi? ( virtual/mpi[cxx] ) mumps? ( sci-libs/mumps[mpi=] ) opencascade? ( sci-libs/opencascade:* ) pdf? ( app-text/poppler:= ) png? ( media-libs/libpng:0 ) petsc? ( sci-mathematics/petsc[mpi=] ) slepc? ( sci-mathematics/slepc[mpi=] ) voro? ( sci-libs/voro++ ) zlib? ( sys-libs/zlib ) || ( >=dev-lang/python-3.11.0_beta1-r1:3.11 >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) virtual/pkgconfig python? ( dev-lang/swig:0 ) virtual/fortran
+DESCRIPTION=Three-dimensional finite element mesh generator
 EAPI=8
-HOMEPAGE=http://www.geuz.org/gmsh/
+HOMEPAGE=https://gmsh.info
 INHERIT=cmake fortran-2 python-any-r1 toolchain-funcs
 IUSE=+alglib +blas cgns eigen examples +gmm jpeg med metis mpi mumps netgen opencascade petsc pdf png python shared slepc X voro zlib
 KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3 free-noncomm
+LICENSE=GPL-2+ free-noncomm alglib? ( MIT ) gmm? ( LGPL-2.1+ ) metis? ( Apache-2.0 ) netgen? ( LGPL-2.1+ ) voro? ( BSD )
 RDEPEND=virtual/fortran X? ( x11-libs/fltk:1[xft] ) alglib? ( sci-libs/alglib ) blas? ( virtual/blas virtual/lapack sci-libs/fftw:3.0 ) cgns? ( sci-libs/cgnslib sci-libs/hdf5[mpi=] ) eigen? ( dev-cpp/eigen ) gmm? ( sci-mathematics/gmm ) jpeg? ( media-libs/libjpeg-turbo ) med? ( sci-libs/med[mpi=] sci-libs/hdf5[mpi=] ) mpi? ( virtual/mpi[cxx] ) mumps? ( sci-libs/mumps[mpi=] ) opencascade? ( sci-libs/opencascade:* ) pdf? ( app-text/poppler:= ) png? ( media-libs/libpng:0 ) petsc? ( sci-mathematics/petsc[mpi=] ) slepc? ( sci-mathematics/slepc[mpi=] ) voro? ( sci-libs/voro++ ) zlib? ( sys-libs/zlib ) virtual/fortran
 REQUIRED_USE=^^ ( blas eigen ) mumps? ( blas ) slepc? ( petsc )
 SLOT=0
-SRC_URI=http://www.geuz.org/gmsh/src/gmsh-4.10.3-source.tgz
+SRC_URI=https://gmsh.info/src/gmsh-4.10.3-source.tgz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d803d34b1b27dca0f5ef1be3d3e5d3df
+_md5_=f2cef825d6227b6c683d03ae7d7af489
diff --git a/metadata/md5-cache/sci-libs/gmsh-4.9.5-r2 b/metadata/md5-cache/sci-libs/gmsh-4.9.5-r2
index 7f376cc478d6..bf6e6f5425ab 100644
--- a/metadata/md5-cache/sci-libs/gmsh-4.9.5-r2
+++ b/metadata/md5-cache/sci-libs/gmsh-4.9.5-r2
@@ -1,9 +1,9 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 virtual/fortran
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=virtual/fortran X? ( x11-libs/fltk:1[xft] ) blas? ( virtual/blas virtual/lapack sci-libs/fftw:3.0 ) cgns? ( sci-libs/cgnslib ) jpeg? ( media-libs/libjpeg-turbo ) med? ( sci-libs/med[mpi] ) opencascade? ( sci-libs/opencascade:* ) png? ( media-libs/libpng:0 ) petsc? ( sci-mathematics/petsc[mpi=] ) zlib? ( sys-libs/zlib ) mpi? ( virtual/mpi[cxx] ) || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) virtual/pkgconfig python? ( dev-lang/swig:0 ) virtual/fortran
-DESCRIPTION=A three-dimensional finite element mesh generator
+DESCRIPTION=Three-dimensional finite element mesh generator
 EAPI=8
-HOMEPAGE=http://www.geuz.org/gmsh/
+HOMEPAGE=https://gmsh.info/
 INHERIT=cmake fortran-2 python-any-r1 toolchain-funcs
 IUSE=blas cgns examples jpeg med metis mpi netgen opencascade petsc png python shared X zlib
 KEYWORDS=~amd64 ~x86
@@ -11,6 +11,6 @@ LICENSE=GPL-3 free-noncomm
 RDEPEND=virtual/fortran X? ( x11-libs/fltk:1[xft] ) blas? ( virtual/blas virtual/lapack sci-libs/fftw:3.0 ) cgns? ( sci-libs/cgnslib ) jpeg? ( media-libs/libjpeg-turbo ) med? ( sci-libs/med[mpi] ) opencascade? ( sci-libs/opencascade:* ) png? ( media-libs/libpng:0 ) petsc? ( sci-mathematics/petsc[mpi=] ) zlib? ( sys-libs/zlib ) mpi? ( virtual/mpi[cxx] ) virtual/fortran
 REQUIRED_USE=med? ( mpi )
 SLOT=0
-SRC_URI=http://www.geuz.org/gmsh/src/gmsh-4.9.5-source.tgz
+SRC_URI=https://gmsh.info/src/gmsh-4.9.5-source.tgz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b241a31ef9fe32270320517f6dbd0c8c
+_md5_=deebb6945d6a633f662320d2345f31f9
diff --git a/metadata/md5-cache/sci-libs/hdf5-1.12.2-r2 b/metadata/md5-cache/sci-libs/hdf5-1.12.2-r2
index 611a00099718..a3e23d7a4f23 100644
--- a/metadata/md5-cache/sci-libs/hdf5-1.12.2-r2
+++ b/metadata/md5-cache/sci-libs/hdf5-1.12.2-r2
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://www.hdfgroup.org/HDF5/
 INHERIT=cmake flag-o-matic fortran-2 toolchain-funcs
 IUSE=cxx debug doc examples fortran +hl mpi szip test threads unsupported zlib
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=NCSA-HDF
 RDEPEND=mpi? ( virtual/mpi[romio] ) szip? ( virtual/szip ) zlib? ( sys-libs/zlib:0= ) fortran? ( virtual/fortran )
 REQUIRED_USE=!unsupported? ( mpi? ( !cxx !threads ) threads? ( !cxx !fortran !hl ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 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_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=9fbf1ca21538188657a810a1fd4ef1e1
+_md5_=ee17701761e66e43657e5f0526d43725
diff --git a/metadata/md5-cache/sci-libs/indilib-1.9.6 b/metadata/md5-cache/sci-libs/indilib-1.9.6-r1
similarity index 50%
rename from metadata/md5-cache/sci-libs/indilib-1.9.6
rename to metadata/md5-cache/sci-libs/indilib-1.9.6-r1
index 2d18a0d1306a..ad9fb464ef48 100644
--- a/metadata/md5-cache/sci-libs/indilib-1.9.6
+++ b/metadata/md5-cache/sci-libs/indilib-1.9.6-r1
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=net-misc/curl sci-libs/cfitsio:= sci-libs/fftw:3.0= sci-libs/gsl:= sci-libs/libnova:= sys-libs/zlib virtual/jpeg:0 virtual/libusb:0 ogg? ( media-libs/libogg media-libs/libtheora ) rtlsdr? ( net-wireless/rtl-sdr ) websocket? ( dev-libs/boost:= ) kernel_linux? ( sys-kernel/linux-headers ) test? ( >=dev-cpp/gtest-1.8.0 ) websocket? ( dev-cpp/websocketpp )
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=media-libs/libjpeg-turbo:= net-misc/curl sci-libs/cfitsio:= sci-libs/fftw:3.0= sci-libs/gsl:= sci-libs/libnova:= sys-libs/zlib virtual/libusb:0 ogg? ( media-libs/libogg media-libs/libtheora ) rtlsdr? ( net-wireless/rtl-sdr ) websocket? ( dev-libs/boost:= ) kernel_linux? ( sys-kernel/linux-headers ) test? ( >=dev-cpp/gtest-1.8.0 ) websocket? ( dev-cpp/websocketpp )
 DESCRIPTION=INDI Astronomical Control Protocol library
 EAPI=8
 HOMEPAGE=https://www.indilib.org/
@@ -8,9 +8,9 @@ INHERIT=cmake udev
 IUSE=ogg rtlsdr test websocket
 KEYWORDS=~amd64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=BSD GPL-2+ LGPL-2+ LGPL-2.1+
-RDEPEND=net-misc/curl sci-libs/cfitsio:= sci-libs/fftw:3.0= sci-libs/gsl:= sci-libs/libnova:= sys-libs/zlib virtual/jpeg:0 virtual/libusb:0 ogg? ( media-libs/libogg media-libs/libtheora ) rtlsdr? ( net-wireless/rtl-sdr ) websocket? ( dev-libs/boost:= )
+RDEPEND=media-libs/libjpeg-turbo:= net-misc/curl sci-libs/cfitsio:= sci-libs/fftw:3.0= sci-libs/gsl:= sci-libs/libnova:= sys-libs/zlib virtual/libusb:0 ogg? ( media-libs/libogg media-libs/libtheora ) rtlsdr? ( net-wireless/rtl-sdr ) websocket? ( dev-libs/boost:= )
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/indilib/indi/archive/v1.9.6.tar.gz -> indilib-1.9.6.tar.gz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=03716d5409777bf704ff59dc65a84235
+_md5_=d9ae61eb0564a78a92658bd7a844cc94
diff --git a/metadata/md5-cache/sci-libs/opencascade-7.5.2-r6 b/metadata/md5-cache/sci-libs/opencascade-7.5.2-r6
index 203775c89d68..9a8b2735b895 100644
--- a/metadata/md5-cache/sci-libs/opencascade-7.5.2-r6
+++ b/metadata/md5-cache/sci-libs/opencascade-7.5.2-r6
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0/7.5
 SRC_URI=https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/V7_5_2;sf=tgz -> opencascade-7.5.2.tar.gz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ca8d0826ed2dd9218117aa02a23fb5e0
+_md5_=f99bb0f8b58aacd0993f87865ab7344a
diff --git a/metadata/md5-cache/sci-libs/opencascade-7.5.3-r7 b/metadata/md5-cache/sci-libs/opencascade-7.5.3-r7
index e6513a9c49b8..f2f8040de8af 100644
--- a/metadata/md5-cache/sci-libs/opencascade-7.5.3-r7
+++ b/metadata/md5-cache/sci-libs/opencascade-7.5.3-r7
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0/7.5
 SRC_URI=https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/V7_5_3;sf=tgz -> opencascade-7.5.3.tar.gz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=43766f75a32f83ab6c46e42ecbaf541a
+_md5_=8ee9db7e98c771fd1d2b8529a34adc02
diff --git a/metadata/md5-cache/sci-libs/opencascade-7.6.0-r4 b/metadata/md5-cache/sci-libs/opencascade-7.6.0-r4
index f7f0529db4f1..9e8ca7096c59 100644
--- a/metadata/md5-cache/sci-libs/opencascade-7.6.0-r4
+++ b/metadata/md5-cache/sci-libs/opencascade-7.6.0-r4
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0/7.6
 SRC_URI=https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/V7_6_0;sf=tgz -> opencascade-7.6.0.tar.gz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ced1c1b51d31dd59a4b4fb509be3be28
+_md5_=3f8d1aabc065b91b96740b7426476296
diff --git a/metadata/md5-cache/sci-libs/opencascade-7.6.1-r1 b/metadata/md5-cache/sci-libs/opencascade-7.6.1-r1
index 8b51c1822460..12ee7719c89b 100644
--- a/metadata/md5-cache/sci-libs/opencascade-7.6.1-r1
+++ b/metadata/md5-cache/sci-libs/opencascade-7.6.1-r1
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0/7.6
 SRC_URI=https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/V7_6_1;sf=tgz -> opencascade-7.6.1.tar.gz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ced1c1b51d31dd59a4b4fb509be3be28
+_md5_=3f8d1aabc065b91b96740b7426476296
diff --git a/metadata/md5-cache/sci-libs/opencascade-7.6.2 b/metadata/md5-cache/sci-libs/opencascade-7.6.2
new file mode 100644
index 000000000000..3b65629355be
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/opencascade-7.6.2
@@ -0,0 +1,17 @@
+BDEPEND=doc? ( app-doc/doxygen[dot] ) examples? ( dev-qt/linguist-tools:5 ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!app-eselect/eselect-opencascade dev-lang/tcl:= dev-lang/tk:= dev-tcltk/itcl dev-tcltk/itk dev-tcltk/tix media-libs/fontconfig media-libs/freetype:2 media-libs/ftgl virtual/glu virtual/opengl x11-libs/libXmu examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtquickcontrols2:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) ffmpeg? ( <media-video/ffmpeg-5:= ) freeimage? ( media-libs/freeimage ) tbb? ( <dev-cpp/tbb-2021.4 ) vtk? ( sci-libs/vtk:=[rendering] ) eigen? ( dev-cpp/eigen ) json? ( dev-libs/rapidjson ) vtk? ( dev-libs/utfcpp )
+DESCRIPTION=Development platform for CAD/CAE, 3D surface/solid modeling and data exchange
+EAPI=8
+HOMEPAGE=https://www.opencascade.com
+INHERIT=cmake
+IUSE=doc eigen examples ffmpeg freeimage gles2 json optimize tbb vtk
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )
+RDEPEND=!app-eselect/eselect-opencascade dev-lang/tcl:= dev-lang/tk:= dev-tcltk/itcl dev-tcltk/itk dev-tcltk/tix media-libs/fontconfig media-libs/freetype:2 media-libs/ftgl virtual/glu virtual/opengl x11-libs/libXmu examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtquickcontrols2:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) ffmpeg? ( <media-video/ffmpeg-5:= ) freeimage? ( media-libs/freeimage ) tbb? ( <dev-cpp/tbb-2021.4 ) vtk? ( sci-libs/vtk:=[rendering] )
+REQUIRED_USE=?? ( optimize tbb )
+RESTRICT=test
+SLOT=0/7.6
+SRC_URI=https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/V7_6_2;sf=tgz -> opencascade-7.6.2.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=52ecd4e10df629f5b779109b38f1d056
diff --git a/metadata/md5-cache/sci-libs/plplot-5.15.0-r102 b/metadata/md5-cache/sci-libs/plplot-5.15.0-r102
index 39ff384b6477..8d521a5f2d96 100644
--- a/metadata/md5-cache/sci-libs/plplot-5.15.0-r102
+++ b/metadata/md5-cache/sci-libs/plplot-5.15.0-r102
@@ -1,17 +1,17 @@
 BDEPEND=sys-devel/make >=dev-util/cmake-3.20.5 fortran? ( virtual/fortran ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=cairo? ( x11-libs/cairo:0=[svg?,X] ) gd? ( media-libs/gd:2=[jpeg?,png?] ) java? ( >=virtual/jre-1.8:* ) latex? ( app-text/ghostscript-gpl virtual/latex-base ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) ocaml? ( dev-lang/ocaml dev-ml/camlidl ) octave? ( sci-mathematics/octave:0= ) pdf? ( media-libs/libharu:0= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] qt5? ( dev-python/PyQt5[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] qt5? ( dev-python/PyQt5[python_targets_python3_9(-)] ) ) ) qhull? ( media-libs/qhull:0= ) qt5? ( dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtprintsupport:5 ) shapefile? ( sci-libs/shapelib:0= ) tcl? ( dev-lang/tcl:0= dev-tcltk/itcl:0= tk? ( dev-lang/tk:0= dev-tcltk/itk ) ) truetype? ( media-fonts/freefont media-libs/lasi:0= gd? ( media-libs/gd:2=[truetype] ) ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3=[X] x11-libs/agg:0=[truetype?] ) X? ( x11-libs/libX11:0= x11-libs/libXau:0= x11-libs/libXdmcp:0= ) virtual/pkgconfig java? ( >=virtual/jdk-1.8:* dev-lang/swig ) lua? ( dev-lang/swig ) ocaml? ( dev-ml/findlib ) octave? ( >=dev-lang/swig-3.0.12 ) python? ( dev-lang/swig ) test? ( media-fonts/font-misc-misc media-fonts/font-cursor-misc ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=cairo? ( x11-libs/cairo:0=[svg?,X] ) gd? ( media-libs/gd:2=[jpeg?,png?] ) java? ( >=virtual/jre-1.8:* ) latex? ( app-text/ghostscript-gpl virtual/latex-base ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) ocaml? ( dev-lang/ocaml dev-ml/camlidl ) octave? ( sci-mathematics/octave:0= ) pdf? ( media-libs/libharu:0= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] qt5? ( dev-python/PyQt5[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] qt5? ( dev-python/PyQt5[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] qt5? ( dev-python/PyQt5[python_targets_python3_10(-)] ) ) ) qhull? ( media-libs/qhull:0= ) qt5? ( dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtprintsupport:5 ) shapefile? ( sci-libs/shapelib:0= ) tcl? ( dev-lang/tcl:0= dev-tcltk/itcl:0= tk? ( dev-lang/tk:0= dev-tcltk/itk ) ) truetype? ( media-fonts/freefont media-libs/lasi:0= gd? ( media-libs/gd:2=[truetype] ) ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3=[X] x11-libs/agg:0=[truetype?] ) X? ( x11-libs/libX11:0= x11-libs/libXau:0= x11-libs/libXdmcp:0= ) virtual/pkgconfig java? ( >=virtual/jdk-1.8:* dev-lang/swig ) lua? ( dev-lang/swig ) ocaml? ( dev-ml/findlib ) octave? ( >=dev-lang/swig-3.0.12 ) python? ( dev-lang/swig ) test? ( media-fonts/font-misc-misc media-fonts/font-cursor-misc ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=Multi-language scientific plotting library
 EAPI=7
 HOMEPAGE=http://plplot.sourceforge.net/
 INHERIT=cmake flag-o-matic fortran-2 java-pkg-opt-2 lua-single python-single-r1 toolchain-funcs virtualx wxwidgets
-IUSE=cairo cxx doc +dynamic examples fortran gd java jpeg latex lua ocaml octave pdf png python qhull qt5 shapefile svg tcl test threads tk truetype wxwidgets X java +lua_single_target_lua5-1 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=cairo cxx doc +dynamic examples fortran gd java jpeg latex lua ocaml octave pdf png python qhull qt5 shapefile svg tcl test threads tk truetype wxwidgets X java +lua_single_target_lua5-1 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2
-RDEPEND=cairo? ( x11-libs/cairo:0=[svg?,X] ) gd? ( media-libs/gd:2=[jpeg?,png?] ) java? ( >=virtual/jre-1.8:* ) latex? ( app-text/ghostscript-gpl virtual/latex-base ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) ocaml? ( dev-lang/ocaml dev-ml/camlidl ) octave? ( sci-mathematics/octave:0= ) pdf? ( media-libs/libharu:0= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] qt5? ( dev-python/PyQt5[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] qt5? ( dev-python/PyQt5[python_targets_python3_9(-)] ) ) ) qhull? ( media-libs/qhull:0= ) qt5? ( dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtprintsupport:5 ) shapefile? ( sci-libs/shapelib:0= ) tcl? ( dev-lang/tcl:0= dev-tcltk/itcl:0= tk? ( dev-lang/tk:0= dev-tcltk/itk ) ) truetype? ( media-fonts/freefont media-libs/lasi:0= gd? ( media-libs/gd:2=[truetype] ) ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3=[X] x11-libs/agg:0=[truetype?] ) X? ( x11-libs/libX11:0= x11-libs/libXau:0= x11-libs/libXdmcp:0= ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) qt5? ( dynamic ) test? ( latex ) tk? ( tcl )
+RDEPEND=cairo? ( x11-libs/cairo:0=[svg?,X] ) gd? ( media-libs/gd:2=[jpeg?,png?] ) java? ( >=virtual/jre-1.8:* ) latex? ( app-text/ghostscript-gpl virtual/latex-base ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) ocaml? ( dev-lang/ocaml dev-ml/camlidl ) octave? ( sci-mathematics/octave:0= ) pdf? ( media-libs/libharu:0= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] qt5? ( dev-python/PyQt5[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] qt5? ( dev-python/PyQt5[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] qt5? ( dev-python/PyQt5[python_targets_python3_10(-)] ) ) ) qhull? ( media-libs/qhull:0= ) qt5? ( dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtprintsupport:5 ) shapefile? ( sci-libs/shapelib:0= ) tcl? ( dev-lang/tcl:0= dev-tcltk/itcl:0= tk? ( dev-lang/tk:0= dev-tcltk/itk ) ) truetype? ( media-fonts/freefont media-libs/lasi:0= gd? ( media-libs/gd:2=[truetype] ) ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3=[X] x11-libs/agg:0=[truetype?] ) X? ( x11-libs/libX11:0= x11-libs/libXau:0= x11-libs/libXdmcp:0= ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) qt5? ( dynamic ) test? ( latex ) tk? ( tcl )
 RESTRICT=!test? ( test ) octave? ( test )
 SLOT=0/14
 SRC_URI=mirror://sourceforge/plplot/plplot-5.15.0.tar.gz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=8039714da2790eeeea5566850e208150
+_md5_=5e865ec2eea3fe0c70369d08fa3c7275
diff --git a/metadata/md5-cache/sci-libs/trilinos-13.2.0 b/metadata/md5-cache/sci-libs/trilinos-13.2.0
new file mode 100644
index 000000000000..33adabba1380
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/trilinos-13.2.0
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/make >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=!dev-cpp/kokkos dev-libs/boost:= sys-libs/binutils-libs:= virtual/blas virtual/lapack virtual/mpi adolc? ( sci-libs/adolc ) arprec? ( sci-libs/arprec ) clp? ( sci-libs/coinor-clp ) cuda? ( >=dev-util/nvidia-cuda-toolkit-3.2 ) eigen? ( dev-cpp/eigen:3 ) glpk? ( sci-mathematics/glpk ) gtest? ( dev-cpp/gtest ) hdf5? ( sci-libs/hdf5:=[mpi] ) hypre? ( sci-libs/hypre:= ) hwloc? ( sys-apps/hwloc:= ) matio? ( sci-libs/matio ) mkl? ( sci-libs/mkl ) metis? ( sci-libs/metis ) mumps? ( sci-libs/mumps ) netcdf? ( sci-libs/netcdf:= ) petsc? ( sci-mathematics/petsc ) qd? ( sci-libs/qd ) scalapack? ( sci-libs/scalapack ) scotch? ( sci-libs/scotch:= ) sparse? ( sci-libs/cxsparse sci-libs/umfpack ) superlu? ( sci-libs/superlu:= ) taucs? ( sci-libs/taucs ) tbb? ( dev-cpp/tbb:= ) tvmet? ( dev-libs/tvmet ) yaml? ( dev-cpp/yaml-cpp:= ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libX11 ) virtual/pkgconfig
+DESCRIPTION=Scientific library collection for large scale problems
+EAPI=8
+HOMEPAGE=http://trilinos.sandia.gov/
+INHERIT=cmake toolchain-funcs
+IUSE=adolc all-packages arprec clp cuda eigen glpk gtest hdf5 hwloc hypre matio metis mkl mumps netcdf openmp petsc qd scalapack scotch sparse superlu taucs tbb test threads tvmet yaml zlib X
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD LGPL-2.1
+RDEPEND=!dev-cpp/kokkos dev-libs/boost:= sys-libs/binutils-libs:= virtual/blas virtual/lapack virtual/mpi adolc? ( sci-libs/adolc ) arprec? ( sci-libs/arprec ) clp? ( sci-libs/coinor-clp ) cuda? ( >=dev-util/nvidia-cuda-toolkit-3.2 ) eigen? ( dev-cpp/eigen:3 ) glpk? ( sci-mathematics/glpk ) gtest? ( dev-cpp/gtest ) hdf5? ( sci-libs/hdf5:=[mpi] ) hypre? ( sci-libs/hypre:= ) hwloc? ( sys-apps/hwloc:= ) matio? ( sci-libs/matio ) mkl? ( sci-libs/mkl ) metis? ( sci-libs/metis ) mumps? ( sci-libs/mumps ) netcdf? ( sci-libs/netcdf:= ) petsc? ( sci-mathematics/petsc ) qd? ( sci-libs/qd ) scalapack? ( sci-libs/scalapack ) scotch? ( sci-libs/scotch:= ) sparse? ( sci-libs/cxsparse sci-libs/umfpack ) superlu? ( sci-libs/superlu:= ) taucs? ( sci-libs/taucs ) tbb? ( dev-cpp/tbb:= ) tvmet? ( dev-libs/tvmet ) yaml? ( dev-cpp/yaml-cpp:= ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libX11 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/trilinos/Trilinos/archive/trilinos-release-13-2-0.tar.gz -> trilinos-13.2.0.tar.gz https://dev.gentoo.org/~tamiko/distfiles/trilinos-13.2.0-patches-r0.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=9f424f2232f3af01100673686d241b79
diff --git a/metadata/md5-cache/sci-libs/trilinos-13.4.0-r1 b/metadata/md5-cache/sci-libs/trilinos-13.4.0-r3
similarity index 91%
rename from metadata/md5-cache/sci-libs/trilinos-13.4.0-r1
rename to metadata/md5-cache/sci-libs/trilinos-13.4.0-r3
index ba4c298324b8..7abfac7565d4 100644
--- a/metadata/md5-cache/sci-libs/trilinos-13.4.0-r1
+++ b/metadata/md5-cache/sci-libs/trilinos-13.4.0-r3
@@ -5,7 +5,7 @@ DESCRIPTION=Scientific library collection for large scale problems
 EAPI=8
 HOMEPAGE=http://trilinos.sandia.gov/
 INHERIT=cmake toolchain-funcs
-IUSE=adolc arprec clp cuda eigen glpk gtest hdf5 hwloc hypre matio metis mkl mumps netcdf openmp petsc qd scalapack scotch sparse superlu taucs tbb test threads tvmet yaml zlib X
+IUSE=adolc all-packages arprec clp cuda eigen glpk gtest hdf5 hwloc hypre matio metis mkl mumps netcdf openmp petsc qd scalapack scotch sparse superlu taucs tbb test threads tvmet yaml zlib X
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD LGPL-2.1
 RDEPEND=!dev-cpp/kokkos dev-libs/boost:= sys-libs/binutils-libs:= virtual/blas virtual/lapack virtual/mpi adolc? ( sci-libs/adolc ) arprec? ( sci-libs/arprec ) clp? ( sci-libs/coinor-clp ) cuda? ( >=dev-util/nvidia-cuda-toolkit-3.2 ) eigen? ( dev-cpp/eigen:3 ) glpk? ( sci-mathematics/glpk ) gtest? ( dev-cpp/gtest ) hdf5? ( sci-libs/hdf5:=[mpi] ) hypre? ( sci-libs/hypre:= ) hwloc? ( sys-apps/hwloc:= ) matio? ( sci-libs/matio ) mkl? ( sci-libs/mkl ) metis? ( sci-libs/metis ) mumps? ( sci-libs/mumps ) netcdf? ( sci-libs/netcdf:= ) petsc? ( sci-mathematics/petsc ) qd? ( sci-libs/qd ) scalapack? ( sci-libs/scalapack ) scotch? ( sci-libs/scotch:= ) sparse? ( sci-libs/cxsparse sci-libs/umfpack ) superlu? ( sci-libs/superlu:= ) taucs? ( sci-libs/taucs ) tbb? ( dev-cpp/tbb:= ) tvmet? ( dev-libs/tvmet ) yaml? ( dev-cpp/yaml-cpp:= ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libX11 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/trilinos/Trilinos/archive/trilinos-release-13-4-0.tar.gz -> trilinos-13.4.0.tar.gz https://dev.gentoo.org/~tamiko/distfiles/trilinos-13.4.0-patches-r0.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=3854015c98c59fe1d27936cd67f580c6
+_md5_=78fa61320159b0c298c4818a1547aea9
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 20fb1dfe08ac..293be0321712 100644
Binary files a/metadata/md5-cache/sci-mathematics/Manifest.gz and b/metadata/md5-cache/sci-mathematics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-mathematics/alectryon-1.4.0-r1 b/metadata/md5-cache/sci-mathematics/alectryon-1.4.0-r1
index ea26e90f9933..d2a24b98aa8c 100644
--- a/metadata/md5-cache/sci-mathematics/alectryon-1.4.0-r1
+++ b/metadata/md5-cache/sci-mathematics/alectryon-1.4.0-r1
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 SLOT=0
 SRC_URI=https://github.com/cpitclaudel/alectryon/archive/v1.4.0.tar.gz -> alectryon-1.4.0.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	elisp-common	e7aaa047873789f549ea3df2f04b2145	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=edb68aaf22f745e31752e00a3ff3a7db
+_md5_=4669c1b36c77bdfc3a2a2436da48079a
diff --git a/metadata/md5-cache/sci-mathematics/polymake-4.6-r1 b/metadata/md5-cache/sci-mathematics/polymake-4.6-r1
new file mode 100644
index 000000000000..47a385b5276c
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/polymake-4.6-r1
@@ -0,0 +1,17 @@
+BDEPEND=dev-util/ninja dev-lang/perl
+DEFINED_PHASES=compile configure install postinst test
+DEPEND=libpolymake? ( dev-lang/perl ) dev-libs/boost:= dev-libs/gmp:= dev-libs/libxml2:2= dev-libs/libxslt:= dev-libs/mpfr:= sys-libs/readline:= bliss? ( sci-libs/bliss:=[gmp] ) cdd? ( sci-libs/cddlib:= ) flint? ( sci-mathematics/flint:= ) lrs? ( >=sci-libs/lrslib-051:=[gmp] ) nauty? ( sci-mathematics/nauty:= ) normaliz? ( >=sci-mathematics/normaliz-3.8:= ) ppl? ( dev-libs/ppl:= ) singular? ( sci-mathematics/singular:= )
+DESCRIPTION=Tool for polyhedral geometry and combinatorics
+EAPI=8
+HOMEPAGE=https://polymake.org/
+INHERIT=flag-o-matic ninja-utils toolchain-funcs
+IUSE=bliss +cdd +flint +normaliz libpolymake lrs nauty ppl singular
+KEYWORDS=~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD GPL-2 GPL-2+ MIT WTFPL-2
+RDEPEND=libpolymake? ( dev-lang/perl ) dev-libs/boost:= dev-libs/gmp:= dev-libs/libxml2:2= dev-libs/libxslt:= dev-libs/mpfr:= sys-libs/readline:= bliss? ( sci-libs/bliss:=[gmp] ) cdd? ( sci-libs/cddlib:= ) flint? ( sci-mathematics/flint:= ) lrs? ( >=sci-libs/lrslib-051:=[gmp] ) nauty? ( sci-mathematics/nauty:= ) normaliz? ( >=sci-mathematics/normaliz-3.8:= ) ppl? ( dev-libs/ppl:= ) singular? ( sci-mathematics/singular:= ) dev-lang/perl dev-perl/JSON dev-perl/Term-ReadLine-Gnu dev-perl/TermReadKey dev-perl/XML-SAX dev-perl/XML-Writer
+REQUIRED_USE=^^ ( bliss nauty )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://polymake.org/lib/exe/fetch.php/download/polymake-4.6-minimal.tar.bz2
+_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=2c163633d418aab9570be54115eb5101
diff --git a/metadata/md5-cache/sci-mathematics/primecount-7.3 b/metadata/md5-cache/sci-mathematics/primecount-7.3
new file mode 100644
index 000000000000..f6dfb4709509
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/primecount-7.3
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=sci-mathematics/primesieve:=
+DESCRIPTION=Highly optimized CLI and library to count primes
+EAPI=8
+HOMEPAGE=https://github.com/kimwalisch/primecount
+INHERIT=cmake toolchain-funcs
+IUSE=cpu_flags_x86_popcnt +executable openmp test
+KEYWORDS=~amd64
+LICENSE=BSD-2
+RDEPEND=sci-mathematics/primesieve:=
+RESTRICT=!test? ( test )
+SLOT=0/7
+SRC_URI=https://github.com/kimwalisch/primecount/archive/refs/tags/v7.3.tar.gz -> primecount-7.3.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=900a0cb1c5ba41d8661b8a8787f952d2
diff --git a/metadata/md5-cache/sci-mathematics/primesieve-7.9 b/metadata/md5-cache/sci-mathematics/primesieve-7.9
new file mode 100644
index 000000000000..4382305c0628
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/primesieve-7.9
@@ -0,0 +1,14 @@
+BDEPEND=doc? ( app-doc/doxygen app-text/texlive media-gfx/graphviz ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=CLI and library for quickly generating prime numbers
+EAPI=8
+HOMEPAGE=https://github.com/kimwalisch/primesieve
+INHERIT=cmake
+IUSE=doc +executable test
+KEYWORDS=~amd64
+LICENSE=BSD-2
+RESTRICT=!test? ( test )
+SLOT=0/9
+SRC_URI=https://github.com/kimwalisch/primesieve/archive/refs/tags/v7.9.tar.gz -> primesieve-7.9.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=8f4073d0311aced9abc3791fff6d74e7
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index c5de6867e5f6..afd7369914da 100644
Binary files a/metadata/md5-cache/sci-visualization/Manifest.gz and b/metadata/md5-cache/sci-visualization/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-visualization/gwyddion-2.60 b/metadata/md5-cache/sci-visualization/gwyddion-2.60
index 28f1ab83aed6..b48bd522b935 100644
--- a/metadata/md5-cache/sci-visualization/gwyddion-2.60
+++ b/metadata/md5-cache/sci-visualization/gwyddion-2.60
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://gwyddion.net/
 INHERIT=autotools xdg
 IUSE=bzip2 doc fits jansson hdf5 nls openexr openmp perl ruby sourceview unique xml X zlib
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.32 dev-libs/libzip media-libs/libpng:0= >=sci-libs/fftw-3.1:3.0=[openmp?] virtual/libiconv virtual/libintl x11-libs/cairo >=x11-libs/gtk+-2.18:2 x11-libs/libXmu x11-libs/pango bzip2? ( app-arch/bzip2 ) fits? ( sci-libs/cfitsio[bzip2?] ) jansson? ( dev-libs/jansson ) hdf5? ( sci-libs/hdf5[zlib?] ) openexr? ( media-libs/openexr:= ) perl? ( dev-lang/perl:= ) ruby? ( dev-ruby/narray ) unique? ( dev-libs/libunique:3 ) sourceview? ( x11-libs/gtksourceview:2.0 ) xml? ( dev-libs/libxml2:2 ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=http://gwyddion.net/download/2.60/gwyddion-2.60.tar.xz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=f7979d533d93ec9f9cadb732265e3166
+_md5_=635bb00445c42de67baed9bc1c347220
diff --git a/metadata/md5-cache/sci-visualization/gwyddion-2.61 b/metadata/md5-cache/sci-visualization/gwyddion-2.61
new file mode 100644
index 000000000000..e209f8997679
--- /dev/null
+++ b/metadata/md5-cache/sci-visualization/gwyddion-2.61
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig doc? ( dev-util/gtk-doc ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.32 dev-libs/libzip media-libs/libpng:0= >=sci-libs/fftw-3.1:3.0=[openmp?] virtual/libiconv virtual/libintl x11-libs/cairo >=x11-libs/gtk+-2.18:2 x11-libs/libXmu x11-libs/pango bzip2? ( app-arch/bzip2 ) fits? ( sci-libs/cfitsio[bzip2?] ) jansson? ( dev-libs/jansson ) hdf5? ( sci-libs/hdf5[zlib?] ) openexr? ( media-libs/openexr:= ) perl? ( dev-lang/perl:= ) ruby? ( dev-ruby/narray ) unique? ( dev-libs/libunique:3 ) sourceview? ( x11-libs/gtksourceview:2.0 ) xml? ( dev-libs/libxml2:2 ) zlib? ( sys-libs/zlib )
+DESCRIPTION=Framework for Scanning Mode Microscopy data analysis
+EAPI=8
+HOMEPAGE=http://gwyddion.net/
+INHERIT=autotools xdg
+IUSE=bzip2 doc fits jansson hdf5 nls openexr openmp perl ruby sourceview unique xml X zlib
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.32 dev-libs/libzip media-libs/libpng:0= >=sci-libs/fftw-3.1:3.0=[openmp?] virtual/libiconv virtual/libintl x11-libs/cairo >=x11-libs/gtk+-2.18:2 x11-libs/libXmu x11-libs/pango bzip2? ( app-arch/bzip2 ) fits? ( sci-libs/cfitsio[bzip2?] ) jansson? ( dev-libs/jansson ) hdf5? ( sci-libs/hdf5[zlib?] ) openexr? ( media-libs/openexr:= ) perl? ( dev-lang/perl:= ) ruby? ( dev-ruby/narray ) unique? ( dev-libs/libunique:3 ) sourceview? ( x11-libs/gtksourceview:2.0 ) xml? ( dev-libs/libxml2:2 ) zlib? ( sys-libs/zlib )
+SLOT=0
+SRC_URI=http://gwyddion.net/download/2.61/gwyddion-2.61.tar.xz
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=56b1cfe8c95e35931007c560a11ed390
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index fe5f1406fe24..a7a5e87f44a3 100644
Binary files a/metadata/md5-cache/sys-apps/Manifest.gz and b/metadata/md5-cache/sys-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-apps/dbus-broker-31 b/metadata/md5-cache/sys-apps/dbus-broker-31
index ff12249989b1..a3a37635d463 100644
--- a/metadata/md5-cache/sys-apps/dbus-broker-31
+++ b/metadata/md5-cache/sys-apps/dbus-broker-31
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/bus1/dbus-broker/wiki
 INHERIT=meson
 IUSE=audit doc +launcher selinux
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv
+KEYWORDS=amd64 arm64 ppc64 ~riscv
 LICENSE=Apache-2.0
 RDEPEND=audit? ( >=sys-process/audit-3.0 >=sys-libs/libcap-ng-0.6 ) launcher? ( >=dev-libs/expat-2.2 >=sys-apps/systemd-230:0= ) selinux? ( >=sys-libs/libselinux-3.2 ) launcher? ( sys-apps/dbus )
 SLOT=0
 SRC_URI=https://github.com/bus1/dbus-broker/releases/download/v31/dbus-broker-31.tar.xz
 _eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=320ea49ddd0703bb741c8621eca53f3f
+_md5_=a637865ac6f6dc3bc5047420088bc7cf
diff --git a/metadata/md5-cache/sys-apps/ethtool-5.18 b/metadata/md5-cache/sys-apps/ethtool-5.18
new file mode 100644
index 000000000000..35d59efc8684
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/ethtool-5.18
@@ -0,0 +1,13 @@
+BDEPEND=app-arch/xz-utils
+DEFINED_PHASES=configure
+DEPEND=netlink? ( net-libs/libmnl )
+DESCRIPTION=Utility for examining and tuning ethernet-based network interfaces
+EAPI=8
+HOMEPAGE=https://www.kernel.org/pub/software/network/ethtool/
+IUSE=+netlink
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=netlink? ( net-libs/libmnl )
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/software/network/ethtool/ethtool-5.18.tar.xz
+_md5_=662cc34b84eca807fe7cfe6da4f11ac6
diff --git a/metadata/md5-cache/sys-apps/firejail-0.9.68 b/metadata/md5-cache/sys-apps/firejail-0.9.70
similarity index 86%
rename from metadata/md5-cache/sys-apps/firejail-0.9.68
rename to metadata/md5-cache/sys-apps/firejail-0.9.70
index 89cf957418f3..4bced5237fa7 100644
--- a/metadata/md5-cache/sys-apps/firejail-0.9.68
+++ b/metadata/md5-cache/sys-apps/firejail-0.9.70
@@ -4,13 +4,13 @@ DESCRIPTION=Security sandbox for any type of processes
 EAPI=7
 HOMEPAGE=https://firejail.wordpress.com/
 INHERIT=toolchain-funcs python-single-r1 linux-info
-IUSE=apparmor +chroot contrib +dbusproxy +file-transfer +globalcfg +network +private-home test +userns +whitelist X python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~x86
+IUSE=apparmor +chroot contrib +dbusproxy +file-transfer +globalcfg +network +private-home test +userns X python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
 RDEPEND=!sys-apps/firejail-lts apparmor? ( sys-libs/libapparmor ) contrib? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) dbusproxy? ( sys-apps/xdg-dbus-proxy )
 REQUIRED_USE=contrib? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/netblue30/firejail/releases/download/0.9.68/firejail-0.9.68.tar.xz
+SRC_URI=https://github.com/netblue30/firejail/releases/download/0.9.70/firejail-0.9.70.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=038456344de8c6eb6e83337be63056d9
+_md5_=b3b672642338ac104ff5038962219972
diff --git a/metadata/md5-cache/sys-apps/firejail-9999 b/metadata/md5-cache/sys-apps/firejail-9999
deleted file mode 100644
index 45b0d47de6fb..000000000000
--- a/metadata/md5-cache/sys-apps/firejail-9999
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install prepare setup unpack
-DEPEND=!sys-apps/firejail-lts apparmor? ( sys-libs/libapparmor ) contrib? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) dbusproxy? ( sys-apps/xdg-dbus-proxy ) sys-libs/libseccomp test? ( dev-tcltk/expect )
-DESCRIPTION=Security sandbox for any type of processes
-EAPI=7
-HOMEPAGE=https://firejail.wordpress.com/
-INHERIT=toolchain-funcs python-single-r1 linux-info git-r3
-IUSE=apparmor +chroot contrib +dbusproxy +file-transfer +globalcfg +network +private-home test +userns +whitelist X python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-LICENSE=GPL-2
-PROPERTIES=live
-RDEPEND=!sys-apps/firejail-lts apparmor? ( sys-libs/libapparmor ) contrib? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) dbusproxy? ( sys-apps/xdg-dbus-proxy )
-REQUIRED_USE=contrib? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
-RESTRICT=test
-SLOT=0
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=75aea18a8bf4d02b846ddbb243a3b38e
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.8.1 b/metadata/md5-cache/sys-apps/fwupd-1.8.1
index a636d2d632e9..279c21966511 100644
--- a/metadata/md5-cache/sys-apps/fwupd-1.8.1
+++ b/metadata/md5-cache/sys-apps/fwupd-1.8.1
@@ -1,10 +1,10 @@
-BDEPEND=|| ( dev-lang/vala:0.56 dev-lang/vala:0.54 dev-lang/vala:0.52 dev-lang/vala:0.50 ) >=dev-util/meson-0.60.0 virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) bash-completion? ( >=app-shells/bash-completion-2.0 ) introspection? ( dev-libs/gobject-introspection ) man? ( app-text/docbook-sgml-utils sys-apps/help2man ) test? ( thunderbolt? ( dev-util/umockdev ) net-libs/gnutls[tools] ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=|| ( dev-lang/vala:0.56 dev-lang/vala:0.54 dev-lang/vala:0.52 dev-lang/vala:0.50 ) >=dev-util/meson-0.60.0 virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) bash-completion? ( >=app-shells/bash-completion-2.0 ) introspection? ( dev-libs/gobject-introspection ) man? ( app-text/docbook-sgml-utils sys-apps/help2man ) test? ( thunderbolt? ( dev-util/umockdev ) net-libs/gnutls[tools] ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
 DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=app-arch/gcab-1.0 app-arch/xz-utils >=dev-libs/glib-2.58:2 dev-libs/json-glib dev-libs/libgudev:= >=dev-libs/libjcat-0.1.4[gpg,pkcs7] >=dev-libs/libxmlb-0.1.13:=[introspection?] python_single_target_python3_8? ( dev-python/pygobject:3[cairo,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[cairo,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[cairo,python_targets_python3_10(-)] ) >=net-libs/libsoup-2.51.92:2.4[introspection?] net-misc/curl archive? ( app-arch/libarchive:= ) cbor? ( dev-libs/libcbor ) dell? ( >=app-crypt/tpm2-tss-2.0 >=sys-libs/libsmbios-2.4.0 ) elogind? ( >=sys-auth/elogind-211 ) flashrom? ( >=sys-apps/flashrom-1.2-r3 ) gnutls? ( net-libs/gnutls ) gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] ) logitech? ( dev-libs/protobuf-c:= ) lzma? ( app-arch/xz-utils ) modemmanager? ( net-misc/modemmanager[qmi] ) policykit? ( >=sys-auth/polkit-0.114 ) sqlite? ( dev-db/sqlite ) systemd? ( >=sys-apps/systemd-211 ) tpm? ( app-crypt/tpm2-tss:= ) uefi? ( sys-apps/fwupd-efi sys-boot/efibootmgr sys-fs/udisks sys-libs/efivar ) x11-libs/pango[introspection]
 DESCRIPTION=Aims to make updating firmware on Linux automatic, safe and reliable
 EAPI=8
 HOMEPAGE=https://fwupd.org
-INHERIT=bash-completion-r1 linux-info meson python-single-r1 vala xdg
+INHERIT=bash-completion-r1 linux-info meson python-single-r1 vala udev xdg
 IUSE=amt archive bash-completion bluetooth cbor dell elogind fastboot flashrom gnutls gtk-doc gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi +sqlite synaptics systemd test thunderbolt tpm uefi python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=LGPL-2.1+
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fwupd/fwupd/archive/1.8.1.tar.gz -> fwupd-1.8.1.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=1ccd9d0eee5d1c9804b4f63bc35d3770
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712	vala	9badd41d5aab740ae5ac301c4416c5f8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=d7f7ebde077fbf0775aea635df86a89b
diff --git a/metadata/md5-cache/sys-apps/kbd-2.5.1 b/metadata/md5-cache/sys-apps/kbd-2.5.1
new file mode 100644
index 000000000000..a02e01f5994a
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/kbd-2.5.1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig test? ( dev-libs/check )
+DEFINED_PHASES=configure install prepare
+DEPEND=app-arch/gzip pam? ( !app-misc/vlock sys-libs/pam )
+DESCRIPTION=Keyboard and console utilities
+EAPI=8
+HOMEPAGE=https://kbd-project.org/
+IUSE=nls pam test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-arch/gzip pam? ( !app-misc/vlock sys-libs/pam )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/linux/utils/kbd/kbd-2.5.1.tar.xz
+_md5_=9739c8da1053d657ce3cf3eeb2470c86
diff --git a/metadata/md5-cache/sys-apps/kbd-9999 b/metadata/md5-cache/sys-apps/kbd-9999
index 707aa83c87bd..a378d4a3d121 100644
--- a/metadata/md5-cache/sys-apps/kbd-9999
+++ b/metadata/md5-cache/sys-apps/kbd-9999
@@ -1,8 +1,8 @@
 BDEPEND=virtual/pkgconfig test? ( dev-libs/check ) 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=configure install prepare test unpack
+DEFINED_PHASES=configure install prepare unpack
 DEPEND=app-arch/gzip pam? ( !app-misc/vlock sys-libs/pam )
 DESCRIPTION=Keyboard and console utilities
-EAPI=7
+EAPI=8
 HOMEPAGE=https://kbd-project.org/
 INHERIT=autotools git-r3
 IUSE=nls pam test
@@ -12,4 +12,4 @@ RDEPEND=app-arch/gzip pam? ( !app-misc/vlock sys-libs/pam )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=38d5398e6603301f9f7a9884fdb94121
+_md5_=9739c8da1053d657ce3cf3eeb2470c86
diff --git a/metadata/md5-cache/sys-apps/kmod-29-r1 b/metadata/md5-cache/sys-apps/kmod-29-r1
new file mode 100644
index 000000000000..a1e1bbe96a4a
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/kmod-29-r1
@@ -0,0 +1,17 @@
+BDEPEND=doc? ( dev-util/gtk-doc dev-util/gtk-doc-am ) lzma? ( virtual/pkgconfig ) python? ( dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] virtual/pkgconfig ) zlib? ( 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 prepare
+DEPEND=!sys-apps/module-init-tools !sys-apps/modutils !<sys-apps/openrc-0.13.8 !<sys-apps/systemd-216-r3 lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) pkcs7? ( >=dev-libs/openssl-1.1.0:= ) zlib? ( >=sys-libs/zlib-1.2.6 ) zstd? ( >=app-arch/zstd-1.5.1-r3:= )
+DESCRIPTION=library and tools for managing linux kernel modules
+EAPI=8
+HOMEPAGE=https://git.kernel.org/?p=utils/kernel/kmod/kmod.git
+INHERIT=autotools libtool bash-completion-r1 python-r1
+IUSE=debug doc +lzma pkcs7 python static-libs +tools +zlib +zstd python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=LGPL-2
+RDEPEND=!sys-apps/module-init-tools !sys-apps/modutils !<sys-apps/openrc-0.13.8 !<sys-apps/systemd-216-r3 lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) pkcs7? ( >=dev-libs/openssl-1.1.0:= ) zlib? ( >=sys-libs/zlib-1.2.6 ) zstd? ( >=app-arch/zstd-1.5.1-r3:= )
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-29.tar.xz
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=8956e5bece2c041ce68de2a3106b786d
diff --git a/metadata/md5-cache/sys-apps/kmod-9999 b/metadata/md5-cache/sys-apps/kmod-9999
index 5c6d7a65f50d..a50841e8f9ae 100644
--- a/metadata/md5-cache/sys-apps/kmod-9999
+++ b/metadata/md5-cache/sys-apps/kmod-9999
@@ -1,16 +1,16 @@
 BDEPEND=doc? ( dev-util/gtk-doc dev-util/gtk-doc-am ) lzma? ( virtual/pkgconfig ) python? ( dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] virtual/pkgconfig ) zlib? ( virtual/pkgconfig ) 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 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=!sys-apps/module-init-tools !sys-apps/modutils !<sys-apps/openrc-0.13.8 !<sys-apps/systemd-216-r3 lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) pkcs7? ( >=dev-libs/openssl-1.1.0:0= ) zlib? ( >=sys-libs/zlib-1.2.6 ) zstd? ( >=app-arch/zstd-1.4.4 )
+DEPEND=!sys-apps/module-init-tools !sys-apps/modutils !<sys-apps/openrc-0.13.8 !<sys-apps/systemd-216-r3 lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) pkcs7? ( >=dev-libs/openssl-1.1.0:= ) zlib? ( >=sys-libs/zlib-1.2.6 ) zstd? ( >=app-arch/zstd-1.5.1-r3:= )
 DESCRIPTION=library and tools for managing linux kernel modules
-EAPI=7
+EAPI=8
 HOMEPAGE=https://git.kernel.org/?p=utils/kernel/kmod/kmod.git
-INHERIT=autotools bash-completion-r1 multilib python-r1 git-r3
-IUSE=debug doc +lzma pkcs7 python static-libs +tools +zlib zstd python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+INHERIT=autotools libtool bash-completion-r1 python-r1 git-r3
+IUSE=debug doc +lzma pkcs7 python static-libs +tools +zlib +zstd python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 LICENSE=LGPL-2
 PROPERTIES=live
-RDEPEND=!sys-apps/module-init-tools !sys-apps/modutils !<sys-apps/openrc-0.13.8 !<sys-apps/systemd-216-r3 lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) pkcs7? ( >=dev-libs/openssl-1.1.0:0= ) zlib? ( >=sys-libs/zlib-1.2.6 ) zstd? ( >=app-arch/zstd-1.4.4 )
+RDEPEND=!sys-apps/module-init-tools !sys-apps/modutils !<sys-apps/openrc-0.13.8 !<sys-apps/systemd-216-r3 lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) pkcs7? ( >=dev-libs/openssl-1.1.0:= ) zlib? ( >=sys-libs/zlib-1.2.6 ) zstd? ( >=app-arch/zstd-1.5.1-r3:= )
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=62a40971d6300a678dd3f7f39592dace
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=8956e5bece2c041ce68de2a3106b786d
diff --git a/metadata/md5-cache/sys-apps/kmscon-8_p20220214-r1 b/metadata/md5-cache/sys-apps/kmscon-8_p20220214-r1
new file mode 100644
index 000000000000..73d7b9fc126b
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/kmscon-8_p20220214-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig doc? ( dev-util/gtk-doc ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare unpack
+DEPEND=>=virtual/udev-172 x11-libs/libxkbcommon >=dev-libs/libtsm-4.0.0:= media-libs/mesa[X(+)] drm? ( x11-libs/libdrm >=media-libs/mesa-8.0.3[egl(+),gbm(+)] ) gles2? ( >=media-libs/mesa-8.0.3[gles2] ) systemd? ( sys-apps/systemd ) pango? ( x11-libs/pango dev-libs/glib:2 ) pixman? ( x11-libs/pixman ) x11-base/xorg-proto
+DESCRIPTION=KMS/DRM based virtual Console Emulator
+EAPI=7
+HOMEPAGE=https://github.com/Aetf/kmscon
+INHERIT=autotools flag-o-matic systemd toolchain-funcs vcs-snapshot
+IUSE=debug doc +drm +fbdev +gles2 +optimizations +pango pixman static-libs systemd +unicode
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT LGPL-2.1 BSD-2
+RDEPEND=>=virtual/udev-172 x11-libs/libxkbcommon >=dev-libs/libtsm-4.0.0:= media-libs/mesa[X(+)] drm? ( x11-libs/libdrm >=media-libs/mesa-8.0.3[egl(+),gbm(+)] ) gles2? ( >=media-libs/mesa-8.0.3[gles2] ) systemd? ( sys-apps/systemd ) pango? ( x11-libs/pango dev-libs/glib:2 ) pixman? ( x11-libs/pixman ) x11-misc/xkeyboard-config
+REQUIRED_USE=gles2? ( drm )
+SLOT=0
+SRC_URI=https://github.com/Aetf/kmscon/archive/5eed56cfc873df4d7606bc1c470e1d2bb4d42f1c.tar.gz -> kmscon-8_p20220214.tar.gz
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vcs-snapshot	19dc666868420457132a7514d4621476	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=16841cbd5d7e254cebc9da3b5b1d9269
diff --git a/metadata/md5-cache/sys-apps/memtest86+-6.00_beta2 b/metadata/md5-cache/sys-apps/memtest86+-6.00_beta2
index 1133904afeee..28cf931174e4 100644
--- a/metadata/md5-cache/sys-apps/memtest86+-6.00_beta2
+++ b/metadata/md5-cache/sys-apps/memtest86+-6.00_beta2
@@ -5,8 +5,9 @@ EAPI=8
 HOMEPAGE=https://www.memtest.org/
 INHERIT=mount-boot
 IUSE=bios32 bios64 +boot efi32 efi64 iso32 iso64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/memtest86plus/memtest86plus/archive/refs/tags/v6.00-beta2.tar.gz -> memtest86+-6.00_beta2.tar.gz
 _eclasses_=mount-boot	02a45c5e022c08dbc05178522b2772f2
-_md5_=fee6e5eee063e5420c7d2842345e3f22
+_md5_=e37d98e7e885f734ce326e6698b63dfb
diff --git a/metadata/md5-cache/sys-apps/s6-2.11.0.1 b/metadata/md5-cache/sys-apps/s6-2.11.0.1
deleted file mode 100644
index 820e39ba606d..000000000000
--- a/metadata/md5-cache/sys-apps/s6-2.11.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=execline? ( >=dev-lang/execline-2.8.2.0:=[static-libs?] ) >=dev-libs/skalibs-2.11.1.0:=[static-libs?]
-DESCRIPTION=skarnet.org's small and secure supervision software suite
-EAPI=8
-HOMEPAGE=https://www.skarnet.org/software/s6/
-INHERIT=toolchain-funcs
-IUSE=+execline static static-libs
-KEYWORDS=amd64 ~arm x86
-LICENSE=ISC
-RDEPEND=execline? ( >=dev-lang/execline-2.8.2.0:=[static-libs?] ) >=dev-libs/skalibs-2.11.1.0:=[static-libs?]
-REQUIRED_USE=static? ( static-libs )
-SLOT=0/2.11
-SRC_URI=https://www.skarnet.org/software/s6/s6-2.11.0.1.tar.gz
-_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=c7fbc7d4a9eeb2b70920b25c089aaaeb
diff --git a/metadata/md5-cache/sys-apps/s6-linux-init-1.0.7.1 b/metadata/md5-cache/sys-apps/s6-linux-init-1.0.7.1
deleted file mode 100644
index 7e835f6ec754..000000000000
--- a/metadata/md5-cache/sys-apps/s6-linux-init-1.0.7.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=dev-lang/execline-2.8.2.0:=[static-libs?] >=dev-libs/skalibs-2.11.1.0:=[static-libs?] >=sys-apps/s6-2.11.0.1:=[execline,static-libs?] sysv-utils? ( !sys-apps/systemd[sysv-utils] !sys-apps/sysvinit )
-DESCRIPTION=Generates an init binary for s6-based init systems
-EAPI=8
-HOMEPAGE=https://www.skarnet.org/software/s6-linux-init/
-INHERIT=toolchain-funcs
-IUSE=static static-libs +sysv-utils
-KEYWORDS=amd64 ~arm x86
-LICENSE=ISC
-RDEPEND=>=dev-lang/execline-2.8.2.0:=[static-libs?] >=dev-libs/skalibs-2.11.1.0:=[static-libs?] >=sys-apps/s6-2.11.0.1:=[execline,static-libs?] sysv-utils? ( !sys-apps/systemd[sysv-utils] !sys-apps/sysvinit )
-REQUIRED_USE=static? ( static-libs )
-SLOT=0/1.0
-SRC_URI=https://www.skarnet.org/software/s6-linux-init/s6-linux-init-1.0.7.1.tar.gz
-_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=3e13ddb469ec942d09642a002c4c4917
diff --git a/metadata/md5-cache/sys-apps/s6-portable-utils-2.2.3.4 b/metadata/md5-cache/sys-apps/s6-portable-utils-2.2.3.4
deleted file mode 100644
index b4a3fd7184c6..000000000000
--- a/metadata/md5-cache/sys-apps/s6-portable-utils-2.2.3.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=!static? ( >=dev-libs/skalibs-2.11.1.0:= ) static? ( >=dev-libs/skalibs-2.11.1.0[static-libs] )
-DESCRIPTION=Set of tiny portable unix utilities
-EAPI=8
-HOMEPAGE=https://www.skarnet.org/software/s6-portable-utils/
-INHERIT=toolchain-funcs
-IUSE=static
-KEYWORDS=amd64 ~arm x86
-LICENSE=ISC
-RDEPEND=!static? ( >=dev-libs/skalibs-2.11.1.0:= )
-SLOT=0
-SRC_URI=https://www.skarnet.org/software/s6-portable-utils/s6-portable-utils-2.2.3.4.tar.gz
-_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=82b068a8d4e9789eb0922ea6647dab69
diff --git a/metadata/md5-cache/sys-apps/systemd-250.6 b/metadata/md5-cache/sys-apps/systemd-250.6
index 1d8c6c477127..9a8bf28c4c8d 100644
--- a/metadata/md5-cache/sys-apps/systemd-250.6
+++ b/metadata/md5-cache/sys-apps/systemd-250.6
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd-stable/archive/v250.6/systemd-stable-250.6.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=f4e7cf16d6ba2401b6d180f53fcc4c42
+_md5_=c8e32e16d26cdcf3e7601c35a243e258
diff --git a/metadata/md5-cache/sys-apps/systemd-250.7 b/metadata/md5-cache/sys-apps/systemd-250.7
index 5e69c00aa845..57bdea52ed9a 100644
--- a/metadata/md5-cache/sys-apps/systemd-250.7
+++ b/metadata/md5-cache/sys-apps/systemd-250.7
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd-stable/archive/v250.7/systemd-stable-250.7.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=1d7a5eca05ab5e45ca26c568d8ba02cb
+_md5_=1d6bf7dea0ab1fab638ef9c85e641114
diff --git a/metadata/md5-cache/sys-apps/systemd-251.2 b/metadata/md5-cache/sys-apps/systemd-251.2
index f4e85f9b24bf..dce54a3e2cf0 100644
--- a/metadata/md5-cache/sys-apps/systemd-251.2
+++ b/metadata/md5-cache/sys-apps/systemd-251.2
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd-stable/archive/v251.2/systemd-stable-251.2.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=72185b91811dd69d52a978f6bb024129
+_md5_=cc0c15a7f24fab330cfa6588d473700b
diff --git a/metadata/md5-cache/sys-apps/systemd-9999 b/metadata/md5-cache/sys-apps/systemd-9999
index 81a6d070162f..900fe606ed7d 100644
--- a/metadata/md5-cache/sys-apps/systemd-9999
+++ b/metadata/md5-cache/sys-apps/systemd-9999
@@ -14,4 +14,4 @@ REQUIRED_USE=dns-over-tls? ( || ( gnutls openssl ) ) homed? ( cryptsetup pam ope
 RESTRICT=!test? ( test )
 SLOT=0/2
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=4b009baa25e1d40035c0f527181a4be7
+_md5_=acb9d3d6453096a2ba487a4582020b35
diff --git a/metadata/md5-cache/sys-apps/systemd-utils-250.6 b/metadata/md5-cache/sys-apps/systemd-utils-250.6
index 79814059e4b1..f5f9b79fbe53 100644
--- a/metadata/md5-cache/sys-apps/systemd-utils-250.6
+++ b/metadata/md5-cache/sys-apps/systemd-utils-250.6
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd-stable/archive/refs/tags/v250.6.tar.gz -> systemd-stable-250.6.tar.gz elibc_musl? ( https://dev.gentoo.org/~floppym/dist/systemd-musl-patches-250.4.tar.gz )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712	usr-ldscript	5c738dce357b54d5a90e30094d2f983c
-_md5_=46219203b764807443ba8c1b84cc1e51
+_md5_=54a21c789d7e90347a77609c78af873f
diff --git a/metadata/md5-cache/sys-apps/systemd-utils-250.7 b/metadata/md5-cache/sys-apps/systemd-utils-250.7
index 154386be579e..07b076ee8c76 100644
--- a/metadata/md5-cache/sys-apps/systemd-utils-250.7
+++ b/metadata/md5-cache/sys-apps/systemd-utils-250.7
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd-stable/archive/refs/tags/v250.7.tar.gz -> systemd-stable-250.7.tar.gz elibc_musl? ( https://dev.gentoo.org/~floppym/dist/systemd-musl-patches-250.4.tar.gz )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712	usr-ldscript	5c738dce357b54d5a90e30094d2f983c
-_md5_=329d00ed241ce68e9767d84325f7187c
+_md5_=52a3e5b9935112b6b65e933364d04ef0
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 1080c80c210f..7b49da0fe087 100644
Binary files a/metadata/md5-cache/sys-auth/Manifest.gz and b/metadata/md5-cache/sys-auth/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-python/patatt-0.4.9 b/metadata/md5-cache/sys-auth/ssh-import-id-5.11
similarity index 62%
rename from metadata/md5-cache/dev-python/patatt-0.4.9
rename to metadata/md5-cache/sys-auth/ssh-import-id-5.11
index 5aa9457c37da..a4b758a2009d 100644
--- a/metadata/md5-cache/dev-python/patatt-0.4.9
+++ b/metadata/md5-cache/sys-auth/ssh-import-id-5.11
@@ -1,15 +1,16 @@
 BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A simple library to add cryptographic attestation to patches sent via email
+DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+DESCRIPTION=Utility to securely retrieve an SSH public key and install it locally
 EAPI=8
-HOMEPAGE=https://pypi.org/project/patatt/
+HOMEPAGE=https://launchpad.net/ssh-import-id
 INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-python/pynacl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
-SRC_URI=mirror://pypi/p/patatt/patatt-0.4.9.tar.gz
+SRC_URI=https://launchpad.net/ssh-import-id/trunk/5.11/+download/ssh-import-id-5.11.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=61cec91f5640087799b3321f83df04ae
+_md5_=ee3e9272d2ff698be1f95dc4a2069730
diff --git a/metadata/md5-cache/sys-auth/ykpers-1.20.0-r1 b/metadata/md5-cache/sys-auth/ykpers-1.20.0-r1
new file mode 100644
index 000000000000..4708bf5682c7
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/ykpers-1.20.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=app-text/asciidoc virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=dev-libs/json-c:= >=sys-auth/libyubikey-1.6 virtual/libusb:1
+DESCRIPTION=Library and tool for personalization of Yubico's YubiKey
+EAPI=8
+HOMEPAGE=https://github.com/Yubico/yubikey-personalization
+INHERIT=autotools udev
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=BSD-2
+RDEPEND=dev-libs/json-c:= >=sys-auth/libyubikey-1.6 virtual/libusb:1
+SLOT=0
+SRC_URI=https://github.com/Yubico/yubikey-personalization/archive/refs/tags/v1.20.0.tar.gz -> ykpers-1.20.0.tar.gz
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712
+_md5_=4c081dcea9246f682293d6c1165431be
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 07a724b449ab..3236c07cf9ea 100644
Binary files a/metadata/md5-cache/sys-cluster/Manifest.gz and b/metadata/md5-cache/sys-cluster/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-cluster/glusterfs-10.2 b/metadata/md5-cache/sys-cluster/glusterfs-10.2
new file mode 100644
index 000000000000..90a4c31f058c
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/glusterfs-10.2
@@ -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 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=acct-group/gluster acct-user/gluster dev-libs/libaio dev-libs/openssl:=[-bindist(-)] net-libs/rpcsvc-proto dev-libs/userspace-rcu:= sys-apps/util-linux sys-libs/liburing:= sys-libs/readline:= !elibc_glibc? ( sys-libs/argp-standalone ) emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) tcmalloc? ( dev-util/google-perftools ) xml? ( dev-libs/libxml2 ) sys-devel/bison sys-devel/flex virtual/acl test? ( >=dev-util/cmocka-1.0.1 app-benchmarks/dbench dev-vcs/git net-fs/nfs-utils virtual/perl-Test-Harness dev-libs/yajl sys-fs/xfsprogs sys-apps/attr )
+DESCRIPTION=GlusterFS is a powerful network/cluster filesystem
+EAPI=7
+HOMEPAGE=https://www.gluster.org/ https://github.com/gluster/glusterfs/
+INHERIT=autotools elisp-common python-single-r1 tmpfiles systemd
+IUSE=debug emacs +fuse +georeplication ipv6 +libtirpc rsyslog static-libs tcmalloc test +xml python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+LICENSE=|| ( GPL-2 LGPL-3+ )
+RDEPEND=acct-group/gluster acct-user/gluster dev-libs/libaio dev-libs/openssl:=[-bindist(-)] net-libs/rpcsvc-proto dev-libs/userspace-rcu:= sys-apps/util-linux sys-libs/liburing:= sys-libs/readline:= !elibc_glibc? ( sys-libs/argp-standalone ) emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) tcmalloc? ( dev-util/google-perftools ) xml? ( dev-libs/libxml2 ) virtual/tmpfiles
+REQUIRED_USE=georeplication? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) xml ) ipv6? ( libtirpc )
+RESTRICT=test
+SLOT=0/10
+SRC_URI=https://download.gluster.org/pub/gluster/glusterfs/10/10.2/glusterfs-10.2.tar.gz
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	e7aaa047873789f549ea3df2f04b2145	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=68dc3da067e53fc3b1c568b23704d00c
diff --git a/metadata/md5-cache/sys-cluster/nomad-1.2.6 b/metadata/md5-cache/sys-cluster/nomad-1.2.6
index 44028c456f82..b27d649b0926 100644
--- a/metadata/md5-cache/sys-cluster/nomad-1.2.6
+++ b/metadata/md5-cache/sys-cluster/nomad-1.2.6
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://nomadproject.io
 INHERIT=go-module systemd
 IUSE=ui
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm64
 LICENSE=MPL-2.0
 RESTRICT=test strip
 SLOT=0
 SRC_URI=https://github.com/hashicorp/nomad/archive/v1.2.6.tar.gz -> nomad-1.2.6.tar.gz https://dev.gentoo.org/~williamh/dist/nomad-1.2.6-vendor.tar.xz
 _eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=5affa2009d78e19bc376b95b30a1bf03
+_md5_=696be5ba5405bbd6d01753e1e609f8b4
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 7b8d7d126107..7dd4bfb56503 100644
Binary files a/metadata/md5-cache/sys-devel/Manifest.gz and b/metadata/md5-cache/sys-devel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-devel/gdb-12.1-r1 b/metadata/md5-cache/sys-devel/gdb-12.1-r1
new file mode 100644
index 000000000000..2f4218d2c72f
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gdb-12.1-r1
@@ -0,0 +1,17 @@
+BDEPEND=app-arch/xz-utils sys-apps/texinfo virtual/yacc nls? ( sys-devel/gettext ) source-highlight? ( virtual/pkgconfig ) test? ( dev-util/dejagnu )
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=dev-libs/mpfr:0= dev-libs/gmp:= >=sys-libs/ncurses-5.2-r2:0= >=sys-libs/readline-7:0= sys-libs/zlib elibc_glibc? ( net-libs/libnsl:= ) lzma? ( app-arch/xz-utils ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) guile? ( >=dev-scheme/guile-2.0 ) xml? ( dev-libs/expat ) source-highlight? ( dev-util/source-highlight ) xxhash? ( dev-libs/xxhash )
+DESCRIPTION=GNU debugger
+EAPI=7
+HOMEPAGE=https://sourceware.org/gdb/
+INHERIT=flag-o-matic python-single-r1 strip-linguas toolchain-funcs
+IUSE=cet guile lzma multitarget nls +python +server source-highlight test vanilla xml xxhash python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3+ LGPL-2.1+
+RDEPEND=dev-libs/mpfr:0= dev-libs/gmp:= >=sys-libs/ncurses-5.2-r2:0= >=sys-libs/readline-7:0= sys-libs/zlib elibc_glibc? ( net-libs/libnsl:= ) lzma? ( app-arch/xz-utils ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) guile? ( >=dev-scheme/guile-2.0 ) xml? ( dev-libs/expat ) source-highlight? ( dev-util/source-highlight ) xxhash? ( dev-libs/xxhash )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
+RESTRICT=ia64? ( test ) !test? ( test ) test
+SLOT=0
+SRC_URI=mirror://gnu/gdb/gdb-12.1.tar.xz ftp://sourceware.org/pub/gdb/releases/gdb-12.1.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=3440af8070afee8aa37e7029da1d7e14
diff --git a/metadata/md5-cache/sys-devel/gdb-9999 b/metadata/md5-cache/sys-devel/gdb-9999
index b1d6f5370bb1..2df7c13a7ac2 100644
--- a/metadata/md5-cache/sys-devel/gdb-9999
+++ b/metadata/md5-cache/sys-devel/gdb-9999
@@ -13,4 +13,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_
 RESTRICT=ia64? ( test ) !test? ( test ) test
 SLOT=0
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=3ec5c3a5dbf6e097ed71ff828331e968
+_md5_=8dabfcf157f7af1bd15bc95d5695b515
diff --git a/metadata/md5-cache/sys-devel/libtool-2.4.7 b/metadata/md5-cache/sys-devel/libtool-2.4.7
index 71629f037e16..2ba1c43f8ead 100644
--- a/metadata/md5-cache/sys-devel/libtool-2.4.7
+++ b/metadata/md5-cache/sys-devel/libtool-2.4.7
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libtool/
 INHERIT=autotools prefix
 IUSE=vanilla
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=GPL-2
 RDEPEND=sys-devel/gnuconfig >=sys-devel/autoconf-2.69:* >=sys-devel/automake-1.13:* >=dev-libs/libltdl-2.4.7
 SLOT=2
 SRC_URI=mirror://gnu/libtool/libtool-2.4.7.tar.xz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=0d1bb9789bc956ab328ff51191babcfd
+_md5_=3230906c648c1136c3a435bb2d8949f7
diff --git a/metadata/md5-cache/sys-devel/sparse-0.6.4-r1 b/metadata/md5-cache/sys-devel/sparse-0.6.4-r2
similarity index 81%
rename from metadata/md5-cache/sys-devel/sparse-0.6.4-r1
rename to metadata/md5-cache/sys-devel/sparse-0.6.4-r2
index adb5248082b0..ca0ae6e13094 100644
--- a/metadata/md5-cache/sys-devel/sparse-0.6.4-r1
+++ b/metadata/md5-cache/sys-devel/sparse-0.6.4-r2
@@ -1,6 +1,6 @@
 BDEPEND=gtk? ( virtual/pkgconfig ) xml? ( virtual/pkgconfig )
 DEFINED_PHASES=compile install setup test
-DEPEND=gtk? ( x11-libs/gtk+:3 ) llvm? ( <sys-devel/llvm-13:= ) sqlite? ( dev-db/sqlite:= ) xml? ( dev-libs/libxml2 ) !!sys-devel/llvm:0
+DEPEND=gtk? ( x11-libs/gtk+:3 ) llvm? ( <sys-devel/llvm-15:= ) sqlite? ( dev-db/sqlite:= ) xml? ( dev-libs/libxml2 ) !!sys-devel/llvm:0
 DESCRIPTION=C semantic parser
 EAPI=7
 HOMEPAGE=https://sparse.wiki.kernel.org/index.php/Main_Page
@@ -8,9 +8,9 @@ INHERIT=llvm toolchain-funcs
 IUSE=gtk llvm sqlite test xml
 KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=MIT
-RDEPEND=gtk? ( x11-libs/gtk+:3 ) llvm? ( <sys-devel/llvm-13:= ) sqlite? ( dev-db/sqlite:= ) xml? ( dev-libs/libxml2 )
+RDEPEND=gtk? ( x11-libs/gtk+:3 ) llvm? ( <sys-devel/llvm-15:= ) sqlite? ( dev-db/sqlite:= ) xml? ( dev-libs/libxml2 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/devel/sparse/dist/sparse-0.6.4.tar.xz
 _eclasses_=llvm	6f88d422e49b917bf254b2594f3d903c	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=0b587f579f8b3db89ea6ac258768ce8f
+_md5_=5035213234d8561694cc21aab3873eb0
diff --git a/metadata/md5-cache/sys-devel/sparse-9999 b/metadata/md5-cache/sys-devel/sparse-9999
index 4e2ec7fe5f8a..a6f9f696c5d7 100644
--- a/metadata/md5-cache/sys-devel/sparse-9999
+++ b/metadata/md5-cache/sys-devel/sparse-9999
@@ -1,6 +1,6 @@
 BDEPEND=gtk? ( virtual/pkgconfig ) xml? ( virtual/pkgconfig ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install setup test unpack
-DEPEND=gtk? ( x11-libs/gtk+:3 ) llvm? ( <sys-devel/llvm-13:= ) sqlite? ( dev-db/sqlite:= ) xml? ( dev-libs/libxml2 ) !!sys-devel/llvm:0
+DEPEND=gtk? ( x11-libs/gtk+:3 ) llvm? ( <sys-devel/llvm-15:= ) sqlite? ( dev-db/sqlite:= ) xml? ( dev-libs/libxml2 ) !!sys-devel/llvm:0
 DESCRIPTION=C semantic parser
 EAPI=7
 HOMEPAGE=https://sparse.wiki.kernel.org/index.php/Main_Page
@@ -8,8 +8,8 @@ INHERIT=llvm toolchain-funcs git-r3
 IUSE=gtk llvm sqlite test xml
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=gtk? ( x11-libs/gtk+:3 ) llvm? ( <sys-devel/llvm-13:= ) sqlite? ( dev-db/sqlite:= ) xml? ( dev-libs/libxml2 )
+RDEPEND=gtk? ( x11-libs/gtk+:3 ) llvm? ( <sys-devel/llvm-15:= ) sqlite? ( dev-db/sqlite:= ) xml? ( dev-libs/libxml2 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	llvm	6f88d422e49b917bf254b2594f3d903c	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=0b587f579f8b3db89ea6ac258768ce8f
+_md5_=5035213234d8561694cc21aab3873eb0
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 1f909848554a..c798a440eecd 100644
Binary files a/metadata/md5-cache/sys-fs/Manifest.gz and b/metadata/md5-cache/sys-fs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-fs/bcache-tools-1.1-r1 b/metadata/md5-cache/sys-fs/bcache-tools-1.1-r1
index 7fd9cff200a5..780e207f5301 100644
--- a/metadata/md5-cache/sys-fs/bcache-tools-1.1-r1
+++ b/metadata/md5-cache/sys-fs/bcache-tools-1.1-r1
@@ -1,5 +1,5 @@
 BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install postinst prepare
+DEFINED_PHASES=install postinst postrm prepare
 DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) sys-apps/util-linux virtual/udev
 DESCRIPTION=Tools for bcache
 EAPI=8
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 SLOT=0
 SRC_URI=https://git.kernel.org/pub/scm/linux/kernel/git/colyli/bcache-tools.git/snapshot/bcache-tools-1.1.tar.gz
 _eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712
-_md5_=cb5ec5de0fd317f555d4feab1d6f6b63
+_md5_=1ad5d79b643028e01ea95813dad69612
diff --git a/metadata/md5-cache/sys-fs/bcache-tools-9999 b/metadata/md5-cache/sys-fs/bcache-tools-9999
index 1984fc7906ca..15ab992b11b6 100644
--- a/metadata/md5-cache/sys-fs/bcache-tools-9999
+++ b/metadata/md5-cache/sys-fs/bcache-tools-9999
@@ -1,5 +1,5 @@
 BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=install postinst prepare unpack
+DEFINED_PHASES=install postinst postrm prepare unpack
 DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) sys-apps/util-linux virtual/udev
 DESCRIPTION=Tools for bcache
 EAPI=8
@@ -12,4 +12,4 @@ RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 _eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712
-_md5_=980e302575adda8840356428db1da50d
+_md5_=4a465c150b15c1b96bdbb1f795c840d1
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-5.10.1-r1 b/metadata/md5-cache/sys-fs/btrfs-progs-5.10.1-r1
index 74ef43dd287d..f50529e225e7 100644
--- a/metadata/md5-cache/sys-fs/btrfs-progs-5.10.1-r1
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-5.10.1-r1
@@ -1,5 +1,5 @@
 BDEPEND=doc? ( || ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor ) app-text/docbook-xml-dtd:4.5 app-text/xmlto )
-DEFINED_PHASES=compile configure install prepare setup
+DEFINED_PHASES=compile configure install postrm prepare setup
 DEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) ) zstd? ( app-arch/zstd:0= ) convert? ( sys-apps/acl ) python? ( python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) ) static? ( dev-libs/lzo:2[static-libs(+)] sys-apps/util-linux:0[static-libs(+)] sys-libs/zlib:0[static-libs(+)] convert? ( sys-fs/e2fsprogs[static-libs(+)] reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] ) ) zstd? ( app-arch/zstd:0[static-libs(+)] ) )
 DESCRIPTION=Btrfs filesystem utilities
 EAPI=7
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0/0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.10.1.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=002e017baad17eac1edc9e22c9c3d06d
+_md5_=7db87fe4ec6dac9d448d744692af94a5
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-5.15.1 b/metadata/md5-cache/sys-fs/btrfs-progs-5.15.1
index 9bd6236602e1..e889fba5eb9e 100644
--- a/metadata/md5-cache/sys-fs/btrfs-progs-5.15.1
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-5.15.1
@@ -1,5 +1,5 @@
 BDEPEND=doc? ( || ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor ) app-text/docbook-xml-dtd:4.5 app-text/xmlto )
-DEFINED_PHASES=compile configure install prepare setup
+DEFINED_PHASES=compile configure install postrm prepare setup
 DEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) zstd? ( app-arch/zstd:0= ) >=sys-kernel/linux-headers-5.10 convert? ( sys-apps/acl ) python? ( python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] ) ) static? ( dev-libs/lzo:2[static-libs(+)] sys-apps/util-linux:0[static-libs(+)] sys-libs/zlib:0[static-libs(+)] convert? ( sys-fs/e2fsprogs[static-libs(+)] reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] ) ) zstd? ( app-arch/zstd:0[static-libs(+)] ) )
 DESCRIPTION=Btrfs filesystem utilities
 EAPI=7
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0/0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.15.1.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=771ea6bb67451b1abb73f08d3f9dbf70
+_md5_=42d36905fed4701c93778be7017cd8a7
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-5.16 b/metadata/md5-cache/sys-fs/btrfs-progs-5.16
index 6e21b3375737..1d9d23ea3497 100644
--- a/metadata/md5-cache/sys-fs/btrfs-progs-5.16
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-5.16
@@ -1,5 +1,5 @@
 BDEPEND=doc? ( || ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor ) app-text/docbook-xml-dtd:4.5 app-text/xmlto )
-DEFINED_PHASES=compile configure install prepare setup
+DEFINED_PHASES=compile configure install postrm prepare setup
 DEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) zstd? ( app-arch/zstd:0= ) >=sys-kernel/linux-headers-5.10 convert? ( sys-apps/acl ) python? ( python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] ) ) static? ( dev-libs/lzo:2[static-libs(+)] sys-apps/util-linux:0[static-libs(+)] sys-libs/zlib:0[static-libs(+)] convert? ( sys-fs/e2fsprogs[static-libs(+)] reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] ) ) zstd? ( app-arch/zstd:0[static-libs(+)] ) )
 DESCRIPTION=Btrfs filesystem utilities
 EAPI=7
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0/0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.16.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=69a72955adf4336bbfc03a4415806701
+_md5_=6ed40480ab09be6812ca372182c67163
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-5.16.2 b/metadata/md5-cache/sys-fs/btrfs-progs-5.16.2
index 1dafb8dab999..2c7fc1b3a602 100644
--- a/metadata/md5-cache/sys-fs/btrfs-progs-5.16.2
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-5.16.2
@@ -1,5 +1,5 @@
 BDEPEND=doc? ( || ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor ) app-text/docbook-xml-dtd:4.5 app-text/xmlto )
-DEFINED_PHASES=compile configure install prepare setup
+DEFINED_PHASES=compile configure install postrm prepare setup
 DEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) zstd? ( app-arch/zstd:0= ) >=sys-kernel/linux-headers-5.10 convert? ( sys-apps/acl ) python? ( python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] ) ) static? ( dev-libs/lzo:2[static-libs(+)] sys-apps/util-linux:0[static-libs(+)] sys-libs/zlib:0[static-libs(+)] convert? ( sys-fs/e2fsprogs[static-libs(+)] reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] ) ) zstd? ( app-arch/zstd:0[static-libs(+)] ) )
 DESCRIPTION=Btrfs filesystem utilities
 EAPI=7
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0/0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.16.2.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=1a0470d361a790836a96f1c551102f47
+_md5_=bd59ff9694a2e873b5a1d6658df34ccf
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-5.17 b/metadata/md5-cache/sys-fs/btrfs-progs-5.17
index 62abd04b5ec8..6ee00eacd623 100644
--- a/metadata/md5-cache/sys-fs/btrfs-progs-5.17
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-5.17
@@ -1,5 +1,5 @@
 BDEPEND=doc? ( app-text/docbook-xml-dtd:4.5 app-text/xmlto dev-python/sphinx ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup
+DEFINED_PHASES=compile configure install postinst postrm prepare setup
 DEPEND=dev-libs/lzo:2= sys-apps/util-linux:=[static-libs(+)?] sys-libs/zlib:= convert? ( sys-fs/e2fsprogs:= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) zstd? ( app-arch/zstd:= ) >=sys-kernel/linux-headers-5.10 convert? ( sys-apps/acl ) python? ( python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] ) ) static? ( dev-libs/lzo:2[static-libs(+)] sys-apps/util-linux:0[static-libs(+)] sys-libs/zlib:0[static-libs(+)] convert? ( sys-fs/e2fsprogs[static-libs(+)] reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] ) ) zstd? ( app-arch/zstd[static-libs(+)] ) )
 DESCRIPTION=Btrfs filesystem utilities
 EAPI=7
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0/0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.17.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712
-_md5_=5713fc527445018c2807f1198f59953b
+_md5_=9de06ff8d0411d2417b40de497e803f7
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-5.18 b/metadata/md5-cache/sys-fs/btrfs-progs-5.18
index e014fde8da93..21dbebc9dbb1 100644
--- a/metadata/md5-cache/sys-fs/btrfs-progs-5.18
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-5.18
@@ -1,5 +1,5 @@
 BDEPEND=virtual/pkgconfig man? ( dev-python/sphinx ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup
+DEFINED_PHASES=compile configure install postinst postrm prepare setup
 DEPEND=dev-libs/lzo:2= sys-apps/util-linux:=[static-libs(+)?] sys-libs/zlib:= convert? ( sys-fs/e2fsprogs:= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) udev? ( virtual/libudev:= ) zstd? ( app-arch/zstd:= ) >=sys-kernel/linux-headers-5.10 convert? ( sys-apps/acl ) python? ( python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] ) ) static? ( dev-libs/lzo:2[static-libs(+)] sys-apps/util-linux:0[static-libs(+)] sys-libs/zlib:0[static-libs(+)] convert? ( sys-fs/e2fsprogs[static-libs(+)] reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] ) ) zstd? ( app-arch/zstd[static-libs(+)] ) )
 DESCRIPTION=Btrfs filesystem utilities
 EAPI=7
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0/0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.18.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712
-_md5_=c049f69bd66a78de5dbadf9ab09ded2d
+_md5_=42b757da52c51c1ea2b3295300369112
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-5.18.1-r1 b/metadata/md5-cache/sys-fs/btrfs-progs-5.18.1-r1
index 66fd191ac03d..e0246ae3a9da 100644
--- a/metadata/md5-cache/sys-fs/btrfs-progs-5.18.1-r1
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-5.18.1-r1
@@ -1,5 +1,5 @@
 BDEPEND=virtual/pkgconfig man? ( dev-python/sphinx ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup
+DEFINED_PHASES=compile configure install postinst postrm prepare setup
 DEPEND=dev-libs/lzo:2= sys-apps/util-linux:=[static-libs(+)?] sys-libs/zlib:= convert? ( sys-fs/e2fsprogs:= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) udev? ( virtual/libudev:= ) zstd? ( app-arch/zstd:= ) >=sys-kernel/linux-headers-5.10 convert? ( sys-apps/acl ) python? ( python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] ) ) static? ( dev-libs/lzo:2[static-libs(+)] sys-apps/util-linux:0[static-libs(+)] sys-libs/zlib:0[static-libs(+)] convert? ( sys-fs/e2fsprogs[static-libs(+)] reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] ) ) zstd? ( app-arch/zstd[static-libs(+)] ) )
 DESCRIPTION=Btrfs filesystem utilities
 EAPI=7
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0/0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.18.1.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712
-_md5_=bb2761049a93c48ff0074c9cff123f7a
+_md5_=4ecc75316c992bc83c70e5853edf475a
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-9999 b/metadata/md5-cache/sys-fs/btrfs-progs-9999
index c0473ef8bd1e..832cf64c1362 100644
--- a/metadata/md5-cache/sys-fs/btrfs-progs-9999
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-9999
@@ -1,5 +1,5 @@
 BDEPEND=virtual/pkgconfig man? ( dev-python/sphinx ) sys-devel/gnuconfig virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install postinst prepare setup unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DEPEND=dev-libs/lzo:2= sys-apps/util-linux:=[static-libs(+)?] sys-libs/zlib:= convert? ( sys-fs/e2fsprogs:= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) udev? ( virtual/libudev:= ) zstd? ( app-arch/zstd:= ) >=sys-kernel/linux-headers-5.10 convert? ( sys-apps/acl ) python? ( python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] ) ) static? ( dev-libs/lzo:2[static-libs(+)] sys-apps/util-linux:0[static-libs(+)] sys-libs/zlib:0[static-libs(+)] convert? ( sys-fs/e2fsprogs[static-libs(+)] reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] ) ) zstd? ( app-arch/zstd[static-libs(+)] ) )
 DESCRIPTION=Btrfs filesystem utilities
 EAPI=7
@@ -13,4 +13,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_
 RESTRICT=test
 SLOT=0/0
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712
-_md5_=bb2761049a93c48ff0074c9cff123f7a
+_md5_=4ecc75316c992bc83c70e5853edf475a
diff --git a/metadata/md5-cache/sys-fs/eudev-3.2.12_pre2 b/metadata/md5-cache/sys-fs/eudev-3.2.12_pre3
similarity index 55%
rename from metadata/md5-cache/sys-fs/eudev-3.2.12_pre2
rename to metadata/md5-cache/sys-fs/eudev-3.2.12_pre3
index 8c6b21607584..21d82cd72184 100644
--- a/metadata/md5-cache/sys-fs/eudev-3.2.12_pre2
+++ b/metadata/md5-cache/sys-fs/eudev-3.2.12_pre3
@@ -1,16 +1,16 @@
-BDEPEND=dev-util/gperf virtual/os-headers virtual/pkgconfig test? ( app-text/tree 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 virtual/pkgconfig
+BDEPEND=dev-util/gperf virtual/os-headers virtual/pkgconfig test? ( app-text/tree dev-lang/perl ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
 DEPEND=>=sys-apps/util-linux-2.20 >=sys-kernel/linux-headers-2.6.39 virtual/libcrypt:= kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !sys-apps/gentoo-systemd-integration !sys-apps/systemd
 DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace devfs)
 EAPI=8
 HOMEPAGE=https://github.com/eudev-project/eudev
-INHERIT=autotools linux-info multilib-minimal toolchain-funcs udev
+INHERIT=linux-info multilib-minimal toolchain-funcs udev
 IUSE=+kmod rule-generator selinux static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=LGPL-2.1 MIT GPL-2
 PDEPEND=>=sys-fs/udev-init-scripts-26
 RDEPEND=>=sys-apps/util-linux-2.20 >=sys-kernel/linux-headers-2.6.39 virtual/libcrypt:= kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !sys-apps/gentoo-systemd-integration !sys-apps/systemd acct-group/input acct-group/kvm acct-group/render !sys-apps/systemd-utils[udev] !sys-fs/udev !sys-apps/systemd !sys-apps/hwids[udev]
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/eudev-project/eudev/archive/refs/tags/v3.2.12-pre2.tar.gz -> eudev-3.2.12_pre2.tar.gz
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712
-_md5_=711364cf83b91b6ab38ab074f012242b
+SRC_URI=https://github.com/eudev-project/eudev/releases/download/v3.2.12-pre3/eudev-3.2.12-pre3.tar.gz
+_eclasses_=linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712
+_md5_=c00ec29d38863fbec7fdc89de0e6c454
diff --git a/metadata/md5-cache/sys-fs/eudev-9999 b/metadata/md5-cache/sys-fs/eudev-9999
index fa6408a0da81..dfb14b5c1898 100644
--- a/metadata/md5-cache/sys-fs/eudev-9999
+++ b/metadata/md5-cache/sys-fs/eudev-9999
@@ -1,10 +1,10 @@
-BDEPEND=dev-util/gperf virtual/os-headers virtual/pkgconfig test? ( app-text/tree 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 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-util/gperf virtual/os-headers virtual/pkgconfig test? ( app-text/tree dev-lang/perl ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
 DEPEND=>=sys-apps/util-linux-2.20 >=sys-kernel/linux-headers-2.6.39 virtual/libcrypt:= kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !sys-apps/gentoo-systemd-integration !sys-apps/systemd
 DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace devfs)
 EAPI=8
 HOMEPAGE=https://github.com/eudev-project/eudev
-INHERIT=autotools linux-info multilib-minimal toolchain-funcs udev git-r3
+INHERIT=linux-info multilib-minimal toolchain-funcs udev autotools git-r3
 IUSE=+kmod rule-generator selinux static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=LGPL-2.1 MIT GPL-2
 PDEPEND=>=sys-fs/udev-init-scripts-26
@@ -13,4 +13,4 @@ RDEPEND=>=sys-apps/util-linux-2.20 >=sys-kernel/linux-headers-2.6.39 virtual/lib
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712
-_md5_=711364cf83b91b6ab38ab074f012242b
+_md5_=c00ec29d38863fbec7fdc89de0e6c454
diff --git a/metadata/md5-cache/sys-fs/lxcfs-5.0.0_p20220524 b/metadata/md5-cache/sys-fs/lxcfs-5.0.0_p20220524
index 26e624f768ef..3e68a1ce0d1b 100644
--- a/metadata/md5-cache/sys-fs/lxcfs-5.0.0_p20220524
+++ b/metadata/md5-cache/sys-fs/lxcfs-5.0.0_p20220524
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://linuxcontainers.org/lxcfs/introduction/ https://github.com/lxc/lxcfs/
 INHERIT=cmake meson python-any-r1 systemd
 IUSE=doc test
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~riscv ~x86
 LICENSE=Apache-2.0 LGPL-2+
 RDEPEND=sys-fs/fuse:3
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/lxc/lxcfs/archive/18e78f70fa6764be4e4f6fcc6ae8d314da7f3a91.tar.gz -> lxcfs-5.0.0_p20220524.tar.gz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ceef19fbd29caf8f5de980f68945e61f
+_md5_=eb2be130acfd90e7c7f75e40f19103a4
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 3a68e522c9b7..dfb8ceae73a9 100644
Binary files a/metadata/md5-cache/sys-kernel/Manifest.gz and b/metadata/md5-cache/sys-kernel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.121 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.121
index 7e79bc9a0d7b..c888c4a61a32 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.121
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.121
@@ -5,7 +5,7 @@ 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
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ppc64 x86
 LICENSE=GPL-2
 PDEPEND=>=virtual/dist-kernel-5.10.121
 RDEPEND=!sys-kernel/gentoo-kernel-bin:5.10.121 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.10.121
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-130.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-130.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
 _eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	1ac15629c90de088f091c6ff655b6ed2	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	d33a77692bb47e8227f27e17fb9c3c05	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=13b50ca26023fa518d62c7790f08a18c
+_md5_=47e0cd26daf80e00703e1b86b7a1b529
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.122 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.122
new file mode 100644
index 000000000000..0c80c95290d4
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.122
@@ -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_beta1-r1:3.11 >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+INHERIT=kernel-build toolchain-funcs
+IUSE=debug hardened savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.122
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.10.122 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.122
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-131.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-131.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
+_eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	1ac15629c90de088f091c6ff655b6ed2	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	d33a77692bb47e8227f27e17fb9c3c05	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=13b50ca26023fa518d62c7790f08a18c
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.46 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.46
index 88399b3a4f96..6269494e0d29 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.46
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.46
@@ -5,7 +5,7 @@ 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
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ppc64 x86
 LICENSE=GPL-2
 PDEPEND=>=virtual/dist-kernel-5.15.46
 RDEPEND=!sys-kernel/gentoo-kernel-bin:5.15.46 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.15.46
 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-50.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-50.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.15.19 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.15.19 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.15.19 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.15.19 )
 _eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	1ac15629c90de088f091c6ff655b6ed2	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	d33a77692bb47e8227f27e17fb9c3c05	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=a8db24d7d192cf605e1a351f56068d34
+_md5_=0a50c04c7a77f1b50348086672d04303
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.47 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.47
new file mode 100644
index 000000000000..21fe14485266
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.47
@@ -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_beta1-r1:3.11 >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) 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.47
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.15.47 || ( 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.47
+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-51.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-51.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.15.19 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.15.19 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.15.19 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.15.19 )
+_eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	1ac15629c90de088f091c6ff655b6ed2	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	d33a77692bb47e8227f27e17fb9c3c05	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=a8db24d7d192cf605e1a351f56068d34
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.17.15 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.17.15
new file mode 100644
index 000000000000..f78683984873
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.17.15
@@ -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_beta1-r1:3.11 >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+INHERIT=kernel-build toolchain-funcs
+IUSE=debug hardened savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.17.15
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.17.15 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig ) hppa? ( savedconfig ) riscv? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.17.15
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.17.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.17-19.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.17-19.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz amd64? ( https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/5.17.11-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.17.11-gentoo ) arm64? ( https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/5.17.11-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.17.11-gentoo ) ppc64? ( https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/5.17.11-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.17.11-gentoo ) x86? ( https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/5.17.11-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.17.11-gentoo )
+_eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	1ac15629c90de088f091c6ff655b6ed2	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	d33a77692bb47e8227f27e17fb9c3c05	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=8cd12080493e96cd551ec7a6f88bf3ab
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.18.4 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.18.4
new file mode 100644
index 000000000000..d4e7e3360d9c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.18.4
@@ -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_beta1-r1:3.11 >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) 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.4
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.18.4 || ( 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.4
+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-7.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.18-7.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz amd64? ( https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/5.18.4-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.18.4-gentoo ) arm64? ( https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/5.18.4-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.18.4-gentoo ) ppc64? ( https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/5.18.4-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.18.4-gentoo ) x86? ( https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/5.18.4-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.18.4-gentoo )
+_eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	1ac15629c90de088f091c6ff655b6ed2	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	d33a77692bb47e8227f27e17fb9c3c05	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=b8779fd4735c6edbb95f427b3bc4d0f6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.197 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.197
index d2ea614fb5b2..78037d56bbc7 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.197
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.197
@@ -5,7 +5,7 @@ EAPI=7
 HOMEPAGE=https://www.kernel.org/
 INHERIT=kernel-build
 IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm64 ~ppc ppc64 x86
 LICENSE=GPL-2
 PDEPEND=>=virtual/dist-kernel-5.4.197
 RDEPEND=!sys-kernel/gentoo-kernel-bin:5.4.197 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.197
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-201.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-201.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
 _eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	1ac15629c90de088f091c6ff655b6ed2	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	d33a77692bb47e8227f27e17fb9c3c05	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=78e18ea313d0e6db8d991a168efb0b8c
+_md5_=7564678921f67a4ba602f0e57926847b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.198 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.198
new file mode 100644
index 000000000000..98780889fbaa
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.198
@@ -0,0 +1,16 @@
+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_beta1-r1:3.11 >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) 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
+IUSE=debug savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.198
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.4.198 || ( 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.4.198
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-202.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-202.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
+_eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	1ac15629c90de088f091c6ff655b6ed2	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	d33a77692bb47e8227f27e17fb9c3c05	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=78e18ea313d0e6db8d991a168efb0b8c
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.121 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.121
index a9d635d0dd31..35d3bdb6ba4b 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.121
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.121
@@ -5,7 +5,7 @@ EAPI=7
 HOMEPAGE=https://www.kernel.org/
 INHERIT=kernel-install toolchain-funcs
 IUSE=+initramfs test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 arm64 ppc64 x86
 LICENSE=GPL-2
 PDEPEND=>=virtual/dist-kernel-5.10.121
 RDEPEND=!sys-kernel/gentoo-kernel:5.10.121 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.10.121
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-130.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-130.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.121-1.xpak -> gentoo-kernel-5.10.121-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.121-1.xpak -> gentoo-kernel-5.10.121-1.arm64.xpak ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.121-1.xpak -> gentoo-kernel-5.10.121-1.ppc64le.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.121-1.xpak -> gentoo-kernel-5.10.121-1.x86.xpak )
 _eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=37cf5e192c772ae5a043406dd66c89e2
+_md5_=94c43a62966a63b2d631f63f3a3bc885
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.122 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.122
new file mode 100644
index 000000000000..e2d56387b235
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.122
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+INHERIT=kernel-install toolchain-funcs
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.122
+RDEPEND=!sys-kernel/gentoo-kernel:5.10.122 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.122
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-131.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-131.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.122-1.xpak -> gentoo-kernel-5.10.122-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.122-1.xpak -> gentoo-kernel-5.10.122-1.arm64.xpak ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.122-1.xpak -> gentoo-kernel-5.10.122-1.ppc64le.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.122-1.xpak -> gentoo-kernel-5.10.122-1.x86.xpak )
+_eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=37cf5e192c772ae5a043406dd66c89e2
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.46 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.46
index 826de2b27399..6d1b35bb6b8d 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.46
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.46
@@ -5,7 +5,7 @@ EAPI=7
 HOMEPAGE=https://www.kernel.org/
 INHERIT=kernel-install toolchain-funcs
 IUSE=+initramfs test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 arm64 ppc64 x86
 LICENSE=GPL-2
 PDEPEND=>=virtual/dist-kernel-5.15.46
 RDEPEND=!sys-kernel/gentoo-kernel:5.15.46 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.15.46
 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-50.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-50.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.46-1.xpak -> gentoo-kernel-5.15.46-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.46-1.xpak -> gentoo-kernel-5.15.46-1.arm64.xpak ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.46-1.xpak -> gentoo-kernel-5.15.46-1.ppc64le.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.46-1.xpak -> gentoo-kernel-5.15.46-1.x86.xpak )
 _eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=727580f9402ad362cb324566395d639e
+_md5_=9b217fd79e948d9f65dfb233ee341422
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.47 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.47
new file mode 100644
index 000000000000..d5042ab808f3
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.47
@@ -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.47
+RDEPEND=!sys-kernel/gentoo-kernel:5.15.47 || ( 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.47
+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-51.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-51.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.47-1.xpak -> gentoo-kernel-5.15.47-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.47-1.xpak -> gentoo-kernel-5.15.47-1.arm64.xpak ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.47-1.xpak -> gentoo-kernel-5.15.47-1.ppc64le.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.47-1.xpak -> gentoo-kernel-5.15.47-1.x86.xpak )
+_eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=727580f9402ad362cb324566395d639e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.17.15 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.17.15
new file mode 100644
index 000000000000..d37b4e27fc97
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.17.15
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+INHERIT=kernel-install toolchain-funcs
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.17.15
+RDEPEND=!sys-kernel/gentoo-kernel:5.17.15 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.17.15
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.17.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.17-19.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.17-19.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.17.15-1.xpak -> gentoo-kernel-5.17.15-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.17.15-1.xpak -> gentoo-kernel-5.17.15-1.arm64.xpak ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.17.15-1.xpak -> gentoo-kernel-5.17.15-1.ppc64le.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.17.15-1.xpak -> gentoo-kernel-5.17.15-1.x86.xpak )
+_eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=727580f9402ad362cb324566395d639e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.18.4 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.18.4
new file mode 100644
index 000000000000..1a1e7bba34a6
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.18.4
@@ -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.4
+RDEPEND=!sys-kernel/gentoo-kernel:5.18.4 || ( 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.4
+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-7.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.18-7.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.4-1.xpak -> gentoo-kernel-5.18.4-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.4-1.xpak -> gentoo-kernel-5.18.4-1.arm64.xpak ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.4-1.xpak -> gentoo-kernel-5.18.4-1.ppc64le.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.4-1.xpak -> gentoo-kernel-5.18.4-1.x86.xpak )
+_eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=6f78a63900cc355b2321ddbd6ba268ca
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.197 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.197
index 024daf728df9..ad4ec5eaa6e0 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.197
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.197
@@ -5,7 +5,7 @@ EAPI=7
 HOMEPAGE=https://www.kernel.org/
 INHERIT=kernel-install toolchain-funcs
 IUSE=+initramfs test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 arm64 ppc64 x86
 LICENSE=GPL-2
 PDEPEND=>=virtual/dist-kernel-5.4.197
 RDEPEND=!sys-kernel/gentoo-kernel:5.4.197 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.197
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-201.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-201.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.197-1.xpak -> gentoo-kernel-5.4.197-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.197-1.xpak -> gentoo-kernel-5.4.197-1.arm64.xpak ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.197-1.xpak -> gentoo-kernel-5.4.197-1.ppc64le.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.197-1.xpak -> gentoo-kernel-5.4.197-1.x86.xpak )
 _eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=727580f9402ad362cb324566395d639e
+_md5_=9b217fd79e948d9f65dfb233ee341422
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.198 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.198
new file mode 100644
index 000000000000..da24bf892ff3
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.198
@@ -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.4.198
+RDEPEND=!sys-kernel/gentoo-kernel:5.4.198 || ( 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.4.198
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-202.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-202.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.198-1.xpak -> gentoo-kernel-5.4.198-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.198-1.xpak -> gentoo-kernel-5.4.198-1.arm64.xpak ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.198-1.xpak -> gentoo-kernel-5.4.198-1.ppc64le.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.198-1.xpak -> gentoo-kernel-5.4.198-1.x86.xpak )
+_eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=727580f9402ad362cb324566395d639e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.283 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.283
new file mode 100644
index 000000000000..3f02266dcdfa
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.283
@@ -0,0 +1,15 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.14 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.14.283
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-294.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-294.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-294.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-294.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-294.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-294.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-294.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-294.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-294.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=37f1819c0dd9aff770ec8ec611e29926
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.284 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.284
new file mode 100644
index 000000000000..1ab6458bf9f2
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.284
@@ -0,0 +1,15 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.14 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.14.284
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-295.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-295.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-295.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-295.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-295.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-295.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-295.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-295.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-295.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=8582c027d504beb79f0e115cbe580498
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.247 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.247
new file mode 100644
index 000000000000..b4e5752aeb14
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.247
@@ -0,0 +1,15 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.19 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.19.247
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-246.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-246.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-246.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-246.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-246.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-246.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-246.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-246.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-246.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=d7f047df66f069b380b445aebde4452b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.248 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.248
new file mode 100644
index 000000000000..0b5a71f526ef
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.248
@@ -0,0 +1,15 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.19 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.19.248
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-247.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-247.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-247.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-247.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-247.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-247.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-247.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-247.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-247.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=70b3445c2129d6a7b274fd0aeabd6a0a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.318 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.318
new file mode 100644
index 000000000000..c402184a1429
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.318
@@ -0,0 +1,15 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.9.318
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-321.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-321.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-321.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-321.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-321.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-321.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-321.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-321.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-321.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=a295c4bb8e57885b6c07aa3a7d1209c0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.319 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.319
new file mode 100644
index 000000000000..a7ca24b5cbd0
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.319
@@ -0,0 +1,15 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.9.319
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-322.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-322.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-322.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-322.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-322.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-322.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-322.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-322.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-322.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=f15b2df45fceddf5dc415dc337b7779f
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.122 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.122
new file mode 100644
index 000000000000..5baed7086d55
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.122
@@ -0,0 +1,15 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.10 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.10.122
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-131.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-131.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-131.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-131.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-131.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-131.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-131.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-131.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-131.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=12e82d7f6c3190b1528e1da935a10fb0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.123 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.123
new file mode 100644
index 000000000000..382524386d48
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.123
@@ -0,0 +1,15 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.10 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.10.123
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-132.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-132.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-132.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-132.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-132.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-132.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-132.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-132.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-132.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=810a023f3d876769c7e898001584290f
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.47 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.47
new file mode 100644
index 000000000000..5df9b747cf57
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.47
@@ -0,0 +1,15 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.15 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.15.47
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-51.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-51.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-51.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-51.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-51.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-51.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-51.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-51.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-51.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=9f6eeafd08d28cf000eadb706bae41ba
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.48 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.48
new file mode 100644
index 000000000000..30bacf3e1445
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.48
@@ -0,0 +1,15 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.15 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.15.48
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-52.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-52.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-52.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-52.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-52.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-52.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-52.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-52.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-52.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=cafd5c511906940a02bdd108722dd944
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.17.15 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.17.15
new file mode 100644
index 000000000000..38c45dad15cd
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.17.15
@@ -0,0 +1,15 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.17 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.17.15
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.17.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.17-19.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.17-19.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.17-19.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.17-19.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.17-19.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.17-19.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.17-19.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.17-19.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.17-19.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=e398d8ccdd433a5931e5fc98a95f493e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.18.4 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.18.4
new file mode 100644
index 000000000000..fdc98b23f574
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.18.4
@@ -0,0 +1,15 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.18 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.18.4
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.18.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.18-7.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.18-7.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.18-7.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.18-7.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.18-7.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.18-7.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.18-7.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.18-7.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.18-7.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=9911f83827e27181bbcd2ccfc2a0da0d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.18.5 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.18.5
new file mode 100644
index 000000000000..845322656107
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.18.5
@@ -0,0 +1,15 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.18 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.18.5
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.18.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.18-8.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.18-8.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.18-8.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.18-8.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.18-8.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.18-8.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.18-8.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.18-8.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.18-8.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=19c773588c6b24bc7f4f31ea2c2d2232
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.198 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.198
new file mode 100644
index 000000000000..a31aff492d07
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.198
@@ -0,0 +1,15 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.4 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.4.198
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-202.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-202.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-202.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-202.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-202.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-202.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-202.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-202.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-202.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=d2e29e515956e0f5c3e126b644b1454c
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.199 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.199
new file mode 100644
index 000000000000..2bd95772424f
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.199
@@ -0,0 +1,15 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.4 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.4.199
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-203.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-203.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-203.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-203.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-203.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-203.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-203.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-203.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-203.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=57a2d7c95710aeef08d8b41855e481c9
diff --git a/metadata/md5-cache/sys-kernel/kpatch-0.6.3-r1 b/metadata/md5-cache/sys-kernel/kpatch-0.6.3-r1
deleted file mode 100644
index 518d7da19f0f..000000000000
--- a/metadata/md5-cache/sys-kernel/kpatch-0.6.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=app-crypt/pesign dev-libs/openssl:0= sys-libs/zlib sys-apps/pciutils dev-libs/elfutils sys-devel/bison test? ( dev-util/shellcheck-bin ) kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=Dynamic kernel patching for Linux
-EAPI=7
-HOMEPAGE=https://github.com/dynup/kpatch
-INHERIT=flag-o-matic linux-mod
-IUSE=+kpatch-build +kpatch kmod doc contrib test dist-kernel
-KEYWORDS=~amd64
-LICENSE=GPL-2+
-RDEPEND=app-crypt/pesign dev-libs/openssl:0= sys-libs/zlib sys-apps/pciutils kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/dynup/kpatch/archive/v0.6.3.tar.gz -> kpatch-0.6.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	linux-mod	6ff232574f0bcad33767903505553e8d	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=de1732dc40cfe36c0695f5fb4462229f
diff --git a/metadata/md5-cache/sys-kernel/kpatch-0.7.1-r1 b/metadata/md5-cache/sys-kernel/kpatch-0.9.6
similarity index 90%
rename from metadata/md5-cache/sys-kernel/kpatch-0.7.1-r1
rename to metadata/md5-cache/sys-kernel/kpatch-0.9.6
index 1ddcaa7ea2a5..cfec785033c2 100644
--- a/metadata/md5-cache/sys-kernel/kpatch-0.7.1-r1
+++ b/metadata/md5-cache/sys-kernel/kpatch-0.9.6
@@ -10,6 +10,6 @@ LICENSE=GPL-2+
 RDEPEND=app-crypt/pesign sys-libs/zlib sys-apps/pciutils kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/dynup/kpatch/archive/v0.7.1.tar.gz -> kpatch-0.7.1.tar.gz
+SRC_URI=https://github.com/dynup/kpatch/archive/v0.9.6.tar.gz -> kpatch-0.9.6.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	linux-mod	6ff232574f0bcad33767903505553e8d	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=6f376bf5b90ee3fb2c99d88d3d421e56
+_md5_=5c8ea600d4b14d04025597338c550438
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20210518 b/metadata/md5-cache/sys-kernel/linux-firmware-20220610
similarity index 81%
rename from metadata/md5-cache/sys-kernel/linux-firmware-20210518
rename to metadata/md5-cache/sys-kernel/linux-firmware-20220610
index 67d3fdd316bc..cad862678ef0 100644
--- a/metadata/md5-cache/sys-kernel/linux-firmware-20210518
+++ b/metadata/md5-cache/sys-kernel/linux-firmware-20220610
@@ -3,13 +3,14 @@ DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend unpack
 DESCRIPTION=Linux firmware files
 EAPI=7
 HOMEPAGE=https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
+INHERIT=mount-boot savedconfig
 IUSE=initramfs +redistributable savedconfig unknown-license savedconfig
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 ) redistributable? ( linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT no-source-code ) ) unknown-license? ( all-rights-reserved )
 RDEPEND=!savedconfig? ( redistributable? ( !sys-firmware/alsa-firmware[alsa_cards_ca0132] !sys-block/qla-fc-firmware !sys-firmware/iwl1000-ucode !sys-firmware/iwl6005-ucode !sys-firmware/iwl6030-ucode !sys-firmware/iwl3160-ucode !sys-firmware/iwl7260-ucode !sys-firmware/iwl3160-7260-bt-ucode !sys-firmware/raspberrypi-wifi-ucode ) unknown-license? ( !sys-firmware/alsa-firmware[alsa_cards_korg1212] !sys-firmware/alsa-firmware[alsa_cards_maestro3] !sys-firmware/alsa-firmware[alsa_cards_sb16] !sys-firmware/alsa-firmware[alsa_cards_ymfpci] ) )
 REQUIRED_USE=initramfs? ( redistributable )
 RESTRICT=binchecks strip test unknown-license? ( bindist )
 SLOT=0
-SRC_URI=https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/f8462923ed8fc874f770b8c6dfad49d39b381f14.tar.gz -> linux-firmware-20210518.tar.gz
+SRC_URI=https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/linux-firmware-20220610.tar.xz
 _eclasses_=mount-boot	02a45c5e022c08dbc05178522b2772f2	portability	d33a77692bb47e8227f27e17fb9c3c05	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d
-_md5_=db3956fa48c204567deb8822c8c26215
+_md5_=007ed331e4428d7d2d3ceee5541e8cb4
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.19.235_p106 b/metadata/md5-cache/sys-kernel/rt-sources-4.19.246_p110
similarity index 81%
rename from metadata/md5-cache/sys-kernel/rt-sources-4.19.235_p106
rename to metadata/md5-cache/sys-kernel/rt-sources-4.19.246_p110
index 35070796532e..0eecf81c70f7 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.19.235_p106
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.19.246_p110
@@ -9,7 +9,7 @@ KEYWORDS=~amd64 ~arm64
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=4.19.235_p106
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.235.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/patch-4.19.235-rt106.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patch-4.19.235-rt106.patch.xz
+SLOT=4.19.246_p110
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.246.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/patch-4.19.246-rt110.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patch-4.19.246-rt110.patch.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
 _md5_=202aa5da9e26e17e9a804c739b2980e7
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-5.10.106_p64 b/metadata/md5-cache/sys-kernel/rt-sources-5.10.120_p70
similarity index 82%
rename from metadata/md5-cache/sys-kernel/rt-sources-5.10.106_p64
rename to metadata/md5-cache/sys-kernel/rt-sources-5.10.120_p70
index cbfd8e287c8c..636efa62a0e0 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-5.10.106_p64
+++ b/metadata/md5-cache/sys-kernel/rt-sources-5.10.120_p70
@@ -9,7 +9,7 @@ KEYWORDS=~amd64 ~arm64
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.10.106_p64
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.106.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/patch-5.10.106-rt64.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patch-5.10.106-rt64.patch.xz
+SLOT=5.10.120_p70
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.120.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/patch-5.10.120-rt70.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patch-5.10.120-rt70.patch.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
 _md5_=202aa5da9e26e17e9a804c739b2980e7
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-5.15.29_p37 b/metadata/md5-cache/sys-kernel/rt-sources-5.15.44_p46
similarity index 87%
rename from metadata/md5-cache/sys-kernel/rt-sources-5.15.29_p37
rename to metadata/md5-cache/sys-kernel/rt-sources-5.15.44_p46
index b8961bbd88c6..43cd64905659 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-5.15.29_p37
+++ b/metadata/md5-cache/sys-kernel/rt-sources-5.15.44_p46
@@ -9,7 +9,7 @@ KEYWORDS=~amd64 ~arm64
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.15.29_p37
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.15.29.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.15-gnu/deblob-5.15 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.15-gnu/deblob-check -> deblob-check-5.15 ) https://www.kernel.org/pub/linux/kernel/projects/rt/5.15/patch-5.15.29-rt37.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.15/older/patch-5.15.29-rt37.patch.xz
+SLOT=5.15.44_p46
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.15.44.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.15-gnu/deblob-5.15 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.15-gnu/deblob-check -> deblob-check-5.15 ) https://www.kernel.org/pub/linux/kernel/projects/rt/5.15/patch-5.15.44-rt46.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.15/older/patch-5.15.44-rt46.patch.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
 _md5_=7433e098049f0396cfc033411f0d8182
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-5.16.2_p19 b/metadata/md5-cache/sys-kernel/rt-sources-5.16.2_p19
deleted file mode 100644
index 45513d819299..000000000000
--- a/metadata/md5-cache/sys-kernel/rt-sources-5.16.2_p19
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed ) deblob? ( || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full Linux 5.16 kernel sources with the CONFIG_PREEMPT_RT patch
-EAPI=8
-HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel https://wiki.linuxfoundation.org/realtime/start https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
-INHERIT=kernel-2
-IUSE=symlink build deblob
-KEYWORDS=~amd64 ~arm64
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.16.2_p19
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.16.2.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.16.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.16-gnu/deblob-5.16 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.16-gnu/deblob-check -> deblob-check-5.16 ) https://www.kernel.org/pub/linux/kernel/projects/rt/5.16/patch-5.16.2-rt19.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.16/older/patch-5.16.2-rt19.patch.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=7433e098049f0396cfc033411f0d8182
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.19.237_p107 b/metadata/md5-cache/sys-kernel/rt-sources-5.18_p11
similarity index 61%
rename from metadata/md5-cache/sys-kernel/rt-sources-4.19.237_p107
rename to metadata/md5-cache/sys-kernel/rt-sources-5.18_p11
index 6f240c007e32..fc4a1588324c 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.19.237_p107
+++ b/metadata/md5-cache/sys-kernel/rt-sources-5.18_p11
@@ -1,6 +1,6 @@
 BDEPEND=!build? ( sys-apps/sed )
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full Linux 4.19 kernel sources with the CONFIG_PREEMPT_RT patch
+DESCRIPTION=Full Linux 5.18 kernel sources with the CONFIG_PREEMPT_RT patch
 EAPI=8
 HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel https://wiki.linuxfoundation.org/realtime/start
 INHERIT=kernel-2
@@ -9,7 +9,7 @@ KEYWORDS=~amd64 ~arm64
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=4.19.237_p107
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.237.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/patch-4.19.237-rt107.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patch-4.19.237-rt107.patch.xz
+SLOT=5.18_p11
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.18.tar.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.18/patch-5.18-rt11.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.18/older/patch-5.18-rt11.patch.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=202aa5da9e26e17e9a804c739b2980e7
+_md5_=c59577bb2ed06e3cb06628fa144b649e
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-5.4.182_p72-r1 b/metadata/md5-cache/sys-kernel/rt-sources-5.4.193_p74
similarity index 78%
rename from metadata/md5-cache/sys-kernel/rt-sources-5.4.182_p72-r1
rename to metadata/md5-cache/sys-kernel/rt-sources-5.4.193_p74
index 018fc4390ed5..5d3ea7b6f691 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-5.4.182_p72-r1
+++ b/metadata/md5-cache/sys-kernel/rt-sources-5.4.193_p74
@@ -9,7 +9,7 @@ KEYWORDS=~amd64 ~arm64
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.4.182_p72-r1
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.182.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/patch-5.4.182-rt72-rc1.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/older/patch-5.4.182-rt72-rc1.patch.xz
+SLOT=5.4.193_p74
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.193.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/patch-5.4.193-rt74.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/older/patch-5.4.193-rt74.patch.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=3a5cff690598b2f38a2153b293282f88
+_md5_=202aa5da9e26e17e9a804c739b2980e7
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.122 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.122
new file mode 100644
index 000000000000..fe1c14b4fdd2
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.122
@@ -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_beta1-r1:3.11 >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+INHERIT=kernel-build toolchain-funcs verify-sig
+IUSE=debug hardened savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.122
+RDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.122
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.122.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.122.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
+_eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	1ac15629c90de088f091c6ff655b6ed2	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	d33a77692bb47e8227f27e17fb9c3c05	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=e05a2285b971a7f7bcbc7b9a4c1f9a4d
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.47 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.47
new file mode 100644
index 000000000000..5e80302f16fb
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.47
@@ -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_beta1-r1:3.11 >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) 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.47
+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.47
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.47.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.47.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	1ac15629c90de088f091c6ff655b6ed2	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	d33a77692bb47e8227f27e17fb9c3c05	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=362af3de009d4e02a5d5d05608d2a485
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.17.15 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.17.15
new file mode 100644
index 000000000000..073d3d385b4c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.17.15
@@ -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_beta1-r1:3.11 >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+INHERIT=kernel-build toolchain-funcs verify-sig
+IUSE=debug hardened savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.17.15
+RDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.17.15
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.17.15.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.17.15.tar.sign ) amd64? ( https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/5.17.11-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.17.11-gentoo ) arm64? ( https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/5.17.11-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.17.11-gentoo ) ppc64? ( https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/5.17.11-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.17.11-gentoo ) x86? ( https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/5.17.11-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.17.11-gentoo )
+_eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	1ac15629c90de088f091c6ff655b6ed2	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	d33a77692bb47e8227f27e17fb9c3c05	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=059365723a845ee2cb4b30fd5215fef3
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.18.4 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.18.4
new file mode 100644
index 000000000000..1a0218f357ba
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.18.4
@@ -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_beta1-r1:3.11 >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) 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.4
+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.4
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.4.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.4.tar.sign ) amd64? ( https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/5.18.4-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.18.4-gentoo ) arm64? ( https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/5.18.4-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.18.4-gentoo ) ppc64? ( https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/5.18.4-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.18.4-gentoo ) x86? ( https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/5.18.4-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.18.4-gentoo )
+_eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	1ac15629c90de088f091c6ff655b6ed2	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	d33a77692bb47e8227f27e17fb9c3c05	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=db8747cfc0090d91e857f14e7006a580
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.198 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.198
new file mode 100644
index 000000000000..e6ad3dff72ea
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.198
@@ -0,0 +1,16 @@
+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_beta1-r1:3.11 >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) 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 verify-sig
+IUSE=debug savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm64 ~ppc ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.198
+RDEPEND=|| ( 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.4.198
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.198.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.198.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
+_eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	1ac15629c90de088f091c6ff655b6ed2	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	d33a77692bb47e8227f27e17fb9c3c05	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=ed42814b85f0ac71eaf96d6f4e673ec3
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.282 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.284
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.14.282
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.14.284
index 656a93f37a09..578532e7f926 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.282
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.284
@@ -9,7 +9,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=4.14.282
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.282.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz
+SLOT=4.14.284
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.284.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
 _md5_=5e76cbc485785140dfc1cbb402aa4bcc
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.246 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.248
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.19.246
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.19.248
index 6561e19184db..6c50be60dd77 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.246
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.248
@@ -9,7 +9,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=4.19.246
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.246.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
+SLOT=4.19.248
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.248.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
 _md5_=5e76cbc485785140dfc1cbb402aa4bcc
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.317 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.319
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.9.317
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.9.319
index ce684b609ea5..5bdff805c1f5 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.317
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.319
@@ -9,7 +9,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=4.9.317
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.317.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz
+SLOT=4.9.319
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.319.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
 _md5_=5e76cbc485785140dfc1cbb402aa4bcc
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.121 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.123
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-5.10.121
rename to metadata/md5-cache/sys-kernel/vanilla-sources-5.10.123
index 891dc54bcae3..912c192c8c14 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.121
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.123
@@ -9,7 +9,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.10.121
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.121.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
+SLOT=5.10.123
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.123.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
 _md5_=5e76cbc485785140dfc1cbb402aa4bcc
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.46 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.48
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-5.15.46
rename to metadata/md5-cache/sys-kernel/vanilla-sources-5.15.48
index b8d7773f7d1a..5f604278d1c5 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.46
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.48
@@ -9,7 +9,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.15.46
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.15.46.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz
+SLOT=5.15.48
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.15.48.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
 _md5_=5e76cbc485785140dfc1cbb402aa4bcc
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.17.14 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.17.15
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-5.17.14
rename to metadata/md5-cache/sys-kernel/vanilla-sources-5.17.15
index 1f868955b73f..20e602f47f70 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.17.14
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.17.15
@@ -9,7 +9,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.17.14
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.17.14.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.17.tar.xz
+SLOT=5.17.15
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.17.15.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.17.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
 _md5_=5e76cbc485785140dfc1cbb402aa4bcc
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.18.3 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.18.5
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-5.18.3
rename to metadata/md5-cache/sys-kernel/vanilla-sources-5.18.5
index 6281b0bf8ffd..eae1e1b312c1 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.18.3
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.18.5
@@ -9,7 +9,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.18.3
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.18.3.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.18.tar.xz
+SLOT=5.18.5
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.18.5.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.18.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
 _md5_=5e76cbc485785140dfc1cbb402aa4bcc
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.197 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.199
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-5.4.197
rename to metadata/md5-cache/sys-kernel/vanilla-sources-5.4.199
index 8d9a060d3e56..e431e24c600a 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.197
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.199
@@ -9,7 +9,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.4.197
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.197.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
+SLOT=5.4.199
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.199.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
 _md5_=5e76cbc485785140dfc1cbb402aa4bcc
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 67faabec32da..baaf0c1c5e01 100644
Binary files a/metadata/md5-cache/sys-libs/Manifest.gz and b/metadata/md5-cache/sys-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-libs/libapparmor-3.0.3-r1 b/metadata/md5-cache/sys-libs/libapparmor-3.0.3-r1
index 341e72428387..6bae5ffc83e5 100644
--- a/metadata/md5-cache/sys-libs/libapparmor-3.0.3-r1
+++ b/metadata/md5-cache/sys-libs/libapparmor-3.0.3-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://gitlab.com/apparmor/apparmor/wikis/home
 INHERIT=autotools distutils-r1 perl-functions
 IUSE=doc +perl +python static-libs python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=perl? ( dev-lang/perl:= ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://launchpad.net/apparmor/3.0/3.0.3/+download/apparmor-3.0.3.tar.gz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	distutils-r1	10a93585889c3ca7651cbcd2ee831e47	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=bca332b7b53b7a7a8b404a896a7aea2c
+_md5_=3ac9fa333b22bb7e43bb8693b7c0c321
diff --git a/metadata/md5-cache/sys-libs/libcap-2.63 b/metadata/md5-cache/sys-libs/libcap-2.63
deleted file mode 100644
index 2c1276a11711..000000000000
--- a/metadata/md5-cache/sys-libs/libcap-2.63
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-apps/diffutils tools? ( dev-lang/go )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=pam? ( sys-libs/pam[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-kernel/linux-headers
-DESCRIPTION=POSIX 1003.1e capabilities
-EAPI=7
-HOMEPAGE=https://sites.google.com/site/fullycapable/
-INHERIT=multilib-minimal toolchain-funcs pam usr-ldscript
-IUSE=pam static-libs tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( GPL-2 BSD )
-PDEPEND=pam? ( sys-libs/pam[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-2.63.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=516a252f96a31f43ee33fc5bd0dcd3d7
diff --git a/metadata/md5-cache/sys-power/Manifest.gz b/metadata/md5-cache/sys-power/Manifest.gz
index fab100f8e092..e554e0b861e4 100644
Binary files a/metadata/md5-cache/sys-power/Manifest.gz and b/metadata/md5-cache/sys-power/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-power/apcupsd-3.14.14-r3 b/metadata/md5-cache/sys-power/apcupsd-3.14.14-r3
index 528b279a05f7..aad0f4589954 100644
--- a/metadata/md5-cache/sys-power/apcupsd-3.14.14-r3
+++ b/metadata/md5-cache/sys-power/apcupsd-3.14.14-r3
@@ -12,4 +12,4 @@ RDEPEND=>=sys-apps/util-linux-2.23[tty-helpers(-)] cgi? ( >=media-libs/gd-1.8.4
 SLOT=0
 SRC_URI=mirror://sourceforge/apcupsd/apcupsd-3.14.14.tar.gz
 _eclasses_=linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712
-_md5_=ecf652f5d4c897cbcf09f94bf7f6b8a4
+_md5_=cdd186247a5283921a6adb8e8f3905ae
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 35945fbf5736..c455da5e0379 100644
Binary files a/metadata/md5-cache/virtual/Manifest.gz and b/metadata/md5-cache/virtual/Manifest.gz differ
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.10.121 b/metadata/md5-cache/virtual/dist-kernel-5.10.121
index d6cd5cfc5db7..4e61a2dfb060 100644
--- a/metadata/md5-cache/virtual/dist-kernel-5.10.121
+++ b/metadata/md5-cache/virtual/dist-kernel-5.10.121
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual to depend on any Distribution Kernel
 EAPI=7
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ppc64 x86
 RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.10.121 ~sys-kernel/gentoo-kernel-bin-5.10.121 ~sys-kernel/vanilla-kernel-5.10.121 )
 SLOT=0/5.10.121
-_md5_=8d5178e82e5992dcec134c02ff7397e0
+_md5_=8e04478c89d67837ed02a4ebab2037e0
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.10.122 b/metadata/md5-cache/virtual/dist-kernel-5.10.122
new file mode 100644
index 000000000000..661be6c0f7cb
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.10.122
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.10.122 ~sys-kernel/gentoo-kernel-bin-5.10.122 ~sys-kernel/vanilla-kernel-5.10.122 )
+SLOT=0/5.10.122
+_md5_=8d5178e82e5992dcec134c02ff7397e0
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.15.46 b/metadata/md5-cache/virtual/dist-kernel-5.15.46
index 3177279e46e9..22052830934b 100644
--- a/metadata/md5-cache/virtual/dist-kernel-5.15.46
+++ b/metadata/md5-cache/virtual/dist-kernel-5.15.46
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual to depend on any Distribution Kernel
 EAPI=7
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ppc64 x86
 RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.15.46 ~sys-kernel/gentoo-kernel-bin-5.15.46 ~sys-kernel/vanilla-kernel-5.15.46 )
 SLOT=0/5.15.46
-_md5_=8d5178e82e5992dcec134c02ff7397e0
+_md5_=8e04478c89d67837ed02a4ebab2037e0
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.15.47 b/metadata/md5-cache/virtual/dist-kernel-5.15.47
new file mode 100644
index 000000000000..b23172694bf7
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.15.47
@@ -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.47 ~sys-kernel/gentoo-kernel-bin-5.15.47 ~sys-kernel/vanilla-kernel-5.15.47 )
+SLOT=0/5.15.47
+_md5_=8d5178e82e5992dcec134c02ff7397e0
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.17.15 b/metadata/md5-cache/virtual/dist-kernel-5.17.15
new file mode 100644
index 000000000000..7c2d1b5bd16f
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.17.15
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.17.15 ~sys-kernel/gentoo-kernel-bin-5.17.15 ~sys-kernel/vanilla-kernel-5.17.15 )
+SLOT=0/5.17.15
+_md5_=62eff3c91f3533c035b4103dfd4b6dd7
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.18.4 b/metadata/md5-cache/virtual/dist-kernel-5.18.4
new file mode 100644
index 000000000000..2e090bab341f
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.18.4
@@ -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.4 ~sys-kernel/gentoo-kernel-bin-5.18.4 ~sys-kernel/vanilla-kernel-5.18.4 )
+SLOT=0/5.18.4
+_md5_=62eff3c91f3533c035b4103dfd4b6dd7
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.197 b/metadata/md5-cache/virtual/dist-kernel-5.4.197
index f8b5da3d9a21..32d753c0cece 100644
--- a/metadata/md5-cache/virtual/dist-kernel-5.4.197
+++ b/metadata/md5-cache/virtual/dist-kernel-5.4.197
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual to depend on any Distribution Kernel
 EAPI=7
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm64 ~ppc ppc64 x86
 RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.4.197 ~sys-kernel/gentoo-kernel-bin-5.4.197 ~sys-kernel/vanilla-kernel-5.4.197 )
 SLOT=0/5.4.197
-_md5_=a81ef674c1ec3ce8090dc986ced1eaf3
+_md5_=2efd2e23ef65c3ee0fb3f77c654bb35e
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.198 b/metadata/md5-cache/virtual/dist-kernel-5.4.198
new file mode 100644
index 000000000000..e90f657ba86c
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.4.198
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.4.198 ~sys-kernel/gentoo-kernel-bin-5.4.198 ~sys-kernel/vanilla-kernel-5.4.198 )
+SLOT=0/5.4.198
+_md5_=a81ef674c1ec3ce8090dc986ced1eaf3
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index ab19f8fce913..05ac8dc14979 100644
Binary files a/metadata/md5-cache/www-client/Manifest.gz and b/metadata/md5-cache/www-client/Manifest.gz differ
diff --git a/metadata/md5-cache/www-client/chromium-102.0.5005.115 b/metadata/md5-cache/www-client/chromium-102.0.5005.115
index b2560870d8aa..90c3dc126a79 100644
--- a/metadata/md5-cache/www-client/chromium-102.0.5005.115
+++ b/metadata/md5-cache/www-client/chromium-102.0.5005.115
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://chromium.org/
 INHERIT=check-reqs chromium-2 desktop flag-o-matic ninja-utils pax-utils python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
 IUSE=component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless +js-type-check kerberos libcxx +official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine custom-cflags +l10n_af +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=BSD
 RDEPEND=system-icu? ( >=dev-libs/icu-69.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=x11-libs/libva-2.7:=[X] ) x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) app-arch/bzip2:= dev-libs/expat:= system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= media-libs/flac:= sys-libs/zlib:=[minizip] !headless? ( x11-libs/gdk-pixbuf:2 x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxshmfence:= virtual/opengl >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= x11-libs/pango:= ) !headless? ( || ( x11-libs/gtk+:3[X,wayland?] gui-libs/gtk:4[X,wayland?] ) ) x11-misc/xdg-utils virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium )
 REQUIRED_USE=component-build? ( !suid !libcxx ) screencast? ( wayland )
 SLOT=0/stable
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-102.0.5005.115.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-102-patchset-6/chromium-102-patchset-6.tar.xz
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=f66a6949bfd9fbb40b2c3c956ffeeba1
+_md5_=2d83f6ed1ffbf9e853e41c4cae31b22a
diff --git a/metadata/md5-cache/www-client/chromium-104.0.5110.0 b/metadata/md5-cache/www-client/chromium-104.0.5110.0
index a724762bf18b..e2fce42d520f 100644
--- a/metadata/md5-cache/www-client/chromium-104.0.5110.0
+++ b/metadata/md5-cache/www-client/chromium-104.0.5110.0
@@ -13,4 +13,4 @@ REQUIRED_USE=component-build? ( !suid !libcxx ) screencast? ( wayland ) !headles
 SLOT=0/dev
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-104.0.5110.0.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-104-patchset-2/chromium-104-patchset-2.tar.xz pgo? ( https://blackhole.sk/~kabel/src/chromium-profiler-0.1.tar )
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	llvm	6f88d422e49b917bf254b2594f3d903c	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=9786df083d90a2b7b5fd041a7be85a26
+_md5_=c1e080555f743aaa719483ad6ac8a429
diff --git a/metadata/md5-cache/www-client/firefox-101.0 b/metadata/md5-cache/www-client/firefox-101.0
deleted file mode 100644
index 83fa1f96479e..000000000000
--- a/metadata/md5-cache/www-client/firefox-101.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10[ncurses,sqlite,ssl] >=dev-lang/python-3.9.9-r1:3.9[ncurses,sqlite,ssl] >=dev-lang/python-3.8.12_p1-r1:3.8[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.23.0 >=net-libs/nodejs-10.23.1 virtual/pkgconfig >=virtual/rust-1.59.0 || ( ( sys-devel/clang:14 sys-devel/llvm:14 clang? ( =sys-devel/lld-14* pgo? ( =sys-libs/compiler-rt-sanitizers-14*[profile] ) ) ) ( sys-devel/clang:13 sys-devel/llvm:13 clang? ( =sys-devel/lld-13* pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] ) ) ) ( sys-devel/clang:12 sys-devel/llvm:12 clang? ( =sys-devel/lld-12* pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] ) ) ) ) amd64? ( >=dev-lang/nasm-2.14 ) x86? ( >=dev-lang/nasm-2.14 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/libffi:= >=dev-libs/nss-3.78 >=dev-libs/nspr-4.32 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/mesa media-video/ffmpeg sys-libs/zlib virtual/freedesktop-icon-theme x11-libs/cairo[X] x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libxcb:= x11-libs/pango x11-libs/pixman dbus? ( sys-apps/dbus dev-libs/dbus-glib ) jack? ( virtual/jack ) libproxy? ( net-libs/libproxy ) screencast? ( media-video/pipewire:= ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( media-sound/sndio ) system-av1? ( >=media-libs/dav1d-0.9.3:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.13 >=media-libs/harfbuzz-2.8.1:0= ) system-icu? ( >=dev-libs/icu-71.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( dev-libs/dbus-glib net-misc/networkmanager sys-apps/dbus ) ) x11-libs/libICE x11-libs/libSM pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( virtual/opengl ) x86? ( virtual/opengl ) !!sys-devel/llvm:0
-DESCRIPTION=Firefox Web Browser
-EAPI=8
-HOMEPAGE=https://www.mozilla.com/firefox
-INHERIT=autotools check-reqs desktop flag-o-matic gnome2-utils linux-info llvm multiprocessing pax-utils python-any-r1 toolchain-funcs virtualx xdg
-IUSE=+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel jack libproxy lto +openh264 pgo pulseaudio sndio selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp wayland wifi geckodriver +gmp-autoupdate screencast l10n_af l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt l10n_lv l10n_ms l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW l10n_ach l10n_an l10n_az l10n_bn l10n_bs l10n_ca-valencia l10n_eo l10n_es-CL l10n_es-MX l10n_fa l10n_ff l10n_gn l10n_gu l10n_hi l10n_hy l10n_ia l10n_km l10n_kn l10n_lij l10n_mk l10n_mr l10n_my l10n_ne l10n_oc l10n_sco l10n_si l10n_son l10n_szl l10n_ta l10n_te l10n_tl l10n_trs l10n_ur l10n_xh pgo
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/libffi:= >=dev-libs/nss-3.78 >=dev-libs/nspr-4.32 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/mesa media-video/ffmpeg sys-libs/zlib virtual/freedesktop-icon-theme x11-libs/cairo[X] x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libxcb:= x11-libs/pango x11-libs/pixman dbus? ( sys-apps/dbus dev-libs/dbus-glib ) jack? ( virtual/jack ) libproxy? ( net-libs/libproxy ) screencast? ( media-video/pipewire:= ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( media-sound/sndio ) system-av1? ( >=media-libs/dav1d-0.9.3:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.13 >=media-libs/harfbuzz-2.8.1:0= ) system-icu? ( >=dev-libs/icu-71.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( dev-libs/dbus-glib net-misc/networkmanager sys-apps/dbus ) ) !www-client/firefox:0 !www-client/firefox:esr jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) ) selinux? ( sec-policy/selinux-mozilla )
-REQUIRED_USE=debug? ( !system-av1 ) pgo? ( lto ) wayland? ( dbus ) wifi? ( dbus ) screencast? ( wayland )
-SLOT=rapid
-SRC_URI=https://archive.mozilla.org/pub/firefox/releases/101.0/source/firefox-101.0.source.tar.xz -> firefox-101.0.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-101-patches-01j.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-101-patches-01j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-101-patches-01j.tar.xz https://dev.gentoo.org/~slashbeast/mozilla/patchsets/firefox-101-patches-01j.tar.xz l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/af.xpi -> firefox-101.0-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/ar.xpi -> firefox-101.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/ast.xpi -> firefox-101.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/be.xpi -> firefox-101.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/bg.xpi -> firefox-101.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/br.xpi -> firefox-101.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/ca.xpi -> firefox-101.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/cak.xpi -> firefox-101.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/cs.xpi -> firefox-101.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/cy.xpi -> firefox-101.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/da.xpi -> firefox-101.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/de.xpi -> firefox-101.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/dsb.xpi -> firefox-101.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/el.xpi -> firefox-101.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/en-CA.xpi -> firefox-101.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/en-GB.xpi -> firefox-101.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/es-AR.xpi -> firefox-101.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/es-ES.xpi -> firefox-101.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/et.xpi -> firefox-101.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/eu.xpi -> firefox-101.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/fi.xpi -> firefox-101.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/fr.xpi -> firefox-101.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/fy-NL.xpi -> firefox-101.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/ga-IE.xpi -> firefox-101.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/gd.xpi -> firefox-101.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/gl.xpi -> firefox-101.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/he.xpi -> firefox-101.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/hr.xpi -> firefox-101.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/hsb.xpi -> firefox-101.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/hu.xpi -> firefox-101.0-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/id.xpi -> firefox-101.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/is.xpi -> firefox-101.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/it.xpi -> firefox-101.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/ja.xpi -> firefox-101.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/ka.xpi -> firefox-101.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/kab.xpi -> firefox-101.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/kk.xpi -> firefox-101.0-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/ko.xpi -> firefox-101.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/lt.xpi -> firefox-101.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/lv.xpi -> firefox-101.0-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/ms.xpi -> firefox-101.0-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/nb-NO.xpi -> firefox-101.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/nl.xpi -> firefox-101.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/nn-NO.xpi -> firefox-101.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/pa-IN.xpi -> firefox-101.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/pl.xpi -> firefox-101.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/pt-BR.xpi -> firefox-101.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/pt-PT.xpi -> firefox-101.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/rm.xpi -> firefox-101.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/ro.xpi -> firefox-101.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/ru.xpi -> firefox-101.0-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/sk.xpi -> firefox-101.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/sl.xpi -> firefox-101.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/sq.xpi -> firefox-101.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/sr.xpi -> firefox-101.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/sv-SE.xpi -> firefox-101.0-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/th.xpi -> firefox-101.0-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/tr.xpi -> firefox-101.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/uk.xpi -> firefox-101.0-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/uz.xpi -> firefox-101.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/vi.xpi -> firefox-101.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/zh-CN.xpi -> firefox-101.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/zh-TW.xpi -> firefox-101.0-zh-TW.xpi ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/ach.xpi -> firefox-101.0-ach.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/an.xpi -> firefox-101.0-an.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/az.xpi -> firefox-101.0-az.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/bn.xpi -> firefox-101.0-bn.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/bs.xpi -> firefox-101.0-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/ca-valencia.xpi -> firefox-101.0-ca-valencia.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/eo.xpi -> firefox-101.0-eo.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/es-CL.xpi -> firefox-101.0-es-CL.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/es-MX.xpi -> firefox-101.0-es-MX.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/fa.xpi -> firefox-101.0-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/ff.xpi -> firefox-101.0-ff.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/gn.xpi -> firefox-101.0-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/gu-IN.xpi -> firefox-101.0-gu-IN.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/hi-IN.xpi -> firefox-101.0-hi-IN.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/hy-AM.xpi -> firefox-101.0-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/ia.xpi -> firefox-101.0-ia.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/km.xpi -> firefox-101.0-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/kn.xpi -> firefox-101.0-kn.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/lij.xpi -> firefox-101.0-lij.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/mk.xpi -> firefox-101.0-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/mr.xpi -> firefox-101.0-mr.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/my.xpi -> firefox-101.0-my.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/ne-NP.xpi -> firefox-101.0-ne-NP.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/oc.xpi -> firefox-101.0-oc.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/sco.xpi -> firefox-101.0-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/si.xpi -> firefox-101.0-si.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/son.xpi -> firefox-101.0-son.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/szl.xpi -> firefox-101.0-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/ta.xpi -> firefox-101.0-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/te.xpi -> firefox-101.0-te.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/tl.xpi -> firefox-101.0-tl.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/trs.xpi -> firefox-101.0-trs.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/ur.xpi -> firefox-101.0-ur.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/xh.xpi -> firefox-101.0-xh.xpi )
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	llvm	6f88d422e49b917bf254b2594f3d903c	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=1f8bea136bd619f97ebe799ff7d7bc8e
diff --git a/metadata/md5-cache/www-client/firefox-101.0-r10 b/metadata/md5-cache/www-client/firefox-101.0-r10
deleted file mode 100644
index 3123f86b391a..000000000000
--- a/metadata/md5-cache/www-client/firefox-101.0-r10
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10[ncurses,sqlite,ssl] >=dev-lang/python-3.9.9-r1:3.9[ncurses,sqlite,ssl] >=dev-lang/python-3.8.12_p1-r1:3.8[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.23.0 >=net-libs/nodejs-10.23.1 virtual/pkgconfig >=virtual/rust-1.59.0 || ( ( sys-devel/clang:14 sys-devel/llvm:14 clang? ( =sys-devel/lld-14* pgo? ( =sys-libs/compiler-rt-sanitizers-14*[profile] ) ) ) ( sys-devel/clang:13 sys-devel/llvm:13 clang? ( =sys-devel/lld-13* pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] ) ) ) ( sys-devel/clang:12 sys-devel/llvm:12 clang? ( =sys-devel/lld-12* pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] ) ) ) ) amd64? ( >=dev-lang/nasm-2.14 ) x86? ( >=dev-lang/nasm-2.14 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=dev-libs/glib:2 dev-libs/atk dev-libs/expat dev-libs/libffi:= >=dev-libs/nss-3.78 >=dev-libs/nspr-4.32 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/mesa media-video/ffmpeg sys-libs/zlib virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/pango x11-libs/pixman dbus? ( dev-libs/dbus-glib sys-apps/dbus ) jack? ( virtual/jack ) libproxy? ( net-libs/libproxy ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( media-sound/sndio ) screencast? ( media-video/pipewire:= ) system-av1? ( >=media-libs/dav1d-0.9.3:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.13 >=media-libs/harfbuzz-2.8.1:0= ) system-icu? ( >=dev-libs/icu-71.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wayland? ( x11-libs/gtk+:3[wayland] x11-libs/libdrm x11-libs/libxkbcommon[wayland] ) wifi? ( kernel_linux? ( dev-libs/dbus-glib net-misc/networkmanager sys-apps/dbus ) ) X? ( virtual/opengl x11-libs/cairo[X] x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon[X] x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb:= ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) X? ( x11-libs/libICE x11-libs/libSM ) !!sys-devel/llvm:0
-DESCRIPTION=Firefox Web Browser
-EAPI=8
-HOMEPAGE=https://www.mozilla.com/firefox
-INHERIT=autotools check-reqs desktop flag-o-matic gnome2-utils linux-info llvm multiprocessing pax-utils python-any-r1 toolchain-funcs virtualx xdg
-IUSE=+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel jack libproxy lto +openh264 pgo pulseaudio sndio selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp wayland wifi geckodriver +gmp-autoupdate screencast +X l10n_af l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt l10n_lv l10n_ms l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW l10n_ach l10n_an l10n_az l10n_bn l10n_bs l10n_ca-valencia l10n_eo l10n_es-CL l10n_es-MX l10n_fa l10n_ff l10n_gn l10n_gu l10n_hi l10n_hy l10n_ia l10n_km l10n_kn l10n_lij l10n_mk l10n_mr l10n_my l10n_ne l10n_oc l10n_sco l10n_si l10n_son l10n_szl l10n_ta l10n_te l10n_tl l10n_trs l10n_ur l10n_xh pgo
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=dev-libs/glib:2 dev-libs/atk dev-libs/expat dev-libs/libffi:= >=dev-libs/nss-3.78 >=dev-libs/nspr-4.32 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/mesa media-video/ffmpeg sys-libs/zlib virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/pango x11-libs/pixman dbus? ( dev-libs/dbus-glib sys-apps/dbus ) jack? ( virtual/jack ) libproxy? ( net-libs/libproxy ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( media-sound/sndio ) screencast? ( media-video/pipewire:= ) system-av1? ( >=media-libs/dav1d-0.9.3:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.13 >=media-libs/harfbuzz-2.8.1:0= ) system-icu? ( >=dev-libs/icu-71.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wayland? ( x11-libs/gtk+:3[wayland] x11-libs/libdrm x11-libs/libxkbcommon[wayland] ) wifi? ( kernel_linux? ( dev-libs/dbus-glib net-misc/networkmanager sys-apps/dbus ) ) X? ( virtual/opengl x11-libs/cairo[X] x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon[X] x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb:= ) !www-client/firefox:0 !www-client/firefox:esr jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) ) selinux? ( sec-policy/selinux-mozilla )
-REQUIRED_USE=debug? ( !system-av1 ) pgo? ( lto ) wayland? ( dbus ) wifi? ( dbus ) || ( X wayland ) pgo? ( X ) screencast? ( wayland )
-SLOT=rapid
-SRC_URI=https://archive.mozilla.org/pub/firefox/releases/101.0/source/firefox-101.0.source.tar.xz -> firefox-101.0.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-101-patches-03j.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-101-patches-03j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-101-patches-03j.tar.xz https://dev.gentoo.org/~slashbeast/mozilla/patchsets/firefox-101-patches-03j.tar.xz l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/af.xpi -> firefox-101.0-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/ar.xpi -> firefox-101.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/ast.xpi -> firefox-101.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/be.xpi -> firefox-101.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/bg.xpi -> firefox-101.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/br.xpi -> firefox-101.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/ca.xpi -> firefox-101.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/cak.xpi -> firefox-101.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/cs.xpi -> firefox-101.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/cy.xpi -> firefox-101.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/da.xpi -> firefox-101.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/de.xpi -> firefox-101.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/dsb.xpi -> firefox-101.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/el.xpi -> firefox-101.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/en-CA.xpi -> firefox-101.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/en-GB.xpi -> firefox-101.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/es-AR.xpi -> firefox-101.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/es-ES.xpi -> firefox-101.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/et.xpi -> firefox-101.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/eu.xpi -> firefox-101.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/fi.xpi -> firefox-101.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/fr.xpi -> firefox-101.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/fy-NL.xpi -> firefox-101.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/ga-IE.xpi -> firefox-101.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/gd.xpi -> firefox-101.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/gl.xpi -> firefox-101.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/he.xpi -> firefox-101.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/hr.xpi -> firefox-101.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/hsb.xpi -> firefox-101.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/hu.xpi -> firefox-101.0-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/id.xpi -> firefox-101.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/is.xpi -> firefox-101.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/it.xpi -> firefox-101.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/ja.xpi -> firefox-101.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/ka.xpi -> firefox-101.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/kab.xpi -> firefox-101.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/kk.xpi -> firefox-101.0-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/ko.xpi -> firefox-101.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/lt.xpi -> firefox-101.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/lv.xpi -> firefox-101.0-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/ms.xpi -> firefox-101.0-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/nb-NO.xpi -> firefox-101.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/nl.xpi -> firefox-101.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/nn-NO.xpi -> firefox-101.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/pa-IN.xpi -> firefox-101.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/pl.xpi -> firefox-101.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/pt-BR.xpi -> firefox-101.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/pt-PT.xpi -> firefox-101.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/rm.xpi -> firefox-101.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/ro.xpi -> firefox-101.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/ru.xpi -> firefox-101.0-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/sk.xpi -> firefox-101.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/sl.xpi -> firefox-101.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/sq.xpi -> firefox-101.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/sr.xpi -> firefox-101.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/sv-SE.xpi -> firefox-101.0-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/th.xpi -> firefox-101.0-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/tr.xpi -> firefox-101.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/uk.xpi -> firefox-101.0-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/uz.xpi -> firefox-101.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/vi.xpi -> firefox-101.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/zh-CN.xpi -> firefox-101.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/zh-TW.xpi -> firefox-101.0-zh-TW.xpi ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/ach.xpi -> firefox-101.0-ach.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/an.xpi -> firefox-101.0-an.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/az.xpi -> firefox-101.0-az.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/bn.xpi -> firefox-101.0-bn.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/bs.xpi -> firefox-101.0-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/ca-valencia.xpi -> firefox-101.0-ca-valencia.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/eo.xpi -> firefox-101.0-eo.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/es-CL.xpi -> firefox-101.0-es-CL.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/es-MX.xpi -> firefox-101.0-es-MX.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/fa.xpi -> firefox-101.0-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/ff.xpi -> firefox-101.0-ff.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/gn.xpi -> firefox-101.0-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/gu-IN.xpi -> firefox-101.0-gu-IN.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/hi-IN.xpi -> firefox-101.0-hi-IN.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/hy-AM.xpi -> firefox-101.0-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/ia.xpi -> firefox-101.0-ia.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/km.xpi -> firefox-101.0-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/kn.xpi -> firefox-101.0-kn.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/lij.xpi -> firefox-101.0-lij.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/mk.xpi -> firefox-101.0-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/mr.xpi -> firefox-101.0-mr.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/my.xpi -> firefox-101.0-my.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/ne-NP.xpi -> firefox-101.0-ne-NP.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/oc.xpi -> firefox-101.0-oc.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/sco.xpi -> firefox-101.0-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/si.xpi -> firefox-101.0-si.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/son.xpi -> firefox-101.0-son.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/szl.xpi -> firefox-101.0-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/ta.xpi -> firefox-101.0-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/te.xpi -> firefox-101.0-te.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/tl.xpi -> firefox-101.0-tl.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/trs.xpi -> firefox-101.0-trs.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/ur.xpi -> firefox-101.0-ur.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/101.0/linux-x86_64/xpi/xh.xpi -> firefox-101.0-xh.xpi )
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	llvm	6f88d422e49b917bf254b2594f3d903c	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=80ae7c10c750a8460fd2a58e8811f7dc
diff --git a/metadata/md5-cache/www-client/firefox-101.0.1 b/metadata/md5-cache/www-client/firefox-101.0.1
index 03f8d45d4f51..2fbd44300550 100644
--- a/metadata/md5-cache/www-client/firefox-101.0.1
+++ b/metadata/md5-cache/www-client/firefox-101.0.1
@@ -11,6 +11,6 @@ LICENSE=MPL-2.0 GPL-2 LGPL-2.1
 RDEPEND=dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/libffi:= >=dev-libs/nss-3.78 >=dev-libs/nspr-4.32 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/mesa media-video/ffmpeg sys-libs/zlib virtual/freedesktop-icon-theme x11-libs/cairo[X] x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libxcb:= x11-libs/pango x11-libs/pixman dbus? ( dev-libs/dbus-glib sys-apps/dbus ) jack? ( virtual/jack ) libproxy? ( net-libs/libproxy ) screencast? ( media-video/pipewire:= ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( >=media-sound/sndio-1.8.0-r1 ) system-av1? ( >=media-libs/dav1d-0.9.3:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.13 >=media-libs/harfbuzz-2.8.1:0= ) system-icu? ( >=dev-libs/icu-71.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( dev-libs/dbus-glib net-misc/networkmanager sys-apps/dbus ) ) !www-client/firefox:0 !www-client/firefox:esr jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) ) selinux? ( sec-policy/selinux-mozilla )
 REQUIRED_USE=debug? ( !system-av1 ) pgo? ( lto ) wayland? ( dbus ) wifi? ( dbus ) screencast? ( wayland )
 SLOT=rapid
-SRC_URI=https://archive.mozilla.org/pub/firefox/releases/101.0.1/source/firefox-101.0.1.source.tar.xz -> firefox-101.0.1.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-101-patches-04j.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-101-patches-04j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-101-patches-04j.tar.xz https://dev.gentoo.org/~slashbeast/mozilla/patchsets/firefox-101-patches-04j.tar.xz l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/af.xpi -> firefox-101.0.1-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ar.xpi -> firefox-101.0.1-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ast.xpi -> firefox-101.0.1-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/be.xpi -> firefox-101.0.1-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/bg.xpi -> firefox-101.0.1-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/br.xpi -> firefox-101.0.1-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ca.xpi -> firefox-101.0.1-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/cak.xpi -> firefox-101.0.1-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/cs.xpi -> firefox-101.0.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/cy.xpi -> firefox-101.0.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/da.xpi -> firefox-101.0.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/de.xpi -> firefox-101.0.1-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/dsb.xpi -> firefox-101.0.1-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/el.xpi -> firefox-101.0.1-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/en-CA.xpi -> firefox-101.0.1-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/en-GB.xpi -> firefox-101.0.1-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/es-AR.xpi -> firefox-101.0.1-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/es-ES.xpi -> firefox-101.0.1-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/et.xpi -> firefox-101.0.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/eu.xpi -> firefox-101.0.1-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/fi.xpi -> firefox-101.0.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/fr.xpi -> firefox-101.0.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/fy-NL.xpi -> firefox-101.0.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ga-IE.xpi -> firefox-101.0.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/gd.xpi -> firefox-101.0.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/gl.xpi -> firefox-101.0.1-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/he.xpi -> firefox-101.0.1-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/hr.xpi -> firefox-101.0.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/hsb.xpi -> firefox-101.0.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/hu.xpi -> firefox-101.0.1-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/id.xpi -> firefox-101.0.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/is.xpi -> firefox-101.0.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/it.xpi -> firefox-101.0.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ja.xpi -> firefox-101.0.1-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ka.xpi -> firefox-101.0.1-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/kab.xpi -> firefox-101.0.1-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/kk.xpi -> firefox-101.0.1-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ko.xpi -> firefox-101.0.1-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/lt.xpi -> firefox-101.0.1-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/lv.xpi -> firefox-101.0.1-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ms.xpi -> firefox-101.0.1-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/nb-NO.xpi -> firefox-101.0.1-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/nl.xpi -> firefox-101.0.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/nn-NO.xpi -> firefox-101.0.1-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/pa-IN.xpi -> firefox-101.0.1-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/pl.xpi -> firefox-101.0.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/pt-BR.xpi -> firefox-101.0.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/pt-PT.xpi -> firefox-101.0.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/rm.xpi -> firefox-101.0.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ro.xpi -> firefox-101.0.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ru.xpi -> firefox-101.0.1-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/sk.xpi -> firefox-101.0.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/sl.xpi -> firefox-101.0.1-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/sq.xpi -> firefox-101.0.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/sr.xpi -> firefox-101.0.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/sv-SE.xpi -> firefox-101.0.1-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/th.xpi -> firefox-101.0.1-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/tr.xpi -> firefox-101.0.1-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/uk.xpi -> firefox-101.0.1-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/uz.xpi -> firefox-101.0.1-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/vi.xpi -> firefox-101.0.1-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/zh-CN.xpi -> firefox-101.0.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/zh-TW.xpi -> firefox-101.0.1-zh-TW.xpi ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ach.xpi -> firefox-101.0.1-ach.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/an.xpi -> firefox-101.0.1-an.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/az.xpi -> firefox-101.0.1-az.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/bn.xpi -> firefox-101.0.1-bn.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/bs.xpi -> firefox-101.0.1-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ca-valencia.xpi -> firefox-101.0.1-ca-valencia.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/eo.xpi -> firefox-101.0.1-eo.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/es-CL.xpi -> firefox-101.0.1-es-CL.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/es-MX.xpi -> firefox-101.0.1-es-MX.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/fa.xpi -> firefox-101.0.1-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ff.xpi -> firefox-101.0.1-ff.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/gn.xpi -> firefox-101.0.1-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/gu-IN.xpi -> firefox-101.0.1-gu-IN.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/hi-IN.xpi -> firefox-101.0.1-hi-IN.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/hy-AM.xpi -> firefox-101.0.1-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ia.xpi -> firefox-101.0.1-ia.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/km.xpi -> firefox-101.0.1-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/kn.xpi -> firefox-101.0.1-kn.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/lij.xpi -> firefox-101.0.1-lij.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/mk.xpi -> firefox-101.0.1-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/mr.xpi -> firefox-101.0.1-mr.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/my.xpi -> firefox-101.0.1-my.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ne-NP.xpi -> firefox-101.0.1-ne-NP.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/oc.xpi -> firefox-101.0.1-oc.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/sco.xpi -> firefox-101.0.1-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/si.xpi -> firefox-101.0.1-si.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/son.xpi -> firefox-101.0.1-son.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/szl.xpi -> firefox-101.0.1-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ta.xpi -> firefox-101.0.1-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/te.xpi -> firefox-101.0.1-te.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/tl.xpi -> firefox-101.0.1-tl.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/trs.xpi -> firefox-101.0.1-trs.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ur.xpi -> firefox-101.0.1-ur.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/xh.xpi -> firefox-101.0.1-xh.xpi )
+SRC_URI=https://archive.mozilla.org/pub/firefox/releases/101.0.1/source/firefox-101.0.1.source.tar.xz -> firefox-101.0.1.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-101-patches-05j.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-101-patches-05j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-101-patches-05j.tar.xz https://dev.gentoo.org/~slashbeast/mozilla/patchsets/firefox-101-patches-05j.tar.xz l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/af.xpi -> firefox-101.0.1-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ar.xpi -> firefox-101.0.1-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ast.xpi -> firefox-101.0.1-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/be.xpi -> firefox-101.0.1-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/bg.xpi -> firefox-101.0.1-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/br.xpi -> firefox-101.0.1-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ca.xpi -> firefox-101.0.1-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/cak.xpi -> firefox-101.0.1-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/cs.xpi -> firefox-101.0.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/cy.xpi -> firefox-101.0.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/da.xpi -> firefox-101.0.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/de.xpi -> firefox-101.0.1-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/dsb.xpi -> firefox-101.0.1-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/el.xpi -> firefox-101.0.1-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/en-CA.xpi -> firefox-101.0.1-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/en-GB.xpi -> firefox-101.0.1-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/es-AR.xpi -> firefox-101.0.1-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/es-ES.xpi -> firefox-101.0.1-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/et.xpi -> firefox-101.0.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/eu.xpi -> firefox-101.0.1-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/fi.xpi -> firefox-101.0.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/fr.xpi -> firefox-101.0.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/fy-NL.xpi -> firefox-101.0.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ga-IE.xpi -> firefox-101.0.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/gd.xpi -> firefox-101.0.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/gl.xpi -> firefox-101.0.1-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/he.xpi -> firefox-101.0.1-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/hr.xpi -> firefox-101.0.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/hsb.xpi -> firefox-101.0.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/hu.xpi -> firefox-101.0.1-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/id.xpi -> firefox-101.0.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/is.xpi -> firefox-101.0.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/it.xpi -> firefox-101.0.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ja.xpi -> firefox-101.0.1-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ka.xpi -> firefox-101.0.1-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/kab.xpi -> firefox-101.0.1-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/kk.xpi -> firefox-101.0.1-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ko.xpi -> firefox-101.0.1-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/lt.xpi -> firefox-101.0.1-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/lv.xpi -> firefox-101.0.1-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ms.xpi -> firefox-101.0.1-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/nb-NO.xpi -> firefox-101.0.1-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/nl.xpi -> firefox-101.0.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/nn-NO.xpi -> firefox-101.0.1-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/pa-IN.xpi -> firefox-101.0.1-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/pl.xpi -> firefox-101.0.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/pt-BR.xpi -> firefox-101.0.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/pt-PT.xpi -> firefox-101.0.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/rm.xpi -> firefox-101.0.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ro.xpi -> firefox-101.0.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ru.xpi -> firefox-101.0.1-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/sk.xpi -> firefox-101.0.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/sl.xpi -> firefox-101.0.1-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/sq.xpi -> firefox-101.0.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/sr.xpi -> firefox-101.0.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/sv-SE.xpi -> firefox-101.0.1-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/th.xpi -> firefox-101.0.1-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/tr.xpi -> firefox-101.0.1-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/uk.xpi -> firefox-101.0.1-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/uz.xpi -> firefox-101.0.1-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/vi.xpi -> firefox-101.0.1-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/zh-CN.xpi -> firefox-101.0.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/zh-TW.xpi -> firefox-101.0.1-zh-TW.xpi ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ach.xpi -> firefox-101.0.1-ach.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/an.xpi -> firefox-101.0.1-an.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/az.xpi -> firefox-101.0.1-az.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/bn.xpi -> firefox-101.0.1-bn.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/bs.xpi -> firefox-101.0.1-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ca-valencia.xpi -> firefox-101.0.1-ca-valencia.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/eo.xpi -> firefox-101.0.1-eo.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/es-CL.xpi -> firefox-101.0.1-es-CL.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/es-MX.xpi -> firefox-101.0.1-es-MX.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/fa.xpi -> firefox-101.0.1-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ff.xpi -> firefox-101.0.1-ff.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/gn.xpi -> firefox-101.0.1-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/gu-IN.xpi -> firefox-101.0.1-gu-IN.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/hi-IN.xpi -> firefox-101.0.1-hi-IN.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/hy-AM.xpi -> firefox-101.0.1-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ia.xpi -> firefox-101.0.1-ia.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/km.xpi -> firefox-101.0.1-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/kn.xpi -> firefox-101.0.1-kn.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/lij.xpi -> firefox-101.0.1-lij.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/mk.xpi -> firefox-101.0.1-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/mr.xpi -> firefox-101.0.1-mr.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/my.xpi -> firefox-101.0.1-my.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ne-NP.xpi -> firefox-101.0.1-ne-NP.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/oc.xpi -> firefox-101.0.1-oc.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/sco.xpi -> firefox-101.0.1-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/si.xpi -> firefox-101.0.1-si.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/son.xpi -> firefox-101.0.1-son.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/szl.xpi -> firefox-101.0.1-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ta.xpi -> firefox-101.0.1-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/te.xpi -> firefox-101.0.1-te.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/tl.xpi -> firefox-101.0.1-tl.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/trs.xpi -> firefox-101.0.1-trs.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ur.xpi -> firefox-101.0.1-ur.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/xh.xpi -> firefox-101.0.1-xh.xpi )
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	llvm	6f88d422e49b917bf254b2594f3d903c	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=79e337b57f19379a2a661af28f029f4a
+_md5_=876837b352a0702a0fbef2b6684d6085
diff --git a/metadata/md5-cache/www-client/firefox-101.0.1-r10 b/metadata/md5-cache/www-client/firefox-101.0.1-r10
index bc2c7e32948d..cd92782b35b1 100644
--- a/metadata/md5-cache/www-client/firefox-101.0.1-r10
+++ b/metadata/md5-cache/www-client/firefox-101.0.1-r10
@@ -11,6 +11,6 @@ LICENSE=MPL-2.0 GPL-2 LGPL-2.1
 RDEPEND=dev-libs/glib:2 dev-libs/atk dev-libs/expat dev-libs/libffi:= >=dev-libs/nss-3.78 >=dev-libs/nspr-4.32 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/mesa media-video/ffmpeg sys-libs/zlib virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/pango x11-libs/pixman dbus? ( dev-libs/dbus-glib sys-apps/dbus ) jack? ( virtual/jack ) libproxy? ( net-libs/libproxy ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( >=media-sound/sndio-1.8.0-r1 ) screencast? ( media-video/pipewire:= ) system-av1? ( >=media-libs/dav1d-0.9.3:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.13 >=media-libs/harfbuzz-2.8.1:0= ) system-icu? ( >=dev-libs/icu-71.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wayland? ( x11-libs/gtk+:3[wayland] x11-libs/libdrm x11-libs/libxkbcommon[wayland] ) wifi? ( kernel_linux? ( dev-libs/dbus-glib net-misc/networkmanager sys-apps/dbus ) ) X? ( virtual/opengl x11-libs/cairo[X] x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon[X] x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb:= ) !www-client/firefox:0 !www-client/firefox:esr jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) ) selinux? ( sec-policy/selinux-mozilla )
 REQUIRED_USE=debug? ( !system-av1 ) pgo? ( lto ) wayland? ( dbus ) wifi? ( dbus ) || ( X wayland ) pgo? ( X ) screencast? ( wayland )
 SLOT=rapid
-SRC_URI=https://archive.mozilla.org/pub/firefox/releases/101.0.1/source/firefox-101.0.1.source.tar.xz -> firefox-101.0.1.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-101-patches-04jwl.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-101-patches-04jwl.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-101-patches-04jwl.tar.xz https://dev.gentoo.org/~slashbeast/mozilla/patchsets/firefox-101-patches-04jwl.tar.xz l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/af.xpi -> firefox-101.0.1-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ar.xpi -> firefox-101.0.1-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ast.xpi -> firefox-101.0.1-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/be.xpi -> firefox-101.0.1-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/bg.xpi -> firefox-101.0.1-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/br.xpi -> firefox-101.0.1-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ca.xpi -> firefox-101.0.1-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/cak.xpi -> firefox-101.0.1-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/cs.xpi -> firefox-101.0.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/cy.xpi -> firefox-101.0.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/da.xpi -> firefox-101.0.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/de.xpi -> firefox-101.0.1-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/dsb.xpi -> firefox-101.0.1-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/el.xpi -> firefox-101.0.1-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/en-CA.xpi -> firefox-101.0.1-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/en-GB.xpi -> firefox-101.0.1-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/es-AR.xpi -> firefox-101.0.1-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/es-ES.xpi -> firefox-101.0.1-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/et.xpi -> firefox-101.0.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/eu.xpi -> firefox-101.0.1-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/fi.xpi -> firefox-101.0.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/fr.xpi -> firefox-101.0.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/fy-NL.xpi -> firefox-101.0.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ga-IE.xpi -> firefox-101.0.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/gd.xpi -> firefox-101.0.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/gl.xpi -> firefox-101.0.1-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/he.xpi -> firefox-101.0.1-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/hr.xpi -> firefox-101.0.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/hsb.xpi -> firefox-101.0.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/hu.xpi -> firefox-101.0.1-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/id.xpi -> firefox-101.0.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/is.xpi -> firefox-101.0.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/it.xpi -> firefox-101.0.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ja.xpi -> firefox-101.0.1-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ka.xpi -> firefox-101.0.1-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/kab.xpi -> firefox-101.0.1-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/kk.xpi -> firefox-101.0.1-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ko.xpi -> firefox-101.0.1-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/lt.xpi -> firefox-101.0.1-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/lv.xpi -> firefox-101.0.1-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ms.xpi -> firefox-101.0.1-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/nb-NO.xpi -> firefox-101.0.1-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/nl.xpi -> firefox-101.0.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/nn-NO.xpi -> firefox-101.0.1-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/pa-IN.xpi -> firefox-101.0.1-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/pl.xpi -> firefox-101.0.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/pt-BR.xpi -> firefox-101.0.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/pt-PT.xpi -> firefox-101.0.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/rm.xpi -> firefox-101.0.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ro.xpi -> firefox-101.0.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ru.xpi -> firefox-101.0.1-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/sk.xpi -> firefox-101.0.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/sl.xpi -> firefox-101.0.1-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/sq.xpi -> firefox-101.0.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/sr.xpi -> firefox-101.0.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/sv-SE.xpi -> firefox-101.0.1-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/th.xpi -> firefox-101.0.1-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/tr.xpi -> firefox-101.0.1-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/uk.xpi -> firefox-101.0.1-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/uz.xpi -> firefox-101.0.1-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/vi.xpi -> firefox-101.0.1-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/zh-CN.xpi -> firefox-101.0.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/zh-TW.xpi -> firefox-101.0.1-zh-TW.xpi ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ach.xpi -> firefox-101.0.1-ach.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/an.xpi -> firefox-101.0.1-an.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/az.xpi -> firefox-101.0.1-az.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/bn.xpi -> firefox-101.0.1-bn.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/bs.xpi -> firefox-101.0.1-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ca-valencia.xpi -> firefox-101.0.1-ca-valencia.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/eo.xpi -> firefox-101.0.1-eo.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/es-CL.xpi -> firefox-101.0.1-es-CL.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/es-MX.xpi -> firefox-101.0.1-es-MX.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/fa.xpi -> firefox-101.0.1-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ff.xpi -> firefox-101.0.1-ff.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/gn.xpi -> firefox-101.0.1-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/gu-IN.xpi -> firefox-101.0.1-gu-IN.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/hi-IN.xpi -> firefox-101.0.1-hi-IN.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/hy-AM.xpi -> firefox-101.0.1-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ia.xpi -> firefox-101.0.1-ia.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/km.xpi -> firefox-101.0.1-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/kn.xpi -> firefox-101.0.1-kn.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/lij.xpi -> firefox-101.0.1-lij.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/mk.xpi -> firefox-101.0.1-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/mr.xpi -> firefox-101.0.1-mr.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/my.xpi -> firefox-101.0.1-my.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ne-NP.xpi -> firefox-101.0.1-ne-NP.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/oc.xpi -> firefox-101.0.1-oc.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/sco.xpi -> firefox-101.0.1-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/si.xpi -> firefox-101.0.1-si.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/son.xpi -> firefox-101.0.1-son.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/szl.xpi -> firefox-101.0.1-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ta.xpi -> firefox-101.0.1-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/te.xpi -> firefox-101.0.1-te.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/tl.xpi -> firefox-101.0.1-tl.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/trs.xpi -> firefox-101.0.1-trs.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ur.xpi -> firefox-101.0.1-ur.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/xh.xpi -> firefox-101.0.1-xh.xpi )
+SRC_URI=https://archive.mozilla.org/pub/firefox/releases/101.0.1/source/firefox-101.0.1.source.tar.xz -> firefox-101.0.1.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-101-patches-05jwl.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-101-patches-05jwl.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-101-patches-05jwl.tar.xz https://dev.gentoo.org/~slashbeast/mozilla/patchsets/firefox-101-patches-05jwl.tar.xz l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/af.xpi -> firefox-101.0.1-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ar.xpi -> firefox-101.0.1-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ast.xpi -> firefox-101.0.1-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/be.xpi -> firefox-101.0.1-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/bg.xpi -> firefox-101.0.1-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/br.xpi -> firefox-101.0.1-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ca.xpi -> firefox-101.0.1-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/cak.xpi -> firefox-101.0.1-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/cs.xpi -> firefox-101.0.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/cy.xpi -> firefox-101.0.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/da.xpi -> firefox-101.0.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/de.xpi -> firefox-101.0.1-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/dsb.xpi -> firefox-101.0.1-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/el.xpi -> firefox-101.0.1-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/en-CA.xpi -> firefox-101.0.1-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/en-GB.xpi -> firefox-101.0.1-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/es-AR.xpi -> firefox-101.0.1-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/es-ES.xpi -> firefox-101.0.1-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/et.xpi -> firefox-101.0.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/eu.xpi -> firefox-101.0.1-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/fi.xpi -> firefox-101.0.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/fr.xpi -> firefox-101.0.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/fy-NL.xpi -> firefox-101.0.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ga-IE.xpi -> firefox-101.0.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/gd.xpi -> firefox-101.0.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/gl.xpi -> firefox-101.0.1-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/he.xpi -> firefox-101.0.1-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/hr.xpi -> firefox-101.0.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/hsb.xpi -> firefox-101.0.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/hu.xpi -> firefox-101.0.1-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/id.xpi -> firefox-101.0.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/is.xpi -> firefox-101.0.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/it.xpi -> firefox-101.0.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ja.xpi -> firefox-101.0.1-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ka.xpi -> firefox-101.0.1-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/kab.xpi -> firefox-101.0.1-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/kk.xpi -> firefox-101.0.1-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ko.xpi -> firefox-101.0.1-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/lt.xpi -> firefox-101.0.1-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/lv.xpi -> firefox-101.0.1-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ms.xpi -> firefox-101.0.1-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/nb-NO.xpi -> firefox-101.0.1-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/nl.xpi -> firefox-101.0.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/nn-NO.xpi -> firefox-101.0.1-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/pa-IN.xpi -> firefox-101.0.1-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/pl.xpi -> firefox-101.0.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/pt-BR.xpi -> firefox-101.0.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/pt-PT.xpi -> firefox-101.0.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/rm.xpi -> firefox-101.0.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ro.xpi -> firefox-101.0.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ru.xpi -> firefox-101.0.1-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/sk.xpi -> firefox-101.0.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/sl.xpi -> firefox-101.0.1-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/sq.xpi -> firefox-101.0.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/sr.xpi -> firefox-101.0.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/sv-SE.xpi -> firefox-101.0.1-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/th.xpi -> firefox-101.0.1-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/tr.xpi -> firefox-101.0.1-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/uk.xpi -> firefox-101.0.1-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/uz.xpi -> firefox-101.0.1-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/vi.xpi -> firefox-101.0.1-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/zh-CN.xpi -> firefox-101.0.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/zh-TW.xpi -> firefox-101.0.1-zh-TW.xpi ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ach.xpi -> firefox-101.0.1-ach.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/an.xpi -> firefox-101.0.1-an.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/az.xpi -> firefox-101.0.1-az.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/bn.xpi -> firefox-101.0.1-bn.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/bs.xpi -> firefox-101.0.1-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ca-valencia.xpi -> firefox-101.0.1-ca-valencia.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/eo.xpi -> firefox-101.0.1-eo.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/es-CL.xpi -> firefox-101.0.1-es-CL.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/es-MX.xpi -> firefox-101.0.1-es-MX.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/fa.xpi -> firefox-101.0.1-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ff.xpi -> firefox-101.0.1-ff.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/gn.xpi -> firefox-101.0.1-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/gu-IN.xpi -> firefox-101.0.1-gu-IN.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/hi-IN.xpi -> firefox-101.0.1-hi-IN.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/hy-AM.xpi -> firefox-101.0.1-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ia.xpi -> firefox-101.0.1-ia.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/km.xpi -> firefox-101.0.1-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/kn.xpi -> firefox-101.0.1-kn.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/lij.xpi -> firefox-101.0.1-lij.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/mk.xpi -> firefox-101.0.1-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/mr.xpi -> firefox-101.0.1-mr.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/my.xpi -> firefox-101.0.1-my.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ne-NP.xpi -> firefox-101.0.1-ne-NP.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/oc.xpi -> firefox-101.0.1-oc.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/sco.xpi -> firefox-101.0.1-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/si.xpi -> firefox-101.0.1-si.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/son.xpi -> firefox-101.0.1-son.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/szl.xpi -> firefox-101.0.1-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ta.xpi -> firefox-101.0.1-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/te.xpi -> firefox-101.0.1-te.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/tl.xpi -> firefox-101.0.1-tl.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/trs.xpi -> firefox-101.0.1-trs.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ur.xpi -> firefox-101.0.1-ur.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/xh.xpi -> firefox-101.0.1-xh.xpi )
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	llvm	6f88d422e49b917bf254b2594f3d903c	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=04460d34db44864e8c1a9a95ea954267
+_md5_=23b9a6be82bf48a5d9811c8b3dbd5b84
diff --git a/metadata/md5-cache/www-client/microsoft-edge-102.0.1245.39 b/metadata/md5-cache/www-client/microsoft-edge-102.0.1245.41
similarity index 95%
rename from metadata/md5-cache/www-client/microsoft-edge-102.0.1245.39
rename to metadata/md5-cache/www-client/microsoft-edge-102.0.1245.41
index cf3a57ae9271..b43bedd2ad28 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-102.0.1245.39
+++ b/metadata/md5-cache/www-client/microsoft-edge-102.0.1245.41
@@ -9,6 +9,6 @@ LICENSE=microsoft-edge
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils mip? ( app-crypt/libsecret )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_102.0.1245.39-1_amd64.deb
+SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_102.0.1245.41-1_amd64.deb
 _eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	fd9cde67030b26e479eeadaced488253	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=3301d61577802771b104ca2c26903a47
diff --git a/metadata/md5-cache/www-client/opera-88.0.4412.27 b/metadata/md5-cache/www-client/opera-88.0.4412.40
similarity index 58%
rename from metadata/md5-cache/www-client/opera-88.0.4412.27
rename to metadata/md5-cache/www-client/opera-88.0.4412.40
index 03e2b47b2707..db3b001b5925 100644
--- a/metadata/md5-cache/www-client/opera-88.0.4412.27
+++ b/metadata/md5-cache/www-client/opera-88.0.4412.40
@@ -3,12 +3,12 @@ DESCRIPTION=A fast and secure web browser
 EAPI=8
 HOMEPAGE=https://www.opera.com/
 INHERIT=chromium-2 pax-utils xdg unpacker
-IUSE=+proprietary-codecs suid +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+IUSE=+proprietary-codecs suid +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
 KEYWORDS=-* amd64
 LICENSE=OPERA-2018
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://download1.operacdn.com/pub/opera/desktop/88.0.4412.27/linux/opera-stable_88.0.4412.27_amd64.deb https://download2.operacdn.com/pub/opera/desktop/88.0.4412.27/linux/opera-stable_88.0.4412.27_amd64.deb https://download3.operacdn.com/pub/opera/desktop/88.0.4412.27/linux/opera-stable_88.0.4412.27_amd64.deb https://download4.operacdn.com/pub/opera/desktop/88.0.4412.27/linux/opera-stable_88.0.4412.27_amd64.deb proprietary-codecs? ( mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-100.0.4896.20.tar.xz )
+SRC_URI=https://download1.operacdn.com/pub/opera/desktop/88.0.4412.40/linux/opera-stable_88.0.4412.40_amd64.deb https://download2.operacdn.com/pub/opera/desktop/88.0.4412.40/linux/opera-stable_88.0.4412.40_amd64.deb https://download3.operacdn.com/pub/opera/desktop/88.0.4412.40/linux/opera-stable_88.0.4412.40_amd64.deb https://download4.operacdn.com/pub/opera/desktop/88.0.4412.40/linux/opera-stable_88.0.4412.40_amd64.deb proprietary-codecs? ( mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-102.0.5005.61.tar.xz )
 _eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	fd9cde67030b26e479eeadaced488253	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=1dfcbff094fe7fa2e888024eb452cdfb
+_md5_=d926edef9a5598685c8c74a4685e8966
diff --git a/metadata/md5-cache/www-client/opera-beta-88.0.4412.18 b/metadata/md5-cache/www-client/opera-beta-88.0.4412.18-r1
similarity index 76%
rename from metadata/md5-cache/www-client/opera-beta-88.0.4412.18
rename to metadata/md5-cache/www-client/opera-beta-88.0.4412.18-r1
index 0faa9e3f0aa8..3f99c6002d5c 100644
--- a/metadata/md5-cache/www-client/opera-beta-88.0.4412.18
+++ b/metadata/md5-cache/www-client/opera-beta-88.0.4412.18-r1
@@ -3,12 +3,12 @@ DESCRIPTION=A fast and secure web browser
 EAPI=8
 HOMEPAGE=https://www.opera.com/
 INHERIT=chromium-2 pax-utils xdg unpacker
-IUSE=+proprietary-codecs suid +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+IUSE=+proprietary-codecs suid +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
 KEYWORDS=-* ~amd64
 LICENSE=OPERA-2018
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://download1.operacdn.com/pub/opera-beta/88.0.4412.18/linux/opera-beta_88.0.4412.18_amd64.deb https://download2.operacdn.com/pub/opera-beta/88.0.4412.18/linux/opera-beta_88.0.4412.18_amd64.deb https://download3.operacdn.com/pub/opera-beta/88.0.4412.18/linux/opera-beta_88.0.4412.18_amd64.deb https://download4.operacdn.com/pub/opera-beta/88.0.4412.18/linux/opera-beta_88.0.4412.18_amd64.deb proprietary-codecs? ( mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-100.0.4896.20.tar.xz )
+SRC_URI=https://download1.operacdn.com/pub/opera-beta/88.0.4412.18/linux/opera-beta_88.0.4412.18_amd64.deb https://download2.operacdn.com/pub/opera-beta/88.0.4412.18/linux/opera-beta_88.0.4412.18_amd64.deb https://download3.operacdn.com/pub/opera-beta/88.0.4412.18/linux/opera-beta_88.0.4412.18_amd64.deb https://download4.operacdn.com/pub/opera-beta/88.0.4412.18/linux/opera-beta_88.0.4412.18_amd64.deb proprietary-codecs? ( mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-102.0.5005.61.tar.xz )
 _eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	fd9cde67030b26e479eeadaced488253	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=38ad1556b6fb9daf5f944e36d3369844
+_md5_=3d354106d856a8fc7d7958ea47439b09
diff --git a/metadata/md5-cache/www-client/opera-beta-88.0.4412.20 b/metadata/md5-cache/www-client/opera-beta-88.0.4412.20-r1
similarity index 76%
rename from metadata/md5-cache/www-client/opera-beta-88.0.4412.20
rename to metadata/md5-cache/www-client/opera-beta-88.0.4412.20-r1
index 581e63d32400..916c827a2823 100644
--- a/metadata/md5-cache/www-client/opera-beta-88.0.4412.20
+++ b/metadata/md5-cache/www-client/opera-beta-88.0.4412.20-r1
@@ -3,12 +3,12 @@ DESCRIPTION=A fast and secure web browser
 EAPI=8
 HOMEPAGE=https://www.opera.com/
 INHERIT=chromium-2 pax-utils xdg unpacker
-IUSE=+proprietary-codecs suid +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+IUSE=+proprietary-codecs suid +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
 KEYWORDS=-* ~amd64
 LICENSE=OPERA-2018
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://download1.operacdn.com/pub/opera-beta/88.0.4412.20/linux/opera-beta_88.0.4412.20_amd64.deb https://download2.operacdn.com/pub/opera-beta/88.0.4412.20/linux/opera-beta_88.0.4412.20_amd64.deb https://download3.operacdn.com/pub/opera-beta/88.0.4412.20/linux/opera-beta_88.0.4412.20_amd64.deb https://download4.operacdn.com/pub/opera-beta/88.0.4412.20/linux/opera-beta_88.0.4412.20_amd64.deb proprietary-codecs? ( mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-100.0.4896.20.tar.xz )
+SRC_URI=https://download1.operacdn.com/pub/opera-beta/88.0.4412.20/linux/opera-beta_88.0.4412.20_amd64.deb https://download2.operacdn.com/pub/opera-beta/88.0.4412.20/linux/opera-beta_88.0.4412.20_amd64.deb https://download3.operacdn.com/pub/opera-beta/88.0.4412.20/linux/opera-beta_88.0.4412.20_amd64.deb https://download4.operacdn.com/pub/opera-beta/88.0.4412.20/linux/opera-beta_88.0.4412.20_amd64.deb proprietary-codecs? ( mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-102.0.5005.61.tar.xz )
 _eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	fd9cde67030b26e479eeadaced488253	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=38ad1556b6fb9daf5f944e36d3369844
+_md5_=3d354106d856a8fc7d7958ea47439b09
diff --git a/metadata/md5-cache/www-client/opera-beta-88.0.4412.13 b/metadata/md5-cache/www-client/opera-beta-89.0.4447.12
similarity index 55%
rename from metadata/md5-cache/www-client/opera-beta-88.0.4412.13
rename to metadata/md5-cache/www-client/opera-beta-89.0.4447.12
index 55ea7b189218..96b4c43260c7 100644
--- a/metadata/md5-cache/www-client/opera-beta-88.0.4412.13
+++ b/metadata/md5-cache/www-client/opera-beta-89.0.4447.12
@@ -3,12 +3,12 @@ DESCRIPTION=A fast and secure web browser
 EAPI=8
 HOMEPAGE=https://www.opera.com/
 INHERIT=chromium-2 pax-utils xdg unpacker
-IUSE=+proprietary-codecs suid +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+IUSE=+proprietary-codecs suid +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
 KEYWORDS=-* ~amd64
 LICENSE=OPERA-2018
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://download1.operacdn.com/pub/opera-beta/88.0.4412.13/linux/opera-beta_88.0.4412.13_amd64.deb https://download2.operacdn.com/pub/opera-beta/88.0.4412.13/linux/opera-beta_88.0.4412.13_amd64.deb https://download3.operacdn.com/pub/opera-beta/88.0.4412.13/linux/opera-beta_88.0.4412.13_amd64.deb https://download4.operacdn.com/pub/opera-beta/88.0.4412.13/linux/opera-beta_88.0.4412.13_amd64.deb proprietary-codecs? ( mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-100.0.4896.20.tar.xz )
+SRC_URI=https://download1.operacdn.com/pub/opera-beta/89.0.4447.12/linux/opera-beta_89.0.4447.12_amd64.deb https://download2.operacdn.com/pub/opera-beta/89.0.4447.12/linux/opera-beta_89.0.4447.12_amd64.deb https://download3.operacdn.com/pub/opera-beta/89.0.4447.12/linux/opera-beta_89.0.4447.12_amd64.deb https://download4.operacdn.com/pub/opera-beta/89.0.4447.12/linux/opera-beta_89.0.4447.12_amd64.deb proprietary-codecs? ( mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-102.0.5005.61.tar.xz )
 _eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	fd9cde67030b26e479eeadaced488253	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=38ad1556b6fb9daf5f944e36d3369844
+_md5_=3d354106d856a8fc7d7958ea47439b09
diff --git a/metadata/md5-cache/www-client/opera-developer-89.0.4428.0 b/metadata/md5-cache/www-client/opera-developer-90.0.4450.0
similarity index 54%
rename from metadata/md5-cache/www-client/opera-developer-89.0.4428.0
rename to metadata/md5-cache/www-client/opera-developer-90.0.4450.0
index 6df9dd728cbc..2f0bf77cc11d 100644
--- a/metadata/md5-cache/www-client/opera-developer-89.0.4428.0
+++ b/metadata/md5-cache/www-client/opera-developer-90.0.4450.0
@@ -3,12 +3,12 @@ DESCRIPTION=A fast and secure web browser
 EAPI=8
 HOMEPAGE=https://www.opera.com/
 INHERIT=chromium-2 pax-utils xdg unpacker
-IUSE=+proprietary-codecs suid +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+IUSE=+proprietary-codecs suid +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
 KEYWORDS=-* ~amd64
 LICENSE=OPERA-2018
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://download1.operacdn.com/pub/opera-developer/89.0.4428.0/linux/opera-developer_89.0.4428.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/89.0.4428.0/linux/opera-developer_89.0.4428.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/89.0.4428.0/linux/opera-developer_89.0.4428.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/89.0.4428.0/linux/opera-developer_89.0.4428.0_amd64.deb proprietary-codecs? ( mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-100.0.4896.20.tar.xz )
+SRC_URI=https://download1.operacdn.com/pub/opera-developer/90.0.4450.0/linux/opera-developer_90.0.4450.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/90.0.4450.0/linux/opera-developer_90.0.4450.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/90.0.4450.0/linux/opera-developer_90.0.4450.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/90.0.4450.0/linux/opera-developer_90.0.4450.0_amd64.deb proprietary-codecs? ( mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-102.0.5005.61.tar.xz )
 _eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	fd9cde67030b26e479eeadaced488253	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=38ad1556b6fb9daf5f944e36d3369844
+_md5_=3d354106d856a8fc7d7958ea47439b09
diff --git a/metadata/md5-cache/www-client/qutebrowser-2.5.1 b/metadata/md5-cache/www-client/qutebrowser-2.5.1
index 9f40462c3b9b..448639181584 100644
--- a/metadata/md5-cache/www-client/qutebrowser-2.5.1
+++ b/metadata/md5-cache/www-client/qutebrowser-2.5.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.qutebrowser.org/
 INHERIT=distutils-r1 optfeature xdg
 IUSE=+adblock widevine test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 ~x86
 LICENSE=GPL-3+
 RDEPEND=dev-qt/qtcore:5[icu] dev-qt/qtgui:5[png] python_single_target_python3_8? ( dev-python/importlib_resources[python_targets_python3_8(-)] ) python_single_target_python3_8? ( dev-python/colorama[python_targets_python3_8(-)] >=dev-python/jinja-3.0.2[python_targets_python3_8(-)] >=dev-python/markupsafe-2.0.1[python_targets_python3_8(-)] dev-python/pygments[python_targets_python3_8(-)] dev-python/PyQt5[python_targets_python3_8(-),dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets] dev-python/PyQtWebEngine[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-),libyaml(+)] dev-python/zipp[python_targets_python3_8(-)] adblock? ( dev-python/adblock[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/colorama[python_targets_python3_9(-)] >=dev-python/jinja-3.0.2[python_targets_python3_9(-)] >=dev-python/markupsafe-2.0.1[python_targets_python3_9(-)] dev-python/pygments[python_targets_python3_9(-)] dev-python/PyQt5[python_targets_python3_9(-),dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets] dev-python/PyQtWebEngine[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-),libyaml(+)] dev-python/zipp[python_targets_python3_9(-)] adblock? ( dev-python/adblock[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/colorama[python_targets_python3_10(-)] >=dev-python/jinja-3.0.2[python_targets_python3_10(-)] >=dev-python/markupsafe-2.0.1[python_targets_python3_10(-)] dev-python/pygments[python_targets_python3_10(-)] dev-python/PyQt5[python_targets_python3_10(-),dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets] dev-python/PyQtWebEngine[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-),libyaml(+)] dev-python/zipp[python_targets_python3_10(-)] adblock? ( dev-python/adblock[python_targets_python3_10(-)] ) ) widevine? ( www-plugins/chrome-binary-plugins ) python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qutebrowser/qutebrowser/releases/download/v2.5.1/qutebrowser-2.5.1.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=8853225b858f96910339b35c9c7dfdfe
+_md5_=56b5985b9504d97b467a007abdbbb1e8
diff --git a/metadata/md5-cache/www-client/seamonkey-2.53.12 b/metadata/md5-cache/www-client/seamonkey-2.53.12
index f75a14661a07..e047c57d380b 100644
--- a/metadata/md5-cache/www-client/seamonkey-2.53.12
+++ b/metadata/md5-cache/www-client/seamonkey-2.53.12
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.seamonkey-project.org/
 INHERIT=autotools check-reqs desktop edos2unix flag-o-matic mozcoreconf-v6 mozlinguas-v2 pax-utils toolchain-funcs xdg-utils
 IUSE=+chatzilla cpu_flags_arm_neon +crypt dbus debug +gmp-autoupdate +ipc jack lto pulseaudio selinux startup-notification test webrtc wifi +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx +system-png +system-sqlite custom-cflags custom-optimization l10n_cs l10n_de l10n_en-GB l10n_es-AR l10n_es-ES l10n_fr l10n_hu l10n_it l10n_ja l10n_lt l10n_nl l10n_pl l10n_pt-PT l10n_ru l10n_sk l10n_sv l10n_zh-CN l10n_zh-TW
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc64 ~x86
 LICENSE=MPL-2.0 GPL-2 LGPL-2.1
 RDEPEND=app-arch/bzip2 >=app-text/hunspell-1.5.4:= dev-libs/atk >=dev-libs/glib-2.26:2 >=dev-libs/libffi-3.0.10:= >=dev-libs/nspr-4.23 >=dev-libs/nss-3.47.1 media-libs/fontconfig >=media-libs/freetype-2.4.10 >=media-libs/mesa-10.2:= >=sys-libs/zlib-1.2.3 >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-3.4.0:3 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt x11-libs/libxcb:= >=x11-libs/pango-1.22.0 x11-libs/pixman media-video/ffmpeg virtual/freedesktop-icon-theme dbus? ( >=dev-libs/dbus-glib-0.72 >=sys-apps/dbus-0.60 ) jack? ( virtual/jack ) crypt? ( <x11-plugins/enigmail-2.1.0 ) kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.9-r1 >=media-libs/harfbuzz-1.3.3:0= ) system-icu? ( >=dev-libs/icu-59.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-libvpx? ( >=media-libs/libvpx-1.8.0:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.31:0=[apng] ) system-sqlite? ( >=dev-db/sqlite-3.38.2:3[secure-delete,debug=] ) wifi? ( kernel_linux? ( >=dev-libs/dbus-glib-0.72 net-misc/networkmanager >=sys-apps/dbus-0.60 ) ) selinux? ( sec-policy/selinux-mozilla )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/seamonkey/releases/2.53.12/source/seamonkey-2.53.12.source.tar.xz -> seamonkey-2.53.12.source.tar.xz https://archive.mozilla.org/pub/seamonkey/releases/2.53.12/source/seamonkey-2.53.12.source-l10n.tar.xz -> seamonkey-2.53.12.source-l10n.tar.xz https://github.com/BioMike/gentoo-seamonkey-patches/archive/refs/tags/2.53.12.tar.gz -> seamonkey-2.53.12-patches.tar.gz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	mozcoreconf-v6	21e7e253b02750554c96cb0f76359e22	mozextension	d63ee4e7c8fe4efa03011a91a2d7ff83	mozlinguas-v2	c09206fab700c5657f500fc2c9baeb6f	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a58b0af5793ba8e6e70c4ebae954cd32
+_md5_=7660e0b01354b25f471cc65715845125
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-5.3.2679.46 b/metadata/md5-cache/www-client/vivaldi-snapshot-5.4.2704.3
similarity index 57%
rename from metadata/md5-cache/www-client/vivaldi-snapshot-5.3.2679.46
rename to metadata/md5-cache/www-client/vivaldi-snapshot-5.4.2704.3
index a207bf1caabf..35a913924a80 100644
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-5.3.2679.46
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-5.4.2704.3
@@ -3,12 +3,12 @@ DESCRIPTION=A browser for our friends
 EAPI=8
 HOMEPAGE=https://vivaldi.com/
 INHERIT=chromium-2 desktop unpacker xdg
-IUSE=proprietary-codecs widevine +l10n_af +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_io +l10n_it +l10n_ja +l10n_jbo +l10n_kab +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW
+IUSE=proprietary-codecs widevine +l10n_af +l10n_am +l10n_ar +l10n_az +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kab +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pa +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sr-Latn +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW
 KEYWORDS=-* ~amd64 ~arm ~arm64
 LICENSE=Vivaldi
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[gbm(+)] net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/pango[X] || ( gui-libs/gtk:4 x11-libs/gtk+:3 ) proprietary-codecs? ( media-video/ffmpeg-chromium:102 ) widevine? ( www-plugins/chrome-binary-plugins )
 RESTRICT=bindist mirror
 SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.3.2679.46-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.3.2679.46-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.3.2679.46-1_arm64.deb )
+SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.4.2704.3-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.4.2704.3-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.4.2704.3-1_arm64.deb )
 _eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=3e8e820e1edba26b042c2365959e3910
+_md5_=c91ac2d27bf30f3918339336bb7d010d
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index d88a62f8cd3b..a7d669593b9c 100644
Binary files a/metadata/md5-cache/www-servers/Manifest.gz and b/metadata/md5-cache/www-servers/Manifest.gz differ
diff --git a/metadata/md5-cache/www-servers/tomcat-10.0.21 b/metadata/md5-cache/www-servers/tomcat-10.0.21
index f39de2f2f7e1..3e92868c74a4 100644
--- a/metadata/md5-cache/www-servers/tomcat-10.0.21
+++ b/metadata/md5-cache/www-servers/tomcat-10.0.21
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://tomcat.apache.org/
 INHERIT=java-pkg-2 java-ant-2 prefix
 IUSE=extra-webapps doc source test
-KEYWORDS=~amd64 ~amd64-linux
+KEYWORDS=amd64 ~amd64-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 dev-java/jakartaee-migration:0 ~dev-java/tomcat-servlet-api-10.0.21:5.0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=10
 SRC_URI=mirror://apache/tomcat/tomcat-10/v10.0.21/src/apache-tomcat-10.0.21-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/6.2.0/biz.aQute.bnd-6.2.0.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/6.2.0/biz.aQute.bndlib-6.2.0.jar
 _eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=6c0b034a8a7ac21052ec8d535344acd6
+_md5_=b24ff14ee46257c4632ef9a322fd7e9d
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.79 b/metadata/md5-cache/www-servers/tomcat-8.5.79
index f7b2ad8c1e8f..e115c123d618 100644
--- a/metadata/md5-cache/www-servers/tomcat-8.5.79
+++ b/metadata/md5-cache/www-servers/tomcat-8.5.79
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://tomcat.apache.org/
 INHERIT=java-pkg-2 java-ant-2 prefix
 IUSE=extra-webapps doc source test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=dev-java/eclipse-ecj:4.15 ~dev-java/tomcat-servlet-api-8.5.79:3.1 acct-group/tomcat acct-user/tomcat >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=8.5
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.79/src/apache-tomcat-8.5.79-src.tar.gz
 _eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=6fecbc278fa842e188fa386a6ef59362
+_md5_=a349f6c83e999bc4dc1e10e73c82d933
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.81 b/metadata/md5-cache/www-servers/tomcat-8.5.81
new file mode 100644
index 000000000000..72b3cd440e58
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-8.5.81
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=dev-java/eclipse-ecj:4.15 ~dev-java/tomcat-servlet-api-8.5.81:3.1 app-admin/pwgen dev-java/ant-core >=virtual/jdk-1.8:* doc? ( dev-java/glassfish-xmlrpc-api:0 dev-java/wsdl4j:0 ) test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DESCRIPTION=Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-ant-2 prefix
+IUSE=extra-webapps doc source test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=dev-java/eclipse-ecj:4.15 ~dev-java/tomcat-servlet-api-8.5.81:3.1 acct-group/tomcat acct-user/tomcat >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test !test? ( test )
+SLOT=8.5
+SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.81/src/apache-tomcat-8.5.81-src.tar.gz
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=6fecbc278fa842e188fa386a6ef59362
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.63 b/metadata/md5-cache/www-servers/tomcat-9.0.63
index 235fe954ae91..27b25a9016cf 100644
--- a/metadata/md5-cache/www-servers/tomcat-9.0.63
+++ b/metadata/md5-cache/www-servers/tomcat-9.0.63
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://tomcat.apache.org/
 INHERIT=java-pkg-2 java-ant-2 prefix
 IUSE=extra-webapps doc source test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 ~dev-java/tomcat-servlet-api-9.0.63:4.0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=9
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.63/src/apache-tomcat-9.0.63-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/6.2.0/biz.aQute.bnd-6.2.0.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/6.2.0/biz.aQute.bndlib-6.2.0.jar
 _eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=fafc247f2998ffbc741126e488bb3f84
+_md5_=9011e000813038b08b10f89c4ceccac9
diff --git a/metadata/md5-cache/x11-base/Manifest.gz b/metadata/md5-cache/x11-base/Manifest.gz
index 8168f72adf88..6ec64acf7ead 100644
Binary files a/metadata/md5-cache/x11-base/Manifest.gz and b/metadata/md5-cache/x11-base/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-base/xcb-proto-1.15 b/metadata/md5-cache/x11-base/xcb-proto-1.15
index b88e23496136..81eae8141753 100644
--- a/metadata/md5-cache/x11-base/xcb-proto-1.15
+++ b/metadata/md5-cache/x11-base/xcb-proto-1.15
@@ -5,11 +5,11 @@ 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
+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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/proto/xcb-proto-1.15.tar.xz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=708feb2d1f4bca01b3d9ad156b319075
+_md5_=07bf1b03ffea6fdf72a9718028f66e0e
diff --git a/metadata/md5-cache/x11-base/xcb-proto-1.15.1 b/metadata/md5-cache/x11-base/xcb-proto-1.15.1
new file mode 100644
index 000000000000..c14931991d8f
--- /dev/null
+++ b/metadata/md5-cache/x11-base/xcb-proto-1.15.1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) dev-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 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=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/proto/xcb-proto-1.15.1.tar.xz
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	17094cfaab5d74475cc6d251157087b8
+_md5_=721f5ae746e6a17284bc50e42b0e641c
diff --git a/metadata/md5-cache/x11-base/xwayland-22.1.2 b/metadata/md5-cache/x11-base/xwayland-22.1.2
index 98d3e8df06ab..2fd01699c20e 100644
--- a/metadata/md5-cache/x11-base/xwayland-22.1.2
+++ b/metadata/md5-cache/x11-base/xwayland-22.1.2
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://wayland.freedesktop.org/xserver.html
 INHERIT=meson
 IUSE=selinux video_cards_nvidia unwind xcsecurity
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-libs/libbsd dev-libs/openssl:= >=dev-libs/wayland-1.20 >=dev-libs/wayland-protocols-1.22 media-fonts/font-util >=media-libs/libepoxy-1.5.4[X,egl(+)] media-libs/libglvnd[X] >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)] >=x11-libs/libdrm-2.4.89 >=x11-libs/libXau-1.0.4 x11-libs/libxcvt >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 x11-libs/libxkbfile >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xkeyboard-config-2.4.1-r3 unwind? ( sys-libs/libunwind ) video_cards_nvidia? ( gui-libs/egl-wayland ) x11-apps/xkbcomp !<=x11-base/xorg-server-1.20.11 selinux? ( sec-policy/selinux-xserver )
 SLOT=0
 SRC_URI=https://xorg.freedesktop.org/archive/individual/xserver/xwayland-22.1.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=6fb42a5d975963cb120c8e0ddca66757
+_md5_=382082a97be04e9446c778dfd0b0a189
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 417efc11f5bb..387884b96caa 100644
Binary files a/metadata/md5-cache/x11-drivers/Manifest.gz and b/metadata/md5-cache/x11-drivers/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-libinput-1.2.1 b/metadata/md5-cache/x11-drivers/xf86-input-libinput-1.2.1
index 0e888d6ceadb..3e263cbb15e9 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-libinput-1.2.1
+++ b/metadata/md5-cache/x11-drivers/xf86-input-libinput-1.2.1
@@ -5,10 +5,10 @@ DESCRIPTION=X.org input driver based on libinput
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-input-libinput
 INHERIT=linux-info xorg-3
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/libinput-1.11.0:0= x11-base/xorg-server:= >=x11-base/xorg-server-1.20[xorg]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-libinput-1.2.1.tar.xz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=61ffbf0c7e5c2e10e57a1e6ebd115f1b
+_md5_=f5a27e896401a89897ca0b0cd3836e5c
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index dfb09f005e9b..a525bb73c708 100644
Binary files a/metadata/md5-cache/x11-libs/Manifest.gz and b/metadata/md5-cache/x11-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.111 b/metadata/md5-cache/x11-libs/libdrm-2.4.111
index 6481a9ce921b..79412b23c0b4 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.111
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.111
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm
 INHERIT=python-any-r1 meson-multilib
 IUSE=video_cards_amdgpu video_cards_exynos video_cards_freedreno video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_tegra video_cards_vc4 video_cards_vivante video_cards_vmware valgrind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dri.freedesktop.org/libdrm/libdrm-2.4.111.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=2fabe0d3c5013566db5262ff33bd33fe
+_md5_=34bb8726a72efd7c0d2c27903eb543da
diff --git a/metadata/md5-cache/x11-libs/libva-intel-media-driver-22.4.3 b/metadata/md5-cache/x11-libs/libva-intel-media-driver-22.4.3
new file mode 100644
index 000000000000..8192f4c46f54
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libva-intel-media-driver-22.4.3
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=media-libs/gmmlib-22.0.0:= >=x11-libs/libva-2.14.0[X?]
+DESCRIPTION=Intel Media Driver for VAAPI (iHD)
+EAPI=8
+HOMEPAGE=https://github.com/intel/media-driver
+INHERIT=cmake
+IUSE=+redistributable test X
+KEYWORDS=~amd64
+LICENSE=MIT BSD redistributable? ( no-source-code )
+RDEPEND=>=media-libs/gmmlib-22.0.0:= >=x11-libs/libva-2.14.0[X?]
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/intel/media-driver/archive/intel-media-22.4.3.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=100b7bea6e934880fbf531dcb3928803
diff --git a/metadata/md5-cache/x11-libs/libxcb-1.15 b/metadata/md5-cache/x11-libs/libxcb-1.15
index 4908b529629a..4df9591e1833 100644
--- a/metadata/md5-cache/x11-libs/libxcb-1.15
+++ b/metadata/md5-cache/x11-libs/libxcb-1.15
@@ -6,11 +6,11 @@ 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
+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	136117fb43a9bf5598530e9cc642f710	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=e465b4bb06be9b9de8a1389053855286
+_md5_=2c03543c7984fd62017768920376ceb1
diff --git a/metadata/md5-cache/x11-libs/libxkbcommon-1.4.1 b/metadata/md5-cache/x11-libs/libxkbcommon-1.4.1
index 9f733f0825b7..007eb81f2a2a 100644
--- a/metadata/md5-cache/x11-libs/libxkbcommon-1.4.1
+++ b/metadata/md5-cache/x11-libs/libxkbcommon-1.4.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://xkbcommon.org/ https://github.com/xkbcommon/libxkbcommon/
 INHERIT=meson-multilib python-any-r1 virtualx
 IUSE=doc static-libs test tools wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=X? ( >=x11-libs/libxcb-1.10:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,xkb] ) wayland? ( >=dev-libs/wayland-1.2.0 ) dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/compose-tables
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://xkbcommon.org/download/libxkbcommon-1.4.1.tar.xz
 _eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=fbd946b03137cd0f41db3b08c3fa9afc
+_md5_=92aca45b2a232c4c744090dbc5e117d7
diff --git a/metadata/md5-cache/x11-libs/motif-2.3.8-r3 b/metadata/md5-cache/x11-libs/motif-2.3.8-r3
index e149b480b9fd..a87bb09037f3 100644
--- a/metadata/md5-cache/x11-libs/motif-2.3.8-r3
+++ b/metadata/md5-cache/x11-libs/motif-2.3.8-r3
@@ -1,15 +1,15 @@
 BDEPEND=sys-devel/flex dev-util/byacc 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=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXmu-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-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unicode? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xft? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x11-base/xorg-proto x11-misc/xbitmaps
+DEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXmu-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-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jpeg? ( >=media-libs/libjpeg-turbo-1.5.3-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unicode? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xft? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x11-base/xorg-proto x11-misc/xbitmaps
 DESCRIPTION=The Motif user interface component toolkit
 EAPI=8
 HOMEPAGE=https://sourceforge.net/projects/motif/ https://motif.ics.com/
 INHERIT=autotools flag-o-matic toolchain-funcs multilib-minimal
 IUSE=examples jpeg +motif22-compatibility png static-libs unicode xft abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+ MIT
-RDEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXmu-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-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unicode? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xft? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RDEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXmu-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-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jpeg? ( >=media-libs/libjpeg-turbo-1.5.3-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unicode? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xft? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/motif/Motif%202.3.8%20Source%20Code/motif-2.3.8.tar.gz https://dev.gentoo.org/~ulm/distfiles/motif-2.3.8-patches-2.tar.xz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=439c28c3f4c36466f823fafd0733a126
+_md5_=34e0b4e70ae6206e4d8d897732ee3c63
diff --git a/metadata/md5-cache/x11-libs/pango-1.50.7 b/metadata/md5-cache/x11-libs/pango-1.50.7
index d507170112b0..2f562420dea5 100644
--- a/metadata/md5-cache/x11-libs/pango-1.50.7
+++ b/metadata/md5-cache/x11-libs/pango-1.50.7
@@ -1,15 +1,16 @@
-BDEPEND=dev-util/glib-utils sys-apps/help2man virtual/pkgconfig >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=dev-util/glib-utils sys-apps/help2man virtual/pkgconfig test? ( media-fonts/cantarell ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=>=dev-libs/glib-2.62.2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/fribidi-1.0.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/harfbuzz-2.6.0:=[glib(+),introspection?,truetype(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/fontconfig-2.13.0:1.0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.12.10:=[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Internationalized text layout and rendering library
 EAPI=7
 HOMEPAGE=https://www.pango.org/ https://gitlab.gnome.org/GNOME/pango
 INHERIT=flag-o-matic gnome2-utils meson-multilib xdg
-IUSE=debug +introspection sysprof X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+IUSE=debug +introspection sysprof 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
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.62.2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/fribidi-1.0.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/harfbuzz-2.6.0:=[glib(+),introspection?,truetype(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/fontconfig-2.13.0:1.0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.12.10:=[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://ftp.gnome.org/pub/GNOME/sources/pango/1.50/pango-1.50.7.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=305f9c17e3b1bacde66367e87672f501
+_md5_=42db83cc93c927dbc041f509986508b8
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index e40559bcd318..a1717c675076 100644
Binary files a/metadata/md5-cache/x11-misc/Manifest.gz and b/metadata/md5-cache/x11-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-misc/py3status-3.44 b/metadata/md5-cache/x11-misc/py3status-3.45
similarity index 96%
rename from metadata/md5-cache/x11-misc/py3status-3.44
rename to metadata/md5-cache/x11-misc/py3status-3.45
index 7b4ce989c2c1..92c31404d785 100644
--- a/metadata/md5-cache/x11-misc/py3status-3.44
+++ b/metadata/md5-cache/x11-misc/py3status-3.45
@@ -12,6 +12,6 @@ RDEPEND=!minimal? ( x11-misc/i3status ) gevent? ( >=dev-python/gevent-1.2.0[pyth
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/ultrabug/py3status/archive/3.44.tar.gz -> py3status-3.44.tar.gz
+SRC_URI=https://github.com/ultrabug/py3status/archive/3.45.tar.gz -> py3status-3.45.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
 _md5_=b1aa16aaef05caaa89eed5b2211712a6
diff --git a/metadata/md5-cache/x11-misc/xkeyboard-config-2.36 b/metadata/md5-cache/x11-misc/xkeyboard-config-2.36
index 8a5c2f2d306a..a2fcf50a0338 100644
--- a/metadata/md5-cache/x11-misc/xkeyboard-config-2.36
+++ b/metadata/md5-cache/x11-misc/xkeyboard-config-2.36
@@ -4,9 +4,9 @@ DESCRIPTION=X keyboard configuration database
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/XKeyboardConfig https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config
 INHERIT=meson python-any-r1
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/data/xkeyboard-config/xkeyboard-config-2.36.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=52b7928894cedea828b23040156af07c
+_md5_=ae8f49501fc4a6d1068f7152e9f7a836
diff --git a/metadata/md5-cache/x11-plugins/Manifest.gz b/metadata/md5-cache/x11-plugins/Manifest.gz
index 0a538051a337..d2e1f5fd1c66 100644
Binary files a/metadata/md5-cache/x11-plugins/Manifest.gz and b/metadata/md5-cache/x11-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-plugins/asclock-2.0.12-r4 b/metadata/md5-cache/x11-plugins/asclock-2.0.12-r4
new file mode 100644
index 000000000000..a56d1c773090
--- /dev/null
+++ b/metadata/md5-cache/x11-plugins/asclock-2.0.12-r4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=x11-libs/libXpm
+DESCRIPTION=Clock applet for AfterStep
+EAPI=8
+HOMEPAGE=http://tigr.net/afterstep/applets/
+INHERIT=edo toolchain-funcs
+KEYWORDS=~amd64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris
+LICENSE=GPL-2
+RDEPEND=x11-libs/libXpm
+SLOT=0
+SRC_URI=http://www.tigr.net/afterstep/download/asclock/asclock-2.0.12.tar.gz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=13ed612ad59d09a7eb656a25c7f69342
diff --git a/metadata/md5-cache/x11-plugins/cputnik-0.2.0-r1 b/metadata/md5-cache/x11-plugins/cputnik-0.2.0-r1
index fce2722186cc..ccdfadaaff08 100644
--- a/metadata/md5-cache/x11-plugins/cputnik-0.2.0-r1
+++ b/metadata/md5-cache/x11-plugins/cputnik-0.2.0-r1
@@ -10,4 +10,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
 SLOT=0
 SRC_URI=https://www.dockapps.net/download/cputnik-0.2.0.tar.gz
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=998354d42b8c4061f2ab7b8bae81ba73
+_md5_=aadbc98022553e2b42978d39efaa7b68
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 6fd82d7f715e..b4c907f807cc 100644
Binary files a/metadata/md5-cache/x11-terms/Manifest.gz and b/metadata/md5-cache/x11-terms/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-terms/kitty-0.25.2 b/metadata/md5-cache/x11-terms/kitty-0.25.2
index f86d731afc4a..7cbe7dc9672f 100644
--- a/metadata/md5-cache/x11-terms/kitty-0.25.2
+++ b/metadata/md5-cache/x11-terms/kitty-0.25.2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://sw.kovidgoyal.net/kitty/
 INHERIT=optfeature multiprocessing python-single-r1 toolchain-funcs xdg verify-sig
 IUSE=+X debug test transfer wayland python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 verify-sig
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc64 x86
 LICENSE=GPL-3
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) media-libs/fontconfig media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libglvnd[X?] media-libs/libpng:= sys-apps/dbus sys-libs/zlib:= x11-libs/libxkbcommon[X?] x11-misc/xkeyboard-config ~x11-terms/kitty-shell-integration-0.25.2 ~x11-terms/kitty-terminfo-0.25.2 X? ( x11-libs/libX11 ) transfer? ( net-libs/librsync:= ) wayland? ( dev-libs/wayland )
 REQUIRED_USE=|| ( X wayland ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
@@ -14,4 +14,4 @@ RESTRICT=!X? ( test ) !test? ( test ) !transfer? ( test ) !wayland? ( test )
 SLOT=0
 SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.25.2/kitty-0.25.2.tar.xz verify-sig? ( https://github.com/kovidgoyal/kitty/releases/download/v0.25.2/kitty-0.25.2.tar.xz.sig )
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=10e9bd71220fd5e21058e12202bb3868
+_md5_=4e7fe6b63dc6a7b9b36844f35db77f83
diff --git a/metadata/md5-cache/x11-terms/kitty-shell-integration-0.25.2 b/metadata/md5-cache/x11-terms/kitty-shell-integration-0.25.2
index bcfbb5d52447..b1345a5b8579 100644
--- a/metadata/md5-cache/x11-terms/kitty-shell-integration-0.25.2
+++ b/metadata/md5-cache/x11-terms/kitty-shell-integration-0.25.2
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Shell integration scripts for kitty, a GPU-based terminal emulator
 EAPI=8
 HOMEPAGE=https://sw.kovidgoyal.net/kitty/
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc64 x86
 LICENSE=GPL-3
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.25.2/kitty-0.25.2.tar.xz
-_md5_=469ce3d113ca8a046e780aa7f7d5ba3d
+_md5_=39cd40f99a86936d6b3b967d93754dc9
diff --git a/metadata/md5-cache/x11-terms/kitty-terminfo-0.25.2 b/metadata/md5-cache/x11-terms/kitty-terminfo-0.25.2
index 7d3a57813d96..782c9d0650b2 100644
--- a/metadata/md5-cache/x11-terms/kitty-terminfo-0.25.2
+++ b/metadata/md5-cache/x11-terms/kitty-terminfo-0.25.2
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Terminfo for kitty, a GPU-based terminal emulator
 EAPI=8
 HOMEPAGE=https://sw.kovidgoyal.net/kitty/
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc64 x86
 LICENSE=GPL-3
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.25.2/kitty-0.25.2.tar.xz
-_md5_=96d958882b65a1b8fae9dfaa54af8e62
+_md5_=cf8bf569abc26ed4e061f6e2c89b2e26
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 0acd03ee6ee6..13bdf422557a 100644
Binary files a/metadata/md5-cache/x11-wm/Manifest.gz and b/metadata/md5-cache/x11-wm/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-wm/notion-4.0.2_p20220613 b/metadata/md5-cache/x11-wm/notion-4.0.2_p20220613
new file mode 100644
index 000000000000..7fe79c626a14
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/notion-4.0.2_p20220613
@@ -0,0 +1,17 @@
+BDEPEND=lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) virtual/pkgconfig
+DEFINED_PHASES=configure install postinst setup unpack
+DEPEND=lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) x11-libs/libSM x11-libs/libX11 x11-libs/libXext nls? ( sys-devel/gettext ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr )
+DESCRIPTION=Notion is a tiling, tabbed window manager for the X window system
+EAPI=8
+HOMEPAGE=https://notionwm.net/
+INHERIT=lua-single toolchain-funcs readme.gentoo-r1 vcs-snapshot
+IUSE=nls xinerama +xrandr +lua_single_target_lua5-4
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) x11-libs/libSM x11-libs/libX11 x11-libs/libXext nls? ( sys-devel/gettext ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr )
+REQUIRED_USE=^^ ( lua_single_target_lua5-4 ) xrandr? ( xinerama )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/raboof/notion/archive/f161c1b4dbba1ac81d8e9c3d7e5e353058a4d7d1.tar.gz -> notion-4.0.2_p20220613.tar.gz
+_eclasses_=lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vcs-snapshot	19dc666868420457132a7514d4621476
+_md5_=ed2ce1bad68e325f0f4ec97662bb1d62
diff --git a/metadata/md5-cache/x11-wm/notion-9999 b/metadata/md5-cache/x11-wm/notion-9999
index f62b1709816b..9b96508d4584 100644
--- a/metadata/md5-cache/x11-wm/notion-9999
+++ b/metadata/md5-cache/x11-wm/notion-9999
@@ -1,16 +1,16 @@
-BDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=configure install postinst prepare setup unpack
-DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) x11-libs/libSM x11-libs/libX11 x11-libs/libXext nls? ( sys-devel/gettext ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr )
+BDEPEND=lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=configure install postinst setup unpack
+DEPEND=lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) x11-libs/libSM x11-libs/libX11 x11-libs/libXext nls? ( sys-devel/gettext ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr )
 DESCRIPTION=Notion is a tiling, tabbed window manager for the X window system
-EAPI=7
+EAPI=8
 HOMEPAGE=https://notionwm.net/
-INHERIT=git-r3 lua-single toolchain-funcs readme.gentoo-r1
-IUSE=nls xinerama +xrandr +lua_single_target_lua5-1
+INHERIT=lua-single toolchain-funcs readme.gentoo-r1 git-r3
+IUSE=nls xinerama +xrandr +lua_single_target_lua5-4
 LICENSE=LGPL-2.1
 PROPERTIES=live
-RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) x11-libs/libSM x11-libs/libX11 x11-libs/libXext nls? ( sys-devel/gettext ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr )
-REQUIRED_USE=^^ ( lua_single_target_lua5-1 ) xrandr? ( xinerama )
+RDEPEND=lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) x11-libs/libSM x11-libs/libX11 x11-libs/libXext nls? ( sys-devel/gettext ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr )
+REQUIRED_USE=^^ ( lua_single_target_lua5-4 ) xrandr? ( xinerama )
 RESTRICT=test
 SLOT=0
 _eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=14f6b62be50d3d5389ff773075dba54d
+_md5_=f1d3814769d3736473e562d46a388c75
diff --git a/metadata/md5-cache/x11-wm/windowlab-1.40-r2 b/metadata/md5-cache/x11-wm/windowlab-1.40-r2
new file mode 100644
index 000000000000..83262884ab0c
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/windowlab-1.40-r2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst
+DEPEND=truetype? ( x11-libs/libXft ) x11-libs/libXext x11-base/xorg-proto
+DESCRIPTION=small and simple window manager of novel design
+EAPI=8
+HOMEPAGE=http://www.nickgravgaard.com/windowlab/
+INHERIT=toolchain-funcs
+IUSE=truetype
+KEYWORDS=~amd64 ~mips ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=truetype? ( x11-libs/libXft ) x11-libs/libXext
+SLOT=0
+SRC_URI=http://www.nickgravgaard.com/windowlab/windowlab-1.40.tar
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=b40f257c5f2d01ccc022c1a8b7493959
diff --git a/metadata/md5-cache/x11-wm/wmii-3.9.2-r7 b/metadata/md5-cache/x11-wm/wmii-3.9.2-r7
new file mode 100644
index 000000000000..ac7620fd2524
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/wmii-3.9.2-r7
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install prepare
+DEPEND=media-libs/freetype >=sys-libs/libixp-0.5_p20110208-r3 x11-libs/libXext x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libX11
+DESCRIPTION=A dynamic window manager for X11
+EAPI=8
+HOMEPAGE=https://github.com/0intro/wmii
+INHERIT=flag-o-matic toolchain-funcs
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=media-libs/freetype >=sys-libs/libixp-0.5_p20110208-r3 x11-libs/libXext x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libX11 media-fonts/font-misc-misc x11-apps/xmessage x11-apps/xsetroot
+SLOT=0
+SRC_URI=https://dl.suckless.org/wmii/wmii+ixp-3.9.2.tbz
+_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=6ec238a2defa7e5e1515702d2ee2941e
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index cd73b51e52d8..291a1995ba82 100644
Binary files a/metadata/md5-cache/xfce-base/Manifest.gz and b/metadata/md5-cache/xfce-base/Manifest.gz differ
diff --git a/metadata/md5-cache/xfce-base/exo-4.16.4 b/metadata/md5-cache/xfce-base/exo-4.16.4
index 8bc81843cc19..bda568d0ff60 100644
--- a/metadata/md5-cache/xfce-base/exo-4.16.4
+++ b/metadata/md5-cache/xfce-base/exo-4.16.4
@@ -5,10 +5,10 @@ DESCRIPTION=Extensions, widgets and framework library with session support for X
 EAPI=7
 HOMEPAGE=https://www.xfce.org/projects/
 INHERIT=autotools xdg-utils
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.50 >=x11-libs/gtk+-3.22:3 >=xfce-base/libxfce4ui-4.15.1:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/exo/4.16/exo-4.16.4.tar.bz2
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=4232ebad44d7f6f948f9d124148eb79a
+_md5_=bca998beb6e23d6d6f3b55e1aa752a19
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index 02ce14582096..d1075b88a566 100644
Binary files a/metadata/md5-cache/xfce-extra/Manifest.gz and b/metadata/md5-cache/xfce-extra/Manifest.gz differ
diff --git a/metadata/md5-cache/xfce-extra/xfce4-wavelan-plugin-0.6.3 b/metadata/md5-cache/xfce-extra/xfce4-wavelan-plugin-0.6.3
new file mode 100644
index 000000000000..89e5aa556e25
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-wavelan-plugin-0.6.3
@@ -0,0 +1,12 @@
+BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=install
+DEPEND=>=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:=
+DESCRIPTION=A panel plug-in to display wireless interface statistics
+EAPI=8
+HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-wavelan-plugin
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+LICENSE=BSD-2
+RDEPEND=>=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= kernel_linux? ( sys-apps/net-tools )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-wavelan-plugin/0.6/xfce4-wavelan-plugin-0.6.3.tar.bz2
+_md5_=023388a36b2c946cc363ea27bf092065
diff --git a/metadata/news/2022-06-13-python3-10/2022-06-13-python3-10.en.txt b/metadata/news/2022-06-13-python3-10/2022-06-13-python3-10.en.txt
new file mode 100644
index 000000000000..cbf5df732e6b
--- /dev/null
+++ b/metadata/news/2022-06-13-python3-10/2022-06-13-python3-10.en.txt
@@ -0,0 +1,120 @@
+Title: Python 3.10 to become the default on 2022-07-01
+Author: Michał Górny <mgorny@gentoo.org>
+Posted: 2022-06-13
+Revision: 1
+News-Item-Format: 2.0
+Display-If-Installed: dev-lang/python:3.8
+Display-If-Installed: dev-lang/python:3.9
+
+We are planning to switch the default Python target of Gentoo systems
+on 2022-07-01, from Python 3.9 to Python 3.10.  If you have not changed
+the values of PYTHON_TARGETS or PYTHON_SINGLE_TARGET, the change will
+have immediate effect on your system and the package manager will try
+to switch automatically on the next upgrade following the change.
+
+If you did change the values, prefer a safer approach or have problems
+with the update, read on.
+
+Please note that the default upgrade method switches packages to the new
+Python versions as they are rebuilt.  This means that all interdependent
+packages have to support the new version for the upgrade to proceed,
+and that some programs may temporarily fail to find their dependencies
+throughout the upgrade (although programs that are already started
+are unlikely to be affected).
+
+
+If you have PYTHON_TARGETS or PYTHON_SINGLE_TARGET declared
+in make.conf, please remove these declarations as they will interfere
+with the package.use samples provided below.  Using make.conf for Python
+targets is discouraged as it prevents package defaults from applying
+when necessary.  This news item assumes using /etc/portage/package.use
+or your package manager's equivalent file for configuration.
+
+
+At this point, you have a few configuration options to choose from:
+
+1. If you wish Python upgrades to apply automatically, you can remove
+   PYTHON_TARGETS and PYTHON_SINGLE_TARGET declarations.  When
+   the defaults change, your package manager should handle the upgrade
+   automatically.  However, you may still need to run the update
+   commands if any problems arise.
+
+2. If you wish to defer the upgrade for the time being, you can
+   explicitly set the old values in package.use.
+
+3. If you wish to force the upgrade earlier, you can explicitly set
+   the new values and run the upgrade commands.
+
+4. If you wish to use a safer approach (i.e. less likely to temporarily
+   break packages during the upgrade), you can perform a multi-step
+   upgrade as outlined below.
+
+5. Finally, you can use an arbitrary combination of PYTHON_TARGETS
+   and PYTHON_SINGLE_TARGET.
+
+
+Deferring the upgrade
+=====================
+To defer the upgrade, explicitly set the old targets:
+
+    */* PYTHON_TARGETS: -* python3_9
+    */* PYTHON_SINGLE_TARGET: -* python3_9
+
+This will enforce Python 3.9 and block any future updates.  However,
+please note that this is only a temporary solution and you will
+eventually need to perform the migration.
+
+
+Forcing the upgrade
+===================
+To force the upgrade earlier, explicitly select the Python 3.10 targets:
+
+    */* PYTHON_TARGETS: -* python3_10
+    */* PYTHON_SINGLE_TARGET: -* python3_10
+
+However, it is important to remember to remove this after the defaults
+change, as it will interfere with the automatic switch to the next
+Python version in the future.
+
+
+Safer upgrade procedure
+=======================
+A safer approach is to add Python 3.10 support to your system first,
+and only then remove Python 3.9.  However, note that this involves two
+rebuilds of all the affected packages, so it will take noticeably
+longer.
+
+First, enable both Python 3.9 and Python 3.10, and then run the upgrade
+commands:
+
+    */* PYTHON_TARGETS: -* python3_9 python3_10
+    */* PYTHON_SINGLE_TARGET: -* python3_9
+
+Then switch PYTHON_SINGLE_TARGET and run the second batch of upgrades:
+
+    */* PYTHON_TARGETS: -* python3_9 python3_10
+    */* PYTHON_SINGLE_TARGET: -* python3_10
+
+Finally, switch to the final version and upgrade:
+
+    */* PYTHON_TARGETS: -* python3_10
+    */* PYTHON_SINGLE_TARGET: -* python3_10
+
+You may wish to remove the target overrides after the defaults switch.
+Alternatively, you can keep them to block the next automatic upgrade
+to Python 3.11, and upgrade manually then.
+
+
+Upgrade commands
+================
+The Python 3.9 cleanup requires that Python 3.9 is removed from
+the complete dependency trees in batch.  If some of the
+installed packages using an older Python version are not triaged
+for the upgrade, the package manager will throw dependency conflicts.
+This makes it important that the upgrade is carried via a --deep
+--changed-use @world upgrade, as well as that any stray packages
+are removed prior to it, e.g.:
+
+    emerge --depclean
+    emerge -1vUD @world
+    emerge --depclean
diff --git a/metadata/news/2022-06-13-python3-10/2022-06-13-python3-10.pl.txt b/metadata/news/2022-06-13-python3-10/2022-06-13-python3-10.pl.txt
new file mode 100644
index 000000000000..684ff3248fbe
--- /dev/null
+++ b/metadata/news/2022-06-13-python3-10/2022-06-13-python3-10.pl.txt
@@ -0,0 +1,133 @@
+Title: Python 3.10 stanie się domyślną wersją począwszy od 2022-07-01
+Author: Michał Górny <mgorny@gentoo.org>
+Translator: Michał Górny <mgorny@gentoo.org>
+Posted: 2022-06-13
+Revision: 1
+News-Item-Format: 2.0
+Display-If-Installed: dev-lang/python:3.8
+Display-If-Installed: dev-lang/python:3.9
+
+Gentoo planuje zmienić domyślną wersję Pythona z 3.9 na 3.10 w dniu
+1. lipca 2022 r.  Użytkownicy, którzy nie zmieniali wartości flag
+PYTHON_TARGETS oraz PYTHON_SINGLE_TARGET nie muszą nic robić.  Menadżer
+pakietów automatycznie zaktualizuje wsparcie Pythona do nowej wersji
+przy kolejnej aktualizacji systemu po tej zmianie.
+
+Informacje zawarte w tej wiadomości przeznaczone są dla użytkowników,
+którzy zmieniali preferowaną wersję Pythona bądź chcą przeprowadzić
+aktualizację w bezpieczniejszy sposób.
+
+Uwaga: standardowa metoda aktualizacji podmienia obsługiwaną wersję
+Pythona w poszczególnych pakietach w miarę ich aktualizacji.
+Oznacza to, że aktualizacja systemu możliwa będzie wyłącznie, jeżeli
+wszystkie zainstalowane pakiety obsługują nową wersję.  W trakcie
+aktualizacji zależności poszczególnych zainstalowanych programów mogą
+stać się tymczasowo niedostępne, nie powinno to jednak mieć wpływu
+na działanie już uruchomionych aplikacji.
+
+
+Użytkownicy, którzy wykorzystują plik make.conf do ustawienia wartości
+zmiennych PYTHON_TARGETS lub PYTHON_SINGLE_TARGET powinni usunąć
+te wartości, gdyż będą one kolidowały z przykładami package.use
+przedstawionymi w tej wiadomości.  Wykorzystywanie pliku make.conf
+do konfiguracji tych zmiennych jest niewskazane, gdyż ustawienia te
+nadpisują domyślne wartości flag zawarte w poszczególnych pakietach.
+Dalszy ciąg tej wiadomości zakłada wykorzystywanie package.use
+lub równoważnego pliku konfiguracyjnego.
+
+
+Dostępne są następujące możliwości aktualizacji:
+
+1. Automatyczna aktualizacja wersji Pythona.  Aby skorzystać z tej
+   opcji, należy usunąć zmienne PYTHON_TARGETS
+   oraz PYTHON_SINGLE_TARGET.  Wówczas menadżer pakietów automatycznie
+   przeprowadzi aktualizację ilekroć zmieni się domyślna wersja Pythona
+   w Gentoo.  Niemniej, może zaistnieć konieczność ręcznej aktualizacji
+   w przypadku wystąpienia problemów.
+
+2. Odroczenie aktualizacji poprzez wymuszenie poprzedniej wersji
+   w pliku package.use.
+
+3. Wymuszenie wcześniejszej aktualizacji poprzez podanie nowej wersji
+   i dokonanie aktualizacji systemu.
+
+4. Zastosowanie bezpiecznego podejścia (tj. zmniejszającego ryzyko
+   niesprawnych programów w trakcie aktualizacji) poprzez wykonanie
+   aktualizacji w kilku krokach.  Proces ten jest szczegółowo opisany
+   w dalszej części wiadomości.
+
+5. Zastosowanie dowolnej kombinacji zmiennych PYTHON_TARGETS
+   oraz PYTHON_SINGLE_TARGET.
+
+
+Odroczenie aktualizacji
+=======================
+Aby odroczyć aktualizację do późniejszego terminu, należy wymusić
+poprzednią wersję Pythona:
+
+    */* PYTHON_TARGETS: -* python3_9
+    */* PYTHON_SINGLE_TARGET: -* python3_9
+
+W ten sposób Python 3.9 zostanie wymuszony na stałe i przyszłe
+aktualizacje zostaną zablokowane.  Należy jednak pamiętać, że jest
+to rozwiązanie tymczasowe i w przyszłości aktualizacja stanie się
+konieczna.
+
+
+Wymuszenie aktualizacji
+=======================
+Aby wymusić aktualizację wcześniej, należy wybrać Pythona 3.10:
+
+    */* PYTHON_TARGETS: -* python3_10
+    */* PYTHON_SINGLE_TARGET: -* python3_10
+
+Zalecane jest jednak usunięcie tych ustawień po podanym wyżej terminie,
+aby nie kolidowały w przyszłości z kolejną zmianą domyślnej wersji
+Pythona.
+
+
+Bezpieczna procedura aktualizacji
+=================================
+Bezpieczniejszą alternatywą do standardowego procesu jest wprowadzenie
+wsparcia Pythona 3.10 w pierwszym kroku, a następnie usunięcie Pythona
+3.9.  Należy jednak pamiętać, że będzie wymagało to dwukrotnego
+przebudowania wszystkich pakietów używających Pythona, tak więc łączny
+czas aktualizacji zostanie wydłużony.
+
+Najpierw załączyć należy obydwie wersje Pythona i przeprowadzić
+aktualizację systemu:
+
+    */* PYTHON_TARGETS: -* python3_9 python3_10
+    */* PYTHON_SINGLE_TARGET: -* python3_9
+
+Następnie przełączyć należy wartość PYTHON_SINGLE_TARGET i przebudować
+pakiety używające tych flag:
+
+    */* PYTHON_TARGETS: -* python3_9 python3_10
+    */* PYTHON_SINGLE_TARGET: -* python3_10
+
+W ostatnim kroku należy wyłączyć poprzednią wersję i przeprowadzić
+kolejną aktualizację:
+
+    */* PYTHON_TARGETS: -* python3_10
+    */* PYTHON_SINGLE_TARGET: -* python3_10
+
+Po terminie zmiany domyślnych wartości, konfigurację tę można usunąć.
+Alternatywnie, pozostawienie jej zablokuje przyszłą aktualizację
+do Pythona 3.11 i pozwoli na ręczne przeprowadzenie bezpieczniej
+aktualizacji.
+
+
+Proces aktualizacji
+===================
+Usunięcie Pythona 3.9 wymaga, by odpowiednie flagi zostały jednocześnie
+wyłączone w całym drzewie zależności.  Jeżeli niektóre z zainstalowanych
+pakietów nie zostaną uwzględnione w planowanej aktualizacji, mogą one
+zablokować ten proces.  Dlatego też istotne jest przeprowadzenie
+aktualizacji przy pomocy parametrów `--deep --changed-use @world` bądź
+równoważnych, jak również wcześniejsze usunięcie niepotrzebnych
+pakietów.  Można tego dokonać używając poleceń:
+
+    emerge --depclean
+    emerge -1vUD @world
+    emerge --depclean
diff --git a/metadata/news/2022-06-13-python3-10/2022-06-13-python3-10.ru.txt b/metadata/news/2022-06-13-python3-10/2022-06-13-python3-10.ru.txt
new file mode 100644
index 000000000000..cc92b9212389
--- /dev/null
+++ b/metadata/news/2022-06-13-python3-10/2022-06-13-python3-10.ru.txt
@@ -0,0 +1,120 @@
+Title: Python 3.10 станет базовым с 2022-07-01
+Author: Michał Górny <mgorny@gentoo.org>
+Translator: Alexey Sokolov <alexey+gentoo@asokolov.org>
+Posted: 2022-06-13
+Revision: 1
+News-Item-Format: 2.0
+Display-If-Installed: dev-lang/python:3.8
+Display-If-Installed: dev-lang/python:3.9
+
+1 июля 2022 года мы собираемся переключить Python target, используемый
+по умолчанию на системах Gentoo, с версии 3.9 на версию 3.10.
+Если вы не меняли значения переменных PYTHON_TARGETS или
+PYTHON_SINGLE_TARGET, то упомянутое изменение затронет систему сразу,
+и пакетный менеджер попытается переключиться на новый Python target
+автоматически при следующем обновлении системы.
+
+Если вы изменили значения этих переменных, предпочитаете более
+безопасный подход или при обновлении возникли проблемы, то
+продолжайте читать далее.
+
+Пожалуйста, обратите внимание, что метод обновления по умолчанию
+переключает пакеты на новую версию Python при их пересборки.
+Это означает, что все зависящие друг от друга пакеты должны поддерживать
+новую версию Python для продолжения обновления и некоторые программы
+временно могут не находить свои зависимости во время обновления 
+(однако, запущенные программы, вероятно, не будут подвержены проблеме).
+
+Если переменные PYTHON_TARGETS или PYTHON_SINGLE_TARGET объявлены
+в вашем файле make.conf, пожалуйста, удалите их, так как они будут
+конфликтовать с представленными ниже примерами конфигурации package.use.
+Мы не рекомендуем использовать файл make.conf для задания значений
+переменных Python target, так как это препятствует применению
+значений по умолчанию для пакетов, когда это необходимо.  В этой новости
+мы предполагаем, что вы используете файл /etc/portage/package.use
+или ваш эквивалент этого файла конфигурации пакетного менеджера.
+
+С этого момента у вас есть выбор из следующих вариантов настройки:
+
+1. Если вы хотите, чтобы Python обновлялся автоматически, вы можете
+   удалить объявленные переменные PYTHON_TARGETS и PYTHON_SINGLE_TARGET.
+   Когда их значения по умолчанию изменятся, пакетный менеджер должен
+   самостоятельно всё обновить. Но если возникнут проблемы, вам всё ещё
+   может понадобиться запустить команды обновления.
+
+2. Если вы хотите пока отложить обновление, вы можете явно указать
+   старые значения в файле package.use.
+
+3. Если вы хотите обновиться раньше, вы можете явно задать новые
+   значения и запустить команды обновления.
+
+4. Если вы хотите использовать более безопасный подход (т.е. с меньшей
+   вероятностью временной поломки пакетов во время обновления),
+   вы можете выполнить последовательное обновление, описанное ниже.
+
+5. Наконец, вы можете произвольным образом комбинировать значения
+   переменных PYTHON_TARGETS и PYTHON_SINGLE_TARGET.
+
+
+Откладывание обновления
+=======================
+Чтобы отложить обновление, явно укажите старые значения:
+
+    */* PYTHON_TARGETS: -* python3_9
+    */* PYTHON_SINGLE_TARGET: -* python3_9
+
+Это заставит систему использовать Python 3.9 и предотвратит последующие
+обновления.  Однако, учтите, что такое решение временное,
+и в конце концов вам всё-таки придётся провести обновление.
+
+
+Принудительное обновление
+=========================
+Чтобы обновиться до Python 3.10 раньше, явно укажите новые значения:
+
+    */* PYTHON_TARGETS: -* python3_10
+    */* PYTHON_SINGLE_TARGET: -* python3_10
+
+При этом важно не забыть удалить эти строки после изменения значений
+по умолчанию, иначе они помешают последующим автоматическим обновлениям
+на следующие версии Python.
+
+
+Процедура безопасного обновления
+================================
+Более безопасный подход такой: сначала добавляется в систему поддержка
+Python 3.10, а затем удаляется поддержка Python 3.9.  Однако, учтите,
+что все затронутые пакеты будут пересобраны дважды, что заметно дольше.
+
+Сначала включите Python 3.9 и Python 3.10 и запустите команды обновления:
+
+    */* PYTHON_TARGETS: -* python3_9 python3_10
+    */* PYTHON_SINGLE_TARGET: -* python3_9
+
+Затем замените PYTHON_SINGLE_TARGET и ещё раз запустите обновление:
+
+    */* PYTHON_TARGETS: -* python3_9 python3_10
+    */* PYTHON_SINGLE_TARGET: -* python3_10
+
+Наконец, переключитесь на окончательную версию и запустите обновление:
+
+    */* PYTHON_TARGETS: -* python3_10
+    */* PYTHON_SINGLE_TARGET: -* python3_10
+
+После смены значений по умолчанию вы можете удалить эти настройки.
+Или же вы можете оставить их, предотвращая автоматическое обновление
+до Python 3.11, и позже обновиться вручную.
+
+
+Команды обновления
+==================
+Для очистки системы от Python 3.9 требуется удалить его сразу из
+всего дерева зависимостей.  Если какие-то установленные пакеты,
+использующие старую версию Python, не помечены для обновления,
+пакетный менеджер покажет ошибки зависимостей.  Поэтому важно проводить
+обновление с использованием опций --deep --changed-use @world,
+а также перед этим удалить все более не требуемые пакеты:
+
+    emerge --depclean
+    emerge -1vUD @world
+    emerge --depclean
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 0cf45d72e752..acf529c85612 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 17017 BLAKE2B 7be328a8a4c41ce39baa109aefc40f06150b6f7bb6578e1d66ff355b0fc716f31c165a176e4806ef97c970291938c37b387df71f41483a4ff730585da37e21ae SHA512 67fd89195b667066cb0549fb5194864dacb49dc3391fad1dad88636326045b6a646299536c435245bd571486c513934c3dcdc45dfc0797e3bd631881b91eb0fe
-TIMESTAMP 2022-06-13T11:09:39Z
+MANIFEST Manifest.files.gz 17528 BLAKE2B d9231e54893c496e7d93671affd023bace9eabe8a3df2a22e31994addce35c17bf9b6d58612cb0592614d9061cda9b5ff59c9663749d31fd54c1516697af64e3 SHA512 12f7f26ceb887fedd096de54a33efe48f24504d2886e22e6ed743973248dc8c2e7df8ef0007d3872cf34823edb7df22e41994f2f1ca9c215ea4914c5ca96242f
+TIMESTAMP 2022-06-16T18:09:52Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmKnGvNfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmKrcfBfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDJbBAApc3d8N9N1RaVYLd6+MpFF6Rd2mTgZg9vo/s8ROAhAi21GRX5vXdOHUMY
-o5sHay5cY/F5Nsmw8I/R5nLwD1MOelOWvRTQlMl0a5QYCCq6dgGQbmkvOX1H2cUO
-o5MK1/HNYhdhZ1K8SGVfmHI8Su/VH9ch+qje3ljrAHmhjInUwTOrPunDd07+SSIo
-z5wfAOTOoNtcD4rft/BLS93oP5nH8Eh+jiOc2HR/t6uAu/WNp+Qt5PXgpvdYq/6r
-psT8bss2xG00K2I794U+Qyw/QW61HM37qgRHyhnmzPgHFQa+RMSW9RG2UbsRxBTJ
-NNYrwi55uO8nXISBWUaeS++0j6OLJZOSXIcCDYNZpTZNWVpBM9q8d6PterxsOnBK
-1Fh8Y/VL4b9ZWRgg1qNcWYVV8DdQTxlKfu2AHG9Y19liEQO10Y5FuLq3Z8I7dnvZ
-9vWoFurnX/tAEpHpRDrv6V/fKQqHIbpTXW18IB4YWN/dJgN9Bu3goziapeht9vDz
-ZZDbO/ew1CFTb7pT/cfDtiHQrQBQRwO3znndp1udumKykCXasF4KHFmnUmMCEFW0
-QdhsBIWHOlfk2o2EgbQHXJQYIDMg8TWN7BALBe7aO8q/fLejfuHdSUNyE2yOr9Ah
-P0AuLbWmQSiB8Lycwf4OVq3dUPYYIlctc3igNWP+WeIEaqTuyTk=
-=ZBpV
+klAvCw//bVgx6boF7iCpjiUanmqrkQmM/TtA18F+4pTkmF+bMODr6MHSz6zPpPdQ
+Q9V335jbUqx9Ce5+OUYHObz7/wtr/oKBoPr5XO7XiN610hbAZo0W/VD5t7FMd1BM
+Wtn+izZ4tbgppvPFMCM3bZa3HOsZYL3uDQda6VEiiketDpxstj0Wxc80/wpSbiqT
+ncqCgH/3WrwWk2PLa55Bo1l4Mpr60X1onTg4Wb+eKSBMr1hsyxxAxxMPaVIumSpd
+shdwTifDcvX5q+h+E0lgJ3y5PF1lpxCaezEn7rUIxQnJySibMjZ0JOxwz8TAy4PL
+9krBGJ1xY/yRa5blJvKreR1QqhxwRapT6wIuqXtQq8uL1uYpNqyX4QC5T5trcIOG
+rHFm8I9DRYSxyNmvNCk51u3rFJXbWdeIrHePMDXejARNmf3fsKLfi1q3MT1iTLvW
+Bm3gjtrvuJX+CJIrNccYcTsM+U6Wo/ko+btds745cZwbueAbCtsleyo+lS4genpq
+8ciOo1ShWFzmFvDGKr0B4HJGnrBO/UDoiGs4XldCRTFiOF6sYIWHRsxYEXmAd4dA
+5/mjzZnaNzO7EM+GVxwumQIsPEg98gZAbTbBUjCTPPDAcwSzOcL4rgof7tAxdSa6
+RPLn9mJlkCOwJSZQWE+YxkLPI1bH+h4VG0zHk3ihyJm+ol7K8Y0=
+=R16+
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/Manifest.files.gz b/metadata/news/Manifest.files.gz
index 566bf4dccb2c..d4f3fb780789 100644
Binary files a/metadata/news/Manifest.files.gz and b/metadata/news/Manifest.files.gz differ
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 068f07b813dd..bb1e6ffcdb51 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 13 Jun 2022 11:09:35 +0000
+Thu, 16 Jun 2022 18:09:47 +0000
diff --git a/metadata/news/timestamp.commit b/metadata/news/timestamp.commit
index aedec05a0863..e991bd92e68f 100644
--- a/metadata/news/timestamp.commit
+++ b/metadata/news/timestamp.commit
@@ -1 +1 @@
-6e976b2854be2c5492025489dacba2158872a768 1653953798 2022-05-30T23:36:38+00:00
+2df2bdc2eb24979ef17520910e1eb5e9fbd3d898 1654928173 2022-06-11T06:16:13+00:00
diff --git a/metadata/timestamp b/metadata/timestamp
index 9183d5acac04..6ecbd9d32d28 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Jun 13 11:09:34 AM UTC 2022
+Thu Jun 16 06:09:47 PM UTC 2022
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index e63f2e5a619c..f50d370bab90 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -915,7 +915,7 @@
 2112192339 ./app-accessibility/nfbtrans/nfbtrans-7.74-r2.ebuild
 2205280910 ./app-accessibility/orca/orca-42.1.ebuild
 2203200240 ./app-accessibility/powiedz/powiedz-1.0-r2.ebuild
-2002230040 ./app-accessibility/sound-icons/sound-icons-0.1.ebuild
+2206161940 ./app-accessibility/sound-icons/sound-icons-0.1.ebuild
 2108101209 ./app-accessibility/speech-dispatcher/speech-dispatcher-0.9.1.ebuild
 2205260840 ./app-accessibility/speech-dispatcher/speech-dispatcher-0.11.1.ebuild
 2105100939 ./app-accessibility/speech-tools/speech-tools-2.5.0.ebuild
@@ -959,6 +959,9 @@
 2206091040 ./app-admin/awscli/awscli-1.25.5.ebuild
 2206101140 ./app-admin/awscli/awscli-1.25.6.ebuild
 2206110940 ./app-admin/awscli/awscli-1.25.7.ebuild
+2206160840 ./app-admin/awscli/awscli-1.25.10.ebuild
+2206140740 ./app-admin/awscli/awscli-1.25.8.ebuild
+2206151440 ./app-admin/awscli/awscli-1.25.9.ebuild
 1912012209 ./app-admin/bastille/bastille-3.0.9-r2.ebuild
 2202200440 ./app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-1.30.0.ebuild
 2204121639 ./app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-1.32.1.ebuild
@@ -1014,7 +1017,7 @@
 2012161539 ./app-admin/eselect/eselect-9999.ebuild
 2204290540 ./app-admin/eselect/eselect-1.4.20.ebuild
 2110200610 ./app-admin/evtxtools/evtxtools-1.1.1-r2.ebuild
-2205041640 ./app-admin/exo/exo-1.54.0.ebuild
+2206141310 ./app-admin/exo/exo-1.56.0.ebuild
 2107121709 ./app-admin/fam/fam-2.7.0_p17_p3.ebuild
 1907151839 ./app-admin/fetchlog/fetchlog-1.4-r1.ebuild
 1705160027 ./app-admin/fifo-cronolog/fifo-cronolog-1.1.1-r1.ebuild
@@ -1053,10 +1056,9 @@
 2011021309 ./app-admin/gtkdiskfree/gtkdiskfree-2.0.4_p20200224.ebuild
 2109162239 ./app-admin/hardinfo/hardinfo-0.6_alpha_pre20201116-r1.ebuild
 2112060510 ./app-admin/haskell-updater/haskell-updater-1.3.2-r1.ebuild
-2112141439 ./app-admin/hcloud/hcloud-1.29.0.ebuild
-2204191739 ./app-admin/hcloud/hcloud-1.29.5.ebuild
+2206141710 ./app-admin/hcloud/hcloud-1.29.5.ebuild
 2205191140 ./app-admin/hddtemp/hddtemp-0.3_beta15-r29.ebuild
-2204022241 ./app-admin/helm/helm-3.8.1.ebuild
+2206141040 ./app-admin/helm/helm-3.8.1.ebuild
 1912111539 ./app-admin/ide-smart/ide-smart-1.4-r2.ebuild
 1712300140 ./app-admin/integrit/integrit-4.1-r1.ebuild
 2112241739 ./app-admin/integrit/integrit-4.2_rc1.ebuild
@@ -1096,7 +1098,7 @@
 2202140039 ./app-admin/mcollective/mcollective-2.12.5.ebuild
 2203200240 ./app-admin/mei-amt-check/mei-amt-check-0_p20170515.ebuild
 2202021409 ./app-admin/metalog/metalog-20200113-r1.ebuild
-2206131040 ./app-admin/metalog/metalog-20220214.ebuild
+2206140910 ./app-admin/metalog/metalog-20220214.ebuild
 2009050409 ./app-admin/mktwpol/mktwpol-1.0.1.ebuild
 2110201010 ./app-admin/mongo-tools/mongo-tools-100.4.1.ebuild
 2110201010 ./app-admin/mongo-tools/mongo-tools-4.2.15.ebuild
@@ -1227,8 +1229,9 @@
 2205051410 ./app-admin/sudo/sudo-1.9.10-r1.ebuild
 2205051040 ./app-admin/sudo/sudo-1.9.8_p2-r1.ebuild
 2206080140 ./app-admin/sudo/sudo-1.9.11.ebuild
-2206070513 ./app-admin/sudo/sudo-9999.ebuild
 2206090310 ./app-admin/sudo/sudo-1.9.11_p1.ebuild
+2206141510 ./app-admin/sudo/sudo-1.9.11_p2.ebuild
+2206141510 ./app-admin/sudo/sudo-9999.ebuild
 2104251239 ./app-admin/superadduser/superadduser-1.15.ebuild
 2106031139 ./app-admin/supervisor/supervisor-4.2.2.ebuild
 2112310239 ./app-admin/supervisor/supervisor-4.2.4.ebuild
@@ -1295,8 +1298,8 @@
 2112232239 ./app-antivirus/clamtk/clamtk-6.14.ebuild
 2112012109 ./app-antivirus/fangfrisch/fangfrisch-1.5.0.ebuild
 2206070840 ./app-antivirus/fangfrisch/fangfrisch-1.5.0-r1.ebuild
-2203150809 ./app-antivirus/lkrg/lkrg-0.9.2.ebuild
-2204212139 ./app-antivirus/lkrg/lkrg-0.9.3.ebuild
+2206161940 ./app-antivirus/lkrg/lkrg-0.9.2.ebuild
+2206161940 ./app-antivirus/lkrg/lkrg-0.9.3.ebuild
 2206061542 ./app-arch/advancecomp/advancecomp-2.3.ebuild
 2112260340 ./app-arch/afio/afio-2.5.1-r2.ebuild
 2103130009 ./app-arch/alien/alien-8.95-r1.ebuild
@@ -1430,6 +1433,7 @@
 2112220709 ./app-arch/zstd/zstd-1.5.0.ebuild
 2202190610 ./app-arch/zstd/zstd-1.5.1-r2.ebuild
 2204290540 ./app-arch/zstd/zstd-1.5.2.ebuild
+2206161840 ./app-arch/zstd/zstd-1.5.1-r3.ebuild
 2204070239 ./app-arch/lunzip/lunzip-1.13.ebuild
 2204070239 ./app-arch/clzip/clzip-1.13.ebuild
 2205180040 ./app-arch/bzip3/bzip3-1.1.1-r1.ebuild
@@ -1514,7 +1518,7 @@
 2104031909 ./app-backup/spideroak-bin/spideroak-bin-7.5.0-r1.ebuild
 2005311609 ./app-backup/synology-cloud-station-backup/synology-cloud-station-backup-4469.ebuild
 2203200240 ./app-backup/tarsnap/tarsnap-1.0.39-r1.ebuild
-2203010209 ./app-backup/tsm/tsm-8.1.13.3.ebuild
+2206161940 ./app-backup/tsm/tsm-8.1.13.3.ebuild
 2110260639 ./app-backup/untangle-https-backup/untangle-https-backup-0.1.0.ebuild
 1907151839 ./app-backup/vzdump/vzdump-1.2.ebuild
 2104020239 ./app-benchmarks/bashmark/bashmark-0.6.2.ebuild
@@ -1584,7 +1588,7 @@
 2010011509 ./app-cdr/dumpet/dumpet-2.1_p20140601-r3.ebuild
 2012311940 ./app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild
 2202080810 ./app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r4.ebuild
-2012301439 ./app-cdr/dvdisaster/dvdisaster-0.79.5.ebuild
+2206161940 ./app-cdr/dvdisaster/dvdisaster-0.79.5.ebuild
 2012181209 ./app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild
 2104200009 ./app-cdr/extract-xiso/extract-xiso-2.7.1.ebuild
 1712281509 ./app-cdr/gaffitter/gaffitter-0.6.0-r1.ebuild
@@ -1685,14 +1689,14 @@
 2202101339 ./app-crypt/glep63-check/glep63-check-11.ebuild
 2105022039 ./app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.9.2-r1.ebuild
 2203230339 ./app-crypt/gnupg/gnupg-2.2.34-r1.ebuild
-2205170840 ./app-crypt/gnupg/gnupg-2.2.35.ebuild
 2205170840 ./app-crypt/gnupg/gnupg-2.3.6.ebuild
+2206151140 ./app-crypt/gnupg/gnupg-2.2.35.ebuild
 2204230009 ./app-crypt/gorilla/gorilla-1.4-r2.ebuild
 2009031339 ./app-crypt/gpa/gpa-0.10.0.ebuild
 2012311940 ./app-crypt/gpg-ringmgr/gpg-ringmgr-1.12-r1.ebuild
 2203260340 ./app-crypt/gpgme/gpgme-1.16.0.ebuild
 2205170840 ./app-crypt/gpgme/gpgme-1.17.1.ebuild
-2206121810 ./app-crypt/gpgme/gpgme-1.17.1-r1.ebuild
+2206142110 ./app-crypt/gpgme/gpgme-1.17.1-r1.ebuild
 2202170139 ./app-crypt/gpgstats/gpgstats-0.5-r2.ebuild
 2104060140 ./app-crypt/hashalot/hashalot-0.3-r2.ebuild
 1809182339 ./app-crypt/hashcat-utils/hashcat-utils-1.9.ebuild
@@ -1742,7 +1746,7 @@
 2101242039 ./app-crypt/libnitrokey/libnitrokey-9999.ebuild
 2203200240 ./app-crypt/libscrypt/libscrypt-1.21.ebuild
 2205141540 ./app-crypt/libscrypt/libscrypt-1.22.ebuild
-2205311240 ./app-crypt/libsecret/libsecret-0.20.5-r3.ebuild
+2206161940 ./app-crypt/libsecret/libsecret-0.20.5-r3.ebuild
 2201041339 ./app-crypt/libu2f-host/libu2f-host-1.1.10.ebuild
 2111192109 ./app-crypt/libu2f-server/libu2f-server-1.1.0-r2.ebuild
 2012231444 ./app-crypt/loop-aes-losetup/loop-aes-losetup-2.28.2.ebuild
@@ -1775,8 +1779,8 @@
 2201271240 ./app-crypt/ophcrack-tables/ophcrack-tables-1.0-r2.ebuild
 2206020610 ./app-crypt/ophcrack/ophcrack-3.8.0.ebuild
 2105022039 ./app-crypt/osslsigncode/osslsigncode-2.0.ebuild
-2104060140 ./app-crypt/p11-kit/p11-kit-0.23.22.ebuild
-2205010512 ./app-crypt/p11-kit/p11-kit-0.24.1.ebuild
+2206161940 ./app-crypt/p11-kit/p11-kit-0.23.22.ebuild
+2206161940 ./app-crypt/p11-kit/p11-kit-0.24.1.ebuild
 1811071339 ./app-crypt/paperkey/paperkey-1.5.ebuild
 2010010609 ./app-crypt/paperkey/paperkey-1.6.ebuild
 2201291609 ./app-crypt/pdfcrack/pdfcrack-0.19.ebuild
@@ -2594,6 +2598,7 @@
 2110291639 ./app-editors/featherpad/featherpad-1.0.0.ebuild
 2111120512 ./app-editors/featherpad/featherpad-1.0.1.ebuild
 2201122009 ./app-editors/featherpad/featherpad-1.1.0.ebuild
+2206141940 ./app-editors/featherpad/featherpad-1.2.0.ebuild
 1906281839 ./app-editors/focuswriter/focuswriter-1.7.2.ebuild
 2110291639 ./app-editors/focuswriter/focuswriter-1.7.6.ebuild
 2110291639 ./app-editors/fte/fte-20110708-r1.ebuild
@@ -2603,6 +2608,7 @@
 2205271340 ./app-editors/gedit/gedit-42.1.ebuild
 2204072009 ./app-editors/ghex/ghex-9999.ebuild
 2205280810 ./app-editors/ghex/ghex-42.2.ebuild
+2206140610 ./app-editors/ghex/ghex-42.3.ebuild
 2204251610 ./app-editors/ghostwriter/ghostwriter-2.0.2.ebuild
 2206070810 ./app-editors/ghostwriter/ghostwriter-2.1.3.ebuild
 2110260439 ./app-editors/gnome-latex/gnome-latex-3.38.0.ebuild
@@ -2633,18 +2639,17 @@
 2110291639 ./app-editors/leafpad/leafpad-0.8.18.1-r1.ebuild
 2203200240 ./app-editors/levee/levee-3.5a.ebuild
 2110291639 ./app-editors/lpe/lpe-1.2.8_p20210401.ebuild
-2201022110 ./app-editors/mg/mg-20210609-r1.ebuild
 2205191040 ./app-editors/mg/mg-20220212.ebuild
+2206161310 ./app-editors/mg/mg-20220614.ebuild
 2110291639 ./app-editors/micro/micro-2.0.10.ebuild
 2106171009 ./app-editors/micro/micro-2.0.9.ebuild
 2101201309 ./app-editors/moe/moe-1.10.ebuild
 2110291639 ./app-editors/moe/moe-1.11.ebuild
 1808152309 ./app-editors/moe/moe-1.9.ebuild
 2206070240 ./app-editors/mousepad/mousepad-0.5.9.ebuild
-2112220409 ./app-editors/nano/nano-5.9.ebuild
-2204290740 ./app-editors/nano/nano-6.3.ebuild
-2204290740 ./app-editors/nano/nano-9999.ebuild
-2205032140 ./app-editors/nano/nano-6.2.ebuild
+2206142040 ./app-editors/nano/nano-6.2.ebuild
+2206142040 ./app-editors/nano/nano-6.3.ebuild
+2206142040 ./app-editors/nano/nano-9999.ebuild
 2202131939 ./app-editors/ne/ne-3.3.1.ebuild
 2110291639 ./app-editors/nedit/nedit-5.7.ebuild
 2206010540 ./app-editors/neovim/neovim-9999.ebuild
@@ -2661,8 +2666,8 @@
 2110291639 ./app-editors/qemacs/qemacs-0.4.1_pre20170225.ebuild
 2204211009 ./app-editors/qhexedit2/qhexedit2-0.8.6_p20190316.ebuild
 2205021540 ./app-editors/qhexedit2/qhexedit2-0.8.9_p20210525.ebuild
-2206091310 ./app-editors/qhexedit2/qhexedit2-0.8.6_p20190316-r2.ebuild
-2206091310 ./app-editors/qhexedit2/qhexedit2-0.8.9_p20210525-r2.ebuild
+2206161940 ./app-editors/qhexedit2/qhexedit2-0.8.6_p20190316-r2.ebuild
+2206161940 ./app-editors/qhexedit2/qhexedit2-0.8.9_p20210525-r2.ebuild
 2110291639 ./app-editors/qxmledit/qxmledit-0.9.12.ebuild
 2110311139 ./app-editors/remarkable/remarkable-1.9.0_pre20210320.ebuild
 2202192240 ./app-editors/retext/retext-7.2.2.ebuild
@@ -2719,6 +2724,7 @@
 2206081140 ./app-editors/zile/zile-2.6.2-r2.ebuild
 2203141939 ./app-editors/ecrire/ecrire-0.2.0-r1.ebuild
 2205280440 ./app-editors/gnome-text-editor/gnome-text-editor-42.1.ebuild
+2206141940 ./app-editors/gnome-text-editor/gnome-text-editor-42.2.ebuild
 1908231509 ./app-emacs/actionscript-mode/actionscript-mode-7.2.2_p20180527.ebuild
 1910171639 ./app-emacs/adaptive-wrap/adaptive-wrap-0.7.ebuild
 2202152209 ./app-emacs/adaptive-wrap/adaptive-wrap-0.8.ebuild
@@ -2729,10 +2735,8 @@
 2110101839 ./app-emacs/async/async-1.9.3.ebuild
 2203191140 ./app-emacs/async/async-1.9.4.ebuild
 1711200020 ./app-emacs/atomic-chrome/atomic-chrome-2.0.0.ebuild
-2101061639 ./app-emacs/auctex/auctex-11.92.ebuild
-2101061639 ./app-emacs/auctex/auctex-12.2.ebuild
 2103160039 ./app-emacs/auctex/auctex-12.3.ebuild
-2205091610 ./app-emacs/auctex/auctex-13.1.ebuild
+2206161340 ./app-emacs/auctex/auctex-13.1.ebuild
 2206072240 ./app-emacs/auto-complete/auto-complete-1.5.1-r2.ebuild
 2204210039 ./app-emacs/autoconf-mode/autoconf-mode-2.69-r1.ebuild
 1910171639 ./app-emacs/basic-toolkit/basic-toolkit-0.7.ebuild
@@ -2767,7 +2771,7 @@
 2104122109 ./app-emacs/css-mode/css-mode-0.11-r2.ebuild
 1910171639 ./app-emacs/css-sort-buffer/css-sort-buffer-0.2.ebuild
 2203191140 ./app-emacs/csv-mode/csv-mode-1.18.ebuild
-2205140140 ./app-emacs/csv-mode/csv-mode-1.20.ebuild
+2206161340 ./app-emacs/csv-mode/csv-mode-1.20.ebuild
 1910171639 ./app-emacs/cycle-buffer/cycle-buffer-2.16.ebuild
 2005101338 ./app-emacs/d-mode/d-mode-2.0.10.ebuild
 2202152309 ./app-emacs/d-mode/d-mode-2.0.11.ebuild
@@ -2846,9 +2850,8 @@
 2204011540 ./app-emacs/haskell-mode/haskell-mode-17.2.ebuild
 1905041639 ./app-emacs/helm-system-packages/helm-system-packages-1.10.1.ebuild
 2202151809 ./app-emacs/helm-system-packages/helm-system-packages-1.10.2.ebuild
-2110101839 ./app-emacs/helm/helm-3.8.0.ebuild
 2203191140 ./app-emacs/helm/helm-3.8.4.ebuild
-2203271239 ./app-emacs/helm/helm-3.8.5.ebuild
+2206161340 ./app-emacs/helm/helm-3.8.5.ebuild
 1911151209 ./app-emacs/hexrgb/hexrgb-0_p1019.ebuild
 2204210039 ./app-emacs/highline/highline-7.2.2.ebuild
 1911181439 ./app-emacs/howm/howm-1.4.5.ebuild
@@ -3306,8 +3309,8 @@
 2205281740 ./app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.34-r1.ebuild
 2204042139 ./app-emulation/virtualbox-modules/virtualbox-modules-6.1.32.ebuild
 2204221039 ./app-emulation/virtualbox-modules/virtualbox-modules-6.1.34.ebuild
-2204042139 ./app-emulation/virtualbox/virtualbox-6.1.32-r1.ebuild
-2204221039 ./app-emulation/virtualbox/virtualbox-6.1.34.ebuild
+2206151610 ./app-emulation/virtualbox/virtualbox-6.1.32-r2.ebuild
+2206151610 ./app-emulation/virtualbox/virtualbox-6.1.34-r1.ebuild
 1812111839 ./app-emulation/vkd3d/vkd3d-1.0.ebuild
 2101170739 ./app-emulation/vkd3d/vkd3d-1.1-r1.ebuild
 1906041809 ./app-emulation/vkd3d/vkd3d-1.1.ebuild
@@ -3346,6 +3349,7 @@
 2205282240 ./app-emulation/ruffle/ruffle-0_p20220516.ebuild
 2206121840 ./app-emulation/ruffle/ruffle-0_p20220601.ebuild
 2206121840 ./app-emulation/ruffle/ruffle-9999.ebuild
+2206161640 ./app-emulation/ruffle/ruffle-0_p20220614.ebuild
 2205280210 ./app-emulation/86Box/86Box-3.5.ebuild
 2205170740 ./app-emulation/dxvk/dxvk-1.10.1.ebuild
 2205170740 ./app-emulation/dxvk/dxvk-9999.ebuild
@@ -3550,7 +3554,7 @@
 2201301339 ./app-i18n/opencc/opencc-1.0.5.ebuild
 2201291839 ./app-i18n/opencc/opencc-9999.ebuild
 2205171610 ./app-i18n/opencc/opencc-1.1.2.ebuild
-2206101010 ./app-i18n/opencc/opencc-1.1.3.ebuild
+2206140040 ./app-i18n/opencc/opencc-1.1.3.ebuild
 2107041709 ./app-i18n/poedit/poedit-2.2.4.ebuild
 2107041709 ./app-i18n/poedit/poedit-2.3.1.ebuild
 2104120442 ./app-i18n/pyzy/pyzy-0.1.0-r3.ebuild
@@ -3757,6 +3761,7 @@
 2104040109 ./app-misc/crunch/crunch-3.6.ebuild
 1912120010 ./app-misc/cstream/cstream-3.1.1-r1.ebuild
 2104040109 ./app-misc/cw/cw-1.0.16-r3.ebuild
+2206160340 ./app-misc/cw/cw-1.0.16-r4.ebuild
 2002112051 ./app-misc/dailystrips/dailystrips-1.0.28-r3.ebuild
 2205160310 ./app-misc/dasel/dasel-1.24.3.ebuild
 2205140940 ./app-misc/datefudge/datefudge-1.24.ebuild
@@ -3919,7 +3924,7 @@
 1809152239 ./app-misc/lxsplit/lxsplit-0.2.4-r1.ebuild
 2204090809 ./app-misc/mc/mc-4.8.27-r1.ebuild
 2204090809 ./app-misc/mc/mc-4.8.28-r1.ebuild
-2204090809 ./app-misc/mc/mc-9999.ebuild
+2206161940 ./app-misc/mc/mc-9999.ebuild
 2105232209 ./app-misc/media-player-info/media-player-info-24.ebuild
 2004032241 ./app-misc/mencal/mencal-3.0.ebuild
 1802221208 ./app-misc/mepl/mepl-0.45-r1.ebuild
@@ -4028,7 +4033,7 @@
 2204292210 ./app-misc/rmlint/rmlint-2.10.1.ebuild
 2103052139 ./app-misc/rox-filer/rox-filer-2.11.ebuild
 2204110939 ./app-misc/rpick/rpick-0.8.9.ebuild
-2205150310 ./app-misc/rpick/rpick-0.8.10.ebuild
+2206161110 ./app-misc/rpick/rpick-0.8.10.ebuild
 2004060039 ./app-misc/rtlamr/rtlamr-0.9.1.ebuild
 2112210209 ./app-misc/rundeck-cli-bin/rundeck-cli-bin-0.1.11.ebuild
 2107310239 ./app-misc/screen/screen-4.8.0-r3.ebuild
@@ -4070,7 +4075,7 @@
 2205110840 ./app-misc/task/task-2.6.2.ebuild
 2107140009 ./app-misc/taskd/taskd-1.1.0-r3.ebuild
 2112150009 ./app-misc/tdfsb/tdfsb-0.0.10-r2.ebuild
-2104161439 ./app-misc/tdl/tdl-1.5.2-r3.ebuild
+2206161940 ./app-misc/tdl/tdl-1.5.2-r3.ebuild
 2104050139 ./app-misc/tek/tek-1.3.0.ebuild
 2110252039 ./app-misc/terminal-colors/terminal-colors-2.3.ebuild
 2205011940 ./app-misc/terminal-colors/terminal-colors-3.0.2.ebuild
@@ -4145,6 +4150,8 @@
 2203072110 ./app-misc/timew-report/timew-report-1.4.0.ebuild
 2204131310 ./app-misc/weggli/weggli-0.2.3.ebuild
 2205251440 ./app-misc/qtxdg-tools/qtxdg-tools-3.9.1.ebuild
+2206160340 ./app-misc/rover/rover-1.0.1.ebuild
+2206160340 ./app-misc/rover/rover-9999.ebuild
 2110242009 ./app-mobilephone/anyremote/anyremote-6.5.ebuild
 2203031839 ./app-mobilephone/dfu-util/dfu-util-0.11.ebuild
 2203031839 ./app-mobilephone/dfu-util/dfu-util-9999.ebuild
@@ -4190,23 +4197,16 @@
 2009300139 ./app-office/kraft/kraft-0.95.ebuild
 2203031409 ./app-office/ktimetracker/ktimetracker-5.0.1-r1.ebuild
 2204130212 ./app-office/ledger/ledger-3.2.1.ebuild
-2106181639 ./app-office/libalkimia/libalkimia-8.1.0-r1.ebuild
 2206101010 ./app-office/libalkimia/libalkimia-8.1.1.ebuild
-2205020310 ./app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.2.6.2.ebuild
-2205180440 ./app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.2.6.2-r1.ebuild
-2206100640 ./app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.3.3.2-r3.ebuild
-2205020310 ./app-office/libreoffice-bin/libreoffice-bin-7.2.6.2.ebuild
-2205180440 ./app-office/libreoffice-bin/libreoffice-bin-7.2.6.2-r1.ebuild
-2206100640 ./app-office/libreoffice-bin/libreoffice-bin-7.3.3.2-r3.ebuild
-2205020310 ./app-office/libreoffice-l10n/libreoffice-l10n-7.2.6.2.ebuild
-2206100640 ./app-office/libreoffice-l10n/libreoffice-l10n-7.3.3.2.ebuild
+2206141040 ./app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.3.3.2-r3.ebuild
+2206141040 ./app-office/libreoffice-bin/libreoffice-bin-7.3.3.2-r3.ebuild
 2206100640 ./app-office/libreoffice-l10n/libreoffice-l10n-7.3.4.2.ebuild
+2206141640 ./app-office/libreoffice-l10n/libreoffice-l10n-7.3.3.2.ebuild
 2112190139 ./app-office/libreoffice-voikko/libreoffice-voikko-5.0-r1.ebuild
-2205020310 ./app-office/libreoffice/libreoffice-7.2.6.2-r1.ebuild
-2206100640 ./app-office/libreoffice/libreoffice-7.3.3.2-r3.ebuild
 2206111040 ./app-office/libreoffice/libreoffice-7.3.4.2.ebuild
 2206111040 ./app-office/libreoffice/libreoffice-7.3.9999.ebuild
 2206111040 ./app-office/libreoffice/libreoffice-9999.ebuild
+2206141640 ./app-office/libreoffice/libreoffice-7.3.3.2-r3.ebuild
 2204161540 ./app-office/lyx/lyx-2.3.6.1-r1.ebuild
 2206071140 ./app-office/lyx/lyx-2.3.6.1-r2.ebuild
 2104192239 ./app-office/magicpoint/magicpoint-1.13a_p20121015-r2.ebuild
@@ -4345,6 +4345,7 @@
 2108152309 ./app-portage/portage-utils/portage-utils-0.92.ebuild
 2201101040 ./app-portage/portage-utils/portage-utils-9999.ebuild
 2204290540 ./app-portage/portage-utils/portage-utils-0.93.3.ebuild
+2206160910 ./app-portage/portage-utils/portage-utils-0.94.1.ebuild
 2104161439 ./app-portage/porticron/porticron-0.7.1.ebuild
 2205092345 ./app-portage/portpeek/portpeek-3.2.2.ebuild
 2204212239 ./app-portage/pram/pram-10.ebuild
@@ -4367,19 +4368,19 @@
 2201280010 ./app-shells/autojump/autojump-22.5.3-r1.ebuild
 2205071110 ./app-shells/bash-completion/bash-completion-2.11.ebuild
 2205071110 ./app-shells/bash-completion/bash-completion-9999.ebuild
-2204070310 ./app-shells/bash/bash-2.05b_p13.ebuild
-2204070310 ./app-shells/bash/bash-3.0_p22.ebuild
-2204070310 ./app-shells/bash/bash-3.1_p23.ebuild
-2204070310 ./app-shells/bash/bash-3.2_p57.ebuild
-2204070310 ./app-shells/bash/bash-4.0_p44.ebuild
-2204070310 ./app-shells/bash/bash-4.1_p17.ebuild
-2204070310 ./app-shells/bash/bash-4.2_p53.ebuild
-2204070310 ./app-shells/bash/bash-4.3_p48-r2.ebuild
-2204070310 ./app-shells/bash/bash-4.4_p23-r2.ebuild
-2204070310 ./app-shells/bash/bash-5.0_p18.ebuild
-2204192239 ./app-shells/bash/bash-5.2_beta.ebuild
-2204192239 ./app-shells/bash/bash-9999.ebuild
-2204290540 ./app-shells/bash/bash-5.1_p16.ebuild
+2206132310 ./app-shells/bash/bash-2.05b_p13.ebuild
+2206132310 ./app-shells/bash/bash-3.0_p22.ebuild
+2206132310 ./app-shells/bash/bash-3.1_p23.ebuild
+2206132310 ./app-shells/bash/bash-3.2_p57.ebuild
+2206132310 ./app-shells/bash/bash-4.0_p44.ebuild
+2206132310 ./app-shells/bash/bash-4.1_p17.ebuild
+2206132310 ./app-shells/bash/bash-4.2_p53.ebuild
+2206132310 ./app-shells/bash/bash-4.3_p48-r2.ebuild
+2206132310 ./app-shells/bash/bash-4.4_p23-r2.ebuild
+2206132310 ./app-shells/bash/bash-5.0_p18.ebuild
+2206132310 ./app-shells/bash/bash-5.1_p16.ebuild
+2206132310 ./app-shells/bash/bash-5.2_beta.ebuild
+2206132310 ./app-shells/bash/bash-9999.ebuild
 2005131639 ./app-shells/bashdb/bashdb-5.0.1.1.2.ebuild
 2104212309 ./app-shells/bashish/bashish-2.2.4.ebuild
 1707171556 ./app-shells/ccsh/ccsh-0.0.4-r4.ebuild
@@ -4533,7 +4534,7 @@
 2206130310 ./app-text/diff-pdf/diff-pdf-0.5.ebuild
 2005201838 ./app-text/diffpdf/diffpdf-2.1.3-r2.ebuild
 2104031909 ./app-text/ding/ding-1.8.1.ebuild
-2012271739 ./app-text/ding/ding-1.9.ebuild
+2206151140 ./app-text/ding/ding-1.9.ebuild
 2205271740 ./app-text/discount/discount-2.2.7b.ebuild
 2006261338 ./app-text/djview/djview-4.10.6-r2.ebuild
 2205171110 ./app-text/djvu/djvu-3.5.28-r1.ebuild
@@ -4594,6 +4595,7 @@
 2104112239 ./app-text/groonga/groonga-8.0.2-r1.ebuild
 2112142339 ./app-text/grutatxt/grutatxt-2.200.0.ebuild
 2205280910 ./app-text/gspell/gspell-1.10.0.ebuild
+2206151940 ./app-text/gspell/gspell-1.11.1.ebuild
 2109091040 ./app-text/gtkspell/gtkspell-2.0.16-r1.ebuild
 2108120640 ./app-text/gtkspell/gtkspell-3.0.10.ebuild
 2201250539 ./app-text/gtranslator/gtranslator-40.0.ebuild
@@ -4640,14 +4642,13 @@
 2112132209 ./app-text/lcdf-typetools/lcdf-typetools-2.108-r1.ebuild
 2202230639 ./app-text/lesspipe/lesspipe-1.91.ebuild
 2203152340 ./app-text/lesspipe/lesspipe-2.04-r1.ebuild
-2206131040 ./app-text/lesspipe/lesspipe-2.05.ebuild
+2206131940 ./app-text/lesspipe/lesspipe-2.05.ebuild
 2104192239 ./app-text/letterize/letterize-1.4.ebuild
 2203251709 ./app-text/libabw/libabw-0.1.3.ebuild
 2203251709 ./app-text/libebook/libebook-0.1.3-r2.ebuild
 2203251709 ./app-text/libepubgen/libepubgen-0.1.1.ebuild
-2202102339 ./app-text/libetonyek/libetonyek-0.1.10.ebuild
 2204280110 ./app-text/libetonyek/libetonyek-9999.ebuild
-2206100640 ./app-text/libetonyek/libetonyek-0.1.10-r1.ebuild
+2206141640 ./app-text/libetonyek/libetonyek-0.1.10-r1.ebuild
 2112252110 ./app-text/libexttextcat/libexttextcat-3.4.6.ebuild
 2112070009 ./app-text/libgepub/libgepub-0.6.0.ebuild
 2108271839 ./app-text/libgxps/libgxps-0.3.2.ebuild
@@ -4656,8 +4657,7 @@
 2203251709 ./app-text/libmspub/libmspub-0.1.4.ebuild
 2111090239 ./app-text/libmwaw/libmwaw-9999.ebuild
 2203251709 ./app-text/libmwaw/libmwaw-0.3.21.ebuild
-2202030709 ./app-text/libnumbertext/libnumbertext-1.0.8.ebuild
-2206100640 ./app-text/libnumbertext/libnumbertext-1.0.10.ebuild
+2206141640 ./app-text/libnumbertext/libnumbertext-1.0.10.ebuild
 2101230339 ./app-text/libodfgen/libodfgen-9999.ebuild
 2112291709 ./app-text/libodfgen/libodfgen-0.1.8.ebuild
 2205141340 ./app-text/libpaper/libpaper-1.1.28.ebuild
@@ -4739,7 +4739,7 @@
 2205020310 ./app-text/poppler/poppler-22.03.0.ebuild
 2206030940 ./app-text/poppler/poppler-9999.ebuild
 2206060210 ./app-text/poppler/poppler-22.06.0.ebuild
-2206100640 ./app-text/poppler/poppler-22.05.0.ebuild
+2206142110 ./app-text/poppler/poppler-22.05.0.ebuild
 2112132209 ./app-text/ps2eps/ps2eps-1.68.ebuild
 2205141340 ./app-text/ps2pkm/ps2pkm-1.8_p20210325-r1.ebuild
 2002280339 ./app-text/psiconv/psiconv-0.8.3-r1.ebuild
@@ -5330,9 +5330,9 @@
 2206121040 ./dev-cpp/doctest/doctest-2.4.8-r1.ebuild
 2202141139 ./dev-cpp/eigen/eigen-3.4.0-r1.ebuild
 2104270539 ./dev-cpp/gconfmm/gconfmm-2.28.3-r1.ebuild
-2107021539 ./dev-cpp/gflags/gflags-2.2.1-r1.ebuild
 2108082209 ./dev-cpp/gflags/gflags-2.2.2.ebuild
 2103061539 ./dev-cpp/gflags/gflags-9999.ebuild
+2206140940 ./dev-cpp/gflags/gflags-2.2.1-r1.ebuild
 2205311240 ./dev-cpp/glibmm/glibmm-2.66.4.ebuild
 2205311240 ./dev-cpp/glibmm/glibmm-2.72.1.ebuild
 2204260610 ./dev-cpp/glog/glog-0.4.0.ebuild
@@ -5416,13 +5416,14 @@
 2205161610 ./dev-cpp/folly/folly-2022.03.28.00.ebuild
 2205291610 ./dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r3.ebuild
 2205291610 ./dev-cpp/sdbus-c++/sdbus-c++-1.1.0-r3.ebuild
-2204290652 ./dev-cpp/highway/highway-0.16.0-r1.ebuild
 2206081140 ./dev-cpp/highway/highway-0.17.0.ebuild
 2206081140 ./dev-cpp/highway/highway-9999.ebuild
+2206151740 ./dev-cpp/highway/highway-0.16.0-r1.ebuild
 2205051910 ./dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.3.0-r2.ebuild
 2205182210 ./dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.4.0.ebuild
 2205180640 ./dev-cpp/taskflow/taskflow-3.3.0.ebuild
 2205180640 ./dev-cpp/taskflow/taskflow-9999.ebuild
+2206160910 ./dev-cpp/gemmlowp/gemmlowp-2021.12.20.ebuild
 2110040939 ./dev-db/apgdiff/apgdiff-2.7.0.ebuild
 2206041110 ./dev-db/barman/barman-2.12-r1.ebuild
 2111141709 ./dev-db/bucardo/bucardo-5.4.1.ebuild
@@ -5506,7 +5507,7 @@
 2201070839 ./dev-db/mydumper/mydumper-0.11.3.5.ebuild
 2204291539 ./dev-db/mydumper/mydumper-0.11.5.2.ebuild
 2205132310 ./dev-db/mydumper/mydumper-0.12.1.ebuild
-2204230540 ./dev-db/myodbc/myodbc-8.0.27-r1.ebuild
+2206161940 ./dev-db/myodbc/myodbc-8.0.27-r1.ebuild
 2109071509 ./dev-db/mysql++/mysql++-3.3.0.ebuild
 2202280139 ./dev-db/mysql-connector-c++/mysql-connector-c++-8.0.27.ebuild
 2203040040 ./dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r1.ebuild
@@ -5516,7 +5517,7 @@
 2205220840 ./dev-db/mysql-workbench/mysql-workbench-8.0.29.ebuild
 2206121141 ./dev-db/mysql-workbench/mysql-workbench-8.0.28.ebuild
 2205150410 ./dev-db/mysql/mysql-5.7.36-r1.ebuild
-2206100610 ./dev-db/mysql/mysql-8.0.27.ebuild
+2206131540 ./dev-db/mysql/mysql-8.0.27.ebuild
 2205130040 ./dev-db/mysqltuner/mysqltuner-1.8.3.ebuild
 2012171509 ./dev-db/mytop/mytop-1.9.1.ebuild
 2201160110 ./dev-db/ocp/ocp-0.2-r1.ebuild
@@ -5545,7 +5546,7 @@
 2206100610 ./dev-db/percona-xtrabackup/percona-xtrabackup-8.0.26.18.ebuild
 2103041839 ./dev-db/pgFormatter/pgFormatter-5.0.ebuild
 2109281639 ./dev-db/pgFormatter/pgFormatter-5.1.ebuild
-2202171409 ./dev-db/pg_activity/pg_activity-2.3.0.ebuild
+2206151610 ./dev-db/pg_activity/pg_activity-2.3.1.ebuild
 2112150709 ./dev-db/pg_top/pg_top-4.0.0-r3.ebuild
 2110241039 ./dev-db/pgadmin4/pgadmin4-4.29-r3.ebuild
 2110241039 ./dev-db/pgadmin4/pgadmin4-4.30-r3.ebuild
@@ -5562,10 +5563,12 @@
 2110231809 ./dev-db/pgmemcache/pgmemcache-2.3.0.ebuild
 2108230109 ./dev-db/pgmodeler/pgmodeler-0.9.2.ebuild
 2202141039 ./dev-db/pgmodeler/pgmodeler-0.9.4.ebuild
-2203151910 ./dev-db/pgpool2/pgpool2-4.2.1-r2.ebuild
-2203151910 ./dev-db/pgpool2/pgpool2-4.2.2-r2.ebuild
 2203160710 ./dev-db/pgpool2/pgpool2-4.3.1.ebuild
-2203151910 ./dev-db/pgpool2/pgpool2-9999.ebuild
+2206141340 ./dev-db/pgpool2/pgpool2-4.2.1-r2.ebuild
+2206141340 ./dev-db/pgpool2/pgpool2-4.2.2-r2.ebuild
+2206141340 ./dev-db/pgpool2/pgpool2-4.2.9.ebuild
+2206141340 ./dev-db/pgpool2/pgpool2-4.3.2.ebuild
+2206141340 ./dev-db/pgpool2/pgpool2-9999.ebuild
 2112260340 ./dev-db/pgrouting/pgrouting-3.1.1.ebuild
 2112260340 ./dev-db/pgrouting/pgrouting-3.1.2.ebuild
 2112260340 ./dev-db/pgrouting/pgrouting-3.1.3.ebuild
@@ -5573,7 +5576,7 @@
 2108230109 ./dev-db/pgtap/pgtap-0.99.0.ebuild
 2108230109 ./dev-db/pgtap/pgtap-1.1.0.ebuild
 2202141039 ./dev-db/pgtap/pgtap-1.2.0.ebuild
-2203221739 ./dev-db/pgtap/pgtap-1.2.0-r2.ebuild
+2206161940 ./dev-db/pgtap/pgtap-1.2.0-r2.ebuild
 2101310343 ./dev-db/pgxnclient/pgxnclient-1.3-r2.ebuild
 2101310343 ./dev-db/pgxnclient/pgxnclient-1.3.1.ebuild
 2104161439 ./dev-db/phpmyadmin/phpmyadmin-4.9.6.ebuild
@@ -5608,23 +5611,24 @@
 2205230940 ./dev-db/postgresql/postgresql-11.16.ebuild
 2205230940 ./dev-db/postgresql/postgresql-12.11.ebuild
 2205230940 ./dev-db/postgresql/postgresql-13.7.ebuild
-2205230940 ./dev-db/postgresql/postgresql-14.3.ebuild
 2205230940 ./dev-db/postgresql/postgresql-15_beta1-r1.ebuild
+2206161710 ./dev-db/postgresql/postgresql-14.4.ebuild
 2106190039 ./dev-db/pspg/pspg-3.1.5-r1.ebuild
 2106190039 ./dev-db/pspg/pspg-4.3.0-r1.ebuild
 2108110309 ./dev-db/pspg/pspg-5.0.5.ebuild
-2206131040 ./dev-db/pspg/pspg-5.5.4.ebuild
+2206131940 ./dev-db/pspg/pspg-5.5.4.ebuild
 1909252109 ./dev-db/psqlodbc/psqlodbc-11.01.0000.ebuild
 2012041709 ./dev-db/psqlodbc/psqlodbc-13.00.0000.ebuild
 2110020309 ./dev-db/qdbm/qdbm-1.8.78-r3.ebuild
 2202271309 ./dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.11-r1.ebuild
-2206130010 ./dev-db/redis/redis-5.0.14.ebuild
-2206130010 ./dev-db/redis/redis-6.0.16.ebuild
-2206130010 ./dev-db/redis/redis-6.2.6.ebuild
 2206130010 ./dev-db/redis/redis-6.2.7-r1.ebuild
-2206130010 ./dev-db/redis/redis-7.0.0-r1.ebuild
 2206130010 ./dev-db/redis/redis-7.0.0.ebuild
-2206130010 ./dev-db/redis/redis-7.0.1.ebuild
+2206160040 ./dev-db/redis/redis-5.0.14.ebuild
+2206160040 ./dev-db/redis/redis-6.0.16.ebuild
+2206160040 ./dev-db/redis/redis-6.2.6.ebuild
+2206160040 ./dev-db/redis/redis-7.0.0-r2.ebuild
+2206160040 ./dev-db/redis/redis-7.0.1-r1.ebuild
+2206160040 ./dev-db/redis/redis-7.0.2.ebuild
 2101040109 ./dev-db/repmgr/repmgr-5.1.0.ebuild
 2205160210 ./dev-db/rqlite/rqlite-7.4.0.ebuild
 2206020640 ./dev-db/rqlite/rqlite-7.5.0.ebuild
@@ -5638,6 +5642,7 @@
 2205151110 ./dev-db/sqlite/sqlite-3.38.2.ebuild
 2206031440 ./dev-db/sqlite/sqlite-3.38.3.ebuild
 2206061910 ./dev-db/sqlite/sqlite-3.38.5.ebuild
+2206151510 ./dev-db/sqlite/sqlite-9999.ebuild
 2102171509 ./dev-db/sqlitebrowser/sqlitebrowser-3.12.1.ebuild
 2107160109 ./dev-db/sqlitebrowser/sqlitebrowser-3.12.2.ebuild
 2102171509 ./dev-db/sqlitebrowser/sqlitebrowser-9999.ebuild
@@ -5659,7 +5664,8 @@
 2203122109 ./dev-db/pglogical/pglogical-2.4.1.ebuild
 2204050639 ./dev-db/sqlmap/sqlmap-1.6.2.ebuild
 2205160840 ./dev-db/sqlmap/sqlmap-1.6.4.ebuild
-2205160840 ./dev-db/sqlmap/sqlmap-9999.ebuild
+2206152140 ./dev-db/sqlmap/sqlmap-1.6.5.ebuild
+2206152140 ./dev-db/sqlmap/sqlmap-9999.ebuild
 2205062310 ./dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-3.1.418-r1.ebuild
 2205062310 ./dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-5.0.407-r1.ebuild
 2205062310 ./dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.202-r1.ebuild
@@ -5703,7 +5709,7 @@
 2009161939 ./dev-embedded/jal/jal-0.4.62.ebuild
 2009162139 ./dev-embedded/kobs-ng/kobs-ng-3.0.35.4.1.0.ebuild
 2009162139 ./dev-embedded/libdisasm/libdisasm-0.23.ebuild
-2012272339 ./dev-embedded/libftd2xx/libftd2xx-1.4.8.ebuild
+2206161940 ./dev-embedded/libftd2xx/libftd2xx-1.4.8.ebuild
 2202020809 ./dev-embedded/libftdi/libftdi-1.5-r3.ebuild
 2202020809 ./dev-embedded/libftdi/libftdi-9999.ebuild
 2204292240 ./dev-embedded/libftdi/libftdi-0.20-r1.ebuild
@@ -6301,7 +6307,7 @@
 2008182039 ./dev-haskell/language-dot/language-dot-0.1.1.ebuild
 2107181639 ./dev-haskell/language-ecmascript/language-ecmascript-0.19.1.0.ebuild
 2008182039 ./dev-haskell/language-glsl/language-glsl-0.3.0.ebuild
-2010241309 ./dev-haskell/language-haskell-extract/language-haskell-extract-0.2.4-r1.ebuild
+2206161940 ./dev-haskell/language-haskell-extract/language-haskell-extract-0.2.4-r1.ebuild
 1912181139 ./dev-haskell/language-javascript/language-javascript-0.6.0.14.ebuild
 2103160139 ./dev-haskell/language-lua/language-lua-0.11.0.1.ebuild
 2008150209 ./dev-haskell/language-python/language-python-0.5.8.ebuild
@@ -6678,7 +6684,7 @@
 2008011139 ./dev-haskell/warp-tls/warp-tls-3.2.12.ebuild
 2008011139 ./dev-haskell/warp/warp-3.3.13.ebuild
 2107251339 ./dev-haskell/wavy/wavy-0.1.0.0.ebuild
-2107251809 ./dev-haskell/wcwidth/wcwidth-0.0.2.ebuild
+2206161940 ./dev-haskell/wcwidth/wcwidth-0.0.2.ebuild
 2008011139 ./dev-haskell/weigh/weigh-0.0.16.ebuild
 2011011639 ./dev-haskell/with-location/with-location-0.1.0.ebuild
 2107251339 ./dev-haskell/wl-pprint-annotated/wl-pprint-annotated-0.1.0.1.ebuild
@@ -6924,8 +6930,8 @@
 2103271909 ./dev-java/jmock/jmock-1.2.0-r2.ebuild
 2103261109 ./dev-java/jmock/jmock-2.6.1-r1.ebuild
 2111261239 ./dev-java/jna/jna-4.2.2-r3.ebuild
-2205121040 ./dev-java/jna/jna-5.10.0.ebuild
 2206010310 ./dev-java/jna/jna-5.11.0.ebuild
+2206151940 ./dev-java/jna/jna-5.10.0.ebuild
 2112222209 ./dev-java/jnr-a64asm/jnr-a64asm-1.0.0.ebuild
 2112311309 ./dev-java/jnr-constants/jnr-constants-0.10.3.ebuild
 2111232009 ./dev-java/jnr-ffi/jnr-ffi-2.2.8.ebuild
@@ -6954,8 +6960,8 @@
 2103121539 ./dev-java/junit/junit-3.8.2-r2.ebuild
 2105061339 ./dev-java/junit/junit-4.13.2.ebuild
 2112222209 ./dev-java/junitparams/junitparams-1.1.1.ebuild
-2204291210 ./dev-java/jython/jython-2.7.0-r6.ebuild
 2204292240 ./dev-java/jython/jython-2.7.0-r4.ebuild
+2206161840 ./dev-java/jython/jython-2.7.0-r6.ebuild
 2202112309 ./dev-java/jzlib/jzlib-1.1.3-r2.ebuild
 2205311240 ./dev-java/leiningen-bin/leiningen-bin-2.9.8.ebuild
 2202090440 ./dev-java/libg/libg-2.1.0-r2.ebuild
@@ -6970,8 +6976,8 @@
 2105041239 ./dev-java/miglayout/miglayout-4.0-r1.ebuild
 2206131210 ./dev-java/mill-bin/mill-bin-0.10.4.ebuild
 2112222209 ./dev-java/mockito/mockito-1.9.5-r2.ebuild
-2204101839 ./dev-java/mockito/mockito-4.4.0.ebuild
 2206031210 ./dev-java/mockito/mockito-4.6.0.ebuild
+2206161840 ./dev-java/mockito/mockito-4.4.0.ebuild
 2201102240 ./dev-java/netty-buffer/netty-buffer-4.0.36-r1.ebuild
 2201181609 ./dev-java/netty-buffer/netty-buffer-4.0.36.ebuild
 2203312010 ./dev-java/netty-common/netty-common-4.0.36-r2.ebuild
@@ -7047,6 +7053,7 @@
 2201291739 ./dev-java/swt/swt-3.8.2-r4.ebuild
 2205150110 ./dev-java/testng/testng-6.9.10-r1.ebuild
 2206100640 ./dev-java/tomcat-native/tomcat-native-1.2.33.ebuild
+2206150640 ./dev-java/tomcat-native/tomcat-native-1.2.34.ebuild
 2106010409 ./dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.109.ebuild
 2201282340 ./dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.36.ebuild
 2202090440 ./dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40.ebuild
@@ -7055,17 +7062,19 @@
 2205050840 ./dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.20.ebuild
 2205050840 ./dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.78.ebuild
 2205050840 ./dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.62.ebuild
-2205161540 ./dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.21.ebuild
-2205161810 ./dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.63.ebuild
-2205241040 ./dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.79.ebuild
 2206120710 ./dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.22.ebuild
 2206101010 ./dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.64.ebuild
+2206161910 ./dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.21.ebuild
+2206161910 ./dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.79.ebuild
+2206140710 ./dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.81.ebuild
+2206161910 ./dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.63.ebuild
 2203170340 ./dev-java/treelayout/treelayout-1.0.3-r1.ebuild
 2201262240 ./dev-java/typesafe-config/typesafe-config-1.3.0-r3.ebuild
 2204270910 ./dev-java/validation-api/validation-api-1.0.0-r1.ebuild
 2204270910 ./dev-java/validation-api/validation-api-1.1.0-r1.ebuild
 2112260340 ./dev-java/velocity/velocity-2.3.ebuild
 2104141209 ./dev-java/wsdl4j/wsdl4j-1.6.2-r1.ebuild
+2206131810 ./dev-java/wsdl4j/wsdl4j-1.6.3.ebuild
 2103262209 ./dev-java/xalan-serializer/xalan-serializer-2.7.2-r1.ebuild
 2201141210 ./dev-java/xalan/xalan-2.7.2-r1.ebuild
 2203061209 ./dev-java/xerces/xerces-2.12.2.ebuild
@@ -7074,7 +7083,7 @@
 2112150139 ./dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r2.ebuild
 2206081140 ./dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r3.ebuild
 2202260109 ./dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7.ebuild
-2204271210 ./dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7-r1.ebuild
+2206161840 ./dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7-r1.ebuild
 2204122140 ./dev-java/xmlunit/xmlunit-1.6-r1.ebuild
 2105161809 ./dev-java/xom/xom-1.3.7.ebuild
 2107011609 ./dev-java/xpp2/xpp2-2.1.10-r3.ebuild
@@ -7128,20 +7137,20 @@
 2205061610 ./dev-java/apiguardian-api/apiguardian-api-1.1.2.ebuild
 2205061610 ./dev-java/opentest4j/opentest4j-1.2.0.ebuild
 2205061610 ./dev-java/univocity-parsers/univocity-parsers-2.9.1.ebuild
-2204101839 ./dev-java/byte-buddy-agent/byte-buddy-agent-1.12.8.ebuild
 2206031210 ./dev-java/byte-buddy-agent/byte-buddy-agent-1.12.10.ebuild
-2204151310 ./dev-java/byte-buddy/byte-buddy-1.12.8.ebuild
+2206161840 ./dev-java/byte-buddy-agent/byte-buddy-agent-1.12.8.ebuild
 2206031210 ./dev-java/byte-buddy/byte-buddy-1.12.10.ebuild
-2204101839 ./dev-java/findbugs-annotations/findbugs-annotations-3.0.1.ebuild
+2206161840 ./dev-java/byte-buddy/byte-buddy-1.12.8.ebuild
+2206161840 ./dev-java/findbugs-annotations/findbugs-annotations-3.0.1.ebuild
 2205152210 ./dev-java/janino/janino-3.1.6.ebuild
 2205231710 ./dev-java/janino/janino-3.1.7.ebuild
-2204290652 ./dev-java/logback-classic/logback-classic-1.2.11.ebuild
-2206081140 ./dev-java/logback-core/logback-core-1.2.11.ebuild
-2204222240 ./dev-java/netty/netty-4.1.35.ebuild
+2206161840 ./dev-java/logback-classic/logback-classic-1.2.11.ebuild
+2206161840 ./dev-java/logback-core/logback-core-1.2.11.ebuild
+2206161840 ./dev-java/netty/netty-4.1.35.ebuild
 2206072140 ./dev-java/guava-testlib/guava-testlib-30.1.1.ebuild
 2205222040 ./dev-java/jakarta-mail-api/jakarta-mail-api-2.1.0.ebuild
 2206010840 ./dev-lang/R/R-4.1.2-r1.ebuild
-2206121141 ./dev-lang/R/R-4.2.0.ebuild
+2206140040 ./dev-lang/R/R-4.2.0.ebuild
 2205160340 ./dev-lang/abs/abs-2.6.0.ebuild
 2205241040 ./dev-lang/ammonite-repl-bin/ammonite-repl-bin-2.5.3.ebuild
 2205241040 ./dev-lang/ammonite-repl-bin/ammonite-repl-bin-2.5.4.ebuild
@@ -7172,13 +7181,12 @@
 2205051740 ./dev-lang/erlang/erlang-24.3.4.ebuild
 2205182010 ./dev-lang/erlang/erlang-25.0.ebuild
 1702282250 ./dev-lang/esco/esco-0.512.ebuild
-2204241309 ./dev-lang/execline/execline-2.8.2.0.ebuild
 2205220940 ./dev-lang/execline/execline-2.8.3.0.ebuild
 2006111539 ./dev-lang/f2c/f2c-20100827-r1.ebuild
 2105140339 ./dev-lang/ferite/ferite-1.1.17-r1.ebuild
 2110170409 ./dev-lang/fpc/fpc-3.2.2.ebuild
 2112290109 ./dev-lang/gdl/gdl-1.0.0_rc3-r1.ebuild
-2202070939 ./dev-lang/gforth/gforth-0.7.3-r2.ebuild
+2206161940 ./dev-lang/gforth/gforth-0.7.3-r2.ebuild
 2201051309 ./dev-lang/ghc/ghc-8.10.4-r1.ebuild
 2201051309 ./dev-lang/ghc/ghc-8.10.5-r1.ebuild
 2201051309 ./dev-lang/ghc/ghc-8.10.6.ebuild
@@ -7190,8 +7198,6 @@
 2105150939 ./dev-lang/gnuprologjava/gnuprologjava-0.2.6-r1.ebuild
 2108202209 ./dev-lang/go-bootstrap/go-bootstrap-1.16.6.ebuild
 2203151809 ./dev-lang/go/go-9999.ebuild
-2205171240 ./dev-lang/go/go-1.17.10.ebuild
-2205171240 ./dev-lang/go/go-1.18.2.ebuild
 2206121141 ./dev-lang/go/go-1.17.11.ebuild
 2206121141 ./dev-lang/go/go-1.18.3.ebuild
 2106271339 ./dev-lang/gprolog/gprolog-1.4.5.ebuild
@@ -7250,7 +7256,7 @@
 2206031810 ./dev-lang/mercury/mercury-22.01.1.ebuild
 2107102209 ./dev-lang/micropython/micropython-1.11-r1.ebuild
 2110251609 ./dev-lang/micropython/micropython-1.17.ebuild
-2107011239 ./dev-lang/mlton/mlton-20180207.ebuild
+2206161940 ./dev-lang/mlton/mlton-20180207.ebuild
 2204260040 ./dev-lang/mmix/mmix-20160804-r1.ebuild
 2112130339 ./dev-lang/moarvm/moarvm-2021.06-r1.ebuild
 2112130339 ./dev-lang/moarvm/moarvm-2021.08.ebuild
@@ -7305,14 +7311,8 @@
 2204290540 ./dev-lang/python-exec-conf/python-exec-conf-2.4.6.ebuild
 2206100840 ./dev-lang/python-exec/python-exec-2.4.9.ebuild
 2205170840 ./dev-lang/python/python-3.10.4.ebuild
-2205170840 ./dev-lang/python/python-3.11.0_beta1-r2.ebuild
 2205170840 ./dev-lang/python/python-3.8.13.ebuild
-2205170840 ./dev-lang/python/python-3.8.13_p1.ebuild
-2205170840 ./dev-lang/python/python-3.9.11.ebuild
 2205190210 ./dev-lang/python/python-3.9.12.ebuild
-2205311740 ./dev-lang/python/python-3.11.0_beta2.ebuild
-2206010940 ./dev-lang/python/python-3.11.0_beta2_p1.ebuild
-2206031010 ./dev-lang/python/python-3.10.4_p1.ebuild
 2206071110 ./dev-lang/python/python-2.7.18_p15.ebuild
 2206071110 ./dev-lang/python/python-3.10.5.ebuild
 2206071110 ./dev-lang/python/python-3.11.0_beta3.ebuild
@@ -7343,13 +7343,13 @@
 2203191510 ./dev-lang/smlnj/smlnj-110.99.2.ebuild
 2102171309 ./dev-lang/snobol/snobol-1.4.1-r1.ebuild
 2202062109 ./dev-lang/spark/spark-2021.ebuild
-2204261810 ./dev-lang/spidermonkey/spidermonkey-1.8.5-r10.ebuild
 2204261810 ./dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r6.ebuild
 2204261810 ./dev-lang/spidermonkey/spidermonkey-78.15.0.ebuild
 2205041740 ./dev-lang/spidermonkey/spidermonkey-91.8.0.ebuild
 2205231640 ./dev-lang/spidermonkey/spidermonkey-91.9.1.ebuild
 2205260410 ./dev-lang/spidermonkey/spidermonkey-68.12.0-r1.ebuild
 2206031040 ./dev-lang/spidermonkey/spidermonkey-91.10.0.ebuild
+2206161940 ./dev-lang/spidermonkey/spidermonkey-1.8.5-r10.ebuild
 2008112209 ./dev-lang/squirrel/squirrel-3.1_p20200612.ebuild
 2011290239 ./dev-lang/srf/srf-1.0-r2.ebuild
 2203240839 ./dev-lang/starlark-rust/starlark-rust-0.7.0.ebuild
@@ -7365,8 +7365,8 @@
 2202071210 ./dev-lang/tcc/tcc-0.9.27_p20211022.ebuild
 2201021239 ./dev-lang/tcl/tcl-8.6.11.ebuild
 2206090010 ./dev-lang/tcl/tcl-8.6.12.ebuild
-1912210209 ./dev-lang/teyjus/teyjus-2.1.ebuild
-2203110039 ./dev-lang/teyjus/teyjus-2.1-r1.ebuild
+2206161940 ./dev-lang/teyjus/teyjus-2.1-r1.ebuild
+2206161940 ./dev-lang/teyjus/teyjus-2.1.ebuild
 2201021239 ./dev-lang/tk/tk-8.6.11.1.ebuild
 2201310139 ./dev-lang/tk/tk-8.6.12.ebuild
 2201221239 ./dev-lang/tuprolog/tuprolog-3.2.0.ebuild
@@ -7442,7 +7442,7 @@
 2205041040 ./dev-libs/boehm-gc/boehm-gc-8.2.0.ebuild
 1912110241 ./dev-libs/boost-mpl-cartesian_product/boost-mpl-cartesian_product-20161205.ebuild
 2205010512 ./dev-libs/boost/boost-1.78.0-r2.ebuild
-2206100640 ./dev-libs/boost/boost-1.79.0.ebuild
+2206142110 ./dev-libs/boost/boost-1.79.0.ebuild
 2202261809 ./dev-libs/botan/botan-2.19.1.ebuild
 2206040440 ./dev-libs/botan/botan-2.19.2.ebuild
 2201291309 ./dev-libs/boxfort/boxfort-0.1.1.ebuild
@@ -7490,6 +7490,7 @@
 2205051910 ./dev-libs/cxxopts/cxxopts-3.0.0.ebuild
 2110082209 ./dev-libs/cxxtools/cxxtools-3.0-r1.ebuild
 2105101009 ./dev-libs/cxxtools/cxxtools-3.0.ebuild
+2206141540 ./dev-libs/cxxtools/cxxtools-3.0-r2.ebuild
 2205081440 ./dev-libs/cyberjack/cyberjack-3.99.5_p15.ebuild
 2205071440 ./dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r2.ebuild
 2206010840 ./dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r3.ebuild
@@ -7535,7 +7536,6 @@
 1704052014 ./dev-libs/ferrisloki/ferrisloki-3.0.13-r2.ebuild
 2202171409 ./dev-libs/ffcall/ffcall-2.1.ebuild
 2205150110 ./dev-libs/ffcall/ffcall-2.4.ebuild
-2112170039 ./dev-libs/flatbuffers/flatbuffers-2.0.0-r1.ebuild
 2206020940 ./dev-libs/flatbuffers/flatbuffers-2.0.6.ebuild
 2205280910 ./dev-libs/folks/folks-0.15.5.ebuild
 2106190039 ./dev-libs/foma/foma-0.9.18-r1.ebuild
@@ -7566,7 +7566,7 @@
 2204130011 ./dev-libs/gnulib/gnulib-2022.02.12.16.27.05.ebuild
 2205262110 ./dev-libs/gnulib/gnulib-2022.05.26.07.24.56.ebuild
 2205311240 ./dev-libs/gobject-introspection-common/gobject-introspection-common-1.72.0.ebuild
-2205311240 ./dev-libs/gobject-introspection/gobject-introspection-1.72.0.ebuild
+2206141840 ./dev-libs/gobject-introspection/gobject-introspection-1.72.0.ebuild
 2204162340 ./dev-libs/gom/gom-0.4.ebuild
 2103070009 ./dev-libs/gost-engine/gost-engine-1.1.0.3_p20181031-r2.ebuild
 2109201609 ./dev-libs/gost-engine/gost-engine-3.0.0.ebuild
@@ -7589,11 +7589,10 @@
 2205100410 ./dev-libs/icinga-php-library/icinga-php-library-0.8.1.ebuild
 2205100410 ./dev-libs/icinga-php-thirdparty/icinga-php-thirdparty-0.10.0-r1.ebuild
 2202030709 ./dev-libs/icu-layoutex/icu-layoutex-70.1.ebuild
-2206100640 ./dev-libs/icu-layoutex/icu-layoutex-71.1.ebuild
+2206142110 ./dev-libs/icu-layoutex/icu-layoutex-71.1.ebuild
 2108070909 ./dev-libs/icu-le-hb/icu-le-hb-1.0.3-r1.ebuild
 2202052039 ./dev-libs/icu/icu-70.1-r1.ebuild
-2205180240 ./dev-libs/icu/icu-71.1.ebuild
-2206100640 ./dev-libs/icu/icu-71.1-r1.ebuild
+2206142110 ./dev-libs/icu/icu-71.1-r1.ebuild
 2102272239 ./dev-libs/igraph/igraph-0.8.5.ebuild
 2104241609 ./dev-libs/igraph/igraph-0.9.2.ebuild
 2106172109 ./dev-libs/igraph/igraph-0.9.4.ebuild
@@ -7705,6 +7704,7 @@
 2103310109 ./dev-libs/libdbh/libdbh-5.0.22.ebuild
 2205251440 ./dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r3.ebuild
 2105251739 ./dev-libs/libdbusmenu/libdbusmenu-16.04.0-r1.ebuild
+2206141840 ./dev-libs/libdbusmenu/libdbusmenu-16.04.0-r2.ebuild
 2202180640 ./dev-libs/libdispatch/libdispatch-5.3.3-r1.ebuild
 2203121339 ./dev-libs/libdispatch/libdispatch-5.5.ebuild
 2112260340 ./dev-libs/libdivecomputer/libdivecomputer-0.6.0-r1.ebuild
@@ -7737,9 +7737,9 @@
 2206051640 ./dev-libs/libfastjson/libfastjson-0.99.8-r1.ebuild
 2206051640 ./dev-libs/libfastjson/libfastjson-0.99.9-r1.ebuild
 2201061240 ./dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild
-2203100240 ./dev-libs/libffi-compat/libffi-compat-3.3-r2.ebuild
+2206142010 ./dev-libs/libffi-compat/libffi-compat-3.3-r2.ebuild
 2201061240 ./dev-libs/libffi/libffi-3.3-r2.ebuild
-2204290540 ./dev-libs/libffi/libffi-3.4.2-r1.ebuild
+2206142010 ./dev-libs/libffi/libffi-3.4.2-r1.ebuild
 2110021909 ./dev-libs/libfido2/libfido2-1.8.0.ebuild
 2201171039 ./dev-libs/libfido2/libfido2-1.9.0.ebuild
 2205060310 ./dev-libs/libfido2/libfido2-1.10.0.ebuild
@@ -7770,6 +7770,7 @@
 2205020240 ./dev-libs/libgcrypt/libgcrypt-1.8.9.ebuild
 2205130610 ./dev-libs/libgcrypt/libgcrypt-1.10.1.ebuild
 2205130610 ./dev-libs/libgcrypt/libgcrypt-1.9.4-r1.ebuild
+2206160010 ./dev-libs/libgcrypt/libgcrypt-1.10.1-r1.ebuild
 2205260840 ./dev-libs/libgdata/libgdata-0.18.1.ebuild
 2203160010 ./dev-libs/libgee/libgee-0.20.5.ebuild
 2202101409 ./dev-libs/libgit2-glib/libgit2-glib-1.0.0.1.ebuild
@@ -7784,7 +7785,7 @@
 2201190139 ./dev-libs/libgnt/libgnt-2.14.3.ebuild
 2106131409 ./dev-libs/libgpg-error/libgpg-error-1.42.ebuild
 2201271640 ./dev-libs/libgpg-error/libgpg-error-1.44.ebuild
-2205170840 ./dev-libs/libgpg-error/libgpg-error-1.45.ebuild
+2206151140 ./dev-libs/libgpg-error/libgpg-error-1.45.ebuild
 2108101609 ./dev-libs/libgpiod/libgpiod-1.4.1.ebuild
 2109242039 ./dev-libs/libgpiod/libgpiod-1.6.3.ebuild
 2109072109 ./dev-libs/libgudev/libgudev-236.ebuild
@@ -7808,16 +7809,15 @@
 2202021039 ./dev-libs/libisofs/libisofs-1.5.4.ebuild
 2104281039 ./dev-libs/libite/libite-2.4.0.ebuild
 2112260240 ./dev-libs/libite/libite-2.5.1.ebuild
-2112012009 ./dev-libs/libixion/libixion-0.16.1.ebuild
 2202120409 ./dev-libs/libixion/libixion-9999.ebuild
-2206100640 ./dev-libs/libixion/libixion-0.17.0.ebuild
+2206141640 ./dev-libs/libixion/libixion-0.17.0.ebuild
 2204181540 ./dev-libs/libjcat/libjcat-0.1.10.ebuild
 2204181540 ./dev-libs/libjcat/libjcat-0.1.11.ebuild
 2204181540 ./dev-libs/libjcat/libjcat-0.1.9-r1.ebuild
 1708050004 ./dev-libs/libkpass/libkpass-6-r1.ebuild
 2106110139 ./dev-libs/libksba/libksba-1.5.0.ebuild
 2106121909 ./dev-libs/libksba/libksba-1.5.1.ebuild
-2204290540 ./dev-libs/libksba/libksba-1.6.0.ebuild
+2206151140 ./dev-libs/libksba/libksba-1.6.0.ebuild
 2109271809 ./dev-libs/liblinear/liblinear-243.ebuild
 2104031909 ./dev-libs/liblist/liblist-2.4-r1.ebuild
 2110212139 ./dev-libs/liblogging/liblogging-1.0.6-r1.ebuild
@@ -7827,7 +7827,7 @@
 2112011009 ./dev-libs/liblouis/liblouis-3.17.0.ebuild
 2201271940 ./dev-libs/liblouis/liblouis-3.20.0.ebuild
 2104060140 ./dev-libs/libltdl/libltdl-2.4.6.ebuild
-2204290540 ./dev-libs/libltdl/libltdl-2.4.7.ebuild
+2206141040 ./dev-libs/libltdl/libltdl-2.4.7.ebuild
 2104060140 ./dev-libs/liblzw/liblzw-0.2-r1.ebuild
 2102190539 ./dev-libs/liblzw/liblzw-0.3.ebuild
 2109291109 ./dev-libs/libmaa/libmaa-1.3.2.ebuild
@@ -7861,9 +7861,8 @@
 2203222209 ./dev-libs/libnsutils/libnsutils-0.1.0-r1.ebuild
 2203301740 ./dev-libs/libofx/libofx-0.10.3.ebuild
 2102250309 ./dev-libs/liboil/liboil-0.3.17-r3.ebuild
-2111140839 ./dev-libs/liborcus/liborcus-0.16.1.ebuild
 2202120409 ./dev-libs/liborcus/liborcus-9999.ebuild
-2206100640 ./dev-libs/liborcus/liborcus-0.17.2.ebuild
+2206141640 ./dev-libs/liborcus/liborcus-0.17.2.ebuild
 2108231509 ./dev-libs/libotf/libotf-0.9.16.ebuild
 2203200410 ./dev-libs/libowfat/libowfat-0.32-r1.ebuild
 2203200410 ./dev-libs/libowfat/libowfat-0.32-r5.ebuild
@@ -7890,7 +7889,7 @@
 2109301539 ./dev-libs/libprelude/libprelude-5.2.0-r10.ebuild
 2109301539 ./dev-libs/libpreludedb/libpreludedb-5.2.0.ebuild
 2106290913 ./dev-libs/libpthread-stubs/libpthread-stubs-0.4-r1.ebuild
-2205292340 ./dev-libs/libpwquality/libpwquality-1.4.4-r1.ebuild
+2206161940 ./dev-libs/libpwquality/libpwquality-1.4.4-r1.ebuild
 2110211709 ./dev-libs/libpy/libpy-0.2.5-r1.ebuild
 2107261109 ./dev-libs/libqtxdg/libqtxdg-3.7.1.ebuild
 2204151640 ./dev-libs/libqtxdg/libqtxdg-3.8.0.ebuild
@@ -7949,7 +7948,7 @@
 2204171140 ./dev-libs/libthreadar/libthreadar-1.4.0.ebuild
 2111230440 ./dev-libs/libtimezonemap/libtimezonemap-0.4.6-r1.ebuild
 2110202209 ./dev-libs/libtomcrypt/libtomcrypt-1.18.2-r3.ebuild
-2206131340 ./dev-libs/libtomcrypt/libtomcrypt-1.18.2-r4.ebuild
+2206131940 ./dev-libs/libtomcrypt/libtomcrypt-1.18.2-r4.ebuild
 1911300139 ./dev-libs/libtomfloat/libtomfloat-0.02-r1.ebuild
 2110280409 ./dev-libs/libtommath/libtommath-1.2.0-r2.ebuild
 1911300139 ./dev-libs/libtompoly/libtompoly-0.04-r1.ebuild
@@ -8019,6 +8018,7 @@
 2201300109 ./dev-libs/libzia/libzia-4.34.ebuild
 2205050910 ./dev-libs/libzia/libzia-4.36.ebuild
 2205171610 ./dev-libs/libzip/libzip-1.8.0-r1.ebuild
+2206141110 ./dev-libs/libzip/libzip-1.9.0.ebuild
 2204280640 ./dev-libs/light/light-1.2.2-r2.ebuild
 2204110939 ./dev-libs/link-grammar/link-grammar-5.10.4.ebuild
 2112150009 ./dev-libs/lockdev/lockdev-1.0.3.1.2-r4.ebuild
@@ -8218,9 +8218,8 @@
 2201061409 ./dev-libs/simdjson/simdjson-1.0.0-r1.ebuild
 2201061409 ./dev-libs/simdjson/simdjson-1.0.2.ebuild
 2205180440 ./dev-libs/simdjson/simdjson-1.1.0.ebuild
-2206030040 ./dev-libs/simdjson/simdjson-2.0.3.ebuild
+2206161910 ./dev-libs/simdjson/simdjson-2.0.4.ebuild
 2109072009 ./dev-libs/sink/sink-0.8.0-r3.ebuild
-2204241309 ./dev-libs/skalibs/skalibs-2.11.1.0.ebuild
 2205220940 ./dev-libs/skalibs/skalibs-2.11.2.0.ebuild
 2203200410 ./dev-libs/snowball-stemmer/snowball-stemmer-2.1.0-r1.ebuild
 2205251240 ./dev-libs/snowball-stemmer/snowball-stemmer-2.2.0.ebuild
@@ -8247,7 +8246,7 @@
 2110312109 ./dev-libs/totem-pl-parser/totem-pl-parser-3.26.6.ebuild
 2202260009 ./dev-libs/tre/tre-0.8.0-r2.ebuild
 2206010840 ./dev-libs/tre/tre-0.8.0_p20210321.ebuild
-2206122140 ./dev-libs/tre/tre-0.8.0_p20210321-r1.ebuild
+2206151040 ./dev-libs/tre/tre-0.8.0_p20210321-r1.ebuild
 2205222240 ./dev-libs/tree-sitter-bash/tree-sitter-bash-0.19.0.ebuild
 2110220309 ./dev-libs/tree-sitter-c/tree-sitter-c-0.20.1.ebuild
 2111131839 ./dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.20.0.ebuild
@@ -8373,7 +8372,9 @@
 2205260840 ./dev-libs/FBGEMM/FBGEMM-2022.01.13.ebuild
 2205272040 ./dev-libs/libnop/libnop-2021.11.03.ebuild
 2206072340 ./dev-libs/linux-syscall-support/linux-syscall-support-2021.05.03.ebuild
-2206081111 ./dev-libs/tlsh/tlsh-4.8.2.ebuild
+2206140910 ./dev-libs/tlsh/tlsh-4.8.2.ebuild
+2206162010 ./dev-libs/libtraceevent/libtraceevent-1.5.2.ebuild
+2206162010 ./dev-libs/libtracefs/libtracefs-1.3.1.ebuild
 2112260340 ./dev-lisp/abcl/abcl-1.8.0.ebuild
 2205132310 ./dev-lisp/alexandria/alexandria-1.4.ebuild
 2205150110 ./dev-lisp/asdf/asdf-3.3.5.ebuild
@@ -10061,7 +10062,7 @@
 2107160109 ./dev-perl/Net-Server-Coro/Net-Server-Coro-1.300.0-r2.ebuild
 2107160109 ./dev-perl/Net-Server-Mail/Net-Server-Mail-0.280.0-r1.ebuild
 2203091610 ./dev-perl/Net-Server/Net-Server-2.10.0.ebuild
-2107171939 ./dev-perl/Net-Subnet/Net-Subnet-1.30.0-r2.ebuild
+2206161940 ./dev-perl/Net-Subnet/Net-Subnet-1.30.0-r2.ebuild
 2108251939 ./dev-perl/Net-Telnet-Cisco/Net-Telnet-Cisco-1.120.0.ebuild
 2203091610 ./dev-perl/Net-Telnet/Net-Telnet-3.50.0.ebuild
 2107171939 ./dev-perl/Net-Trackback/Net-Trackback-1.10.0-r2.ebuild
@@ -10306,6 +10307,7 @@
 2108081809 ./dev-perl/Sort-Versions/Sort-Versions-1.620.0-r1.ebuild
 2101070139 ./dev-perl/Specio/Specio-0.420.0.ebuild
 2205141340 ./dev-perl/Specio/Specio-0.470.0.ebuild
+2206141740 ./dev-perl/Specio/Specio-0.480.0.ebuild
 2108090339 ./dev-perl/Speech-Recognizer-SPX/Speech-Recognizer-SPX-0.80.100-r2.ebuild
 2108090339 ./dev-perl/Sphinx-Config/Sphinx-Config-0.100.0-r1.ebuild
 2108090339 ./dev-perl/Sphinx-Search/Sphinx-Search-0.310.0-r1.ebuild
@@ -10371,6 +10373,7 @@
 2112051109 ./dev-perl/Sys-Virt/Sys-Virt-7.5.0.ebuild
 2205140610 ./dev-perl/Sys-Virt/Sys-Virt-8.1.0.ebuild
 2205311110 ./dev-perl/Sys-Virt/Sys-Virt-8.3.0.ebuild
+2206160140 ./dev-perl/Sys-Virt/Sys-Virt-8.4.0.ebuild
 2108120039 ./dev-perl/Sysadm-Install/Sysadm-Install-0.480.0-r1.ebuild
 2108132239 ./dev-perl/TAP-Parser-SourceHandler-pgTAP/TAP-Parser-SourceHandler-pgTAP-3.350.0-r1.ebuild
 2205141010 ./dev-perl/Taint-Runtime/Taint-Runtime-0.30.0-r2.ebuild
@@ -10564,7 +10567,7 @@
 2109292209 ./dev-perl/Tk-CursorControl/Tk-CursorControl-0.400.0-r4.ebuild
 2109292309 ./dev-perl/Tk-JPEG-Lite/Tk-JPEG-Lite-2.15.0-r1.ebuild
 2203211109 ./dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.260.0.ebuild
-2203110039 ./dev-perl/Tk/Tk-804.36.0.ebuild
+2206161940 ./dev-perl/Tk/Tk-804.36.0.ebuild
 2203091610 ./dev-perl/Tree-DAG_Node/Tree-DAG_Node-1.320.0.ebuild
 2112050739 ./dev-perl/Tree-Simple/Tree-Simple-1.340.0.ebuild
 2109292309 ./dev-perl/Try-Tiny/Try-Tiny-0.300.0-r1.ebuild
@@ -10977,6 +10980,7 @@
 2203170210 ./dev-php/libvirt-php/libvirt-php-0.5.5-r1.ebuild
 2203170210 ./dev-php/libvirt-php/libvirt-php-9999.ebuild
 2203220639 ./dev-php/libvirt-php/libvirt-php-0.5.5_p20211020.ebuild
+2206160140 ./dev-php/libvirt-php/libvirt-php-0.5.6.ebuild
 2203171809 ./dev-php/maxmind-db-reader/maxmind-db-reader-1.11.0.ebuild
 2105101009 ./dev-php/metadata-minifier/metadata-minifier-1.0.0.ebuild
 1707101834 ./dev-php/mmslib/mmslib-0.97.ebuild
@@ -11034,8 +11038,8 @@
 2203221539 ./dev-php/pecl-radius/pecl-radius-1.4.0_beta1-r3.ebuild
 2110231109 ./dev-php/pecl-raphf/pecl-raphf-2.0.1-r1.ebuild
 2111222309 ./dev-php/pecl-raphf/pecl-raphf-2.0.1-r2.ebuild
-2203182040 ./dev-php/pecl-redis/pecl-redis-5.3.7.ebuild
 2203211109 ./dev-php/pecl-redis/pecl-redis-5.3.6.ebuild
+2206161310 ./dev-php/pecl-redis/pecl-redis-5.3.7.ebuild
 2101111839 ./dev-php/pecl-rrd/pecl-rrd-2.0.1-r4.ebuild
 2110151739 ./dev-php/pecl-rrd/pecl-rrd-2.0.3.ebuild
 2109231709 ./dev-php/pecl-ssh2/pecl-ssh2-1.3.1.ebuild
@@ -11176,16 +11180,12 @@
 2101310343 ./dev-python/3to2/3to2-1.1.1-r1.ebuild
 2202281139 ./dev-python/APScheduler/APScheduler-3.9.1.ebuild
 2206100640 ./dev-python/Babel/Babel-2.10.1.ebuild
+2206160740 ./dev-python/Babel/Babel-2.10.2.ebuild
 2205181410 ./dev-python/BitVector/BitVector-3.5.0.ebuild
 2205181410 ./dev-python/CppHeaderParser/CppHeaderParser-2.7.4.ebuild
-2205141040 ./dev-python/Faker/Faker-13.11.1.ebuild
-2206011040 ./dev-python/Faker/Faker-13.12.0.ebuild
-2206062210 ./dev-python/Faker/Faker-13.12.1.ebuild
 2206110840 ./dev-python/Faker/Faker-13.13.0.ebuild
 2205290010 ./dev-python/GitPython/GitPython-3.1.27.ebuild
 2110111109 ./dev-python/GridDataFormats/GridDataFormats-0.6.0.ebuild
-2202211239 ./dev-python/GridDataFormats/GridDataFormats-0.7.0.ebuild
-2205220910 ./dev-python/GridDataFormats/GridDataFormats-1.0.0.ebuild
 2205261140 ./dev-python/GridDataFormats/GridDataFormats-1.0.1.ebuild
 2109081439 ./dev-python/MechanicalSoup/MechanicalSoup-1.1.0.ebuild
 2108250839 ./dev-python/PyContracts/PyContracts-1.8.14-r1.ebuild
@@ -11198,6 +11198,7 @@
 2206022310 ./dev-python/PyPDF2/PyPDF2-2.0.0.ebuild
 2206062210 ./dev-python/PyPDF2/PyPDF2-2.1.0.ebuild
 2206131040 ./dev-python/PyPDF2/PyPDF2-2.1.1.ebuild
+2206140740 ./dev-python/PyPDF2/PyPDF2-2.2.0.ebuild
 2206082240 ./dev-python/PyQt-builder/PyQt-builder-1.12.2.ebuild
 2202042209 ./dev-python/PyQt5-sip/PyQt5-sip-12.9.0.ebuild
 2206082240 ./dev-python/PyQt5-sip/PyQt5-sip-12.10.1.ebuild
@@ -11222,6 +11223,7 @@
 2205271240 ./dev-python/aesara/aesara-2.6.6.ebuild
 2206041010 ./dev-python/aesara/aesara-2.7.0.ebuild
 2206051240 ./dev-python/aesara/aesara-2.7.1.ebuild
+2206151440 ./dev-python/aesara/aesara-2.7.2.ebuild
 2112260340 ./dev-python/agate-dbf/agate-dbf-0.2.2-r1.ebuild
 2112260340 ./dev-python/agate-excel/agate-excel-0.2.5-r1.ebuild
 2112260340 ./dev-python/agate-sql/agate-sql-0.5.8-r1.ebuild
@@ -11238,11 +11240,10 @@
 2206110940 ./dev-python/aioresponses/aioresponses-0.7.3-r1.ebuild
 2108071714 ./dev-python/aiorpcX/aiorpcX-0.19.1.ebuild
 2108071639 ./dev-python/aiorpcX/aiorpcX-0.22.1.ebuild
-2205010512 ./dev-python/aiosignal/aiosignal-1.2.0.ebuild
-2205131940 ./dev-python/aiosignal/aiosignal-1.2.0-r1.ebuild
-2205010512 ./dev-python/alabaster/alabaster-0.7.12.ebuild
-2205141510 ./dev-python/alabaster/alabaster-0.7.12-r1.ebuild
+2206161310 ./dev-python/aiosignal/aiosignal-1.2.0-r1.ebuild
+2206161210 ./dev-python/alabaster/alabaster-0.7.12-r1.ebuild
 2101310343 ./dev-python/alagitpull/alagitpull-0.0.23-r1.ebuild
+2206152140 ./dev-python/alagitpull/alagitpull-0.0.23-r2.ebuild
 2204161110 ./dev-python/alembic/alembic-1.7.7.ebuild
 2206011040 ./dev-python/alembic/alembic-1.8.0.ebuild
 2203152010 ./dev-python/ament_package/ament_package-0.14.0.ebuild
@@ -11256,9 +11257,8 @@
 2106052339 ./dev-python/ansicolor/ansicolor-0.3.2.ebuild
 2205181410 ./dev-python/ansicolor/ansicolor-0.3.2-r1.ebuild
 2205181410 ./dev-python/ansicolor/ansicolor-9999.ebuild
-2205111610 ./dev-python/anyio/anyio-3.5.0-r1.ebuild
-2205151040 ./dev-python/anyio/anyio-3.6.1.ebuild
-2202260309 ./dev-python/anyqt/anyqt-0.0.14.ebuild
+2206161210 ./dev-python/anyio/anyio-3.6.1.ebuild
+2206140740 ./dev-python/anyqt/anyqt-0.1.1.ebuild
 2206100640 ./dev-python/apipkg/apipkg-2.1.1.ebuild
 2206082310 ./dev-python/apipkg/apipkg-3.0.1.ebuild
 2205130940 ./dev-python/apispec/apispec-5.2.2.ebuild
@@ -11273,39 +11273,34 @@
 2205111740 ./dev-python/arrow/arrow-1.2.2.ebuild
 2206121610 ./dev-python/asgiref/asgiref-3.5.2.ebuild
 2205181410 ./dev-python/asn1crypto/asn1crypto-1.5.1.ebuild
-2205181410 ./dev-python/asteval/asteval-0.9.26.ebuild
 2205251040 ./dev-python/asteval/asteval-0.9.27.ebuild
 2205271240 ./dev-python/astor/astor-0.8.1-r1.ebuild
 2205311140 ./dev-python/astroid/astroid-2.11.5.ebuild
+2206132010 ./dev-python/astroid/astroid-2.11.6.ebuild
 2205080740 ./dev-python/asttokens/asttokens-2.0.5.ebuild
 2112240209 ./dev-python/astunparse/astunparse-1.6.3.ebuild
 2205122240 ./dev-python/async-lru/async-lru-1.0.3.ebuild
 2206121610 ./dev-python/async_generator/async_generator-1.10-r2.ebuild
 2205010512 ./dev-python/async_timeout/async_timeout-4.0.2.ebuild
 2205202110 ./dev-python/async_timeout/async_timeout-4.0.2-r1.ebuild
-2205181410 ./dev-python/asyncstdlib/asyncstdlib-3.10.4.ebuild
 2206030910 ./dev-python/asyncstdlib/asyncstdlib-3.10.5.ebuild
 2206100640 ./dev-python/atomicwrites/atomicwrites-1.4.0-r2.ebuild
 2204211739 ./dev-python/atpublic/atpublic-3.0.1.ebuild
 2206100640 ./dev-python/attrs/attrs-21.4.0-r1.ebuild
 2206020910 ./dev-python/audioread/audioread-2.1.9-r1.ebuild
-2106051609 ./dev-python/authres/authres-1.2.0.ebuild
-2205122240 ./dev-python/authres/authres-1.2.0-r1.ebuild
+2206131940 ./dev-python/authres/authres-1.2.0-r1.ebuild
 2206031510 ./dev-python/autobahn/autobahn-22.3.2-r1.ebuild
 2206031510 ./dev-python/autobahn/autobahn-22.4.2.ebuild
 2206110940 ./dev-python/autobahn/autobahn-22.5.1-r1.ebuild
-2205261240 ./dev-python/automat/automat-20.2.0.ebuild
-2206131310 ./dev-python/automat/automat-20.2.0-r1.ebuild
+2206142240 ./dev-python/automat/automat-20.2.0-r1.ebuild
 2205211610 ./dev-python/autopage/autopage-0.5.0.ebuild
 2205281740 ./dev-python/autopage/autopage-0.5.1.ebuild
 2111270009 ./dev-python/autopep8/autopep8-1.6.0.ebuild
 2205181440 ./dev-python/autopep8/autopep8-9999.ebuild
-2201291509 ./dev-python/autoprop/autoprop-4.0.2-r1.ebuild
 2205310940 ./dev-python/autoprop/autoprop-4.1.0.ebuild
 2204270110 ./dev-python/aws-sam-translator/aws-sam-translator-1.45.0.ebuild
 2206080840 ./dev-python/aws-sam-translator/aws-sam-translator-1.46.0.ebuild
 2201282210 ./dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.8.0.ebuild
-2204252210 ./dev-python/awxkit/awxkit-21.0.0.ebuild
 2206030910 ./dev-python/awxkit/awxkit-21.1.0.ebuild
 2109171239 ./dev-python/babelfish/babelfish-0.6.0-r1.ebuild
 2205191040 ./dev-python/babelfish/babelfish-0.6.0-r2.ebuild
@@ -11333,15 +11328,13 @@
 2110161709 ./dev-python/betamax-matchers/betamax-matchers-0.4.0.ebuild
 2205010512 ./dev-python/betamax/betamax-0.8.1.ebuild
 2205221210 ./dev-python/betamax/betamax-0.8.1-r1.ebuild
-2201172009 ./dev-python/bibtexparser/bibtexparser-1.2.0.ebuild
 2205211110 ./dev-python/bibtexparser/bibtexparser-1.2.0-r2.ebuild
 2205171540 ./dev-python/binaryornot/binaryornot-0.4.4-r2.ebuild
 2206061240 ./dev-python/bitarray/bitarray-2.5.1.ebuild
 2205122240 ./dev-python/bitstring/bitstring-3.1.9.ebuild
 2204172210 ./dev-python/black/black-22.1.0.ebuild
 2205111610 ./dev-python/black/black-22.3.0.ebuild
-2205151410 ./dev-python/bleach/bleach-5.0.0-r1.ebuild
-2205151140 ./dev-python/bleach/bleach-5.0.0.ebuild
+2206161210 ./dev-python/bleach/bleach-5.0.0-r1.ebuild
 2201210239 ./dev-python/blessed/blessed-1.19.1.ebuild
 2203301440 ./dev-python/blessings/blessings-1.7-r1.ebuild
 2206120940 ./dev-python/blinker/blinker-1.4-r3.ebuild
@@ -11359,6 +11352,9 @@
 2206091040 ./dev-python/boto3/boto3-1.24.5.ebuild
 2206101140 ./dev-python/boto3/boto3-1.24.6.ebuild
 2206110940 ./dev-python/boto3/boto3-1.24.7.ebuild
+2206160840 ./dev-python/boto3/boto3-1.24.10.ebuild
+2206140740 ./dev-python/boto3/boto3-1.24.8.ebuild
+2206151440 ./dev-python/boto3/boto3-1.24.9.ebuild
 2205211010 ./dev-python/botocore/botocore-9999.ebuild
 2206030910 ./dev-python/botocore/botocore-1.27.2.ebuild
 2206061413 ./dev-python/botocore/botocore-1.26.10.ebuild
@@ -11367,6 +11363,9 @@
 2206091040 ./dev-python/botocore/botocore-1.27.5.ebuild
 2206101140 ./dev-python/botocore/botocore-1.27.6.ebuild
 2206110940 ./dev-python/botocore/botocore-1.27.7.ebuild
+2206160840 ./dev-python/botocore/botocore-1.27.10.ebuild
+2206140740 ./dev-python/botocore/botocore-1.27.8.ebuild
+2206151440 ./dev-python/botocore/botocore-1.27.9.ebuild
 2206030910 ./dev-python/bottle/bottle-0.12.21.ebuild
 2206111010 ./dev-python/bottleneck/bottleneck-1.3.4.ebuild
 2203301440 ./dev-python/bpython/bpython-0.22.1.ebuild
@@ -11376,22 +11375,18 @@
 2204021110 ./dev-python/braintree/braintree-4.15.2.ebuild
 2205181440 ./dev-python/breathe/breathe-4.33.1.ebuild
 2205010512 ./dev-python/brotlicffi/brotlicffi-1.0.9.2.ebuild
-2206131340 ./dev-python/brotlicffi/brotlicffi-1.0.9.2-r1.ebuild
+2206141040 ./dev-python/brotlicffi/brotlicffi-1.0.9.2-r1.ebuild
 2105171109 ./dev-python/brython/brython-3.9.0.ebuild
 2203092140 ./dev-python/brython/brython-3.10.5.ebuild
 2205181440 ./dev-python/bsddb3/bsddb3-6.2.9.ebuild
 2203301440 ./dev-python/cached-property/cached-property-1.5.2.ebuild
 2205181740 ./dev-python/cached-property/cached-property-1.5.2-r1.ebuild
-2202131209 ./dev-python/cachelib/cachelib-0.6.0.ebuild
-2205151010 ./dev-python/cachelib/cachelib-0.7.0.ebuild
-2110312109 ./dev-python/cachetools/cachetools-4.2.4.ebuild
-2203250209 ./dev-python/cachetools/cachetools-5.0.0.ebuild
-2205161110 ./dev-python/cachetools/cachetools-5.1.0.ebuild
-2205301040 ./dev-python/cachetools/cachetools-5.2.0.ebuild
+2206161210 ./dev-python/cachelib/cachelib-0.7.0.ebuild
+2206140740 ./dev-python/cachelib/cachelib-0.8.0.ebuild
+2206161210 ./dev-python/cachetools/cachetools-5.2.0.ebuild
 2205241710 ./dev-python/cairocffi/cairocffi-1.3.0.ebuild
 2109131109 ./dev-python/cangjie/cangjie-1.3-r1.ebuild
 2108081639 ./dev-python/capturer/capturer-3.0.ebuild
-2201291539 ./dev-python/carbon/carbon-1.1.8-r1.ebuild
 2206061640 ./dev-python/carbon/carbon-1.1.10.ebuild
 2105061139 ./dev-python/case/case-1.5.3.ebuild
 2112260340 ./dev-python/casttube/casttube-0.2.1.ebuild
@@ -11403,16 +11398,13 @@
 2206061413 ./dev-python/cbor2/cbor2-5.4.3.ebuild
 2206010511 ./dev-python/cchardet/cchardet-2.1.7.ebuild
 2203210210 ./dev-python/cerberus/cerberus-1.3.2.ebuild
-2203210210 ./dev-python/cerberus/cerberus-1.3.4.ebuild
-2205171010 ./dev-python/cerberus/cerberus-1.3.4-r1.ebuild
+2206161210 ./dev-python/cerberus/cerberus-1.3.4-r1.ebuild
 2206100640 ./dev-python/certifi/certifi-3021.3.16-r2.ebuild
-2205010512 ./dev-python/cffi/cffi-1.15.0.ebuild
-2206131340 ./dev-python/cffi/cffi-1.15.0-r1.ebuild
+2206141040 ./dev-python/cffi/cffi-1.15.0-r1.ebuild
 2205301410 ./dev-python/cfgv/cfgv-3.3.1.ebuild
 2206011040 ./dev-python/cfn-lint/cfn-lint-0.61.0.ebuild
 2206061240 ./dev-python/cfn-lint/cfn-lint-0.60.1.ebuild
 2203092340 ./dev-python/cftime/cftime-1.6.0.ebuild
-2106011409 ./dev-python/cgroup-utils/cgroup-utils-0.8.ebuild
 2205310540 ./dev-python/cgroup-utils/cgroup-utils-0.8-r1.ebuild
 2105181609 ./dev-python/chai/chai-1.1.2.ebuild
 2205151410 ./dev-python/chameleon/chameleon-3.10.0.ebuild
@@ -11427,7 +11419,6 @@
 2205221410 ./dev-python/cheroot/cheroot-8.6.0.ebuild
 2202010139 ./dev-python/cherrypy/cherrypy-18.6.1.ebuild
 2205311040 ./dev-python/cherrypy/cherrypy-18.6.1-r1.ebuild
-2108070239 ./dev-python/chump/chump-1.6.0-r1.ebuild
 2205252110 ./dev-python/chump/chump-1.6.0-r2.ebuild
 2110222039 ./dev-python/citeproc-py/citeproc-py-0.6.0.ebuild
 2105111209 ./dev-python/cjkwrap/cjkwrap-2.2-r1.ebuild
@@ -11445,18 +11436,14 @@
 2105071409 ./dev-python/click-default-group/click-default-group-1.2.2.ebuild
 2206011040 ./dev-python/click-default-group/click-default-group-1.2.2-r1.ebuild
 2107121239 ./dev-python/click-help-colors/click-help-colors-0.9.1.ebuild
-2112210709 ./dev-python/click-log/click-log-0.3.2.ebuild
 2205231010 ./dev-python/click-log/click-log-0.4.0.ebuild
 2204301910 ./dev-python/click-plugins/click-plugins-1.1.1.ebuild
-2112260340 ./dev-python/click-threading/click-threading-0.5.0.ebuild
 2205231010 ./dev-python/click-threading/click-threading-0.5.0-r1.ebuild
 2205311040 ./dev-python/click/click-8.1.3.ebuild
 2205290040 ./dev-python/cliff/cliff-3.10.1.ebuild
 2203252323 ./dev-python/clikit/clikit-0.6.2.ebuild
 2105231239 ./dev-python/clint/clint-0.5.1-r3.ebuild
-2205010512 ./dev-python/cloudpickle/cloudpickle-2.0.0.ebuild
-2205131540 ./dev-python/cloudpickle/cloudpickle-2.0.0-r1.ebuild
-2205211010 ./dev-python/cloudpickle/cloudpickle-2.1.0.ebuild
+2206161240 ./dev-python/cloudpickle/cloudpickle-2.1.0.ebuild
 2203181710 ./dev-python/cloudscraper/cloudscraper-1.2.60.ebuild
 2205290040 ./dev-python/cmd2/cmd2-2.4.1.ebuild
 2112260340 ./dev-python/collective-checkdocs/collective-checkdocs-0.2-r1.ebuild
@@ -11475,21 +11462,20 @@
 2203282210 ./dev-python/consonance/consonance-0.1.5-r1.ebuild
 2205131240 ./dev-python/constantly/constantly-15.1.0-r2.ebuild
 2203270940 ./dev-python/construct/construct-2.10.68.ebuild
-2201281840 ./dev-python/cookies/cookies-2.2.1-r1.ebuild
-2205131040 ./dev-python/cookies/cookies-2.2.1-r2.ebuild
+2206161240 ./dev-python/cookies/cookies-2.2.1-r2.ebuild
 2204241639 ./dev-python/coreapi/coreapi-2.3.3-r2.ebuild
 2205252110 ./dev-python/coreschema/coreschema-0.0.4-r1.ebuild
 2111221109 ./dev-python/cov-core/cov-core-1.15.0-r3.ebuild
 2205101340 ./dev-python/coverage/coverage-6.3.2-r1.ebuild
 2205130940 ./dev-python/coverage/coverage-6.3.3.ebuild
 2205230940 ./dev-python/coverage/coverage-6.4.ebuild
-2206030910 ./dev-python/coverage/coverage-6.4.1.ebuild
+2206161910 ./dev-python/coverage/coverage-6.4.1.ebuild
 2205261410 ./dev-python/cppy/cppy-1.2.1-r1.ebuild
 2203252323 ./dev-python/crashtest/crashtest-0.3.1.ebuild
 2205252110 ./dev-python/crashtest/crashtest-0.3.1-r1.ebuild
 2205122240 ./dev-python/crcmod/crcmod-1.7-r5.ebuild
 2203211109 ./dev-python/croniter/croniter-1.3.4.ebuild
-2205151010 ./dev-python/croniter/croniter-1.3.5.ebuild
+2206161840 ./dev-python/croniter/croniter-1.3.5.ebuild
 2205121740 ./dev-python/cryptography/cryptography-3.4.7-r3.ebuild
 2206090610 ./dev-python/cryptography/cryptography-37.0.2-r1.ebuild
 2203311540 ./dev-python/css-parser/css-parser-1.0.7-r1.ebuild
@@ -11498,7 +11484,7 @@
 2205191040 ./dev-python/cssselect2/cssselect2-0.6.0.ebuild
 2203262110 ./dev-python/cssutils/cssutils-2.4.0.ebuild
 2206030910 ./dev-python/cssutils/cssutils-2.4.1.ebuild
-2206091040 ./dev-python/cssutils/cssutils-2.4.2.ebuild
+2206141040 ./dev-python/cssutils/cssutils-2.4.2.ebuild
 2203092240 ./dev-python/csvkit/csvkit-1.0.7.ebuild
 2203301440 ./dev-python/curtsies/curtsies-0.3.10.ebuild
 2206131040 ./dev-python/cvxopt/cvxopt-1.3.0.ebuild
@@ -11512,8 +11498,7 @@
 2205111310 ./dev-python/cython/cython-0.29.28.ebuild
 2205111310 ./dev-python/cython/cython-0.29.28_p20220503.ebuild
 2205161910 ./dev-python/cython/cython-0.29.29.ebuild
-2206121610 ./dev-python/cython/cython-0.29.30.ebuild
-2204242210 ./dev-python/daemonize/daemonize-2.5.0.ebuild
+2206151040 ./dev-python/cython/cython-0.29.30.ebuild
 2206131040 ./dev-python/daemonize/daemonize-2.5.0-r1.ebuild
 2205270940 ./dev-python/dask/dask-2022.05.2.ebuild
 2206061240 ./dev-python/dask/dask-2022.05.0.ebuild
@@ -11526,15 +11511,13 @@
 2205281910 ./dev-python/debtcollector/debtcollector-2.5.0.ebuild
 2205251240 ./dev-python/debugpy/debugpy-1.5.1.ebuild
 2206101740 ./dev-python/debugpy/debugpy-1.6.0.ebuild
-2205010512 ./dev-python/decorator/decorator-5.1.1.ebuild
-2205131410 ./dev-python/decorator/decorator-5.1.1-r1.ebuild
+2206161210 ./dev-python/decorator/decorator-5.1.1-r1.ebuild
 2205212140 ./dev-python/deepmerge/deepmerge-1.0.1.ebuild
 2203311540 ./dev-python/defcon/defcon-0.10.0-r1.ebuild
-2205141040 ./dev-python/defcon/defcon-0.10.1.ebuild
+2206161840 ./dev-python/defcon/defcon-0.10.1.ebuild
 2206121510 ./dev-python/defusedxml/defusedxml-0.7.1-r1.ebuild
 2205161640 ./dev-python/denonavr/denonavr-0.10.11.ebuild
-2203082040 ./dev-python/deprecated/deprecated-1.2.13.ebuild
-2205130940 ./dev-python/deprecated/deprecated-1.2.13-r1.ebuild
+2206161240 ./dev-python/deprecated/deprecated-1.2.13-r1.ebuild
 2205311340 ./dev-python/deprecation/deprecation-2.1.0.ebuild
 2205111610 ./dev-python/dictdiffer/dictdiffer-0.9.0.ebuild
 2206011410 ./dev-python/dictdiffer/dictdiffer-0.9.0-r1.ebuild
@@ -11544,8 +11527,8 @@
 2205041810 ./dev-python/dill/dill-0.3.4-r1.ebuild
 2205201140 ./dev-python/dill/dill-0.3.5.ebuild
 2205290010 ./dev-python/dill/dill-0.3.5.1.ebuild
-2206080040 ./dev-python/discogs-client/discogs-client-2.3.14.ebuild
-2206080040 ./dev-python/discogs-client/discogs-client-9999.ebuild
+2206151440 ./dev-python/discogs-client/discogs-client-2.3.15.ebuild
+2206151440 ./dev-python/discogs-client/discogs-client-9999.ebuild
 2204010840 ./dev-python/diskcache/diskcache-5.4.0-r1.ebuild
 2202100210 ./dev-python/dissononce/dissononce-0.34.3-r2.ebuild
 2205010512 ./dev-python/distlib/distlib-0.3.4-r1.ebuild
@@ -11559,10 +11542,8 @@
 2205111110 ./dev-python/django-auth-ldap/django-auth-ldap-4.1.0.ebuild
 2204151840 ./dev-python/django-cache-url/django-cache-url-3.4.0.ebuild
 2206131140 ./dev-python/django-cache-url/django-cache-url-3.4.2.ebuild
-2111011339 ./dev-python/django-cacheops/django-cacheops-6.0.ebuild
 2205280810 ./dev-python/django-cacheops/django-cacheops-6.1.ebuild
 2206131140 ./dev-python/django-configurations/django-configurations-2.3.2.ebuild
-2205111110 ./dev-python/django-cors-headers/django-cors-headers-3.12.0.ebuild
 2206060840 ./dev-python/django-cors-headers/django-cors-headers-3.13.0.ebuild
 2204241639 ./dev-python/django-filter/django-filter-21.1-r2.ebuild
 2202110039 ./dev-python/django-js-asset/django-js-asset-2.0.ebuild
@@ -11585,7 +11566,6 @@
 2111190139 ./dev-python/django_polymorphic/django_polymorphic-3.1.ebuild
 2204241639 ./dev-python/djangorestframework/djangorestframework-3.13.1-r1.ebuild
 2205212040 ./dev-python/dkimpy/dkimpy-1.0.5-r1.ebuild
-2205161110 ./dev-python/dns-lexicon/dns-lexicon-3.11.1.ebuild
 2205171010 ./dev-python/dns-lexicon/dns-lexicon-3.11.2.ebuild
 2205151410 ./dev-python/dnspython/dnspython-2.2.1.ebuild
 2205011610 ./dev-python/doc8/doc8-0.11.1.ebuild
@@ -11596,10 +11576,8 @@
 2205231240 ./dev-python/docopt/docopt-0.6.2-r5.ebuild
 2202271539 ./dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2-r1.ebuild
 2106041309 ./dev-python/docutils-glep/docutils-glep-1.2.ebuild
-2205010512 ./dev-python/docutils/docutils-0.17.1.ebuild
-2205010512 ./dev-python/docutils/docutils-0.18.1.ebuild
-2205141140 ./dev-python/docutils/docutils-0.17.1-r1.ebuild
-2205141140 ./dev-python/docutils/docutils-0.18.1-r1.ebuild
+2206161210 ./dev-python/docutils/docutils-0.17.1-r1.ebuild
+2206161310 ./dev-python/docutils/docutils-0.18.1-r1.ebuild
 2206010440 ./dev-python/dogpile-cache/dogpile-cache-1.1.5.ebuild
 2206110840 ./dev-python/dogpile-cache/dogpile-cache-1.1.6.ebuild
 2203281240 ./dev-python/doit-py/doit-py-0.5.0.ebuild
@@ -11639,7 +11617,7 @@
 2106051639 ./dev-python/errorhandler/errorhandler-2.0.1.ebuild
 2205211240 ./dev-python/et_xmlfile/et_xmlfile-1.1.0-r1.ebuild
 2201021409 ./dev-python/eventlet/eventlet-0.33.0.ebuild
-2205130940 ./dev-python/eventlet/eventlet-0.33.1.ebuild
+2206161310 ./dev-python/eventlet/eventlet-0.33.1.ebuild
 2107071509 ./dev-python/ewmh/ewmh-0.1.6.ebuild
 2108020039 ./dev-python/exam/exam-0.10.6.ebuild
 2206100640 ./dev-python/execnet/execnet-1.9.0-r1.ebuild
@@ -11662,11 +11640,8 @@
 2201110540 ./dev-python/fido2/fido2-0.9.3.ebuild
 2206090240 ./dev-python/fido2/fido2-1.0.0.ebuild
 2206100640 ./dev-python/fields/fields-5.0.0-r3.ebuild
-2205100010 ./dev-python/filelock/filelock-3.6.0.ebuild
-2205141040 ./dev-python/filelock/filelock-3.7.0.ebuild
-2206011040 ./dev-python/filelock/filelock-3.7.1.ebuild
+2206161240 ./dev-python/filelock/filelock-3.7.1.ebuild
 2205311340 ./dev-python/filetype/filetype-1.0.10.ebuild
-2112170009 ./dev-python/findimports/findimports-2.2.0.ebuild
 2205212140 ./dev-python/findimports/findimports-2.2.0-r1.ebuild
 2201291539 ./dev-python/fitsio/fitsio-1.1.7.ebuild
 2202021039 ./dev-python/fixtures/fixtures-3.0.0-r1.ebuild
@@ -11731,6 +11706,7 @@
 2205281310 ./dev-python/gast/gast-0.5.3-r1.ebuild
 2112252040 ./dev-python/gatt-python/gatt-python-0.2.6.ebuild
 2103030039 ./dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.7.ebuild
+2206162010 ./dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-3.0.ebuild
 2205272310 ./dev-python/genshi/genshi-0.7.7.ebuild
 2106051709 ./dev-python/genson/genson-1.1.0.ebuild
 2206100640 ./dev-python/genty/genty-1.3.2-r2.ebuild
@@ -11746,30 +11722,28 @@
 2206021840 ./dev-python/glob2/glob2-0.7-r1.ebuild
 2202111409 ./dev-python/glooey/glooey-0.3.6.ebuild
 2205010512 ./dev-python/gmpy/gmpy-2.1.2.ebuild
-2206131340 ./dev-python/gmpy/gmpy-2.1.2-r1.ebuild
+2206131940 ./dev-python/gmpy/gmpy-2.1.2-r1.ebuild
 2205271240 ./dev-python/google-api-core/google-api-core-2.7.3.ebuild
 2205270940 ./dev-python/google-api-core/google-api-core-2.8.1.ebuild
+2206160940 ./dev-python/google-api-core/google-api-core-2.8.2.ebuild
 2205180910 ./dev-python/google-api-python-client/google-api-python-client-2.48.0.ebuild
 2205212040 ./dev-python/google-api-python-client/google-api-python-client-2.47.0.ebuild
 2205261140 ./dev-python/google-api-python-client/google-api-python-client-2.49.0.ebuild
 2206080840 ./dev-python/google-api-python-client/google-api-python-client-2.50.0.ebuild
-2105061039 ./dev-python/google-apitools/google-apitools-0.5.32.ebuild
+2206151440 ./dev-python/google-api-python-client/google-api-python-client-2.51.0.ebuild
 2205311410 ./dev-python/google-apitools/google-apitools-0.5.32-r1.ebuild
 2203270940 ./dev-python/google-auth-httplib2/google-auth-httplib2-0.1.0-r1.ebuild
-2203152140 ./dev-python/google-auth-oauthlib/google-auth-oauthlib-0.5.1.ebuild
 2206092240 ./dev-python/google-auth-oauthlib/google-auth-oauthlib-0.5.2.ebuild
 2205271240 ./dev-python/google-auth/google-auth-2.6.6-r1.ebuild
 2206080840 ./dev-python/google-auth/google-auth-2.7.0.ebuild
+2206151440 ./dev-python/google-auth/google-auth-2.8.0.ebuild
 2111252209 ./dev-python/google-pasta/google-pasta-0.2.0-r1.ebuild
 2205221910 ./dev-python/google-reauth-python/google-reauth-python-0.1.1.ebuild
-2204221509 ./dev-python/googleapis-common-protos/googleapis-common-protos-1.56.0-r2.ebuild
-2205130940 ./dev-python/googleapis-common-protos/googleapis-common-protos-1.56.1.ebuild
-2205270940 ./dev-python/googleapis-common-protos/googleapis-common-protos-1.56.2.ebuild
+2206161240 ./dev-python/googleapis-common-protos/googleapis-common-protos-1.56.2.ebuild
 2204162110 ./dev-python/graph-tool/graph-tool-2.44-r1.ebuild
 2204162110 ./dev-python/graph-tool/graph-tool-9999.ebuild
 2205171440 ./dev-python/graphviz/graphviz-0.20.ebuild
-2110312139 ./dev-python/greenlet/greenlet-1.1.2.ebuild
-2206131340 ./dev-python/greenlet/greenlet-1.1.2-r1.ebuild
+2206131940 ./dev-python/greenlet/greenlet-1.1.2-r1.ebuild
 2205131040 ./dev-python/greenstalk/greenstalk-2.0.0-r1.ebuild
 2112200809 ./dev-python/grpcio-testing/grpcio-testing-1.43.0.ebuild
 2112200809 ./dev-python/grpcio-tools/grpcio-tools-1.43.0.ebuild
@@ -11787,7 +11761,7 @@
 2205121940 ./dev-python/h2/h2-4.1.0-r1.ebuild
 2205251040 ./dev-python/h5py/h5py-3.7.0.ebuild
 2205302310 ./dev-python/h5py/h5py-3.6.0.ebuild
-2107012209 ./dev-python/happybase/happybase-0.9_p20210701.ebuild
+2206162010 ./dev-python/happybase/happybase-1.2.0.ebuild
 2109182039 ./dev-python/hcloud-python/hcloud-python-1.16.0.ebuild
 2205171540 ./dev-python/helpdev/helpdev-0.7.1.ebuild
 2205311340 ./dev-python/hiredis/hiredis-2.0.0-r2.ebuild
@@ -11797,7 +11771,6 @@
 2105181239 ./dev-python/html2text/html2text-2020.1.16-r1.ebuild
 2110240809 ./dev-python/html5-parser/html5-parser-0.4.10.ebuild
 2206121510 ./dev-python/html5lib/html5lib-1.1-r1.ebuild
-2106051709 ./dev-python/httmock/httmock-1.4.0.ebuild
 2206011110 ./dev-python/httmock/httmock-1.4.0-r1.ebuild
 2106051709 ./dev-python/http-parser/http-parser-0.9.0.ebuild
 2206122140 ./dev-python/http-parser/http-parser-0.9.0-r1.ebuild
@@ -11806,8 +11779,7 @@
 2205151040 ./dev-python/httpcore/httpcore-0.14.7-r1.ebuild
 2205180910 ./dev-python/httpcore/httpcore-0.15.0.ebuild
 2205181340 ./dev-python/httplib2/httplib2-0.20.4.ebuild
-2112141539 ./dev-python/httpretty/httpretty-1.1.4.ebuild
-2205181010 ./dev-python/httpretty/httpretty-1.1.4-r1.ebuild
+2206161240 ./dev-python/httpretty/httpretty-1.1.4-r1.ebuild
 2205151440 ./dev-python/httpx/httpx-0.22.0-r3.ebuild
 2205240940 ./dev-python/httpx/httpx-0.23.0.ebuild
 2206122140 ./dev-python/huawei-lte-api/huawei-lte-api-1.6.ebuild
@@ -11821,16 +11793,16 @@
 2206021010 ./dev-python/hypothesis/hypothesis-6.46.11.ebuild
 2206110840 ./dev-python/hypothesis/hypothesis-6.47.1.ebuild
 2206121510 ./dev-python/hypothesis/hypothesis-6.46.9.ebuild
-2206131340 ./dev-python/hypothesis/hypothesis-6.47.2.ebuild
+2206150040 ./dev-python/hypothesis/hypothesis-6.47.2.ebuild
+2206151440 ./dev-python/hypothesis/hypothesis-6.47.3.ebuild
 2112210709 ./dev-python/icalendar/icalendar-4.0.9.ebuild
 2205311040 ./dev-python/identify/identify-2.5.1.ebuild
 2206121510 ./dev-python/idna/idna-3.3-r1.ebuild
 2205162310 ./dev-python/ifaddr/ifaddr-0.1.7.ebuild
+2206160940 ./dev-python/ifaddr/ifaddr-0.2.0.ebuild
 2105222139 ./dev-python/ijson/ijson-3.1.4.ebuild
-2205161110 ./dev-python/imageio/imageio-2.19.2.ebuild
 2205301040 ./dev-python/imageio/imageio-2.19.3.ebuild
-2205010512 ./dev-python/imagesize/imagesize-1.3.0.ebuild
-2205141510 ./dev-python/imagesize/imagesize-1.3.0-r1.ebuild
+2206161240 ./dev-python/imagesize/imagesize-1.3.0-r1.ebuild
 2106032239 ./dev-python/imapclient/imapclient-2.2.0.ebuild
 2203302210 ./dev-python/iminuit/iminuit-2.11.2.ebuild
 2205182140 ./dev-python/immutables/immutables-0.17.ebuild
@@ -11838,11 +11810,11 @@
 2206021140 ./dev-python/importlib_metadata/importlib_metadata-4.11.3.ebuild
 2206021140 ./dev-python/importlib_metadata/importlib_metadata-4.11.4.ebuild
 2206021140 ./dev-python/importlib_resources/importlib_resources-5.7.1.ebuild
+2206160940 ./dev-python/importlib_resources/importlib_resources-5.8.0.ebuild
 2109031039 ./dev-python/imread/imread-0.7.3-r1.ebuild
 2205131240 ./dev-python/incremental/incremental-21.3.0-r1.ebuild
 2206122140 ./dev-python/indexed_gzip/indexed_gzip-1.6.13.ebuild
 2205212110 ./dev-python/inflect/inflect-5.6.0.ebuild
-2105091439 ./dev-python/inflection/inflection-0.5.1.ebuild
 2205251410 ./dev-python/inflection/inflection-0.5.1-r1.ebuild
 2108242039 ./dev-python/influxdb/influxdb-5.3.0-r1.ebuild
 2206100640 ./dev-python/iniconfig/iniconfig-1.1.1-r1.ebuild
@@ -11859,16 +11831,17 @@
 2206122140 ./dev-python/ipy/ipy-1.01-r1.ebuild
 2205032310 ./dev-python/ipykernel/ipykernel-6.13.0.ebuild
 2206071015 ./dev-python/ipykernel/ipykernel-6.13.1.ebuild
+2206140740 ./dev-python/ipykernel/ipykernel-6.14.0.ebuild
+2206160940 ./dev-python/ipykernel/ipykernel-6.15.0.ebuild
 2111181139 ./dev-python/ipyparallel/ipyparallel-6.3.0-r1.ebuild
 2111200709 ./dev-python/ipyparallel/ipyparallel-7.1.0.ebuild
 2201230239 ./dev-python/ipyparallel/ipyparallel-8.1.0.ebuild
 2202071509 ./dev-python/ipyparallel/ipyparallel-8.1.0-r1.ebuild
 2203181940 ./dev-python/ipyparallel/ipyparallel-8.2.0.ebuild
 2204262210 ./dev-python/ipyparallel/ipyparallel-8.2.1.ebuild
-2205101340 ./dev-python/ipyparallel/ipyparallel-8.3.0.ebuild
-2206101610 ./dev-python/ipython/ipython-8.2.0.ebuild
-2206101610 ./dev-python/ipython/ipython-8.3.0-r1.ebuild
+2206141040 ./dev-python/ipyparallel/ipyparallel-8.3.0.ebuild
 2206101610 ./dev-python/ipython/ipython-8.4.0.ebuild
+2206140910 ./dev-python/ipython/ipython-8.3.0-r1.ebuild
 2203151509 ./dev-python/ipython_genutils/ipython_genutils-0.2.0-r3.ebuild
 2204161140 ./dev-python/ipywidgets/ipywidgets-7.7.0.ebuild
 2206021140 ./dev-python/irc/irc-20.0.0-r1.ebuild
@@ -11879,8 +11852,7 @@
 2205122340 ./dev-python/itsdangerous/itsdangerous-2.1.2.ebuild
 2206122140 ./dev-python/itypes/itypes-1.2.0-r1.ebuild
 2206100640 ./dev-python/jaraco-classes/jaraco-classes-3.2.1-r1.ebuild
-2202040009 ./dev-python/jaraco-collections/jaraco-collections-3.5.1.ebuild
-2205131940 ./dev-python/jaraco-collections/jaraco-collections-3.5.1-r1.ebuild
+2206161240 ./dev-python/jaraco-collections/jaraco-collections-3.5.1-r1.ebuild
 2205100010 ./dev-python/jaraco-context/jaraco-context-4.1.1-r2.ebuild
 2205311040 ./dev-python/jaraco-envs/jaraco-envs-2.4.0.ebuild
 2205100010 ./dev-python/jaraco-functools/jaraco-functools-3.5.0-r2.ebuild
@@ -11889,23 +11861,19 @@
 2205131940 ./dev-python/jaraco-packaging/jaraco-packaging-8.2.1-r1.ebuild
 2206021140 ./dev-python/jaraco-path/jaraco-path-3.4.0.ebuild
 2204242210 ./dev-python/jaraco-stream/jaraco-stream-3.0.3.ebuild
-2205131940 ./dev-python/jaraco-stream/jaraco-stream-3.0.3-r1.ebuild
+2206161840 ./dev-python/jaraco-stream/jaraco-stream-3.0.3-r1.ebuild
 2205100010 ./dev-python/jaraco-text/jaraco-text-3.7.0-r2.ebuild
 2206041010 ./dev-python/jaraco-text/jaraco-text-3.8.0.ebuild
-2205140110 ./dev-python/jc/jc-1.19.0.ebuild
-2206011040 ./dev-python/jc/jc-1.20.0.ebuild
-2105181609 ./dev-python/jdcal/jdcal-1.4.1.ebuild
-2205132210 ./dev-python/jdcal/jdcal-1.4.1-r1.ebuild
+2206160940 ./dev-python/jc/jc-1.20.1.ebuild
+2206161240 ./dev-python/jdcal/jdcal-1.4.1-r1.ebuild
 2205271240 ./dev-python/jedi/jedi-0.18.1.ebuild
 2205202110 ./dev-python/jeepney/jeepney-0.8.0.ebuild
 2205191540 ./dev-python/jellyfish/jellyfish-0.9.0-r1.ebuild
-2112260340 ./dev-python/jikanpy/jikanpy-4.3.2.ebuild
 2206122140 ./dev-python/jikanpy/jikanpy-4.3.2-r1.ebuild
 2203271939 ./dev-python/jinja/jinja-2.11.3-r1.ebuild
 2205311040 ./dev-python/jinja/jinja-3.1.2.ebuild
 2205191110 ./dev-python/jinja2-time/jinja2-time-0.2.0-r1.ebuild
 2205171540 ./dev-python/jinja2-time/jinja2-time-0.2.0.ebuild
-2106051739 ./dev-python/jinja2_pluralize/jinja2_pluralize-0.3.0.ebuild
 2205191110 ./dev-python/jinja2_pluralize/jinja2_pluralize-0.3.0-r1.ebuild
 2205141740 ./dev-python/jmespath/jmespath-1.0.0.ebuild
 2111131339 ./dev-python/joblib/joblib-1.1.0.ebuild
@@ -11914,6 +11882,7 @@
 2111131909 ./dev-python/jq/jq-1.2.1.ebuild
 2203211239 ./dev-python/jq/jq-1.2.2.ebuild
 2201171009 ./dev-python/js2py/js2py-0.71.ebuild
+2206132040 ./dev-python/js2py/js2py-0.71_p20210918.ebuild
 2201282210 ./dev-python/jschema_to_python/jschema_to_python-1.2.3.ebuild
 2205241610 ./dev-python/jsmin/jsmin-3.0.1.ebuild
 2106051739 ./dev-python/json-rpc/json-rpc-1.13.0.ebuild
@@ -11922,10 +11891,8 @@
 2205151140 ./dev-python/jsondiff/jsondiff-2.0.0.ebuild
 2112260340 ./dev-python/jsonext/jsonext-0.4.2.ebuild
 2206122140 ./dev-python/jsonext/jsonext-0.4.2-r1.ebuild
-2106051739 ./dev-python/jsonmerge/jsonmerge-1.8.0.ebuild
 2205252210 ./dev-python/jsonmerge/jsonmerge-1.8.0-r1.ebuild
 2205181740 ./dev-python/jsonpatch/jsonpatch-1.32.ebuild
-2203151509 ./dev-python/jsonpickle/jsonpickle-2.1.0.ebuild
 2206131040 ./dev-python/jsonpickle/jsonpickle-2.2.0.ebuild
 2205311040 ./dev-python/jsonpointer/jsonpointer-2.3.ebuild
 2206122140 ./dev-python/jsonref/jsonref-0.2.ebuild
@@ -11934,7 +11901,6 @@
 2205252210 ./dev-python/jsonrpclib/jsonrpclib-0.4.3.2.ebuild
 2206021510 ./dev-python/jsonschema/jsonschema-4.6.0.ebuild
 2206121610 ./dev-python/jsonschema/jsonschema-4.5.1.ebuild
-2106051739 ./dev-python/jsonxs/jsonxs-0.6.ebuild
 2205252210 ./dev-python/jsonxs/jsonxs-0.6-r1.ebuild
 2205181740 ./dev-python/junit-xml/junit-xml-1.9.ebuild
 2112291609 ./dev-python/jupyter-lsp/jupyter-lsp-1.5.1.ebuild
@@ -11945,41 +11911,37 @@
 2205212110 ./dev-python/jupyter_core/jupyter_core-4.10.0.ebuild
 2205151140 ./dev-python/jupyter_packaging/jupyter_packaging-0.12.0-r1.ebuild
 2206122140 ./dev-python/jupyter_packaging/jupyter_packaging-0.12.1.ebuild
-2205311040 ./dev-python/jupyter_server/jupyter_server-1.17.0.ebuild
 2206080840 ./dev-python/jupyter_server/jupyter_server-1.17.1.ebuild
+2206141040 ./dev-python/jupyter_server/jupyter_server-1.17.0.ebuild
 2202212209 ./dev-python/jupyter_server_mathjax/jupyter_server_mathjax-0.2.5.ebuild
 2205021410 ./dev-python/jupyterlab-lsp/jupyterlab-lsp-3.10.1.ebuild
-2205021410 ./dev-python/jupyterlab/jupyterlab-3.3.4.ebuild
 2206101740 ./dev-python/jupyterlab/jupyterlab-3.4.3.ebuild
 2205151210 ./dev-python/jupyterlab_pygments/jupyterlab_pygments-0.2.2.ebuild
-2205021410 ./dev-python/jupyterlab_server/jupyterlab_server-2.13.0.ebuild
 2206101740 ./dev-python/jupyterlab_server/jupyterlab_server-2.14.0.ebuild
 2205220911 ./dev-python/jwcrypto/jwcrypto-1.3.1.ebuild
 2205271240 ./dev-python/jwcrypto/jwcrypto-1.2.0.ebuild
-2112101110 ./dev-python/k5test/k5test-0.10.1.ebuild
-2205131710 ./dev-python/k5test/k5test-0.10.1-r1.ebuild
+2206161240 ./dev-python/k5test/k5test-0.10.1-r1.ebuild
 2108021009 ./dev-python/kafka-python/kafka-python-2.0.2.ebuild
-2110231709 ./dev-python/kaitaistruct/kaitaistruct-0.9.ebuild
-2206111440 ./dev-python/kaitaistruct/kaitaistruct-0.9-r1.ebuild
+2206161240 ./dev-python/kaitaistruct/kaitaistruct-0.9-r1.ebuild
 2105232039 ./dev-python/kaptan/kaptan-0.5.12-r1.ebuild
 2205242210 ./dev-python/kaptan/kaptan-0.5.12-r2.ebuild
 2205190610 ./dev-python/kazoo/kazoo-2.8.0.ebuild
 2205131710 ./dev-python/kconfiglib/kconfiglib-14.1.0-r1.ebuild
-2103310109 ./dev-python/keep/keep-2.10.1.ebuild
-2205131410 ./dev-python/keep/keep-2.10.1-r1.ebuild
+2206161310 ./dev-python/keep/keep-2.10.1-r1.ebuild
 2205022310 ./dev-python/keyring/keyring-23.5.0.ebuild
 2206021140 ./dev-python/keyring/keyring-23.5.1.ebuild
 2206082310 ./dev-python/keyring/keyring-23.6.0.ebuild
 2204012040 ./dev-python/keystoneauth/keystoneauth-4.5.0.ebuild
 2205290040 ./dev-python/keystoneauth/keystoneauth-4.6.0.ebuild
 2206040040 ./dev-python/kiwisolver/kiwisolver-1.4.2.ebuild
+2206132010 ./dev-python/kiwisolver/kiwisolver-1.4.3.ebuild
 2203141339 ./dev-python/klein/klein-21.8.0.ebuild
 2203160139 ./dev-python/kombu/kombu-5.2.4.ebuild
 2203211239 ./dev-python/krb5/krb5-0.3.0.ebuild
 2206010940 ./dev-python/krb5/krb5-0.3.0-r1.ebuild
 2205171540 ./dev-python/latexcodec/latexcodec-2.0.1.ebuild
 2205071440 ./dev-python/lazy-object-proxy/lazy-object-proxy-1.7.1.ebuild
-2205131810 ./dev-python/lazy-object-proxy/lazy-object-proxy-1.7.1-r1.ebuild
+2206161340 ./dev-python/lazy-object-proxy/lazy-object-proxy-1.7.1-r1.ebuild
 2204161110 ./dev-python/ldap3/ldap3-2.9.1.ebuild
 2203290210 ./dev-python/leather/leather-0.3.4.ebuild
 2107152109 ./dev-python/lesscpy/lesscpy-0.15.0.ebuild
@@ -12034,17 +11996,13 @@
 2205131240 ./dev-python/mako/mako-1.2.0.ebuild
 2109121140 ./dev-python/mamba/mamba-0.11.2.ebuild
 2206122240 ./dev-python/mando/mando-0.7.1.ebuild
-2204100110 ./dev-python/manuel/manuel-1.10.1.ebuild
-2204221839 ./dev-python/manuel/manuel-1.10.1-r1.ebuild
-2205161110 ./dev-python/manuel/manuel-1.11.2.ebuild
-2204252210 ./dev-python/markdown/markdown-3.3.6.ebuild
-2205162340 ./dev-python/markdown/markdown-3.3.7.ebuild
+2206161310 ./dev-python/manuel/manuel-1.11.2.ebuild
+2206161210 ./dev-python/markdown/markdown-3.3.7.ebuild
 2112022309 ./dev-python/markdown2/markdown2-2.4.2.ebuild
 2205292240 ./dev-python/markdown2/markdown2-2.4.3.ebuild
 2112222239 ./dev-python/markups/markups-3.1.3.ebuild
 2105052239 ./dev-python/markupsafe/markupsafe-1.1.1-r1.ebuild
 2205111540 ./dev-python/markupsafe/markupsafe-2.1.1.ebuild
-2203142009 ./dev-python/marshmallow/marshmallow-3.15.0.ebuild
 2205301040 ./dev-python/marshmallow/marshmallow-3.16.0.ebuild
 2203262039 ./dev-python/matplotlib-inline/matplotlib-inline-0.1.3-r1.ebuild
 2205031510 ./dev-python/matplotlib/matplotlib-3.5.2.ebuild
@@ -12064,7 +12022,6 @@
 2205162340 ./dev-python/mergedeep/mergedeep-1.3.4.ebuild
 2203281240 ./dev-python/mergedict/mergedict-1.0.0.ebuild
 2205292240 ./dev-python/mergedict/mergedict-1.0.0-r1.ebuild
-2202240139 ./dev-python/metakernel/metakernel-0.28.2-r1.ebuild
 2206131410 ./dev-python/metakernel/metakernel-0.29.0.ebuild
 2203281240 ./dev-python/micawber/micawber-0.5.4.ebuild
 2106051739 ./dev-python/mimerender/mimerender-0.6.0.ebuild
@@ -12074,7 +12031,6 @@
 2112190139 ./dev-python/miniupnpc/miniupnpc-2.2.3.ebuild
 2205200511 ./dev-python/misaka/misaka-2.1.1-r1.ebuild
 2206121610 ./dev-python/mistune/mistune-2.0.2-r1.ebuild
-2106060009 ./dev-python/mkautodoc/mkautodoc-0.1.0.ebuild
 2205241610 ./dev-python/mkautodoc/mkautodoc-0.1.0-r1.ebuild
 2109091909 ./dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1-r1.ebuild
 2205241610 ./dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1-r2.ebuild
@@ -12121,7 +12077,6 @@
 2205131940 ./dev-python/multidict/multidict-6.0.2.ebuild
 2205010512 ./dev-python/munch/munch-2.5.0-r1.ebuild
 2205240940 ./dev-python/munch/munch-2.5.0-r2.ebuild
-2109121909 ./dev-python/munkres/munkres-1.1.4.ebuild
 2205292240 ./dev-python/munkres/munkres-1.1.4-r1.ebuild
 2201281510 ./dev-python/mygpoclient/mygpoclient-1.8.ebuild
 2205071240 ./dev-python/mypy/mypy-0.942.ebuild
@@ -12138,7 +12093,6 @@
 2206011040 ./dev-python/nbclient/nbclient-0.6.3.ebuild
 2206011040 ./dev-python/nbclient/nbclient-0.6.4.ebuild
 2206121810 ./dev-python/nbconvert/nbconvert-6.5.0-r1.ebuild
-2111281740 ./dev-python/nbdime/nbdime-3.1.1.ebuild
 2206121810 ./dev-python/nbdime/nbdime-3.1.1-r1.ebuild
 2205151140 ./dev-python/nbformat/nbformat-5.4.0.ebuild
 2203312110 ./dev-python/nbsphinx/nbsphinx-0.8.8-r1.ebuild
@@ -12146,7 +12100,6 @@
 2112281739 ./dev-python/nbval/nbval-0.9.6.ebuild
 2111281810 ./dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild
 2205051140 ./dev-python/neovim-remote/neovim-remote-9999.ebuild
-2205071240 ./dev-python/neovim-remote/neovim-remote-2.5.0.ebuild
 2205201140 ./dev-python/neovim-remote/neovim-remote-2.5.1.ebuild
 2205161910 ./dev-python/nest_asyncio/nest_asyncio-1.5.5.ebuild
 2111221009 ./dev-python/netaddr/netaddr-0.8.0.ebuild
@@ -12157,6 +12110,7 @@
 2205191040 ./dev-python/networkx/networkx-2.8.1.ebuild
 2206030240 ./dev-python/networkx/networkx-2.8.2.ebuild
 2206051240 ./dev-python/networkx/networkx-2.8.3.ebuild
+2206151440 ./dev-python/networkx/networkx-2.8.4.ebuild
 2204241440 ./dev-python/nltk-data/nltk-data-20211221.ebuild
 2204241440 ./dev-python/nltk/nltk-3.7.ebuild
 2108270909 ./dev-python/nnpy/nnpy-1.4.2.ebuild
@@ -12174,11 +12128,6 @@
 2205141040 ./dev-python/nototools/nototools-0.2.16.ebuild
 2107121909 ./dev-python/ntlm-auth/ntlm-auth-1.5.0.ebuild
 2105291139 ./dev-python/ntplib/ntplib-0.4.0.ebuild
-2205141340 ./dev-python/nuitka/nuitka-0.7.7.ebuild
-2205211010 ./dev-python/nuitka/nuitka-0.8.ebuild
-2205240940 ./dev-python/nuitka/nuitka-0.8.1.ebuild
-2205270940 ./dev-python/nuitka/nuitka-0.8.2.ebuild
-2205301040 ./dev-python/nuitka/nuitka-0.8.3.ebuild
 2206080840 ./dev-python/nuitka/nuitka-0.8.4.ebuild
 2202141139 ./dev-python/numexpr/numexpr-2.8.1.ebuild
 2205241640 ./dev-python/numexpr/numexpr-2.8.1-r1.ebuild
@@ -12221,6 +12170,7 @@
 2205290910 ./dev-python/oslotest/oslotest-4.5.0-r2.ebuild
 2204091009 ./dev-python/osrf_pycommon/osrf_pycommon-2.0.2.ebuild
 2205271240 ./dev-python/outcome/outcome-1.1.0-r1.ebuild
+2206151440 ./dev-python/outcome/outcome-1.2.0.ebuild
 2112260340 ./dev-python/ovs/ovs-2.13.0.ebuild
 2112260340 ./dev-python/ovs/ovs-2.13.3.ebuild
 2206012140 ./dev-python/ovs/ovs-2.17.1_p1.ebuild
@@ -12290,21 +12240,15 @@
 2205032110 ./dev-python/pillow/pillow-9.0.1.ebuild
 2205172240 ./dev-python/pillow/pillow-9.1.1.ebuild
 2206121610 ./dev-python/pip/pip-22.1.2.ebuild
-2204190909 ./dev-python/pipenv/pipenv-2022.4.8.ebuild
-2205252040 ./dev-python/pipenv/pipenv-2022.5.2-r1.ebuild
 2206072210 ./dev-python/pipenv/pipenv-2022.6.7.ebuild
-2204062039 ./dev-python/pivy/pivy-0.6.6-r1.ebuild
-2206101210 ./dev-python/pivy/pivy-0.6.7.ebuild
+2206151310 ./dev-python/pivy/pivy-0.6.7.ebuild
 2205230940 ./dev-python/pkgconfig/pkgconfig-1.5.5-r1.ebuild
 2205010512 ./dev-python/pkginfo/pkginfo-1.8.2.ebuild
 2205240940 ./dev-python/pkginfo/pkginfo-1.8.2-r1.ebuild
 2206082310 ./dev-python/pkginfo/pkginfo-1.8.3.ebuild
-2205121410 ./dev-python/platformdirs/platformdirs-2.5.1.ebuild
-2206131340 ./dev-python/platformdirs/platformdirs-2.5.2.ebuild
+2206140040 ./dev-python/platformdirs/platformdirs-2.5.2.ebuild
 2111281840 ./dev-python/plotly-geo/plotly-geo-1.0.0.ebuild
 2108242209 ./dev-python/plotly/plotly-5.2.2.ebuild
-2204052109 ./dev-python/plotly/plotly-5.7.0.ebuild
-2206030940 ./dev-python/plotly/plotly-5.8.0.ebuild
 2206110840 ./dev-python/plotly/plotly-5.8.2.ebuild
 2206100640 ./dev-python/pluggy/pluggy-1.0.0-r2.ebuild
 2105171109 ./dev-python/pluginbase/pluginbase-1.0.1.ebuild
@@ -12339,11 +12283,10 @@
 2202131339 ./dev-python/progressbar2/progressbar2-4.0.0.ebuild
 2205061610 ./dev-python/prometheus_client/prometheus_client-0.14.1.ebuild
 2205161810 ./dev-python/prompt_toolkit/prompt_toolkit-3.0.29.ebuild
-2202081310 ./dev-python/proto-plus/proto-plus-1.20.0.ebuild
-2202151209 ./dev-python/proto-plus/proto-plus-1.20.1.ebuild
 2203221239 ./dev-python/proto-plus/proto-plus-1.20.3.ebuild
 2205201140 ./dev-python/proto-plus/proto-plus-1.20.4.ebuild
 2205270940 ./dev-python/proto-plus/proto-plus-1.20.5.ebuild
+2206151440 ./dev-python/proto-plus/proto-plus-1.20.6.ebuild
 2204221509 ./dev-python/protobuf-python/protobuf-python-3.19.3-r2.ebuild
 2205181010 ./dev-python/protobuf-python/protobuf-python-3.19.3-r3.ebuild
 2205181010 ./dev-python/protobuf-python/protobuf-python-9999.ebuild
@@ -12354,6 +12297,7 @@
 2110241039 ./dev-python/psycopg/psycopg-2.8.6-r1.ebuild
 2202020339 ./dev-python/psycopg/psycopg-2.9.3.ebuild
 2206041110 ./dev-python/psycopg/psycopg-3.0.14.ebuild
+2206160940 ./dev-python/psycopg/psycopg-3.0.15.ebuild
 2205100010 ./dev-python/ptyprocess/ptyprocess-0.7.0-r1.ebuild
 2206111440 ./dev-python/publicsuffix/publicsuffix-2.20191221-r2.ebuild
 2105100009 ./dev-python/pudb/pudb-2021.1.ebuild
@@ -12373,7 +12317,6 @@
 2112281209 ./dev-python/pyFFTW/pyFFTW-9999.ebuild
 2202021839 ./dev-python/pyGPG/pyGPG-9999.ebuild
 2203181210 ./dev-python/pyGPG/pyGPG-0.2-r1.ebuild
-2105141439 ./dev-python/pyacoustid/pyacoustid-1.2.0.ebuild
 2205310510 ./dev-python/pyacoustid/pyacoustid-1.2.2.ebuild
 2206051940 ./dev-python/pyaes/pyaes-1.6.1-r3.ebuild
 2201082109 ./dev-python/pyalsa/pyalsa-1.2.6.ebuild
@@ -12384,8 +12327,7 @@
 2201201609 ./dev-python/pyatspi/pyatspi-2.38.2.ebuild
 2111011139 ./dev-python/pyaudio/pyaudio-0.2.11-r1.ebuild
 2205050840 ./dev-python/pybind11/pybind11-2.9.2.ebuild
-2205161910 ./dev-python/pybind11/pybind11-2.9.2-r1.ebuild
-2205171540 ./dev-python/pybtex-docutils/pybtex-docutils-1.0.1.ebuild
+2206161410 ./dev-python/pybind11/pybind11-2.9.2-r1.ebuild
 2206011240 ./dev-python/pybtex-docutils/pybtex-docutils-1.0.2.ebuild
 2205171540 ./dev-python/pybtex/pybtex-0.24.0.ebuild
 2205171210 ./dev-python/pycairo/pycairo-1.21.0.ebuild
@@ -12407,30 +12349,27 @@
 2111042339 ./dev-python/pycson/pycson-0.8-r1.ebuild
 2205241240 ./dev-python/pycson/pycson-0.8-r2.ebuild
 2206052110 ./dev-python/pycson/pycson-0.8-r3.ebuild
-2101310343 ./dev-python/pycuda/pycuda-2019.1.2.ebuild
 2205311310 ./dev-python/pycuda/pycuda-2021.1.ebuild
 2203181240 ./dev-python/pycups/pycups-2.0.1-r1.ebuild
 2107030009 ./dev-python/pycurl-requests/pycurl-requests-0.2.1.ebuild
 2205050610 ./dev-python/pycurl/pycurl-7.44.1.ebuild
-2205131240 ./dev-python/pycurl/pycurl-7.44.1-r1.ebuild
 2206120940 ./dev-python/pycurl/pycurl-7.45.1.ebuild
+2206161410 ./dev-python/pycurl/pycurl-7.44.1-r1.ebuild
 2107130939 ./dev-python/pycxx/pycxx-7.1.5.ebuild
 2205011510 ./dev-python/pydantic/pydantic-1.9.0-r2.ebuild
 2205112110 ./dev-python/pydantic/pydantic-1.9.0-r4.ebuild
-2206131340 ./dev-python/pydantic/pydantic-1.9.1.ebuild
+2206150040 ./dev-python/pydantic/pydantic-1.9.1.ebuild
 2205171540 ./dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.7.2.ebuild
 2205202110 ./dev-python/pydbus/pydbus-0.6.0.ebuild
 2205141440 ./dev-python/pydecomp/pydecomp-0.3-r3.ebuild
 2205141440 ./dev-python/pydecomp/pydecomp-9999.ebuild
 2205251240 ./dev-python/pydevd/pydevd-2.8.0.ebuild
-2206121840 ./dev-python/pydevd/pydevd-2.8.0-r1.ebuild
+2206151110 ./dev-python/pydevd/pydevd-2.8.0-r1.ebuild
 2204280810 ./dev-python/pydispatcher/pydispatcher-2.1.2-r1.ebuild
 2205161740 ./dev-python/pydocstyle/pydocstyle-6.1.1.ebuild
 2205231310 ./dev-python/pydocstyle/pydocstyle-6.1.1-r1.ebuild
 2202041309 ./dev-python/pydot/pydot-1.4.2-r3.ebuild
-2106052109 ./dev-python/pydotplus/pydotplus-2.0.2.ebuild
 2206052110 ./dev-python/pydotplus/pydotplus-2.0.2-r1.ebuild
-2110311039 ./dev-python/pydyf/pydyf-0.1.2.ebuild
 2206051940 ./dev-python/pydyf/pydyf-0.2.0.ebuild
 2206052110 ./dev-python/pyelftools/pyelftools-0.28.ebuild
 2204260610 ./dev-python/pyenchant/pyenchant-3.2.2.ebuild
@@ -12444,15 +12383,10 @@
 2204161110 ./dev-python/pygal/pygal-3.0.0-r2.ebuild
 2203262009 ./dev-python/pygame/pygame-2.1.2-r1.ebuild
 2106011509 ./dev-python/pygame_sdl2/pygame_sdl2-7.3.5-r2.ebuild
-2205121040 ./dev-python/pyghmi/pyghmi-1.5.42.ebuild
-2205251040 ./dev-python/pyghmi/pyghmi-1.5.43.ebuild
-2206041010 ./dev-python/pyghmi/pyghmi-1.5.44.ebuild
-2206110840 ./dev-python/pyghmi/pyghmi-1.5.45.ebuild
+2206151440 ./dev-python/pyghmi/pyghmi-1.5.47.ebuild
 2205170010 ./dev-python/pygit2/pygit2-1.9.1.ebuild
 2205251040 ./dev-python/pygit2/pygit2-1.9.2.ebuild
-2204100110 ./dev-python/pyglet/pyglet-1.5.23.ebuild
-2205130940 ./dev-python/pyglet/pyglet-1.5.24.ebuild
-2205211010 ./dev-python/pyglet/pyglet-1.5.26.ebuild
+2206161310 ./dev-python/pyglet/pyglet-1.5.26.ebuild
 2105242309 ./dev-python/pygments-github-lexers/pygments-github-lexers-0.0.5.ebuild
 2205311040 ./dev-python/pygments/pygments-2.12.0-r1.ebuild
 2205311240 ./dev-python/pygobject/pygobject-3.42.1.ebuild
@@ -12469,7 +12403,6 @@
 2201171009 ./dev-python/pyjsparser/pyjsparser-2.7.1_p20190421.ebuild
 2206071310 ./dev-python/pyjwt/pyjwt-2.4.0.ebuild
 2107121909 ./dev-python/pykerberos/pykerberos-1.3.1.ebuild
-2110082309 ./dev-python/pykka/pykka-3.0.2.ebuild
 2205280810 ./dev-python/pykka/pykka-3.1.1.ebuild
 2108300739 ./dev-python/pykwalify/pykwalify-1.8.0-r1.ebuild
 2204151840 ./dev-python/pylama/pylama-8.3.8.ebuild
@@ -12480,6 +12413,7 @@
 2205221410 ./dev-python/pylibmc/pylibmc-1.6.1-r2.ebuild
 2205311210 ./dev-python/pylint/pylint-2.13.9.ebuild
 2206080740 ./dev-python/pylint/pylint-2.14.1.ebuild
+2206151440 ./dev-python/pylint/pylint-2.14.2.ebuild
 2206051940 ./dev-python/pylru/pylru-1.2.1.ebuild
 2111252209 ./dev-python/pyls-spyder/pyls-spyder-0.4.0-r1.ebuild
 2206020910 ./dev-python/pymad/pymad-0.10-r1.ebuild
@@ -12489,7 +12423,6 @@
 2205171540 ./dev-python/pymdown-lexers/pymdown-lexers-0_pre20210902.ebuild
 2105231509 ./dev-python/pymdstat/pymdstat-0.4.2-r1.ebuild
 2111091409 ./dev-python/pymediainfo/pymediainfo-5.1.0-r1.ebuild
-2110151209 ./dev-python/pymetar/pymetar-1.4.ebuild
 2206121810 ./dev-python/pymetar/pymetar-1.4-r1.ebuild
 2203211309 ./dev-python/pymilter/pymilter-1.0.4-r2.ebuild
 2204051109 ./dev-python/pymongo/pymongo-4.1.0.ebuild
@@ -12498,7 +12431,7 @@
 2203161339 ./dev-python/pymountboot/pymountboot-0.2.3-r1.ebuild
 2202141139 ./dev-python/pymysql/pymysql-1.0.2.ebuild
 2202162309 ./dev-python/pynacl/pynacl-1.5.0.ebuild
-2205131710 ./dev-python/pynacl/pynacl-1.5.0-r1.ebuild
+2206161340 ./dev-python/pynacl/pynacl-1.5.0-r1.ebuild
 2205082310 ./dev-python/pynest2d/pynest2d-4.13_beta.ebuild
 2110061339 ./dev-python/pynput/pynput-1.7.3.ebuild
 2105042239 ./dev-python/pynput/pynput-9999.ebuild
@@ -12512,7 +12445,6 @@
 2205271410 ./dev-python/pyopenssl/pyopenssl-20.0.1-r1.ebuild
 2206011140 ./dev-python/pyopenssl/pyopenssl-22.0.0.ebuild
 2112310439 ./dev-python/pyotherside/pyotherside-1.5.9.ebuild
-2112260340 ./dev-python/pyotp/pyotp-2.6.0.ebuild
 2206051940 ./dev-python/pyotp/pyotp-2.6.0-r1.ebuild
 2111230440 ./dev-python/pypam/pypam-0.5.0-r6.ebuild
 2112210510 ./dev-python/pypam/pypam-0.5.0-r7.ebuild
@@ -12528,7 +12460,6 @@
 2203281240 ./dev-python/pyphen/pyphen-0.12.0-r1.ebuild
 2206070940 ./dev-python/pypiserver/pypiserver-1.5.0-r2.ebuild
 2205212140 ./dev-python/pypng/pypng-0.0.21-r1.ebuild
-2105071439 ./dev-python/pyprof2calltree/pyprof2calltree-1.4.5.ebuild
 2205282140 ./dev-python/pyprof2calltree/pyprof2calltree-1.4.5-r1.ebuild
 2205271240 ./dev-python/pyproj/pyproj-3.3.1.ebuild
 2205161910 ./dev-python/pyproject2setuppy/pyproject2setuppy-22-r1.ebuild
@@ -12538,27 +12469,25 @@
 2205041840 ./dev-python/pypy/pypy-7.3.9.ebuild
 2205041840 ./dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.9.ebuild
 2205041840 ./dev-python/pypy3-exe/pypy3-exe-7.3.9.ebuild
-2205041840 ./dev-python/pypy3/pypy3-7.3.9.ebuild
-2205171110 ./dev-python/pypy3/pypy3-7.3.9_p1.ebuild
+2206161310 ./dev-python/pypy3/pypy3-7.3.9_p1.ebuild
 2203141339 ./dev-python/pyqrcode/pyqrcode-1.2.1-r1.ebuild
 2205191840 ./dev-python/pyqrcode/pyqrcode-1.2.1-r2.ebuild
 2109241409 ./dev-python/pyqt-distutils/pyqt-distutils-0.7.3.ebuild
 2204212209 ./dev-python/pyqtgraph/pyqtgraph-0.12.4.ebuild
-2205010512 ./dev-python/pyquery/pyquery-1.4.3.ebuild
-2205171040 ./dev-python/pyquery/pyquery-1.4.3-r1.ebuild
+2206161240 ./dev-python/pyquery/pyquery-1.4.3-r1.ebuild
 2105191039 ./dev-python/pyre2/pyre2-1.0.7.ebuild
 2110020510 ./dev-python/pyrfc3339/pyrfc3339-1.1.ebuild
 2205200511 ./dev-python/pyroute2/pyroute2-0.5.14.ebuild
+2206161940 ./dev-python/pyroute2/pyroute2-0.5.19.ebuild
 2202050409 ./dev-python/pyrqlite/pyrqlite-2.1.1.ebuild
 2205010512 ./dev-python/pyrsistent/pyrsistent-0.18.1.ebuild
-2206131340 ./dev-python/pyrsistent/pyrsistent-0.18.1-r1.ebuild
+2206131940 ./dev-python/pyrsistent/pyrsistent-0.18.1-r1.ebuild
 2204191709 ./dev-python/pyscard/pyscard-2.0.3.ebuild
 2110190339 ./dev-python/pyscreenshot/pyscreenshot-3.0.ebuild
 2206011410 ./dev-python/pyscreenshot/pyscreenshot-3.0-r1.ebuild
 2205121710 ./dev-python/pyserial/pyserial-3.5-r1.ebuild
 2112141639 ./dev-python/pyside2-tools/pyside2-tools-5.15.2.ebuild
 2202252209 ./dev-python/pyside2/pyside2-5.15.2-r1.ebuild
-2205242140 ./dev-python/pysimdjson/pysimdjson-4.0.3-r1.ebuild
 2205301040 ./dev-python/pysimdjson/pysimdjson-5.0.1.ebuild
 2108071539 ./dev-python/pysmi/pysmi-0.3.4.ebuild
 2205170512 ./dev-python/pysnmp-mibs/pysnmp-mibs-0.1.6.ebuild
@@ -12572,7 +12501,6 @@
 2105191039 ./dev-python/pysrt/pysrt-1.1.2.ebuild
 2206010440 ./dev-python/pysrt/pysrt-1.1.2-r1.ebuild
 2206010440 ./dev-python/pysrt/pysrt-9999.ebuild
-2105191109 ./dev-python/pysvg/pysvg-0.2.2_p3.ebuild
 2206051940 ./dev-python/pysvg/pysvg-0.2.2_p3-r1.ebuild
 2109110910 ./dev-python/pysvn/pysvn-1.9.15.ebuild
 2202030009 ./dev-python/pytables/pytables-3.7.0.ebuild
@@ -12585,14 +12513,11 @@
 2205142110 ./dev-python/pytest-console-scripts/pytest-console-scripts-1.3.1.ebuild
 2205010512 ./dev-python/pytest-cov/pytest-cov-3.0.0-r1.ebuild
 2206100640 ./dev-python/pytest-datadir/pytest-datadir-1.3.1-r1.ebuild
-2112152009 ./dev-python/pytest-describe/pytest-describe-2.0.1.ebuild
-2205142110 ./dev-python/pytest-describe/pytest-describe-2.0.1-r1.ebuild
+2206161310 ./dev-python/pytest-describe/pytest-describe-2.0.1-r1.ebuild
 2201012139 ./dev-python/pytest-django/pytest-django-4.5.2.ebuild
-2110220239 ./dev-python/pytest-env/pytest-env-0.6.2.ebuild
-2205142110 ./dev-python/pytest-env/pytest-env-0.6.2-r1.ebuild
+2206161310 ./dev-python/pytest-env/pytest-env-0.6.2-r1.ebuild
 2206131040 ./dev-python/pytest-expect/pytest-expect-1.1.0-r2.ebuild
-2105262039 ./dev-python/pytest-faulthandler/pytest-faulthandler-2.0.1.ebuild
-2205142110 ./dev-python/pytest-faulthandler/pytest-faulthandler-2.0.1-r1.ebuild
+2206161310 ./dev-python/pytest-faulthandler/pytest-faulthandler-2.0.1-r1.ebuild
 2206131040 ./dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0-r2.ebuild
 2204100039 ./dev-python/pytest-flake8/pytest-flake8-1.1.1.ebuild
 2201250144 ./dev-python/pytest-flakes/pytest-flakes-4.0.4.ebuild
@@ -12610,7 +12535,6 @@
 2203271240 ./dev-python/pytest-metadata/pytest-metadata-2.0.1.ebuild
 2205110010 ./dev-python/pytest-mock/pytest-mock-3.7.0.ebuild
 2205171540 ./dev-python/pytest-ordering/pytest-ordering-0.6.ebuild
-2204011140 ./dev-python/pytest-plus/pytest-plus-0.2.ebuild
 2206051940 ./dev-python/pytest-plus/pytest-plus-0.2-r1.ebuild
 2109101040 ./dev-python/pytest-pylint/pytest-pylint-0.18.0.ebuild
 2206082240 ./dev-python/pytest-qt/pytest-qt-4.0.2-r1.ebuild
@@ -12622,7 +12546,6 @@
 2203270110 ./dev-python/pytest-services/pytest-services-2.2.1.ebuild
 2205221410 ./dev-python/pytest-services/pytest-services-2.2.1-r1.ebuild
 2206131040 ./dev-python/pytest-shutil/pytest-shutil-1.7.0-r3.ebuild
-2112210709 ./dev-python/pytest-subtesthack/pytest-subtesthack-0.1.2-r1.ebuild
 2205231010 ./dev-python/pytest-subtesthack/pytest-subtesthack-0.1.2-r2.ebuild
 2205121740 ./dev-python/pytest-subtests/pytest-subtests-0.7.0.ebuild
 2205262210 ./dev-python/pytest-subtests/pytest-subtests-0.8.0.ebuild
@@ -12644,11 +12567,9 @@
 2108120139 ./dev-python/python-augeas/python-augeas-1.1.0.ebuild
 2202100210 ./dev-python/python-axolotl-curve25519/python-axolotl-curve25519-0.4.1_p2-r2.ebuild
 2202100210 ./dev-python/python-axolotl/python-axolotl-0.2.3-r2.ebuild
-2203100610 ./dev-python/python-bugzilla/python-bugzilla-3.2.0.ebuild
-2205141140 ./dev-python/python-bugzilla/python-bugzilla-3.2.0-r1.ebuild
+2206161310 ./dev-python/python-bugzilla/python-bugzilla-3.2.0-r1.ebuild
 2108020510 ./dev-python/python-caja/python-caja-1.24.0-r2.ebuild
 2205290040 ./dev-python/python-cinderclient/python-cinderclient-8.3.0.ebuild
-2110101009 ./dev-python/python-cstruct/python-cstruct-2.1.ebuild
 2205272240 ./dev-python/python-cstruct/python-cstruct-2.1-r1.ebuild
 2108052239 ./dev-python/python-ctags/python-ctags-1.5.0.ebuild
 2111062309 ./dev-python/python-daemon/python-daemon-2.3.0-r1.ebuild
@@ -12656,6 +12577,7 @@
 2206131040 ./dev-python/python-dateutil/python-dateutil-2.8.2-r1.ebuild
 2206090610 ./dev-python/python-dbusmock/python-dbusmock-0.27.5.ebuild
 2202180039 ./dev-python/python-debian/python-debian-0.1.43.ebuild
+2206151440 ./dev-python/python-debian/python-debian-0.1.44.ebuild
 2203152140 ./dev-python/python-discid/python-discid-1.2.0-r1.ebuild
 2107020039 ./dev-python/python-distutils-extra/python-distutils-extra-2.45.ebuild
 2206051740 ./dev-python/python-distutils-extra/python-distutils-extra-2.46.ebuild
@@ -12675,7 +12597,6 @@
 2204290740 ./dev-python/python-engineio/python-engineio-4.3.2-r2.ebuild
 2101310343 ./dev-python/python-etcd/python-etcd-0.4.5-r1.ebuild
 2206082340 ./dev-python/python-evdev/python-evdev-1.5.0.ebuild
-2105231509 ./dev-python/python-gammu/python-gammu-2.11.ebuild
 2205181840 ./dev-python/python-gammu/python-gammu-3.2.4.ebuild
 2203152111 ./dev-python/python-gflags/python-gflags-3.1.2-r2.ebuild
 2204012110 ./dev-python/python-glanceclient/python-glanceclient-3.6.0.ebuild
@@ -12690,8 +12611,8 @@
 2205311940 ./dev-python/python-keyutils/python-keyutils-0.6.ebuild
 2203270110 ./dev-python/python-ldap/python-ldap-3.4.0.ebuild
 2205140610 ./dev-python/python-ldap/python-ldap-3.4.0-r1.ebuild
-2205140610 ./dev-python/python-ldap/python-ldap-3.4.0_p20220420.ebuild
 2205140610 ./dev-python/python-ldap/python-ldap-9999.ebuild
+2206161910 ./dev-python/python-ldap/python-ldap-3.4.0_p20220420.ebuild
 2205171540 ./dev-python/python-levenshtein/python-levenshtein-0.12.2.ebuild
 2111192339 ./dev-python/python-lhafile/python-lhafile-0.3.0.ebuild
 2205080640 ./dev-python/python-libevdev/python-libevdev-0.10.ebuild
@@ -12737,7 +12658,7 @@
 2205201140 ./dev-python/python-utils/python-utils-3.2.3.ebuild
 2205291040 ./dev-python/python-utils/python-utils-3.3.0.ebuild
 2205301040 ./dev-python/python-utils/python-utils-3.3.1.ebuild
-2206011040 ./dev-python/python-utils/python-utils-3.3.3.ebuild
+2206161840 ./dev-python/python-utils/python-utils-3.3.3.ebuild
 2108201109 ./dev-python/python-varlink/python-varlink-30.3.1.ebuild
 2205162310 ./dev-python/python-vlc/python-vlc-3.0.16120.ebuild
 2110190339 ./dev-python/python-xlib/python-xlib-0.31.ebuild
@@ -12752,7 +12673,6 @@
 2205070740 ./dev-python/pythondialog/pythondialog-3.5.3.ebuild
 2203181340 ./dev-python/pythran/pythran-0.11.0.ebuild
 2205162340 ./dev-python/pytidylib/pytidylib-0.3.2-r2.ebuild
-2203290210 ./dev-python/pytimeparse/pytimeparse-1.1.8.ebuild
 2205272240 ./dev-python/pytimeparse/pytimeparse-1.1.8-r1.ebuild
 2205212040 ./dev-python/pytools/pytools-2022.1.7.ebuild
 2205301410 ./dev-python/pytools/pytools-2022.1.9.ebuild
@@ -12768,7 +12688,6 @@
 2206011410 ./dev-python/pyvirtualdisplay/pyvirtualdisplay-3.0.ebuild
 2203142009 ./dev-python/pywavelets/pywavelets-1.3.0.ebuild
 2204151040 ./dev-python/pywinrm/pywinrm-0.4.3.ebuild
-2103041309 ./dev-python/pyx/pyx-0.15.ebuild
 2205291840 ./dev-python/pyx/pyx-0.15_p1.ebuild
 2204241440 ./dev-python/pyxDamerauLevenshtein/pyxDamerauLevenshtein-1.7.0.ebuild
 2202231139 ./dev-python/pyxattr/pyxattr-0.7.2.ebuild
@@ -12776,7 +12695,7 @@
 2205260840 ./dev-python/pyxdg/pyxdg-0.27-r1.ebuild
 2206060840 ./dev-python/pyxdg/pyxdg-0.28.ebuild
 2205010512 ./dev-python/pyyaml/pyyaml-6.0.ebuild
-2206131040 ./dev-python/pyyaml/pyyaml-6.0-r1.ebuild
+2206131940 ./dev-python/pyyaml/pyyaml-6.0-r1.ebuild
 2205162340 ./dev-python/pyyaml_env_tag/pyyaml_env_tag-0.1-r1.ebuild
 2203152140 ./dev-python/pyzbar/pyzbar-0.1.9.ebuild
 2201300139 ./dev-python/pyzmq/pyzmq-22.1.0.ebuild
@@ -12789,13 +12708,10 @@
 2205191840 ./dev-python/qrcode/qrcode-7.3.1-r1.ebuild
 2108020609 ./dev-python/qscintilla-python/qscintilla-python-2.11.6.ebuild
 2206010511 ./dev-python/qscintilla-python/qscintilla-python-2.13.1.ebuild
-2107301139 ./dev-python/qstylizer/qstylizer-0.2.1.ebuild
 2205251410 ./dev-python/qstylizer/qstylizer-0.2.1-r1.ebuild
-2206082240 ./dev-python/qtawesome/qtawesome-1.1.1.ebuild
-2206121910 ./dev-python/qtawesome/qtawesome-1.1.1-r1.ebuild
-2202131839 ./dev-python/qtconsole/qtconsole-5.2.2.ebuild
-2204021040 ./dev-python/qtconsole/qtconsole-5.3.0.ebuild
+2206150040 ./dev-python/qtawesome/qtawesome-1.1.1-r1.ebuild
 2206060840 ./dev-python/qtconsole/qtconsole-5.3.1.ebuild
+2206141040 ./dev-python/qtconsole/qtconsole-5.3.0.ebuild
 2112131909 ./dev-python/qtsass/qtsass-0.3.0.ebuild
 2206082240 ./dev-python/qtsass/qtsass-0.3.0-r1.ebuild
 2203152140 ./dev-python/quantities/quantities-0.13.0-r1.ebuild
@@ -12805,11 +12721,9 @@
 2205292210 ./dev-python/random2/random2-1.0.1-r2.ebuild
 2111052039 ./dev-python/rarfile/rarfile-4.0.ebuild
 2206010440 ./dev-python/rarfile/rarfile-4.0-r1.ebuild
-2203100310 ./dev-python/ratelimit/ratelimit-2.2.1.ebuild
 2205292210 ./dev-python/ratelimit/ratelimit-2.2.1-r1.ebuild
 2205012040 ./dev-python/rdflib/rdflib-6.1.1.ebuild
-2205010512 ./dev-python/re-assert/re-assert-1.1.0.ebuild
-2205150940 ./dev-python/re-assert/re-assert-1.1.0-r1.ebuild
+2206161310 ./dev-python/re-assert/re-assert-1.1.0-r1.ebuild
 2205271240 ./dev-python/readme_renderer/readme_renderer-35.0.ebuild
 2206021010 ./dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.8.ebuild
 2206131040 ./dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.7.ebuild
@@ -12822,7 +12736,6 @@
 2206030540 ./dev-python/redis-py/redis-py-4.3.3.ebuild
 2204070009 ./dev-python/reedsolomon/reedsolomon-1.5.4-r1.ebuild
 2205292210 ./dev-python/reedsolomon/reedsolomon-1.5.4-r2.ebuild
-2202140209 ./dev-python/reflink/reflink-0.2.1-r1.ebuild
 2205292210 ./dev-python/reflink/reflink-0.2.1-r2.ebuild
 2205271410 ./dev-python/regex/regex-2022.4.24.ebuild
 2206030910 ./dev-python/regex/regex-2022.6.2.ebuild
@@ -12850,9 +12763,8 @@
 2205221210 ./dev-python/requests-toolbelt/requests-toolbelt-0.9.1-r1.ebuild
 2203070310 ./dev-python/requests-unixsocket/requests-unixsocket-0.3.0-r1.ebuild
 2205221240 ./dev-python/requests-unixsocket/requests-unixsocket-0.3.0-r2.ebuild
-2204290540 ./dev-python/requests/requests-2.27.1.ebuild
-2205131440 ./dev-python/requests/requests-2.27.1-r1.ebuild
 2206092240 ./dev-python/requests/requests-2.28.0.ebuild
+2206161240 ./dev-python/requests/requests-2.27.1-r1.ebuild
 2201170839 ./dev-python/requests_download/requests_download-0.1.2.ebuild
 2205292210 ./dev-python/requests_download/requests_download-0.1.2-r1.ebuild
 2204151140 ./dev-python/requests_pkcs12/requests_pkcs12-1.14.ebuild
@@ -12868,8 +12780,7 @@
 2205292140 ./dev-python/retrying/retrying-1.3.3-r1.ebuild
 2206131040 ./dev-python/rfc3339-validator/rfc3339-validator-0.1.4-r1.ebuild
 2205111740 ./dev-python/rfc3986-validator/rfc3986-validator-0.1.1-r1.ebuild
-2205010512 ./dev-python/rfc3986/rfc3986-2.0.0.ebuild
-2205151110 ./dev-python/rfc3986/rfc3986-2.0.0-r1.ebuild
+2206161210 ./dev-python/rfc3986/rfc3986-2.0.0-r1.ebuild
 2205111740 ./dev-python/rfc3987/rfc3987-1.3.8-r2.ebuild
 2205251040 ./dev-python/rich/rich-12.4.4.ebuild
 2205271240 ./dev-python/rich/rich-12.4.1.ebuild
@@ -12888,8 +12799,7 @@
 2201291909 ./dev-python/rpy/rpy-3.4.5.ebuild
 2205151140 ./dev-python/rpyc/rpyc-5.1.0.ebuild
 2206100640 ./dev-python/rq/rq-1.10.1-r2.ebuild
-2112252110 ./dev-python/rsa/rsa-4.8.ebuild
-2205142310 ./dev-python/rsa/rsa-4.8-r1.ebuild
+2206161310 ./dev-python/rsa/rsa-4.8-r1.ebuild
 2205191610 ./dev-python/rst-linker/rst-linker-2.3.0.ebuild
 2205292210 ./dev-python/rtimulib/rtimulib-7.2.1-r2.ebuild
 2205200540 ./dev-python/rtslib-fb/rtslib-fb-2.1.74.ebuild
@@ -12900,7 +12810,6 @@
 2205142310 ./dev-python/s3transfer/s3transfer-0.5.2.ebuild
 2206011040 ./dev-python/s3transfer/s3transfer-0.6.0.ebuild
 2109182139 ./dev-python/sabyenc/sabyenc-4.0.2.ebuild
-2201301639 ./dev-python/sarge/sarge-0.1.7-r1.ebuild
 2206052140 ./dev-python/sarge/sarge-0.1.7_p1.ebuild
 2201282210 ./dev-python/sarif_om/sarif_om-1.0.4.ebuild
 2106052139 ./dev-python/scandir/scandir-1.10.0-r2.ebuild
@@ -12929,23 +12838,22 @@
 2206131040 ./dev-python/setuptools-git/setuptools-git-1.2-r3.ebuild
 2206120910 ./dev-python/setuptools/setuptools-62.3.4.ebuild
 2206131040 ./dev-python/setuptools/setuptools-62.3.3.ebuild
+2206140740 ./dev-python/setuptools/setuptools-62.4.0.ebuild
 2205271240 ./dev-python/setuptools_scm/setuptools_scm-6.4.2.ebuild
-2202141139 ./dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1-r4.ebuild
-2205161910 ./dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1-r5.ebuild
+2206161310 ./dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1-r5.ebuild
 2108181109 ./dev-python/setuptools_trial/setuptools_trial-0.6.0-r1.ebuild
 2201301639 ./dev-python/sexpdata/sexpdata-0.0.3-r2.ebuild
 2205171540 ./dev-python/sgmllib3k/sgmllib3k-1.0.0.ebuild
 2205201140 ./dev-python/sgmllib3k/sgmllib3k-1.0.0-r1.ebuild
-2205111610 ./dev-python/sh/sh-1.14.2.ebuild
-2205151110 ./dev-python/sh/sh-1.14.2-r1.ebuild
-2202252209 ./dev-python/shiboken2/shiboken2-5.15.2-r1.ebuild
+2206161240 ./dev-python/sh/sh-1.14.2-r1.ebuild
+2206161940 ./dev-python/shiboken2/shiboken2-5.15.2-r1.ebuild
 2205310940 ./dev-python/signature_dispatch/signature_dispatch-1.0.0-r1.ebuild
 2205201540 ./dev-python/simplebayes/simplebayes-1.5.8.ebuild
 2202180039 ./dev-python/simpleeval/simpleeval-0.9.12.ebuild
 2106052139 ./dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild
 2205010512 ./dev-python/simplejson/simplejson-3.17.5.ebuild
 2205110010 ./dev-python/simplejson/simplejson-3.17.5-r1.ebuild
-2206131040 ./dev-python/simplejson/simplejson-3.17.6.ebuild
+2206131940 ./dev-python/simplejson/simplejson-3.17.6.ebuild
 2205100540 ./dev-python/simplekml/simplekml-1.3.6.ebuild
 2107130139 ./dev-python/simpy/simpy-4.0.1.ebuild
 2108101209 ./dev-python/sip/sip-4.19.25-r1.ebuild
@@ -12968,12 +12876,9 @@
 2205071440 ./dev-python/snakeoil/snakeoil-0.9.10.ebuild
 2105242309 ./dev-python/snaketrace/snaketrace-0.3.1.ebuild
 2205191840 ./dev-python/snappy/snappy-0.6.1.ebuild
-2105231709 ./dev-python/snapshottest/snapshottest-0.5.1.ebuild
 2206052010 ./dev-python/snapshottest/snapshottest-0.6.0.ebuild
-2205111610 ./dev-python/sniffio/sniffio-1.2.0.ebuild
-2205131940 ./dev-python/sniffio/sniffio-1.2.0-r1.ebuild
-2205010512 ./dev-python/snowballstemmer/snowballstemmer-2.2.0.ebuild
-2205141510 ./dev-python/snowballstemmer/snowballstemmer-2.2.0-r1.ebuild
+2206161210 ./dev-python/sniffio/sniffio-1.2.0-r1.ebuild
+2206161240 ./dev-python/snowballstemmer/snowballstemmer-2.2.0-r1.ebuild
 2205221910 ./dev-python/socketio-client-nexus/socketio-client-nexus-0.7.6.ebuild
 2205221910 ./dev-python/socketio-client/socketio-client-0.7.2.ebuild
 2206100640 ./dev-python/sortedcontainers/sortedcontainers-2.4.0-r1.ebuild
@@ -13047,7 +12952,6 @@
 2108192209 ./dev-python/sshtunnel/sshtunnel-0.3.1.ebuild
 2201301639 ./dev-python/ssl-fetch/ssl-fetch-9999.ebuild
 2205191040 ./dev-python/ssl-fetch/ssl-fetch-0.4-r1.ebuild
-2109092039 ./dev-python/stapler/stapler-1.0.0_p20200531-r2.ebuild
 2205261940 ./dev-python/stapler/stapler-1.0.0_p20220330.ebuild
 2205290040 ./dev-python/statsd/statsd-3.3.0.ebuild
 2205072110 ./dev-python/statsmodels/statsmodels-0.13.2.ebuild
@@ -13062,14 +12966,10 @@
 2206082310 ./dev-python/stripe/stripe-3.3.0.ebuild
 2204011140 ./dev-python/subprocess-tee/subprocess-tee-0.3.5.ebuild
 2205171740 ./dev-python/subunit/subunit-1.4.0_p20210729.ebuild
-2112130639 ./dev-python/sure/sure-2.0.0.ebuild
-2205141140 ./dev-python/sure/sure-2.0.0-r1.ebuild
+2206161240 ./dev-python/sure/sure-2.0.0-r1.ebuild
 2205191040 ./dev-python/svg-path/svg-path-6.0.ebuild
 2206092240 ./dev-python/svg-path/svg-path-6.1.ebuild
-2201281210 ./dev-python/svglib/svglib-1.2.1.ebuild
 2205191040 ./dev-python/svglib/svglib-1.3.0.ebuild
-2106052139 ./dev-python/svgwrite/svgwrite-1.4.1.ebuild
-2205191110 ./dev-python/svgwrite/svgwrite-1.4.1-r1.ebuild
 2206052140 ./dev-python/svgwrite/svgwrite-1.4.2.ebuild
 2111021340 ./dev-python/swagger-spec-validator/swagger-spec-validator-2.7.4.ebuild
 2203311710 ./dev-python/sybil/sybil-3.0.1.ebuild
@@ -13081,22 +12981,18 @@
 2105231239 ./dev-python/tabulate/tabulate-0.8.9.ebuild
 2205231240 ./dev-python/tabulate/tabulate-0.8.9-r1.ebuild
 2206070940 ./dev-python/tagpy/tagpy-2018.1-r3.ebuild
-2201291010 ./dev-python/tappy/tappy-3.1.ebuild
-2205162210 ./dev-python/tappy/tappy-3.1-r1.ebuild
+2206161240 ./dev-python/tappy/tappy-3.1-r1.ebuild
 2106222009 ./dev-python/tblib/tblib-1.7.0.ebuild
 2206131040 ./dev-python/tblib/tblib-1.7.0-r1.ebuild
-2203141639 ./dev-python/tekore/tekore-4.3.0.ebuild
 2205251040 ./dev-python/tekore/tekore-4.4.0.ebuild
 2205290040 ./dev-python/tempest/tempest-30.1.0.ebuild
 2206030910 ./dev-python/tempest/tempest-31.0.0.ebuild
 2109100139 ./dev-python/tempita/tempita-0.5.3-r3.ebuild
-2205010512 ./dev-python/tempora/tempora-5.0.0.ebuild
-2206021140 ./dev-python/tempora/tempora-5.0.1.ebuild
+2206161310 ./dev-python/tempora/tempora-5.0.1.ebuild
 2109231839 ./dev-python/tenacity/tenacity-8.0.1.ebuild
 2205231340 ./dev-python/tenacity/tenacity-8.0.1-r1.ebuild
 2205121640 ./dev-python/termcolor/termcolor-1.1.0-r3.ebuild
-2204151840 ./dev-python/terminado/terminado-0.13.3.ebuild
-2205171010 ./dev-python/terminado/terminado-0.15.0.ebuild
+2206161210 ./dev-python/terminado/terminado-0.15.0.ebuild
 2201271310 ./dev-python/terminaltables/terminaltables-9999.ebuild
 2202271539 ./dev-python/terminaltables/terminaltables-3.1.10-r1.ebuild
 2205162210 ./dev-python/test_server/test_server-0.0.40.ebuild
@@ -13110,19 +13006,17 @@
 2205211440 ./dev-python/testtools/testtools-2.5.0-r1.ebuild
 2205171540 ./dev-python/text-unidecode/text-unidecode-1.3-r1.ebuild
 2204241440 ./dev-python/textdistance/textdistance-4.2.2.ebuild
-2108141139 ./dev-python/texttable/texttable-1.6.4.ebuild
-2205162210 ./dev-python/texttable/texttable-1.6.4-r1.ebuild
+2206160910 ./dev-python/texttable/texttable-1.6.4-r1.ebuild
 2205162210 ./dev-python/threadpoolctl/threadpoolctl-3.1.0.ebuild
 2205171540 ./dev-python/three-merge/three-merge-0.1.1.ebuild
 2204301910 ./dev-python/thrift/thrift-0.14.1.ebuild
 2206031310 ./dev-python/thrift/thrift-0.16.0.ebuild
-2107012209 ./dev-python/thriftpy2/thriftpy2-0.4.14.ebuild
+2206162010 ./dev-python/thriftpy2/thriftpy2-0.4.14-r1.ebuild
 2205311040 ./dev-python/thunarx-python/thunarx-python-0.5.2.ebuild
 2205161640 ./dev-python/tikzplotlib/tikzplotlib-0.10.1.ebuild
 2205111610 ./dev-python/timeout-decorator/timeout-decorator-0.5.0.ebuild
 2205191110 ./dev-python/timeout-decorator/timeout-decorator-0.5.0-r1.ebuild
-2106052139 ./dev-python/tinycss/tinycss-0.4.ebuild
-2205162210 ./dev-python/tinycss/tinycss-0.4-r1.ebuild
+2206161510 ./dev-python/tinycss/tinycss-0.4-r1.ebuild
 2205191040 ./dev-python/tinycss2/tinycss2-1.1.1-r1.ebuild
 2106071009 ./dev-python/tld/tld-0.12.6.ebuild
 2206090710 ./dev-python/tldextract/tldextract-3.3.0.ebuild
@@ -13133,9 +13027,7 @@
 2206081111 ./dev-python/tomli/tomli-2.0.1-r1.ebuild
 2205111310 ./dev-python/tomlkit/tomlkit-0.10.2.ebuild
 2205251040 ./dev-python/tomlkit/tomlkit-0.11.0.ebuild
-2202141139 ./dev-python/toolz/toolz-0.11.2.ebuild
-2205162210 ./dev-python/toolz/toolz-0.11.2-r1.ebuild
-2110011009 ./dev-python/toposort/toposort-1.7.ebuild
+2206161240 ./dev-python/toolz/toolz-0.11.2-r1.ebuild
 2205162210 ./dev-python/toposort/toposort-1.7-r1.ebuild
 2206011040 ./dev-python/towncrier/towncrier-21.9.0.ebuild
 2205151410 ./dev-python/tox/tox-3.25.0.ebuild
@@ -13143,15 +13035,14 @@
 2206131040 ./dev-python/traitlets/traitlets-5.2.2_p1.ebuild
 2203271839 ./dev-python/transitions/transitions-0.8.11.ebuild
 2206100640 ./dev-python/translate-toolkit/translate-toolkit-3.6.2.ebuild
+2206132110 ./dev-python/translate-toolkit/translate-toolkit-3.7.0.ebuild
 2205071440 ./dev-python/tree-sitter/tree-sitter-0.20.0.ebuild
 2205191610 ./dev-python/tree-sitter/tree-sitter-0.20.0-r1.ebuild
 2203141339 ./dev-python/treq/treq-22.2.0.ebuild
 2111281610 ./dev-python/trio-asyncio/trio-asyncio-0.12.0.ebuild
 2205150940 ./dev-python/trio/trio-0.20.0.ebuild
 2206080840 ./dev-python/trio/trio-0.21.0.ebuild
-2205010512 ./dev-python/trustme/trustme-0.9.0.ebuild
-2205131240 ./dev-python/trustme/trustme-0.9.0-r1.ebuild
-2203141339 ./dev-python/tubes/tubes-0.2.0-r1.ebuild
+2206161240 ./dev-python/trustme/trustme-0.9.0-r1.ebuild
 2206021010 ./dev-python/tubes/tubes-0.2.1.ebuild
 2104070939 ./dev-python/tvdb_api/tvdb_api-3.0.2.ebuild
 2205240940 ./dev-python/twine/twine-4.0.0.ebuild
@@ -13171,8 +13062,6 @@
 2205191610 ./dev-python/typogrify/typogrify-2.0.7-r1.ebuild
 2205151010 ./dev-python/tzlocal/tzlocal-4.2.ebuild
 2206131040 ./dev-python/u-msgpack-python/u-msgpack-python-2.7.1-r1.ebuild
-2202210209 ./dev-python/ubelt/ubelt-1.0.1.ebuild
-2206041010 ./dev-python/ubelt/ubelt-1.1.0.ebuild
 2206101140 ./dev-python/ubelt/ubelt-1.1.1.ebuild
 2205161610 ./dev-python/ujson/ujson-5.2.0-r1.ebuild
 2205191040 ./dev-python/ujson/ujson-5.3.0.ebuild
@@ -13183,18 +13072,16 @@
 2205162210 ./dev-python/unidiff/unidiff-0.7.3.ebuild
 2206100740 ./dev-python/unittest-mixins/unittest-mixins-1.6-r2.ebuild
 2205311040 ./dev-python/unittest-or-fail/unittest-or-fail-2.ebuild
-2202141139 ./dev-python/untangle/untangle-1.1.1.ebuild
-2205162210 ./dev-python/untangle/untangle-1.1.1-r1.ebuild
+2206161310 ./dev-python/untangle/untangle-1.1.1-r1.ebuild
 2204080009 ./dev-python/uranium/uranium-4.13.0-r1.ebuild
 2109231739 ./dev-python/urdf_parser_py/urdf_parser_py-0.4.5.ebuild
 2201171609 ./dev-python/uritemplate/uritemplate-4.1.0.ebuild
-2205162210 ./dev-python/uritemplate/uritemplate-4.1.1.ebuild
+2206161340 ./dev-python/uritemplate/uritemplate-4.1.1.ebuild
 2205162210 ./dev-python/url-normalize/url-normalize-1.4.3-r1.ebuild
 2108211609 ./dev-python/urlgrabber/urlgrabber-4.1.0.ebuild
-2204290540 ./dev-python/urllib3/urllib3-1.26.9.ebuild
-2205131240 ./dev-python/urllib3/urllib3-1.26.9-r1.ebuild
+2206161240 ./dev-python/urllib3/urllib3-1.26.9-r1.ebuild
 2112210709 ./dev-python/urwid/urwid-2.1.2.ebuild
-2205162210 ./dev-python/urwid/urwid-2.1.2-r1.ebuild
+2206161910 ./dev-python/urwid/urwid-2.1.2-r1.ebuild
 2111050039 ./dev-python/urwid_readline/urwid_readline-0.13.ebuild
 2110202239 ./dev-python/urwidtrees/urwidtrees-1.0.3.ebuild
 2111101609 ./dev-python/utidylib/utidylib-0.6-r2.ebuild
@@ -13205,17 +13092,13 @@
 2109200939 ./dev-python/uvloop/uvloop-0.15.3.ebuild
 2111191509 ./dev-python/uvloop/uvloop-0.15.3-r1.ebuild
 2112041209 ./dev-python/uvloop/uvloop-0.16.0.ebuild
-2205162010 ./dev-python/validators/validators-0.19.0.ebuild
 2206052140 ./dev-python/validators/validators-0.20.0.ebuild
 2107022209 ./dev-python/vcrpy/vcrpy-4.1.1.ebuild
 2205181010 ./dev-python/vcrpy/vcrpy-4.1.1-r1.ebuild
 2109262109 ./dev-python/vcstools/vcstools-0.1.42.ebuild
-2204070239 ./dev-python/vdf/vdf-3.4.ebuild
-2205162010 ./dev-python/vdf/vdf-3.4-r1.ebuild
-2205231010 ./dev-python/vdirsyncer/vdirsyncer-0.18.0-r3.ebuild
+2206161340 ./dev-python/vdf/vdf-3.4-r1.ebuild
 2205231010 ./dev-python/vdirsyncer/vdirsyncer-0.18.0-r4.ebuild
 2201072009 ./dev-python/vecrec/vecrec-0.3.1.ebuild
-2108081539 ./dev-python/verboselogs/verboselogs-1.7.ebuild
 2205162010 ./dev-python/verboselogs/verboselogs-1.7-r1.ebuild
 2205161910 ./dev-python/versioneer/versioneer-0.22.ebuild
 2105071639 ./dev-python/vine/vine-5.0.0.ebuild
@@ -13223,14 +13106,12 @@
 2205211240 ./dev-python/virtualenv-clone/virtualenv-clone-0.5.7.ebuild
 2205121410 ./dev-python/virtualenv/virtualenv-20.14.1-r1.ebuild
 2112311009 ./dev-python/virtualenvwrapper/virtualenvwrapper-4.8.4-r1.ebuild
-2105112239 ./dev-python/visitor/visitor-0.1.3-r1.ebuild
 2205162010 ./dev-python/visitor/visitor-0.1.3-r2.ebuild
 2110190339 ./dev-python/vncdotool/vncdotool-0.13.0.ebuild
 2203121339 ./dev-python/vncdotool/vncdotool-1.0.0.ebuild
 2206011410 ./dev-python/vncdotool/vncdotool-0.13.0-r1.ebuild
 2206011410 ./dev-python/vncdotool/vncdotool-1.0.0-r1.ebuild
-2109140439 ./dev-python/vobject/vobject-0.9.6.1-r2.ebuild
-2205162010 ./dev-python/vobject/vobject-0.9.6.1-r3.ebuild
+2206161340 ./dev-python/vobject/vobject-0.9.6.1-r3.ebuild
 2205290040 ./dev-python/voluptuous/voluptuous-0.13.1-r1.ebuild
 2203101110 ./dev-python/vpython/vpython-7.6.3.ebuild
 2205171040 ./dev-python/waitress/waitress-2.1.1.ebuild
@@ -13238,42 +13119,37 @@
 2108171009 ./dev-python/wand/wand-0.6.7.ebuild
 2205282010 ./dev-python/warlock/warlock-1.3.3-r3.ebuild
 2205120010 ./dev-python/watchdog/watchdog-2.1.7.ebuild
-2205161110 ./dev-python/watchdog/watchdog-2.1.8.ebuild
 2206110840 ./dev-python/watchdog/watchdog-2.1.9.ebuild
+2206161910 ./dev-python/watchdog/watchdog-2.1.8.ebuild
 2206051240 ./dev-python/watchgod/watchgod-0.8.2.ebuild
 2205171540 ./dev-python/wcmatch/wcmatch-8.3.ebuild
 2205310940 ./dev-python/wcmatch/wcmatch-8.4.ebuild
 2205161810 ./dev-python/wcwidth/wcwidth-0.2.5-r1.ebuild
-2205211240 ./dev-python/weasyprint/weasyprint-54.3.ebuild
 2205211240 ./dev-python/weasyprint/weasyprint-55.0.ebuild
 2203281240 ./dev-python/webassets/webassets-2.0.ebuild
 2206131040 ./dev-python/webcolors/webcolors-1.12.ebuild
 2206131040 ./dev-python/webencodings/webencodings-0.5.1-r2.ebuild
-2205010512 ./dev-python/webob/webob-1.8.7.ebuild
-2205171010 ./dev-python/webob/webob-1.8.7-r1.ebuild
+2206161210 ./dev-python/webob/webob-1.8.7-r1.ebuild
 2205011540 ./dev-python/websocket-client/websocket-client-1.3.2.ebuild
 2206051240 ./dev-python/websockets/websockets-10.3.ebuild
 2204161440 ./dev-python/websockify/websockify-0.10.0.ebuild
-2205010512 ./dev-python/webtest/webtest-3.0.0.ebuild
-2205171040 ./dev-python/webtest/webtest-3.0.0-r1.ebuild
+2206161240 ./dev-python/webtest/webtest-3.0.0-r1.ebuild
 2206051240 ./dev-python/werkzeug/werkzeug-2.1.2.ebuild
 2105102239 ./dev-python/whatever/whatever-0.6.ebuild
 2205100010 ./dev-python/wheel/wheel-0.37.1-r1.ebuild
 2106052209 ./dev-python/whichcraft/whichcraft-0.6.1.ebuild
-2110292139 ./dev-python/whisper/whisper-1.1.8.ebuild
 2205231540 ./dev-python/whisper/whisper-1.1.10.ebuild
 2205010512 ./dev-python/whoosh/whoosh-2.7.4-r1.ebuild
-2205141510 ./dev-python/whoosh/whoosh-2.7.4-r2.ebuild
+2206161910 ./dev-python/whoosh/whoosh-2.7.4-r2.ebuild
 2204161140 ./dev-python/widgetsnbextension/widgetsnbextension-3.6.0.ebuild
 2203191710 ./dev-python/wrapt/wrapt-1.13.2-r1.ebuild
 2204182140 ./dev-python/wrapt/wrapt-1.14.0.ebuild
-2205130940 ./dev-python/wrapt/wrapt-1.14.1.ebuild
+2206161340 ./dev-python/wrapt/wrapt-1.14.1.ebuild
 2107051639 ./dev-python/ws4py/ws4py-0.5.1-r1.ebuild
 2107051639 ./dev-python/ws4py/ws4py-9999.ebuild
 2203141339 ./dev-python/wsaccel/wsaccel-0.6.3.ebuild
 2205191840 ./dev-python/wsaccel/wsaccel-0.6.3-r1.ebuild
-2205010512 ./dev-python/wsgiproxy2/wsgiproxy2-0.5.1.ebuild
-2205171040 ./dev-python/wsgiproxy2/wsgiproxy2-0.5.1-r1.ebuild
+2206161210 ./dev-python/wsgiproxy2/wsgiproxy2-0.5.1-r1.ebuild
 2205151210 ./dev-python/wsproto/wsproto-1.1.0.ebuild
 2108192309 ./dev-python/wstools/wstools-0.4.8.ebuild
 2205281340 ./dev-python/wstools/wstools-0.4.10-r1.ebuild
@@ -13289,10 +13165,8 @@
 2205191040 ./dev-python/xlrd/xlrd-2.0.1-r1.ebuild
 2205191040 ./dev-python/xlsxwriter/xlsxwriter-3.0.3.ebuild
 2205191040 ./dev-python/xlwt/xlwt-1.3.0-r2.ebuild
-2205111540 ./dev-python/xmlschema/xmlschema-1.10.0.ebuild
-2205151010 ./dev-python/xmlschema/xmlschema-1.11.0.ebuild
-2205230940 ./dev-python/xmlschema/xmlschema-1.11.1.ebuild
 2206112210 ./dev-python/xmlschema/xmlschema-1.11.2.ebuild
+2206161240 ./dev-python/xmlschema/xmlschema-1.11.1.ebuild
 2206100740 ./dev-python/xmltodict/xmltodict-0.13.0-r1.ebuild
 2205162310 ./dev-python/xvfbwrapper/xvfbwrapper-0.2.9.ebuild
 2205191040 ./dev-python/xxhash/xxhash-3.0.0.ebuild
@@ -13303,13 +13177,14 @@
 2203281240 ./dev-python/yapsy/yapsy-1.12.2.ebuild
 2205010512 ./dev-python/yarl/yarl-1.7.2-r1.ebuild
 2205131940 ./dev-python/yarl/yarl-1.7.2-r2.ebuild
-2205201910 ./dev-python/yarl/yarl-1.7.2-r3.ebuild
+2206161410 ./dev-python/yarl/yarl-1.7.2-r3.ebuild
 2205201540 ./dev-python/yaswfp/yaswfp-0.9.3-r2.ebuild
 2109030209 ./dev-python/zc-lockfile/zc-lockfile-2.0.ebuild
 2205221240 ./dev-python/zc-lockfile/zc-lockfile-2.0-r1.ebuild
 2204092239 ./dev-python/zconfig/zconfig-3.6.0-r1.ebuild
 2204021110 ./dev-python/zeep/zeep-4.1.0-r2.ebuild
 2206061340 ./dev-python/zeroconf/zeroconf-0.38.6.ebuild
+2206151440 ./dev-python/zeroconf/zeroconf-0.38.7.ebuild
 2206021140 ./dev-python/zipp/zipp-3.8.0.ebuild
 2204221839 ./dev-python/zope-component/zope-component-4.4.1-r2.ebuild
 2206080240 ./dev-python/zope-component/zope-component-5.0.1.ebuild
@@ -13326,10 +13201,7 @@
 2205212040 ./dev-python/zstd/zstd-1.5.2.5.ebuild
 2203250209 ./dev-python/zxcvbn/zxcvbn-4.4.28.ebuild
 2205191040 ./dev-python/zxcvbn/zxcvbn-4.4.28-r1.ebuild
-2112220409 ./dev-python/ukkonen/ukkonen-1.0.1.ebuild
-2205162210 ./dev-python/ukkonen/ukkonen-1.0.1-r1.ebuild
-2205112015 ./dev-python/ansible-compat/ansible-compat-2.0.3.ebuild
-2205171010 ./dev-python/ansible-compat/ansible-compat-2.0.4.ebuild
+2206161340 ./dev-python/ukkonen/ukkonen-1.0.1-r1.ebuild
 2205240940 ./dev-python/ansible-compat/ansible-compat-2.1.0.ebuild
 2204011140 ./dev-python/pytest-markdown/pytest-markdown-1.0.2.ebuild
 2112260340 ./dev-python/csscompressor/csscompressor-0.9.5.ebuild
@@ -13337,7 +13209,6 @@
 2203101110 ./dev-python/jupyter-server-proxy/jupyter-server-proxy-3.2.1.ebuild
 2111281840 ./dev-python/simpervisor/simpervisor-0.4.ebuild
 2206021840 ./dev-python/boltons/boltons-21.0.0-r1.ebuild
-2203091940 ./dev-python/patatt/patatt-0.4.9.ebuild
 2206052010 ./dev-python/patatt/patatt-0.4.9-r1.ebuild
 2112110110 ./dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.6.2.ebuild
 2201271240 ./dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.6.3.ebuild
@@ -13353,23 +13224,17 @@
 2112302239 ./dev-python/multipledispatch/multipledispatch-0.6.0.ebuild
 2205292240 ./dev-python/multipledispatch/multipledispatch-0.6.0-r1.ebuild
 2201232239 ./dev-python/starlette/starlette-0.18.0.ebuild
-2205031140 ./dev-python/starlette/starlette-0.20.0.ebuild
-2206011040 ./dev-python/starlette/starlette-0.20.1.ebuild
-2206080840 ./dev-python/starlette/starlette-0.20.2.ebuild
 2206101140 ./dev-python/starlette/starlette-0.20.3.ebuild
 2205041140 ./dev-python/tifffile/tifffile-2022.5.4.ebuild
-2205171540 ./dev-python/pytest-codeblocks/pytest-codeblocks-0.15.0.ebuild
-2206072210 ./dev-python/pytest-codeblocks/pytest-codeblocks-0.16.0.ebuild
 2206101310 ./dev-python/pytest-codeblocks/pytest-codeblocks-0.16.1.ebuild
 2205102110 ./dev-python/wcag-contrast-ratio/wcag-contrast-ratio-0.9-r1.ebuild
 2206100640 ./dev-python/build/build-0.8.0.ebuild
 2205161810 ./dev-python/littleutils/littleutils-0.2.2.ebuild
 2205161810 ./dev-python/pure_eval/pure_eval-0.2.2.ebuild
 2205080740 ./dev-python/stack_data/stack_data-0.2.0.ebuild
+2206160940 ./dev-python/stack_data/stack_data-0.3.0.ebuild
 2205271240 ./dev-python/installer/installer-0.5.1.ebuild
 2206081111 ./dev-python/installer/installer-0.5.1-r1.ebuild
-2205022240 ./dev-python/pdm-pep517/pdm-pep517-0.12.4.ebuild
-2205171010 ./dev-python/pdm-pep517/pdm-pep517-0.12.5.ebuild
 2206082310 ./dev-python/pdm-pep517/pdm-pep517-0.12.7.ebuild
 2205121710 ./dev-python/poetry-core/poetry-core-1.0.8.ebuild
 2205150940 ./dev-python/socksio/socksio-1.0.0.ebuild
@@ -13391,7 +13256,6 @@
 2201261509 ./dev-python/py-zabbix/py-zabbix-1.1.7.ebuild
 2201280840 ./dev-python/filebytes/filebytes-0.10.2.ebuild
 2201280840 ./dev-python/filebytes/filebytes-9999.ebuild
-2204050639 ./dev-python/yara-python/yara-python-4.2.0.ebuild
 2206091040 ./dev-python/yara-python/yara-python-4.2.0-r2.ebuild
 2205121410 ./dev-python/autocommand/autocommand-2.2.1_p20211118.ebuild
 2204201109 ./dev-python/cachecontrol/cachecontrol-0.12.11.ebuild
@@ -13417,13 +13281,7 @@
 2204100539 ./dev-python/uri_template/uri_template-1.1.0.ebuild
 2205111740 ./dev-python/uri_template/uri_template-1.2.0.ebuild
 2205120010 ./dev-python/ephemeral-port-reserve/ephemeral-port-reserve-1.1.4.ebuild
-2205062310 ./dev-python/pytest-shell-utilities/pytest-shell-utilities-1.0.5.ebuild
-2205171010 ./dev-python/pytest-shell-utilities/pytest-shell-utilities-1.1.0.ebuild
-2205211010 ./dev-python/pytest-shell-utilities/pytest-shell-utilities-1.2.0.ebuild
-2205240940 ./dev-python/pytest-shell-utilities/pytest-shell-utilities-1.2.1.ebuild
-2205262210 ./dev-python/pytest-shell-utilities/pytest-shell-utilities-1.3.0.ebuild
-2205301710 ./dev-python/pytest-shell-utilities/pytest-shell-utilities-1.4.0.ebuild
-2206030910 ./dev-python/pytest-shell-utilities/pytest-shell-utilities-1.5.0.ebuild
+2206161310 ./dev-python/pytest-shell-utilities/pytest-shell-utilities-1.5.0.ebuild
 2205062310 ./dev-python/pytest-skip-markers/pytest-skip-markers-1.2.0.ebuild
 2205100110 ./dev-python/pytest-skip-markers/pytest-skip-markers-1.3.0.ebuild
 2205301710 ./dev-python/pytest-skip-markers/pytest-skip-markers-1.3.0-r1.ebuild
@@ -13437,7 +13295,6 @@
 2205032240 ./dev-python/youtube-search-python/youtube-search-python-1.6.5.ebuild
 2205110010 ./dev-python/ytmusicapi/ytmusicapi-0.22.0.ebuild
 2204102009 ./dev-python/leechcorepyc/leechcorepyc-2.10.2.ebuild
-2204050639 ./dev-python/pefile/pefile-2021.9.3.ebuild
 2204050639 ./dev-python/pefile/pefile-9999.ebuild
 2205310610 ./dev-python/pefile/pefile-2022.5.30.ebuild
 2205311210 ./dev-python/python-ptrace/python-ptrace-0.9.8.ebuild
@@ -13447,25 +13304,15 @@
 2206061240 ./dev-python/gpep517/gpep517-6.ebuild
 2204051639 ./dev-python/spotipy/spotipy-2.19.0.ebuild
 2205182140 ./dev-python/editables/editables-0.3.ebuild
-2205161110 ./dev-python/hatchling/hatchling-0.25.0.ebuild
-2205182140 ./dev-python/hatchling/hatchling-0.24.0.ebuild
-2205180910 ./dev-python/hatchling/hatchling-1.0.0.ebuild
-2205201140 ./dev-python/hatchling/hatchling-1.1.0.ebuild
-2205211010 ./dev-python/hatchling/hatchling-1.2.0.ebuild
-2205230940 ./dev-python/hatchling/hatchling-1.3.0.ebuild
-2205310940 ./dev-python/hatchling/hatchling-1.3.1.ebuild
+2206160940 ./dev-python/hatchling/hatchling-1.3.1.ebuild
 2204251910 ./dev-python/pystache/pystache-0.6.0.ebuild
 2204201109 ./dev-python/pyeclib/pyeclib-1.6.0-r1.ebuild
 2205192010 ./dev-python/pyeclib/pyeclib-1.6.1.ebuild
-2205211010 ./dev-python/exceptiongroup/exceptiongroup-1.0.0_rc7.ebuild
-2206131340 ./dev-python/exceptiongroup/exceptiongroup-1.0.0_rc8.ebuild
-2205122240 ./dev-python/flit_scm/flit_scm-1.5.0.ebuild
-2206131340 ./dev-python/flit_scm/flit_scm-1.6.2.ebuild
+2206150040 ./dev-python/exceptiongroup/exceptiongroup-1.0.0_rc8.ebuild
+2206150040 ./dev-python/flit_scm/flit_scm-1.6.2.ebuild
 2206090610 ./dev-python/setuptools-rust/setuptools-rust-1.3.0.ebuild
 2206090610 ./dev-python/dirty-equals/dirty-equals-0.4.ebuild
 2206121110 ./dev-python/tpm2-pytss/tpm2-pytss-1.1.0.ebuild
-2205151210 ./dev-python/watchfiles/watchfiles-0.13.ebuild
-2205171010 ./dev-python/watchfiles/watchfiles-0.14.ebuild
 2206090610 ./dev-python/watchfiles/watchfiles-0.14.1.ebuild
 2206080240 ./dev-python/zope-hookable/zope-hookable-5.1.0.ebuild
 2205271410 ./dev-python/lark/lark-1.1.2.ebuild
@@ -13473,155 +13320,138 @@
 2205021410 ./dev-python/notebook_shim/notebook_shim-0.1.0.ebuild
 2206070240 ./dev-python/suds-community/suds-community-1.1.1.ebuild
 2205062210 ./dev-python/pytesseract/pytesseract-0.3.10.ebuild
-2206131340 ./dev-python/hatch-vcs/hatch-vcs-0.2.0.ebuild
+2206140040 ./dev-python/hatch-vcs/hatch-vcs-0.2.0.ebuild
 2205152140 ./dev-python/Opcodes/Opcodes-0.3.14.ebuild
 2205161640 ./dev-python/PeachPy/PeachPy-2021.10.13.ebuild
 2205200440 ./dev-python/allpairspy/allpairspy-2.5.0.ebuild
-2205190440 ./dev-python/dbus-next/dbus-next-0.2.3.ebuild
-2206081310 ./dev-python/dbus-next/dbus-next-0.2.3-r1.ebuild
+2206161110 ./dev-python/dbus-next/dbus-next-0.2.3-r1.ebuild
 2205200440 ./dev-python/pathvalidate/pathvalidate-2.5.0.ebuild
 2205282010 ./dev-python/tcolorpy/tcolorpy-0.1.2.ebuild
 2205211010 ./dev-python/kgb/kgb-7.0-r1.ebuild
 2205211010 ./dev-python/pydiffx/pydiffx-1.0.1-r1.ebuild
 2205242210 ./dev-python/openapi-schema-validator/openapi-schema-validator-0.2.3.ebuild
 2205242210 ./dev-python/openapi-spec-validator/openapi-spec-validator-0.4.0.ebuild
-2206011510 ./dev-python/versioningit/versioningit-1.1.1.ebuild
 2206131040 ./dev-python/versioningit/versioningit-2.0.0.ebuild
 2206071310 ./dev-python/pytest-httpserver/pytest-httpserver-1.0.4-r1.ebuild
 2206121210 ./dev-python/meson-python/meson-python-0.5.0-r1.ebuild
 2206100840 ./dev-python/sphinx-pytest/sphinx-pytest-0.0.3.ebuild
-2206081111 ./dev-python/tlsh/tlsh-4.8.2.ebuild
+2206140910 ./dev-python/tlsh/tlsh-4.8.2.ebuild
 2206101740 ./dev-python/check-manifest/check-manifest-0.48.ebuild
 2206101740 ./dev-python/dictpath/dictpath-0.1.3.ebuild
-2206091040 ./dev-python/jaraco-test/jaraco-test-5.1.0.ebuild
+2206141040 ./dev-python/jaraco-test/jaraco-test-5.1.0.ebuild
 2206111110 ./dev-python/openapi-core/openapi-core-0.14.2.ebuild
 2206120940 ./dev-python/pyproject-metadata/pyproject-metadata-0.5.0.ebuild
+2206161940 ./dev-python/yaxmldiff/yaxmldiff-0.1.0.ebuild
 2204172140 ./dev-qt/assistant/assistant-5.15.3.ebuild
-2206100640 ./dev-qt/assistant/assistant-5.15.4.ebuild
+2206141640 ./dev-qt/assistant/assistant-5.15.4.ebuild
 2204172140 ./dev-qt/designer/designer-5.15.3.ebuild
-2206100640 ./dev-qt/designer/designer-5.15.4.ebuild
+2206141640 ./dev-qt/designer/designer-5.15.4.ebuild
 2205190840 ./dev-qt/linguist-tools/linguist-tools-5.15.3.ebuild
 2206091740 ./dev-qt/linguist-tools/linguist-tools-5.15.4-r1.ebuild
-2206100640 ./dev-qt/linguist-tools/linguist-tools-5.15.4.ebuild
+2206141640 ./dev-qt/linguist-tools/linguist-tools-5.15.4.ebuild
 2204172140 ./dev-qt/linguist/linguist-5.15.3.ebuild
-2206100640 ./dev-qt/linguist/linguist-5.15.4.ebuild
+2206141640 ./dev-qt/linguist/linguist-5.15.4.ebuild
 2204172140 ./dev-qt/pixeltool/pixeltool-5.15.3.ebuild
-2206100640 ./dev-qt/pixeltool/pixeltool-5.15.4.ebuild
+2206141640 ./dev-qt/pixeltool/pixeltool-5.15.4.ebuild
 2204172140 ./dev-qt/qdbus/qdbus-5.15.3.ebuild
-2206100640 ./dev-qt/qdbus/qdbus-5.15.4.ebuild
+2206141640 ./dev-qt/qdbus/qdbus-5.15.4.ebuild
 2204172140 ./dev-qt/qdbusviewer/qdbusviewer-5.15.3.ebuild
-2206100640 ./dev-qt/qdbusviewer/qdbusviewer-5.15.4.ebuild
-2204140340 ./dev-qt/qdoc/qdoc-5.15.3.ebuild
-2206100640 ./dev-qt/qdoc/qdoc-5.15.4.ebuild
+2206141640 ./dev-qt/qdbusviewer/qdbusviewer-5.15.4.ebuild
+2206141640 ./dev-qt/qdoc/qdoc-5.15.4.ebuild
 2111290909 ./dev-qt/qt-creator/qt-creator-9999.ebuild
 2112022239 ./dev-qt/qt-creator/qt-creator-6.0.0.ebuild
 2109082009 ./dev-qt/qt-docs/qt-docs-5.15.2_p202011130614.ebuild
-2206031540 ./dev-qt/qt3d/qt3d-5.15.3-r1.ebuild
-2206100640 ./dev-qt/qt3d/qt3d-5.15.4-r1.ebuild
-2204140340 ./dev-qt/qtbluetooth/qtbluetooth-5.15.3.ebuild
-2206100640 ./dev-qt/qtbluetooth/qtbluetooth-5.15.4.ebuild
+2206141640 ./dev-qt/qt3d/qt3d-5.15.4-r1.ebuild
+2206141640 ./dev-qt/qtbluetooth/qtbluetooth-5.15.4.ebuild
 2205232210 ./dev-qt/qtcharts/qtcharts-5.15.3.ebuild
-2206100640 ./dev-qt/qtcharts/qtcharts-5.15.4.ebuild
+2206141640 ./dev-qt/qtcharts/qtcharts-5.15.4.ebuild
 2204172140 ./dev-qt/qtchooser/qtchooser-66-r2.ebuild
 2204172140 ./dev-qt/qtconcurrent/qtconcurrent-5.15.3.ebuild
-2206100640 ./dev-qt/qtconcurrent/qtconcurrent-5.15.4.ebuild
+2206141640 ./dev-qt/qtconcurrent/qtconcurrent-5.15.4.ebuild
 2205190840 ./dev-qt/qtcore/qtcore-5.15.3.ebuild
-2206100640 ./dev-qt/qtcore/qtcore-5.15.4-r2.ebuild
 2206091740 ./dev-qt/qtcore/qtcore-5.15.4-r3.ebuild
-2204140340 ./dev-qt/qtdatavis3d/qtdatavis3d-5.15.3.ebuild
-2206100640 ./dev-qt/qtdatavis3d/qtdatavis3d-5.15.4.ebuild
+2206141640 ./dev-qt/qtcore/qtcore-5.15.4-r2.ebuild
+2206141640 ./dev-qt/qtdatavis3d/qtdatavis3d-5.15.4.ebuild
 2204172140 ./dev-qt/qtdbus/qtdbus-5.15.3.ebuild
-2206100640 ./dev-qt/qtdbus/qtdbus-5.15.4.ebuild
+2206141640 ./dev-qt/qtdbus/qtdbus-5.15.4.ebuild
 2204172140 ./dev-qt/qtdeclarative/qtdeclarative-5.15.3-r1.ebuild
-2206100640 ./dev-qt/qtdeclarative/qtdeclarative-5.15.4.ebuild
 2206122310 ./dev-qt/qtdeclarative/qtdeclarative-5.15.4-r1.ebuild
-2204140340 ./dev-qt/qtdiag/qtdiag-5.15.3.ebuild
-2206100640 ./dev-qt/qtdiag/qtdiag-5.15.4.ebuild
-2204140340 ./dev-qt/qtgamepad/qtgamepad-5.15.3.ebuild
-2206100640 ./dev-qt/qtgamepad/qtgamepad-5.15.4.ebuild
+2206141640 ./dev-qt/qtdeclarative/qtdeclarative-5.15.4.ebuild
+2206141040 ./dev-qt/qtdiag/qtdiag-5.15.4.ebuild
+2206141640 ./dev-qt/qtgamepad/qtgamepad-5.15.4.ebuild
 2204172140 ./dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.3.ebuild
-2206100640 ./dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.4.ebuild
+2206141640 ./dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.4.ebuild
 2204172140 ./dev-qt/qtgui/qtgui-5.15.3.ebuild
-2206100640 ./dev-qt/qtgui/qtgui-5.15.4.ebuild
 2206122310 ./dev-qt/qtgui/qtgui-5.15.4-r2.ebuild
+2206141640 ./dev-qt/qtgui/qtgui-5.15.4.ebuild
 2204172140 ./dev-qt/qthelp/qthelp-5.15.3.ebuild
-2206100640 ./dev-qt/qthelp/qthelp-5.15.4.ebuild
+2206141640 ./dev-qt/qthelp/qthelp-5.15.4.ebuild
 2204172140 ./dev-qt/qtimageformats/qtimageformats-5.15.3.ebuild
-2206100640 ./dev-qt/qtimageformats/qtimageformats-5.15.4.ebuild
 2206122310 ./dev-qt/qtimageformats/qtimageformats-5.15.4-r1.ebuild
-2204140340 ./dev-qt/qtlocation/qtlocation-5.15.3-r1.ebuild
-2206100640 ./dev-qt/qtlocation/qtlocation-5.15.4.ebuild
+2206141640 ./dev-qt/qtimageformats/qtimageformats-5.15.4.ebuild
+2206141640 ./dev-qt/qtlocation/qtlocation-5.15.4.ebuild
 2110291639 ./dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20171024.ebuild
 2204172140 ./dev-qt/qtmultimedia/qtmultimedia-5.15.3.ebuild
-2206100640 ./dev-qt/qtmultimedia/qtmultimedia-5.15.4-r1.ebuild
+2206141640 ./dev-qt/qtmultimedia/qtmultimedia-5.15.4-r1.ebuild
 2204172140 ./dev-qt/qtnetwork/qtnetwork-5.15.3.ebuild
-2206100640 ./dev-qt/qtnetwork/qtnetwork-5.15.4.ebuild
-2204140340 ./dev-qt/qtnetworkauth/qtnetworkauth-5.15.3.ebuild
-2206100640 ./dev-qt/qtnetworkauth/qtnetworkauth-5.15.4.ebuild
+2206141640 ./dev-qt/qtnetwork/qtnetwork-5.15.4.ebuild
+2206141640 ./dev-qt/qtnetworkauth/qtnetworkauth-5.15.4.ebuild
 2204172140 ./dev-qt/qtopengl/qtopengl-5.15.3.ebuild
-2206100640 ./dev-qt/qtopengl/qtopengl-5.15.4.ebuild
+2206141640 ./dev-qt/qtopengl/qtopengl-5.15.4.ebuild
 2204172140 ./dev-qt/qtpaths/qtpaths-5.15.3.ebuild
-2206100640 ./dev-qt/qtpaths/qtpaths-5.15.4.ebuild
+2206141640 ./dev-qt/qtpaths/qtpaths-5.15.4.ebuild
 2203211409 ./dev-qt/qtplugininfo/qtplugininfo-5.15.3.ebuild
 2205202310 ./dev-qt/qtplugininfo/qtplugininfo-5.15.4.ebuild
 2204172140 ./dev-qt/qtpositioning/qtpositioning-5.15.3.ebuild
-2206100640 ./dev-qt/qtpositioning/qtpositioning-5.15.4.ebuild
+2206141640 ./dev-qt/qtpositioning/qtpositioning-5.15.4.ebuild
 2204172140 ./dev-qt/qtprintsupport/qtprintsupport-5.15.3.ebuild
 2206091740 ./dev-qt/qtprintsupport/qtprintsupport-5.15.4-r1.ebuild
-2206100640 ./dev-qt/qtprintsupport/qtprintsupport-5.15.4.ebuild
+2206141640 ./dev-qt/qtprintsupport/qtprintsupport-5.15.4.ebuild
 2204172140 ./dev-qt/qtquickcontrols/qtquickcontrols-5.15.3.ebuild
-2206100640 ./dev-qt/qtquickcontrols/qtquickcontrols-5.15.4.ebuild
-2204140340 ./dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.3.ebuild
-2206100640 ./dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.4.ebuild
-2203211409 ./dev-qt/qtquicktimeline/qtquicktimeline-5.15.3.ebuild
+2206141640 ./dev-qt/qtquickcontrols/qtquickcontrols-5.15.4.ebuild
+2206141640 ./dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.4.ebuild
 2205202310 ./dev-qt/qtquicktimeline/qtquicktimeline-5.15.4.ebuild
 2204172140 ./dev-qt/qtscript/qtscript-5.15.3.ebuild
-2206100640 ./dev-qt/qtscript/qtscript-5.15.4.ebuild
-2204140340 ./dev-qt/qtscxml/qtscxml-5.15.3.ebuild
-2206100640 ./dev-qt/qtscxml/qtscxml-5.15.4.ebuild
+2206141640 ./dev-qt/qtscript/qtscript-5.15.4.ebuild
+2206141640 ./dev-qt/qtscxml/qtscxml-5.15.4.ebuild
 2204172140 ./dev-qt/qtsensors/qtsensors-5.15.3.ebuild
-2206100640 ./dev-qt/qtsensors/qtsensors-5.15.4.ebuild
+2206141640 ./dev-qt/qtsensors/qtsensors-5.15.4.ebuild
 2203211409 ./dev-qt/qtserialbus/qtserialbus-5.15.3.ebuild
 2205202310 ./dev-qt/qtserialbus/qtserialbus-5.15.4.ebuild
 2204172140 ./dev-qt/qtserialport/qtserialport-5.15.3.ebuild
-2206100640 ./dev-qt/qtserialport/qtserialport-5.15.4.ebuild
+2206141640 ./dev-qt/qtserialport/qtserialport-5.15.4.ebuild
 2110291639 ./dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20171024.ebuild
-2204140340 ./dev-qt/qtspeech/qtspeech-5.15.3.ebuild
-2206100640 ./dev-qt/qtspeech/qtspeech-5.15.4.ebuild
+2206141640 ./dev-qt/qtspeech/qtspeech-5.15.4.ebuild
 2204172140 ./dev-qt/qtsql/qtsql-5.15.3.ebuild
-2206100640 ./dev-qt/qtsql/qtsql-5.15.4.ebuild
+2206141640 ./dev-qt/qtsql/qtsql-5.15.4.ebuild
 2101240239 ./dev-qt/qtstyleplugins/qtstyleplugins-5.0.0_p20170311-r1.ebuild
 2204172140 ./dev-qt/qtsvg/qtsvg-5.15.3.ebuild
-2206100640 ./dev-qt/qtsvg/qtsvg-5.15.4.ebuild
+2206141640 ./dev-qt/qtsvg/qtsvg-5.15.4.ebuild
 2204172140 ./dev-qt/qttest/qttest-5.15.3.ebuild
 2206091740 ./dev-qt/qttest/qttest-5.15.4-r1.ebuild
-2206100640 ./dev-qt/qttest/qttest-5.15.4.ebuild
+2206141640 ./dev-qt/qttest/qttest-5.15.4.ebuild
 2204172140 ./dev-qt/qttranslations/qttranslations-5.15.3.ebuild
-2206100640 ./dev-qt/qttranslations/qttranslations-5.15.4.ebuild
-2204140340 ./dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.3.ebuild
-2206100640 ./dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.4.ebuild
+2206141640 ./dev-qt/qttranslations/qttranslations-5.15.4.ebuild
+2206141640 ./dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.4.ebuild
 2205041510 ./dev-qt/qtwayland/qtwayland-5.15.3-r1.ebuild
-2206100640 ./dev-qt/qtwayland/qtwayland-5.15.4.ebuild
+2206141640 ./dev-qt/qtwayland/qtwayland-5.15.4.ebuild
 2204172140 ./dev-qt/qtwebchannel/qtwebchannel-5.15.3.ebuild
-2206100640 ./dev-qt/qtwebchannel/qtwebchannel-5.15.4.ebuild
-2206101110 ./dev-qt/qtwebengine/qtwebengine-5.15.3_p20220406.ebuild
-2206101110 ./dev-qt/qtwebengine/qtwebengine-5.15.4_p20220505.ebuild
-2206101110 ./dev-qt/qtwebengine/qtwebengine-5.15.4_p20220526.ebuild
+2206141640 ./dev-qt/qtwebchannel/qtwebchannel-5.15.4.ebuild
+2206141640 ./dev-qt/qtwebengine/qtwebengine-5.15.4_p20220526.ebuild
 2204172140 ./dev-qt/qtwebsockets/qtwebsockets-5.15.3.ebuild
-2206100640 ./dev-qt/qtwebsockets/qtwebsockets-5.15.4.ebuild
-2203211409 ./dev-qt/qtwebview/qtwebview-5.15.3.ebuild
+2206141640 ./dev-qt/qtwebsockets/qtwebsockets-5.15.4.ebuild
 2205202310 ./dev-qt/qtwebview/qtwebview-5.15.4.ebuild
 2204172140 ./dev-qt/qtwidgets/qtwidgets-5.15.3.ebuild
-2206100640 ./dev-qt/qtwidgets/qtwidgets-5.15.4-r1.ebuild
 2206091740 ./dev-qt/qtwidgets/qtwidgets-5.15.4-r2.ebuild
+2206141640 ./dev-qt/qtwidgets/qtwidgets-5.15.4-r1.ebuild
 2204172140 ./dev-qt/qtx11extras/qtx11extras-5.15.3.ebuild
-2206100640 ./dev-qt/qtx11extras/qtx11extras-5.15.4.ebuild
+2206141640 ./dev-qt/qtx11extras/qtx11extras-5.15.4.ebuild
 2205190840 ./dev-qt/qtxml/qtxml-5.15.3.ebuild
-2206100640 ./dev-qt/qtxml/qtxml-5.15.4.ebuild
+2206141640 ./dev-qt/qtxml/qtxml-5.15.4.ebuild
 2204172140 ./dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.3.ebuild
-2206100640 ./dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.4.ebuild
+2206141640 ./dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.4.ebuild
 2204172140 ./dev-qt/qtwaylandscanner/qtwaylandscanner-5.15.3.ebuild
-2206100640 ./dev-qt/qtwaylandscanner/qtwaylandscanner-5.15.4.ebuild
+2206141640 ./dev-qt/qtwaylandscanner/qtwaylandscanner-5.15.4.ebuild
 2108031839 ./dev-ros/actionlib/actionlib-1.13.2-r1.ebuild
 2108031839 ./dev-ros/actionlib/actionlib-9999.ebuild
 2007082039 ./dev-ros/actionlib_msgs/actionlib_msgs-1.13.0.ebuild
@@ -15236,14 +15066,14 @@
 2205061010 ./dev-ruby/heredoc_unindent/heredoc_unindent-1.2.0-r1.ebuild
 2107071139 ./dev-ruby/hiera-eyaml-gpg/hiera-eyaml-gpg-0.7.4.ebuild
 2111191009 ./dev-ruby/hiera-eyaml-plaintext/hiera-eyaml-plaintext-0.6-r2.ebuild
-2009140939 ./dev-ruby/hiera-eyaml/hiera-eyaml-3.1.1.ebuild
-2111251240 ./dev-ruby/hiera-eyaml/hiera-eyaml-3.2.2.ebuild
+2206161940 ./dev-ruby/hiera-eyaml/hiera-eyaml-3.1.1.ebuild
+2206161940 ./dev-ruby/hiera-eyaml/hiera-eyaml-3.2.2.ebuild
 2204021110 ./dev-ruby/hiera/hiera-3.8.0.ebuild
 2204200839 ./dev-ruby/hiera/hiera-3.9.0.ebuild
 2104100939 ./dev-ruby/highline/highline-2.0.3.ebuild
 2205061010 ./dev-ruby/highline/highline-2.0.3-r1.ebuild
 2107091109 ./dev-ruby/hipchat/hipchat-1.6.0.ebuild
-2110171209 ./dev-ruby/hiredis/hiredis-0.6.3-r1.ebuild
+2206161940 ./dev-ruby/hiredis/hiredis-0.6.3-r1.ebuild
 2110200339 ./dev-ruby/histogram/histogram-0.2.4.1.ebuild
 2101062139 ./dev-ruby/hitimes/hitimes-2.0.0.ebuild
 2205061010 ./dev-ruby/hitimes/hitimes-2.0.0-r1.ebuild
@@ -15409,6 +15239,7 @@
 2101062139 ./dev-ruby/minitest/minitest-5.14.3.ebuild
 2107211339 ./dev-ruby/minitest/minitest-5.14.4.ebuild
 2205081810 ./dev-ruby/minitest/minitest-5.15.0.ebuild
+2206150810 ./dev-ruby/minitest/minitest-5.16.0.ebuild
 2205011210 ./dev-ruby/mixlib-shellout/mixlib-shellout-3.0.9.ebuild
 2204261710 ./dev-ruby/mocha/mocha-1.13.0.ebuild
 2205081810 ./dev-ruby/mocha/mocha-0.14.0-r1.ebuild
@@ -15754,7 +15585,7 @@
 2204241040 ./dev-ruby/ruby-ldap/ruby-ldap-0.9.20-r3.ebuild
 2103140439 ./dev-ruby/ruby-libsecret/ruby-libsecret-3.4.3.ebuild
 2204241040 ./dev-ruby/ruby-macho/ruby-macho-2.5.1.ebuild
-2205261410 ./dev-ruby/ruby-mp3info/ruby-mp3info-0.8.10-r1.ebuild
+2206161940 ./dev-ruby/ruby-mp3info/ruby-mp3info-0.8.10-r1.ebuild
 2012011009 ./dev-ruby/ruby-net-ldap/ruby-net-ldap-0.17.0.ebuild
 2206080810 ./dev-ruby/ruby-net-ldap/ruby-net-ldap-0.17.1.ebuild
 2002021209 ./dev-ruby/ruby-odbc/ruby-odbc-0.99999.ebuild
@@ -15808,8 +15639,8 @@
 2110231009 ./dev-ruby/rubytest-cli/rubytest-cli-0.2.0-r1.ebuild
 2110231009 ./dev-ruby/rubytest/rubytest-0.8.1-r1.ebuild
 2102160909 ./dev-ruby/rubytter/rubytter-1.5.1-r2.ebuild
-2105170909 ./dev-ruby/rubyzip/rubyzip-1.3.0.ebuild
-2203211109 ./dev-ruby/rubyzip/rubyzip-2.3.2-r1.ebuild
+2206161940 ./dev-ruby/rubyzip/rubyzip-1.3.0.ebuild
+2206161940 ./dev-ruby/rubyzip/rubyzip-2.3.2-r1.ebuild
 2107161209 ./dev-ruby/safe_yaml/safe_yaml-1.0.5-r1.ebuild
 2203271339 ./dev-ruby/sanitize/sanitize-6.0.0.ebuild
 2206121141 ./dev-ruby/sass-listen/sass-listen-4.0.0-r1.ebuild
@@ -15822,7 +15653,7 @@
 2205051440 ./dev-ruby/sass/sass-3.7.4.ebuild
 2206121141 ./dev-ruby/sass/sass-3.7.4-r1.ebuild
 2107062309 ./dev-ruby/sassc-rails/sassc-rails-2.1.2-r1.ebuild
-2203191510 ./dev-ruby/sassc/sassc-2.4.0-r1.ebuild
+2206161940 ./dev-ruby/sassc/sassc-2.4.0-r1.ebuild
 2205081040 ./dev-ruby/sawyer/sawyer-0.8.2-r1.ebuild
 2205270910 ./dev-ruby/sawyer/sawyer-0.9.1.ebuild
 2109071539 ./dev-ruby/sdoc/sdoc-1.1.0.ebuild
@@ -15837,6 +15668,7 @@
 2204182040 ./dev-ruby/semver2/semver2-3.4.2-r1.ebuild
 2204182040 ./dev-ruby/serialport/serialport-1.3.2.ebuild
 2201150940 ./dev-ruby/serverengine/serverengine-2.2.5.ebuild
+2206140840 ./dev-ruby/serverengine/serverengine-2.3.0.ebuild
 2110250909 ./dev-ruby/set/set-1.0.2.ebuild
 2203141909 ./dev-ruby/settingslogic/settingslogic-2.0.9-r2.ebuild
 2101062139 ./dev-ruby/sexp_processor/sexp_processor-4.15.0.ebuild
@@ -15887,6 +15719,8 @@
 2206131140 ./dev-ruby/sprockets/sprockets-4.0.2.ebuild
 2204221010 ./dev-ruby/spy/spy-1.0.2.ebuild
 2204221010 ./dev-ruby/sqlite3/sqlite3-1.4.2-r1.ebuild
+2206140810 ./dev-ruby/sqlite3/sqlite3-1.4.3.ebuild
+2206160910 ./dev-ruby/sqlite3/sqlite3-1.4.4.ebuild
 2001031909 ./dev-ruby/sshkey/sshkey-2.0.0.ebuild
 2204221010 ./dev-ruby/sshkey/sshkey-2.0.0-r1.ebuild
 2203310910 ./dev-ruby/sshkit/sshkit-1.21.2.ebuild
@@ -16026,6 +15860,7 @@
 2206121141 ./dev-ruby/yard/yard-0.9.28.ebuild
 2110040409 ./dev-ruby/zeitwerk/zeitwerk-2.4.2.ebuild
 2205081810 ./dev-ruby/zeitwerk/zeitwerk-2.5.4.ebuild
+2206140810 ./dev-ruby/zeitwerk/zeitwerk-2.6.0.ebuild
 2101062139 ./dev-ruby/zentest/zentest-4.12.0.ebuild
 2204161040 ./dev-ruby/zentest/zentest-4.12.1.ebuild
 2202262209 ./dev-ruby/benchmark-ips/benchmark-ips-2.9.2.ebuild
@@ -16094,8 +15929,8 @@
 2204090539 ./dev-scheme/guile/guile-3.0.8.ebuild
 2205041040 ./dev-scheme/guile/guile-2.2.7-r1.ebuild
 1805171038 ./dev-scheme/jscheme/jscheme-7.2-r1.ebuild
-2104212209 ./dev-scheme/kawa/kawa-1.14-r2.ebuild
 2204212139 ./dev-scheme/kawa/kawa-3.1.1-r1.ebuild
+2206161940 ./dev-scheme/kawa/kawa-1.14-r2.ebuild
 2201050409 ./dev-scheme/racket/racket-8.2-r3.ebuild
 2202151039 ./dev-scheme/racket/racket-8.3-r3.ebuild
 2204021110 ./dev-scheme/racket/racket-8.4-r1.ebuild
@@ -16261,6 +16096,7 @@
 2107151340 ./dev-texlive/texlive-latexextra/texlive-latexextra-2021.ebuild
 2205141340 ./dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2021.ebuild
 2107261139 ./dev-texlive/texlive-luatex/texlive-luatex-2021.ebuild
+2206160140 ./dev-texlive/texlive-luatex/texlive-luatex-2021-r1.ebuild
 2107261139 ./dev-texlive/texlive-mathscience/texlive-mathscience-2021.ebuild
 2107270239 ./dev-texlive/texlive-metapost/texlive-metapost-2021.ebuild
 2112132209 ./dev-texlive/texlive-music/texlive-music-2021.ebuild
@@ -16329,7 +16165,7 @@
 2205211140 ./dev-util/bloaty/bloaty-1.1.ebuild
 2008031109 ./dev-util/bnfc/bnfc-2.8.3.ebuild
 2202052039 ./dev-util/boost-build/boost-build-1.78.0-r1.ebuild
-2206100640 ./dev-util/boost-build/boost-build-1.79.0.ebuild
+2206142110 ./dev-util/boost-build/boost-build-1.79.0.ebuild
 2205202210 ./dev-util/bpftool/bpftool-5.17.7.ebuild
 2205281910 ./dev-util/bpftool/bpftool-5.17.4.ebuild
 2206061040 ./dev-util/bpftool/bpftool-5.18.1.ebuild
@@ -16402,13 +16238,12 @@
 2205112210 ./dev-util/chroot-wrapper/chroot-wrapper-0.9.9.ebuild
 2112210039 ./dev-util/clair/clair-2.1.3.ebuild
 2112210039 ./dev-util/clair/clair-2.1.4.ebuild
-2201191709 ./dev-util/clazy/clazy-1.10-r2.ebuild
 2205271010 ./dev-util/clazy/clazy-1.11-r1.ebuild
 2101310343 ./dev-util/cligh/cligh-0.3.ebuild
 2101310343 ./dev-util/cligh/cligh-9999.ebuild
 2102220109 ./dev-util/clinfo/clinfo-3.0.21.02.21.ebuild
 2004090109 ./dev-util/clinfo/clinfo-9999.ebuild
-2206031640 ./dev-util/clion/clion-2022.1.1.ebuild
+2206141040 ./dev-util/clion/clion-2022.1.1-r1.ebuild
 2205170440 ./dev-util/clippy/clippy-8.2.2-r1.ebuild
 2205301010 ./dev-util/clippy/clippy-8.2.2.ebuild
 2106272139 ./dev-util/cloc/cloc-1.88.ebuild
@@ -16521,7 +16356,7 @@
 2204142310 ./dev-util/diffoscope/diffoscope-207.ebuild
 2206081111 ./dev-util/diffoscope/diffoscope-214-r1.ebuild
 2206121141 ./dev-util/diffoscope/diffoscope-214.ebuild
-2206101110 ./dev-util/diffoscope/diffoscope-216.ebuild
+2206140910 ./dev-util/diffoscope/diffoscope-216.ebuild
 2104060140 ./dev-util/diffstat/diffstat-1.63.ebuild
 2202111709 ./dev-util/diffstat/diffstat-1.64.ebuild
 2206051040 ./dev-util/diffuse/diffuse-0.7.5.ebuild
@@ -16563,13 +16398,14 @@
 1903072109 ./dev-util/ftnchek/ftnchek-3.3.1-r2.ebuild
 2108050609 ./dev-util/fuzz/fuzz-0.6-r2.ebuild
 2105242309 ./dev-util/gcovr/gcovr-4.2.ebuild
+2206161940 ./dev-util/gcovr/gcovr-5.1.ebuild
 2205302140 ./dev-util/gdbus-codegen/gdbus-codegen-2.72.2.ebuild
 2205311240 ./dev-util/gdbus-codegen/gdbus-codegen-2.72.1.ebuild
 2202170139 ./dev-util/geany-plugins/geany-plugins-1.37-r101.ebuild
-2206071140 ./dev-util/geany-plugins/geany-plugins-1.38-r1.ebuild
+2206161210 ./dev-util/geany-plugins/geany-plugins-1.38-r1.ebuild
 2106301339 ./dev-util/geany/geany-1.37.1.ebuild
 2110101739 ./dev-util/geany/geany-9999.ebuild
-2206071140 ./dev-util/geany/geany-1.38.ebuild
+2206161210 ./dev-util/geany/geany-1.38.ebuild
 2202111809 ./dev-util/gengetopt/gengetopt-2.23.ebuild
 2205200511 ./dev-util/gertty/gertty-1.6.0-r1.ebuild
 2205200511 ./dev-util/gertty/gertty-9999.ebuild
@@ -16620,7 +16456,7 @@
 2108261609 ./dev-util/hip/hip-4.3.0.ebuild
 2201241810 ./dev-util/hip/hip-4.3.0-r1.ebuild
 2203060009 ./dev-util/hip/hip-4.3.0-r2.ebuild
-2203270640 ./dev-util/hip/hip-5.0.2.ebuild
+2206131510 ./dev-util/hip/hip-5.0.2-r1.ebuild
 2202071309 ./dev-util/howdoi/howdoi-2.0.19.ebuild
 2002230040 ./dev-util/huc/huc-0.1-r1.ebuild
 2104161439 ./dev-util/hxd/hxd-0.70.02-r2.ebuild
@@ -16667,6 +16503,7 @@
 2204021440 ./dev-util/kdstatemachineeditor/kdstatemachineeditor-1.2.8.ebuild
 2204021440 ./dev-util/kdstatemachineeditor/kdstatemachineeditor-9999.ebuild
 2102131339 ./dev-util/kernelshark/kernelshark-1.2.ebuild
+2206162010 ./dev-util/kernelshark/kernelshark-2.1.0.ebuild
 2005131809 ./dev-util/kubebuilder/kubebuilder-2.3.1.ebuild
 2104161439 ./dev-util/kup/kup-0.3.6.ebuild
 2204090610 ./dev-util/kup/kup-0.3.4-r1.ebuild
@@ -16709,12 +16546,11 @@
 1712280139 ./dev-util/makeheaders/makeheaders-0_p4.ebuild
 2104042139 ./dev-util/makepp/makepp-2.0.99.2.ebuild
 2105161410 ./dev-util/massif-visualizer/massif-visualizer-0.7.0-r1.ebuild
-2205291540 ./dev-util/maturin/maturin-0.12.18.ebuild
 2206021840 ./dev-util/maturin/maturin-0.12.17.ebuild
 2206061140 ./dev-util/maturin/maturin-0.12.19.ebuild
-2205150040 ./dev-util/mdds/mdds-1.7.0.ebuild
+2206161640 ./dev-util/maturin/maturin-0.12.20.ebuild
 2205150040 ./dev-util/mdds/mdds-9999.ebuild
-2206100640 ./dev-util/mdds/mdds-2.0.3.ebuild
+2206141640 ./dev-util/mdds/mdds-2.0.3.ebuild
 2112310709 ./dev-util/meld/meld-3.20.4.ebuild
 2103152309 ./dev-util/memprof/memprof-0.6.2-r1.ebuild
 2204291110 ./dev-util/meson-format-array/meson-format-array-0.ebuild
@@ -16734,11 +16570,11 @@
 1908180239 ./dev-util/ninka/ninka-2.0_pre1_p20170402.ebuild
 2201281040 ./dev-util/numdiff/numdiff-5.9.0.ebuild
 2201111640 ./dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-11.5.1.ebuild
-2112042009 ./dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.5.1-r1.ebuild
-2201141710 ./dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.6.0.ebuild
-2202231309 ./dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.6.1.ebuild
-2203281610 ./dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.6.2.ebuild
 2206091240 ./dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.7.0.ebuild
+2206161940 ./dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.5.1-r1.ebuild
+2206161940 ./dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.6.0.ebuild
+2206161940 ./dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.6.1.ebuild
+2206161940 ./dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.6.2.ebuild
 2110011039 ./dev-util/objconv/objconv-2.51.ebuild
 2111250310 ./dev-util/omake/omake-0.10.3-r1.ebuild
 1705252354 ./dev-util/open-vcdiff/open-vcdiff-0.8.4-r1.ebuild
@@ -16749,7 +16585,7 @@
 2202170139 ./dev-util/ostree/ostree-2021.3-r3.ebuild
 2204130640 ./dev-util/ostree/ostree-2022.2.ebuild
 2206080640 ./dev-util/ostree/ostree-2022.4.ebuild
-2204211009 ./dev-util/packer/packer-1.7.10.ebuild
+2206140940 ./dev-util/packer/packer-1.7.10.ebuild
 2205200940 ./dev-util/pahole/pahole-9999.ebuild
 2205220410 ./dev-util/pahole/pahole-1.23.ebuild
 2201061240 ./dev-util/patchbin/patchbin-20160208.ebuild
@@ -16759,24 +16595,21 @@
 2204190039 ./dev-util/patdiff/patdiff-0.14.0-r1.ebuild
 2204272340 ./dev-util/patdiff/patdiff-0.15.0.ebuild
 1806050608 ./dev-util/peg/peg-0.1.18.ebuild
-2204071639 ./dev-util/perf/perf-5.17.1.ebuild
-2205231840 ./dev-util/perf/perf-5.18.ebuild
-2205311910 ./dev-util/perf/perf-5.15-r1.ebuild
+2206161240 ./dev-util/perf/perf-5.15-r1.ebuild
+2206161240 ./dev-util/perf/perf-5.17.1.ebuild
+2206161240 ./dev-util/perf/perf-5.18.ebuild
 2205071440 ./dev-util/pkgcheck/pkgcheck-0.10.9-r1.ebuild
 2205071440 ./dev-util/pkgcheck/pkgcheck-9999.ebuild
 2205222240 ./dev-util/pkgcheck/pkgcheck-0.10.10.ebuild
 2205270040 ./dev-util/pkgcheck/pkgcheck-0.10.11.ebuild
 2206120340 ./dev-util/pkgconf/pkgconf-1.8.0-r1.ebuild
 2206120340 ./dev-util/pkgconf/pkgconf-9999.ebuild
-2205071440 ./dev-util/pkgdev/pkgdev-0.2.0.ebuild
-2205222140 ./dev-util/pkgdev/pkgdev-0.2.1.ebuild
-2206051240 ./dev-util/pkgdev/pkgdev-0.1.9.ebuild
-2206122110 ./dev-util/pkgdev/pkgdev-0.2.1-r1.ebuild
 2206122110 ./dev-util/pkgdev/pkgdev-9999.ebuild
+2206140040 ./dev-util/pkgdev/pkgdev-0.2.1-r1.ebuild
 2008131309 ./dev-util/pkgdiff/pkgdiff-1.7.2.ebuild
 2008131309 ./dev-util/pkgdiff/pkgdiff-9999.ebuild
 2111042039 ./dev-util/plan9port/plan9port-0_pre20210321.ebuild
-2205200511 ./dev-util/ply/ply-2.1.1-r1.ebuild
+2206150740 ./dev-util/ply/ply-2.1.1-r1.ebuild
 2204101840 ./dev-util/poke/poke-2.3.ebuild
 1801211408 ./dev-util/premake/premake-4.4_beta5.ebuild
 1801211408 ./dev-util/premake/premake-5.0.0_alpha12.ebuild
@@ -16788,8 +16621,8 @@
 2111231939 ./dev-util/protobuf-cucumber/protobuf-cucumber-3.10.8-r1.ebuild
 2101070210 ./dev-util/pscan/pscan-20000721-r1.ebuild
 2107171739 ./dev-util/pycharm-community/pycharm-community-2021.1.2-r1.ebuild
-2204051139 ./dev-util/pycharm-community/pycharm-community-2021.3.3.ebuild
 2204261240 ./dev-util/pycharm-community/pycharm-community-2022.1.ebuild
+2206161740 ./dev-util/pycharm-community/pycharm-community-2022.1.2.ebuild
 2204112240 ./dev-util/pycharm-professional/pycharm-professional-2021.1.2-r1.ebuild
 2204112240 ./dev-util/pycharm-professional/pycharm-professional-2021.3.2.ebuild
 2204112240 ./dev-util/pycharm-professional/pycharm-professional-2021.3.3.ebuild
@@ -16849,9 +16682,9 @@
 2009222109 ./dev-util/rocminfo/rocminfo-9999.ebuild
 2203260340 ./dev-util/rocminfo/rocminfo-5.0.2.ebuild
 2101241109 ./dev-util/roctracer/roctracer-4.0.0-r1.ebuild
-2201301139 ./dev-util/roctracer/roctracer-4.3.0-r1.ebuild
 2202140039 ./dev-util/roctracer/roctracer-4.2.0-r1.ebuild
-2205011810 ./dev-util/roctracer/roctracer-5.0.2.ebuild
+2206131510 ./dev-util/roctracer/roctracer-4.3.0-r2.ebuild
+2206131510 ./dev-util/roctracer/roctracer-5.0.2.ebuild
 2203191710 ./dev-util/rosdep/rosdep-0.21.0.ebuild
 2203191710 ./dev-util/rosdep/rosdep-9999.ebuild
 2201290940 ./dev-util/rosinstall/rosinstall-0.7.8.ebuild
@@ -16927,13 +16760,14 @@
 2205011048 ./dev-util/systemtap/systemtap-4.5.ebuild
 2206080040 ./dev-util/systemtap/systemtap-4.6.ebuild
 2206080040 ./dev-util/systemtap/systemtap-4.7.ebuild
-2206131340 ./dev-util/systemtap/systemtap-4.5-r1.ebuild
+2206141040 ./dev-util/systemtap/systemtap-4.5-r1.ebuild
 1903070739 ./dev-util/tinlink/tinlink-1.0.0-r1.ebuild
 2104021709 ./dev-util/tkdiff/tkdiff-4.2.ebuild
 2110260639 ./dev-util/tkdiff/tkdiff-5.1.ebuild
 2110252309 ./dev-util/tkdiff/tkdiff-5.2.1.ebuild
 2002230040 ./dev-util/tmake/tmake-2.12-r1.ebuild
 2103261509 ./dev-util/trace-cmd/trace-cmd-2.9.1.ebuild
+2206162010 ./dev-util/trace-cmd/trace-cmd-3.0.2.ebuild
 2104060140 ./dev-util/treecc/treecc-0.3.10-r1.ebuild
 2002230040 ./dev-util/tup/tup-9999.ebuild
 2112051109 ./dev-util/tup/tup-0.7.10.ebuild
@@ -17018,6 +16852,7 @@
 2205112015 ./dev-util/gitlab-runner/gitlab-runner-14.9.2.ebuild
 2205242340 ./dev-util/gitlab-runner/gitlab-runner-15.0.0.ebuild
 2205032110 ./dev-util/difftastic/difftastic-0.28.0.ebuild
+2206152140 ./dev-util/difftastic/difftastic-0.29.1.ebuild
 2204010410 ./dev-util/wachy/wachy-0.1.0_alpha6.ebuild
 2204050639 ./dev-util/ROPgadget/ROPgadget-6.6.ebuild
 2204050639 ./dev-util/ROPgadget/ROPgadget-9999.ebuild
@@ -17032,6 +16867,8 @@
 2206010440 ./dev-util/snakeviz/snakeviz-2.1.1.ebuild
 2205292140 ./dev-util/web_page_replay_go/web_page_replay_go-20220314.ebuild
 2206092240 ./dev-util/breakpad/breakpad-2022.06.04.ebuild
+2206131510 ./dev-util/rocprofiler/rocprofiler-4.3.0.ebuild
+2206131510 ./dev-util/rocprofiler/rocprofiler-5.0.2.ebuild
 2105162309 ./dev-vcs/bfg/bfg-1.13.0.ebuild
 2109252009 ./dev-vcs/breezy/breezy-3.2.1-r1.ebuild
 2012231444 ./dev-vcs/colorcvs/colorcvs-1.4-r2.ebuild
@@ -17039,7 +16876,7 @@
 2101070210 ./dev-vcs/cssc/cssc-1.4.1.ebuild
 2105292209 ./dev-vcs/cvs-fast-export/cvs-fast-export-1.57.ebuild
 2202151739 ./dev-vcs/cvs-fast-export/cvs-fast-export-1.59.ebuild
-2205010512 ./dev-vcs/cvs/cvs-1.12.12-r14.ebuild
+2206161940 ./dev-vcs/cvs/cvs-1.12.12-r14.ebuild
 1902111809 ./dev-vcs/cvs2cl/cvs2cl-2.71-r1.ebuild
 2002230040 ./dev-vcs/cvsgraph/cvsgraph-1.7.0.ebuild
 2109281609 ./dev-vcs/cvsps/cvsps-3.13-r2.ebuild
@@ -17091,6 +16928,7 @@
 2206110940 ./dev-vcs/git/git-9999-r2.ebuild
 2206110940 ./dev-vcs/git/git-9999-r3.ebuild
 2206110940 ./dev-vcs/git/git-9999.ebuild
+2206161440 ./dev-vcs/git/git-2.37.0_rc0.ebuild
 2202101509 ./dev-vcs/gitg/gitg-41.ebuild
 2107140109 ./dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.1-r2.ebuild
 2201170309 ./dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1-r2.ebuild
@@ -17133,8 +16971,8 @@
 2202152039 ./dev-vcs/rsvndump/rsvndump-0.6.1.ebuild
 2203110039 ./dev-vcs/rsvndump/rsvndump-0.6-r1.ebuild
 2205070310 ./dev-vcs/stgit/stgit-1.5.ebuild
-2206121141 ./dev-vcs/subversion/subversion-1.14.1.ebuild
 2206121141 ./dev-vcs/subversion/subversion-1.14.2-r1.ebuild
+2206161940 ./dev-vcs/subversion/subversion-1.14.1.ebuild
 1911100639 ./dev-vcs/svn2cl/svn2cl-0.12.ebuild
 2103040109 ./dev-vcs/svn2cl/svn2cl-0.14.ebuild
 1912111539 ./dev-vcs/svn2git/svn2git-1.0.16.ebuild
@@ -17215,7 +17053,7 @@
 2106240539 ./games-action/moon-buggy/moon-buggy-1.0.51-r2.ebuild
 2112120010 ./games-action/multimc-bin/multimc-bin-1.6.1-r1.ebuild
 2205200010 ./games-action/nighthawk/nighthawk-4.0.ebuild
-2106080739 ./games-action/noiz2sa/noiz2sa-0.51a-r1.ebuild
+2206160340 ./games-action/noiz2sa/noiz2sa-0.51a-r2.ebuild
 2108291409 ./games-action/orbital-eunuchs-sniper/orbital-eunuchs-sniper-1.30-r1.ebuild
 2106080739 ./games-action/postalplus/postalplus-1-r1.ebuild
 2106080739 ./games-action/powermanga/powermanga-0.93.1-r1.ebuild
@@ -17271,8 +17109,7 @@
 2104040939 ./games-arcade/bumprace/bumprace-1.5.3-r1.ebuild
 2108190409 ./games-arcade/burgerspace/burgerspace-1.9.3-r1.ebuild
 2112171109 ./games-arcade/cavezofphear/cavezofphear-0.5.1-r1.ebuild
-2112021639 ./games-arcade/cdogs-sdl/cdogs-sdl-1.2.0.ebuild
-2205030910 ./games-arcade/cdogs-sdl/cdogs-sdl-1.3.0.ebuild
+2206140340 ./games-arcade/cdogs-sdl/cdogs-sdl-1.3.1.ebuild
 2108070610 ./games-arcade/ceferino/ceferino-0.97.8-r3.ebuild
 2108022139 ./games-arcade/circuslinux/circuslinux-1.0.3-r2.ebuild
 1910111911 ./games-arcade/cob/cob-0.9-r1.ebuild
@@ -17434,6 +17271,7 @@
 2204202009 ./games-board/stockfish/stockfish-15-r1.ebuild
 1802210308 ./games-board/tablebase-syzygy/tablebase-syzygy-0_pre20131213-r100.ebuild
 1801290438 ./games-board/tablebase-syzygy/tablebase-syzygy-0_pre20131213.ebuild
+2206151940 ./games-board/tablebase-syzygy/tablebase-syzygy-0_pre20131213-r101.ebuild
 2205280910 ./games-board/tali/tali-40.7.ebuild
 2002230040 ./games-board/tetzle/tetzle-2.1.3.ebuild
 2001220239 ./games-board/xboard/xboard-4.9.1.ebuild
@@ -17494,10 +17332,10 @@
 2201192009 ./games-emulation/mednafen/mednafen-1.29.0.ebuild
 2111301639 ./games-emulation/mednaffe/mednaffe-0.9.2.ebuild
 2104041339 ./games-emulation/mekanix/mekanix-070-r1.ebuild
-2109231709 ./games-emulation/mgba/mgba-0.9.2.ebuild
-2112182309 ./games-emulation/mgba/mgba-0.9.3.ebuild
-2112182309 ./games-emulation/mgba/mgba-9999.ebuild
-2206081540 ./games-emulation/mgba/mgba-0.9.3-r1.ebuild
+2206161940 ./games-emulation/mgba/mgba-0.9.2.ebuild
+2206161940 ./games-emulation/mgba/mgba-0.9.3-r1.ebuild
+2206161940 ./games-emulation/mgba/mgba-0.9.3.ebuild
+2206161940 ./games-emulation/mgba/mgba-9999.ebuild
 2106190039 ./games-emulation/mupen64plus-audio-sdl/mupen64plus-audio-sdl-2.5.9.ebuild
 2105211839 ./games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r2.ebuild
 2106190039 ./games-emulation/mupen64plus-input-sdl/mupen64plus-input-sdl-2.5.9.ebuild
@@ -17631,7 +17469,7 @@
 2104161439 ./games-fps/wolfgl/wolfgl-0.93-r2.ebuild
 2108190409 ./games-fps/worldofpadman/worldofpadman-1.6-r2.ebuild
 2112141209 ./games-fps/xonotic/xonotic-0.8.2.ebuild
-2204260740 ./games-fps/yamagi-quake2/yamagi-quake2-8.01.ebuild
+2206161210 ./games-fps/yamagi-quake2/yamagi-quake2-8.01.ebuild
 2202210209 ./games-fps/doom-data-gog/doom-data-gog-1.9.ebuild
 2202210209 ./games-fps/doom2-data-gog/doom2-data-gog-1.9.ebuild
 2202210209 ./games-fps/final-doom-data-gog/final-doom-data-gog-1.9.ebuild
@@ -18057,9 +17895,8 @@
 2001041839 ./games-util/mcrcon/mcrcon-0.7.1.ebuild
 2111010139 ./games-util/mcrcon/mcrcon-0.7.2.ebuild
 2202120239 ./games-util/nml/nml-0.6.1.ebuild
-2109081439 ./games-util/pyfa/pyfa-2.33.0.ebuild
-2109081439 ./games-util/pyfa/pyfa-2.37.0.ebuild
 2109081439 ./games-util/pyfa/pyfa-9999.ebuild
+2206162010 ./games-util/pyfa/pyfa-2.43.0.ebuild
 2002112051 ./games-util/qjoypad/qjoypad-4.3.1.ebuild
 2104212209 ./games-util/qstat/qstat-2.14.ebuild
 2203201710 ./games-util/sc-controller/sc-controller-0.4.8.6_p20211211.ebuild
@@ -18084,17 +17921,17 @@
 2202080810 ./gnome-base/dconf-editor/dconf-editor-3.38.3.ebuild
 2205190840 ./gnome-base/dconf/dconf-0.40.0.ebuild
 2108231509 ./gnome-base/gconf/gconf-3.2.6-r5.ebuild
-2205280910 ./gnome-base/gdm/gdm-42.0.ebuild
+2206161940 ./gnome-base/gdm/gdm-42.0.ebuild
 2203272210 ./gnome-base/gnome-applets/gnome-applets-3.44.0.ebuild
 2105261839 ./gnome-base/gnome-common/gnome-common-3.18.0-r1.ebuild
 2205280910 ./gnome-base/gnome-control-center/gnome-control-center-42.1.ebuild
 2205280010 ./gnome-base/gnome-control-center/gnome-control-center-42.2.ebuild
 2203131809 ./gnome-base/gnome-core-apps/gnome-core-apps-41.3.ebuild
 2203130309 ./gnome-base/gnome-core-libs/gnome-core-libs-41.3.ebuild
-2205280910 ./gnome-base/gnome-desktop/gnome-desktop-42.1-r300.ebuild
 2205280910 ./gnome-base/gnome-desktop/gnome-desktop-42.1-r400.ebuild
 2206021910 ./gnome-base/gnome-desktop/gnome-desktop-42.2-r300.ebuild
 2206021910 ./gnome-base/gnome-desktop/gnome-desktop-42.2-r400.ebuild
+2206161940 ./gnome-base/gnome-desktop/gnome-desktop-42.1-r300.ebuild
 2204110909 ./gnome-base/gnome-extra-apps/gnome-extra-apps-41.0.ebuild
 2204101939 ./gnome-base/gnome-flashback/gnome-flashback-3.44.0-r1.ebuild
 2205181110 ./gnome-base/gnome-keyring/gnome-keyring-40.0-r1.ebuild
@@ -18145,6 +17982,7 @@
 2205280910 ./gnome-extra/gnome-calculator/gnome-calculator-42.0.ebuild
 2205310340 ./gnome-extra/gnome-calculator/gnome-calculator-42.1.ebuild
 2205280910 ./gnome-extra/gnome-calendar/gnome-calendar-42.1.ebuild
+2206151910 ./gnome-extra/gnome-calendar/gnome-calendar-42.2.ebuild
 2205280910 ./gnome-extra/gnome-characters/gnome-characters-42.0.ebuild
 2205280440 ./gnome-extra/gnome-clocks/gnome-clocks-42.0.ebuild
 2108271839 ./gnome-extra/gnome-color-manager/gnome-color-manager-3.36.0.ebuild
@@ -18275,7 +18113,7 @@
 1708310022 ./gnustep-base/mknfonts/mknfonts-0.5-r2.ebuild
 2104192239 ./gnustep-base/mknfonts/mknfonts-0.5-r3.ebuild
 2110251109 ./gnustep-libs/cenonlibrary/cenonlibrary-4.0.0.ebuild
-2110292139 ./gnustep-libs/dbuskit/dbuskit-0.1.1-r1.ebuild
+2206161940 ./gnustep-libs/dbuskit/dbuskit-0.1.1-r1.ebuild
 2203230410 ./gnustep-libs/gsldap/gsldap-0.0.1_pre20070219-r1.ebuild
 2112111810 ./gnustep-libs/highlighterkit/highlighterkit-0.1.3-r1.ebuild
 1708310022 ./gnustep-libs/netclasses/netclasses-1.1.0.ebuild
@@ -18330,7 +18168,8 @@
 2106180939 ./gui-apps/wcm/wcm-0.7.0.ebuild
 2102101709 ./gui-apps/wcm/wcm-9999.ebuild
 2006111739 ./gui-apps/wf-recorder/wf-recorder-0.2.1-r1.ebuild
-2006111739 ./gui-apps/wf-recorder/wf-recorder-9999.ebuild
+2206152140 ./gui-apps/wf-recorder/wf-recorder-0.3.0-r1.ebuild
+2206152110 ./gui-apps/wf-recorder/wf-recorder-9999.ebuild
 2106180939 ./gui-apps/wf-shell/wf-shell-0.7.0.ebuild
 2011140009 ./gui-apps/wf-shell/wf-shell-9999.ebuild
 2203220439 ./gui-apps/wl-clipboard/wl-clipboard-9999.ebuild
@@ -18381,6 +18220,7 @@
 2205280910 ./gui-libs/libadwaita/libadwaita-1.1.1.ebuild
 2206011910 ./gui-libs/libadwaita/libadwaita-1.1.2.ebuild
 2205280910 ./gui-libs/gtksourceview/gtksourceview-5.4.1.ebuild
+2206140610 ./gui-libs/gtksourceview/gtksourceview-5.4.2.ebuild
 2205251440 ./gui-libs/xdg-desktop-portal-lxqt/xdg-desktop-portal-lxqt-0.2.0.ebuild
 2201140910 ./gui-wm/hikari/hikari-2.3.3.ebuild
 2205260910 ./gui-wm/sway/sway-1.7.ebuild
@@ -18841,245 +18681,165 @@
 2204222140 ./kde-apps/zeroconf-ioslave/zeroconf-ioslave-21.12.3.ebuild
 2206091440 ./kde-apps/zeroconf-ioslave/zeroconf-ioslave-22.04.2.ebuild
 2204290652 ./kde-frameworks/attica/attica-5.92.0.ebuild
-2205141440 ./kde-frameworks/attica/attica-5.94.0.ebuild
 2206122310 ./kde-frameworks/attica/attica-5.95.0.ebuild
 2204290652 ./kde-frameworks/baloo/baloo-5.92.0.ebuild
-2205141440 ./kde-frameworks/baloo/baloo-5.94.0.ebuild
 2206122310 ./kde-frameworks/baloo/baloo-5.95.0.ebuild
 2204290652 ./kde-frameworks/bluez-qt/bluez-qt-5.92.0.ebuild
-2205141440 ./kde-frameworks/bluez-qt/bluez-qt-5.94.0.ebuild
-2206122310 ./kde-frameworks/bluez-qt/bluez-qt-5.95.0.ebuild
+2206141610 ./kde-frameworks/bluez-qt/bluez-qt-5.95.0-r1.ebuild
 2204290652 ./kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.92.0.ebuild
-2205141440 ./kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.94.0.ebuild
 2206122310 ./kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.95.0.ebuild
 2204290652 ./kde-frameworks/breeze-icons/breeze-icons-5.92.0.ebuild
-2205141440 ./kde-frameworks/breeze-icons/breeze-icons-5.94.0.ebuild
 2206122310 ./kde-frameworks/breeze-icons/breeze-icons-5.95.0.ebuild
 2204290740 ./kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.92.0.ebuild
-2205190840 ./kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.94.0.ebuild
 2206122310 ./kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.95.0.ebuild
 2204290652 ./kde-frameworks/frameworkintegration/frameworkintegration-5.92.0.ebuild
-2205141440 ./kde-frameworks/frameworkintegration/frameworkintegration-5.94.0.ebuild
 2206122310 ./kde-frameworks/frameworkintegration/frameworkintegration-5.95.0.ebuild
 2204290652 ./kde-frameworks/kactivities-stats/kactivities-stats-5.92.0.ebuild
-2205141440 ./kde-frameworks/kactivities-stats/kactivities-stats-5.94.0.ebuild
 2206122310 ./kde-frameworks/kactivities-stats/kactivities-stats-5.95.0.ebuild
 2204290652 ./kde-frameworks/kactivities/kactivities-5.92.0.ebuild
-2205141440 ./kde-frameworks/kactivities/kactivities-5.94.0.ebuild
 2206122310 ./kde-frameworks/kactivities/kactivities-5.95.0.ebuild
 2204290652 ./kde-frameworks/kapidox/kapidox-5.92.0.ebuild
-2205141440 ./kde-frameworks/kapidox/kapidox-5.94.0.ebuild
 2206122310 ./kde-frameworks/kapidox/kapidox-5.95.0.ebuild
 2204290652 ./kde-frameworks/karchive/karchive-5.92.0.ebuild
-2205141440 ./kde-frameworks/karchive/karchive-5.94.0.ebuild
 2206122310 ./kde-frameworks/karchive/karchive-5.95.0.ebuild
 2204290652 ./kde-frameworks/kauth/kauth-5.92.0.ebuild
-2205141440 ./kde-frameworks/kauth/kauth-5.94.0.ebuild
 2206122310 ./kde-frameworks/kauth/kauth-5.95.0.ebuild
 2204290652 ./kde-frameworks/kbookmarks/kbookmarks-5.92.0.ebuild
-2205141440 ./kde-frameworks/kbookmarks/kbookmarks-5.94.0.ebuild
 2206122310 ./kde-frameworks/kbookmarks/kbookmarks-5.95.0.ebuild
 2204290652 ./kde-frameworks/kcalendarcore/kcalendarcore-5.92.0.ebuild
-2205141440 ./kde-frameworks/kcalendarcore/kcalendarcore-5.94.0.ebuild
 2206122310 ./kde-frameworks/kcalendarcore/kcalendarcore-5.95.0.ebuild
 2204290652 ./kde-frameworks/kcmutils/kcmutils-5.92.0-r1.ebuild
-2205141440 ./kde-frameworks/kcmutils/kcmutils-5.94.0.ebuild
 2206122310 ./kde-frameworks/kcmutils/kcmutils-5.95.0.ebuild
 2204290652 ./kde-frameworks/kcodecs/kcodecs-5.92.0.ebuild
-2205141440 ./kde-frameworks/kcodecs/kcodecs-5.94.0.ebuild
 2206122310 ./kde-frameworks/kcodecs/kcodecs-5.95.0.ebuild
 2204290652 ./kde-frameworks/kcompletion/kcompletion-5.92.0.ebuild
-2205141440 ./kde-frameworks/kcompletion/kcompletion-5.94.0.ebuild
 2206122310 ./kde-frameworks/kcompletion/kcompletion-5.95.0.ebuild
 2204290652 ./kde-frameworks/kconfig/kconfig-5.92.0.ebuild
-2205141440 ./kde-frameworks/kconfig/kconfig-5.94.0.ebuild
 2206122310 ./kde-frameworks/kconfig/kconfig-5.95.0.ebuild
 2204290652 ./kde-frameworks/kconfigwidgets/kconfigwidgets-5.92.0-r1.ebuild
-2205141440 ./kde-frameworks/kconfigwidgets/kconfigwidgets-5.94.0.ebuild
 2206122310 ./kde-frameworks/kconfigwidgets/kconfigwidgets-5.95.0.ebuild
 2204290652 ./kde-frameworks/kcontacts/kcontacts-5.92.0.ebuild
-2205141440 ./kde-frameworks/kcontacts/kcontacts-5.94.0.ebuild
 2206122310 ./kde-frameworks/kcontacts/kcontacts-5.95.0.ebuild
 2204290652 ./kde-frameworks/kcoreaddons/kcoreaddons-5.92.0.ebuild
-2205251440 ./kde-frameworks/kcoreaddons/kcoreaddons-5.94.0.ebuild
 2206122310 ./kde-frameworks/kcoreaddons/kcoreaddons-5.95.0.ebuild
 2206081840 ./kde-frameworks/kcrash/kcrash-5.92.0.ebuild
-2206081840 ./kde-frameworks/kcrash/kcrash-5.94.0.ebuild
 2206122310 ./kde-frameworks/kcrash/kcrash-5.95.0.ebuild
 2204290652 ./kde-frameworks/kdav/kdav-5.92.0.ebuild
-2205141440 ./kde-frameworks/kdav/kdav-5.94.0.ebuild
 2206122310 ./kde-frameworks/kdav/kdav-5.95.0.ebuild
 2204290652 ./kde-frameworks/kdbusaddons/kdbusaddons-5.92.0.ebuild
-2205141440 ./kde-frameworks/kdbusaddons/kdbusaddons-5.94.0.ebuild
 2206122310 ./kde-frameworks/kdbusaddons/kdbusaddons-5.95.0.ebuild
 2204290652 ./kde-frameworks/kdeclarative/kdeclarative-5.92.0.ebuild
-2205141440 ./kde-frameworks/kdeclarative/kdeclarative-5.94.0.ebuild
 2206122310 ./kde-frameworks/kdeclarative/kdeclarative-5.95.0.ebuild
 2204290652 ./kde-frameworks/kded/kded-5.92.0.ebuild
-2205141440 ./kde-frameworks/kded/kded-5.94.0.ebuild
 2206122310 ./kde-frameworks/kded/kded-5.95.0.ebuild
 2204290652 ./kde-frameworks/kdelibs4support/kdelibs4support-5.92.0.ebuild
-2205141440 ./kde-frameworks/kdelibs4support/kdelibs4support-5.94.0.ebuild
 2206122310 ./kde-frameworks/kdelibs4support/kdelibs4support-5.95.0.ebuild
 2204290652 ./kde-frameworks/kdesu/kdesu-5.92.0.ebuild
-2205141440 ./kde-frameworks/kdesu/kdesu-5.94.0.ebuild
 2206122310 ./kde-frameworks/kdesu/kdesu-5.95.0.ebuild
 2204290652 ./kde-frameworks/kdnssd/kdnssd-5.92.0.ebuild
-2205141440 ./kde-frameworks/kdnssd/kdnssd-5.94.0.ebuild
 2206122310 ./kde-frameworks/kdnssd/kdnssd-5.95.0.ebuild
 2204290652 ./kde-frameworks/kdoctools/kdoctools-5.92.0.ebuild
-2205141440 ./kde-frameworks/kdoctools/kdoctools-5.94.0.ebuild
 2206122310 ./kde-frameworks/kdoctools/kdoctools-5.95.0.ebuild
 2204290652 ./kde-frameworks/kemoticons/kemoticons-5.92.0.ebuild
-2205141440 ./kde-frameworks/kemoticons/kemoticons-5.94.0.ebuild
 2206122310 ./kde-frameworks/kemoticons/kemoticons-5.95.0.ebuild
 2205251440 ./kde-frameworks/kf-env/kf-env-5.ebuild
 2204290652 ./kde-frameworks/kfilemetadata/kfilemetadata-5.92.0.ebuild
-2205141440 ./kde-frameworks/kfilemetadata/kfilemetadata-5.94.0.ebuild
 2206122310 ./kde-frameworks/kfilemetadata/kfilemetadata-5.95.0.ebuild
 2204290652 ./kde-frameworks/kglobalaccel/kglobalaccel-5.92.0.ebuild
-2205141440 ./kde-frameworks/kglobalaccel/kglobalaccel-5.94.0.ebuild
 2206122310 ./kde-frameworks/kglobalaccel/kglobalaccel-5.95.0.ebuild
 2204290652 ./kde-frameworks/kguiaddons/kguiaddons-5.92.0.ebuild
-2205141440 ./kde-frameworks/kguiaddons/kguiaddons-5.94.0.ebuild
 2206122310 ./kde-frameworks/kguiaddons/kguiaddons-5.95.0.ebuild
 2204290652 ./kde-frameworks/kholidays/kholidays-5.92.0.ebuild
-2205141440 ./kde-frameworks/kholidays/kholidays-5.94.0.ebuild
 2206122310 ./kde-frameworks/kholidays/kholidays-5.95.0.ebuild
 2204290652 ./kde-frameworks/khtml/khtml-5.92.0.ebuild
-2205141440 ./kde-frameworks/khtml/khtml-5.94.0.ebuild
 2206122310 ./kde-frameworks/khtml/khtml-5.95.0.ebuild
 2204290652 ./kde-frameworks/ki18n/ki18n-5.92.0.ebuild
-2205141440 ./kde-frameworks/ki18n/ki18n-5.94.0.ebuild
 2206122310 ./kde-frameworks/ki18n/ki18n-5.95.0.ebuild
 2204290652 ./kde-frameworks/kiconthemes/kiconthemes-5.92.0.ebuild
-2205141440 ./kde-frameworks/kiconthemes/kiconthemes-5.94.0.ebuild
 2206122310 ./kde-frameworks/kiconthemes/kiconthemes-5.95.0.ebuild
 2204290652 ./kde-frameworks/kidletime/kidletime-5.92.0-r1.ebuild
-2205141440 ./kde-frameworks/kidletime/kidletime-5.94.0.ebuild
 2206122310 ./kde-frameworks/kidletime/kidletime-5.95.0.ebuild
 2204290652 ./kde-frameworks/kimageformats/kimageformats-5.92.0-r2.ebuild
-2205141440 ./kde-frameworks/kimageformats/kimageformats-5.94.0.ebuild
 2206122310 ./kde-frameworks/kimageformats/kimageformats-5.95.0.ebuild
 2204290652 ./kde-frameworks/kinit/kinit-5.92.0.ebuild
-2205141440 ./kde-frameworks/kinit/kinit-5.94.0.ebuild
 2206122310 ./kde-frameworks/kinit/kinit-5.95.0.ebuild
 2204290652 ./kde-frameworks/kio/kio-5.92.0.ebuild
-2205141440 ./kde-frameworks/kio/kio-5.94.0.ebuild
 2206122310 ./kde-frameworks/kio/kio-5.95.0.ebuild
 2204290652 ./kde-frameworks/kirigami/kirigami-5.92.0-r1.ebuild
-2205141440 ./kde-frameworks/kirigami/kirigami-5.94.0.ebuild
 2206122310 ./kde-frameworks/kirigami/kirigami-5.95.0.ebuild
 2204290652 ./kde-frameworks/kitemmodels/kitemmodels-5.92.0.ebuild
-2205141440 ./kde-frameworks/kitemmodels/kitemmodels-5.94.0.ebuild
 2206122310 ./kde-frameworks/kitemmodels/kitemmodels-5.95.0.ebuild
 2204290652 ./kde-frameworks/kitemviews/kitemviews-5.92.0.ebuild
-2205141440 ./kde-frameworks/kitemviews/kitemviews-5.94.0.ebuild
 2206122310 ./kde-frameworks/kitemviews/kitemviews-5.95.0.ebuild
 2204290652 ./kde-frameworks/kjobwidgets/kjobwidgets-5.92.0.ebuild
-2205141440 ./kde-frameworks/kjobwidgets/kjobwidgets-5.94.0.ebuild
 2206122310 ./kde-frameworks/kjobwidgets/kjobwidgets-5.95.0.ebuild
 2204290652 ./kde-frameworks/kjs/kjs-5.92.0.ebuild
-2205141440 ./kde-frameworks/kjs/kjs-5.94.0.ebuild
 2206122310 ./kde-frameworks/kjs/kjs-5.95.0.ebuild
 2204290652 ./kde-frameworks/knewstuff/knewstuff-5.92.0-r2.ebuild
-2205301940 ./kde-frameworks/knewstuff/knewstuff-5.94.0-r1.ebuild
 2206122310 ./kde-frameworks/knewstuff/knewstuff-5.95.0.ebuild
 2204290652 ./kde-frameworks/knotifications/knotifications-5.92.0.ebuild
-2205141440 ./kde-frameworks/knotifications/knotifications-5.94.0.ebuild
 2206122310 ./kde-frameworks/knotifications/knotifications-5.95.0.ebuild
 2204290652 ./kde-frameworks/knotifyconfig/knotifyconfig-5.92.0.ebuild
-2205141440 ./kde-frameworks/knotifyconfig/knotifyconfig-5.94.0.ebuild
 2206122310 ./kde-frameworks/knotifyconfig/knotifyconfig-5.95.0.ebuild
 2204290652 ./kde-frameworks/kpackage/kpackage-5.92.0.ebuild
-2205141440 ./kde-frameworks/kpackage/kpackage-5.94.0.ebuild
 2206122310 ./kde-frameworks/kpackage/kpackage-5.95.0.ebuild
 2204290652 ./kde-frameworks/kparts/kparts-5.92.0.ebuild
-2205141440 ./kde-frameworks/kparts/kparts-5.94.0.ebuild
 2206122310 ./kde-frameworks/kparts/kparts-5.95.0.ebuild
 2204290652 ./kde-frameworks/kpeople/kpeople-5.92.0.ebuild
-2205141440 ./kde-frameworks/kpeople/kpeople-5.94.0.ebuild
 2206122310 ./kde-frameworks/kpeople/kpeople-5.95.0.ebuild
 2204290652 ./kde-frameworks/kplotting/kplotting-5.92.0.ebuild
-2205141440 ./kde-frameworks/kplotting/kplotting-5.94.0.ebuild
 2206122310 ./kde-frameworks/kplotting/kplotting-5.95.0.ebuild
 2204290652 ./kde-frameworks/kpty/kpty-5.92.0.ebuild
-2205141440 ./kde-frameworks/kpty/kpty-5.94.0.ebuild
 2206122310 ./kde-frameworks/kpty/kpty-5.95.0.ebuild
 2204290652 ./kde-frameworks/kquickcharts/kquickcharts-5.92.0.ebuild
-2205141440 ./kde-frameworks/kquickcharts/kquickcharts-5.94.0.ebuild
 2206122310 ./kde-frameworks/kquickcharts/kquickcharts-5.95.0.ebuild
 2204290652 ./kde-frameworks/kross/kross-5.92.0.ebuild
-2205141440 ./kde-frameworks/kross/kross-5.94.0.ebuild
 2206122310 ./kde-frameworks/kross/kross-5.95.0.ebuild
 2204290652 ./kde-frameworks/krunner/krunner-5.92.0.ebuild
-2205141440 ./kde-frameworks/krunner/krunner-5.94.0.ebuild
 2206122310 ./kde-frameworks/krunner/krunner-5.95.0.ebuild
 2204290652 ./kde-frameworks/kservice/kservice-5.92.0.ebuild
-2205141440 ./kde-frameworks/kservice/kservice-5.94.0.ebuild
 2206122310 ./kde-frameworks/kservice/kservice-5.95.0.ebuild
 2204290652 ./kde-frameworks/ktexteditor/ktexteditor-5.92.0-r1.ebuild
-2205141440 ./kde-frameworks/ktexteditor/ktexteditor-5.94.0.ebuild
 2206122310 ./kde-frameworks/ktexteditor/ktexteditor-5.95.0.ebuild
 2204290652 ./kde-frameworks/ktextwidgets/ktextwidgets-5.92.0.ebuild
-2205141440 ./kde-frameworks/ktextwidgets/ktextwidgets-5.94.0.ebuild
 2206122310 ./kde-frameworks/ktextwidgets/ktextwidgets-5.95.0.ebuild
 2204290652 ./kde-frameworks/kunitconversion/kunitconversion-5.92.0.ebuild
-2205141440 ./kde-frameworks/kunitconversion/kunitconversion-5.94.0.ebuild
 2206122310 ./kde-frameworks/kunitconversion/kunitconversion-5.95.0.ebuild
 2204290652 ./kde-frameworks/kwallet/kwallet-5.92.0.ebuild
-2205141440 ./kde-frameworks/kwallet/kwallet-5.94.0.ebuild
 2206122310 ./kde-frameworks/kwallet/kwallet-5.95.0.ebuild
 2204290652 ./kde-frameworks/kwayland/kwayland-5.92.0.ebuild
-2205251440 ./kde-frameworks/kwayland/kwayland-5.94.0.ebuild
 2206122310 ./kde-frameworks/kwayland/kwayland-5.95.0.ebuild
 2204290652 ./kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.92.0.ebuild
-2205141440 ./kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.94.0.ebuild
 2206122310 ./kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.95.0.ebuild
 2204290652 ./kde-frameworks/kwindowsystem/kwindowsystem-5.92.0.ebuild
-2205251440 ./kde-frameworks/kwindowsystem/kwindowsystem-5.94.0.ebuild
 2206122310 ./kde-frameworks/kwindowsystem/kwindowsystem-5.95.0.ebuild
 2204290652 ./kde-frameworks/kxmlgui/kxmlgui-5.92.0.ebuild
-2205141440 ./kde-frameworks/kxmlgui/kxmlgui-5.94.0.ebuild
 2206122310 ./kde-frameworks/kxmlgui/kxmlgui-5.95.0.ebuild
 2204290652 ./kde-frameworks/modemmanager-qt/modemmanager-qt-5.92.0.ebuild
-2205141440 ./kde-frameworks/modemmanager-qt/modemmanager-qt-5.94.0.ebuild
 2206122310 ./kde-frameworks/modemmanager-qt/modemmanager-qt-5.95.0.ebuild
 2204290652 ./kde-frameworks/networkmanager-qt/networkmanager-qt-5.92.0.ebuild
-2205141440 ./kde-frameworks/networkmanager-qt/networkmanager-qt-5.94.0.ebuild
 2206122310 ./kde-frameworks/networkmanager-qt/networkmanager-qt-5.95.0.ebuild
 2204290652 ./kde-frameworks/oxygen-icons/oxygen-icons-5.92.0.ebuild
-2205251440 ./kde-frameworks/oxygen-icons/oxygen-icons-5.94.0.ebuild
 2206122310 ./kde-frameworks/oxygen-icons/oxygen-icons-5.95.0.ebuild
 2204290652 ./kde-frameworks/plasma/plasma-5.92.0-r2.ebuild
-2206130110 ./kde-frameworks/plasma/plasma-5.94.0.ebuild
-2206130110 ./kde-frameworks/plasma/plasma-5.95.0-r2.ebuild
+2206141610 ./kde-frameworks/plasma/plasma-5.95.0-r3.ebuild
 2204290652 ./kde-frameworks/prison/prison-5.92.0.ebuild
-2205141440 ./kde-frameworks/prison/prison-5.94.0.ebuild
 2206122310 ./kde-frameworks/prison/prison-5.95.0.ebuild
 2204290652 ./kde-frameworks/purpose/purpose-5.92.0.ebuild
-2205141440 ./kde-frameworks/purpose/purpose-5.94.0.ebuild
 2206122310 ./kde-frameworks/purpose/purpose-5.95.0.ebuild
 2204290652 ./kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.92.0.ebuild
-2205141440 ./kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.94.0.ebuild
 2206122310 ./kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.95.0.ebuild
 2204290652 ./kde-frameworks/solid/solid-5.92.0.ebuild
-2205251440 ./kde-frameworks/solid/solid-5.94.0.ebuild
 2206122310 ./kde-frameworks/solid/solid-5.95.0.ebuild
 2204290652 ./kde-frameworks/sonnet/sonnet-5.92.0.ebuild
-2205141440 ./kde-frameworks/sonnet/sonnet-5.94.0.ebuild
 2206122310 ./kde-frameworks/sonnet/sonnet-5.95.0.ebuild
 2204290652 ./kde-frameworks/syndication/syndication-5.92.0.ebuild
-2205141440 ./kde-frameworks/syndication/syndication-5.94.0.ebuild
 2206122310 ./kde-frameworks/syndication/syndication-5.95.0.ebuild
 2204290652 ./kde-frameworks/syntax-highlighting/syntax-highlighting-5.92.0-r1.ebuild
-2205141440 ./kde-frameworks/syntax-highlighting/syntax-highlighting-5.94.0.ebuild
 2206122310 ./kde-frameworks/syntax-highlighting/syntax-highlighting-5.95.0.ebuild
 2204290652 ./kde-frameworks/threadweaver/threadweaver-5.92.0.ebuild
-2205141440 ./kde-frameworks/threadweaver/threadweaver-5.94.0.ebuild
 2206122310 ./kde-frameworks/threadweaver/threadweaver-5.95.0.ebuild
 2204290652 ./kde-frameworks/countryflags/countryflags-5.92.0.ebuild
-2205141440 ./kde-frameworks/countryflags/countryflags-5.94.0.ebuild
 2206122310 ./kde-frameworks/countryflags/countryflags-5.95.0.ebuild
 2108211939 ./kde-misc/basket/basket-2.49b.ebuild
 2005162209 ./kde-misc/colord-kde/colord-kde-0.5.0-r2.ebuild
@@ -19117,60 +18877,112 @@
 2204222140 ./kde-misc/zanshin/zanshin-21.12.3.ebuild
 2206091440 ./kde-misc/zanshin/zanshin-22.04.2.ebuild
 2205282340 ./kde-plasma/bluedevil/bluedevil-5.24.5.ebuild
+2206141610 ./kde-plasma/bluedevil/bluedevil-5.25.0.ebuild
 2205282340 ./kde-plasma/breeze-grub/breeze-grub-5.24.5.ebuild
+2206141610 ./kde-plasma/breeze-grub/breeze-grub-5.25.0.ebuild
 2205282340 ./kde-plasma/breeze-gtk/breeze-gtk-5.24.5.ebuild
+2206141610 ./kde-plasma/breeze-gtk/breeze-gtk-5.25.0.ebuild
 2205282340 ./kde-plasma/breeze-plymouth/breeze-plymouth-5.24.5.ebuild
+2206141610 ./kde-plasma/breeze-plymouth/breeze-plymouth-5.25.0.ebuild
 2205282340 ./kde-plasma/breeze/breeze-5.24.5.ebuild
+2206141610 ./kde-plasma/breeze/breeze-5.25.0.ebuild
 2205282340 ./kde-plasma/discover/discover-5.24.5.ebuild
+2206141610 ./kde-plasma/discover/discover-5.25.0.ebuild
 2205282340 ./kde-plasma/drkonqi/drkonqi-5.24.5.ebuild
+2206141610 ./kde-plasma/drkonqi/drkonqi-5.25.0.ebuild
 2205282340 ./kde-plasma/kactivitymanagerd/kactivitymanagerd-5.24.5.ebuild
+2206141610 ./kde-plasma/kactivitymanagerd/kactivitymanagerd-5.25.0.ebuild
 2205282340 ./kde-plasma/kde-cli-tools/kde-cli-tools-5.24.5.ebuild
+2206141610 ./kde-plasma/kde-cli-tools/kde-cli-tools-5.25.0.ebuild
 2205282340 ./kde-plasma/kde-gtk-config/kde-gtk-config-5.24.5.ebuild
+2206141610 ./kde-plasma/kde-gtk-config/kde-gtk-config-5.25.0.ebuild
 2205282340 ./kde-plasma/kdecoration/kdecoration-5.24.5.ebuild
+2206141610 ./kde-plasma/kdecoration/kdecoration-5.25.0.ebuild
 2205282340 ./kde-plasma/kdeplasma-addons/kdeplasma-addons-5.24.5-r1.ebuild
+2206141610 ./kde-plasma/kdeplasma-addons/kdeplasma-addons-5.25.0.ebuild
 2205282340 ./kde-plasma/kgamma/kgamma-5.24.5.ebuild
+2206141610 ./kde-plasma/kgamma/kgamma-5.25.0.ebuild
 2205282340 ./kde-plasma/khotkeys/khotkeys-5.24.5.ebuild
+2206141610 ./kde-plasma/khotkeys/khotkeys-5.25.0.ebuild
 2205282340 ./kde-plasma/kinfocenter/kinfocenter-5.24.5.ebuild
+2206141610 ./kde-plasma/kinfocenter/kinfocenter-5.25.0.ebuild
 2205282340 ./kde-plasma/kmenuedit/kmenuedit-5.24.5.ebuild
+2206141610 ./kde-plasma/kmenuedit/kmenuedit-5.25.0.ebuild
 2205282340 ./kde-plasma/kscreen/kscreen-5.24.5-r1.ebuild
-2206101010 ./kde-plasma/kscreen/kscreen-5.24.5-r2.ebuild
+2206140040 ./kde-plasma/kscreen/kscreen-5.24.5-r2.ebuild
+2206141610 ./kde-plasma/kscreen/kscreen-5.25.0.ebuild
 2205282340 ./kde-plasma/kscreenlocker/kscreenlocker-5.24.5.ebuild
+2206141610 ./kde-plasma/kscreenlocker/kscreenlocker-5.25.0.ebuild
 2205282340 ./kde-plasma/ksshaskpass/ksshaskpass-5.24.5.ebuild
+2206141610 ./kde-plasma/ksshaskpass/ksshaskpass-5.25.0.ebuild
 2201250210 ./kde-plasma/ksysguard/ksysguard-5.22.0-r1.ebuild
 2205282340 ./kde-plasma/ksystemstats/ksystemstats-5.24.5.ebuild
+2206141610 ./kde-plasma/ksystemstats/ksystemstats-5.25.0.ebuild
 2205282340 ./kde-plasma/kwallet-pam/kwallet-pam-5.24.5.ebuild
+2206141610 ./kde-plasma/kwallet-pam/kwallet-pam-5.25.0.ebuild
 2205282340 ./kde-plasma/kwayland-integration/kwayland-integration-5.24.5.ebuild
+2206141610 ./kde-plasma/kwayland-integration/kwayland-integration-5.25.0.ebuild
 2205282340 ./kde-plasma/kwayland-server/kwayland-server-5.24.5-r1.ebuild
 2205282340 ./kde-plasma/kwin/kwin-5.24.5-r2.ebuild
+2206141610 ./kde-plasma/kwin/kwin-5.25.0.ebuild
 2205282340 ./kde-plasma/kwrited/kwrited-5.24.5.ebuild
+2206141610 ./kde-plasma/kwrited/kwrited-5.25.0.ebuild
 2205282340 ./kde-plasma/layer-shell-qt/layer-shell-qt-5.24.5.ebuild
+2206141610 ./kde-plasma/layer-shell-qt/layer-shell-qt-5.25.0.ebuild
 2205282340 ./kde-plasma/libkscreen/libkscreen-5.24.5.ebuild
+2206141610 ./kde-plasma/libkscreen/libkscreen-5.25.0.ebuild
 2205282340 ./kde-plasma/libksysguard/libksysguard-5.24.5-r1.ebuild
+2206141610 ./kde-plasma/libksysguard/libksysguard-5.25.0.ebuild
 2205282340 ./kde-plasma/libkworkspace/libkworkspace-5.24.5.ebuild
+2206141610 ./kde-plasma/libkworkspace/libkworkspace-5.25.0.ebuild
 2205282340 ./kde-plasma/milou/milou-5.24.5.ebuild
+2206141610 ./kde-plasma/milou/milou-5.25.0.ebuild
 2205282340 ./kde-plasma/oxygen/oxygen-5.24.5.ebuild
+2206141610 ./kde-plasma/oxygen/oxygen-5.25.0.ebuild
 2205282340 ./kde-plasma/plasma-browser-integration/plasma-browser-integration-5.24.5.ebuild
+2206141610 ./kde-plasma/plasma-browser-integration/plasma-browser-integration-5.25.0.ebuild
 2205282340 ./kde-plasma/plasma-desktop/plasma-desktop-5.24.5.ebuild
+2206141610 ./kde-plasma/plasma-desktop/plasma-desktop-5.25.0.ebuild
 2205282340 ./kde-plasma/plasma-disks/plasma-disks-5.24.5.ebuild
+2206141610 ./kde-plasma/plasma-disks/plasma-disks-5.25.0.ebuild
 2205282340 ./kde-plasma/plasma-firewall/plasma-firewall-5.24.5.ebuild
+2206141610 ./kde-plasma/plasma-firewall/plasma-firewall-5.25.0.ebuild
 2205282340 ./kde-plasma/plasma-integration/plasma-integration-5.24.5.ebuild
+2206141610 ./kde-plasma/plasma-integration/plasma-integration-5.25.0.ebuild
 2205282340 ./kde-plasma/plasma-meta/plasma-meta-5.24.5.ebuild
+2206141610 ./kde-plasma/plasma-meta/plasma-meta-5.25.0.ebuild
 2205282340 ./kde-plasma/plasma-nm/plasma-nm-5.24.5.ebuild
+2206141610 ./kde-plasma/plasma-nm/plasma-nm-5.25.0.ebuild
 2205282340 ./kde-plasma/plasma-pa/plasma-pa-5.24.5.ebuild
+2206141610 ./kde-plasma/plasma-pa/plasma-pa-5.25.0.ebuild
 2205282340 ./kde-plasma/plasma-sdk/plasma-sdk-5.24.5.ebuild
+2206141610 ./kde-plasma/plasma-sdk/plasma-sdk-5.25.0.ebuild
 2205282340 ./kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.24.5.ebuild
+2206141610 ./kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.25.0.ebuild
 2205281010 ./kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.24.5.ebuild
+2206141610 ./kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.25.0.ebuild
 2205282340 ./kde-plasma/plasma-vault/plasma-vault-5.24.5.ebuild
+2206141610 ./kde-plasma/plasma-vault/plasma-vault-5.25.0.ebuild
 2205282340 ./kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.24.5.ebuild
+2206141610 ./kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.25.0.ebuild
 2205282340 ./kde-plasma/plasma-workspace/plasma-workspace-5.24.5-r1.ebuild
+2206141610 ./kde-plasma/plasma-workspace/plasma-workspace-5.25.0.ebuild
 2205282340 ./kde-plasma/plymouth-kcm/plymouth-kcm-5.24.5.ebuild
+2206141610 ./kde-plasma/plymouth-kcm/plymouth-kcm-5.25.0.ebuild
 2205282340 ./kde-plasma/polkit-kde-agent/polkit-kde-agent-5.24.5.ebuild
+2206141610 ./kde-plasma/polkit-kde-agent/polkit-kde-agent-5.25.0.ebuild
 2205282340 ./kde-plasma/powerdevil/powerdevil-5.24.5.ebuild
+2206141610 ./kde-plasma/powerdevil/powerdevil-5.25.0.ebuild
 2205282340 ./kde-plasma/sddm-kcm/sddm-kcm-5.24.5.ebuild
+2206141610 ./kde-plasma/sddm-kcm/sddm-kcm-5.25.0.ebuild
 2205282340 ./kde-plasma/systemsettings/systemsettings-5.24.5-r1.ebuild
+2206141610 ./kde-plasma/systemsettings/systemsettings-5.25.0.ebuild
 2205282340 ./kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.5-r1.ebuild
-2206101010 ./kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.5-r2.ebuild
+2206140040 ./kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.5-r2.ebuild
+2206141610 ./kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.25.0.ebuild
 2205282340 ./kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.24.5.ebuild
+2206141610 ./kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.25.0.ebuild
+2206141610 ./kde-plasma/oxygen-sounds/oxygen-sounds-5.25.0.ebuild
 2107230909 ./lxde-base/lxappearance-obconf/lxappearance-obconf-0.2.3-r1.ebuild
 2201162040 ./lxde-base/lxappearance/lxappearance-0.6.3-r2.ebuild
 2107211809 ./lxde-base/lxde-common/lxde-common-0.99.2-r1.ebuild
@@ -19264,12 +19076,12 @@
 2204290210 ./mail-client/mutt/mutt-2.2.3.ebuild
 2205251510 ./mail-client/mutt/mutt-2.2.5.ebuild
 2206061542 ./mail-client/mutt/mutt-2.2.6.ebuild
-2204260540 ./mail-client/neomutt/neomutt-20211029-r1.ebuild
-2204260540 ./mail-client/neomutt/neomutt-20211029.ebuild
-2204260540 ./mail-client/neomutt/neomutt-20220408.ebuild
-2204260540 ./mail-client/neomutt/neomutt-20220415.ebuild
-2204260540 ./mail-client/neomutt/neomutt-99999999.ebuild
-2204292140 ./mail-client/neomutt/neomutt-20220429.ebuild
+2206161940 ./mail-client/neomutt/neomutt-20211029-r1.ebuild
+2206161940 ./mail-client/neomutt/neomutt-20211029.ebuild
+2206161940 ./mail-client/neomutt/neomutt-20220408.ebuild
+2206161940 ./mail-client/neomutt/neomutt-20220415.ebuild
+2206161940 ./mail-client/neomutt/neomutt-20220429.ebuild
+2206161940 ./mail-client/neomutt/neomutt-99999999.ebuild
 2104180939 ./mail-client/novell-groupwise-client/novell-groupwise-client-8.0.2.96933-r1.ebuild
 2110191709 ./mail-client/roundcube/roundcube-1.4.11.ebuild
 2110191709 ./mail-client/roundcube/roundcube-1.5.0.ebuild
@@ -19277,6 +19089,7 @@
 2112312039 ./mail-client/roundcube/roundcube-1.5.2.ebuild
 2203071910 ./mail-client/roundcube/roundcube-1.6_beta.ebuild
 2203071910 ./mail-client/roundcube/roundcube-9999.ebuild
+2206131710 ./mail-client/roundcube/roundcube-1.6_rc.ebuild
 2203200310 ./mail-client/s-nail/s-nail-14.9.22.ebuild
 2205140940 ./mail-client/s-nail/s-nail-14.9.24.ebuild
 2206121640 ./mail-client/sylpheed/sylpheed-3.7.0-r4.ebuild
@@ -19572,7 +19385,7 @@
 2205251140 ./media-fonts/mikachan-font-ttc/mikachan-font-ttc-9.1.ebuild
 2205251140 ./media-fonts/mikachan-font-ttf/mikachan-font-ttf-8.9-r2.ebuild
 2205251140 ./media-fonts/mix-mplus-ipa/mix-mplus-ipa-20130617-r1.ebuild
-2205251140 ./media-fonts/monafont/monafont-2.90-r2.ebuild
+2206161940 ./media-fonts/monafont/monafont-2.90-r2.ebuild
 2205251140 ./media-fonts/monoid/monoid-0.61.ebuild
 2205251140 ./media-fonts/montecarlo/montecarlo-0-r1.ebuild
 2205251140 ./media-fonts/mplus-fonts/mplus-fonts-2.2.4-r1.ebuild
@@ -19674,24 +19487,23 @@
 2109272239 ./media-gfx/argyllcms/argyllcms-2.2.1.ebuild
 2205181110 ./media-gfx/argyllcms/argyllcms-2.3.0.ebuild
 2011261339 ./media-gfx/arss/arss-0.2.3-r1.ebuild
-2108120640 ./media-gfx/asymptote/asymptote-2.70-r1.ebuild
-2202021039 ./media-gfx/asymptote/asymptote-2.77.ebuild
 2204061709 ./media-gfx/asymptote/asymptote-2.80.ebuild
 2206091110 ./media-gfx/asymptote/asymptote-2.78.ebuild
 2102281539 ./media-gfx/autopano-sift-C/autopano-sift-C-2.5.1.ebuild
 1912131839 ./media-gfx/aview/aview-1.3.0_rc1-r3.ebuild
-2203142209 ./media-gfx/blender/blender-2.93.0-r1.ebuild
-2203142209 ./media-gfx/blender/blender-2.93.6.ebuild
-2203142209 ./media-gfx/blender/blender-2.93.8-r4.ebuild
-2203142209 ./media-gfx/blender/blender-2.93.8-r5.ebuild
-2203142209 ./media-gfx/blender/blender-3.0.0-r1.ebuild
-2203142209 ./media-gfx/blender/blender-3.0.1-r4.ebuild
-2203142209 ./media-gfx/blender/blender-3.1.0.ebuild
-2204010340 ./media-gfx/blender/blender-3.1.1.ebuild
-2205201440 ./media-gfx/blender/blender-3.0.1-r5.ebuild
-2205201440 ./media-gfx/blender/blender-3.1.2.ebuild
-2205201440 ./media-gfx/blender/blender-9999.ebuild
-2206071340 ./media-gfx/blender/blender-2.93.9.ebuild
+2206161940 ./media-gfx/blender/blender-2.93.0-r1.ebuild
+2206161940 ./media-gfx/blender/blender-2.93.6.ebuild
+2206161940 ./media-gfx/blender/blender-2.93.8-r4.ebuild
+2206161940 ./media-gfx/blender/blender-2.93.8-r5.ebuild
+2206161940 ./media-gfx/blender/blender-2.93.9.ebuild
+2206161940 ./media-gfx/blender/blender-3.0.0-r1.ebuild
+2206161940 ./media-gfx/blender/blender-3.0.1-r4.ebuild
+2206161940 ./media-gfx/blender/blender-3.0.1-r5.ebuild
+2206161940 ./media-gfx/blender/blender-3.1.0.ebuild
+2206161940 ./media-gfx/blender/blender-3.1.1.ebuild
+2206161940 ./media-gfx/blender/blender-3.1.2.ebuild
+2206160410 ./media-gfx/blender/blender-3.2.0.ebuild
+2206161940 ./media-gfx/blender/blender-9999.ebuild
 2202201939 ./media-gfx/brscan4/brscan4-0.4.11.1-r1.ebuild
 2203141339 ./media-gfx/cairosvg/cairosvg-2.5.2.ebuild
 2011041109 ./media-gfx/cellwriter/cellwriter-1.3.6.ebuild
@@ -19740,13 +19552,8 @@
 2110310339 ./media-gfx/fbida/fbida-2.14-r3.ebuild
 2009051239 ./media-gfx/fbida/fbida-9999.ebuild
 2205082310 ./media-gfx/fdm-materials/fdm-materials-4.13.0.ebuild
-2102070439 ./media-gfx/feh/feh-3.6.1.ebuild
-2103112339 ./media-gfx/feh/feh-3.6.2.ebuild
-2103281609 ./media-gfx/feh/feh-3.6.3.ebuild
-2101060009 ./media-gfx/feh/feh-3.6.ebuild
-2108200039 ./media-gfx/feh/feh-3.7.1.ebuild
-2105270009 ./media-gfx/feh/feh-3.7.ebuild
 2201240710 ./media-gfx/feh/feh-3.7.2.ebuild
+2206161510 ./media-gfx/feh/feh-3.9-r1.ebuild
 2101021609 ./media-gfx/figurine/figurine-1.0.5-r1.ebuild
 2106162209 ./media-gfx/fim/fim-0.5_rc3.ebuild
 2106040039 ./media-gfx/flam3/flam3-3.1.1.ebuild
@@ -19779,6 +19586,7 @@
 2205150410 ./media-gfx/gimp/gimp-2.10.30.ebuild
 2205150410 ./media-gfx/gimp/gimp-2.99.10-r1.ebuild
 2205150410 ./media-gfx/gimp/gimp-9999.ebuild
+2206160010 ./media-gfx/gimp/gimp-2.10.32.ebuild
 2205150040 ./media-gfx/gmic/gmic-3.0.1-r1.ebuild
 2102270009 ./media-gfx/gnofract4d/gnofract4d-4.3_p20201029.ebuild
 2111120512 ./media-gfx/gnofract4d/gnofract4d-4.3_p20211108.ebuild
@@ -19793,8 +19601,8 @@
 1912131839 ./media-gfx/gphotofs/gphotofs-0.5-r1.ebuild
 2108261809 ./media-gfx/gpicview/gpicview-0.2.5-r2.ebuild
 2205150040 ./media-gfx/graphicsmagick/graphicsmagick-1.3.37.ebuild
-2205150040 ./media-gfx/graphicsmagick/graphicsmagick-1.3.38.ebuild
 2205150040 ./media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
+2206151740 ./media-gfx/graphicsmagick/graphicsmagick-1.3.38.ebuild
 2206070040 ./media-gfx/graphite2/graphite2-1.3.14_p20210810-r1.ebuild
 2204122110 ./media-gfx/graphviz/graphviz-2.49.0-r1.ebuild
 2206071015 ./media-gfx/graphviz/graphviz-2.50.0.ebuild
@@ -19845,7 +19653,7 @@
 1902162309 ./media-gfx/jigl/jigl-2.0.1-r1.ebuild
 2101061739 ./media-gfx/jp2a/jp2a-1.0.6-r1.ebuild
 2203261009 ./media-gfx/jp2a/jp2a-1.1.1.ebuild
-1911131109 ./media-gfx/jpeg2ps/jpeg2ps-1.9-r2.ebuild
+2206151210 ./media-gfx/jpeg2ps/jpeg2ps-1.9-r3.ebuild
 2002112051 ./media-gfx/jpeginfo/jpeginfo-1.6.1-r1.ebuild
 1904012039 ./media-gfx/jpegoptim/jpegoptim-1.4.6.ebuild
 1805292338 ./media-gfx/jpegpixi/jpegpixi-1.1.1.ebuild
@@ -19854,8 +19662,7 @@
 2111151640 ./media-gfx/kgeotag/kgeotag-1.2.0.ebuild
 2011252009 ./media-gfx/kgraphviewer/kgraphviewer-2.4.3-r1.ebuild
 2109302039 ./media-gfx/kphotoalbum/kphotoalbum-5.8.1.ebuild
-2202281039 ./media-gfx/krita/krita-5.0.2.ebuild
-2206011440 ./media-gfx/krita/krita-5.0.8.ebuild
+2206150040 ./media-gfx/krita/krita-5.0.8.ebuild
 2107141739 ./media-gfx/kuickshow/kuickshow-0.10.2.ebuild
 2105161410 ./media-gfx/kxstitch/kxstitch-2.2.0.ebuild
 2205161140 ./media-gfx/libimagequant/libimagequant-2.15.1.ebuild
@@ -19924,8 +19731,8 @@
 1912131839 ./media-gfx/pngtools/pngtools-0.4-r2.ebuild
 2004282239 ./media-gfx/potrace/potrace-1.15.ebuild
 2205171610 ./media-gfx/potrace/potrace-1.16.ebuild
-2204280110 ./media-gfx/povray/povray-3.7.0.0-r1.ebuild
-2204280110 ./media-gfx/povray/povray-3.7.0.0-r2.ebuild
+2206161940 ./media-gfx/povray/povray-3.7.0.0-r1.ebuild
+2206161940 ./media-gfx/povray/povray-3.7.0.0-r2.ebuild
 2201041339 ./media-gfx/pqiv/pqiv-2.11.ebuild
 2201041339 ./media-gfx/pqiv/pqiv-9999.ebuild
 1805290208 ./media-gfx/pqstego/pqstego-0.0.1.ebuild
@@ -19977,7 +19784,7 @@
 1912111539 ./media-gfx/tuxpaint-stamps/tuxpaint-stamps-20090628-r1.ebuild
 2201160510 ./media-gfx/tuxpaint-stamps/tuxpaint-stamps-20211125.ebuild
 2108190409 ./media-gfx/tuxpaint/tuxpaint-0.9.24-r1.ebuild
-2203181140 ./media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild
+2206161940 ./media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild
 2101281609 ./media-gfx/valentina/valentina-0.6.1-r1.ebuild
 2012301109 ./media-gfx/valentina/valentina-9999.ebuild
 1708061128 ./media-gfx/viewer/viewer-0.8.0-r1.ebuild
@@ -20143,7 +19950,7 @@
 2203250639 ./media-libs/harfbuzz/harfbuzz-9999.ebuild
 2205020310 ./media-libs/harfbuzz/harfbuzz-3.4.0-r1.ebuild
 2205210040 ./media-libs/harfbuzz/harfbuzz-4.3.0.ebuild
-2206100640 ./media-libs/harfbuzz/harfbuzz-4.2.1.ebuild
+2206142110 ./media-libs/harfbuzz/harfbuzz-4.2.1.ebuild
 1911150539 ./media-libs/icc-profiles-basiccolor-printing2009/icc-profiles-basiccolor-printing2009-1.2.0.ebuild
 1911150609 ./media-libs/icc-profiles-openicc/icc-profiles-openicc-1.3.1.ebuild
 2011261339 ./media-libs/icclib/icclib-2.14.ebuild
@@ -20360,7 +20167,7 @@
 2106030210 ./media-libs/libpqstego/libpqstego-0.0.1-r1.ebuild
 2108211209 ./media-libs/libprojectm/libprojectm-3.1.12.ebuild
 2102162039 ./media-libs/libprojectm/libprojectm-9999.ebuild
-2206121141 ./media-libs/libpulse/libpulse-16.0.ebuild
+2206160110 ./media-libs/libpulse/libpulse-16.0.ebuild
 2109161539 ./media-libs/libqaccessibilityclient/libqaccessibilityclient-0.4.1.ebuild
 2108250339 ./media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
 2101240709 ./media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130-r100.ebuild
@@ -20427,9 +20234,9 @@
 2205192340 ./media-libs/mesa/mesa-22.0.4.ebuild
 2205190110 ./media-libs/mesa/mesa-22.1.0.ebuild
 2205280440 ./media-libs/mesa/mesa-22.0.3.ebuild
-2206020440 ./media-libs/mesa/mesa-22.0.5.ebuild
 2206020110 ./media-libs/mesa/mesa-22.1.1.ebuild
 2206020110 ./media-libs/mesa/mesa-9999.ebuild
+2206161840 ./media-libs/mesa/mesa-22.0.5.ebuild
 2204101640 ./media-libs/mlt/mlt-7.4.0.ebuild
 2204290740 ./media-libs/mlt/mlt-7.6.0.ebuild
 2204280110 ./media-libs/munt-mt32emu/munt-mt32emu-2.6.3.ebuild
@@ -20513,8 +20320,8 @@
 2202281039 ./media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
 2104031909 ./media-libs/sdl2-gfx/sdl2-gfx-1.0.4.ebuild
 2205191540 ./media-libs/sdl2-image/sdl2-image-2.0.5_p20210328.ebuild
-2103251639 ./media-libs/sdl2-mixer/sdl2-mixer-2.0.4.ebuild
-2112302339 ./media-libs/sdl2-mixer/sdl2-mixer-2.0.4-r1.ebuild
+2206161940 ./media-libs/sdl2-mixer/sdl2-mixer-2.0.4-r1.ebuild
+2206161940 ./media-libs/sdl2-mixer/sdl2-mixer-2.0.4.ebuild
 2109252209 ./media-libs/sdl2-net/sdl2-net-2.0.1.ebuild
 2111291109 ./media-libs/sdl2-ttf/sdl2-ttf-2.0.15.ebuild
 2201170309 ./media-libs/sdl2-ttf/sdl2-ttf-2.0.18-r1.ebuild
@@ -20577,7 +20384,7 @@
 2110310339 ./media-libs/waffle/waffle-9999.ebuild
 1902201609 ./media-libs/webrtc-audio-processing/webrtc-audio-processing-0.3.1.ebuild
 2109231739 ./media-libs/webrtc-audio-processing/webrtc-audio-processing-1.0.ebuild
-2205171640 ./media-libs/woff2/woff2-1.0.2-r5.ebuild
+2206161940 ./media-libs/woff2/woff2-1.0.2-r5.ebuild
 2108140709 ./media-libs/wxsvg/wxsvg-1.5.11-r1.ebuild
 2202281309 ./media-libs/wxsvg/wxsvg-1.5.23.ebuild
 2108100310 ./media-libs/x264/x264-0.0.20190903-r1.ebuild
@@ -20601,13 +20408,9 @@
 2108181239 ./media-libs/zita-resampler/zita-resampler-1.8.0.ebuild
 2011020109 ./media-libs/zmusic/zmusic-1.1.4.ebuild
 2112162140 ./media-libs/zvbi/zvbi-0.2.35-r2.ebuild
-2111140109 ./media-libs/zxing-cpp/zxing-cpp-1.2.0.ebuild
-2205151540 ./media-libs/zxing-cpp/zxing-cpp-1.3.0.ebuild
+2206151110 ./media-libs/zxing-cpp/zxing-cpp-1.3.0.ebuild
 2201020009 ./media-libs/cubeb/cubeb-0.2_p20211213.ebuild
-2205170910 ./media-libs/fcft/fcft-3.0.0.ebuild
-2205170910 ./media-libs/fcft/fcft-3.0.1.ebuild
-2205170910 ./media-libs/fcft/fcft-3.1.1.ebuild
-2205200440 ./media-libs/fcft/fcft-3.1.2.ebuild
+2206141040 ./media-libs/fcft/fcft-3.1.2-r1.ebuild
 2202050239 ./media-libs/rtmidi/rtmidi-5.0.0.ebuild
 2203261740 ./media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-21.50.1.1376756.ebuild
 2203261740 ./media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-21.50.2.1384496.ebuild
@@ -20615,10 +20418,10 @@
 2206031410 ./media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-22.10.3.1420322.ebuild
 2202190839 ./media-libs/amf-headers/amf-headers-1.4.23.ebuild
 2206031410 ./media-libs/amf-headers/amf-headers-1.4.24.ebuild
-2205221110 ./media-libs/libvmaf/libvmaf-2.3.0-r2.ebuild
-2204290652 ./media-libs/libjxl/libjxl-0.7.0_pre20220329.ebuild
+2206161940 ./media-libs/libvmaf/libvmaf-2.3.0-r2.ebuild
 2205140410 ./media-libs/libjxl/libjxl-0.7.0_pre20220511.ebuild
 2205140410 ./media-libs/libjxl/libjxl-9999.ebuild
+2206151740 ./media-libs/libjxl/libjxl-0.7.0_pre20220329.ebuild
 2204141010 ./media-libs/sdl_audiolib/sdl_audiolib-0_pre20220410.ebuild
 2204141010 ./media-libs/sdl_audiolib/sdl_audiolib-9999.ebuild
 2205122140 ./media-libs/mesa-amber/mesa-amber-21.3.8.ebuild
@@ -21144,6 +20947,7 @@
 2205220911 ./media-sound/abcmidi/abcmidi-2022.05.20.ebuild
 2206071140 ./media-sound/abcmidi/abcmidi-2022.05.05.ebuild
 2206081040 ./media-sound/abcmidi/abcmidi-2022.06.07.ebuild
+2206160710 ./media-sound/abcmidi/abcmidi-2022.06.14.ebuild
 2206121142 ./media-sound/aeolus/aeolus-0.10.4.ebuild
 2203202209 ./media-sound/alac_decoder/alac_decoder-0.2.0-r2.ebuild
 2204252340 ./media-sound/alsa-tools/alsa-tools-1.2.5.ebuild
@@ -21309,6 +21113,7 @@
 1911101439 ./media-sound/justeport/justeport-0.2.ebuild
 2201221309 ./media-sound/kid3/kid3-3.9.1.ebuild
 2105231339 ./media-sound/klick/klick-0.12.2-r2.ebuild
+2206161940 ./media-sound/klick/klick-0.12.2-r3.ebuild
 2201190109 ./media-sound/kmetronome/kmetronome-1.3.0.ebuild
 2205301010 ./media-sound/kmidimon/kmidimon-1.3.0.ebuild
 2205190840 ./media-sound/lame/lame-3.100-r3.ebuild
@@ -21338,8 +21143,8 @@
 2106070939 ./media-sound/mikmod/mikmod-3.2.8.ebuild
 2112130539 ./media-sound/milkytracker/milkytracker-1.03.00.ebuild
 2108170039 ./media-sound/mixxx/mixxx-9999.ebuild
-2201202009 ./media-sound/mixxx/mixxx-2.3.9999.ebuild
-2205101710 ./media-sound/mixxx/mixxx-2.3.2.ebuild
+2206161940 ./media-sound/mixxx/mixxx-2.3.2.ebuild
+2206161940 ./media-sound/mixxx/mixxx-2.3.9999.ebuild
 1906221809 ./media-sound/mmix/mmix-0.3-r1.ebuild
 2108170039 ./media-sound/moc/moc-2.5.2-r3.ebuild
 2112210710 ./media-sound/moc/moc-2.6_alpha3-r5.ebuild
@@ -21427,8 +21232,7 @@
 2008082009 ./media-sound/pitchtune/pitchtune-0.0.4.ebuild
 2206070513 ./media-sound/pithos/pithos-1.5.1-r1.ebuild
 2103071809 ./media-sound/playerctl/playerctl-2.3.1.ebuild
-2107180040 ./media-sound/pms/pms-0.42_p20170508-r1.ebuild
-2107180040 ./media-sound/pms/pms-9999.ebuild
+2206132010 ./media-sound/pms/pms-0.42_p20170508-r1.ebuild
 2103302139 ./media-sound/pnmixer/pnmixer-0.7.2-r1.ebuild
 1910171339 ./media-sound/poc/poc-0.4.1.ebuild
 1912130239 ./media-sound/podcatcher/podcatcher-3.1.6.ebuild
@@ -21442,7 +21246,8 @@
 2010071039 ./media-sound/pulseaudio-ctl/pulseaudio-ctl-1.68.ebuild
 2102201939 ./media-sound/pulseaudio-ctl/pulseaudio-ctl-1.69.ebuild
 2202210410 ./media-sound/pulseaudio-ctl/pulseaudio-ctl-1.70-r1.ebuild
-2206121142 ./media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r1.ebuild
+2206160110 ./media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r1.ebuild
+2206160240 ./media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r4.ebuild
 2203081640 ./media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4-r4.ebuild
 2203081640 ./media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4.ebuild
 2112290139 ./media-sound/pulseaudio/pulseaudio-15.0-r2.ebuild
@@ -21600,13 +21405,14 @@
 2111251909 ./media-tv/gtk-v4l/gtk-v4l-0.4-r1.ebuild
 1912131639 ./media-tv/ivtv-utils/ivtv-utils-1.4.1.ebuild
 1806021308 ./media-tv/ivtvplayer/ivtvplayer-0.1.3-r2.ebuild
-2112170439 ./media-tv/kodi/kodi-9999.ebuild
 2201241810 ./media-tv/kodi/kodi-19.0-r2.ebuild
 2201241810 ./media-tv/kodi/kodi-19.1-r2.ebuild
 2201241810 ./media-tv/kodi/kodi-19.2-r1.ebuild
 2201241810 ./media-tv/kodi/kodi-19.3-r1.ebuild
-2201241810 ./media-tv/kodi/kodi-19.9999.ebuild
 2206091040 ./media-tv/kodi/kodi-19.4.ebuild
+2206141710 ./media-tv/kodi/kodi-19.4-r1.ebuild
+2206141710 ./media-tv/kodi/kodi-19.9999.ebuild
+2206162010 ./media-tv/kodi/kodi-9999.ebuild
 2203200340 ./media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild
 2111251940 ./media-tv/mythtv-status/mythtv-status-1.0.1.ebuild
 2204110211 ./media-tv/mythtv/mythtv-31.0-r7.ebuild
@@ -21641,7 +21447,7 @@
 2111070309 ./media-video/avidemux/avidemux-2.7.8.ebuild
 1904221409 ./media-video/baka-mplayer/baka-mplayer-2.0.4.ebuild
 2001212239 ./media-video/baka-mplayer/baka-mplayer-9999.ebuild
-2112241040 ./media-video/baka-mplayer/baka-mplayer-2.0.4-r1.ebuild
+2206141140 ./media-video/baka-mplayer/baka-mplayer-2.0.4-r1.ebuild
 2001050939 ./media-video/bashnapi/bashnapi-2.0.0.ebuild
 2104180939 ./media-video/bbtools/bbtools-1.9.ebuild
 2104302039 ./media-video/bdsup2sub/bdsup2sub-4.0.0-r3.ebuild
@@ -21768,11 +21574,10 @@
 1911092239 ./media-video/pgmfindclip/pgmfindclip-1.13.ebuild
 2109240209 ./media-video/pipewire/pipewire-0.3.30-r2.ebuild
 2111150440 ./media-video/pipewire/pipewire-0.3.36.ebuild
-2205132310 ./media-video/pipewire/pipewire-0.3.49-r1.ebuild
-2205132310 ./media-video/pipewire/pipewire-0.3.50-r3.ebuild
-2205190840 ./media-video/pipewire/pipewire-0.3.51-r1.ebuild
-2206100410 ./media-video/pipewire/pipewire-0.3.52.ebuild
-2206100410 ./media-video/pipewire/pipewire-9999.ebuild
+2206160110 ./media-video/pipewire/pipewire-0.3.49-r2.ebuild
+2206160940 ./media-video/pipewire/pipewire-0.3.51-r2.ebuild
+2206160110 ./media-video/pipewire/pipewire-0.3.52-r1.ebuild
+2206160140 ./media-video/pipewire/pipewire-9999.ebuild
 2201061809 ./media-video/pitivi/pitivi-0.999-r5.ebuild
 2205310810 ./media-video/pitivi/pitivi-2021.05-r1.ebuild
 2203200340 ./media-video/projectx/projectx-0.91.0.10-r3.ebuild
@@ -21830,9 +21635,9 @@
 1911102109 ./media-video/vamps/vamps-0.99.2-r2.ebuild
 2108250339 ./media-video/vcdimager/vcdimager-2.0.1.ebuild
 2110081440 ./media-video/vcsi/vcsi-7.0.13.ebuild
-2106301339 ./media-video/vdr/vdr-2.2.0-r6.ebuild
-2106301339 ./media-video/vdr/vdr-2.2.0-r7.ebuild
-2107171739 ./media-video/vdr/vdr-2.4.7-r1.ebuild
+2206161940 ./media-video/vdr/vdr-2.2.0-r6.ebuild
+2206161940 ./media-video/vdr/vdr-2.2.0-r7.ebuild
+2206161940 ./media-video/vdr/vdr-2.4.7-r1.ebuild
 2110220239 ./media-video/vdr2jpeg/vdr2jpeg-0.2.0-r5.ebuild
 1911101209 ./media-video/vdrsync/vdrsync-0.1.3_pre050322-r1.ebuild
 2101241539 ./media-video/vdrsync/vdrsync-0.1.3_pre050322-r2.ebuild
@@ -21851,11 +21656,11 @@
 1909290609 ./media-video/vobcopy/vobcopy-1.2.0.ebuild
 2104180939 ./media-video/vstrip/vstrip-0.8f.ebuild
 2203081810 ./media-video/webcamoid/webcamoid-8.8.0.ebuild
-2204220109 ./media-video/wireplumber/wireplumber-0.4.9-r1.ebuild
-2204290910 ./media-video/wireplumber/wireplumber-0.4.9.ebuild
-2205190840 ./media-video/wireplumber/wireplumber-0.4.10-r1.ebuild
-2205300810 ./media-video/wireplumber/wireplumber-0.4.10-r3.ebuild
 2205300810 ./media-video/wireplumber/wireplumber-9999.ebuild
+2206161940 ./media-video/wireplumber/wireplumber-0.4.10-r1.ebuild
+2206160940 ./media-video/wireplumber/wireplumber-0.4.10-r3.ebuild
+2206161940 ./media-video/wireplumber/wireplumber-0.4.9-r1.ebuild
+2206161940 ./media-video/wireplumber/wireplumber-0.4.9.ebuild
 2201051309 ./media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild
 2203101609 ./media-video/x264-encoder/x264-encoder-0.0.20220222.ebuild
 2203101609 ./media-video/x264-encoder/x264-encoder-9999.ebuild
@@ -21865,8 +21670,8 @@
 2107180709 ./media-video/xvid4conf/xvid4conf-1.12.ebuild
 2206080940 ./media-video/yle-dl/yle-dl-20220531.ebuild
 2206111110 ./media-video/yle-dl/yle-dl-20220610.ebuild
-2112041709 ./media-video/jellyfin-media-player/jellyfin-media-player-1.6.1.ebuild
-2112260340 ./media-video/jellyfin-web-jmp-bin/jellyfin-web-jmp-bin-10.7.6.ebuild
+2206131810 ./media-video/jellyfin-media-player/jellyfin-media-player-1.7.0.ebuild
+2206131810 ./media-video/jellyfin-web-jmp-bin/jellyfin-web-jmp-bin-10.8.0.ebuild
 2205191410 ./media-video/popcorntime-bin/popcorntime-bin-0.4.7.ebuild
 2203141939 ./media-video/rage/rage-0.4.0-r1.ebuild
 2203261740 ./media-video/amdgpu-pro-amf/amdgpu-pro-amf-1.4.24.1376756-r1.ebuild
@@ -21987,7 +21792,6 @@
 2204130810 ./net-analyzer/hydra/hydra-9.3-r1.ebuild
 2107160439 ./net-analyzer/ibmonitor/ibmonitor-1.4-r1.ebuild
 2112292039 ./net-analyzer/icinga2/icinga2-9999.ebuild
-2201031909 ./net-analyzer/icinga2/icinga2-2.13.2-r3.ebuild
 2205172040 ./net-analyzer/icinga2/icinga2-2.13.3.ebuild
 2002112051 ./net-analyzer/ifmetric/ifmetric-0.3-r2.ebuild
 2202052109 ./net-analyzer/ifstat/ifstat-1.1-r2.ebuild
@@ -22001,7 +21805,7 @@
 2011270339 ./net-analyzer/ipband/ipband-0.8.1-r2.ebuild
 2111292209 ./net-analyzer/ipcad/ipcad-3.7.3.ebuild
 2004191309 ./net-analyzer/ipgen/ipgen-9999.ebuild
-2203202209 ./net-analyzer/ipguard/ipguard-1.04-r1.ebuild
+2206161940 ./net-analyzer/ipguard/ipguard-1.04-r1.ebuild
 2205110010 ./net-analyzer/iplog/iplog-2.2.3-r3.ebuild
 2001182109 ./net-analyzer/ippl/ippl-1.4.14-r6.ebuild
 2103162239 ./net-analyzer/ipsumdump/ipsumdump-1.86-r1.ebuild
@@ -22269,8 +22073,9 @@
 2205051310 ./net-analyzer/wireshark/wireshark-3.6.3.ebuild
 2205311010 ./net-analyzer/wireshark/wireshark-3.6.5.ebuild
 2205311010 ./net-analyzer/wireshark/wireshark-9999.ebuild
+2206162110 ./net-analyzer/wireshark/wireshark-3.6.6.ebuild
 2103160309 ./net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild
-2011270309 ./net-analyzer/xprobe/xprobe-0.3-r1.ebuild
+2206160110 ./net-analyzer/xprobe/xprobe-0.3-r1.ebuild
 2011271109 ./net-analyzer/yersinia/yersinia-0.8.2.ebuild
 2001281909 ./net-analyzer/yersinia/yersinia-9999.ebuild
 2206101240 ./net-analyzer/zabbix/zabbix-4.0.38-r2.ebuild
@@ -22317,7 +22122,7 @@
 2112061840 ./net-dialup/ppp/ppp-2.4.9-r5.ebuild
 2205051210 ./net-dialup/ppp/ppp-2.4.9-r6.ebuild
 2205171510 ./net-dialup/ppp/ppp-2.4.9-r7.ebuild
-2206121142 ./net-dialup/ppp/ppp-2.4.9-r8.ebuild
+2206140010 ./net-dialup/ppp/ppp-2.4.9-r8.ebuild
 2111292209 ./net-dialup/pppconfig/pppconfig-2.3.21.ebuild
 2202191640 ./net-dialup/pppconfig/pppconfig-2.3.25.ebuild
 2205260840 ./net-dialup/pptpclient/pptpclient-1.10.0.ebuild
@@ -22340,9 +22145,11 @@
 2203271540 ./net-dns/bind-tools/bind-tools-9.16.27.ebuild
 2205310640 ./net-dns/bind-tools/bind-tools-9.16.29.ebuild
 2206031040 ./net-dns/bind-tools/bind-tools-9.16.29-r1.ebuild
+2206162110 ./net-dns/bind-tools/bind-tools-9.16.30.ebuild
 2203230410 ./net-dns/bind/bind-9.16.27-r1.ebuild
 2205310640 ./net-dns/bind/bind-9.16.29.ebuild
 2206031040 ./net-dns/bind/bind-9.16.29-r1.ebuild
+2206162110 ./net-dns/bind/bind-9.16.30.ebuild
 2203110039 ./net-dns/c-ares/c-ares-1.17.2.ebuild
 2205060310 ./net-dns/c-ares/c-ares-1.18.1.ebuild
 2205160710 ./net-dns/coredns/coredns-1.8.3.ebuild
@@ -22473,7 +22280,7 @@
 2202130909 ./net-fs/davfs2/davfs2-1.6.1.ebuild
 2105290309 ./net-fs/libnfs/libnfs-4.0.0.ebuild
 2204030709 ./net-fs/libnfs/libnfs-9999.ebuild
-2206131040 ./net-fs/libnfs/libnfs-5.0.1.ebuild
+2206131940 ./net-fs/libnfs/libnfs-5.0.1.ebuild
 2103281109 ./net-fs/mc/mc-2021.03.23.05.46.11.ebuild
 2104192209 ./net-fs/minio/minio-2021.04.18.19.26.29-r2.ebuild
 2204101340 ./net-fs/netatalk/netatalk-3.1.12-r7.ebuild
@@ -22509,8 +22316,8 @@
 2202170109 ./net-ftp/gftp/gftp-2.0.19-r3.ebuild
 2205100140 ./net-ftp/gftp/gftp-2.9.1b.ebuild
 2107011009 ./net-ftp/gproftpd/gproftpd-8.3.2-r3.ebuild
-2111301009 ./net-ftp/lftp/lftp-9999.ebuild
-2204281110 ./net-ftp/lftp/lftp-4.9.2.ebuild
+2206161940 ./net-ftp/lftp/lftp-4.9.2.ebuild
+2206161940 ./net-ftp/lftp/lftp-9999.ebuild
 2204271010 ./net-ftp/linksys-tftp/linksys-tftp-1.2.1-r3.ebuild
 2202260339 ./net-ftp/ncftp/ncftp-3.2.6-r4.ebuild
 2205110210 ./net-ftp/proftpd/proftpd-1.3.7a-r3.ebuild
@@ -22520,6 +22327,7 @@
 2205110210 ./net-ftp/proftpd/proftpd-1.3.8_rc2-r2.ebuild
 2204290210 ./net-ftp/pure-ftpd/pure-ftpd-9999.ebuild
 2205272040 ./net-ftp/pure-ftpd/pure-ftpd-1.0.50-r3.ebuild
+2206142310 ./net-ftp/pure-ftpd/pure-ftpd-1.0.51.ebuild
 2106302209 ./net-ftp/pureadmin/pureadmin-0.4-r3.ebuild
 2204030609 ./net-ftp/tftp-hpa/tftp-hpa-5.2-r3.ebuild
 2204102210 ./net-ftp/tnftp/tnftp-20210827.ebuild
@@ -22616,7 +22424,6 @@
 2112222210 ./net-im/telepathy-logger/telepathy-logger-0.8.2-r1.ebuild
 2203270810 ./net-im/telepathy-mission-control/telepathy-mission-control-5.16.6.ebuild
 1912201239 ./net-im/tkabber/tkabber-1.1.2.ebuild
-2108241209 ./net-im/toxic/toxic-0.10.1-r1.ebuild
 2112110140 ./net-im/toxic/toxic-0.11.1.ebuild
 2201070840 ./net-im/toxic/toxic-0.11.3.ebuild
 2202100210 ./net-im/transwhat/transwhat-0.2.2_p20190426-r3.ebuild
@@ -22681,6 +22488,7 @@
 2205141110 ./net-irc/limnoria/limnoria-20220427.ebuild
 2106302209 ./net-irc/muh/muh-2.2a-r2.ebuild
 2204151010 ./net-irc/ngircd/ngircd-26.1-r4.ebuild
+2206160210 ./net-irc/ngircd/ngircd-26.1-r5.ebuild
 2111080609 ./net-irc/ninja/ninja-1.5.9_pre14-r2.ebuild
 2104161439 ./net-irc/onis/onis-0.8.2-r1.ebuild
 2104040139 ./net-irc/pisg/pisg-0.73-r1.ebuild
@@ -22703,8 +22511,8 @@
 2203270540 ./net-irc/weechat/weechat-3.4.1.ebuild
 2204080409 ./net-irc/weechat/weechat-3.5.ebuild
 2204080409 ./net-irc/weechat/weechat-9999.ebuild
-2008302209 ./net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48.ebuild
 2206120410 ./net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48-r1.ebuild
+2206161940 ./net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48.ebuild
 2008302209 ./net-irc/znc-igloo-push/znc-igloo-push-20200520.ebuild
 2202100210 ./net-irc/znc-palaver/znc-palaver-1.2.1-r1.ebuild
 2008302209 ./net-irc/znc-playback/znc-playback-20200510.ebuild
@@ -22740,12 +22548,13 @@
 1903300009 ./net-libs/freaklabs-chibiarduino/freaklabs-chibiarduino-9999.ebuild
 2205311240 ./net-libs/glib-networking/glib-networking-2.72.0-r1.ebuild
 2110260909 ./net-libs/gloox/gloox-1.0.24.ebuild
+2206160110 ./net-libs/gloox/gloox-1.0.24-r1.ebuild
 2204101840 ./net-libs/gnet/gnet-2.0.8-r4.ebuild
 2205280910 ./net-libs/gnome-online-accounts/gnome-online-accounts-3.44.0.ebuild
 2112030839 ./net-libs/gnutls/gnutls-3.7.2.ebuild
 2205150040 ./net-libs/gnutls/gnutls-3.7.5.ebuild
 2205191240 ./net-libs/gnutls/gnutls-3.7.3-r1.ebuild
-2206100640 ./net-libs/gnutls/gnutls-3.7.6.ebuild
+2206142110 ./net-libs/gnutls/gnutls-3.7.6.ebuild
 2202280409 ./net-libs/google-cloud-cpp/google-cloud-cpp-0.10.0-r2.ebuild
 2203060340 ./net-libs/google-cloud-cpp/google-cloud-cpp-1.36.0.ebuild
 2107021539 ./net-libs/grpc/grpc-1.38.1.ebuild
@@ -22773,8 +22582,9 @@
 2204130011 ./net-libs/ldns/ldns-1.8.0-r4.ebuild
 2205130940 ./net-libs/ldns/ldns-1.8.1.ebuild
 2110021309 ./net-libs/libaccounts-glib/libaccounts-glib-1.25-r2.ebuild
-2102252109 ./net-libs/libad9361-iio/libad9361-iio-9999.ebuild
 2204302241 ./net-libs/libad9361-iio/libad9361-iio-0.2.ebuild
+2206142240 ./net-libs/libad9361-iio/libad9361-iio-0.2-r1.ebuild
+2206142240 ./net-libs/libad9361-iio/libad9361-iio-9999.ebuild
 2107220639 ./net-libs/libasr/libasr-1.0.4.ebuild
 2205190840 ./net-libs/libasyncns/libasyncns-0.8-r4.ebuild
 2104040139 ./net-libs/libaxc/libaxc-0.3.4-r2.ebuild
@@ -22863,17 +22673,20 @@
 2206051040 ./net-libs/libnftnl/libnftnl-1.2.1-r1.ebuild
 2206051040 ./net-libs/libnftnl/libnftnl-9999.ebuild
 2206072340 ./net-libs/libnftnl/libnftnl-1.2.2.ebuild
+2206151640 ./net-libs/libnftnl/libnftnl-1.2.2-r1.ebuild
 2205082210 ./net-libs/libnice/libnice-0.1.19.ebuild
 2205311240 ./net-libs/libnice/libnice-0.1.18.ebuild
 2110170339 ./net-libs/libnids/libnids-1.24-r8.ebuild
 2112140439 ./net-libs/libnids/libnids-1.26-r1.ebuild
 2108110109 ./net-libs/libnipper/libnipper-0.12.6-r1.ebuild
+2206131540 ./net-libs/libnipper/libnipper-0.12.6-r2.ebuild
 2205311240 ./net-libs/libnma/libnma-1.8.38.ebuild
+2206152140 ./net-libs/libnma/libnma-1.8.40.ebuild
 2205220010 ./net-libs/libnpupnp/libnpupnp-4.2.1.ebuild
 2205220010 ./net-libs/libnpupnp/libnpupnp-4.2.2.ebuild
 2104060140 ./net-libs/libnsl/libnsl-0-r1.ebuild
 2108140709 ./net-libs/libnsl/libnsl-1.3.0-r2.ebuild
-2204291110 ./net-libs/libnsl/libnsl-2.0.0-r1.ebuild
+2206141140 ./net-libs/libnsl/libnsl-2.0.0-r1.ebuild
 2205171510 ./net-libs/libntlm/libntlm-1.6.ebuild
 2201140110 ./net-libs/libnxml/libnxml-0.18.3-r1.ebuild
 2201271240 ./net-libs/liboauth/liboauth-1.0.3-r1.ebuild
@@ -22971,8 +22784,6 @@
 2204122340 ./net-libs/ngtcp2/ngtcp2-0.3.1.ebuild
 2204251740 ./net-libs/ngtcp2/ngtcp2-0.4.0.ebuild
 2205162010 ./net-libs/ngtcp2/ngtcp2-0.5.0.ebuild
-2205191710 ./net-libs/nodejs/nodejs-16.14.2.ebuild
-2206031440 ./net-libs/nodejs/nodejs-14.19.0.ebuild
 2206032210 ./net-libs/nodejs/nodejs-99999999.ebuild
 2206121142 ./net-libs/nodejs/nodejs-14.19.3.ebuild
 2206121142 ./net-libs/nodejs/nodejs-16.15.1.ebuild
@@ -22985,6 +22796,7 @@
 2202080810 ./net-libs/phodav/phodav-2.5.ebuild
 2105021409 ./net-libs/pjproject/pjproject-2.10-r1.ebuild
 2107241109 ./net-libs/pjproject/pjproject-2.10-r2.ebuild
+2206151640 ./net-libs/pjproject/pjproject-2.12.1.ebuild
 2109241610 ./net-libs/quiche/quiche-0.10.0.ebuild
 2109071939 ./net-libs/quiche/quiche-0.9.0-r1.ebuild
 2202012239 ./net-libs/quiche/quiche-0.11.0.ebuild
@@ -23025,9 +22837,9 @@
 2109121440 ./net-libs/telepathy-logger-qt/telepathy-logger-qt-17.09.0.ebuild
 2109230209 ./net-libs/telepathy-qt/telepathy-qt-0.9.8-r1.ebuild
 2109230209 ./net-libs/telepathy-qt/telepathy-qt-9999.ebuild
-2105141309 ./net-libs/tox/tox-0.2.12-r1.ebuild
-2201070840 ./net-libs/tox/tox-9999.ebuild
 2202211309 ./net-libs/tox/tox-0.2.13.ebuild
+2206161940 ./net-libs/tox/tox-0.2.18.ebuild
+2206161940 ./net-libs/tox/tox-9999.ebuild
 2201220339 ./net-libs/tox_extension_messages/tox_extension_messages-0.0.3.ebuild
 2205220810 ./net-libs/toxext/toxext-0.0.3.ebuild
 2203200310 ./net-libs/udns/udns-0.4.ebuild
@@ -23036,7 +22848,7 @@
 2202070940 ./net-libs/usrsctp/usrsctp-0.9.5.0.ebuild
 2102270739 ./net-libs/wandio/wandio-4.2.3_p1-r1.ebuild
 2205131640 ./net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild
-2205290440 ./net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild
+2206151140 ./net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild
 2106222139 ./net-libs/wvstreams/wvstreams-4.6.1_p14-r2.ebuild
 2206110910 ./net-libs/xdp-tools/xdp-tools-1.2.3.ebuild
 2103041409 ./net-libs/xrootd-ceph/xrootd-ceph-5.0.3.ebuild
@@ -23050,8 +22862,8 @@
 2103052339 ./net-mail/altermime/altermime-0.3.11.ebuild
 2206072340 ./net-mail/amavis-logwatch/amavis-logwatch-1.51.04.ebuild
 2111260110 ./net-mail/asmail/asmail-2.1-r2.ebuild
-2205200940 ./net-mail/automx2/automx2-2022.0.ebuild
-2205200440 ./net-mail/automx2/automx2-2022.1.ebuild
+2206161940 ./net-mail/automx2/automx2-2022.0.ebuild
+2206161940 ./net-mail/automx2/automx2-2022.1.ebuild
 2104060140 ./net-mail/autorespond/autorespond-2.0.4.ebuild
 2007210509 ./net-mail/autorespond/autorespond-2.0.5.ebuild
 2203091940 ./net-mail/b4/b4-0.8.0.ebuild
@@ -23071,9 +22883,8 @@
 2203230239 ./net-mail/dbmail/dbmail-3.2.3-r5.ebuild
 2203230239 ./net-mail/dbmail/dbmail-3.2.5-r2.ebuild
 2104161439 ./net-mail/dot-forward/dot-forward-0.71-r4.ebuild
-2205040010 ./net-mail/dovecot/dovecot-2.3.18-r2.ebuild
-2205101440 ./net-mail/dovecot/dovecot-2.3.19.ebuild
 2205191710 ./net-mail/dovecot/dovecot-2.3.18-r1.ebuild
+2206141710 ./net-mail/dovecot/dovecot-2.3.19.1.ebuild
 2009050439 ./net-mail/email/email-3.1.3-r1.ebuild
 2203040410 ./net-mail/eps/eps-1.7-r1.ebuild
 2105252109 ./net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r4.ebuild
@@ -23128,6 +22939,7 @@
 2205140210 ./net-mail/poppassd_ceti/poppassd_ceti-1.8.7.ebuild
 2205140210 ./net-mail/poppassd_ceti/poppassd_ceti-1.8.9.ebuild
 2206072340 ./net-mail/postfix-logwatch/postfix-logwatch-1.40.04.ebuild
+2206151540 ./net-mail/postfix-logwatch/postfix-logwatch-1.40.05.ebuild
 2111150910 ./net-mail/qlogtools/qlogtools-3.1-r1.ebuild
 2002230040 ./net-mail/qmail-autoresponder/qmail-autoresponder-2.0.ebuild
 2203040040 ./net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r3.ebuild
@@ -23142,9 +22954,9 @@
 2104060140 ./net-mail/queue-fix/queue-fix-1.4-r3.ebuild
 2106120709 ./net-mail/queue-repair/queue-repair-0.9.0-r2.ebuild
 2104060140 ./net-mail/randomsig/randomsig-1.10.0.ebuild
-1911232239 ./net-mail/relay-ctrl/relay-ctrl-3.1.1-r2.ebuild
-2005310809 ./net-mail/relay-ctrl/relay-ctrl-3.1.1-r3.ebuild
-2005310809 ./net-mail/relay-ctrl/relay-ctrl-3.2.ebuild
+2206161940 ./net-mail/relay-ctrl/relay-ctrl-3.1.1-r2.ebuild
+2206161940 ./net-mail/relay-ctrl/relay-ctrl-3.1.1-r3.ebuild
+2206161940 ./net-mail/relay-ctrl/relay-ctrl-3.2.ebuild
 2104040109 ./net-mail/renattach/renattach-1.2.4-r1.ebuild
 2009150409 ./net-mail/ripmime/ripmime-1.4.0.10-r1.ebuild
 2012311940 ./net-mail/ripole/ripole-0.2.2.ebuild
@@ -23206,7 +23018,7 @@
 2002230040 ./net-misc/babeld/babeld-1.8.2.ebuild
 2002230040 ./net-misc/babeld/babeld-1.9.1.ebuild
 2202260609 ./net-misc/balance/balance-3.57-r1.ebuild
-2111280410 ./net-misc/batctl/batctl-2021.4.ebuild
+2206131810 ./net-misc/batctl/batctl-2022.1.ebuild
 2112201410 ./net-misc/bfgminer/bfgminer-5.5.0-r2.ebuild
 2104161439 ./net-misc/bgpq3/bgpq3-0.1.35.ebuild
 2111221339 ./net-misc/bgpq3/bgpq3-0.1.36.ebuild
@@ -23278,9 +23090,7 @@
 2204240039 ./net-misc/dropbear/dropbear-2022.82.ebuild
 2105061339 ./net-misc/dropbox-cli/dropbox-cli-2020.03.04-r1.ebuild
 2206091110 ./net-misc/dropbox-cli/dropbox-cli-2022.ebuild
-2205021510 ./net-misc/dropbox/dropbox-147.4.4800.ebuild
-2205111740 ./net-misc/dropbox/dropbox-148.4.4519.ebuild
-2206081510 ./net-misc/dropbox/dropbox-150.4.5000.ebuild
+2206132010 ./net-misc/dropbox/dropbox-150.4.5000.ebuild
 2203141940 ./net-misc/econnman/econnman-1.1_p20160305.ebuild
 2203260309 ./net-misc/efax/efax-0.9a_p19_p1.ebuild
 2205282210 ./net-misc/electron-cash/electron-cash-4.2.10.ebuild
@@ -23482,8 +23292,8 @@
 2205311040 ./net-misc/ntpsec/ntpsec-1.2.1-r3.ebuild
 2206030840 ./net-misc/ntpsec/ntpsec-1.2.1-r4.ebuild
 2206121510 ./net-misc/ntpsec/ntpsec-1.2.1-r5.ebuild
-2206121840 ./net-misc/ntpsec/ntpsec-1.2.1-r6.ebuild
 2206121840 ./net-misc/ntpsec/ntpsec-9999.ebuild
+2206151310 ./net-misc/ntpsec/ntpsec-1.2.1-r6.ebuild
 2201040239 ./net-misc/nx/nx-3.5.99.25.ebuild
 2201040239 ./net-misc/nx/nx-3.5.99.26.ebuild
 2111192109 ./net-misc/nxplayer/nxplayer-5.1.24.1-r1.ebuild
@@ -23496,6 +23306,7 @@
 2112091940 ./net-misc/oidentd/oidentd-3.0.0-r1.ebuild
 2112030539 ./net-misc/olsrd/olsrd-0.9.8_p20210612.ebuild
 2107310209 ./net-misc/omniORB/omniORB-4.2.4.ebuild
+2206141810 ./net-misc/omniORB/omniORB-4.3.0.ebuild
 2001310039 ./net-misc/omnisync/omnisync-1.0_p20200130.ebuild
 2107281639 ./net-misc/openntpd/openntpd-6.2_p3-r2.ebuild
 2107281639 ./net-misc/openntpd/openntpd-6.8_p1-r1.ebuild
@@ -23606,8 +23417,8 @@
 2108292239 ./net-misc/socket-burst-dampener/socket-burst-dampener-1.3.1.ebuild
 2103310109 ./net-misc/socket/socket-1.5.ebuild
 2203250510 ./net-misc/spice-gtk/spice-gtk-0.39-r2.ebuild
-2206130010 ./net-misc/spice-gtk/spice-gtk-0.40.ebuild
-2206121710 ./net-misc/spice-gtk/spice-gtk-9999.ebuild
+2206140140 ./net-misc/spice-gtk/spice-gtk-0.40.ebuild
+2206140140 ./net-misc/spice-gtk/spice-gtk-9999.ebuild
 2203260309 ./net-misc/spiped/spiped-1.6.0-r1.ebuild
 2203260309 ./net-misc/spiped/spiped-1.6.1.ebuild
 2203260309 ./net-misc/spiped/spiped-1.6.2.ebuild
@@ -23653,11 +23464,12 @@
 2101061839 ./net-misc/throttle/throttle-1.2-r1.ebuild
 1911091639 ./net-misc/tiers/tiers-1.1.ebuild
 2205091310 ./net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild
-2205140410 ./net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild
 2205132310 ./net-misc/tigervnc/tigervnc-9999.ebuild
+2206161340 ./net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild
 2104200439 ./net-misc/tipcutils/tipcutils-2.0.3.ebuild
 1706022014 ./net-misc/ttytter/ttytter-2.1.00.ebuild
 2204181040 ./net-misc/turbovnc/turbovnc-2.2.7-r2.ebuild
+2206160040 ./net-misc/turbovnc/turbovnc-3.0.ebuild
 2007260139 ./net-misc/ubridge/ubridge-0.9.18.ebuild
 2108181609 ./net-misc/ucarp/ucarp-1.5.2-r7.ebuild
 2011291139 ./net-misc/udpcast/udpcast-20200328.ebuild
@@ -23711,7 +23523,6 @@
 2203070040 ./net-misc/youtube-dl/youtube-dl-9999.ebuild
 2201220240 ./net-misc/youtube-viewer/youtube-viewer-3.9.7.ebuild
 2201220240 ./net-misc/youtube-viewer/youtube-viewer-9999.ebuild
-2204110110 ./net-misc/yt-dlp/yt-dlp-2022.4.8.ebuild
 2206021840 ./net-misc/yt-dlp/yt-dlp-2022.5.18.ebuild
 2104122209 ./net-misc/zerotier/zerotier-1.6.4.ebuild
 2110271609 ./net-misc/zssh/zssh-1.5c-r1.ebuild
@@ -23720,13 +23531,14 @@
 2204160010 ./net-misc/ytfzf/ytfzf-2.3.ebuild
 2206110940 ./net-misc/mptcpd/mptcpd-0.9.ebuild
 2206110940 ./net-misc/mptcpd/mptcpd-9999.ebuild
-2204241110 ./net-misc/r8125/r8125-9.008.00.ebuild
+2206162010 ./net-misc/r8125/r8125-9.008.00.ebuild
+2206162010 ./net-misc/r8125/r8125-9.009.01.ebuild
 2203230039 ./net-misc/htail/htail-1.5.ebuild
 2204041939 ./net-misc/downloader-cli/downloader-cli-0.3.3.ebuild
 2204051709 ./net-misc/ytmdl/ytmdl-2022.3.16.ebuild
 2204260840 ./net-misc/rsync-bpc/rsync-bpc-3.1.3.0.ebuild
 2205170010 ./net-misc/gnome-connections/gnome-connections-42.1.2.ebuild
-2205140410 ./net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.12.0.ebuild
+2206161340 ./net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.12.0.ebuild
 2204171840 ./net-nds/389-ds-base/389-ds-base-1.4.4.19-r3.ebuild
 2204202009 ./net-nds/389-ds-base/389-ds-base-2.1.0-r2.ebuild
 2203230239 ./net-nds/adtool/adtool-1.3.3-r2.ebuild
@@ -23764,9 +23576,11 @@
 2104130339 ./net-news/rsstail/rsstail-2.1_p20200310.ebuild
 2201271240 ./net-news/rsstool/rsstool-1.0.1_rc2.ebuild
 2202160310 ./net-news/snownews/snownews-1.9.ebuild
+2206160340 ./net-news/snownews/snownews-1.9-r1.ebuild
 2104040109 ./net-news/yydecode/yydecode-0.2.10-r1.ebuild
 2203091840 ./net-news/sfeed/sfeed-1.3.ebuild
 2204050709 ./net-news/sfeed/sfeed-1.4.ebuild
+2206162010 ./net-news/sfeed/sfeed-1.5.ebuild
 2203040410 ./net-nntp/brag/brag-1.4.3.ebuild
 2201021310 ./net-nntp/leafnode/leafnode-1.11.11-r1.ebuild
 2104200439 ./net-nntp/newspost/newspost-2.1.1-r3.ebuild
@@ -23844,7 +23658,7 @@
 2201020309 ./net-p2p/nicotine+/nicotine+-3.1.1.ebuild
 2201212340 ./net-p2p/nicotine+/nicotine+-3.2.0.ebuild
 2206070910 ./net-p2p/nicotine+/nicotine+-3.2.1.ebuild
-2206072240 ./net-p2p/nicotine+/nicotine+-3.2.2-r1.ebuild
+2206151040 ./net-p2p/nicotine+/nicotine+-3.2.2-r1.ebuild
 2106302209 ./net-p2p/opendchub/opendchub-0.8.2-r1.ebuild
 2203221239 ./net-p2p/qbittorrent/qbittorrent-4.3.9.ebuild
 2205260210 ./net-p2p/qbittorrent/qbittorrent-4.4.3.1.ebuild
@@ -23864,9 +23678,9 @@
 2105112239 ./net-p2p/torrentinfo/torrentinfo-1.8.6-r2.ebuild
 2205310810 ./net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.4.1.ebuild
 2205310810 ./net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.5.1.ebuild
-2204041439 ./net-p2p/transmission/transmission-3.00-r1.ebuild
-2205172340 ./net-p2p/transmission/transmission-3.00-r4.ebuild
-2205172340 ./net-p2p/transmission/transmission-9999.ebuild
+2206132110 ./net-p2p/transmission/transmission-3.00-r1.ebuild
+2206132110 ./net-p2p/transmission/transmission-3.00-r4.ebuild
+2206132110 ./net-p2p/transmission/transmission-9999.ebuild
 2106112309 ./net-p2p/tremc/tremc-0.9.2_p20201101.ebuild
 2205311940 ./net-p2p/tremc/tremc-0.9.3.ebuild
 1806011708 ./net-p2p/tvrss/tvrss-1.8_beta.ebuild
@@ -23879,7 +23693,7 @@
 2011290239 ./net-print/c2esp/c2esp-27.ebuild
 2104120442 ./net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild
 2104120442 ./net-print/cndrvcups-lb/cndrvcups-lb-3.70.ebuild
-2101180509 ./net-print/cnijfilter2/cnijfilter2-5.90.ebuild
+2206161940 ./net-print/cnijfilter2/cnijfilter2-5.90.ebuild
 2112191509 ./net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.40.ebuild
 2204140710 ./net-print/cups-bjnp/cups-bjnp-2.0.3.ebuild
 2203230410 ./net-print/cups-filters/cups-filters-1.28.10-r3.ebuild
@@ -23925,17 +23739,17 @@
 2203161339 ./net-proxy/haproxy-dataplaneapi/haproxy-dataplaneapi-2.5.1.ebuild
 2204061709 ./net-proxy/haproxy/haproxy-2.2.17.ebuild
 2204061709 ./net-proxy/haproxy/haproxy-2.2.21.ebuild
-2204061709 ./net-proxy/haproxy/haproxy-2.4.14.ebuild
-2204061709 ./net-proxy/haproxy/haproxy-2.5.4.ebuild
 2204261840 ./net-proxy/haproxy/haproxy-2.2.9999.ebuild
-2204261840 ./net-proxy/haproxy/haproxy-2.4.9999.ebuild
-2204261840 ./net-proxy/haproxy/haproxy-2.5.9999.ebuild
-2204261840 ./net-proxy/haproxy/haproxy-9999.ebuild
 2205131910 ./net-proxy/haproxy/haproxy-2.2.24.ebuild
-2205131910 ./net-proxy/haproxy/haproxy-2.4.17.ebuild
-2205131910 ./net-proxy/haproxy/haproxy-2.5.7.ebuild
 2206011440 ./net-proxy/haproxy/haproxy-2.6.0.ebuild
 2206011440 ./net-proxy/haproxy/haproxy-2.6.9999.ebuild
+2206161940 ./net-proxy/haproxy/haproxy-2.4.14.ebuild
+2206161940 ./net-proxy/haproxy/haproxy-2.4.17.ebuild
+2206161940 ./net-proxy/haproxy/haproxy-2.4.9999.ebuild
+2206161940 ./net-proxy/haproxy/haproxy-2.5.4.ebuild
+2206161940 ./net-proxy/haproxy/haproxy-2.5.7.ebuild
+2206161940 ./net-proxy/haproxy/haproxy-2.5.9999.ebuild
+2206161940 ./net-proxy/haproxy/haproxy-9999.ebuild
 2205192310 ./net-proxy/hatop/hatop-0.8.1.ebuild
 2104172239 ./net-proxy/havp/havp-0.92a-r3.ebuild
 2102040639 ./net-proxy/microsocks/microsocks-1.0.2.ebuild
@@ -24077,8 +23891,8 @@
 2205060310 ./net-wireless/crda/crda-4.14.ebuild
 2108130210 ./net-wireless/dump1090/dump1090-4.0.ebuild
 2110150909 ./net-wireless/dump1090/dump1090-5.0.ebuild
-2110141309 ./net-wireless/dump1090/dump1090-6.1.ebuild
 2109262309 ./net-wireless/dump1090/dump1090-9999.ebuild
+2206141610 ./net-wireless/dump1090/dump1090-6.1.ebuild
 2205202240 ./net-wireless/gnome-bluetooth/gnome-bluetooth-3.34.5.ebuild
 2205280910 ./net-wireless/gnome-bluetooth/gnome-bluetooth-42.0-r2.ebuild
 2206101640 ./net-wireless/gnome-bluetooth/gnome-bluetooth-42.1.ebuild
@@ -24090,8 +23904,8 @@
 2110072010 ./net-wireless/gqrx/gqrx-2.14.6.ebuild
 2102171909 ./net-wireless/gqrx/gqrx-9999.ebuild
 2205010110 ./net-wireless/gqrx/gqrx-2.15.8.ebuild
-2107172140 ./net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20200812.ebuild
 2107172140 ./net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild
+2206142110 ./net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20200812.ebuild
 2206102110 ./net-wireless/gr-iio/gr-iio-0.3_p20191219-r2.ebuild
 2206102110 ./net-wireless/gr-iio/gr-iio-9999.ebuild
 2206101640 ./net-wireless/gr-iqbal/gr-iqbal-0.38.2.ebuild
@@ -24100,8 +23914,8 @@
 2206101710 ./net-wireless/gr-osmosdr/gr-osmosdr-0.2.3.ebuild
 2107172140 ./net-wireless/gr-paint/gr-paint-9999.ebuild
 2206111840 ./net-wireless/gr-paint/gr-paint-0.0_p20200517-r1.ebuild
-2107172140 ./net-wireless/gr-rds/gr-rds-0.0_p20200807.ebuild
-2107172140 ./net-wireless/gr-rds/gr-rds-9999.ebuild
+2206141440 ./net-wireless/gr-rds/gr-rds-0.0_p20200807.ebuild
+2206141440 ./net-wireless/gr-rds/gr-rds-9999.ebuild
 2206111540 ./net-wireless/gr-scopy/gr-scopy-0.0_p20201005.ebuild
 2206111540 ./net-wireless/gr-scopy/gr-scopy-9999.ebuild
 2110262109 ./net-wireless/hackrf-tools/hackrf-tools-2021.03.1.ebuild
@@ -24121,8 +23935,7 @@
 2204252240 ./net-wireless/iwd/iwd-1.26.ebuild
 2205271010 ./net-wireless/iwd/iwd-1.27.ebuild
 2206072240 ./net-wireless/iwd/iwd-1.28.ebuild
-2101090039 ./net-wireless/iwgtk/iwgtk-0.4.ebuild
-2206072240 ./net-wireless/iwgtk/iwgtk-0.5.ebuild
+2206141640 ./net-wireless/iwgtk/iwgtk-0.6.ebuild
 2102150639 ./net-wireless/jackit/jackit-0.0_p20170918-r1.ebuild
 2102172009 ./net-wireless/kismet-rest/kismet-rest-2019.05.02.ebuild
 2102172009 ./net-wireless/kismet-rest/kismet-rest-9999.ebuild
@@ -24168,7 +23981,8 @@
 2203200410 ./net-wireless/rfkill/rfkill-0.5-r3.ebuild
 2203200410 ./net-wireless/rfkill/rfkill-1.0.ebuild
 2110021909 ./net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802.ebuild
-2108171339 ./net-wireless/rtl-sdr/rtl-sdr-9999.ebuild
+2206141610 ./net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802-r1.ebuild
+2206141610 ./net-wireless/rtl-sdr/rtl-sdr-9999.ebuild
 2203181640 ./net-wireless/rtl_433/rtl_433-21.12.ebuild
 2203181640 ./net-wireless/rtl_433/rtl_433-9999.ebuild
 1901080739 ./net-wireless/sdrplay/sdrplay-2.13.1-r1.ebuild
@@ -24528,7 +24342,7 @@
 1702282250 ./sci-biology/maq/maq-0.7.1-r2.ebuild
 1702282250 ./sci-biology/maqview/maqview-0.2.5-r3.ebuild
 2006211709 ./sci-biology/mcl/mcl-14.137.ebuild
-2203202209 ./sci-biology/mosaik/mosaik-2.2.30.ebuild
+2206131540 ./sci-biology/mosaik/mosaik-2.2.30.ebuild
 2104051739 ./sci-biology/mothur/mothur-1.27.0-r1.ebuild
 2201272010 ./sci-biology/mrbayes/mrbayes-3.2.7.ebuild
 2203202209 ./sci-biology/mrbayes/mrbayes-3.1.2-r2.ebuild
@@ -24650,7 +24464,7 @@
 2102191609 ./sci-chemistry/molden/molden-5.5.ebuild
 2202191710 ./sci-chemistry/molden/molden-6.9.ebuild
 2203202209 ./sci-chemistry/moldy/moldy-2.16e-r2.ebuild
-2101310343 ./sci-chemistry/molequeue/molequeue-0.9.0-r1.ebuild
+2206151710 ./sci-chemistry/molequeue/molequeue-0.9.0-r1.ebuild
 2111190309 ./sci-chemistry/molmol/molmol-2k_p2-r5.ebuild
 2206091010 ./sci-chemistry/molsketch/molsketch-0.7.2-r1.ebuild
 2203202209 ./sci-chemistry/mopac7/mopac7-1.15-r1.ebuild
@@ -24770,6 +24584,7 @@
 2201170309 ./sci-electronics/spice/spice-3.5.5-r3.ebuild
 2108222309 ./sci-electronics/splat/splat-1.4.2.ebuild
 2205021410 ./sci-electronics/systemc/systemc-2.3.4-r1.ebuild
+2206162010 ./sci-electronics/systemc/systemc-2.3.4-r2.ebuild
 2111190309 ./sci-electronics/vbs/vbs-1.4.0.ebuild
 2203312110 ./sci-electronics/voacapl/voacapl-0.7.6-r1.ebuild
 2106162109 ./sci-electronics/xcircuit/xcircuit-3.10.30.ebuild
@@ -24812,10 +24627,10 @@
 2206070710 ./sci-geosciences/gpxsee/gpxsee-11.1-r1.ebuild
 2201021009 ./sci-geosciences/grass/grass-7.8.6-r1.ebuild
 2202260539 ./sci-geosciences/grass/grass-7.8.7.ebuild
-2205121810 ./sci-geosciences/grass/grass-8.0.2.ebuild
 2205121810 ./sci-geosciences/grass/grass-9999.ebuild
 2205222340 ./sci-geosciences/grass/grass-8.0.1-r1.ebuild
 2206040710 ./sci-geosciences/grass/grass-8.2.0.ebuild
+2206152140 ./sci-geosciences/grass/grass-8.0.2.ebuild
 2002171539 ./sci-geosciences/gshhg-gmt/gshhg-gmt-2.3.7.ebuild
 2108222309 ./sci-geosciences/gshhs-data/gshhs-data-2.2.0.ebuild
 2201011439 ./sci-geosciences/gshhs/gshhs-1.13-r1.ebuild
@@ -24891,9 +24706,7 @@
 2201101210 ./sci-geosciences/qmapshack/qmapshack-1.16.1.ebuild
 2103020309 ./sci-geosciences/readosm/readosm-1.0.0e-r1.ebuild
 2103020309 ./sci-geosciences/readosm/readosm-1.1.0a.ebuild
-2111050109 ./sci-geosciences/routino/routino-3.3.3.ebuild
-2206091110 ./sci-geosciences/routino/routino-3.3.3-r1.ebuild
-2206121840 ./sci-geosciences/routino/routino-3.3.3-r2.ebuild
+2206150040 ./sci-geosciences/routino/routino-3.3.3-r2.ebuild
 1902201639 ./sci-geosciences/tcd-utils/tcd-utils-20120115-r1.ebuild
 2203260340 ./sci-geosciences/viking/viking-1.10.ebuild
 1903170109 ./sci-geosciences/xtide/xtide-2.15.1.ebuild
@@ -25017,8 +24830,8 @@
 2201111810 ./sci-libs/getdata/getdata-0.11.0.ebuild
 2205150040 ./sci-libs/ginkgo/ginkgo-1.4.0-r3.ebuild
 2111021910 ./sci-libs/givaro/givaro-4.1.1-r2.ebuild
-2206060910 ./sci-libs/gmsh/gmsh-4.10.3.ebuild
-2206060910 ./sci-libs/gmsh/gmsh-4.9.5-r2.ebuild
+2206131610 ./sci-libs/gmsh/gmsh-4.10.3.ebuild
+2206131610 ./sci-libs/gmsh/gmsh-4.9.5-r2.ebuild
 2205170840 ./sci-libs/gsl/gsl-2.7.1-r1.ebuild
 2205170840 ./sci-libs/gsl/gsl-2.7.ebuild
 2205171640 ./sci-libs/gts/gts-20121130.ebuild
@@ -25030,7 +24843,7 @@
 2205030540 ./sci-libs/hdf5/hdf5-1.12.1-r1.ebuild
 2205030540 ./sci-libs/hdf5/hdf5-1.12.1.ebuild
 2206010310 ./sci-libs/hdf5/hdf5-1.12.2-r1.ebuild
-2206131040 ./sci-libs/hdf5/hdf5-1.12.2-r2.ebuild
+2206140910 ./sci-libs/hdf5/hdf5-1.12.2-r2.ebuild
 2101241109 ./sci-libs/hipCUB/hipCUB-4.0.0-r1.ebuild
 2205021140 ./sci-libs/hipCUB/hipCUB-4.3.0-r1.ebuild
 2205030910 ./sci-libs/hipCUB/hipCUB-5.0.2.ebuild
@@ -25054,7 +24867,7 @@
 2203011339 ./sci-libs/inchi/inchi-1.06.ebuild
 2111291139 ./sci-libs/indilib/indilib-1.9.2.ebuild
 2204211609 ./sci-libs/indilib/indilib-1.9.5.1.ebuild
-2205261810 ./sci-libs/indilib/indilib-1.9.6.ebuild
+2206141610 ./sci-libs/indilib/indilib-1.9.6-r1.ebuild
 1804261339 ./sci-libs/io_lib/io_lib-1.14.7.ebuild
 2203110039 ./sci-libs/ipopt/ipopt-3.12.12.ebuild
 2205072340 ./sci-libs/ipopt/ipopt-3.14.4.ebuild
@@ -25175,10 +24988,11 @@
 2205161140 ./sci-libs/openblas/openblas-0.3.18.ebuild
 2205161140 ./sci-libs/openblas/openblas-0.3.19.ebuild
 2205161140 ./sci-libs/openblas/openblas-0.3.20.ebuild
-2206031410 ./sci-libs/opencascade/opencascade-7.5.2-r6.ebuild
-2206031410 ./sci-libs/opencascade/opencascade-7.5.3-r7.ebuild
-2206031410 ./sci-libs/opencascade/opencascade-7.6.0-r4.ebuild
-2206031410 ./sci-libs/opencascade/opencascade-7.6.1-r1.ebuild
+2206141910 ./sci-libs/opencascade/opencascade-7.5.2-r6.ebuild
+2206141910 ./sci-libs/opencascade/opencascade-7.5.3-r7.ebuild
+2206141910 ./sci-libs/opencascade/opencascade-7.6.0-r4.ebuild
+2206141910 ./sci-libs/opencascade/opencascade-7.6.1-r1.ebuild
+2206141910 ./sci-libs/opencascade/opencascade-7.6.2.ebuild
 2105280039 ./sci-libs/openlibm/openlibm-0.7.5.ebuild
 2110121239 ./sci-libs/openlibm/openlibm-0.8.0.ebuild
 2202280210 ./sci-libs/orocos-bfl/orocos-bfl-0.8.0.ebuild
@@ -25196,7 +25010,7 @@
 2203082140 ./sci-libs/pcl/pcl-1.12.1.ebuild
 2205191540 ./sci-libs/pcl/pcl-1.12.0.ebuild
 2205170840 ./sci-libs/pgplot/pgplot-5.2.2-r7.ebuild
-2107172140 ./sci-libs/plplot/plplot-5.15.0-r102.ebuild
+2206141640 ./sci-libs/plplot/plplot-5.15.0-r102.ebuild
 2105092239 ./sci-libs/primegen/primegen-0.97-r2.ebuild
 2203202209 ./sci-libs/profnet/profnet-1.0.22.ebuild
 2203202209 ./sci-libs/profphd-utils/profphd-utils-1.0.10-r1.ebuild
@@ -25277,7 +25091,8 @@
 2202070510 ./sci-libs/tensorflow/tensorflow-2.8.0.ebuild
 2006111539 ./sci-libs/tnt/tnt-3.0.12.ebuild
 2206120710 ./sci-libs/trilinos/trilinos-13.0.1-r4.ebuild
-2206120940 ./sci-libs/trilinos/trilinos-13.4.0-r1.ebuild
+2206140710 ./sci-libs/trilinos/trilinos-13.2.0.ebuild
+2206140710 ./sci-libs/trilinos/trilinos-13.4.0-r3.ebuild
 2111190309 ./sci-libs/udunits/udunits-2.2.28.ebuild
 2105131709 ./sci-libs/ufconfig/ufconfig-3.7.1.ebuild
 2107141939 ./sci-libs/umfpack/umfpack-5.7.9.ebuild
@@ -25308,6 +25123,7 @@
 2205311410 ./sci-libs/tensorpipe/tensorpipe-2022.05.13.ebuild
 2206120910 ./sci-libs/arborx/arborx-1.2.ebuild
 2206121410 ./sci-libs/gloo/gloo-2022.05.18.ebuild
+2206141340 ./sci-libs/foxi/foxi-2021.05.27.ebuild
 2112291709 ./sci-mathematics/4ti2/4ti2-1.6.7-r1.ebuild
 2205150410 ./sci-mathematics/agda-stdlib/agda-stdlib-2.6.1.2.1.4.ebuild
 2103160139 ./sci-mathematics/agda/agda-2.6.1.2.ebuild
@@ -25411,6 +25227,7 @@
 2111021910 ./sci-mathematics/planarity/planarity-3.0.1.1.ebuild
 2206130310 ./sci-mathematics/planarity/planarity-3.0.2.0.ebuild
 2202071339 ./sci-mathematics/polymake/polymake-4.6.ebuild
+2206152240 ./sci-mathematics/polymake/polymake-4.6-r1.ebuild
 2105192339 ./sci-mathematics/prng/prng-3.0.2-r3.ebuild
 2104161439 ./sci-mathematics/prover9/prover9-2009.11a.ebuild
 2005272209 ./sci-mathematics/psmt2-frontend/psmt2-frontend-0.2.ebuild
@@ -25462,7 +25279,9 @@
 2204170040 ./sci-mathematics/why3/why3-1.4.1.ebuild
 2205072010 ./sci-mathematics/why3/why3-1.5.0.ebuild
 2205161140 ./sci-mathematics/primecount/primecount-7.2-r1.ebuild
+2206131440 ./sci-mathematics/primecount/primecount-7.3.ebuild
 2201301809 ./sci-mathematics/primesieve/primesieve-7.7.ebuild
+2206131440 ./sci-mathematics/primesieve/primesieve-7.9.ebuild
 2203110039 ./sci-mathematics/verit/verit-2021.06.2.ebuild
 2204032239 ./sci-mathematics/cryptominisat/cryptominisat-5.8.0.ebuild
 2112271640 ./sci-mathematics/stp/stp-2.3.3-r1.ebuild
@@ -25470,7 +25289,7 @@
 2112282109 ./sci-mathematics/smtinterpol/smtinterpol-2.5_p20211018.ebuild
 2203021010 ./sci-mathematics/cadabra/cadabra-2.3.8.ebuild
 2203030809 ./sci-mathematics/metamath-databases/metamath-databases-20220303.ebuild
-2204041739 ./sci-mathematics/alectryon/alectryon-1.4.0-r1.ebuild
+2206141340 ./sci-mathematics/alectryon/alectryon-1.4.0-r1.ebuild
 2203050810 ./sci-mathematics/coq-mathcomp/coq-mathcomp-1.14.0.ebuild
 2204200139 ./sci-mathematics/coq-serapi/coq-serapi-0.15.0-r2.ebuild
 2104180939 ./sci-misc/ViSP-images/ViSP-images-3.3.0.ebuild
@@ -25558,7 +25377,8 @@
 2202262209 ./sci-visualization/gr/gr-0.53.0.ebuild
 2112290109 ./sci-visualization/grace/grace-5.1.25_p9-r1.ebuild
 2103020309 ./sci-visualization/gwyddion/gwyddion-2.56.ebuild
-2203282310 ./sci-visualization/gwyddion/gwyddion-2.60.ebuild
+2206140040 ./sci-visualization/gwyddion/gwyddion-2.60.ebuild
+2206131510 ./sci-visualization/gwyddion/gwyddion-2.61.ebuild
 2202052009 ./sci-visualization/jupyter-dash/jupyter-dash-0.4.0.ebuild
 2109071609 ./sci-visualization/kst/kst-2.0.8-r2.ebuild
 2205092210 ./sci-visualization/labplot/labplot-2.9.0-r1.ebuild
@@ -26651,8 +26471,8 @@
 2104180939 ./sys-apps/darwin-miscutils/darwin-miscutils-8.ebuild
 2104180939 ./sys-apps/darwin-miscutils/darwin-miscutils-9.ebuild
 2201170309 ./sys-apps/dbus-broker/dbus-broker-29.ebuild
-2205192340 ./sys-apps/dbus-broker/dbus-broker-31.ebuild
 2205192340 ./sys-apps/dbus-broker/dbus-broker-9999.ebuild
+2206150040 ./sys-apps/dbus-broker/dbus-broker-31.ebuild
 2201041339 ./sys-apps/dbus/dbus-1.12.20-r4.ebuild
 2204291110 ./sys-apps/dbus/dbus-1.14.0-r1.ebuild
 2205041840 ./sys-apps/dbus/dbus-1.12.22-r1.ebuild
@@ -26695,6 +26515,7 @@
 2112260040 ./sys-apps/ethtool/ethtool-5.15.ebuild
 2201201539 ./sys-apps/ethtool/ethtool-5.16.ebuild
 2205191140 ./sys-apps/ethtool/ethtool-5.17.ebuild
+2206141510 ./sys-apps/ethtool/ethtool-5.18.ebuild
 2112121739 ./sys-apps/exa/exa-0.10.1.ebuild
 2107170239 ./sys-apps/fakechroot/fakechroot-2.20.1.ebuild
 2205311210 ./sys-apps/fakechroot/fakechroot-2.20.1_p2.ebuild
@@ -26715,9 +26536,8 @@
 2206011140 ./sys-apps/findutils/findutils-4.9.0.ebuild
 2003160109 ./sys-apps/firejail-lts/firejail-lts-0.9.56.2-r1.ebuild
 2102210839 ./sys-apps/firejail-lts/firejail-lts-0.9.56.2-r2.ebuild
-2202180610 ./sys-apps/firejail/firejail-9999.ebuild
-2202210510 ./sys-apps/firejail/firejail-0.9.68.ebuild
 2203291040 ./sys-apps/firejail/firejail-0.9.68-r1.ebuild
+2206150910 ./sys-apps/firejail/firejail-0.9.70.ebuild
 2107310840 ./sys-apps/fix-gnustack/fix-gnustack-0.1.ebuild
 2205011048 ./sys-apps/flashrom/flashrom-1.2-r3.ebuild
 2205152110 ./sys-apps/flatpak/flatpak-1.12.3.ebuild
@@ -26730,7 +26550,7 @@
 2202281340 ./sys-apps/fwupd/fwupd-1.7.5.ebuild
 2205020512 ./sys-apps/fwupd/fwupd-1.8.0-r1.ebuild
 2205271640 ./sys-apps/fwupd/fwupd-1.7.7-r2.ebuild
-2205271710 ./sys-apps/fwupd/fwupd-1.8.1.ebuild
+2206132310 ./sys-apps/fwupd/fwupd-1.8.1.ebuild
 2205191440 ./sys-apps/fxload/fxload-20081013-r1.ebuild
 2205300610 ./sys-apps/gawk/gawk-5.1.1-r2.ebuild
 2201221539 ./sys-apps/gcp/gcp-0.2.1.ebuild
@@ -26819,7 +26639,8 @@
 2006291439 ./sys-apps/iucode_tool/iucode_tool-2.3.1-r1.ebuild
 2206030540 ./sys-apps/kbd/kbd-2.4.0.ebuild
 2206030540 ./sys-apps/kbd/kbd-2.5.0.ebuild
-2206030540 ./sys-apps/kbd/kbd-9999.ebuild
+2206162110 ./sys-apps/kbd/kbd-2.5.1.ebuild
+2206162110 ./sys-apps/kbd/kbd-9999.ebuild
 2101310343 ./sys-apps/kcheck/kcheck-0.0.2-r1.ebuild
 2101310343 ./sys-apps/kcheck/kcheck-9999.ebuild
 2204222110 ./sys-apps/kexec-tools/kexec-tools-2.0.22.ebuild
@@ -26827,10 +26648,12 @@
 2204222110 ./sys-apps/kexec-tools/kexec-tools-9999.ebuild
 2205110410 ./sys-apps/keyutils/keyutils-1.6.1.ebuild
 2205110410 ./sys-apps/keyutils/keyutils-1.6.3.ebuild
-2111090739 ./sys-apps/kmod/kmod-9999.ebuild
 2204291110 ./sys-apps/kmod/kmod-29.ebuild
+2206161910 ./sys-apps/kmod/kmod-29-r1.ebuild
+2206161910 ./sys-apps/kmod/kmod-9999.ebuild
 2110310339 ./sys-apps/kmscon/kmscon-8_p20180906-r2.ebuild
 2202192010 ./sys-apps/kmscon/kmscon-8_p20220214.ebuild
+2206141910 ./sys-apps/kmscon/kmscon-8_p20220214-r1.ebuild
 2002112051 ./sys-apps/lcdsplash/lcdsplash-0.3.ebuild
 2202100210 ./sys-apps/lcdutils/lcdutils-0.2-r2.ebuild
 2204290540 ./sys-apps/less/less-590.ebuild
@@ -26862,7 +26685,7 @@
 2204110710 ./sys-apps/mcstrans/mcstrans-9999.ebuild
 2206040410 ./sys-apps/mcstrans/mcstrans-3.4.ebuild
 2201181539 ./sys-apps/memtest86+/memtest86+-5.31b-r3.ebuild
-2206072110 ./sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild
+2206141910 ./sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild
 2201241610 ./sys-apps/memtest86-bin/memtest86-bin-9.4.ebuild
 2104161339 ./sys-apps/memtest86/memtest86-4.3.7-r2.ebuild
 2205051310 ./sys-apps/memtester/memtester-4.5.1.ebuild
@@ -26964,14 +26787,11 @@
 2205160710 ./sys-apps/rootlesskit/rootlesskit-0.14.2.ebuild
 2104060140 ./sys-apps/s390-tools/s390-tools-2.9.0.ebuild
 2204200309 ./sys-apps/s390-tools/s390-tools-2.12.0.ebuild
-2204241310 ./sys-apps/s6-linux-init/s6-linux-init-1.0.7.1.ebuild
 2205220940 ./sys-apps/s6-linux-init/s6-linux-init-1.0.7.3.ebuild
 2204241310 ./sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.7.ebuild
-2204241310 ./sys-apps/s6-portable-utils/s6-portable-utils-2.2.3.4.ebuild
 2205220940 ./sys-apps/s6-portable-utils/s6-portable-utils-2.2.4.0.ebuild
 2204241310 ./sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild
 2205241010 ./sys-apps/s6-rc/s6-rc-0.5.3.1.ebuild
-2204241310 ./sys-apps/s6/s6-2.11.0.1.ebuild
 2205220940 ./sys-apps/s6/s6-2.11.1.0.ebuild
 2107171439 ./sys-apps/salinfo/salinfo-1.2.ebuild
 2110010939 ./sys-apps/sandbox/sandbox-2.24.ebuild
@@ -27017,10 +26837,10 @@
 2201190139 ./sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.9.ebuild
 2206040540 ./sys-apps/systemd-tmpfiles/systemd-tmpfiles-250.ebuild
 2206081640 ./sys-apps/systemd/systemd-250.4-r2.ebuild
-2206081640 ./sys-apps/systemd/systemd-250.6.ebuild
-2206081640 ./sys-apps/systemd/systemd-250.7.ebuild
-2206081640 ./sys-apps/systemd/systemd-251.2.ebuild
-2206081640 ./sys-apps/systemd/systemd-9999.ebuild
+2206141840 ./sys-apps/systemd/systemd-250.6.ebuild
+2206141840 ./sys-apps/systemd/systemd-250.7.ebuild
+2206141840 ./sys-apps/systemd/systemd-251.2.ebuild
+2206141840 ./sys-apps/systemd/systemd-9999.ebuild
 2201040640 ./sys-apps/sysvinit/sysvinit-2.99-r1.ebuild
 2204291110 ./sys-apps/sysvinit/sysvinit-3.03.ebuild
 2204270710 ./sys-apps/sysvinit/sysvinit-3.04.ebuild
@@ -27081,8 +26901,8 @@
 2205151010 ./sys-apps/zram-generator/zram-generator-1.1.2.ebuild
 2202011339 ./sys-apps/uutils/uutils-0.0.12.ebuild
 2204041539 ./sys-apps/uutils/uutils-0.0.13.ebuild
-2206040540 ./sys-apps/systemd-utils/systemd-utils-250.6.ebuild
-2206030610 ./sys-apps/systemd-utils/systemd-utils-250.7.ebuild
+2206141840 ./sys-apps/systemd-utils/systemd-utils-250.6.ebuild
+2206141840 ./sys-apps/systemd-utils/systemd-utils-250.7.ebuild
 2206092310 ./sys-apps/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome-42.1.ebuild
 2206010010 ./sys-apps/eless/eless-0.7.ebuild
 2202121739 ./sys-auth/AusweisApp2/AusweisApp2-9999.ebuild
@@ -27165,10 +26985,12 @@
 2204280640 ./sys-auth/thinkfinger/thinkfinger-0.3-r3.ebuild
 2011160239 ./sys-auth/ykclient/ykclient-2.15.ebuild
 2110110009 ./sys-auth/ykpers/ykpers-1.20.0.ebuild
+2206151310 ./sys-auth/ykpers/ykpers-1.20.0-r1.ebuild
 2111191709 ./sys-auth/yubico-piv-tool/yubico-piv-tool-2.2.1.ebuild
 2204100239 ./sys-auth/yubico-piv-tool/yubico-piv-tool-2.3.0.ebuild
 2108012139 ./sys-auth/yubikey-personalization-gui/yubikey-personalization-gui-3.1.25.ebuild
 2206090240 ./sys-auth/solo1/solo1-0.1.1.ebuild
+2206150040 ./sys-auth/ssh-import-id/ssh-import-id-5.11.ebuild
 2204080009 ./sys-block/aoetools/aoetools-37.ebuild
 2202100210 ./sys-block/arcconf/arcconf-2.01.22270-r2.ebuild
 2202100210 ./sys-block/arcconf/arcconf-3.07.23971-r1.ebuild
@@ -27374,6 +27196,7 @@
 2203041240 ./sys-cluster/glusterfs/glusterfs-9.4-r1.ebuild
 2203041240 ./sys-cluster/glusterfs/glusterfs-9.5-r1.ebuild
 2205191340 ./sys-cluster/glusterfs/glusterfs-10.1-r1.ebuild
+2206151640 ./sys-cluster/glusterfs/glusterfs-10.2.ebuild
 2205160610 ./sys-cluster/gmqtt/gmqtt-0.4.1.ebuild
 2010050209 ./sys-cluster/hpl/hpl-2.0-r4.ebuild
 2010050209 ./sys-cluster/hpl/hpl-2.3.ebuild
@@ -27466,7 +27289,7 @@
 2202262209 ./sys-cluster/minikube/minikube-1.25.2.ebuild
 2203040040 ./sys-cluster/mpich/mpich-3.4.3.ebuild
 2201292339 ./sys-cluster/native-mpi/native-mpi-0-r1.ebuild
-2202162310 ./sys-cluster/nomad/nomad-1.2.6.ebuild
+2206141040 ./sys-cluster/nomad/nomad-1.2.6.ebuild
 2201292339 ./sys-cluster/nullmpi/nullmpi-0.7-r1.ebuild
 2203070740 ./sys-cluster/openmpi/openmpi-4.1.2.ebuild
 2206040440 ./sys-cluster/openmpi/openmpi-4.1.4.ebuild
@@ -27608,7 +27431,8 @@
 2104161439 ./sys-devel/gdb-apple/gdb-apple-1752.ebuild
 2206121640 ./sys-devel/gdb/gdb-11.2.ebuild
 2206121640 ./sys-devel/gdb/gdb-12.1.ebuild
-2206121640 ./sys-devel/gdb/gdb-9999.ebuild
+2206160140 ./sys-devel/gdb/gdb-12.1-r1.ebuild
+2206160140 ./sys-devel/gdb/gdb-9999.ebuild
 2204290540 ./sys-devel/gettext/gettext-0.21-r1.ebuild
 2204290540 ./sys-devel/gnuconfig/gnuconfig-20210107.ebuild
 2205110740 ./sys-devel/gnuconfig/gnuconfig-99999999.ebuild
@@ -27622,7 +27446,7 @@
 2206021140 ./sys-devel/kgcc64/kgcc64-9.4.0.ebuild
 2104060140 ./sys-devel/libtool/libtool-2.4.6-r6.ebuild
 2203250640 ./sys-devel/libtool/libtool-9999.ebuild
-2204290540 ./sys-devel/libtool/libtool-2.4.7.ebuild
+2206141040 ./sys-devel/libtool/libtool-2.4.7.ebuild
 2109110940 ./sys-devel/lld/lld-12.0.1.ebuild
 2204150310 ./sys-devel/lld/lld-14.0.1.ebuild
 2204212010 ./sys-devel/lld/lld-13.0.1.ebuild
@@ -27681,8 +27505,8 @@
 2111141240 ./sys-devel/smatch/smatch-1.60.ebuild
 2111141240 ./sys-devel/smatch/smatch-1.72.ebuild
 2111141240 ./sys-devel/smatch/smatch-9999.ebuild
-2204150511 ./sys-devel/sparse/sparse-0.6.4-r1.ebuild
-2204150511 ./sys-devel/sparse/sparse-9999.ebuild
+2206161510 ./sys-devel/sparse/sparse-0.6.4-r2.ebuild
+2206161110 ./sys-devel/sparse/sparse-9999.ebuild
 2106011409 ./sys-devel/ucpp/ucpp-1.3.5.ebuild
 2201120040 ./sys-fabric/mstflint/mstflint-4.18.0_p1-r1.ebuild
 2106300039 ./sys-fabric/opensm/opensm-3.3.23-r1.ebuild
@@ -27758,22 +27582,22 @@
 2102161539 ./sys-fs/avfs/avfs-1.1.3.ebuild
 2205051710 ./sys-fs/avfs/avfs-1.1.4.ebuild
 2109072209 ./sys-fs/bashmount/bashmount-4.3.2-r1.ebuild
-2112151439 ./sys-fs/bcache-tools/bcache-tools-9999.ebuild
-2204072009 ./sys-fs/bcache-tools/bcache-tools-1.1-r1.ebuild
+2206161510 ./sys-fs/bcache-tools/bcache-tools-1.1-r1.ebuild
+2206161510 ./sys-fs/bcache-tools/bcache-tools-9999.ebuild
 2107090340 ./sys-fs/bees/bees-0.6.5-r1.ebuild
 2107090340 ./sys-fs/bees/bees-9999.ebuild
 2205301111 ./sys-fs/bees/bees-0.7.ebuild
 2102032339 ./sys-fs/bindfs/bindfs-1.14.9.ebuild
 2102162039 ./sys-fs/bindfs/bindfs-1.15.0.ebuild
 2102180539 ./sys-fs/bindfs/bindfs-1.15.1.ebuild
-2109132339 ./sys-fs/btrfs-progs/btrfs-progs-5.10.1-r1.ebuild
-2112310609 ./sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild
-2201250240 ./sys-fs/btrfs-progs/btrfs-progs-5.16.ebuild
-2205051040 ./sys-fs/btrfs-progs/btrfs-progs-5.16.2.ebuild
-2205060310 ./sys-fs/btrfs-progs/btrfs-progs-5.17.ebuild
-2205260310 ./sys-fs/btrfs-progs/btrfs-progs-5.18.ebuild
-2206070840 ./sys-fs/btrfs-progs/btrfs-progs-5.18.1-r1.ebuild
-2206070840 ./sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
+2206151910 ./sys-fs/btrfs-progs/btrfs-progs-5.10.1-r1.ebuild
+2206151910 ./sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild
+2206151910 ./sys-fs/btrfs-progs/btrfs-progs-5.16.2.ebuild
+2206151910 ./sys-fs/btrfs-progs/btrfs-progs-5.16.ebuild
+2206151910 ./sys-fs/btrfs-progs/btrfs-progs-5.17.ebuild
+2206151910 ./sys-fs/btrfs-progs/btrfs-progs-5.18.1-r1.ebuild
+2206151910 ./sys-fs/btrfs-progs/btrfs-progs-5.18.ebuild
+2206151910 ./sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
 2002112051 ./sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.2.ebuild
 2201110540 ./sys-fs/btrfsmaintenance/btrfsmaintenance-0.5.ebuild
 2202140039 ./sys-fs/cachefilesd/cachefilesd-0.10.10-r1.ebuild
@@ -27810,8 +27634,8 @@
 2112021709 ./sys-fs/encfs/encfs-1.9.5-r1.ebuild
 2112071009 ./sys-fs/encfs/encfs-1.9.5-r2.ebuild
 2204290810 ./sys-fs/eudev/eudev-3.2.11-r2.ebuild
-2206070513 ./sys-fs/eudev/eudev-9999.ebuild
-2206100610 ./sys-fs/eudev/eudev-3.2.12_pre2.ebuild
+2206160410 ./sys-fs/eudev/eudev-3.2.12_pre3.ebuild
+2206160410 ./sys-fs/eudev/eudev-9999.ebuild
 2204072009 ./sys-fs/exfat-utils/exfat-utils-1.3.0.ebuild
 2205051040 ./sys-fs/exfatprogs/exfatprogs-1.1.3.ebuild
 2205051040 ./sys-fs/exfatprogs/exfatprogs-9999.ebuild
@@ -27871,7 +27695,7 @@
 2204241840 ./sys-fs/lvm2/lvm2-2.02.188-r2.ebuild
 2205081940 ./sys-fs/lvm2/lvm2-2.03.14-r1.ebuild
 2205221140 ./sys-fs/lxcfs/lxcfs-4.0.12.ebuild
-2206121940 ./sys-fs/lxcfs/lxcfs-5.0.0_p20220524.ebuild
+2206141740 ./sys-fs/lxcfs/lxcfs-5.0.0_p20220524.ebuild
 2204080009 ./sys-fs/mac-fdisk/mac-fdisk-0.1_p18.ebuild
 2206012210 ./sys-fs/mac-fdisk/mac-fdisk-0.1_p18-r1.ebuild
 2109180510 ./sys-fs/mdadm/mdadm-4.1.ebuild
@@ -27991,10 +27815,15 @@
 2206062040 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.120.ebuild
 2206062040 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.45.ebuild
 2206062040 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.17.13.ebuild
-2206070810 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.197.ebuild
-2206092140 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.121.ebuild
-2206092140 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.46.ebuild
 2206092140 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.17.14.ebuild
+2206161910 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.121.ebuild
+2206151740 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.122.ebuild
+2206161910 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.46.ebuild
+2206151740 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.47.ebuild
+2206151740 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.17.15.ebuild
+2206152240 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.18.4.ebuild
+2206161910 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.197.ebuild
+2206151740 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.198.ebuild
 2205181810 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.17.9.ebuild
 2205220940 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.10.117.ebuild
 2205220340 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.15.41.ebuild
@@ -28009,10 +27838,15 @@
 2206062040 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.10.120.ebuild
 2206062040 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.15.45.ebuild
 2206062040 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.17.13.ebuild
-2206070810 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.4.197.ebuild
-2206092140 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.10.121.ebuild
-2206092140 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.15.46.ebuild
 2206092140 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.17.14.ebuild
+2206161910 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.10.121.ebuild
+2206151740 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.10.122.ebuild
+2206161910 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.15.46.ebuild
+2206151740 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.15.47.ebuild
+2206151740 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.17.15.ebuild
+2206152240 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.18.4.ebuild
+2206161910 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.4.197.ebuild
+2206151740 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.4.198.ebuild
 2205160210 ./sys-kernel/gentoo-sources/gentoo-sources-4.19.243.ebuild
 2205160210 ./sys-kernel/gentoo-sources/gentoo-sources-5.17.8.ebuild
 2205181340 ./sys-kernel/gentoo-sources/gentoo-sources-5.17.9.ebuild
@@ -28048,19 +27882,32 @@
 2206091540 ./sys-kernel/gentoo-sources/gentoo-sources-5.15.46.ebuild
 2206091540 ./sys-kernel/gentoo-sources/gentoo-sources-5.17.14.ebuild
 2206091540 ./sys-kernel/gentoo-sources/gentoo-sources-5.18.3.ebuild
+2206141940 ./sys-kernel/gentoo-sources/gentoo-sources-4.14.283.ebuild
+2206161540 ./sys-kernel/gentoo-sources/gentoo-sources-4.14.284.ebuild
+2206141940 ./sys-kernel/gentoo-sources/gentoo-sources-4.19.247.ebuild
+2206161540 ./sys-kernel/gentoo-sources/gentoo-sources-4.19.248.ebuild
+2206141940 ./sys-kernel/gentoo-sources/gentoo-sources-4.9.318.ebuild
+2206161540 ./sys-kernel/gentoo-sources/gentoo-sources-4.9.319.ebuild
+2206142110 ./sys-kernel/gentoo-sources/gentoo-sources-5.10.122.ebuild
+2206161540 ./sys-kernel/gentoo-sources/gentoo-sources-5.10.123.ebuild
+2206142110 ./sys-kernel/gentoo-sources/gentoo-sources-5.15.47.ebuild
+2206161540 ./sys-kernel/gentoo-sources/gentoo-sources-5.15.48.ebuild
+2206142110 ./sys-kernel/gentoo-sources/gentoo-sources-5.17.15.ebuild
+2206142110 ./sys-kernel/gentoo-sources/gentoo-sources-5.18.4.ebuild
+2206161540 ./sys-kernel/gentoo-sources/gentoo-sources-5.18.5.ebuild
+2206142110 ./sys-kernel/gentoo-sources/gentoo-sources-5.4.198.ebuild
+2206161540 ./sys-kernel/gentoo-sources/gentoo-sources-5.4.199.ebuild
 2206061542 ./sys-kernel/git-sources/git-sources-5.19_rc1.ebuild
 2206130340 ./sys-kernel/git-sources/git-sources-5.19_rc2.ebuild
 2204290540 ./sys-kernel/installkernel-gentoo/installkernel-gentoo-5.ebuild
 2106270109 ./sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-1.ebuild
 2206011740 ./sys-kernel/kergen/kergen-0.1.5.ebuild
-2008081539 ./sys-kernel/kpatch/kpatch-0.6.3-r1.ebuild
-2008081539 ./sys-kernel/kpatch/kpatch-0.7.1-r1.ebuild
 1912110241 ./sys-kernel/kpatch/kpatch-9999.ebuild
 2206110910 ./sys-kernel/kpatch/kpatch-0.9.4.ebuild
+2206152110 ./sys-kernel/kpatch/kpatch-0.9.6.ebuild
 2204102110 ./sys-kernel/linux-docs/linux-docs-5.15.33.ebuild
 2203122239 ./sys-kernel/linux-firmware/linux-firmware-20220310.ebuild
 2203122239 ./sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
-2203181710 ./sys-kernel/linux-firmware/linux-firmware-20210518.ebuild
 2203181710 ./sys-kernel/linux-firmware/linux-firmware-20210629.ebuild
 2203181710 ./sys-kernel/linux-firmware/linux-firmware-20210716.ebuild
 2203181710 ./sys-kernel/linux-firmware/linux-firmware-20210818.ebuild
@@ -28070,6 +27917,7 @@
 2203181710 ./sys-kernel/linux-firmware/linux-firmware-20220209.ebuild
 2204131910 ./sys-kernel/linux-firmware/linux-firmware-20220411.ebuild
 2205191140 ./sys-kernel/linux-firmware/linux-firmware-20220509.ebuild
+2206131440 ./sys-kernel/linux-firmware/linux-firmware-20220610.ebuild
 2203202040 ./sys-kernel/linux-headers/linux-headers-5.10-r2.ebuild
 2203202040 ./sys-kernel/linux-headers/linux-headers-5.15-r3.ebuild
 2203202040 ./sys-kernel/linux-headers/linux-headers-5.16.ebuild
@@ -28100,12 +27948,11 @@
 2203220510 ./sys-kernel/raspberrypi-sources/raspberrypi-sources-5.10.9999.ebuild
 2204092310 ./sys-kernel/raspberrypi-sources/raspberrypi-sources-5.10.63_p20211029.ebuild
 2204260810 ./sys-kernel/raspberrypi-sources/raspberrypi-sources-5.15.32_p20220331-r1.ebuild
-2202042109 ./sys-kernel/rt-sources/rt-sources-5.16.2_p19.ebuild
-2203251139 ./sys-kernel/rt-sources/rt-sources-4.19.235_p106.ebuild
-2203251139 ./sys-kernel/rt-sources/rt-sources-5.10.106_p64.ebuild
-2203251139 ./sys-kernel/rt-sources/rt-sources-5.15.29_p37.ebuild
-2203251139 ./sys-kernel/rt-sources/rt-sources-5.4.182_p72-r1.ebuild
-2205052040 ./sys-kernel/rt-sources/rt-sources-4.19.237_p107.ebuild
+2206151940 ./sys-kernel/rt-sources/rt-sources-4.19.246_p110.ebuild
+2206151940 ./sys-kernel/rt-sources/rt-sources-5.10.120_p70.ebuild
+2206151940 ./sys-kernel/rt-sources/rt-sources-5.15.44_p46.ebuild
+2206151940 ./sys-kernel/rt-sources/rt-sources-5.18_p11.ebuild
+2206151940 ./sys-kernel/rt-sources/rt-sources-5.4.193_p74.ebuild
 2205181810 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.10.117.ebuild
 2205181810 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.15.41.ebuild
 2205181810 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.17.9.ebuild
@@ -28124,14 +27971,19 @@
 2206092140 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.10.121.ebuild
 2206092140 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.15.46.ebuild
 2206092140 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.17.14.ebuild
-2206061040 ./sys-kernel/vanilla-sources/vanilla-sources-4.14.282.ebuild
-2206061040 ./sys-kernel/vanilla-sources/vanilla-sources-4.19.246.ebuild
-2206061040 ./sys-kernel/vanilla-sources/vanilla-sources-4.9.317.ebuild
-2206061040 ./sys-kernel/vanilla-sources/vanilla-sources-5.4.197.ebuild
-2206091410 ./sys-kernel/vanilla-sources/vanilla-sources-5.10.121.ebuild
-2206091410 ./sys-kernel/vanilla-sources/vanilla-sources-5.15.46.ebuild
-2206091410 ./sys-kernel/vanilla-sources/vanilla-sources-5.17.14.ebuild
-2206091410 ./sys-kernel/vanilla-sources/vanilla-sources-5.18.3.ebuild
+2206151740 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.10.122.ebuild
+2206151740 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.15.47.ebuild
+2206151740 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.17.15.ebuild
+2206152240 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.18.4.ebuild
+2206151740 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.4.198.ebuild
+2206161510 ./sys-kernel/vanilla-sources/vanilla-sources-4.14.284.ebuild
+2206161510 ./sys-kernel/vanilla-sources/vanilla-sources-4.19.248.ebuild
+2206161510 ./sys-kernel/vanilla-sources/vanilla-sources-4.9.319.ebuild
+2206161510 ./sys-kernel/vanilla-sources/vanilla-sources-5.10.123.ebuild
+2206161510 ./sys-kernel/vanilla-sources/vanilla-sources-5.15.48.ebuild
+2206142040 ./sys-kernel/vanilla-sources/vanilla-sources-5.17.15.ebuild
+2206161510 ./sys-kernel/vanilla-sources/vanilla-sources-5.18.5.ebuild
+2206161510 ./sys-kernel/vanilla-sources/vanilla-sources-5.4.199.ebuild
 2201310039 ./sys-kernel/zen-sources/zen-sources-5.15.10.ebuild
 2203301840 ./sys-kernel/zen-sources/zen-sources-5.17.1.ebuild
 2101091409 ./sys-libs/argp-standalone/argp-standalone-1.3-r2.ebuild
@@ -28202,14 +28054,13 @@
 2205060310 ./sys-libs/libaal/libaal-1.0.7-r2.ebuild
 2202100940 ./sys-libs/libapparmor/libapparmor-3.0.1.ebuild
 2202100940 ./sys-libs/libapparmor/libapparmor-3.0.3.ebuild
-2206121910 ./sys-libs/libapparmor/libapparmor-3.0.3-r1.ebuild
+2206150040 ./sys-libs/libapparmor/libapparmor-3.0.3-r1.ebuild
 2205190840 ./sys-libs/libavc1394/libavc1394-0.5.4-r2.ebuild
 2205260840 ./sys-libs/libblockdev/libblockdev-2.26.ebuild
 2206011540 ./sys-libs/libblockdev/libblockdev-2.27.ebuild
 2206011540 ./sys-libs/libblockdev/libblockdev-9999.ebuild
 2110312339 ./sys-libs/libcap-ng/libcap-ng-0.8.2-r1.ebuild
 2206021040 ./sys-libs/libcap-ng/libcap-ng-0.8.3.ebuild
-2203122339 ./sys-libs/libcap/libcap-2.63.ebuild
 2205080540 ./sys-libs/libcap/libcap-9999.ebuild
 2205221140 ./sys-libs/libcap/libcap-2.64.ebuild
 2203301740 ./sys-libs/libchipcard/libchipcard-5.1.5_rc2.ebuild
@@ -28357,7 +28208,7 @@
 2108282340 ./sys-power/acpilight/acpilight-1.2-r3.ebuild
 2206091110 ./sys-power/acpilight/acpilight-1.2-r4.ebuild
 2104252209 ./sys-power/acpitool/acpitool-0.5.1-r2.ebuild
-2201041339 ./sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild
+2206161940 ./sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild
 2012281809 ./sys-power/athcool/athcool-0.3.12.ebuild
 2205280040 ./sys-power/bbswitch/bbswitch-0.8_p20211129.ebuild
 2201110210 ./sys-power/cpupower/cpupower-5.12.ebuild
@@ -28508,10 +28359,15 @@
 2206062040 ./virtual/dist-kernel/dist-kernel-5.10.120.ebuild
 2206062040 ./virtual/dist-kernel/dist-kernel-5.15.45.ebuild
 2206062040 ./virtual/dist-kernel/dist-kernel-5.17.13.ebuild
-2206070810 ./virtual/dist-kernel/dist-kernel-5.4.197.ebuild
-2206092140 ./virtual/dist-kernel/dist-kernel-5.10.121.ebuild
-2206092140 ./virtual/dist-kernel/dist-kernel-5.15.46.ebuild
 2206092140 ./virtual/dist-kernel/dist-kernel-5.17.14.ebuild
+2206161910 ./virtual/dist-kernel/dist-kernel-5.10.121.ebuild
+2206151740 ./virtual/dist-kernel/dist-kernel-5.10.122.ebuild
+2206161910 ./virtual/dist-kernel/dist-kernel-5.15.46.ebuild
+2206151740 ./virtual/dist-kernel/dist-kernel-5.15.47.ebuild
+2206151740 ./virtual/dist-kernel/dist-kernel-5.17.15.ebuild
+2206152240 ./virtual/dist-kernel/dist-kernel-5.18.4.ebuild
+2206161910 ./virtual/dist-kernel/dist-kernel-5.4.197.ebuild
+2206151740 ./virtual/dist-kernel/dist-kernel-5.4.198.ebuild
 2106280039 ./virtual/dotnet-sdk/dotnet-sdk-5.0.ebuild
 2111220609 ./virtual/dotnet-sdk/dotnet-sdk-6.0.ebuild
 2202122309 ./virtual/dotnet-sdk/dotnet-sdk-3.1.ebuild
@@ -28927,8 +28783,8 @@
 2205282310 ./www-apps/miniflux/miniflux-2.0.37.ebuild
 2206020040 ./www-client/chromium/chromium-102.0.5005.61.ebuild
 2206030940 ./www-client/chromium/chromium-103.0.5060.33.ebuild
-2206101540 ./www-client/chromium/chromium-102.0.5005.115.ebuild
-2206111410 ./www-client/chromium/chromium-104.0.5110.0.ebuild
+2206140040 ./www-client/chromium/chromium-102.0.5005.115.ebuild
+2206142010 ./www-client/chromium/chromium-104.0.5110.0.ebuild
 2203260310 ./www-client/dillo/dillo-3.0.5-r3.ebuild
 2203260310 ./www-client/dillo/dillo-3.1_pre20181005.ebuild
 2203260310 ./www-client/dillo/dillo-9999.ebuild
@@ -28941,11 +28797,9 @@
 2104121139 ./www-client/fetch/fetch-1.0-r4.ebuild
 2206010840 ./www-client/firefox-bin/firefox-bin-91.10.0.ebuild
 2206090910 ./www-client/firefox-bin/firefox-bin-101.0.1.ebuild
-2205312140 ./www-client/firefox/firefox-101.0.ebuild
-2206051710 ./www-client/firefox/firefox-101.0-r10.ebuild
-2206092010 ./www-client/firefox/firefox-101.0.1-r10.ebuild
-2206091940 ./www-client/firefox/firefox-101.0.1.ebuild
 2206092140 ./www-client/firefox/firefox-91.10.0.ebuild
+2206151440 ./www-client/firefox/firefox-101.0.1-r10.ebuild
+2206151440 ./www-client/firefox/firefox-101.0.1.ebuild
 2206091140 ./www-client/google-chrome-beta/google-chrome-beta-103.0.5060.42.ebuild
 2206111410 ./www-client/google-chrome-unstable/google-chrome-unstable-104.0.5110.0.ebuild
 2206101540 ./www-client/google-chrome/google-chrome-102.0.5005.115.ebuild
@@ -28964,37 +28818,37 @@
 2205312340 ./www-client/microsoft-edge-dev/microsoft-edge-dev-103.0.1264.11.ebuild
 2206021440 ./www-client/microsoft-edge-dev/microsoft-edge-dev-104.0.1271.2.ebuild
 2206091140 ./www-client/microsoft-edge-dev/microsoft-edge-dev-104.0.1278.2.ebuild
-2206101540 ./www-client/microsoft-edge/microsoft-edge-102.0.1245.39.ebuild
+2206141210 ./www-client/microsoft-edge/microsoft-edge-102.0.1245.41.ebuild
 2107180040 ./www-client/netrik/netrik-1.16.1-r3.ebuild
 2203222209 ./www-client/netsurf/netsurf-3.10-r6.ebuild
-2205191940 ./www-client/opera-beta/opera-beta-88.0.4412.13.ebuild
-2205271640 ./www-client/opera-beta/opera-beta-88.0.4412.18.ebuild
-2206030910 ./www-client/opera-beta/opera-beta-88.0.4412.20.ebuild
-2205242210 ./www-client/opera-developer/opera-developer-89.0.4428.0.ebuild
+2206141210 ./www-client/opera-beta/opera-beta-88.0.4412.18-r1.ebuild
+2206141210 ./www-client/opera-beta/opera-beta-88.0.4412.20-r1.ebuild
+2206151940 ./www-client/opera-beta/opera-beta-89.0.4447.12.ebuild
 2205311340 ./www-client/opera-developer/opera-developer-89.0.4436.0.ebuild
 2206071040 ./www-client/opera-developer/opera-developer-89.0.4443.0.ebuild
-2206091140 ./www-client/opera/opera-88.0.4412.27.ebuild
+2206141210 ./www-client/opera-developer/opera-developer-90.0.4450.0.ebuild
+2206141210 ./www-client/opera/opera-88.0.4412.40.ebuild
 2101102339 ./www-client/otter/otter-9999.ebuild
 2204082210 ./www-client/otter/otter-1.0.03.ebuild
 2109280109 ./www-client/pybugz/pybugz-0.13-r1.ebuild
 2204172310 ./www-client/pybugz/pybugz-9999.ebuild
 2206010610 ./www-client/pybugz/pybugz-0.13-r2.ebuild
 2204210809 ./www-client/qutebrowser/qutebrowser-2.5.0.ebuild
-2206111640 ./www-client/qutebrowser/qutebrowser-2.5.1.ebuild
 2206111640 ./www-client/qutebrowser/qutebrowser-9999.ebuild
+2206161640 ./www-client/qutebrowser/qutebrowser-2.5.1.ebuild
 2205170840 ./www-client/seamonkey/seamonkey-2.53.10.2.ebuild
 2205170840 ./www-client/seamonkey/seamonkey-2.53.11-r1.ebuild
 2205170840 ./www-client/seamonkey/seamonkey-2.53.11.1.ebuild
 2205170840 ./www-client/seamonkey/seamonkey-2.53.11.ebuild
-2205170840 ./www-client/seamonkey/seamonkey-2.53.12.ebuild
+2206161940 ./www-client/seamonkey/seamonkey-2.53.12.ebuild
 2206091110 ./www-client/surf/surf-2.1-r1.ebuild
 2206091110 ./www-client/surf/surf-9999.ebuild
 2103060139 ./www-client/surfraw/surfraw-2.3.0-r3.ebuild
 2009241739 ./www-client/surfraw/surfraw-99999.ebuild
 2106222139 ./www-client/uget/uget-2.2.1-r1.ebuild
 2105292209 ./www-client/uget/uget-9999.ebuild
-2206081140 ./www-client/vivaldi-snapshot/vivaldi-snapshot-5.3.2679.46.ebuild
 2206111410 ./www-client/vivaldi-snapshot/vivaldi-snapshot-5.3.2679.50.ebuild
+2206160140 ./www-client/vivaldi-snapshot/vivaldi-snapshot-5.4.2704.3.ebuild
 2206121142 ./www-client/vivaldi/vivaldi-5.3.2679.51.ebuild
 2206121142 ./www-client/vivaldi/vivaldi-5.3.2679.55.ebuild
 2107170109 ./www-client/w3m/w3m-0.5.3_p20210102.ebuild
@@ -29080,15 +28934,16 @@
 2111181009 ./www-servers/thin/thin-1.8.1.ebuild
 2107202209 ./www-servers/thttpd/thttpd-2.27.1-r2.ebuild
 2107202209 ./www-servers/thttpd/thttpd-9999.ebuild
-2205161540 ./www-servers/tomcat/tomcat-10.0.21.ebuild
-2205161810 ./www-servers/tomcat/tomcat-9.0.63.ebuild
-2205241040 ./www-servers/tomcat/tomcat-8.5.79.ebuild
 2205311040 ./www-servers/tomcat/tomcat-10.0.20.ebuild
 2205311040 ./www-servers/tomcat/tomcat-9.0.62.ebuild
 2206011440 ./www-servers/tomcat/tomcat-7.0.109-r1.ebuild
 2206011140 ./www-servers/tomcat/tomcat-8.5.78-r1.ebuild
 2206120710 ./www-servers/tomcat/tomcat-10.0.22.ebuild
 2206101010 ./www-servers/tomcat/tomcat-9.0.64.ebuild
+2206160940 ./www-servers/tomcat/tomcat-10.0.21.ebuild
+2206160940 ./www-servers/tomcat/tomcat-8.5.79.ebuild
+2206140710 ./www-servers/tomcat/tomcat-8.5.81.ebuild
+2206160940 ./www-servers/tomcat/tomcat-9.0.63.ebuild
 2205010512 ./www-servers/tornado/tornado-6.1.ebuild
 2205131240 ./www-servers/tornado/tornado-6.1-r1.ebuild
 2203230410 ./www-servers/uwsgi/uwsgi-2.0.19.1-r109.ebuild
@@ -29194,7 +29049,8 @@
 2110220439 ./x11-apps/xwininfo/xwininfo-1.1.5.ebuild
 2110220439 ./x11-apps/xwud/xwud-1.0.5-r1.ebuild
 2201011839 ./x11-base/xcb-proto/xcb-proto-1.14.1.ebuild
-2205080640 ./x11-base/xcb-proto/xcb-proto-1.15.ebuild
+2206161940 ./x11-base/xcb-proto/xcb-proto-1.15.1.ebuild
+2206161840 ./x11-base/xcb-proto/xcb-proto-1.15.ebuild
 2104060140 ./x11-base/xorg-drivers/xorg-drivers-1.20-r2.ebuild
 2205081040 ./x11-base/xorg-drivers/xorg-drivers-21.1.ebuild
 2205081040 ./x11-base/xorg-drivers/xorg-drivers-9999.ebuild
@@ -29206,8 +29062,8 @@
 2206101040 ./x11-base/xorg-server/xorg-server-21.1.3-r3.ebuild
 2110220439 ./x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild
 2205171210 ./x11-base/xwayland/xwayland-9999.ebuild
-2205251310 ./x11-base/xwayland/xwayland-22.1.2.ebuild
 2205280440 ./x11-base/xwayland/xwayland-22.1.1.ebuild
+2206161840 ./x11-base/xwayland/xwayland-22.1.2.ebuild
 2204040610 ./x11-base/xorg-sgml-doctools/xorg-sgml-doctools-1.12.ebuild
 2206122010 ./x11-drivers/nvidia-drivers/nvidia-drivers-390.151.ebuild
 2206122010 ./x11-drivers/nvidia-drivers/nvidia-drivers-470.129.06.ebuild
@@ -29217,8 +29073,8 @@
 2205260840 ./x11-drivers/xf86-input-elographics/xf86-input-elographics-1.4.2.ebuild
 2205251910 ./x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.6.ebuild
 2205251910 ./x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.3.ebuild
-2205081040 ./x11-drivers/xf86-input-libinput/xf86-input-libinput-1.2.1.ebuild
 2205131610 ./x11-drivers/xf86-input-libinput/xf86-input-libinput-1.2.0.ebuild
+2206161840 ./x11-drivers/xf86-input-libinput/xf86-input-libinput-1.2.1.ebuild
 2012231444 ./x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.5.0.ebuild
 2205260840 ./x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.9.1.ebuild
 2105021839 ./x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-13.1.0-r1.ebuild
@@ -29324,8 +29180,8 @@
 2205100440 ./x11-libs/libdmx/libdmx-1.1.4.ebuild
 2203110039 ./x11-libs/libdockapp/libdockapp-0.7.3.ebuild
 2205280440 ./x11-libs/libdrm/libdrm-2.4.110.ebuild
-2206041540 ./x11-libs/libdrm/libdrm-2.4.111.ebuild
 2206041540 ./x11-libs/libdrm/libdrm-9999.ebuild
+2206161840 ./x11-libs/libdrm/libdrm-2.4.111.ebuild
 2109010039 ./x11-libs/libfakeXinerama/libfakeXinerama-0.1.0.ebuild
 2111230440 ./x11-libs/libfakekey/libfakekey-0.3-r1.ebuild
 2205251440 ./x11-libs/libfm-extra/libfm-extra-1.3.2.ebuild
@@ -29356,6 +29212,7 @@
 2205091310 ./x11-libs/libva-intel-media-driver/libva-intel-media-driver-22.3.1.ebuild
 2205140210 ./x11-libs/libva-intel-media-driver/libva-intel-media-driver-22.4.1.ebuild
 2205292210 ./x11-libs/libva-intel-media-driver/libva-intel-media-driver-22.4.2.ebuild
+2206132240 ./x11-libs/libva-intel-media-driver/libva-intel-media-driver-22.4.3.ebuild
 2103261839 ./x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r5.ebuild
 2202020039 ./x11-libs/libva/libva-2.13.0-r2.ebuild
 2205130940 ./x11-libs/libva/libva-2.14.0.ebuild
@@ -29364,19 +29221,19 @@
 2104150839 ./x11-libs/libwnck/libwnck-2.31.0-r1.ebuild
 2203160010 ./x11-libs/libwnck/libwnck-40.1.ebuild
 2201011839 ./x11-libs/libxcb/libxcb-1.14.ebuild
-2205080640 ./x11-libs/libxcb/libxcb-1.15.ebuild
+2206161840 ./x11-libs/libxcb/libxcb-1.15.ebuild
 2205081040 ./x11-libs/libxcvt/libxcvt-0.1.1.ebuild
 2205081040 ./x11-libs/libxcvt/libxcvt-9999.ebuild
-2205242140 ./x11-libs/libxkbcommon/libxkbcommon-1.4.1.ebuild
 2205280440 ./x11-libs/libxkbcommon/libxkbcommon-1.4.0.ebuild
+2206161840 ./x11-libs/libxkbcommon/libxkbcommon-1.4.1.ebuild
 2205081040 ./x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild
 2105290309 ./x11-libs/libxklavier/libxklavier-5.4.ebuild
 2205081040 ./x11-libs/libxshmfence/libxshmfence-1.3-r2.ebuild
 2201012339 ./x11-libs/motif/motif-2.3.8-r2.ebuild
-2203302040 ./x11-libs/motif/motif-2.3.8-r3.ebuild
+2206161210 ./x11-libs/motif/motif-2.3.8-r3.ebuild
 2108051709 ./x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild
 2205090840 ./x11-libs/pango/pango-1.42.4-r2.ebuild
-2205311240 ./x11-libs/pango/pango-1.50.7.ebuild
+2206141840 ./x11-libs/pango/pango-1.50.7.ebuild
 2205150440 ./x11-libs/pixman/pixman-0.40.0.ebuild
 2205150440 ./x11-libs/pixman/pixman-9999.ebuild
 2108031409 ./x11-libs/qscintilla/qscintilla-2.11.6.ebuild
@@ -29593,7 +29450,7 @@
 2012232339 ./x11-misc/prime-run/prime-run-1.0.ebuild
 2102141909 ./x11-misc/primus/primus-0.2-r3.ebuild
 2205050010 ./x11-misc/projecteur/projecteur-0.9.2.ebuild
-2204221809 ./x11-misc/py3status/py3status-3.44.ebuild
+2206161710 ./x11-misc/py3status/py3status-3.45.ebuild
 2005202109 ./x11-misc/qarma/qarma-1.ebuild
 2107041710 ./x11-misc/qcomicbook/qcomicbook-0.9.1.ebuild
 2006040939 ./x11-misc/qlipper/qlipper-5.1.2.ebuild
@@ -29759,8 +29616,8 @@
 1803171138 ./x11-misc/xkblayout-state/xkblayout-state-9999.ebuild
 2203200340 ./x11-misc/xkbset/xkbset-0.5_p7_p1.ebuild
 2205280440 ./x11-misc/xkeyboard-config/xkeyboard-config-2.35.1.ebuild
-2206041540 ./x11-misc/xkeyboard-config/xkeyboard-config-2.36.ebuild
 2206041540 ./x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
+2206161840 ./x11-misc/xkeyboard-config/xkeyboard-config-2.36.ebuild
 2104151009 ./x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild
 2104261409 ./x11-misc/xlockmore/xlockmore-5.66.ebuild
 2203231209 ./x11-misc/xlockmore/xlockmore-5.69.ebuild
@@ -29823,13 +29680,14 @@
 1805220439 ./x11-plugins/allin1/allin1-0.5.0-r2.ebuild
 2104200509 ./x11-plugins/asapm/asapm-3.1-r1.ebuild
 2101022339 ./x11-plugins/asclock/asclock-2.0.12-r3.ebuild
+2206152340 ./x11-plugins/asclock/asclock-2.0.12-r4.ebuild
 1805220439 ./x11-plugins/ascpu/ascpu-1.11-r1.ebuild
 2203200340 ./x11-plugins/asmem/asmem-1.12-r1.ebuild
 2103050239 ./x11-plugins/asmon/asmon-0.71-r1.ebuild
 2002230040 ./x11-plugins/astime/astime-2.8-r2.ebuild
 2112041339 ./x11-plugins/bfm/bfm-0.6.4-r3.ebuild
 2104192239 ./x11-plugins/bubblemon/bubblemon-1.46-r3.ebuild
-2005090209 ./x11-plugins/cputnik/cputnik-0.2.0-r1.ebuild
+2206152340 ./x11-plugins/cputnik/cputnik-0.2.0-r1.ebuild
 2112201210 ./x11-plugins/docker/docker-1.5-r2.ebuild
 1908180209 ./x11-plugins/e16-epplets/e16-epplets-0.16.ebuild
 2003252139 ./x11-plugins/enigmail/enigmail-2.0.12-r1.ebuild
@@ -30034,10 +29892,10 @@
 2205162240 ./x11-terms/guake/guake-3.8.5.ebuild
 2111031010 ./x11-terms/kitty-terminfo/kitty-terminfo-9999.ebuild
 2206021840 ./x11-terms/kitty-terminfo/kitty-terminfo-0.25.1.ebuild
-2206071310 ./x11-terms/kitty-terminfo/kitty-terminfo-0.25.2.ebuild
+2206161640 ./x11-terms/kitty-terminfo/kitty-terminfo-0.25.2.ebuild
 2205260940 ./x11-terms/kitty/kitty-9999.ebuild
 2206021840 ./x11-terms/kitty/kitty-0.25.1.ebuild
-2206071310 ./x11-terms/kitty/kitty-0.25.2.ebuild
+2206161640 ./x11-terms/kitty/kitty-0.25.2.ebuild
 2104160809 ./x11-terms/kterm/kterm-6.2.0-r7.ebuild
 2112020339 ./x11-terms/lilyterm/lilyterm-0.9.9.4-r2.ebuild
 2112020339 ./x11-terms/lilyterm/lilyterm-99999.ebuild
@@ -30072,7 +29930,7 @@
 2205211240 ./x11-terms/zutty/zutty-0.12.ebuild
 2204120240 ./x11-terms/kitty-shell-integration/kitty-shell-integration-9999.ebuild
 2206021840 ./x11-terms/kitty-shell-integration/kitty-shell-integration-0.25.1.ebuild
-2206071310 ./x11-terms/kitty-shell-integration/kitty-shell-integration-0.25.2.ebuild
+2206161640 ./x11-terms/kitty-shell-integration/kitty-shell-integration-0.25.2.ebuild
 2201080010 ./x11-terms/st-terminfo/st-terminfo-9999.ebuild
 2201091240 ./x11-terms/st-terminfo/st-terminfo-0.8.5.ebuild
 2201130510 ./x11-themes/QGnomePlatform/QGnomePlatform-0.8.3.ebuild
@@ -30293,7 +30151,8 @@
 2205280910 ./x11-wm/mutter/mutter-42.1.ebuild
 2205291810 ./x11-wm/mutter/mutter-42.2.ebuild
 2012152209 ./x11-wm/notion/notion-3_p2015061300-r100.ebuild
-2012152209 ./x11-wm/notion/notion-9999.ebuild
+2206131610 ./x11-wm/notion/notion-4.0.2_p20220613.ebuild
+2206131610 ./x11-wm/notion/notion-9999.ebuild
 2205251440 ./x11-wm/openbox/openbox-3.6.1-r3.ebuild
 2205251440 ./x11-wm/openbox/openbox-9999.ebuild
 2011261339 ./x11-wm/oroborus/oroborus-2.0.20-r1.ebuild
@@ -30318,12 +30177,14 @@
 2205280440 ./x11-wm/twm/twm-1.0.12.ebuild
 2104151009 ./x11-wm/vtwm/vtwm-5.4.7-r2.ebuild
 2104130339 ./x11-wm/windowlab/windowlab-1.40-r1.ebuild
+2206152340 ./x11-wm/windowlab/windowlab-1.40-r2.ebuild
 2101231239 ./x11-wm/windowmaker/windowmaker-9999.ebuild
 2205222210 ./x11-wm/windowmaker/windowmaker-0.95.9-r2.ebuild
 2104200209 ./x11-wm/wm2/wm2-4-r1.ebuild
 2202200440 ./x11-wm/wmfs/wmfs-20180520.ebuild
 2202200440 ./x11-wm/wmfs/wmfs-99999999.ebuild
 2102121709 ./x11-wm/wmii/wmii-3.9.2-r6.ebuild
+2206141610 ./x11-wm/wmii/wmii-3.9.2-r7.ebuild
 2009042309 ./x11-wm/xmonad-contrib/xmonad-contrib-0.16.ebuild
 2107241209 ./x11-wm/xmonad/xmonad-0.15-r1.ebuild
 2005172009 ./x11-wm/xmonad/xmonad-0.15.ebuild
@@ -30336,8 +30197,8 @@
 2105251739 ./xfce-base/exo/exo-4.16.2.ebuild
 2109300109 ./xfce-base/exo/exo-4.17.1.ebuild
 2203270540 ./xfce-base/exo/exo-4.16.3.ebuild
-2206121142 ./xfce-base/exo/exo-4.16.4.ebuild
 2206111440 ./xfce-base/exo/exo-4.17.2.ebuild
+2206150040 ./xfce-base/exo/exo-4.16.4.ebuild
 2105251739 ./xfce-base/garcon/garcon-0.8.0.ebuild
 2205161110 ./xfce-base/garcon/garcon-4.17.0.ebuild
 2111021340 ./xfce-base/libxfce4ui/libxfce4ui-4.16.1.ebuild
@@ -30404,6 +30265,7 @@
 2102190139 ./xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-2.0.1.ebuild
 2111190939 ./xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.3.ebuild
 2201041339 ./xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.6.2-r1.ebuild
+2206141910 ./xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.6.3.ebuild
 2109162239 ./xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.11.0-r1.ebuild
 2112201540 ./xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.7.1.ebuild
 2111190939 ./xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.2.ebuild
@@ -30435,8 +30297,6 @@
 2204100039 ./app-containers/docker-cli/docker-cli-20.10.14.ebuild
 2205171840 ./app-containers/docker-cli/docker-cli-20.10.16.ebuild
 2112201210 ./app-containers/docker-compose/docker-compose-1.29.2-r1.ebuild
-2203262039 ./app-containers/docker-compose/docker-compose-2.3.3-r2.ebuild
-2204102210 ./app-containers/docker-compose/docker-compose-2.4.1.ebuild
 2205021840 ./app-containers/docker-compose/docker-compose-2.5.0.ebuild
 2206032040 ./app-containers/docker-compose/docker-compose-2.6.0.ebuild
 2112201210 ./app-containers/docker-credential-helpers/docker-credential-helpers-0.6.3.ebuild
@@ -30461,8 +30321,8 @@
 2203070940 ./app-containers/kompose/kompose-1.26.1.ebuild
 2112210539 ./app-containers/lxc-templates/lxc-templates-3.0.4.ebuild
 2203200940 ./app-containers/lxc/lxc-4.0.12.ebuild
-2205221140 ./app-containers/lxd/lxd-4.0.9-r3.ebuild
-2206111240 ./app-containers/lxd/lxd-5.0.0.ebuild
+2206161940 ./app-containers/lxd/lxd-4.0.9-r3.ebuild
+2206141740 ./app-containers/lxd/lxd-5.0.0.ebuild
 2203050339 ./app-containers/nerdctl/nerdctl-0.17.1.ebuild
 2203260510 ./app-containers/nerdctl/nerdctl-0.18.0.ebuild
 2204231909 ./app-containers/nerdctl/nerdctl-0.19.0.ebuild
@@ -30490,7 +30350,9 @@
 2205300140 ./app-containers/apptainer/apptainer-1.0.2.ebuild
 2204092309 ./app-containers/catatonit/catatonit-0.1.7.ebuild
 2205120040 ./app-containers/grype/grype-0.36.1.ebuild
+2206150440 ./app-containers/grype/grype-0.39.0.ebuild
 2205120040 ./app-containers/syft/syft-0.45.1.ebuild
+2206150440 ./app-containers/syft/syft-0.47.0.ebuild
 2204291439 ./sec-keys/openpgp-keys-adamspiers/openpgp-keys-adamspiers-20210426.ebuild
 2204291439 ./sec-keys/openpgp-keys-alexbarton/openpgp-keys-alexbarton-20210416.ebuild
 2204291439 ./sec-keys/openpgp-keys-bcl/openpgp-keys-bcl-20210128.ebuild
@@ -31473,7 +31335,6 @@
 2205170254 metadata/md5-cache/acct-user/znc-0-r1
 2205170254 metadata/md5-cache/acct-user/zookeeper-0
 2104180939 metadata/md5-cache/app-accessibility/mbrola-3.0.1h-r6
-2002230040 metadata/md5-cache/app-accessibility/sound-icons-0.1
 2203070710 metadata/md5-cache/app-accessibility/mbrola-voices-0_pre20200331
 2204172340 metadata/md5-cache/app-accessibility/emacspeak-39.0-r2
 2204172340 metadata/md5-cache/app-accessibility/emacspeak-9999
@@ -31502,7 +31363,6 @@
 2206071015 metadata/md5-cache/app-accessibility/espeakup-0.90
 2206071015 metadata/md5-cache/app-accessibility/espeakup-9999
 2206071015 metadata/md5-cache/app-accessibility/orca-42.1
-2206121142 metadata/md5-cache/app-accessibility/Manifest.gz
 2206121142 metadata/md5-cache/app-accessibility/brltty-6.1
 2206121142 metadata/md5-cache/app-accessibility/brltty-6.1-r1
 2206121142 metadata/md5-cache/app-accessibility/brltty-6.4
@@ -31511,6 +31371,8 @@
 2206091440 metadata/md5-cache/app-accessibility/kontrast-22.04.2
 2206121142 metadata/md5-cache/app-accessibility/speech-dispatcher-0.11.1
 2206121142 metadata/md5-cache/app-accessibility/speech-dispatcher-0.9.1
+2206161940 metadata/md5-cache/app-accessibility/Manifest.gz
+2206161940 metadata/md5-cache/app-accessibility/sound-icons-0.1
 2107101839 metadata/md5-cache/app-admin/aerospike-amc-community-4.0.19-r2
 2107101809 metadata/md5-cache/app-admin/aerospike-amc-community-5.0.0
 2104031909 metadata/md5-cache/app-admin/amazon-ec2-init-20101127-r1
@@ -31554,7 +31416,6 @@
 2107080709 metadata/md5-cache/app-admin/spectre-meltdown-checker-0.44
 2104251239 metadata/md5-cache/app-admin/superadduser-1.15
 1902251139 metadata/md5-cache/app-admin/tmpreaper-1.6.14
-2112141439 metadata/md5-cache/app-admin/hcloud-1.29.0
 2112200039 metadata/md5-cache/app-admin/op-cli-bin-1.12.3
 2112200039 metadata/md5-cache/app-admin/op-cli-bin-1.7.0
 2112310009 metadata/md5-cache/app-admin/profile-cleaner-2.37
@@ -31602,14 +31463,12 @@
 2204150511 metadata/md5-cache/app-admin/terraform-1.0.9
 2204150511 metadata/md5-cache/app-admin/terraform-1.1.2
 2204150511 metadata/md5-cache/app-admin/terraform-1.1.5
-2204191739 metadata/md5-cache/app-admin/hcloud-1.29.5
 2204210039 metadata/md5-cache/app-admin/emacs-updater-1.16
 2204291539 metadata/md5-cache/app-admin/filebeat-7.17.3
 2204290540 metadata/md5-cache/app-admin/perl-cleaner-2.30
 2205011048 metadata/md5-cache/app-admin/evtxtools-1.1.1-r2
 2205022240 metadata/md5-cache/app-admin/logstash-bin-6.8.23
 2205022240 metadata/md5-cache/app-admin/logstash-bin-7.17.3
-2205041640 metadata/md5-cache/app-admin/exo-1.54.0
 2205070910 metadata/md5-cache/app-admin/tpm-1.3.3
 2205070910 metadata/md5-cache/app-admin/tpm-9999
 2205102340 metadata/md5-cache/app-admin/mongosh-bin-1.3.1
@@ -31664,7 +31523,6 @@
 2205170840 metadata/md5-cache/app-admin/gopass-1.14.1
 2205170654 metadata/md5-cache/app-admin/hardinfo-0.6_alpha_pre20201116-r1
 2205191140 metadata/md5-cache/app-admin/hddtemp-0.3_beta15-r29
-2205170654 metadata/md5-cache/app-admin/helm-3.8.1
 2205170654 metadata/md5-cache/app-admin/ide-smart-1.4-r2
 2205170654 metadata/md5-cache/app-admin/integrit-4.1-r1
 2205170654 metadata/md5-cache/app-admin/integrit-4.2_rc1
@@ -31803,7 +31661,6 @@
 2206071015 metadata/md5-cache/app-admin/rsyslog-8.2112.0
 2206071015 metadata/md5-cache/app-admin/rsyslog-8.2204.0
 2206080140 metadata/md5-cache/app-admin/sudo-1.9.11
-2206070513 metadata/md5-cache/app-admin/sudo-9999
 2206071015 metadata/md5-cache/app-admin/syslog-ng-3.34.1
 2206071015 metadata/md5-cache/app-admin/syslog-ng-3.35.1
 2206071015 metadata/md5-cache/app-admin/syslog-ng-3.36.1
@@ -31876,18 +31733,26 @@
 2206121142 metadata/md5-cache/app-admin/webapp-config-1.55-r2
 2206121142 metadata/md5-cache/app-admin/webapp-config-9999
 2206121142 metadata/md5-cache/app-admin/xkcdpass-1.19.3
-2206131040 metadata/md5-cache/app-admin/Manifest.gz
-2206131040 metadata/md5-cache/app-admin/metalog-20220214
 2206122310 metadata/md5-cache/app-admin/terraform-1.2.2
+2206160840 metadata/md5-cache/app-admin/Manifest.gz
+2206160840 metadata/md5-cache/app-admin/awscli-1.25.10
+2206140740 metadata/md5-cache/app-admin/awscli-1.25.8
+2206151440 metadata/md5-cache/app-admin/awscli-1.25.9
+2206141310 metadata/md5-cache/app-admin/exo-1.56.0
+2206141710 metadata/md5-cache/app-admin/hcloud-1.29.5
+2206141040 metadata/md5-cache/app-admin/helm-3.8.1
+2206140910 metadata/md5-cache/app-admin/metalog-20220214
+2206141510 metadata/md5-cache/app-admin/sudo-1.9.11_p2
+2206141510 metadata/md5-cache/app-admin/sudo-9999
 2205170654 metadata/md5-cache/app-antivirus/clamav-0.103.6
 2206071015 metadata/md5-cache/app-antivirus/clamav-0.104.2
 2206071015 metadata/md5-cache/app-antivirus/clamav-0.104.3
 2206071015 metadata/md5-cache/app-antivirus/clamtk-6.14
-2206121142 metadata/md5-cache/app-antivirus/Manifest.gz
 2206121142 metadata/md5-cache/app-antivirus/fangfrisch-1.5.0
 2206121142 metadata/md5-cache/app-antivirus/fangfrisch-1.5.0-r1
-2206112210 metadata/md5-cache/app-antivirus/lkrg-0.9.2
-2206112210 metadata/md5-cache/app-antivirus/lkrg-0.9.3
+2206161940 metadata/md5-cache/app-antivirus/Manifest.gz
+2206161940 metadata/md5-cache/app-antivirus/lkrg-0.9.2
+2206161940 metadata/md5-cache/app-antivirus/lkrg-0.9.3
 2101061609 metadata/md5-cache/app-arch/deb2targz-1-r3
 2011141839 metadata/md5-cache/app-arch/duff-0.5.2
 2109132339 metadata/md5-cache/app-arch/dump-0.4.47-r1
@@ -32015,7 +31880,6 @@
 2206081540 metadata/md5-cache/app-arch/plzip-1.10
 2206051740 metadata/md5-cache/app-arch/rar-6.12
 2206071015 metadata/md5-cache/app-arch/rpm-4.17.0-r2
-2206121142 metadata/md5-cache/app-arch/Manifest.gz
 2206121142 metadata/md5-cache/app-arch/bloscpack-0.16.0
 2206121142 metadata/md5-cache/app-arch/brotli-1.0.9-r3
 2206121142 metadata/md5-cache/app-arch/brotli-1.0.9-r4
@@ -32028,6 +31892,8 @@
 2206121142 metadata/md5-cache/app-arch/vimball-0.5.1
 2206121142 metadata/md5-cache/app-arch/vimball-9999
 2206100840 metadata/md5-cache/app-arch/zpaq-7.15
+2206161840 metadata/md5-cache/app-arch/Manifest.gz
+2206161840 metadata/md5-cache/app-arch/zstd-1.5.1-r3
 2104161439 metadata/md5-cache/app-backup/backup-manager-0.7.14
 2104161439 metadata/md5-cache/app-backup/backup-manager-0.7.14-r1
 2012311940 metadata/md5-cache/app-backup/ccollect-0.8
@@ -32079,7 +31945,6 @@
 2205170654 metadata/md5-cache/app-backup/snapper-0.9.1
 2205170654 metadata/md5-cache/app-backup/spideroak-bin-7.5.0-r1
 2205170654 metadata/md5-cache/app-backup/tarsnap-1.0.39-r1
-2205170654 metadata/md5-cache/app-backup/tsm-8.1.13.3
 2205211440 metadata/md5-cache/app-backup/bacula-11.0.5
 2205211440 metadata/md5-cache/app-backup/bacula-11.0.6-r1
 2205211140 metadata/md5-cache/app-backup/dar-2.7.5
@@ -32093,7 +31958,6 @@
 2206071015 metadata/md5-cache/app-backup/deja-dup-42.7-r1
 2206071015 metadata/md5-cache/app-backup/deja-dup-42.8
 2206080340 metadata/md5-cache/app-backup/rear-2.6
-2206121142 metadata/md5-cache/app-backup/Manifest.gz
 2206121142 metadata/md5-cache/app-backup/attic-0.16-r1
 2206121142 metadata/md5-cache/app-backup/attic-9999
 2206101440 metadata/md5-cache/app-backup/bareos-21.1.2
@@ -32110,6 +31974,8 @@
 2206121142 metadata/md5-cache/app-backup/duplicity-0.8.23-r1
 2206121142 metadata/md5-cache/app-backup/rdiff-backup-2.0.5-r1
 2206121142 metadata/md5-cache/app-backup/untangle-https-backup-0.1.0
+2206161940 metadata/md5-cache/app-backup/Manifest.gz
+2206161940 metadata/md5-cache/app-backup/tsm-8.1.13.3
 2109012139 metadata/md5-cache/app-benchmarks/bonnie++-2.00a
 1907151840 metadata/md5-cache/app-benchmarks/forkbomb-1.4-r1
 2110300109 metadata/md5-cache/app-benchmarks/geekbench-2.4.2-r1
@@ -32185,7 +32051,6 @@
 2205170654 metadata/md5-cache/app-cdr/dumpet-2.1_p20140601-r3
 2205170654 metadata/md5-cache/app-cdr/dvd+rw-tools-7.1-r3
 2205170654 metadata/md5-cache/app-cdr/dvd+rw-tools-7.1-r4
-2205170654 metadata/md5-cache/app-cdr/dvdisaster-0.79.5
 2205170654 metadata/md5-cache/app-cdr/extract-xiso-2.7.1
 2205170654 metadata/md5-cache/app-cdr/gaffitter-0.6.0-r1
 2205170654 metadata/md5-cache/app-cdr/graveman-0.3.12_p5-r3
@@ -32202,8 +32067,9 @@
 2206071015 metadata/md5-cache/app-cdr/cdemu-3.2.4
 2206071015 metadata/md5-cache/app-cdr/cdemu-3.2.5
 2206071015 metadata/md5-cache/app-cdr/gcdemu-3.2.6
-2206091440 metadata/md5-cache/app-cdr/Manifest.gz
 2206091440 metadata/md5-cache/app-cdr/dolphin-plugins-mountiso-22.04.2
+2206161940 metadata/md5-cache/app-cdr/Manifest.gz
+2206161940 metadata/md5-cache/app-cdr/dvdisaster-0.79.5
 2103052109 metadata/md5-cache/app-crypt/asedriveiiie-serial-3.5
 2006062109 metadata/md5-cache/app-crypt/asedriveiiie-usb-3.5
 1904220939 metadata/md5-cache/app-crypt/bcwipe-1.9.13
@@ -32275,7 +32141,6 @@
 2205170654 metadata/md5-cache/app-crypt/elettra-1.0
 2205170654 metadata/md5-cache/app-crypt/gifshuffle-2.0-r1
 2205170654 metadata/md5-cache/app-crypt/gnupg-2.2.34-r1
-2205170840 metadata/md5-cache/app-crypt/gnupg-2.2.35
 2205170840 metadata/md5-cache/app-crypt/gnupg-2.3.6
 2205170654 metadata/md5-cache/app-crypt/gpgstats-0.5-r2
 2205170654 metadata/md5-cache/app-crypt/hashcat-6.2.1-r1
@@ -32335,8 +32200,6 @@
 2205170654 metadata/md5-cache/app-crypt/nwipe-0.33
 2205170654 metadata/md5-cache/app-crypt/onak-0.5.0
 2205170654 metadata/md5-cache/app-crypt/osslsigncode-2.0
-2205170654 metadata/md5-cache/app-crypt/p11-kit-0.23.22
-2205170654 metadata/md5-cache/app-crypt/p11-kit-0.24.1
 2205170654 metadata/md5-cache/app-crypt/pdfcrack-0.19
 2205170654 metadata/md5-cache/app-crypt/pesign-114
 2205170910 metadata/md5-cache/app-crypt/pinentry-1.1.1-r1
@@ -32384,7 +32247,6 @@
 2206060940 metadata/md5-cache/app-crypt/jitterentropy-rngd-1.2.7
 2206080340 metadata/md5-cache/app-crypt/libnitrokey-3.6
 2206080340 metadata/md5-cache/app-crypt/libnitrokey-9999
-2206071015 metadata/md5-cache/app-crypt/libsecret-0.20.5-r3
 2206080340 metadata/md5-cache/app-crypt/libu2f-host-1.1.10
 2206071015 metadata/md5-cache/app-crypt/mit-krb5-1.19.2-r4
 2206071015 metadata/md5-cache/app-crypt/mit-krb5-1.19.3-r2
@@ -32434,8 +32296,12 @@
 2206110910 metadata/md5-cache/app-crypt/sbsigntools-0.9.4
 2206112210 metadata/md5-cache/app-crypt/tpm-emulator-0.7.5-r3
 2206121142 metadata/md5-cache/app-crypt/yubikey-manager-4.0.8
-2206121810 metadata/md5-cache/app-crypt/Manifest.gz
-2206121810 metadata/md5-cache/app-crypt/gpgme-1.17.1-r1
+2206161940 metadata/md5-cache/app-crypt/Manifest.gz
+2206151140 metadata/md5-cache/app-crypt/gnupg-2.2.35
+2206142110 metadata/md5-cache/app-crypt/gpgme-1.17.1-r1
+2206161940 metadata/md5-cache/app-crypt/libsecret-0.20.5-r3
+2206161940 metadata/md5-cache/app-crypt/p11-kit-0.23.22
+2206161940 metadata/md5-cache/app-crypt/p11-kit-0.24.1
 2109291739 metadata/md5-cache/app-dicts/bookview-3.2.1
 2109291739 metadata/md5-cache/app-dicts/dictd-vera-1.24-r1
 2109291739 metadata/md5-cache/app-dicts/eblook-1.6.1
@@ -33231,15 +33097,10 @@
 2205170654 metadata/md5-cache/app-editors/kile-2.9.93-r1
 2205170654 metadata/md5-cache/app-editors/levee-3.5a
 2205170654 metadata/md5-cache/app-editors/lpe-1.2.8_p20210401
-2205170654 metadata/md5-cache/app-editors/mg-20210609-r1
 2205191040 metadata/md5-cache/app-editors/mg-20220212
 2205170654 metadata/md5-cache/app-editors/moe-1.10
 2205170654 metadata/md5-cache/app-editors/moe-1.11
 2205170654 metadata/md5-cache/app-editors/moe-1.9
-2205170654 metadata/md5-cache/app-editors/nano-5.9
-2205170654 metadata/md5-cache/app-editors/nano-6.2
-2205170654 metadata/md5-cache/app-editors/nano-6.3
-2205170654 metadata/md5-cache/app-editors/nano-9999
 2205170654 metadata/md5-cache/app-editors/ne-3.3.1
 2205170654 metadata/md5-cache/app-editors/nedit-5.7
 2205170654 metadata/md5-cache/app-editors/ng-1.5_beta1-r3
@@ -33306,18 +33167,25 @@
 2206081040 metadata/md5-cache/app-editors/vim-core-8.2.5066
 2206081040 metadata/md5-cache/app-editors/vim-core-9999
 2206081140 metadata/md5-cache/app-editors/zile-2.6.2-r2
-2206121142 metadata/md5-cache/app-editors/Manifest.gz
 2206090340 metadata/md5-cache/app-editors/gvim-8.2.5066
 2206090340 metadata/md5-cache/app-editors/gvim-9999
 2206092210 metadata/md5-cache/app-editors/okteta-0.26.9
 2206121142 metadata/md5-cache/app-editors/pyvim-3.0.2
 2206121142 metadata/md5-cache/app-editors/qhexedit2-0.8.6_p20190316
-2206121142 metadata/md5-cache/app-editors/qhexedit2-0.8.6_p20190316-r2
 2206121142 metadata/md5-cache/app-editors/qhexedit2-0.8.9_p20210525
-2206121142 metadata/md5-cache/app-editors/qhexedit2-0.8.9_p20210525-r2
 2206121142 metadata/md5-cache/app-editors/retext-7.2.2
 2206121142 metadata/md5-cache/app-editors/retext-7.2.3
 2206121142 metadata/md5-cache/app-editors/retext-9999
+2206161940 metadata/md5-cache/app-editors/Manifest.gz
+2206141940 metadata/md5-cache/app-editors/featherpad-1.2.0
+2206140610 metadata/md5-cache/app-editors/ghex-42.3
+2206141940 metadata/md5-cache/app-editors/gnome-text-editor-42.2
+2206161310 metadata/md5-cache/app-editors/mg-20220614
+2206142040 metadata/md5-cache/app-editors/nano-6.2
+2206142040 metadata/md5-cache/app-editors/nano-6.3
+2206142040 metadata/md5-cache/app-editors/nano-9999
+2206161940 metadata/md5-cache/app-editors/qhexedit2-0.8.6_p20190316-r2
+2206161940 metadata/md5-cache/app-editors/qhexedit2-0.8.9_p20210525-r2
 2204172340 metadata/md5-cache/app-emacs/actionscript-mode-7.2.2_p20180527
 2204172340 metadata/md5-cache/app-emacs/adaptive-wrap-0.7
 2204172340 metadata/md5-cache/app-emacs/adaptive-wrap-0.8
@@ -33333,8 +33201,6 @@
 2204172340 metadata/md5-cache/app-emacs/async-1.9.3
 2204172340 metadata/md5-cache/app-emacs/async-1.9.4
 2204172340 metadata/md5-cache/app-emacs/atomic-chrome-2.0.0
-2204172340 metadata/md5-cache/app-emacs/auctex-11.92
-2204172340 metadata/md5-cache/app-emacs/auctex-12.2
 2204172340 metadata/md5-cache/app-emacs/auctex-12.3
 2204172340 metadata/md5-cache/app-emacs/avy-0.5.0
 2204172340 metadata/md5-cache/app-emacs/basic-toolkit-0.7
@@ -33443,9 +33309,7 @@
 2204172340 metadata/md5-cache/app-emacs/h4x0r-0.13-r1
 2204172340 metadata/md5-cache/app-emacs/haskell-mode-16.1
 2204172340 metadata/md5-cache/app-emacs/haskell-mode-17.2
-2204172340 metadata/md5-cache/app-emacs/helm-3.8.0
 2204172340 metadata/md5-cache/app-emacs/helm-3.8.4
-2204172340 metadata/md5-cache/app-emacs/helm-3.8.5
 2204172340 metadata/md5-cache/app-emacs/helm-system-packages-1.10.1
 2204172340 metadata/md5-cache/app-emacs/helm-system-packages-1.10.2
 2204172340 metadata/md5-cache/app-emacs/hexrgb-0_p1019
@@ -33709,7 +33573,6 @@
 2205081610 metadata/md5-cache/app-emacs/mastodon-1.0.0
 2205071410 metadata/md5-cache/app-emacs/slime-2.27
 2205071410 metadata/md5-cache/app-emacs/vhdl-mode-3.38.3
-2205091610 metadata/md5-cache/app-emacs/auctex-13.1
 2205091840 metadata/md5-cache/app-emacs/js-comint-1.2.0
 2205091610 metadata/md5-cache/app-emacs/posframe-1.1.7
 2205100210 metadata/md5-cache/app-emacs/all-the-icons-5.0.0-r1
@@ -33724,7 +33587,6 @@
 2205131110 metadata/md5-cache/app-emacs/epc-0.1.1
 2205130140 metadata/md5-cache/app-emacs/haxe-mode-0.3.3
 2205131110 metadata/md5-cache/app-emacs/nim-mode-0.4.2_p20211102
-2205140140 metadata/md5-cache/app-emacs/csv-mode-1.20
 2205170654 metadata/md5-cache/app-emacs/bbdb-3.1.2-r2
 2205170654 metadata/md5-cache/app-emacs/bbdb-3.2.2a-r1
 2205170654 metadata/md5-cache/app-emacs/doxymacs-1.8.0-r4
@@ -33777,11 +33639,14 @@
 2206060210 metadata/md5-cache/app-emacs/lean-mode-20220501
 2206072240 metadata/md5-cache/app-emacs/markdown-mode-2.4-r1
 2206072240 metadata/md5-cache/app-emacs/markdown-mode-2.5-r1
-2206121142 metadata/md5-cache/app-emacs/Manifest.gz
 2206110511 metadata/md5-cache/app-emacs/eldev-1.1.2
 2206121142 metadata/md5-cache/app-emacs/elpy-1.35.0_p20220321
 2206121142 metadata/md5-cache/app-emacs/pymacs-0.26-r3
 2206121142 metadata/md5-cache/app-emacs/racket-mode-20220505
+2206161340 metadata/md5-cache/app-emacs/Manifest.gz
+2206161340 metadata/md5-cache/app-emacs/auctex-13.1
+2206161340 metadata/md5-cache/app-emacs/csv-mode-1.20
+2206161340 metadata/md5-cache/app-emacs/helm-3.8.5
 1912171039 metadata/md5-cache/app-emulation/bochs-2.6.10
 2110200512 metadata/md5-cache/app-emulation/bochs-2.7
 1910051539 metadata/md5-cache/app-emulation/dlx-1.0.0
@@ -33912,8 +33777,6 @@
 2206071015 metadata/md5-cache/app-emulation/spice-protocol-9999
 2206071015 metadata/md5-cache/app-emulation/virt-viewer-10.0_p20210730
 2206071015 metadata/md5-cache/app-emulation/virt-viewer-11.0
-2206080340 metadata/md5-cache/app-emulation/virtualbox-6.1.32-r1
-2206080340 metadata/md5-cache/app-emulation/virtualbox-6.1.34
 2206071015 metadata/md5-cache/app-emulation/vkd3d-proton-2.6
 2206071015 metadata/md5-cache/app-emulation/vkd3d-proton-9999
 2206080340 metadata/md5-cache/app-emulation/xe-guest-utilities-6.2.0_p1120-r1
@@ -33951,9 +33814,12 @@
 2206112210 metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.34-r1
 2206112210 metadata/md5-cache/app-emulation/virtualbox-modules-6.1.32
 2206112210 metadata/md5-cache/app-emulation/virtualbox-modules-6.1.34
-2206121840 metadata/md5-cache/app-emulation/Manifest.gz
 2206121840 metadata/md5-cache/app-emulation/ruffle-0_p20220601
 2206121840 metadata/md5-cache/app-emulation/ruffle-9999
+2206161640 metadata/md5-cache/app-emulation/Manifest.gz
+2206161640 metadata/md5-cache/app-emulation/ruffle-0_p20220614
+2206151610 metadata/md5-cache/app-emulation/virtualbox-6.1.32-r2
+2206151610 metadata/md5-cache/app-emulation/virtualbox-6.1.34-r1
 2104060140 metadata/md5-cache/app-eselect/eselect-awk-0.3
 2107211409 metadata/md5-cache/app-eselect/eselect-blas-0.1
 2104060140 metadata/md5-cache/app-eselect/eselect-cblas-0.1
@@ -34208,10 +34074,10 @@
 2206121210 metadata/md5-cache/app-i18n/man-pages-l10n-4.14.0
 2206121142 metadata/md5-cache/app-i18n/nkf-2.1.4
 2206121142 metadata/md5-cache/app-i18n/nkf-2.1.5
-2206101010 metadata/md5-cache/app-i18n/opencc-1.1.3
-2206121710 metadata/md5-cache/app-i18n/Manifest.gz
 2206121710 metadata/md5-cache/app-i18n/ibus-table-1.16.8
 2206121710 metadata/md5-cache/app-i18n/ibus-table-others-1.3.13
+2206140040 metadata/md5-cache/app-i18n/Manifest.gz
+2206140040 metadata/md5-cache/app-i18n/opencc-1.1.3
 2002112051 metadata/md5-cache/app-laptop/hdaps-gl-0.0.7
 2205170654 metadata/md5-cache/app-laptop/dispad-0.3.1-r1
 2205170654 metadata/md5-cache/app-laptop/hdapsd-20141203-r2
@@ -34511,7 +34377,6 @@
 2205170654 metadata/md5-cache/app-misc/lxsplit-0.2.4-r1
 2205170654 metadata/md5-cache/app-misc/mc-4.8.27-r1
 2205170654 metadata/md5-cache/app-misc/mc-4.8.28-r1
-2205170654 metadata/md5-cache/app-misc/mc-9999
 2205170654 metadata/md5-cache/app-misc/mepl-0.45-r1
 2205170654 metadata/md5-cache/app-misc/mmv-1.01b_p19
 2205170654 metadata/md5-cache/app-misc/mouseremote-0.90-r3
@@ -34572,7 +34437,6 @@
 2205170654 metadata/md5-cache/app-misc/reptyr-0.8.0
 2205170654 metadata/md5-cache/app-misc/rl-0.2.7-r1
 2205170654 metadata/md5-cache/app-misc/rlwrap-0.45.2-r1
-2205170654 metadata/md5-cache/app-misc/rpick-0.8.10
 2205170654 metadata/md5-cache/app-misc/rpick-0.8.9
 2205170654 metadata/md5-cache/app-misc/screen-4.8.0-r3
 2205191040 metadata/md5-cache/app-misc/screen-4.9.0
@@ -34588,7 +34452,6 @@
 2205170654 metadata/md5-cache/app-misc/task-2.6.2
 2205170654 metadata/md5-cache/app-misc/taskd-1.1.0-r3
 2205170654 metadata/md5-cache/app-misc/tdfsb-0.0.10-r2
-2205170654 metadata/md5-cache/app-misc/tdl-1.5.2-r3
 2205170654 metadata/md5-cache/app-misc/timew-1.4.2
 2205170654 metadata/md5-cache/app-misc/timew-1.4.3
 2205170654 metadata/md5-cache/app-misc/tmate-2.4.0
@@ -34694,7 +34557,6 @@
 2206071015 metadata/md5-cache/app-misc/votrify-5
 2206071015 metadata/md5-cache/app-misc/votrify-5-r1
 2206071015 metadata/md5-cache/app-misc/wayland-utils-1.0.0
-2206121142 metadata/md5-cache/app-misc/Manifest.gz
 2206121142 metadata/md5-cache/app-misc/asciicast-tools-0.0_pre20190410
 2206121142 metadata/md5-cache/app-misc/asciicast-tools-0.0_pre20220524
 2206121142 metadata/md5-cache/app-misc/asciinema-2.1.0
@@ -34752,6 +34614,13 @@
 2206121142 metadata/md5-cache/app-misc/wildq-1.1.11
 2206121142 metadata/md5-cache/app-misc/yq-2.13.0
 2206121142 metadata/md5-cache/app-misc/yq-2.14.0
+2206161940 metadata/md5-cache/app-misc/Manifest.gz
+2206160340 metadata/md5-cache/app-misc/cw-1.0.16-r4
+2206161940 metadata/md5-cache/app-misc/mc-9999
+2206160340 metadata/md5-cache/app-misc/rover-1.0.1
+2206160340 metadata/md5-cache/app-misc/rover-9999
+2206161110 metadata/md5-cache/app-misc/rpick-0.8.10
+2206161940 metadata/md5-cache/app-misc/tdl-1.5.2-r3
 2110242009 metadata/md5-cache/app-mobilephone/anyremote-6.5
 1805222109 metadata/md5-cache/app-mobilephone/scmxx-0.9.0
 2203031839 metadata/md5-cache/app-mobilephone/dfu-util-0.11
@@ -34776,8 +34645,6 @@
 2203240726 metadata/md5-cache/app-office/libreoffice-voikko-5.0-r1
 2203240726 metadata/md5-cache/app-office/projectlibre-bin-1.6.2
 2204011845 metadata/md5-cache/app-office/upwork-5.4.5.1-r1
-2205020310 metadata/md5-cache/app-office/libreoffice-bin-debug-7.2.6.2
-2205020310 metadata/md5-cache/app-office/libreoffice-l10n-7.2.6.2
 2205022240 metadata/md5-cache/app-office/moneydance-2022.4060
 2205170654 metadata/md5-cache/app-office/abiword-3.0.5
 2205170654 metadata/md5-cache/app-office/abiword-docs-3.0.2
@@ -34792,8 +34659,6 @@
 2205170654 metadata/md5-cache/app-office/kmymoney-5.1.2-r1
 2205170654 metadata/md5-cache/app-office/kraft-0.95
 2205170654 metadata/md5-cache/app-office/ktimetracker-5.0.1-r1
-2205170654 metadata/md5-cache/app-office/libalkimia-8.1.0-r1
-2205180440 metadata/md5-cache/app-office/libreoffice-bin-debug-7.2.6.2-r1
 2205170654 metadata/md5-cache/app-office/magicpoint-1.13a_p20121015-r2
 2205170654 metadata/md5-cache/app-office/mdbtools-1.0.0
 2205170654 metadata/md5-cache/app-office/multitalk-1.4-r1
@@ -34818,28 +34683,25 @@
 2206071015 metadata/md5-cache/app-office/gtg-0.4.0
 2206071015 metadata/md5-cache/app-office/gtg-0.5
 2206071015 metadata/md5-cache/app-office/ledger-3.2.1
-2206071015 metadata/md5-cache/app-office/libreoffice-7.2.6.2-r1
-2206071015 metadata/md5-cache/app-office/libreoffice-bin-7.2.6.2
-2206071015 metadata/md5-cache/app-office/libreoffice-bin-7.2.6.2-r1
 2206071015 metadata/md5-cache/app-office/lyx-2.3.6.1-r1
 2206071140 metadata/md5-cache/app-office/lyx-2.3.6.1-r2
 2206071015 metadata/md5-cache/app-office/scribus-1.5.8-r1
 2206071015 metadata/md5-cache/app-office/unoconv-0.9.0
 2206071015 metadata/md5-cache/app-office/unoconv-0.9.0-r1
-2206121142 metadata/md5-cache/app-office/Manifest.gz
 2206121142 metadata/md5-cache/app-office/gnumeric-1.12.52
 2206121142 metadata/md5-cache/app-office/impressive-0.13.0_beta2
 2206091440 metadata/md5-cache/app-office/kalendar-22.04.2
 2206101010 metadata/md5-cache/app-office/libalkimia-8.1.1
-2206100640 metadata/md5-cache/app-office/libreoffice-7.3.3.2-r3
 2206111040 metadata/md5-cache/app-office/libreoffice-7.3.4.2
 2206111040 metadata/md5-cache/app-office/libreoffice-7.3.9999
 2206111040 metadata/md5-cache/app-office/libreoffice-9999
-2206100640 metadata/md5-cache/app-office/libreoffice-bin-7.3.3.2-r3
-2206100640 metadata/md5-cache/app-office/libreoffice-bin-debug-7.3.3.2-r3
-2206100640 metadata/md5-cache/app-office/libreoffice-l10n-7.3.3.2
 2206100640 metadata/md5-cache/app-office/libreoffice-l10n-7.3.4.2
 2206112110 metadata/md5-cache/app-office/wps-office-11.1.0.11664
+2206141840 metadata/md5-cache/app-office/Manifest.gz
+2206141640 metadata/md5-cache/app-office/libreoffice-7.3.3.2-r3
+2206141040 metadata/md5-cache/app-office/libreoffice-bin-7.3.3.2-r3
+2206141040 metadata/md5-cache/app-office/libreoffice-bin-debug-7.3.3.2-r3
+2206141640 metadata/md5-cache/app-office/libreoffice-l10n-7.3.3.2
 2204011845 metadata/md5-cache/app-officeext/Manifest.gz
 2204011845 metadata/md5-cache/app-officeext/barcode-1.3.5.0-r1
 2204011845 metadata/md5-cache/app-officeext/ct2n-1.5.0
@@ -34974,8 +34836,9 @@
 2206121142 metadata/md5-cache/app-portage/tatt-0.8
 2206121142 metadata/md5-cache/app-portage/tatt-0.9
 2206121142 metadata/md5-cache/app-portage/tatt-9999
-2206130940 metadata/md5-cache/app-portage/Manifest.gz
 2206130940 metadata/md5-cache/app-portage/iwdevtools-9999
+2206160910 metadata/md5-cache/app-portage/Manifest.gz
+2206160910 metadata/md5-cache/app-portage/portage-utils-0.94.1
 2005131639 metadata/md5-cache/app-shells/bashdb-5.0.1.1.2
 2104212309 metadata/md5-cache/app-shells/bashish-2.2.4
 2012271709 metadata/md5-cache/app-shells/dsh-0.25.10-r1
@@ -34998,19 +34861,6 @@
 2205102010 metadata/md5-cache/app-shells/gentoo-zsh-completions-20220112
 2205102010 metadata/md5-cache/app-shells/zsh-completions-0.33.0
 2205102010 metadata/md5-cache/app-shells/zsh-syntax-highlighting-0.7.1
-2205170654 metadata/md5-cache/app-shells/bash-2.05b_p13
-2205170654 metadata/md5-cache/app-shells/bash-3.0_p22
-2205170654 metadata/md5-cache/app-shells/bash-3.1_p23
-2205170654 metadata/md5-cache/app-shells/bash-3.2_p57
-2205170654 metadata/md5-cache/app-shells/bash-4.0_p44
-2205170654 metadata/md5-cache/app-shells/bash-4.1_p17
-2205170654 metadata/md5-cache/app-shells/bash-4.2_p53
-2205170654 metadata/md5-cache/app-shells/bash-4.3_p48-r2
-2205170654 metadata/md5-cache/app-shells/bash-4.4_p23-r2
-2205170654 metadata/md5-cache/app-shells/bash-5.0_p18
-2205170654 metadata/md5-cache/app-shells/bash-5.1_p16
-2205170654 metadata/md5-cache/app-shells/bash-5.2_beta
-2205170654 metadata/md5-cache/app-shells/bash-9999
 2205170654 metadata/md5-cache/app-shells/ccsh-0.0.4-r4
 2205170654 metadata/md5-cache/app-shells/ctypes-sh-1.2-r1
 2205170654 metadata/md5-cache/app-shells/dash-0.5.11.5
@@ -35073,12 +34923,25 @@
 2206071015 metadata/md5-cache/app-shells/fish-9999
 2206071015 metadata/md5-cache/app-shells/ksh-2020.0.0-r1
 2206071015 metadata/md5-cache/app-shells/loksh-7.1
-2206121142 metadata/md5-cache/app-shells/Manifest.gz
 2206121142 metadata/md5-cache/app-shells/autojump-22.5.3-r1
 2206121142 metadata/md5-cache/app-shells/powerline-2.7-r2
 2206121142 metadata/md5-cache/app-shells/powerline-9999
 2206121142 metadata/md5-cache/app-shells/thefuck-3.30
 2206121142 metadata/md5-cache/app-shells/thefuck-3.32
+2206132310 metadata/md5-cache/app-shells/Manifest.gz
+2206132310 metadata/md5-cache/app-shells/bash-2.05b_p13
+2206132310 metadata/md5-cache/app-shells/bash-3.0_p22
+2206132310 metadata/md5-cache/app-shells/bash-3.1_p23
+2206132310 metadata/md5-cache/app-shells/bash-3.2_p57
+2206132310 metadata/md5-cache/app-shells/bash-4.0_p44
+2206132310 metadata/md5-cache/app-shells/bash-4.1_p17
+2206132310 metadata/md5-cache/app-shells/bash-4.2_p53
+2206132310 metadata/md5-cache/app-shells/bash-4.3_p48-r2
+2206132310 metadata/md5-cache/app-shells/bash-4.4_p23-r2
+2206132310 metadata/md5-cache/app-shells/bash-5.0_p18
+2206132310 metadata/md5-cache/app-shells/bash-5.1_p16
+2206132310 metadata/md5-cache/app-shells/bash-5.2_beta
+2206132310 metadata/md5-cache/app-shells/bash-9999
 2101061709 metadata/md5-cache/app-text/antixls-0.3b
 2111090809 metadata/md5-cache/app-text/bibclean-3.06
 2110070609 metadata/md5-cache/app-text/build-docbook-catalog-1.21
@@ -35151,14 +35014,11 @@
 2201281040 metadata/md5-cache/app-text/blogc-0.20.1
 2202010310 metadata/md5-cache/app-text/epspdf-0.6.3-r1
 2202010310 metadata/md5-cache/app-text/epspdf-0.6.5
-2202030709 metadata/md5-cache/app-text/libnumbertext-1.0.8
 2202070940 metadata/md5-cache/app-text/unpaper-6.1-r1
-2202102339 metadata/md5-cache/app-text/libetonyek-0.1.10
 2202230639 metadata/md5-cache/app-text/lesspipe-1.91
 2203100240 metadata/md5-cache/app-text/ttf2pk2-2.0_p20210325
 2203222209 metadata/md5-cache/app-text/bdf2psf-1.155
 2203240726 metadata/md5-cache/app-text/code2html-0.9.1-r2
-2203240726 metadata/md5-cache/app-text/ding-1.9
 2203240726 metadata/md5-cache/app-text/flpsed-0.7.3
 2203240726 metadata/md5-cache/app-text/liblangtag-0.6.3
 2203240726 metadata/md5-cache/app-text/master-pdf-editor-5.7.90
@@ -35487,8 +35347,6 @@
 2206121142 metadata/md5-cache/app-text/htmlmin-0.1.12-r1
 2206121142 metadata/md5-cache/app-text/krop-0.6.0-r1
 2206121142 metadata/md5-cache/app-text/krop-9999
-2206100640 metadata/md5-cache/app-text/libetonyek-0.1.10-r1
-2206100640 metadata/md5-cache/app-text/libnumbertext-1.0.10
 2206121142 metadata/md5-cache/app-text/nfoview-1.28.1-r1
 2206121142 metadata/md5-cache/app-text/openpaperwork-core-2.1.0
 2206121142 metadata/md5-cache/app-text/openpaperwork-core-2.1.1
@@ -35503,7 +35361,6 @@
 2206121142 metadata/md5-cache/app-text/pdfminer-20220506
 2206121142 metadata/md5-cache/app-text/pelican-4.7.2-r1
 2206121142 metadata/md5-cache/app-text/pelican-9999
-2206100640 metadata/md5-cache/app-text/poppler-22.05.0
 2206121142 metadata/md5-cache/app-text/pytextile-4.0.1
 2206121142 metadata/md5-cache/app-text/q-text-as-data-2.0.10
 2206121142 metadata/md5-cache/app-text/restview-2.9.2
@@ -35517,11 +35374,16 @@
 2206090610 metadata/md5-cache/app-text/xhtml1-20020801-r6
 2206121142 metadata/md5-cache/app-text/xlsx2csv-0.7.6
 2206121142 metadata/md5-cache/app-text/xmldiff-2.4
-2206131210 metadata/md5-cache/app-text/Manifest.gz
 2206131040 metadata/md5-cache/app-text/build-docbook-catalog-2.3
 2206130310 metadata/md5-cache/app-text/diff-pdf-0.5
 2206131210 metadata/md5-cache/app-text/kramdown-rfc-1.6.11
-2206131040 metadata/md5-cache/app-text/lesspipe-2.05
+2206151940 metadata/md5-cache/app-text/Manifest.gz
+2206151140 metadata/md5-cache/app-text/ding-1.9
+2206151940 metadata/md5-cache/app-text/gspell-1.11.1
+2206131940 metadata/md5-cache/app-text/lesspipe-2.05
+2206141640 metadata/md5-cache/app-text/libetonyek-0.1.10-r1
+2206141640 metadata/md5-cache/app-text/libnumbertext-1.0.10
+2206142110 metadata/md5-cache/app-text/poppler-22.05.0
 2203240726 metadata/md5-cache/app-vim/vim-spell-cs-20061021-r1
 2203240726 metadata/md5-cache/app-vim/vim-spell-da-20060116-r1
 2203240726 metadata/md5-cache/app-vim/vim-spell-de-20080213-r1
@@ -35939,7 +35801,6 @@
 2205170654 metadata/md5-cache/dev-cpp/folly-2022.03.28.00
 2205170654 metadata/md5-cache/dev-cpp/folly-2022.04.11.00
 2205170654 metadata/md5-cache/dev-cpp/gconfmm-2.28.3-r1
-2205170654 metadata/md5-cache/dev-cpp/gflags-2.2.1-r1
 2205170654 metadata/md5-cache/dev-cpp/gflags-2.2.2
 2205170654 metadata/md5-cache/dev-cpp/gflags-9999
 2205170654 metadata/md5-cache/dev-cpp/glog-0.4.0
@@ -35948,7 +35809,6 @@
 2205170654 metadata/md5-cache/dev-cpp/gtkmm-2.24.5-r1
 2205170654 metadata/md5-cache/dev-cpp/gtksourceviewmm-3.18.0-r2
 2205170654 metadata/md5-cache/dev-cpp/gulrak-filesystem-1.5.12
-2205170654 metadata/md5-cache/dev-cpp/highway-0.16.0-r1
 2205170654 metadata/md5-cache/dev-cpp/htmlcxx-0.87
 2205170654 metadata/md5-cache/dev-cpp/json11-1.0.0
 2205170654 metadata/md5-cache/dev-cpp/kokkos-3.1.01-r1
@@ -36038,9 +35898,12 @@
 2206071140 metadata/md5-cache/dev-cpp/rapidyaml-0.4.1
 2206071015 metadata/md5-cache/dev-cpp/sdbus-c++-0.9.0-r3
 2206071015 metadata/md5-cache/dev-cpp/sdbus-c++-1.1.0-r3
-2206121040 metadata/md5-cache/dev-cpp/Manifest.gz
 2206121040 metadata/md5-cache/dev-cpp/doctest-2.4.8-r1
 2206110910 metadata/md5-cache/dev-cpp/pstreams-1.0.1
+2206160910 metadata/md5-cache/dev-cpp/Manifest.gz
+2206160910 metadata/md5-cache/dev-cpp/gemmlowp-2021.12.20
+2206140940 metadata/md5-cache/dev-cpp/gflags-2.2.1-r1
+2206151740 metadata/md5-cache/dev-cpp/highway-0.16.0-r1
 2107250309 metadata/md5-cache/dev-db/freetds-1.2.18
 1702282310 metadata/md5-cache/dev-db/gigabase-3.83-r2
 2102252239 metadata/md5-cache/dev-db/lmdb++-0.9.14.0
@@ -36124,7 +35987,6 @@
 2205170654 metadata/md5-cache/dev-db/mydumper-0.11.3.5
 2205170654 metadata/md5-cache/dev-db/mydumper-0.11.5.2
 2205170654 metadata/md5-cache/dev-db/mydumper-0.12.1
-2205170654 metadata/md5-cache/dev-db/myodbc-8.0.27-r1
 2205170654 metadata/md5-cache/dev-db/mysql++-3.3.0
 2205170654 metadata/md5-cache/dev-db/mysql-5.7.36-r1
 2205170654 metadata/md5-cache/dev-db/mysql-connector-c++-1.1.12-r1
@@ -36179,10 +36041,7 @@
 2205211310 metadata/md5-cache/dev-db/pglogical-2.4.1
 2205211310 metadata/md5-cache/dev-db/pgmodeler-0.9.2
 2205211310 metadata/md5-cache/dev-db/pgmodeler-0.9.4
-2205211310 metadata/md5-cache/dev-db/pgpool2-4.2.1-r2
-2205211310 metadata/md5-cache/dev-db/pgpool2-4.2.2-r2
 2205211310 metadata/md5-cache/dev-db/pgpool2-4.3.1
-2205211310 metadata/md5-cache/dev-db/pgpool2-9999
 2205211310 metadata/md5-cache/dev-db/pgrouting-3.1.1
 2205211310 metadata/md5-cache/dev-db/pgrouting-3.1.2
 2205211310 metadata/md5-cache/dev-db/pgrouting-3.1.3
@@ -36190,7 +36049,6 @@
 2205211310 metadata/md5-cache/dev-db/pgtap-0.99.0
 2205211310 metadata/md5-cache/dev-db/pgtap-1.1.0
 2205211310 metadata/md5-cache/dev-db/pgtap-1.2.0
-2205211310 metadata/md5-cache/dev-db/pgtap-1.2.0-r2
 2205211310 metadata/md5-cache/dev-db/plr-8.3.0.17
 2205211310 metadata/md5-cache/dev-db/plr-8.4.1
 2205211310 metadata/md5-cache/dev-db/plr-8.4.5
@@ -36250,35 +36108,45 @@
 2206071015 metadata/md5-cache/dev-db/postgresql-13.7
 2206071015 metadata/md5-cache/dev-db/postgresql-14.1-r1
 2206071015 metadata/md5-cache/dev-db/postgresql-14.2-r1
-2206071015 metadata/md5-cache/dev-db/postgresql-14.3
 2206071015 metadata/md5-cache/dev-db/postgresql-15_beta1-r1
 2206071015 metadata/md5-cache/dev-db/postgresql-9999
 2206061910 metadata/md5-cache/dev-db/sqlite-3.38.5
 2206080210 metadata/md5-cache/dev-db/sqlitestudio-3.3.3
 2206071015 metadata/md5-cache/dev-db/sqlmap-1.6.2
 2206071015 metadata/md5-cache/dev-db/sqlmap-1.6.4
-2206071015 metadata/md5-cache/dev-db/sqlmap-9999
 2206121142 metadata/md5-cache/dev-db/barman-2.12-r1
 2206121142 metadata/md5-cache/dev-db/mycli-1.24.1
 2206121142 metadata/md5-cache/dev-db/mycli-1.25.0
 2206121142 metadata/md5-cache/dev-db/mycli-9999
-2206100610 metadata/md5-cache/dev-db/mysql-8.0.27
 2206121142 metadata/md5-cache/dev-db/mysql-workbench-8.0.28
 2206100610 metadata/md5-cache/dev-db/percona-server-8.0.26.16-r1
 2206100610 metadata/md5-cache/dev-db/percona-xtrabackup-8.0.26.18
-2206121142 metadata/md5-cache/dev-db/pg_activity-2.3.0
 2206121142 metadata/md5-cache/dev-db/pgcli-3.3.1-r1
 2206121142 metadata/md5-cache/dev-db/pgxnclient-1.3-r2
 2206121142 metadata/md5-cache/dev-db/pgxnclient-1.3.1
-2206131040 metadata/md5-cache/dev-db/Manifest.gz
-2206131040 metadata/md5-cache/dev-db/pspg-5.5.4
-2206130010 metadata/md5-cache/dev-db/redis-5.0.14
-2206130010 metadata/md5-cache/dev-db/redis-6.0.16
-2206130010 metadata/md5-cache/dev-db/redis-6.2.6
 2206130010 metadata/md5-cache/dev-db/redis-6.2.7-r1
 2206130010 metadata/md5-cache/dev-db/redis-7.0.0
-2206130010 metadata/md5-cache/dev-db/redis-7.0.0-r1
-2206130010 metadata/md5-cache/dev-db/redis-7.0.1
+2206161940 metadata/md5-cache/dev-db/Manifest.gz
+2206161940 metadata/md5-cache/dev-db/myodbc-8.0.27-r1
+2206131540 metadata/md5-cache/dev-db/mysql-8.0.27
+2206151610 metadata/md5-cache/dev-db/pg_activity-2.3.1
+2206141340 metadata/md5-cache/dev-db/pgpool2-4.2.1-r2
+2206141340 metadata/md5-cache/dev-db/pgpool2-4.2.2-r2
+2206141340 metadata/md5-cache/dev-db/pgpool2-4.2.9
+2206141340 metadata/md5-cache/dev-db/pgpool2-4.3.2
+2206141340 metadata/md5-cache/dev-db/pgpool2-9999
+2206161940 metadata/md5-cache/dev-db/pgtap-1.2.0-r2
+2206161710 metadata/md5-cache/dev-db/postgresql-14.4
+2206131940 metadata/md5-cache/dev-db/pspg-5.5.4
+2206160040 metadata/md5-cache/dev-db/redis-5.0.14
+2206160040 metadata/md5-cache/dev-db/redis-6.0.16
+2206160040 metadata/md5-cache/dev-db/redis-6.2.6
+2206160040 metadata/md5-cache/dev-db/redis-7.0.0-r2
+2206160040 metadata/md5-cache/dev-db/redis-7.0.1-r1
+2206160040 metadata/md5-cache/dev-db/redis-7.0.2
+2206151510 metadata/md5-cache/dev-db/sqlite-9999
+2206152140 metadata/md5-cache/dev-db/sqlmap-1.6.5
+2206152140 metadata/md5-cache/dev-db/sqlmap-9999
 2106210925 metadata/md5-cache/dev-dotnet/ndesk-dbus-0.6.1a
 2106210925 metadata/md5-cache/dev-dotnet/ndesk-dbus-glib-0.4.1
 2205062310 metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-3.1.418-r1
@@ -36298,7 +36166,6 @@
 2009161939 metadata/md5-cache/dev-embedded/include-0.4.2
 2009161939 metadata/md5-cache/dev-embedded/jal-0.4.62
 2009162139 metadata/md5-cache/dev-embedded/kobs-ng-3.0.35.4.1.0
-2012272339 metadata/md5-cache/dev-embedded/libftd2xx-1.4.8
 1911101539 metadata/md5-cache/dev-embedded/pista-0.70
 1910191339 metadata/md5-cache/dev-embedded/upslug2-11
 2102181209 metadata/md5-cache/dev-embedded/urjtag-2019.12
@@ -36359,7 +36226,6 @@
 2206080340 metadata/md5-cache/dev-embedded/openocd-9999
 2206080340 metadata/md5-cache/dev-embedded/ponyprog-3.1.3
 2206080340 metadata/md5-cache/dev-embedded/stlink-9999
-2206121142 metadata/md5-cache/dev-embedded/Manifest.gz
 2206090010 metadata/md5-cache/dev-embedded/avr-libc-2.1.0
 2206121142 metadata/md5-cache/dev-embedded/esptool-3.2
 2206121142 metadata/md5-cache/dev-embedded/esptool-3.3.1
@@ -36369,6 +36235,8 @@
 2206121142 metadata/md5-cache/dev-embedded/rpi-eeprom-13.3_p1-r1
 2206121142 metadata/md5-cache/dev-embedded/rpi-eeprom-13.8_p1
 2206110910 metadata/md5-cache/dev-embedded/stlink-1.7.0
+2206161940 metadata/md5-cache/dev-embedded/Manifest.gz
+2206161940 metadata/md5-cache/dev-embedded/libftd2xx-1.4.8
 2206101310 metadata/md5-cache/dev-erlang/Manifest.gz
 2206101310 metadata/md5-cache/dev-erlang/base64url-1.0.1
 2206101310 metadata/md5-cache/dev-erlang/cache_tab-1.0.29
@@ -36519,7 +36387,6 @@
 2205271010 metadata/md5-cache/dev-go/Manifest.gz
 2205271010 metadata/md5-cache/dev-go/act-1.6.0
 2008011139 metadata/md5-cache/dev-haskell/stack-bin-2.3.1
-2205202040 metadata/md5-cache/dev-haskell/Manifest.gz
 2205202040 metadata/md5-cache/dev-haskell/abstract-deque-0.3
 2205202040 metadata/md5-cache/dev-haskell/abstract-deque-tests-0.3
 2205202040 metadata/md5-cache/dev-haskell/abstract-par-0.3.3-r1
@@ -36927,7 +36794,6 @@
 2205202040 metadata/md5-cache/dev-haskell/language-dot-0.1.1
 2205202040 metadata/md5-cache/dev-haskell/language-ecmascript-0.19.1.0
 2205202040 metadata/md5-cache/dev-haskell/language-glsl-0.3.0
-2205202040 metadata/md5-cache/dev-haskell/language-haskell-extract-0.2.4-r1
 2205202040 metadata/md5-cache/dev-haskell/language-javascript-0.6.0.14
 2205202040 metadata/md5-cache/dev-haskell/language-lua-0.11.0.1
 2205202040 metadata/md5-cache/dev-haskell/language-python-0.5.8
@@ -37303,7 +37169,6 @@
 2205202040 metadata/md5-cache/dev-haskell/warp-3.3.13
 2205202040 metadata/md5-cache/dev-haskell/warp-tls-3.2.12
 2205202040 metadata/md5-cache/dev-haskell/wavy-0.1.0.0
-2205202040 metadata/md5-cache/dev-haskell/wcwidth-0.0.2
 2205202040 metadata/md5-cache/dev-haskell/weigh-0.0.16
 2205202040 metadata/md5-cache/dev-haskell/with-location-0.1.0
 2205202040 metadata/md5-cache/dev-haskell/wl-pprint-1.2.1
@@ -37345,6 +37210,9 @@
 2205202040 metadata/md5-cache/dev-haskell/zlib-bindings-0.1.1.5
 2205202040 metadata/md5-cache/dev-haskell/zlib-conduit-1.1.0
 2205202040 metadata/md5-cache/dev-haskell/zlib-enum-0.2.3.1-r1
+2206161940 metadata/md5-cache/dev-haskell/Manifest.gz
+2206161940 metadata/md5-cache/dev-haskell/language-haskell-extract-0.2.4-r1
+2206161940 metadata/md5-cache/dev-haskell/wcwidth-0.0.2
 2101062239 metadata/md5-cache/dev-java/ant-1.10.9
 2205022240 metadata/md5-cache/dev-java/antlr-4.9.3
 2205022240 metadata/md5-cache/dev-java/gradle-bin-6.8.3
@@ -37384,8 +37252,6 @@
 2205051240 metadata/md5-cache/dev-java/bcpg-1.69
 2205051240 metadata/md5-cache/dev-java/bcutil-1.69
 2205051240 metadata/md5-cache/dev-java/brotli-dec-0.1.2
-2205051240 metadata/md5-cache/dev-java/byte-buddy-1.12.8
-2205051240 metadata/md5-cache/dev-java/byte-buddy-agent-1.12.8
 2205051240 metadata/md5-cache/dev-java/cal10n-0.8.1
 2205051240 metadata/md5-cache/dev-java/cglib-3.3.0-r1
 2205051240 metadata/md5-cache/dev-java/checker-framework-qual-3.14.0
@@ -37407,7 +37273,6 @@
 2205051240 metadata/md5-cache/dev-java/dom4j-2.1.3
 2205051240 metadata/md5-cache/dev-java/error-prone-annotations-2.7.1
 2205051240 metadata/md5-cache/dev-java/failureaccess-30.1.1
-2205051240 metadata/md5-cache/dev-java/findbugs-annotations-3.0.1
 2205051240 metadata/md5-cache/dev-java/fontbox-2.0.24
 2205051240 metadata/md5-cache/dev-java/gnu-regexp-1.1.4-r4
 2205051240 metadata/md5-cache/dev-java/guava-20.0-r1
@@ -37481,13 +37346,10 @@
 2205051240 metadata/md5-cache/dev-java/kafka-clients-1.1.1
 2205051240 metadata/md5-cache/dev-java/lmax-disruptor-3.4.4
 2205051240 metadata/md5-cache/dev-java/log4j-api-java9-2.17.1
-2205051240 metadata/md5-cache/dev-java/logback-classic-1.2.11
 2205051240 metadata/md5-cache/dev-java/mchange-commons-0.2.20
 2205051240 metadata/md5-cache/dev-java/mockito-1.9.5-r2
-2205051240 metadata/md5-cache/dev-java/mockito-4.4.0
 2205051240 metadata/md5-cache/dev-java/msv-20130601
 2205051240 metadata/md5-cache/dev-java/mvel-2.3.2-r1
-2205051240 metadata/md5-cache/dev-java/netty-4.1.35
 2205051240 metadata/md5-cache/dev-java/netty-common-4.0.36-r2
 2205051240 metadata/md5-cache/dev-java/objenesis-3.2
 2205051240 metadata/md5-cache/dev-java/objenesis-test-3.2
@@ -37537,7 +37399,6 @@
 2205051240 metadata/md5-cache/dev-java/xml-commons-external-1.4.01-r2
 2205051240 metadata/md5-cache/dev-java/xml-commons-resolver-1.2-r2
 2205051240 metadata/md5-cache/dev-java/xmlgraphics-commons-2.7
-2205051240 metadata/md5-cache/dev-java/xmlgraphics-commons-2.7-r1
 2205051240 metadata/md5-cache/dev-java/xmpbox-2.0.24
 2205051240 metadata/md5-cache/dev-java/xom-1.3.7
 2205051240 metadata/md5-cache/dev-java/xpp3-1.1.4c-r6
@@ -37572,8 +37433,6 @@
 2205151210 metadata/md5-cache/dev-java/log4j-api-2.17.2
 2205151210 metadata/md5-cache/dev-java/log4j-core-2.17.2
 2205150110 metadata/md5-cache/dev-java/testng-6.9.10-r1
-2205161540 metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.21
-2205161810 metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.63
 2205170654 metadata/md5-cache/dev-java/ant-antlr-1.10.9
 2205170654 metadata/md5-cache/dev-java/ant-apache-bcel-1.10.9
 2205170654 metadata/md5-cache/dev-java/ant-apache-bsf-1.10.9
@@ -37638,7 +37497,6 @@
 2205170654 metadata/md5-cache/dev-java/jdom-2.0.6-r5
 2205170654 metadata/md5-cache/dev-java/jffi-1.2.9-r1
 2205170654 metadata/md5-cache/dev-java/jna-4.2.2-r3
-2205170654 metadata/md5-cache/dev-java/jna-5.10.0
 2205170654 metadata/md5-cache/dev-java/jnr-ffi-2.0.2-r1
 2205170654 metadata/md5-cache/dev-java/jnr-netdb-1.1.4-r1
 2205170654 metadata/md5-cache/dev-java/jnr-posix-3.0.10-r1
@@ -37694,7 +37552,6 @@
 2205241840 metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.3
 2205241840 metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.3
 2205241840 metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.3
-2205241040 metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.79
 2205301210 metadata/md5-cache/dev-java/ant-eclipse-ecj-4.22-r1
 2205301210 metadata/md5-cache/dev-java/eclipse-ecj-4.22-r1
 2205301210 metadata/md5-cache/dev-java/jopt-simple-5.0.4
@@ -37729,8 +37586,6 @@
 2206081140 metadata/md5-cache/dev-java/jnr-netdb-1.2.0
 2206081140 metadata/md5-cache/dev-java/jnr-posix-3.1.15
 2206071015 metadata/md5-cache/dev-java/jython-2.7.0-r4
-2206071015 metadata/md5-cache/dev-java/jython-2.7.0-r6
-2206081140 metadata/md5-cache/dev-java/logback-core-1.2.11
 2206081310 metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0-r2
 2206081310 metadata/md5-cache/dev-java/relaxng-datatype-1.0-r3
 2206081140 metadata/md5-cache/dev-java/sbt-0.13.18-r1
@@ -37764,8 +37619,24 @@
 2206100640 metadata/md5-cache/dev-java/tomcat-native-1.2.33
 2206120710 metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.22
 2206101010 metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.64
-2206131210 metadata/md5-cache/dev-java/Manifest.gz
 2206131210 metadata/md5-cache/dev-java/mill-bin-0.10.4
+2206161910 metadata/md5-cache/dev-java/Manifest.gz
+2206161840 metadata/md5-cache/dev-java/byte-buddy-1.12.8
+2206161840 metadata/md5-cache/dev-java/byte-buddy-agent-1.12.8
+2206161840 metadata/md5-cache/dev-java/findbugs-annotations-3.0.1
+2206151940 metadata/md5-cache/dev-java/jna-5.10.0
+2206161840 metadata/md5-cache/dev-java/jython-2.7.0-r6
+2206161840 metadata/md5-cache/dev-java/logback-classic-1.2.11
+2206161840 metadata/md5-cache/dev-java/logback-core-1.2.11
+2206161840 metadata/md5-cache/dev-java/mockito-4.4.0
+2206161840 metadata/md5-cache/dev-java/netty-4.1.35
+2206150640 metadata/md5-cache/dev-java/tomcat-native-1.2.34
+2206161910 metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.21
+2206161910 metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.79
+2206140710 metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.81
+2206161910 metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.63
+2206131810 metadata/md5-cache/dev-java/wsdl4j-1.6.3
+2206161840 metadata/md5-cache/dev-java/xmlgraphics-commons-2.7-r1
 2101062239 metadata/md5-cache/dev-lang/cll1h-0.6-r1
 2101070439 metadata/md5-cache/dev-lang/coffee-script-2.5.1
 1702282312 metadata/md5-cache/dev-lang/esco-0.512
@@ -37794,8 +37665,6 @@
 2203240726 metadata/md5-cache/dev-lang/logtalk-3.47.0
 2203240726 metadata/md5-cache/dev-lang/spark-2021
 2204011845 metadata/md5-cache/dev-lang/arc-3.2
-2204172340 metadata/md5-cache/dev-lang/gforth-0.7.3-r2
-2204172340 metadata/md5-cache/dev-lang/teyjus-2.1-r1
 2204232309 metadata/md5-cache/dev-lang/jimtcl-0.81
 2204231210 metadata/md5-cache/dev-lang/pico8-0.2.4c
 2205022240 metadata/md5-cache/dev-lang/closure-compiler-bin-20211107
@@ -37809,7 +37678,6 @@
 2205022240 metadata/md5-cache/dev-lang/rakudo-2021.10
 2205022240 metadata/md5-cache/dev-lang/rakudo-2022.02
 2205022240 metadata/md5-cache/dev-lang/scala-bin-2.13.6
-2205122041 metadata/md5-cache/dev-lang/mlton-20180207
 2205122041 metadata/md5-cache/dev-lang/scala-2.12.10
 2205160340 metadata/md5-cache/dev-lang/abs-2.6.0
 2205170654 metadata/md5-cache/dev-lang/bas-2.4
@@ -37828,7 +37696,6 @@
 2205170654 metadata/md5-cache/dev-lang/erlang-24.3.3
 2205170654 metadata/md5-cache/dev-lang/erlang-24.3.4
 2205182010 metadata/md5-cache/dev-lang/erlang-25.0
-2205170654 metadata/md5-cache/dev-lang/execline-2.8.2.0
 2205170654 metadata/md5-cache/dev-lang/f2c-20100827-r1
 2205170654 metadata/md5-cache/dev-lang/fennel-0.9.1
 2205170654 metadata/md5-cache/dev-lang/fennel-1.0.0
@@ -37836,8 +37703,6 @@
 2205170654 metadata/md5-cache/dev-lang/ferite-1.1.17-r1
 2205170654 metadata/md5-cache/dev-lang/fpc-3.2.2
 2205170654 metadata/md5-cache/dev-lang/gnuprologjava-0.2.6-r1
-2205171240 metadata/md5-cache/dev-lang/go-1.17.10
-2205171240 metadata/md5-cache/dev-lang/go-1.18.2
 2205170654 metadata/md5-cache/dev-lang/go-9999
 2205170654 metadata/md5-cache/dev-lang/gprolog-1.4.5
 2205170654 metadata/md5-cache/dev-lang/gprolog-1.5.0
@@ -37932,7 +37797,6 @@
 2205170654 metadata/md5-cache/dev-lang/tcc-0.9.27_p20211022
 2205170654 metadata/md5-cache/dev-lang/tcc-9999
 2205170654 metadata/md5-cache/dev-lang/tcl-8.6.11
-2205170654 metadata/md5-cache/dev-lang/teyjus-2.1
 2205170654 metadata/md5-cache/dev-lang/tk-8.6.11.1
 2205170654 metadata/md5-cache/dev-lang/tk-8.6.12
 2205170654 metadata/md5-cache/dev-lang/tuprolog-3.2.0
@@ -37976,23 +37840,16 @@
 2206080140 metadata/md5-cache/dev-lang/perl-5.36.0
 2206071110 metadata/md5-cache/dev-lang/python-2.7.18_p15
 2206071015 metadata/md5-cache/dev-lang/python-3.10.4
-2206071015 metadata/md5-cache/dev-lang/python-3.10.4_p1
 2206071110 metadata/md5-cache/dev-lang/python-3.10.5
-2206071015 metadata/md5-cache/dev-lang/python-3.11.0_beta1-r2
-2206071015 metadata/md5-cache/dev-lang/python-3.11.0_beta2
-2206071015 metadata/md5-cache/dev-lang/python-3.11.0_beta2_p1
 2206071110 metadata/md5-cache/dev-lang/python-3.11.0_beta3
 2206071015 metadata/md5-cache/dev-lang/python-3.8.13
-2206071015 metadata/md5-cache/dev-lang/python-3.8.13_p1
 2206071110 metadata/md5-cache/dev-lang/python-3.8.13_p2
-2206071015 metadata/md5-cache/dev-lang/python-3.9.11
 2206071015 metadata/md5-cache/dev-lang/python-3.9.12
 2206071110 metadata/md5-cache/dev-lang/python-3.9.13
 2206071015 metadata/md5-cache/dev-lang/python-exec-conf-2.4.6
 2206071015 metadata/md5-cache/dev-lang/qu-prolog-10.6
 2206071015 metadata/md5-cache/dev-lang/rust-1.59.0
 2206071015 metadata/md5-cache/dev-lang/rust-1.61.0-r1
-2206071015 metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r10
 2206071015 metadata/md5-cache/dev-lang/spidermonkey-60.5.2_p0-r6
 2206071015 metadata/md5-cache/dev-lang/spidermonkey-68.12.0-r1
 2206071015 metadata/md5-cache/dev-lang/spidermonkey-78.15.0
@@ -38001,7 +37858,6 @@
 2206071015 metadata/md5-cache/dev-lang/spidermonkey-91.9.1
 2206071015 metadata/md5-cache/dev-lang/yap-7.0.1
 2206071015 metadata/md5-cache/dev-lang/yap-7.1.0
-2206121142 metadata/md5-cache/dev-lang/R-4.2.0
 2206121142 metadata/md5-cache/dev-lang/gdl-1.0.0_rc3-r1
 2206121142 metadata/md5-cache/dev-lang/go-1.17.11
 2206121142 metadata/md5-cache/dev-lang/go-1.18.3
@@ -38017,11 +37873,17 @@
 2206101010 metadata/md5-cache/dev-lang/rust-1.60.0
 2206101010 metadata/md5-cache/dev-lang/rust-bin-1.60.0
 2206090010 metadata/md5-cache/dev-lang/tcl-8.6.12
-2206121540 metadata/md5-cache/dev-lang/Manifest.gz
 2206121540 metadata/md5-cache/dev-lang/gnat-gpl-2020
 2206121540 metadata/md5-cache/dev-lang/gnat-gpl-2021-r1
 2206121540 metadata/md5-cache/dev-lang/gnat-gpl-2021-r3
 2206121510 metadata/md5-cache/dev-lang/ispc-1.18.0
+2206161940 metadata/md5-cache/dev-lang/Manifest.gz
+2206140040 metadata/md5-cache/dev-lang/R-4.2.0
+2206161940 metadata/md5-cache/dev-lang/gforth-0.7.3-r2
+2206161940 metadata/md5-cache/dev-lang/mlton-20180207
+2206161940 metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r10
+2206161940 metadata/md5-cache/dev-lang/teyjus-2.1
+2206161940 metadata/md5-cache/dev-lang/teyjus-2.1-r1
 2108220339 metadata/md5-cache/dev-libs/argtable-2.13-r1
 1808290309 metadata/md5-cache/dev-libs/bcm2835-1.57
 2007042139 metadata/md5-cache/dev-libs/bemenu-0.5.0
@@ -38103,7 +37965,6 @@
 2204130011 metadata/md5-cache/dev-libs/gnulib-2022.02.12.16.27.05
 2204130011 metadata/md5-cache/dev-libs/libax25-0.0.12_rc5
 2204241040 metadata/md5-cache/dev-libs/libstrophe-0.10.0
-2204290540 metadata/md5-cache/dev-libs/libksba-1.6.0
 2205011048 metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r6
 2205011048 metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r7
 2205061110 metadata/md5-cache/dev-libs/pkcs11-helper-1.29.0
@@ -38208,7 +38069,6 @@
 2205170654 metadata/md5-cache/dev-libs/ferrisloki-3.0.13-r2
 2205170654 metadata/md5-cache/dev-libs/ffcall-2.1
 2205170654 metadata/md5-cache/dev-libs/ffcall-2.4
-2205170654 metadata/md5-cache/dev-libs/flatbuffers-2.0.0-r1
 2205170654 metadata/md5-cache/dev-libs/foma-0.9.18-r1
 2205170654 metadata/md5-cache/dev-libs/fstrm-0.6.1
 2205170654 metadata/md5-cache/dev-libs/gdl-3.40.0
@@ -38319,9 +38179,7 @@
 2205170654 metadata/md5-cache/dev-libs/libezV24-0.1.1-r2
 2205170654 metadata/md5-cache/dev-libs/libf2c-20130927-r1
 2205170654 metadata/md5-cache/dev-libs/libffi-3.3-r2
-2205170654 metadata/md5-cache/dev-libs/libffi-3.4.2-r1
 2205170654 metadata/md5-cache/dev-libs/libffi-compat-3.2.1-r3
-2205170654 metadata/md5-cache/dev-libs/libffi-compat-3.3-r2
 2205170654 metadata/md5-cache/dev-libs/libfilezilla-0.36.0
 2205170654 metadata/md5-cache/dev-libs/libfilezilla-0.37.1-r1
 2205170654 metadata/md5-cache/dev-libs/libfilezilla-0.37.2
@@ -38349,7 +38207,6 @@
 2205170654 metadata/md5-cache/dev-libs/libgee-0.20.5
 2205170654 metadata/md5-cache/dev-libs/libgpg-error-1.42
 2205170654 metadata/md5-cache/dev-libs/libgpg-error-1.44
-2205170840 metadata/md5-cache/dev-libs/libgpg-error-1.45
 2205170654 metadata/md5-cache/dev-libs/libgpiod-1.4.1
 2205170654 metadata/md5-cache/dev-libs/libgpiod-1.6.3
 2205170654 metadata/md5-cache/dev-libs/libgrapheme-1
@@ -38363,7 +38220,6 @@
 2205170654 metadata/md5-cache/dev-libs/liblogging-1.0.6-r1
 2205170654 metadata/md5-cache/dev-libs/liblognorm-2.0.6
 2205170654 metadata/md5-cache/dev-libs/libltdl-2.4.6
-2205170654 metadata/md5-cache/dev-libs/libltdl-2.4.7
 2205170654 metadata/md5-cache/dev-libs/libmateweather-1.24.1
 2205170654 metadata/md5-cache/dev-libs/libmateweather-1.26.0
 2205170654 metadata/md5-cache/dev-libs/libmaxminddb-1.5.2
@@ -38633,7 +38489,6 @@
 2205170654 metadata/md5-cache/dev-libs/simdjson-1.0.2
 2205180440 metadata/md5-cache/dev-libs/simdjson-1.1.0
 2205170654 metadata/md5-cache/dev-libs/sink-0.8.0-r3
-2205170654 metadata/md5-cache/dev-libs/skalibs-2.11.1.0
 2205171010 metadata/md5-cache/dev-libs/sleef-3.5.1
 2205170654 metadata/md5-cache/dev-libs/snowball-stemmer-2.1.0-r1
 2205191340 metadata/md5-cache/dev-libs/softhsm-2.6.1-r2
@@ -38772,7 +38627,6 @@
 2206051640 metadata/md5-cache/dev-libs/libfastjson-0.99.9-r1
 2206030540 metadata/md5-cache/dev-libs/nettle-3.8
 2206041440 metadata/md5-cache/dev-libs/nss-3.68.4
-2206030040 metadata/md5-cache/dev-libs/simdjson-2.0.3
 2206031110 metadata/md5-cache/dev-libs/unibilium-2.1.1
 2206071015 metadata/md5-cache/dev-libs/FBGEMM-2022.01.13
 2206071015 metadata/md5-cache/dev-libs/aml-0.2.1
@@ -38801,14 +38655,12 @@
 2206071015 metadata/md5-cache/dev-libs/gjs-1.72.0
 2206071015 metadata/md5-cache/dev-libs/glib-2.72.1
 2206071015 metadata/md5-cache/dev-libs/glib-2.72.2
-2206071015 metadata/md5-cache/dev-libs/gobject-introspection-1.72.0
 2206071015 metadata/md5-cache/dev-libs/granite-5.2.5-r1
 2206071015 metadata/md5-cache/dev-libs/granite-6.0.0
 2206071015 metadata/md5-cache/dev-libs/granite-6.2.0
 2206071110 metadata/md5-cache/dev-libs/hidapi-0.11.0
 2206071015 metadata/md5-cache/dev-libs/hyperscan-5.4.0
 2206071015 metadata/md5-cache/dev-libs/icu-70.1-r1
-2206071015 metadata/md5-cache/dev-libs/icu-71.1
 2206071015 metadata/md5-cache/dev-libs/imath-3.1.4-r3
 2206071015 metadata/md5-cache/dev-libs/imath-3.1.4-r4
 2206071015 metadata/md5-cache/dev-libs/imath-3.1.5
@@ -38859,14 +38711,12 @@
 2206071015 metadata/md5-cache/dev-libs/libindicate-12.10.1-r3
 2206071015 metadata/md5-cache/dev-libs/libindicator-12.10.1-r301
 2206080340 metadata/md5-cache/dev-libs/libinput-1.20.1
-2206071015 metadata/md5-cache/dev-libs/libixion-0.16.1
 2206071015 metadata/md5-cache/dev-libs/libixion-9999
 2206071015 metadata/md5-cache/dev-libs/libjcat-0.1.10
 2206071015 metadata/md5-cache/dev-libs/libjcat-0.1.11
 2206071015 metadata/md5-cache/dev-libs/libjcat-0.1.9-r1
 2206071015 metadata/md5-cache/dev-libs/libmanette-0.2.6
 2206061240 metadata/md5-cache/dev-libs/libmodbus-3.1.7
-2206071015 metadata/md5-cache/dev-libs/liborcus-0.16.1
 2206071015 metadata/md5-cache/dev-libs/liborcus-9999
 2206071015 metadata/md5-cache/dev-libs/libpeas-1.32.0
 2206071015 metadata/md5-cache/dev-libs/libportal-0.6
@@ -38912,7 +38762,6 @@
 2206071015 metadata/md5-cache/dev-libs/sord-9999
 2206071015 metadata/md5-cache/dev-libs/template-glib-3.34.1
 2206071015 metadata/md5-cache/dev-libs/tllist-1.0.5
-2206081111 metadata/md5-cache/dev-libs/tlsh-4.8.2
 2206071015 metadata/md5-cache/dev-libs/totem-pl-parser-3.26.6
 2206071015 metadata/md5-cache/dev-libs/udis86-1.7.2-r1
 2206071015 metadata/md5-cache/dev-libs/voikko-fi-2.5
@@ -38929,7 +38778,6 @@
 2206121142 metadata/md5-cache/dev-libs/FP16-2021.03.20-r2
 2206121142 metadata/md5-cache/dev-libs/Ice-3.6.5-r2
 2206121142 metadata/md5-cache/dev-libs/boost-1.78.0-r2
-2206121142 metadata/md5-cache/dev-libs/boost-1.79.0
 2206121142 metadata/md5-cache/dev-libs/botan-2.19.1
 2206121142 metadata/md5-cache/dev-libs/botan-2.19.2
 2206121142 metadata/md5-cache/dev-libs/capstone-4.0.2-r2
@@ -38938,8 +38786,6 @@
 2206121142 metadata/md5-cache/dev-libs/distorm3-3.5.2
 2206090740 metadata/md5-cache/dev-libs/ell-0.51
 2206121142 metadata/md5-cache/dev-libs/gom-0.4
-2206100640 metadata/md5-cache/dev-libs/icu-71.1-r1
-2206100640 metadata/md5-cache/dev-libs/icu-layoutex-71.1
 2206112040 metadata/md5-cache/dev-libs/intel-compute-runtime-22.23.23405
 2206121142 metadata/md5-cache/dev-libs/keystone-0.9.2-r1
 2206121142 metadata/md5-cache/dev-libs/keystone-9999
@@ -38960,18 +38806,15 @@
 2206121142 metadata/md5-cache/dev-libs/libdnet-1.16.1
 2206121142 metadata/md5-cache/dev-libs/libgit2-glib-1.0.0.1
 2206120513 metadata/md5-cache/dev-libs/libinput-1.21.0-r1
-2206100640 metadata/md5-cache/dev-libs/libixion-0.17.0
 2206121142 metadata/md5-cache/dev-libs/liblouis-3.13.0
 2206121142 metadata/md5-cache/dev-libs/liblouis-3.17.0
 2206121142 metadata/md5-cache/dev-libs/liblouis-3.20.0
 2206121142 metadata/md5-cache/dev-libs/libnl-3.5.0
 2206121142 metadata/md5-cache/dev-libs/libnl-3.6.0-r1
 2206121142 metadata/md5-cache/dev-libs/libnl-99999999
-2206100640 metadata/md5-cache/dev-libs/liborcus-0.17.2
 2206090440 metadata/md5-cache/dev-libs/libpqxx-7.4.1
 2206121142 metadata/md5-cache/dev-libs/libprelude-5.2.0-r10
 2206121142 metadata/md5-cache/dev-libs/libpreludedb-5.2.0
-2206121142 metadata/md5-cache/dev-libs/libpwquality-1.4.4-r1
 2206121142 metadata/md5-cache/dev-libs/libpy-0.2.5-r1
 2206121142 metadata/md5-cache/dev-libs/libreport-2.16.0
 2206121142 metadata/md5-cache/dev-libs/libreport-2.17.1
@@ -38999,9 +38842,29 @@
 2206121142 metadata/md5-cache/dev-libs/xapian-bindings-1.4.18-r1
 2206121142 metadata/md5-cache/dev-libs/xapian-bindings-1.4.19
 2206121040 metadata/md5-cache/dev-libs/yaz-5.32.0
-2206131340 metadata/md5-cache/dev-libs/Manifest.gz
-2206131340 metadata/md5-cache/dev-libs/libtomcrypt-1.18.2-r4
-2206122140 metadata/md5-cache/dev-libs/tre-0.8.0_p20210321-r1
+2206162010 metadata/md5-cache/dev-libs/Manifest.gz
+2206142110 metadata/md5-cache/dev-libs/boost-1.79.0
+2206141540 metadata/md5-cache/dev-libs/cxxtools-3.0-r2
+2206141840 metadata/md5-cache/dev-libs/gobject-introspection-1.72.0
+2206142110 metadata/md5-cache/dev-libs/icu-71.1-r1
+2206142110 metadata/md5-cache/dev-libs/icu-layoutex-71.1
+2206141840 metadata/md5-cache/dev-libs/libdbusmenu-16.04.0-r2
+2206142010 metadata/md5-cache/dev-libs/libffi-3.4.2-r1
+2206142010 metadata/md5-cache/dev-libs/libffi-compat-3.3-r2
+2206160010 metadata/md5-cache/dev-libs/libgcrypt-1.10.1-r1
+2206151140 metadata/md5-cache/dev-libs/libgpg-error-1.45
+2206141640 metadata/md5-cache/dev-libs/libixion-0.17.0
+2206151140 metadata/md5-cache/dev-libs/libksba-1.6.0
+2206141040 metadata/md5-cache/dev-libs/libltdl-2.4.7
+2206141640 metadata/md5-cache/dev-libs/liborcus-0.17.2
+2206161940 metadata/md5-cache/dev-libs/libpwquality-1.4.4-r1
+2206131940 metadata/md5-cache/dev-libs/libtomcrypt-1.18.2-r4
+2206162010 metadata/md5-cache/dev-libs/libtraceevent-1.5.2
+2206162010 metadata/md5-cache/dev-libs/libtracefs-1.3.1
+2206141110 metadata/md5-cache/dev-libs/libzip-1.9.0
+2206161910 metadata/md5-cache/dev-libs/simdjson-2.0.4
+2206140910 metadata/md5-cache/dev-libs/tlsh-4.8.2
+2206151040 metadata/md5-cache/dev-libs/tre-0.8.0_p20210321-r1
 2203240726 metadata/md5-cache/dev-lisp/ecls-21.2.1-r4
 2205132310 metadata/md5-cache/dev-lisp/alexandria-1.4
 2205150110 metadata/md5-cache/dev-lisp/asdf-3.3.5
@@ -40580,7 +40443,6 @@
 2205011048 metadata/md5-cache/dev-perl/Net-Server-2.10.0
 2205011048 metadata/md5-cache/dev-perl/Net-Server-Coro-1.300.0-r2
 2205011048 metadata/md5-cache/dev-perl/Net-Server-Mail-0.280.0-r1
-2205011048 metadata/md5-cache/dev-perl/Net-Subnet-1.30.0-r2
 2205011048 metadata/md5-cache/dev-perl/Net-Telnet-3.50.0
 2205011048 metadata/md5-cache/dev-perl/Net-Telnet-Cisco-1.120.0
 2205011048 metadata/md5-cache/dev-perl/Net-Trackback-1.10.0-r2
@@ -41019,7 +40881,6 @@
 2205011048 metadata/md5-cache/dev-perl/Time-TAI64-2.110.0-r3
 2205011048 metadata/md5-cache/dev-perl/Time-TZOffset-0.40.0-r1
 2205011048 metadata/md5-cache/dev-perl/TimeDate-2.330.0-r1
-2205011048 metadata/md5-cache/dev-perl/Tk-804.36.0
 2205011048 metadata/md5-cache/dev-perl/Tk-CursorControl-0.400.0-r4
 2205011048 metadata/md5-cache/dev-perl/Tk-JPEG-Lite-2.15.0-r1
 2205011048 metadata/md5-cache/dev-perl/Tk-TableMatrix-1.260.0
@@ -41401,9 +41262,13 @@
 2206071015 metadata/md5-cache/dev-perl/Inline-Python-0.560.0-r1
 2206060410 metadata/md5-cache/dev-perl/Sereal-Decoder-4.23.0
 2206060410 metadata/md5-cache/dev-perl/Sereal-Encoder-4.23.0
-2206092310 metadata/md5-cache/dev-perl/Manifest.gz
 2206092310 metadata/md5-cache/dev-perl/Sereal-Decoder-4.23.0-r1
 2206092310 metadata/md5-cache/dev-perl/Sereal-Encoder-4.23.0-r1
+2206161940 metadata/md5-cache/dev-perl/Manifest.gz
+2206161940 metadata/md5-cache/dev-perl/Net-Subnet-1.30.0-r2
+2206141740 metadata/md5-cache/dev-perl/Specio-0.480.0
+2206160140 metadata/md5-cache/dev-perl/Sys-Virt-8.4.0
+2206161940 metadata/md5-cache/dev-perl/Tk-804.36.0
 2012150539 metadata/md5-cache/dev-php/File_Iterator-1.4.2
 2101072209 metadata/md5-cache/dev-php/File_Iterator-2.0.2-r1
 2108131009 metadata/md5-cache/dev-php/PEAR-Archive_Tar-1.4.14
@@ -41774,7 +41639,6 @@
 2205170654 metadata/md5-cache/dev-php/pecl-raphf-2.0.1-r1
 2205170654 metadata/md5-cache/dev-php/pecl-raphf-2.0.1-r2
 2205170654 metadata/md5-cache/dev-php/pecl-redis-5.3.6
-2205170654 metadata/md5-cache/dev-php/pecl-redis-5.3.7
 2205170654 metadata/md5-cache/dev-php/pecl-rrd-2.0.1-r4
 2205170654 metadata/md5-cache/dev-php/pecl-rrd-2.0.3
 2205170654 metadata/md5-cache/dev-php/pecl-ssh2-1.3.1
@@ -41804,8 +41668,10 @@
 2205170654 metadata/md5-cache/dev-php/xdebug-client-2.9.6
 2205170654 metadata/md5-cache/dev-php/xdebug-client-2.9.8
 2205170654 metadata/md5-cache/dev-php/xhprof-2.3.5
-2205271610 metadata/md5-cache/dev-php/Manifest.gz
 2205271610 metadata/md5-cache/dev-php/smarty-4.1.1
+2206161310 metadata/md5-cache/dev-php/Manifest.gz
+2206160140 metadata/md5-cache/dev-php/libvirt-php-0.5.6
+2206161310 metadata/md5-cache/dev-php/pecl-redis-5.3.7
 2104060140 metadata/md5-cache/dev-python/python-docs-2.7.18
 2204211739 metadata/md5-cache/dev-python/python-docs-3.10.3
 2204211739 metadata/md5-cache/dev-python/python-docs-3.7.13
@@ -41825,8 +41691,6 @@
 2206071015 metadata/md5-cache/dev-python/pyotherside-1.5.9
 2206071015 metadata/md5-cache/dev-python/pypy-7.3.9
 2206071015 metadata/md5-cache/dev-python/pypy-exe-7.3.9
-2206071015 metadata/md5-cache/dev-python/pypy3-7.3.9
-2206071015 metadata/md5-cache/dev-python/pypy3-7.3.9_p1
 2206071015 metadata/md5-cache/dev-python/pypy3-exe-7.3.9
 2206071015 metadata/md5-cache/dev-python/python-caja-1.24.0-r2
 2206071015 metadata/md5-cache/dev-python/quex-0.71.2
@@ -41837,14 +41701,9 @@
 2206121142 metadata/md5-cache/dev-python/Babel-2.10.1
 2206121142 metadata/md5-cache/dev-python/BitVector-3.5.0
 2206121142 metadata/md5-cache/dev-python/CppHeaderParser-2.7.4
-2206121142 metadata/md5-cache/dev-python/Faker-13.11.1
-2206121142 metadata/md5-cache/dev-python/Faker-13.12.0
-2206121142 metadata/md5-cache/dev-python/Faker-13.12.1
 2206121142 metadata/md5-cache/dev-python/Faker-13.13.0
 2206121142 metadata/md5-cache/dev-python/GitPython-3.1.27
 2206121142 metadata/md5-cache/dev-python/GridDataFormats-0.6.0
-2206121142 metadata/md5-cache/dev-python/GridDataFormats-0.7.0
-2206121142 metadata/md5-cache/dev-python/GridDataFormats-1.0.0
 2206121142 metadata/md5-cache/dev-python/GridDataFormats-1.0.1
 2206121142 metadata/md5-cache/dev-python/MechanicalSoup-1.1.0
 2206121142 metadata/md5-cache/dev-python/Opcodes-0.3.14
@@ -41897,11 +41756,7 @@
 2206121142 metadata/md5-cache/dev-python/aioresponses-0.7.3-r1
 2206121142 metadata/md5-cache/dev-python/aiorpcX-0.19.1
 2206121142 metadata/md5-cache/dev-python/aiorpcX-0.22.1
-2206121142 metadata/md5-cache/dev-python/aiosignal-1.2.0
-2206121142 metadata/md5-cache/dev-python/aiosignal-1.2.0-r1
 2206121142 metadata/md5-cache/dev-python/ajsonrpc-1.2.0
-2206121142 metadata/md5-cache/dev-python/alabaster-0.7.12
-2206121142 metadata/md5-cache/dev-python/alabaster-0.7.12-r1
 2206121142 metadata/md5-cache/dev-python/alagitpull-0.0.23-r1
 2206121142 metadata/md5-cache/dev-python/alembic-1.7.7
 2206121142 metadata/md5-cache/dev-python/alembic-1.8.0
@@ -41912,8 +41767,6 @@
 2206121142 metadata/md5-cache/dev-python/aniso8601-9.0.1-r1
 2206121142 metadata/md5-cache/dev-python/ansi-0.3.6
 2206121142 metadata/md5-cache/dev-python/ansi2html-1.7.0
-2206121142 metadata/md5-cache/dev-python/ansible-compat-2.0.3
-2206121142 metadata/md5-cache/dev-python/ansible-compat-2.0.4
 2206121142 metadata/md5-cache/dev-python/ansible-compat-2.1.0
 2206121142 metadata/md5-cache/dev-python/ansible-pygments-0.1.1
 2206121142 metadata/md5-cache/dev-python/ansible-runner-1.4.9
@@ -41921,9 +41774,6 @@
 2206121142 metadata/md5-cache/dev-python/ansicolor-0.3.2-r1
 2206121142 metadata/md5-cache/dev-python/ansicolor-9999
 2206121142 metadata/md5-cache/dev-python/antlr4-python3-runtime-4.10.1
-2206121142 metadata/md5-cache/dev-python/anyio-3.5.0-r1
-2206121142 metadata/md5-cache/dev-python/anyio-3.6.1
-2206121142 metadata/md5-cache/dev-python/anyqt-0.0.14
 2206121142 metadata/md5-cache/dev-python/apipkg-2.1.1
 2206121142 metadata/md5-cache/dev-python/apipkg-3.0.1
 2206121142 metadata/md5-cache/dev-python/apispec-5.2.2
@@ -41939,7 +41789,6 @@
 2206121142 metadata/md5-cache/dev-python/argparse-manpage-3
 2206121142 metadata/md5-cache/dev-python/arrow-1.2.2
 2206121142 metadata/md5-cache/dev-python/asn1crypto-1.5.1
-2206121142 metadata/md5-cache/dev-python/asteval-0.9.26
 2206121142 metadata/md5-cache/dev-python/asteval-0.9.27
 2206121142 metadata/md5-cache/dev-python/astor-0.8.1-r1
 2206121142 metadata/md5-cache/dev-python/astroid-2.11.5
@@ -41948,29 +41797,23 @@
 2206121142 metadata/md5-cache/dev-python/async-lru-1.0.3
 2206121142 metadata/md5-cache/dev-python/async_timeout-4.0.2
 2206121142 metadata/md5-cache/dev-python/async_timeout-4.0.2-r1
-2206121142 metadata/md5-cache/dev-python/asyncstdlib-3.10.4
 2206121142 metadata/md5-cache/dev-python/asyncstdlib-3.10.5
 2206121142 metadata/md5-cache/dev-python/atomicwrites-1.4.0-r2
 2206121142 metadata/md5-cache/dev-python/atpublic-3.0.1
 2206121142 metadata/md5-cache/dev-python/attrs-21.4.0-r1
 2206121142 metadata/md5-cache/dev-python/audioread-2.1.9-r1
-2206121142 metadata/md5-cache/dev-python/authres-1.2.0
-2206121142 metadata/md5-cache/dev-python/authres-1.2.0-r1
 2206121142 metadata/md5-cache/dev-python/autobahn-22.3.2-r1
 2206121142 metadata/md5-cache/dev-python/autobahn-22.4.2
 2206121142 metadata/md5-cache/dev-python/autobahn-22.5.1-r1
 2206121142 metadata/md5-cache/dev-python/autocommand-2.2.1_p20211118
-2206121142 metadata/md5-cache/dev-python/automat-20.2.0
 2206121142 metadata/md5-cache/dev-python/autopage-0.5.0
 2206121142 metadata/md5-cache/dev-python/autopage-0.5.1
 2206121142 metadata/md5-cache/dev-python/autopep8-1.6.0
 2206121142 metadata/md5-cache/dev-python/autopep8-9999
-2206121142 metadata/md5-cache/dev-python/autoprop-4.0.2-r1
 2206121142 metadata/md5-cache/dev-python/autoprop-4.1.0
 2206121142 metadata/md5-cache/dev-python/aws-sam-translator-1.45.0
 2206121142 metadata/md5-cache/dev-python/aws-sam-translator-1.46.0
 2206121142 metadata/md5-cache/dev-python/aws-xray-sdk-python-2.8.0
-2206121142 metadata/md5-cache/dev-python/awxkit-21.0.0
 2206121142 metadata/md5-cache/dev-python/awxkit-21.1.0
 2206121142 metadata/md5-cache/dev-python/babelfish-0.6.0-r1
 2206121142 metadata/md5-cache/dev-python/babelfish-0.6.0-r2
@@ -41998,15 +41841,12 @@
 2206121142 metadata/md5-cache/dev-python/betamax-0.8.1
 2206121142 metadata/md5-cache/dev-python/betamax-0.8.1-r1
 2206121142 metadata/md5-cache/dev-python/betamax-matchers-0.4.0
-2206121142 metadata/md5-cache/dev-python/bibtexparser-1.2.0
 2206121142 metadata/md5-cache/dev-python/bibtexparser-1.2.0-r2
 2206121142 metadata/md5-cache/dev-python/binaryornot-0.4.4-r2
 2206121142 metadata/md5-cache/dev-python/bitarray-2.5.1
 2206121142 metadata/md5-cache/dev-python/bitstring-3.1.9
 2206121142 metadata/md5-cache/dev-python/black-22.1.0
 2206121142 metadata/md5-cache/dev-python/black-22.3.0
-2206121142 metadata/md5-cache/dev-python/bleach-5.0.0
-2206121142 metadata/md5-cache/dev-python/bleach-5.0.0-r1
 2206121142 metadata/md5-cache/dev-python/blessed-1.19.1
 2206121142 metadata/md5-cache/dev-python/blessings-1.7-r1
 2206121142 metadata/md5-cache/dev-python/blinker-1.4-r3
@@ -42048,17 +41888,10 @@
 2206121142 metadata/md5-cache/dev-python/cachecontrol-0.12.11
 2206121142 metadata/md5-cache/dev-python/cached-property-1.5.2
 2206121142 metadata/md5-cache/dev-python/cached-property-1.5.2-r1
-2206121142 metadata/md5-cache/dev-python/cachelib-0.6.0
-2206121142 metadata/md5-cache/dev-python/cachelib-0.7.0
-2206121142 metadata/md5-cache/dev-python/cachetools-4.2.4
-2206121142 metadata/md5-cache/dev-python/cachetools-5.0.0
-2206121142 metadata/md5-cache/dev-python/cachetools-5.1.0
-2206121142 metadata/md5-cache/dev-python/cachetools-5.2.0
 2206121142 metadata/md5-cache/dev-python/cairocffi-1.3.0
 2206121142 metadata/md5-cache/dev-python/cangjie-1.3-r1
 2206121142 metadata/md5-cache/dev-python/capturer-3.0
 2206121142 metadata/md5-cache/dev-python/carbon-1.1.10
-2206121142 metadata/md5-cache/dev-python/carbon-1.1.8-r1
 2206121142 metadata/md5-cache/dev-python/case-1.5.3
 2206121142 metadata/md5-cache/dev-python/casttube-0.2.1
 2206121142 metadata/md5-cache/dev-python/catkin_pkg-0.4.24
@@ -42069,15 +41902,11 @@
 2206121142 metadata/md5-cache/dev-python/cbor2-5.4.3
 2206121142 metadata/md5-cache/dev-python/cchardet-2.1.7
 2206121142 metadata/md5-cache/dev-python/cerberus-1.3.2
-2206121142 metadata/md5-cache/dev-python/cerberus-1.3.4
-2206121142 metadata/md5-cache/dev-python/cerberus-1.3.4-r1
 2206121142 metadata/md5-cache/dev-python/certifi-3021.3.16-r2
-2206121142 metadata/md5-cache/dev-python/cffi-1.15.0
 2206121142 metadata/md5-cache/dev-python/cfgv-3.3.1
 2206121142 metadata/md5-cache/dev-python/cfn-lint-0.60.1
 2206121142 metadata/md5-cache/dev-python/cfn-lint-0.61.0
 2206121142 metadata/md5-cache/dev-python/cftime-1.6.0
-2206121142 metadata/md5-cache/dev-python/cgroup-utils-0.8
 2206121142 metadata/md5-cache/dev-python/cgroup-utils-0.8-r1
 2206121142 metadata/md5-cache/dev-python/chai-1.1.2
 2206121142 metadata/md5-cache/dev-python/chameleon-3.10.0
@@ -42092,7 +41921,6 @@
 2206121142 metadata/md5-cache/dev-python/cheroot-8.6.0-r1
 2206121142 metadata/md5-cache/dev-python/cherrypy-18.6.1
 2206121142 metadata/md5-cache/dev-python/cherrypy-18.6.1-r1
-2206121142 metadata/md5-cache/dev-python/chump-1.6.0-r1
 2206121142 metadata/md5-cache/dev-python/chump-1.6.0-r2
 2206121142 metadata/md5-cache/dev-python/citeproc-py-0.6.0
 2206121142 metadata/md5-cache/dev-python/cjkwrap-2.2-r1
@@ -42111,17 +41939,12 @@
 2206121142 metadata/md5-cache/dev-python/click-default-group-1.2.2
 2206121142 metadata/md5-cache/dev-python/click-default-group-1.2.2-r1
 2206121142 metadata/md5-cache/dev-python/click-help-colors-0.9.1
-2206121142 metadata/md5-cache/dev-python/click-log-0.3.2
 2206121142 metadata/md5-cache/dev-python/click-log-0.4.0
 2206121142 metadata/md5-cache/dev-python/click-plugins-1.1.1
-2206121142 metadata/md5-cache/dev-python/click-threading-0.5.0
 2206121142 metadata/md5-cache/dev-python/click-threading-0.5.0-r1
 2206121142 metadata/md5-cache/dev-python/cliff-3.10.1
 2206121142 metadata/md5-cache/dev-python/clikit-0.6.2
 2206121142 metadata/md5-cache/dev-python/clint-0.5.1-r3
-2206121142 metadata/md5-cache/dev-python/cloudpickle-2.0.0
-2206121142 metadata/md5-cache/dev-python/cloudpickle-2.0.0-r1
-2206121142 metadata/md5-cache/dev-python/cloudpickle-2.1.0
 2206121142 metadata/md5-cache/dev-python/cloudscraper-1.2.60
 2206121142 metadata/md5-cache/dev-python/cmd2-2.4.1
 2206121142 metadata/md5-cache/dev-python/collective-checkdocs-0.2-r1
@@ -42139,21 +41962,17 @@
 2206121142 metadata/md5-cache/dev-python/consonance-0.1.5-r1
 2206121142 metadata/md5-cache/dev-python/constantly-15.1.0-r2
 2206121142 metadata/md5-cache/dev-python/construct-2.10.68
-2206121142 metadata/md5-cache/dev-python/cookies-2.2.1-r1
-2206121142 metadata/md5-cache/dev-python/cookies-2.2.1-r2
 2206121142 metadata/md5-cache/dev-python/coreapi-2.3.3-r2
 2206121142 metadata/md5-cache/dev-python/coreschema-0.0.4-r1
 2206121142 metadata/md5-cache/dev-python/cov-core-1.15.0-r3
 2206121142 metadata/md5-cache/dev-python/coverage-6.3.2-r1
 2206121142 metadata/md5-cache/dev-python/coverage-6.3.3
 2206121142 metadata/md5-cache/dev-python/coverage-6.4
-2206121142 metadata/md5-cache/dev-python/coverage-6.4.1
 2206121142 metadata/md5-cache/dev-python/cppy-1.2.1-r1
 2206121142 metadata/md5-cache/dev-python/crashtest-0.3.1
 2206121142 metadata/md5-cache/dev-python/crashtest-0.3.1-r1
 2206121142 metadata/md5-cache/dev-python/crcmod-1.7-r5
 2206121142 metadata/md5-cache/dev-python/croniter-1.3.4
-2206121142 metadata/md5-cache/dev-python/croniter-1.3.5
 2206121142 metadata/md5-cache/dev-python/cryptography-3.4.7-r3
 2206121142 metadata/md5-cache/dev-python/cryptography-37.0.2-r1
 2206121142 metadata/md5-cache/dev-python/css-parser-1.0.7-r1
@@ -42163,7 +41982,6 @@
 2206121142 metadata/md5-cache/dev-python/cssselect2-0.6.0
 2206121142 metadata/md5-cache/dev-python/cssutils-2.4.0
 2206121142 metadata/md5-cache/dev-python/cssutils-2.4.1
-2206121142 metadata/md5-cache/dev-python/cssutils-2.4.2
 2206121142 metadata/md5-cache/dev-python/csvkit-1.0.7
 2206121142 metadata/md5-cache/dev-python/curtsies-0.3.10
 2206121142 metadata/md5-cache/dev-python/cwcwidth-0.1.6
@@ -42176,13 +41994,10 @@
 2206121142 metadata/md5-cache/dev-python/cython-0.29.28_p20220503
 2206121142 metadata/md5-cache/dev-python/cython-0.29.29
 2206121142 metadata/md5-cache/dev-python/cython-test-exception-raiser-1.0.2-r1
-2206121142 metadata/md5-cache/dev-python/daemonize-2.5.0
 2206121142 metadata/md5-cache/dev-python/dask-2022.05.0
 2206121142 metadata/md5-cache/dev-python/dask-2022.05.2
 2206121142 metadata/md5-cache/dev-python/dask-2022.6.0
 2206121142 metadata/md5-cache/dev-python/dbfread-2.0.7
-2206121142 metadata/md5-cache/dev-python/dbus-next-0.2.3
-2206121142 metadata/md5-cache/dev-python/dbus-next-0.2.3-r1
 2206121142 metadata/md5-cache/dev-python/dbus-python-1.2.18
 2206121142 metadata/md5-cache/dev-python/dbutils-3.0.2
 2206121142 metadata/md5-cache/dev-python/ddt-1.4.4
@@ -42190,14 +42005,9 @@
 2206121142 metadata/md5-cache/dev-python/debtcollector-2.5.0
 2206121142 metadata/md5-cache/dev-python/debugpy-1.5.1
 2206121142 metadata/md5-cache/dev-python/debugpy-1.6.0
-2206121142 metadata/md5-cache/dev-python/decorator-5.1.1
-2206121142 metadata/md5-cache/dev-python/decorator-5.1.1-r1
 2206121142 metadata/md5-cache/dev-python/deepmerge-1.0.1
 2206121142 metadata/md5-cache/dev-python/defcon-0.10.0-r1
-2206121142 metadata/md5-cache/dev-python/defcon-0.10.1
 2206121142 metadata/md5-cache/dev-python/denonavr-0.10.11
-2206121142 metadata/md5-cache/dev-python/deprecated-1.2.13
-2206121142 metadata/md5-cache/dev-python/deprecated-1.2.13-r1
 2206121142 metadata/md5-cache/dev-python/deprecation-2.1.0
 2206121142 metadata/md5-cache/dev-python/dictdiffer-0.9.0
 2206121142 metadata/md5-cache/dev-python/dictdiffer-0.9.0-r1
@@ -42209,8 +42019,6 @@
 2206121142 metadata/md5-cache/dev-python/dill-0.3.5
 2206121142 metadata/md5-cache/dev-python/dill-0.3.5.1
 2206121142 metadata/md5-cache/dev-python/dirty-equals-0.4
-2206121142 metadata/md5-cache/dev-python/discogs-client-2.3.14
-2206121142 metadata/md5-cache/dev-python/discogs-client-9999
 2206121142 metadata/md5-cache/dev-python/diskcache-5.4.0-r1
 2206121142 metadata/md5-cache/dev-python/dissononce-0.34.3-r2
 2206121142 metadata/md5-cache/dev-python/distlib-0.3.4-r1
@@ -42222,9 +42030,7 @@
 2206121142 metadata/md5-cache/dev-python/django-4.0.4
 2206121142 metadata/md5-cache/dev-python/django-auth-ldap-4.1.0
 2206121142 metadata/md5-cache/dev-python/django-cache-url-3.4.0
-2206121142 metadata/md5-cache/dev-python/django-cacheops-6.0
 2206121142 metadata/md5-cache/dev-python/django-cacheops-6.1
-2206121142 metadata/md5-cache/dev-python/django-cors-headers-3.12.0
 2206121142 metadata/md5-cache/dev-python/django-cors-headers-3.13.0
 2206121142 metadata/md5-cache/dev-python/django-filter-21.1-r2
 2206121142 metadata/md5-cache/dev-python/django-js-asset-2.0
@@ -42243,7 +42049,6 @@
 2206121142 metadata/md5-cache/dev-python/django_polymorphic-3.1
 2206121142 metadata/md5-cache/dev-python/djangorestframework-3.13.1-r1
 2206121142 metadata/md5-cache/dev-python/dkimpy-1.0.5-r1
-2206121142 metadata/md5-cache/dev-python/dns-lexicon-3.11.1
 2206121142 metadata/md5-cache/dev-python/dns-lexicon-3.11.2
 2206121142 metadata/md5-cache/dev-python/dnspython-2.2.1
 2206121142 metadata/md5-cache/dev-python/doc8-0.11.1
@@ -42253,10 +42058,6 @@
 2206121142 metadata/md5-cache/dev-python/docopt-0.6.2-r4
 2206121142 metadata/md5-cache/dev-python/docopt-0.6.2-r5
 2206121142 metadata/md5-cache/dev-python/doctest-ignore-unicode-0.1.2-r1
-2206121142 metadata/md5-cache/dev-python/docutils-0.17.1
-2206121142 metadata/md5-cache/dev-python/docutils-0.17.1-r1
-2206121142 metadata/md5-cache/dev-python/docutils-0.18.1
-2206121142 metadata/md5-cache/dev-python/docutils-0.18.1-r1
 2206121142 metadata/md5-cache/dev-python/docutils-glep-1.2
 2206121142 metadata/md5-cache/dev-python/dogpile-cache-1.1.5
 2206121142 metadata/md5-cache/dev-python/dogpile-cache-1.1.6
@@ -42300,10 +42101,8 @@
 2206121142 metadata/md5-cache/dev-python/et_xmlfile-1.1.0-r1
 2206121142 metadata/md5-cache/dev-python/etuples-0.3.5
 2206121142 metadata/md5-cache/dev-python/eventlet-0.33.0
-2206121142 metadata/md5-cache/dev-python/eventlet-0.33.1
 2206121142 metadata/md5-cache/dev-python/ewmh-0.1.6
 2206121142 metadata/md5-cache/dev-python/exam-0.10.6
-2206121142 metadata/md5-cache/dev-python/exceptiongroup-1.0.0_rc7
 2206121142 metadata/md5-cache/dev-python/execnet-1.9.0-r1
 2206121142 metadata/md5-cache/dev-python/executing-0.8.3
 2206121142 metadata/md5-cache/dev-python/expects-0.9.0
@@ -42327,11 +42126,7 @@
 2206121142 metadata/md5-cache/dev-python/fields-5.0.0-r3
 2206121142 metadata/md5-cache/dev-python/filebytes-0.10.2
 2206121142 metadata/md5-cache/dev-python/filebytes-9999
-2206121142 metadata/md5-cache/dev-python/filelock-3.6.0
-2206121142 metadata/md5-cache/dev-python/filelock-3.7.0
-2206121142 metadata/md5-cache/dev-python/filelock-3.7.1
 2206121142 metadata/md5-cache/dev-python/filetype-1.0.10
-2206121142 metadata/md5-cache/dev-python/findimports-2.2.0
 2206121142 metadata/md5-cache/dev-python/findimports-2.2.0-r1
 2206121142 metadata/md5-cache/dev-python/fitsio-1.1.7
 2206121142 metadata/md5-cache/dev-python/fixtures-3.0.0-r1
@@ -42375,7 +42170,6 @@
 2206121142 metadata/md5-cache/dev-python/flexmock-0.11.3
 2206121142 metadata/md5-cache/dev-python/flit-3.7.1
 2206121142 metadata/md5-cache/dev-python/flit_core-3.7.1
-2206121142 metadata/md5-cache/dev-python/flit_scm-1.5.0
 2206121142 metadata/md5-cache/dev-python/flufl-lock-7.0-r1
 2206121142 metadata/md5-cache/dev-python/fonttools-4.33.3
 2206121142 metadata/md5-cache/dev-python/freezegun-1.2.1
@@ -42417,24 +42211,18 @@
 2206121142 metadata/md5-cache/dev-python/google-api-python-client-2.48.0
 2206121142 metadata/md5-cache/dev-python/google-api-python-client-2.49.0
 2206121142 metadata/md5-cache/dev-python/google-api-python-client-2.50.0
-2206121142 metadata/md5-cache/dev-python/google-apitools-0.5.32
 2206121142 metadata/md5-cache/dev-python/google-apitools-0.5.32-r1
 2206121142 metadata/md5-cache/dev-python/google-auth-2.6.6-r1
 2206121142 metadata/md5-cache/dev-python/google-auth-2.7.0
 2206121142 metadata/md5-cache/dev-python/google-auth-httplib2-0.1.0-r1
-2206121142 metadata/md5-cache/dev-python/google-auth-oauthlib-0.5.1
 2206121142 metadata/md5-cache/dev-python/google-auth-oauthlib-0.5.2
 2206121142 metadata/md5-cache/dev-python/google-pasta-0.2.0-r1
 2206121142 metadata/md5-cache/dev-python/google-reauth-python-0.1.1
-2206121142 metadata/md5-cache/dev-python/googleapis-common-protos-1.56.0-r2
-2206121142 metadata/md5-cache/dev-python/googleapis-common-protos-1.56.1
-2206121142 metadata/md5-cache/dev-python/googleapis-common-protos-1.56.2
 2206121142 metadata/md5-cache/dev-python/gpep517-6
 2206121142 metadata/md5-cache/dev-python/gpep517-6-r1
 2206121142 metadata/md5-cache/dev-python/graph-tool-2.44-r1
 2206121142 metadata/md5-cache/dev-python/graph-tool-9999
 2206121142 metadata/md5-cache/dev-python/graphviz-0.20
-2206121142 metadata/md5-cache/dev-python/greenlet-1.1.2
 2206121142 metadata/md5-cache/dev-python/greenstalk-2.0.0-r1
 2206121142 metadata/md5-cache/dev-python/grpcio-1.43.0
 2206121142 metadata/md5-cache/dev-python/grpcio-testing-1.43.0
@@ -42452,14 +42240,6 @@
 2206121142 metadata/md5-cache/dev-python/h2-4.1.0-r1
 2206121142 metadata/md5-cache/dev-python/h5py-3.6.0
 2206121142 metadata/md5-cache/dev-python/h5py-3.7.0
-2206121142 metadata/md5-cache/dev-python/happybase-0.9_p20210701
-2206121142 metadata/md5-cache/dev-python/hatchling-0.24.0
-2206121142 metadata/md5-cache/dev-python/hatchling-0.25.0
-2206121142 metadata/md5-cache/dev-python/hatchling-1.0.0
-2206121142 metadata/md5-cache/dev-python/hatchling-1.1.0
-2206121142 metadata/md5-cache/dev-python/hatchling-1.2.0
-2206121142 metadata/md5-cache/dev-python/hatchling-1.3.0
-2206121142 metadata/md5-cache/dev-python/hatchling-1.3.1
 2206121142 metadata/md5-cache/dev-python/hcloud-python-1.16.0
 2206121142 metadata/md5-cache/dev-python/helpdev-0.7.1
 2206121142 metadata/md5-cache/dev-python/hiredis-2.0.0-r2
@@ -42468,7 +42248,6 @@
 2206121142 metadata/md5-cache/dev-python/hpack-4.0.0-r1
 2206121142 metadata/md5-cache/dev-python/html2text-2020.1.16-r1
 2206121142 metadata/md5-cache/dev-python/html5-parser-0.4.10
-2206121142 metadata/md5-cache/dev-python/httmock-1.4.0
 2206121142 metadata/md5-cache/dev-python/httmock-1.4.0-r1
 2206121142 metadata/md5-cache/dev-python/http-parser-0.9.0
 2206121142 metadata/md5-cache/dev-python/httpauth-0.3-r1
@@ -42476,8 +42255,6 @@
 2206121142 metadata/md5-cache/dev-python/httpcore-0.14.7-r1
 2206121142 metadata/md5-cache/dev-python/httpcore-0.15.0
 2206121142 metadata/md5-cache/dev-python/httplib2-0.20.4
-2206121142 metadata/md5-cache/dev-python/httpretty-1.1.4
-2206121142 metadata/md5-cache/dev-python/httpretty-1.1.4-r1
 2206121142 metadata/md5-cache/dev-python/httpx-0.22.0-r3
 2206121142 metadata/md5-cache/dev-python/httpx-0.23.0
 2206121142 metadata/md5-cache/dev-python/humanfriendly-10.0
@@ -42492,10 +42269,7 @@
 2206121142 metadata/md5-cache/dev-python/identify-2.5.1
 2206121142 metadata/md5-cache/dev-python/ifaddr-0.1.7
 2206121142 metadata/md5-cache/dev-python/ijson-3.1.4
-2206121142 metadata/md5-cache/dev-python/imageio-2.19.2
 2206121142 metadata/md5-cache/dev-python/imageio-2.19.3
-2206121142 metadata/md5-cache/dev-python/imagesize-1.3.0
-2206121142 metadata/md5-cache/dev-python/imagesize-1.3.0-r1
 2206121142 metadata/md5-cache/dev-python/imapclient-2.2.0
 2206121142 metadata/md5-cache/dev-python/iminuit-2.11.2
 2206121142 metadata/md5-cache/dev-python/immutables-0.17
@@ -42506,7 +42280,6 @@
 2206121142 metadata/md5-cache/dev-python/imread-0.7.3-r1
 2206121142 metadata/md5-cache/dev-python/incremental-21.3.0-r1
 2206121142 metadata/md5-cache/dev-python/inflect-5.6.0
-2206121142 metadata/md5-cache/dev-python/inflection-0.5.1
 2206121142 metadata/md5-cache/dev-python/inflection-0.5.1-r1
 2206121142 metadata/md5-cache/dev-python/influxdb-5.3.0-r1
 2206121142 metadata/md5-cache/dev-python/ini2toml-0.10
@@ -42528,9 +42301,6 @@
 2206121142 metadata/md5-cache/dev-python/ipyparallel-8.1.0-r1
 2206121142 metadata/md5-cache/dev-python/ipyparallel-8.2.0
 2206121142 metadata/md5-cache/dev-python/ipyparallel-8.2.1
-2206121142 metadata/md5-cache/dev-python/ipyparallel-8.3.0
-2206121142 metadata/md5-cache/dev-python/ipython-8.2.0
-2206121142 metadata/md5-cache/dev-python/ipython-8.3.0-r1
 2206121142 metadata/md5-cache/dev-python/ipython-8.4.0
 2206121142 metadata/md5-cache/dev-python/ipython_genutils-0.2.0-r3
 2206121142 metadata/md5-cache/dev-python/ipywidgets-7.7.0
@@ -42540,8 +42310,6 @@
 2206121142 metadata/md5-cache/dev-python/itsdangerous-2.1.2
 2206121142 metadata/md5-cache/dev-python/itunespy-1.6-r1
 2206121142 metadata/md5-cache/dev-python/jaraco-classes-3.2.1-r1
-2206121142 metadata/md5-cache/dev-python/jaraco-collections-3.5.1
-2206121142 metadata/md5-cache/dev-python/jaraco-collections-3.5.1-r1
 2206121142 metadata/md5-cache/dev-python/jaraco-context-4.1.1-r2
 2206121142 metadata/md5-cache/dev-python/jaraco-envs-2.4.0
 2206121142 metadata/md5-cache/dev-python/jaraco-functools-3.5.0-r2
@@ -42550,23 +42318,15 @@
 2206121142 metadata/md5-cache/dev-python/jaraco-packaging-8.2.1-r1
 2206121142 metadata/md5-cache/dev-python/jaraco-path-3.4.0
 2206121142 metadata/md5-cache/dev-python/jaraco-stream-3.0.3
-2206121142 metadata/md5-cache/dev-python/jaraco-stream-3.0.3-r1
-2206121142 metadata/md5-cache/dev-python/jaraco-test-5.1.0
 2206121142 metadata/md5-cache/dev-python/jaraco-text-3.7.0-r2
 2206121142 metadata/md5-cache/dev-python/jaraco-text-3.8.0
-2206121142 metadata/md5-cache/dev-python/jc-1.19.0
-2206121142 metadata/md5-cache/dev-python/jc-1.20.0
-2206121142 metadata/md5-cache/dev-python/jdcal-1.4.1
-2206121142 metadata/md5-cache/dev-python/jdcal-1.4.1-r1
 2206121142 metadata/md5-cache/dev-python/jedi-0.18.1
 2206121142 metadata/md5-cache/dev-python/jeepney-0.8.0
 2206121142 metadata/md5-cache/dev-python/jellyfish-0.9.0-r1
-2206121142 metadata/md5-cache/dev-python/jikanpy-4.3.2
 2206121142 metadata/md5-cache/dev-python/jinja-2.11.3-r1
 2206121142 metadata/md5-cache/dev-python/jinja-3.1.2
 2206121142 metadata/md5-cache/dev-python/jinja2-time-0.2.0
 2206121142 metadata/md5-cache/dev-python/jinja2-time-0.2.0-r1
-2206121142 metadata/md5-cache/dev-python/jinja2_pluralize-0.3.0
 2206121142 metadata/md5-cache/dev-python/jinja2_pluralize-0.3.0-r1
 2206121142 metadata/md5-cache/dev-python/jmespath-1.0.0
 2206121142 metadata/md5-cache/dev-python/joblib-1.1.0
@@ -42581,16 +42341,13 @@
 2206121142 metadata/md5-cache/dev-python/json5-0.9.8
 2206121142 metadata/md5-cache/dev-python/jsondiff-2.0.0
 2206121142 metadata/md5-cache/dev-python/jsonext-0.4.2
-2206121142 metadata/md5-cache/dev-python/jsonmerge-1.8.0
 2206121142 metadata/md5-cache/dev-python/jsonmerge-1.8.0-r1
 2206121142 metadata/md5-cache/dev-python/jsonpatch-1.32
-2206121142 metadata/md5-cache/dev-python/jsonpickle-2.1.0
 2206121142 metadata/md5-cache/dev-python/jsonpointer-2.3
 2206121142 metadata/md5-cache/dev-python/jsonrpclib-0.4.2
 2206121142 metadata/md5-cache/dev-python/jsonrpclib-0.4.3.2
 2206121142 metadata/md5-cache/dev-python/jsonrpclib-9999
 2206121142 metadata/md5-cache/dev-python/jsonschema-4.6.0
-2206121142 metadata/md5-cache/dev-python/jsonxs-0.6
 2206121142 metadata/md5-cache/dev-python/jsonxs-0.6-r1
 2206121142 metadata/md5-cache/dev-python/junit-xml-1.9
 2206121142 metadata/md5-cache/dev-python/jupyter-1.0.0-r4
@@ -42602,28 +42359,19 @@
 2206121142 metadata/md5-cache/dev-python/jupyter_core-4.10.0
 2206121142 metadata/md5-cache/dev-python/jupyter_kernel_test-0.4.3
 2206121142 metadata/md5-cache/dev-python/jupyter_packaging-0.12.0-r1
-2206121142 metadata/md5-cache/dev-python/jupyter_server-1.17.0
 2206121142 metadata/md5-cache/dev-python/jupyter_server-1.17.1
 2206121142 metadata/md5-cache/dev-python/jupyter_server_mathjax-0.2.5
-2206121142 metadata/md5-cache/dev-python/jupyterlab-3.3.4
 2206121142 metadata/md5-cache/dev-python/jupyterlab-3.4.3
 2206121142 metadata/md5-cache/dev-python/jupyterlab-lsp-3.10.1
 2206121142 metadata/md5-cache/dev-python/jupyterlab_pygments-0.2.2
-2206121142 metadata/md5-cache/dev-python/jupyterlab_server-2.13.0
 2206121142 metadata/md5-cache/dev-python/jupyterlab_server-2.14.0
 2206121142 metadata/md5-cache/dev-python/jwcrypto-1.2.0
 2206121142 metadata/md5-cache/dev-python/jwcrypto-1.3.1
-2206121142 metadata/md5-cache/dev-python/k5test-0.10.1
-2206121142 metadata/md5-cache/dev-python/k5test-0.10.1-r1
 2206121142 metadata/md5-cache/dev-python/kafka-python-2.0.2
-2206121142 metadata/md5-cache/dev-python/kaitaistruct-0.9
-2206121142 metadata/md5-cache/dev-python/kaitaistruct-0.9-r1
 2206121142 metadata/md5-cache/dev-python/kaptan-0.5.12-r1
 2206121142 metadata/md5-cache/dev-python/kaptan-0.5.12-r2
 2206121142 metadata/md5-cache/dev-python/kazoo-2.8.0
 2206121142 metadata/md5-cache/dev-python/kconfiglib-14.1.0-r1
-2206121142 metadata/md5-cache/dev-python/keep-2.10.1
-2206121142 metadata/md5-cache/dev-python/keep-2.10.1-r1
 2206121142 metadata/md5-cache/dev-python/keyring-23.5.0
 2206121142 metadata/md5-cache/dev-python/keyring-23.5.1
 2206121142 metadata/md5-cache/dev-python/keyring-23.6.0
@@ -42638,7 +42386,6 @@
 2206121142 metadata/md5-cache/dev-python/lark-1.1.2
 2206121142 metadata/md5-cache/dev-python/latexcodec-2.0.1
 2206121142 metadata/md5-cache/dev-python/lazy-object-proxy-1.7.1
-2206121142 metadata/md5-cache/dev-python/lazy-object-proxy-1.7.1-r1
 2206121142 metadata/md5-cache/dev-python/ldap3-2.9.1
 2206121142 metadata/md5-cache/dev-python/leather-0.3.4
 2206121142 metadata/md5-cache/dev-python/leechcorepyc-2.10.2
@@ -42696,19 +42443,13 @@
 2206121142 metadata/md5-cache/dev-python/makefun-1.13.1
 2206121142 metadata/md5-cache/dev-python/mako-1.2.0
 2206121142 metadata/md5-cache/dev-python/mamba-0.11.2
-2206121142 metadata/md5-cache/dev-python/manuel-1.10.1
-2206121142 metadata/md5-cache/dev-python/manuel-1.10.1-r1
-2206121142 metadata/md5-cache/dev-python/manuel-1.11.2
 2206121142 metadata/md5-cache/dev-python/mapbox_earcut-1.0.0
-2206121142 metadata/md5-cache/dev-python/markdown-3.3.6
-2206121142 metadata/md5-cache/dev-python/markdown-3.3.7
 2206121142 metadata/md5-cache/dev-python/markdown-it-py-2.1.0
 2206121142 metadata/md5-cache/dev-python/markdown2-2.4.2
 2206121142 metadata/md5-cache/dev-python/markdown2-2.4.3
 2206121142 metadata/md5-cache/dev-python/markups-3.1.3
 2206121142 metadata/md5-cache/dev-python/markupsafe-1.1.1-r1
 2206121142 metadata/md5-cache/dev-python/markupsafe-2.1.1
-2206121142 metadata/md5-cache/dev-python/marshmallow-3.15.0
 2206121142 metadata/md5-cache/dev-python/marshmallow-3.16.0
 2206121142 metadata/md5-cache/dev-python/matplotlib-3.4.3-r1
 2206121142 metadata/md5-cache/dev-python/matplotlib-3.5.1
@@ -42732,7 +42473,6 @@
 2206121142 metadata/md5-cache/dev-python/mergedict-1.0.0-r1
 2206121142 metadata/md5-cache/dev-python/meshio-5.3.4
 2206121210 metadata/md5-cache/dev-python/meson-python-0.5.0-r1
-2206121142 metadata/md5-cache/dev-python/metakernel-0.28.2-r1
 2206121142 metadata/md5-cache/dev-python/micawber-0.5.4
 2206121142 metadata/md5-cache/dev-python/mimerender-0.6.0
 2206121142 metadata/md5-cache/dev-python/mimerender-0.6.0-r1
@@ -42741,7 +42481,6 @@
 2206121142 metadata/md5-cache/dev-python/minimock-1.3.0
 2206121142 metadata/md5-cache/dev-python/miniupnpc-2.2.3
 2206121142 metadata/md5-cache/dev-python/misaka-2.1.1-r1
-2206121142 metadata/md5-cache/dev-python/mkautodoc-0.1.0
 2206121142 metadata/md5-cache/dev-python/mkautodoc-0.1.0-r1
 2206121142 metadata/md5-cache/dev-python/mkdocs-1.3.0
 2206121142 metadata/md5-cache/dev-python/mkdocs-1.3.0-r1
@@ -42794,7 +42533,6 @@
 2206121142 metadata/md5-cache/dev-python/multipledispatch-0.6.0-r1
 2206121142 metadata/md5-cache/dev-python/munch-2.5.0-r1
 2206121142 metadata/md5-cache/dev-python/munch-2.5.0-r2
-2206121142 metadata/md5-cache/dev-python/munkres-1.1.4
 2206121142 metadata/md5-cache/dev-python/munkres-1.1.4-r1
 2206121142 metadata/md5-cache/dev-python/mygpoclient-1.8
 2206121142 metadata/md5-cache/dev-python/mypy-0.942
@@ -42811,13 +42549,11 @@
 2206121142 metadata/md5-cache/dev-python/nbclassic-0.3.7
 2206121142 metadata/md5-cache/dev-python/nbclient-0.6.3
 2206121142 metadata/md5-cache/dev-python/nbclient-0.6.4
-2206121142 metadata/md5-cache/dev-python/nbdime-3.1.1
 2206121142 metadata/md5-cache/dev-python/nbformat-5.4.0
 2206121142 metadata/md5-cache/dev-python/nbsphinx-0.8.8-r1
 2206121142 metadata/md5-cache/dev-python/nbsphinx-0.8.9
 2206121142 metadata/md5-cache/dev-python/nbval-0.9.6
 2206121142 metadata/md5-cache/dev-python/ndg-httpsclient-0.5.1
-2206121142 metadata/md5-cache/dev-python/neovim-remote-2.5.0
 2206121142 metadata/md5-cache/dev-python/neovim-remote-2.5.1
 2206121142 metadata/md5-cache/dev-python/neovim-remote-9999
 2206121142 metadata/md5-cache/dev-python/nest_asyncio-1.5.5
@@ -42850,11 +42586,6 @@
 2206121142 metadata/md5-cache/dev-python/nspektr-0.4.0
 2206121142 metadata/md5-cache/dev-python/ntlm-auth-1.5.0
 2206121142 metadata/md5-cache/dev-python/ntplib-0.4.0
-2206121142 metadata/md5-cache/dev-python/nuitka-0.7.7
-2206121142 metadata/md5-cache/dev-python/nuitka-0.8
-2206121142 metadata/md5-cache/dev-python/nuitka-0.8.1
-2206121142 metadata/md5-cache/dev-python/nuitka-0.8.2
-2206121142 metadata/md5-cache/dev-python/nuitka-0.8.3
 2206121142 metadata/md5-cache/dev-python/nuitka-0.8.4
 2206121142 metadata/md5-cache/dev-python/numexpr-2.8.1
 2206121142 metadata/md5-cache/dev-python/numexpr-2.8.1-r1
@@ -42926,7 +42657,6 @@
 2206121142 metadata/md5-cache/dev-python/paste-3.5.0-r2
 2206121142 metadata/md5-cache/dev-python/pastedeploy-2.1.1-r3
 2206121142 metadata/md5-cache/dev-python/pastel-0.2.1
-2206121142 metadata/md5-cache/dev-python/patatt-0.4.9
 2206121142 metadata/md5-cache/dev-python/patatt-0.4.9-r1
 2206121142 metadata/md5-cache/dev-python/patch-ng-1.17.4
 2206121142 metadata/md5-cache/dev-python/path-and-address-2.0.1
@@ -42940,14 +42670,11 @@
 2206121142 metadata/md5-cache/dev-python/pbr-5.8.0-r1
 2206121142 metadata/md5-cache/dev-python/pbr-5.9.0
 2206121142 metadata/md5-cache/dev-python/pdfrw-0.4_p1
-2206121142 metadata/md5-cache/dev-python/pdm-pep517-0.12.4
-2206121142 metadata/md5-cache/dev-python/pdm-pep517-0.12.5
 2206121142 metadata/md5-cache/dev-python/pdm-pep517-0.12.7
 2206121142 metadata/md5-cache/dev-python/pdoc3-0.10.0
 2206121142 metadata/md5-cache/dev-python/pebble-4.6.3
 2206121142 metadata/md5-cache/dev-python/pecan-1.4.1
 2206121142 metadata/md5-cache/dev-python/peewee-3.14.10-r1
-2206121142 metadata/md5-cache/dev-python/pefile-2021.9.3
 2206121142 metadata/md5-cache/dev-python/pefile-2022.5.30
 2206121142 metadata/md5-cache/dev-python/pefile-9999
 2206121142 metadata/md5-cache/dev-python/pelican-minify-0.9-r1
@@ -42976,19 +42703,12 @@
 2206121142 metadata/md5-cache/dev-python/pillow-9.0.1-r1
 2206121142 metadata/md5-cache/dev-python/pillow-9.1.1
 2206121142 metadata/md5-cache/dev-python/pip-run-8.8.0
-2206121142 metadata/md5-cache/dev-python/pipenv-2022.4.8
-2206121142 metadata/md5-cache/dev-python/pipenv-2022.5.2-r1
 2206121142 metadata/md5-cache/dev-python/pipenv-2022.6.7
-2206121142 metadata/md5-cache/dev-python/pivy-0.6.6-r1
-2206121142 metadata/md5-cache/dev-python/pivy-0.6.7
 2206121142 metadata/md5-cache/dev-python/pkgconfig-1.5.5-r1
 2206121142 metadata/md5-cache/dev-python/pkginfo-1.8.2
 2206121142 metadata/md5-cache/dev-python/pkginfo-1.8.2-r1
 2206121142 metadata/md5-cache/dev-python/pkginfo-1.8.3
-2206121142 metadata/md5-cache/dev-python/platformdirs-2.5.1
 2206121142 metadata/md5-cache/dev-python/plotly-5.2.2
-2206121142 metadata/md5-cache/dev-python/plotly-5.7.0
-2206121142 metadata/md5-cache/dev-python/plotly-5.8.0
 2206121142 metadata/md5-cache/dev-python/plotly-5.8.2
 2206121142 metadata/md5-cache/dev-python/plotly-geo-1.0.0
 2206121142 metadata/md5-cache/dev-python/pluggy-1.0.0-r2
@@ -43024,8 +42744,6 @@
 2206121142 metadata/md5-cache/dev-python/progressbar2-4.0.0
 2206121142 metadata/md5-cache/dev-python/prometheus_client-0.14.1
 2206121142 metadata/md5-cache/dev-python/prompt_toolkit-3.0.29
-2206121142 metadata/md5-cache/dev-python/proto-plus-1.20.0
-2206121142 metadata/md5-cache/dev-python/proto-plus-1.20.1
 2206121142 metadata/md5-cache/dev-python/proto-plus-1.20.3
 2206121142 metadata/md5-cache/dev-python/proto-plus-1.20.4
 2206121142 metadata/md5-cache/dev-python/proto-plus-1.20.5
@@ -43061,7 +42779,6 @@
 2206121142 metadata/md5-cache/dev-python/pyFFTW-9999
 2206121142 metadata/md5-cache/dev-python/pyGPG-0.2-r1
 2206121142 metadata/md5-cache/dev-python/pyGPG-9999
-2206121142 metadata/md5-cache/dev-python/pyacoustid-1.2.0
 2206121142 metadata/md5-cache/dev-python/pyacoustid-1.2.2
 2206121142 metadata/md5-cache/dev-python/pyaes-1.6.1-r3
 2206121142 metadata/md5-cache/dev-python/pyalsa-1.2.6
@@ -43070,9 +42787,7 @@
 2206121142 metadata/md5-cache/dev-python/pyatspi-2.38.2
 2206121142 metadata/md5-cache/dev-python/pyaudio-0.2.11-r1
 2206121142 metadata/md5-cache/dev-python/pybind11-2.9.2
-2206121142 metadata/md5-cache/dev-python/pybind11-2.9.2-r1
 2206121142 metadata/md5-cache/dev-python/pybtex-0.24.0
-2206121142 metadata/md5-cache/dev-python/pybtex-docutils-1.0.1
 2206121142 metadata/md5-cache/dev-python/pybtex-docutils-1.0.2
 2206121142 metadata/md5-cache/dev-python/pycairo-1.21.0
 2206121142 metadata/md5-cache/dev-python/pycapnp-0.6.4
@@ -43092,11 +42807,9 @@
 2206121142 metadata/md5-cache/dev-python/pycson-0.8-r1
 2206121142 metadata/md5-cache/dev-python/pycson-0.8-r2
 2206121142 metadata/md5-cache/dev-python/pycson-0.8-r3
-2206121142 metadata/md5-cache/dev-python/pycuda-2019.1.2
 2206121142 metadata/md5-cache/dev-python/pycuda-2021.1
 2206121142 metadata/md5-cache/dev-python/pycups-2.0.1-r1
 2206121142 metadata/md5-cache/dev-python/pycurl-7.44.1
-2206121142 metadata/md5-cache/dev-python/pycurl-7.44.1-r1
 2206121142 metadata/md5-cache/dev-python/pycurl-7.45.1
 2206121142 metadata/md5-cache/dev-python/pycurl-requests-0.2.1
 2206121142 metadata/md5-cache/dev-python/pycxx-7.1.5
@@ -43112,9 +42825,7 @@
 2206121142 metadata/md5-cache/dev-python/pydocstyle-6.1.1
 2206121142 metadata/md5-cache/dev-python/pydocstyle-6.1.1-r1
 2206121142 metadata/md5-cache/dev-python/pydot-1.4.2-r3
-2206121142 metadata/md5-cache/dev-python/pydotplus-2.0.2
 2206121142 metadata/md5-cache/dev-python/pydotplus-2.0.2-r1
-2206121142 metadata/md5-cache/dev-python/pydyf-0.1.2
 2206121142 metadata/md5-cache/dev-python/pydyf-0.2.0
 2206121142 metadata/md5-cache/dev-python/pyeclib-1.6.0-r1
 2206121142 metadata/md5-cache/dev-python/pyeclib-1.6.1
@@ -43131,15 +42842,8 @@
 2206121142 metadata/md5-cache/dev-python/pygal-3.0.0-r2
 2206121142 metadata/md5-cache/dev-python/pygame-2.1.2-r1
 2206121142 metadata/md5-cache/dev-python/pygame_sdl2-7.3.5-r2
-2206121142 metadata/md5-cache/dev-python/pyghmi-1.5.42
-2206121142 metadata/md5-cache/dev-python/pyghmi-1.5.43
-2206121142 metadata/md5-cache/dev-python/pyghmi-1.5.44
-2206121142 metadata/md5-cache/dev-python/pyghmi-1.5.45
 2206121142 metadata/md5-cache/dev-python/pygit2-1.9.1
 2206121142 metadata/md5-cache/dev-python/pygit2-1.9.2
-2206121142 metadata/md5-cache/dev-python/pyglet-1.5.23
-2206121142 metadata/md5-cache/dev-python/pyglet-1.5.24
-2206121142 metadata/md5-cache/dev-python/pyglet-1.5.26
 2206121142 metadata/md5-cache/dev-python/pygments-2.12.0-r1
 2206121142 metadata/md5-cache/dev-python/pygments-github-lexers-0.0.5
 2206121142 metadata/md5-cache/dev-python/pygobject-3.42.1
@@ -43153,7 +42857,6 @@
 2206121142 metadata/md5-cache/dev-python/pyjsparser-2.7.1_p20190421
 2206121142 metadata/md5-cache/dev-python/pyjwt-2.4.0
 2206121142 metadata/md5-cache/dev-python/pykerberos-1.3.1
-2206121142 metadata/md5-cache/dev-python/pykka-3.0.2
 2206121142 metadata/md5-cache/dev-python/pykka-3.1.1
 2206121142 metadata/md5-cache/dev-python/pykwalify-1.8.0-r1
 2206121142 metadata/md5-cache/dev-python/pylama-8.3.8
@@ -43173,7 +42876,6 @@
 2206121142 metadata/md5-cache/dev-python/pymdown-lexers-0_pre20210902
 2206121142 metadata/md5-cache/dev-python/pymdstat-0.4.2-r1
 2206121142 metadata/md5-cache/dev-python/pymediainfo-5.1.0-r1
-2206121142 metadata/md5-cache/dev-python/pymetar-1.4
 2206121142 metadata/md5-cache/dev-python/pymilter-1.0.4-r2
 2206121142 metadata/md5-cache/dev-python/pymongo-4.0.2
 2206121142 metadata/md5-cache/dev-python/pymongo-4.1.0
@@ -43181,7 +42883,6 @@
 2206121142 metadata/md5-cache/dev-python/pymountboot-0.2.3-r1
 2206121142 metadata/md5-cache/dev-python/pymysql-1.0.2
 2206121142 metadata/md5-cache/dev-python/pynacl-1.5.0
-2206121142 metadata/md5-cache/dev-python/pynacl-1.5.0-r1
 2206121142 metadata/md5-cache/dev-python/pynput-1.7.3
 2206121142 metadata/md5-cache/dev-python/pynput-9999
 2206121142 metadata/md5-cache/dev-python/pynvim-0.4.3-r1
@@ -43193,7 +42894,6 @@
 2206121142 metadata/md5-cache/dev-python/pyopengl_accelerate-3.1.6
 2206121142 metadata/md5-cache/dev-python/pyopenssl-20.0.1-r1
 2206121142 metadata/md5-cache/dev-python/pyopenssl-22.0.0
-2206121142 metadata/md5-cache/dev-python/pyotp-2.6.0
 2206121142 metadata/md5-cache/dev-python/pyotp-2.6.0-r1
 2206121142 metadata/md5-cache/dev-python/pypam-0.5.0-r6
 2206121142 metadata/md5-cache/dev-python/pypam-0.5.0-r7
@@ -43209,7 +42909,6 @@
 2206121142 metadata/md5-cache/dev-python/pyphen-0.12.0-r1
 2206121142 metadata/md5-cache/dev-python/pypiserver-1.5.0-r2
 2206121142 metadata/md5-cache/dev-python/pypng-0.0.21-r1
-2206121142 metadata/md5-cache/dev-python/pyprof2calltree-1.4.5
 2206121142 metadata/md5-cache/dev-python/pyprof2calltree-1.4.5-r1
 2206121142 metadata/md5-cache/dev-python/pyproj-3.3.1
 2206121142 metadata/md5-cache/dev-python/pyproject-metadata-0.5.0
@@ -43219,8 +42918,6 @@
 2206121142 metadata/md5-cache/dev-python/pyqrcode-1.2.1-r2
 2206121142 metadata/md5-cache/dev-python/pyqt-distutils-0.7.3
 2206121142 metadata/md5-cache/dev-python/pyqtgraph-0.12.4
-2206121142 metadata/md5-cache/dev-python/pyquery-1.4.3
-2206121142 metadata/md5-cache/dev-python/pyquery-1.4.3-r1
 2206121142 metadata/md5-cache/dev-python/pyre2-1.0.7
 2206121142 metadata/md5-cache/dev-python/pyrfc3339-1.1
 2206121142 metadata/md5-cache/dev-python/pyroute2-0.5.14
@@ -43232,7 +42929,6 @@
 2206121142 metadata/md5-cache/dev-python/pyserial-3.5-r1
 2206121142 metadata/md5-cache/dev-python/pyside2-5.15.2-r1
 2206121142 metadata/md5-cache/dev-python/pyside2-tools-5.15.2
-2206121142 metadata/md5-cache/dev-python/pysimdjson-4.0.3-r1
 2206121142 metadata/md5-cache/dev-python/pysimdjson-5.0.1
 2206121142 metadata/md5-cache/dev-python/pysmi-0.3.4
 2206121142 metadata/md5-cache/dev-python/pysnmp-4.4.12-r2
@@ -43247,7 +42943,6 @@
 2206121142 metadata/md5-cache/dev-python/pysrt-1.1.2-r1
 2206121142 metadata/md5-cache/dev-python/pysrt-9999
 2206121142 metadata/md5-cache/dev-python/pystache-0.6.0
-2206121142 metadata/md5-cache/dev-python/pysvg-0.2.2_p3
 2206121142 metadata/md5-cache/dev-python/pysvg-0.2.2_p3-r1
 2206121142 metadata/md5-cache/dev-python/pysvn-1.9.15
 2206121142 metadata/md5-cache/dev-python/pytables-3.7.0
@@ -43259,19 +42954,11 @@
 2206121142 metadata/md5-cache/dev-python/pytest-bdd-5.0.0-r1
 2206121142 metadata/md5-cache/dev-python/pytest-cache-1.0-r2
 2206121142 metadata/md5-cache/dev-python/pytest-check-1.0.5
-2206121142 metadata/md5-cache/dev-python/pytest-codeblocks-0.15.0
-2206121142 metadata/md5-cache/dev-python/pytest-codeblocks-0.16.0
 2206121142 metadata/md5-cache/dev-python/pytest-codeblocks-0.16.1
 2206121142 metadata/md5-cache/dev-python/pytest-console-scripts-1.3.1
 2206121142 metadata/md5-cache/dev-python/pytest-cov-3.0.0-r1
 2206121142 metadata/md5-cache/dev-python/pytest-datadir-1.3.1-r1
-2206121142 metadata/md5-cache/dev-python/pytest-describe-2.0.1
-2206121142 metadata/md5-cache/dev-python/pytest-describe-2.0.1-r1
 2206121142 metadata/md5-cache/dev-python/pytest-django-4.5.2
-2206121142 metadata/md5-cache/dev-python/pytest-env-0.6.2
-2206121142 metadata/md5-cache/dev-python/pytest-env-0.6.2-r1
-2206121142 metadata/md5-cache/dev-python/pytest-faulthandler-2.0.1
-2206121142 metadata/md5-cache/dev-python/pytest-faulthandler-2.0.1-r1
 2206121142 metadata/md5-cache/dev-python/pytest-flake8-1.1.1
 2206121142 metadata/md5-cache/dev-python/pytest-flakes-4.0.4
 2206121142 metadata/md5-cache/dev-python/pytest-forked-1.4.0-r1
@@ -43291,7 +42978,6 @@
 2206121142 metadata/md5-cache/dev-python/pytest-mock-3.7.0
 2206121142 metadata/md5-cache/dev-python/pytest-ordering-0.6
 2206121142 metadata/md5-cache/dev-python/pytest-param-files-0.3.4
-2206121142 metadata/md5-cache/dev-python/pytest-plus-0.2
 2206121142 metadata/md5-cache/dev-python/pytest-plus-0.2-r1
 2206121142 metadata/md5-cache/dev-python/pytest-pylint-0.18.0
 2206121142 metadata/md5-cache/dev-python/pytest-qt-4.0.2-r1
@@ -43301,17 +42987,9 @@
 2206121142 metadata/md5-cache/dev-python/pytest-salt-factories-1.0.0_rc13
 2206121142 metadata/md5-cache/dev-python/pytest-services-2.2.1
 2206121142 metadata/md5-cache/dev-python/pytest-services-2.2.1-r1
-2206121142 metadata/md5-cache/dev-python/pytest-shell-utilities-1.0.5
-2206121142 metadata/md5-cache/dev-python/pytest-shell-utilities-1.1.0
-2206121142 metadata/md5-cache/dev-python/pytest-shell-utilities-1.2.0
-2206121142 metadata/md5-cache/dev-python/pytest-shell-utilities-1.2.1
-2206121142 metadata/md5-cache/dev-python/pytest-shell-utilities-1.3.0
-2206121142 metadata/md5-cache/dev-python/pytest-shell-utilities-1.4.0
-2206121142 metadata/md5-cache/dev-python/pytest-shell-utilities-1.5.0
 2206121142 metadata/md5-cache/dev-python/pytest-skip-markers-1.2.0
 2206121142 metadata/md5-cache/dev-python/pytest-skip-markers-1.3.0
 2206121142 metadata/md5-cache/dev-python/pytest-skip-markers-1.3.0-r1
-2206121142 metadata/md5-cache/dev-python/pytest-subtesthack-0.1.2-r1
 2206121142 metadata/md5-cache/dev-python/pytest-subtesthack-0.1.2-r2
 2206121142 metadata/md5-cache/dev-python/pytest-subtests-0.7.0
 2206121142 metadata/md5-cache/dev-python/pytest-subtests-0.8.0
@@ -43331,10 +43009,7 @@
 2206121142 metadata/md5-cache/dev-python/python-augeas-1.1.0
 2206121142 metadata/md5-cache/dev-python/python-axolotl-0.2.3-r2
 2206121142 metadata/md5-cache/dev-python/python-axolotl-curve25519-0.4.1_p2-r2
-2206121142 metadata/md5-cache/dev-python/python-bugzilla-3.2.0
-2206121142 metadata/md5-cache/dev-python/python-bugzilla-3.2.0-r1
 2206121142 metadata/md5-cache/dev-python/python-cinderclient-8.3.0
-2206121142 metadata/md5-cache/dev-python/python-cstruct-2.1
 2206121142 metadata/md5-cache/dev-python/python-cstruct-2.1-r1
 2206121142 metadata/md5-cache/dev-python/python-ctags-1.5.0
 2206121142 metadata/md5-cache/dev-python/python-daemon-2.3.0-r1
@@ -43353,7 +43028,6 @@
 2206121142 metadata/md5-cache/dev-python/python-engineio-4.3.2-r2
 2206121142 metadata/md5-cache/dev-python/python-etcd-0.4.5-r1
 2206121142 metadata/md5-cache/dev-python/python-evdev-1.5.0
-2206121142 metadata/md5-cache/dev-python/python-gammu-2.11
 2206121142 metadata/md5-cache/dev-python/python-gammu-3.2.4
 2206121142 metadata/md5-cache/dev-python/python-gflags-3.1.2-r2
 2206121142 metadata/md5-cache/dev-python/python-glanceclient-3.6.0
@@ -43368,7 +43042,6 @@
 2206121142 metadata/md5-cache/dev-python/python-keyutils-0.6
 2206121142 metadata/md5-cache/dev-python/python-ldap-3.4.0
 2206121142 metadata/md5-cache/dev-python/python-ldap-3.4.0-r1
-2206121142 metadata/md5-cache/dev-python/python-ldap-3.4.0_p20220420
 2206121142 metadata/md5-cache/dev-python/python-ldap-9999
 2206121142 metadata/md5-cache/dev-python/python-levenshtein-0.12.2
 2206121142 metadata/md5-cache/dev-python/python-lhafile-0.3.0
@@ -43418,7 +43091,6 @@
 2206121142 metadata/md5-cache/dev-python/python-utils-3.2.3
 2206121142 metadata/md5-cache/dev-python/python-utils-3.3.0
 2206121142 metadata/md5-cache/dev-python/python-utils-3.3.1
-2206121142 metadata/md5-cache/dev-python/python-utils-3.3.3
 2206121142 metadata/md5-cache/dev-python/python-varlink-30.3.1
 2206121142 metadata/md5-cache/dev-python/python-vlc-3.0.16120
 2206121142 metadata/md5-cache/dev-python/python-xlib-0.31
@@ -43434,7 +43106,6 @@
 2206121142 metadata/md5-cache/dev-python/pythondialog-3.5.3
 2206121142 metadata/md5-cache/dev-python/pythran-0.11.0
 2206121142 metadata/md5-cache/dev-python/pytidylib-0.3.2-r2
-2206121142 metadata/md5-cache/dev-python/pytimeparse-1.1.8
 2206121142 metadata/md5-cache/dev-python/pytimeparse-1.1.8-r1
 2206121142 metadata/md5-cache/dev-python/pytools-2022.1.7
 2206121142 metadata/md5-cache/dev-python/pytools-2022.1.9
@@ -43450,7 +43121,6 @@
 2206121142 metadata/md5-cache/dev-python/pyvirtualdisplay-3.0
 2206121142 metadata/md5-cache/dev-python/pywavelets-1.3.0
 2206121142 metadata/md5-cache/dev-python/pywinrm-0.4.3
-2206121142 metadata/md5-cache/dev-python/pyx-0.15
 2206121142 metadata/md5-cache/dev-python/pyx-0.15_p1
 2206121142 metadata/md5-cache/dev-python/pyxDamerauLevenshtein-1.7.0
 2206121142 metadata/md5-cache/dev-python/pyxattr-0.7.2
@@ -43470,11 +43140,7 @@
 2206121142 metadata/md5-cache/dev-python/qrcode-7.3.1-r1
 2206121142 metadata/md5-cache/dev-python/qscintilla-python-2.11.6
 2206121142 metadata/md5-cache/dev-python/qscintilla-python-2.13.1
-2206121142 metadata/md5-cache/dev-python/qstylizer-0.2.1
 2206121142 metadata/md5-cache/dev-python/qstylizer-0.2.1-r1
-2206121142 metadata/md5-cache/dev-python/qtawesome-1.1.1
-2206121142 metadata/md5-cache/dev-python/qtconsole-5.2.2
-2206121142 metadata/md5-cache/dev-python/qtconsole-5.3.0
 2206121142 metadata/md5-cache/dev-python/qtconsole-5.3.1
 2206121142 metadata/md5-cache/dev-python/qtsass-0.3.0
 2206121142 metadata/md5-cache/dev-python/qtsass-0.3.0-r1
@@ -43484,11 +43150,8 @@
 2206121142 metadata/md5-cache/dev-python/random2-1.0.1-r2
 2206121142 metadata/md5-cache/dev-python/rarfile-4.0
 2206121142 metadata/md5-cache/dev-python/rarfile-4.0-r1
-2206121142 metadata/md5-cache/dev-python/ratelimit-2.2.1
 2206121142 metadata/md5-cache/dev-python/ratelimit-2.2.1-r1
 2206121142 metadata/md5-cache/dev-python/rdflib-6.1.1
-2206121142 metadata/md5-cache/dev-python/re-assert-1.1.0
-2206121142 metadata/md5-cache/dev-python/re-assert-1.1.0-r1
 2206121142 metadata/md5-cache/dev-python/readme_renderer-35.0
 2206121142 metadata/md5-cache/dev-python/readthedocs-sphinx-ext-2.1.8
 2206121142 metadata/md5-cache/dev-python/rebulk-3.1.0
@@ -43500,7 +43163,6 @@
 2206121142 metadata/md5-cache/dev-python/redis-py-4.3.3
 2206121142 metadata/md5-cache/dev-python/reedsolomon-1.5.4-r1
 2206121142 metadata/md5-cache/dev-python/reedsolomon-1.5.4-r2
-2206121142 metadata/md5-cache/dev-python/reflink-0.2.1-r1
 2206121142 metadata/md5-cache/dev-python/reflink-0.2.1-r2
 2206121142 metadata/md5-cache/dev-python/regex-2022.4.24
 2206121142 metadata/md5-cache/dev-python/regex-2022.6.2
@@ -43513,8 +43175,6 @@
 2206121142 metadata/md5-cache/dev-python/reportlab-3.6.8
 2206121142 metadata/md5-cache/dev-python/reportlab-3.6.9
 2206121142 metadata/md5-cache/dev-python/repoze-lru-0.7-r3
-2206121142 metadata/md5-cache/dev-python/requests-2.27.1
-2206121142 metadata/md5-cache/dev-python/requests-2.27.1-r1
 2206121142 metadata/md5-cache/dev-python/requests-2.28.0
 2206121142 metadata/md5-cache/dev-python/requests-cache-0.9.4
 2206121142 metadata/md5-cache/dev-python/requests-credssp-2.0.0
@@ -43544,8 +43204,6 @@
 2206121142 metadata/md5-cache/dev-python/retry-decorator-1.1.1-r1
 2206121142 metadata/md5-cache/dev-python/retrying-1.3.3
 2206121142 metadata/md5-cache/dev-python/retrying-1.3.3-r1
-2206121142 metadata/md5-cache/dev-python/rfc3986-2.0.0
-2206121142 metadata/md5-cache/dev-python/rfc3986-2.0.0-r1
 2206121142 metadata/md5-cache/dev-python/rfc3986-validator-0.1.1-r1
 2206121142 metadata/md5-cache/dev-python/rfc3987-1.3.8-r2
 2206121142 metadata/md5-cache/dev-python/rich-12.4.1
@@ -43565,8 +43223,6 @@
 2206121142 metadata/md5-cache/dev-python/rpy-3.4.5
 2206121142 metadata/md5-cache/dev-python/rpyc-5.1.0
 2206121142 metadata/md5-cache/dev-python/rq-1.10.1-r2
-2206121142 metadata/md5-cache/dev-python/rsa-4.8
-2206121142 metadata/md5-cache/dev-python/rsa-4.8-r1
 2206121142 metadata/md5-cache/dev-python/rst-linker-2.3.0
 2206121142 metadata/md5-cache/dev-python/rtimulib-7.2.1-r2
 2206121142 metadata/md5-cache/dev-python/rtslib-fb-2.1.74
@@ -43577,7 +43233,6 @@
 2206121142 metadata/md5-cache/dev-python/s3transfer-0.5.2
 2206121142 metadata/md5-cache/dev-python/s3transfer-0.6.0
 2206121142 metadata/md5-cache/dev-python/sabyenc-4.0.2
-2206121142 metadata/md5-cache/dev-python/sarge-0.1.7-r1
 2206121142 metadata/md5-cache/dev-python/sarge-0.1.7_p1
 2206121142 metadata/md5-cache/dev-python/sarif_om-1.0.4
 2206121142 metadata/md5-cache/dev-python/scandir-1.10.0-r2
@@ -43605,15 +43260,10 @@
 2206121142 metadata/md5-cache/dev-python/setuptools-declarative-requirements-1.2.0-r2
 2206121142 metadata/md5-cache/dev-python/setuptools-rust-1.3.0
 2206121142 metadata/md5-cache/dev-python/setuptools_scm-6.4.2
-2206121142 metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.1-r4
-2206121142 metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.1-r5
 2206121142 metadata/md5-cache/dev-python/setuptools_trial-0.6.0-r1
 2206121142 metadata/md5-cache/dev-python/sexpdata-0.0.3-r2
 2206121142 metadata/md5-cache/dev-python/sgmllib3k-1.0.0
 2206121142 metadata/md5-cache/dev-python/sgmllib3k-1.0.0-r1
-2206121142 metadata/md5-cache/dev-python/sh-1.14.2
-2206121142 metadata/md5-cache/dev-python/sh-1.14.2-r1
-2206121142 metadata/md5-cache/dev-python/shiboken2-5.15.2-r1
 2206121142 metadata/md5-cache/dev-python/signature_dispatch-1.0.0-r1
 2206121142 metadata/md5-cache/dev-python/simber-0.2.4
 2206121142 metadata/md5-cache/dev-python/simpervisor-0.4
@@ -43644,12 +43294,7 @@
 2206121142 metadata/md5-cache/dev-python/snakeoil-9999
 2206121142 metadata/md5-cache/dev-python/snaketrace-0.3.1
 2206121142 metadata/md5-cache/dev-python/snappy-0.6.1
-2206121142 metadata/md5-cache/dev-python/snapshottest-0.5.1
 2206121142 metadata/md5-cache/dev-python/snapshottest-0.6.0
-2206121142 metadata/md5-cache/dev-python/sniffio-1.2.0
-2206121142 metadata/md5-cache/dev-python/sniffio-1.2.0-r1
-2206121142 metadata/md5-cache/dev-python/snowballstemmer-2.2.0
-2206121142 metadata/md5-cache/dev-python/snowballstemmer-2.2.0-r1
 2206121142 metadata/md5-cache/dev-python/socketio-client-0.7.2
 2206121142 metadata/md5-cache/dev-python/socketio-client-nexus-0.7.6
 2206121142 metadata/md5-cache/dev-python/socksio-1.0.0
@@ -43731,12 +43376,8 @@
 2206121142 metadata/md5-cache/dev-python/ssl-fetch-0.4-r1
 2206121142 metadata/md5-cache/dev-python/ssl-fetch-9999
 2206121142 metadata/md5-cache/dev-python/stack_data-0.2.0
-2206121142 metadata/md5-cache/dev-python/stapler-1.0.0_p20200531-r2
 2206121142 metadata/md5-cache/dev-python/stapler-1.0.0_p20220330
 2206121142 metadata/md5-cache/dev-python/starlette-0.18.0
-2206121142 metadata/md5-cache/dev-python/starlette-0.20.0
-2206121142 metadata/md5-cache/dev-python/starlette-0.20.1
-2206121142 metadata/md5-cache/dev-python/starlette-0.20.2
 2206121142 metadata/md5-cache/dev-python/starlette-0.20.3
 2206121142 metadata/md5-cache/dev-python/statsd-3.3.0
 2206121142 metadata/md5-cache/dev-python/statsmodels-0.13.2
@@ -43752,14 +43393,9 @@
 2206121142 metadata/md5-cache/dev-python/subprocess-tee-0.3.5
 2206121142 metadata/md5-cache/dev-python/subunit-1.4.0_p20210729
 2206121142 metadata/md5-cache/dev-python/suds-community-1.1.1
-2206121142 metadata/md5-cache/dev-python/sure-2.0.0
-2206121142 metadata/md5-cache/dev-python/sure-2.0.0-r1
 2206121142 metadata/md5-cache/dev-python/svg-path-6.0
 2206121142 metadata/md5-cache/dev-python/svg-path-6.1
-2206121142 metadata/md5-cache/dev-python/svglib-1.2.1
 2206121142 metadata/md5-cache/dev-python/svglib-1.3.0
-2206121142 metadata/md5-cache/dev-python/svgwrite-1.4.1
-2206121142 metadata/md5-cache/dev-python/svgwrite-1.4.1-r1
 2206121142 metadata/md5-cache/dev-python/svgwrite-1.4.2
 2206121142 metadata/md5-cache/dev-python/swagger-spec-validator-2.7.4
 2206121142 metadata/md5-cache/dev-python/sybil-3.0.1
@@ -43771,22 +43407,15 @@
 2206121142 metadata/md5-cache/dev-python/tabulate-0.8.9
 2206121142 metadata/md5-cache/dev-python/tabulate-0.8.9-r1
 2206121142 metadata/md5-cache/dev-python/tagpy-2018.1-r3
-2206121142 metadata/md5-cache/dev-python/tappy-3.1
-2206121142 metadata/md5-cache/dev-python/tappy-3.1-r1
 2206121142 metadata/md5-cache/dev-python/tblib-1.7.0
 2206121142 metadata/md5-cache/dev-python/tcolorpy-0.1.2
-2206121142 metadata/md5-cache/dev-python/tekore-4.3.0
 2206121142 metadata/md5-cache/dev-python/tekore-4.4.0
 2206121142 metadata/md5-cache/dev-python/tempest-30.1.0
 2206121142 metadata/md5-cache/dev-python/tempest-31.0.0
 2206121142 metadata/md5-cache/dev-python/tempita-0.5.3-r3
-2206121142 metadata/md5-cache/dev-python/tempora-5.0.0
-2206121142 metadata/md5-cache/dev-python/tempora-5.0.1
 2206121142 metadata/md5-cache/dev-python/tenacity-8.0.1
 2206121142 metadata/md5-cache/dev-python/tenacity-8.0.1-r1
 2206121142 metadata/md5-cache/dev-python/termcolor-1.1.0-r3
-2206121142 metadata/md5-cache/dev-python/terminado-0.13.3
-2206121142 metadata/md5-cache/dev-python/terminado-0.15.0
 2206121142 metadata/md5-cache/dev-python/terminaltables-3.1.10-r1
 2206121142 metadata/md5-cache/dev-python/terminaltables-9999
 2206121142 metadata/md5-cache/dev-python/test_server-0.0.40
@@ -43801,23 +43430,17 @@
 2206121142 metadata/md5-cache/dev-python/text-unidecode-1.3-r1
 2206121142 metadata/md5-cache/dev-python/textX-3.0.0
 2206121142 metadata/md5-cache/dev-python/textdistance-4.2.2
-2206121142 metadata/md5-cache/dev-python/texttable-1.6.4
-2206121142 metadata/md5-cache/dev-python/texttable-1.6.4-r1
 2206121142 metadata/md5-cache/dev-python/threadpoolctl-3.1.0
 2206121142 metadata/md5-cache/dev-python/three-merge-0.1.1
 2206121142 metadata/md5-cache/dev-python/thrift-0.14.1
 2206121142 metadata/md5-cache/dev-python/thrift-0.16.0
-2206121142 metadata/md5-cache/dev-python/thriftpy2-0.4.14
 2206121142 metadata/md5-cache/dev-python/tifffile-2022.5.4
 2206121142 metadata/md5-cache/dev-python/tikzplotlib-0.10.1
 2206121142 metadata/md5-cache/dev-python/timeout-decorator-0.5.0
 2206121142 metadata/md5-cache/dev-python/timeout-decorator-0.5.0-r1
-2206121142 metadata/md5-cache/dev-python/tinycss-0.4
-2206121142 metadata/md5-cache/dev-python/tinycss-0.4-r1
 2206121142 metadata/md5-cache/dev-python/tinycss2-1.1.1-r1
 2206121142 metadata/md5-cache/dev-python/tld-0.12.6
 2206121142 metadata/md5-cache/dev-python/tldextract-3.3.0
-2206121142 metadata/md5-cache/dev-python/tlsh-4.8.2
 2206121142 metadata/md5-cache/dev-python/toml-0.10.2-r1
 2206121142 metadata/md5-cache/dev-python/tomli-1.2.3
 2206121142 metadata/md5-cache/dev-python/tomli-2.0.1
@@ -43825,9 +43448,6 @@
 2206121142 metadata/md5-cache/dev-python/tomli-w-1.0.0-r1
 2206121142 metadata/md5-cache/dev-python/tomlkit-0.10.2
 2206121142 metadata/md5-cache/dev-python/tomlkit-0.11.0
-2206121142 metadata/md5-cache/dev-python/toolz-0.11.2
-2206121142 metadata/md5-cache/dev-python/toolz-0.11.2-r1
-2206121142 metadata/md5-cache/dev-python/toposort-1.7
 2206121142 metadata/md5-cache/dev-python/toposort-1.7-r1
 2206121142 metadata/md5-cache/dev-python/towncrier-21.9.0
 2206121142 metadata/md5-cache/dev-python/tox-3.25.0
@@ -43844,9 +43464,6 @@
 2206121142 metadata/md5-cache/dev-python/trio-0.20.0
 2206121142 metadata/md5-cache/dev-python/trio-0.21.0
 2206121142 metadata/md5-cache/dev-python/trio-asyncio-0.12.0
-2206121142 metadata/md5-cache/dev-python/trustme-0.9.0
-2206121142 metadata/md5-cache/dev-python/trustme-0.9.0-r1
-2206121142 metadata/md5-cache/dev-python/tubes-0.2.0-r1
 2206121142 metadata/md5-cache/dev-python/tubes-0.2.1
 2206121142 metadata/md5-cache/dev-python/tvdb_api-3.0.2
 2206121142 metadata/md5-cache/dev-python/twine-4.0.0
@@ -43866,13 +43483,9 @@
 2206121142 metadata/md5-cache/dev-python/typogrify-2.0.7
 2206121142 metadata/md5-cache/dev-python/typogrify-2.0.7-r1
 2206121142 metadata/md5-cache/dev-python/tzlocal-4.2
-2206121142 metadata/md5-cache/dev-python/ubelt-1.0.1
-2206121142 metadata/md5-cache/dev-python/ubelt-1.1.0
 2206121142 metadata/md5-cache/dev-python/ubelt-1.1.1
 2206121142 metadata/md5-cache/dev-python/ujson-5.2.0-r1
 2206121142 metadata/md5-cache/dev-python/ujson-5.3.0
-2206121142 metadata/md5-cache/dev-python/ukkonen-1.0.1
-2206121142 metadata/md5-cache/dev-python/ukkonen-1.0.1-r1
 2206121142 metadata/md5-cache/dev-python/unasync-0.5.0
 2206121142 metadata/md5-cache/dev-python/uncertainties-3.1.6
 2206121142 metadata/md5-cache/dev-python/unicodecsv-0.14.1-r2
@@ -43880,20 +43493,14 @@
 2206121142 metadata/md5-cache/dev-python/unidiff-0.7.3
 2206121142 metadata/md5-cache/dev-python/unittest-mixins-1.6-r2
 2206121142 metadata/md5-cache/dev-python/unittest-or-fail-2
-2206121142 metadata/md5-cache/dev-python/untangle-1.1.1
-2206121142 metadata/md5-cache/dev-python/untangle-1.1.1-r1
 2206121142 metadata/md5-cache/dev-python/uranium-4.13.0-r1
 2206121142 metadata/md5-cache/dev-python/urdf_parser_py-0.4.5
 2206121142 metadata/md5-cache/dev-python/uri_template-1.1.0
 2206121142 metadata/md5-cache/dev-python/uri_template-1.2.0
 2206121142 metadata/md5-cache/dev-python/uritemplate-4.1.0
-2206121142 metadata/md5-cache/dev-python/uritemplate-4.1.1
 2206121142 metadata/md5-cache/dev-python/url-normalize-1.4.3-r1
 2206121142 metadata/md5-cache/dev-python/urlgrabber-4.1.0
-2206121142 metadata/md5-cache/dev-python/urllib3-1.26.9
-2206121142 metadata/md5-cache/dev-python/urllib3-1.26.9-r1
 2206121142 metadata/md5-cache/dev-python/urwid-2.1.2
-2206121142 metadata/md5-cache/dev-python/urwid-2.1.2-r1
 2206121142 metadata/md5-cache/dev-python/urwid_readline-0.13
 2206121142 metadata/md5-cache/dev-python/urwidtrees-1.0.3
 2206121142 metadata/md5-cache/dev-python/utidylib-0.6-r2
@@ -43904,33 +43511,24 @@
 2206121142 metadata/md5-cache/dev-python/uvloop-0.15.3
 2206121142 metadata/md5-cache/dev-python/uvloop-0.15.3-r1
 2206121142 metadata/md5-cache/dev-python/uvloop-0.16.0
-2206121142 metadata/md5-cache/dev-python/validators-0.19.0
 2206121142 metadata/md5-cache/dev-python/validators-0.20.0
 2206121142 metadata/md5-cache/dev-python/vcrpy-4.1.1
 2206121142 metadata/md5-cache/dev-python/vcrpy-4.1.1-r1
 2206121142 metadata/md5-cache/dev-python/vcstools-0.1.42
-2206121142 metadata/md5-cache/dev-python/vdf-3.4
-2206121142 metadata/md5-cache/dev-python/vdf-3.4-r1
-2206121142 metadata/md5-cache/dev-python/vdirsyncer-0.18.0-r3
 2206121142 metadata/md5-cache/dev-python/vdirsyncer-0.18.0-r4
 2206121142 metadata/md5-cache/dev-python/vecrec-0.3.1
-2206121142 metadata/md5-cache/dev-python/verboselogs-1.7
 2206121142 metadata/md5-cache/dev-python/verboselogs-1.7-r1
 2206121142 metadata/md5-cache/dev-python/versioneer-0.22
-2206121142 metadata/md5-cache/dev-python/versioningit-1.1.1
 2206121142 metadata/md5-cache/dev-python/vine-5.0.0
 2206121142 metadata/md5-cache/dev-python/virtualenv-20.14.1-r1
 2206121142 metadata/md5-cache/dev-python/virtualenv-clone-0.5.6
 2206121142 metadata/md5-cache/dev-python/virtualenv-clone-0.5.7
 2206121142 metadata/md5-cache/dev-python/virtualenvwrapper-4.8.4-r1
-2206121142 metadata/md5-cache/dev-python/visitor-0.1.3-r1
 2206121142 metadata/md5-cache/dev-python/visitor-0.1.3-r2
 2206121142 metadata/md5-cache/dev-python/vncdotool-0.13.0
 2206121142 metadata/md5-cache/dev-python/vncdotool-0.13.0-r1
 2206121142 metadata/md5-cache/dev-python/vncdotool-1.0.0
 2206121142 metadata/md5-cache/dev-python/vncdotool-1.0.0-r1
-2206121142 metadata/md5-cache/dev-python/vobject-0.9.6.1-r2
-2206121142 metadata/md5-cache/dev-python/vobject-0.9.6.1-r3
 2206121142 metadata/md5-cache/dev-python/voluptuous-0.13.1-r1
 2206121142 metadata/md5-cache/dev-python/vpython-7.6.3
 2206121142 metadata/md5-cache/dev-python/waitress-2.1.1
@@ -43938,44 +43536,31 @@
 2206121142 metadata/md5-cache/dev-python/wand-0.6.7
 2206121142 metadata/md5-cache/dev-python/warlock-1.3.3-r3
 2206121142 metadata/md5-cache/dev-python/watchdog-2.1.7
-2206121142 metadata/md5-cache/dev-python/watchdog-2.1.8
 2206121142 metadata/md5-cache/dev-python/watchdog-2.1.9
-2206121142 metadata/md5-cache/dev-python/watchfiles-0.13
-2206121142 metadata/md5-cache/dev-python/watchfiles-0.14
 2206121142 metadata/md5-cache/dev-python/watchfiles-0.14.1
 2206121142 metadata/md5-cache/dev-python/watchgod-0.8.2
 2206121142 metadata/md5-cache/dev-python/wcag-contrast-ratio-0.9-r1
 2206121142 metadata/md5-cache/dev-python/wcmatch-8.3
 2206121142 metadata/md5-cache/dev-python/wcmatch-8.4
 2206121142 metadata/md5-cache/dev-python/wcwidth-0.2.5-r1
-2206121142 metadata/md5-cache/dev-python/weasyprint-54.3
 2206121142 metadata/md5-cache/dev-python/weasyprint-55.0
 2206121142 metadata/md5-cache/dev-python/webassets-2.0
-2206121142 metadata/md5-cache/dev-python/webob-1.8.7
-2206121142 metadata/md5-cache/dev-python/webob-1.8.7-r1
 2206121142 metadata/md5-cache/dev-python/websocket-client-1.3.2
 2206121142 metadata/md5-cache/dev-python/websockets-10.3
 2206121142 metadata/md5-cache/dev-python/websockify-0.10.0
-2206121142 metadata/md5-cache/dev-python/webtest-3.0.0
-2206121142 metadata/md5-cache/dev-python/webtest-3.0.0-r1
 2206121142 metadata/md5-cache/dev-python/werkzeug-2.1.2
 2206121142 metadata/md5-cache/dev-python/whatever-0.6
 2206121142 metadata/md5-cache/dev-python/wheel-0.37.1-r1
 2206121142 metadata/md5-cache/dev-python/whichcraft-0.6.1
 2206121142 metadata/md5-cache/dev-python/whisper-1.1.10
-2206121142 metadata/md5-cache/dev-python/whisper-1.1.8
 2206121142 metadata/md5-cache/dev-python/whoosh-2.7.4-r1
-2206121142 metadata/md5-cache/dev-python/whoosh-2.7.4-r2
 2206121142 metadata/md5-cache/dev-python/widgetsnbextension-3.6.0
 2206121142 metadata/md5-cache/dev-python/wrapt-1.13.2-r1
 2206121142 metadata/md5-cache/dev-python/wrapt-1.14.0
-2206121142 metadata/md5-cache/dev-python/wrapt-1.14.1
 2206121142 metadata/md5-cache/dev-python/ws4py-0.5.1-r1
 2206121142 metadata/md5-cache/dev-python/ws4py-9999
 2206121142 metadata/md5-cache/dev-python/wsaccel-0.6.3
 2206121142 metadata/md5-cache/dev-python/wsaccel-0.6.3-r1
-2206121142 metadata/md5-cache/dev-python/wsgiproxy2-0.5.1
-2206121142 metadata/md5-cache/dev-python/wsgiproxy2-0.5.1-r1
 2206121142 metadata/md5-cache/dev-python/wsproto-1.1.0
 2206121142 metadata/md5-cache/dev-python/wstools-0.4.10-r1
 2206121142 metadata/md5-cache/dev-python/wstools-0.4.8
@@ -43991,9 +43576,6 @@
 2206121142 metadata/md5-cache/dev-python/xlrd-2.0.1-r1
 2206121142 metadata/md5-cache/dev-python/xlsxwriter-3.0.3
 2206121142 metadata/md5-cache/dev-python/xlwt-1.3.0-r2
-2206121142 metadata/md5-cache/dev-python/xmlschema-1.10.0
-2206121142 metadata/md5-cache/dev-python/xmlschema-1.11.0
-2206121142 metadata/md5-cache/dev-python/xmlschema-1.11.1
 2206121142 metadata/md5-cache/dev-python/xmlschema-1.11.2
 2206121142 metadata/md5-cache/dev-python/xmltodict-0.13.0-r1
 2206121142 metadata/md5-cache/dev-python/xvfbwrapper-0.2.9
@@ -44003,11 +43585,9 @@
 2206121142 metadata/md5-cache/dev-python/yappi-1.3.3
 2206121142 metadata/md5-cache/dev-python/yappi-1.3.5
 2206121142 metadata/md5-cache/dev-python/yapsy-1.12.2
-2206121142 metadata/md5-cache/dev-python/yara-python-4.2.0
 2206121142 metadata/md5-cache/dev-python/yara-python-4.2.0-r2
 2206121142 metadata/md5-cache/dev-python/yarl-1.7.2-r1
 2206121142 metadata/md5-cache/dev-python/yarl-1.7.2-r2
-2206121142 metadata/md5-cache/dev-python/yarl-1.7.2-r3
 2206121142 metadata/md5-cache/dev-python/yaswfp-0.9.3-r2
 2206121142 metadata/md5-cache/dev-python/youtube-search-python-1.6.5
 2206121142 metadata/md5-cache/dev-python/ytmusicapi-0.22.0
@@ -44033,20 +43613,15 @@
 2206121142 metadata/md5-cache/dev-python/zstd-1.5.2.5
 2206121142 metadata/md5-cache/dev-python/zxcvbn-4.4.28
 2206121142 metadata/md5-cache/dev-python/zxcvbn-4.4.28-r1
-2206131410 metadata/md5-cache/dev-python/Manifest.gz
 2206131040 metadata/md5-cache/dev-python/PyPDF2-2.1.1
 2206131040 metadata/md5-cache/dev-python/PySocks-1.7.1-r2
 2206121610 metadata/md5-cache/dev-python/asgiref-3.5.2
 2206121610 metadata/md5-cache/dev-python/async_generator-1.10-r2
-2206131310 metadata/md5-cache/dev-python/automat-20.2.0-r1
-2206131340 metadata/md5-cache/dev-python/brotlicffi-1.0.9.2-r1
-2206131340 metadata/md5-cache/dev-python/cffi-1.15.0-r1
 2206121510 metadata/md5-cache/dev-python/chardet-4.0.0-r1
 2206121510 metadata/md5-cache/dev-python/colorama-0.4.4-r1
 2206121510 metadata/md5-cache/dev-python/commonmark-0.9.1-r1
 2206121510 metadata/md5-cache/dev-python/cssselect-1.1.0-r2
 2206131040 metadata/md5-cache/dev-python/cvxopt-1.3.0
-2206121610 metadata/md5-cache/dev-python/cython-0.29.30
 2206131040 metadata/md5-cache/dev-python/daemonize-2.5.0-r1
 2206121510 metadata/md5-cache/dev-python/defusedxml-0.7.1-r1
 2206121510 metadata/md5-cache/dev-python/distlib-0.3.4-r2
@@ -44056,18 +43631,12 @@
 2206131040 metadata/md5-cache/dev-python/django-4.0.5
 2206131140 metadata/md5-cache/dev-python/django-cache-url-3.4.2
 2206131140 metadata/md5-cache/dev-python/django-configurations-2.3.2
-2206131340 metadata/md5-cache/dev-python/exceptiongroup-1.0.0_rc8
-2206131340 metadata/md5-cache/dev-python/flit_scm-1.6.2
 2206121510 metadata/md5-cache/dev-python/fqdn-1.5.1-r2
-2206131340 metadata/md5-cache/dev-python/gmpy-2.1.2-r1
-2206131340 metadata/md5-cache/dev-python/greenlet-1.1.2-r1
-2206131340 metadata/md5-cache/dev-python/hatch-vcs-0.2.0
 2206121510 metadata/md5-cache/dev-python/html5lib-1.1-r1
 2206122140 metadata/md5-cache/dev-python/http-parser-0.9.0-r1
 2206122140 metadata/md5-cache/dev-python/huawei-lte-api-1.6
 2206122140 metadata/md5-cache/dev-python/humanize-4.1.0
 2206121510 metadata/md5-cache/dev-python/hypothesis-6.46.9
-2206131340 metadata/md5-cache/dev-python/hypothesis-6.47.2
 2206121510 metadata/md5-cache/dev-python/idna-3.3-r1
 2206122140 metadata/md5-cache/dev-python/imageio-ffmpeg-0.4.7
 2206122140 metadata/md5-cache/dev-python/indexed_gzip-1.6.13
@@ -44097,16 +43666,12 @@
 2206131040 metadata/md5-cache/dev-python/oslo-utils-4.13.0-r1
 2206121610 metadata/md5-cache/dev-python/pathspec-0.9.0-r1
 2206121610 metadata/md5-cache/dev-python/pip-22.1.2
-2206131340 metadata/md5-cache/dev-python/platformdirs-2.5.2
 2206131040 metadata/md5-cache/dev-python/ply-3.11-r2
 2206131040 metadata/md5-cache/dev-python/pyasn1-0.4.8-r2
 2206131040 metadata/md5-cache/dev-python/pyasn1-modules-0.2.8-r2
 2206121610 metadata/md5-cache/dev-python/pycparser-2.21-r1
-2206131340 metadata/md5-cache/dev-python/pydantic-1.9.1
-2206121840 metadata/md5-cache/dev-python/pydevd-2.8.0-r1
 2206131040 metadata/md5-cache/dev-python/pyhamcrest-2.0.3-r1
 2206121810 metadata/md5-cache/dev-python/pymetar-1.4-r1
-2206131340 metadata/md5-cache/dev-python/pyrsistent-0.18.1-r1
 2206131040 metadata/md5-cache/dev-python/pytest-expect-1.1.0-r2
 2206131040 metadata/md5-cache/dev-python/pytest-fixture-config-1.7.0-r2
 2206131040 metadata/md5-cache/dev-python/pytest-rerunfailures-10.2-r1
@@ -44114,8 +43679,6 @@
 2206131040 metadata/md5-cache/dev-python/pytest-virtualenv-1.7.0-r2
 2206131040 metadata/md5-cache/dev-python/pytest-xprocess-0.19.0
 2206131040 metadata/md5-cache/dev-python/python-dateutil-2.8.2-r1
-2206131040 metadata/md5-cache/dev-python/pyyaml-6.0-r1
-2206121910 metadata/md5-cache/dev-python/qtawesome-1.1.1-r1
 2206131040 metadata/md5-cache/dev-python/readthedocs-sphinx-ext-2.1.7
 2206131040 metadata/md5-cache/dev-python/rfc3339-validator-0.1.4-r1
 2206131410 metadata/md5-cache/dev-python/scikit-build-0.15.0
@@ -44123,13 +43686,158 @@
 2206131040 metadata/md5-cache/dev-python/service_identity-21.1.0-r1
 2206131040 metadata/md5-cache/dev-python/setuptools-62.3.3
 2206131040 metadata/md5-cache/dev-python/setuptools-git-1.2-r3
-2206131040 metadata/md5-cache/dev-python/simplejson-3.17.6
 2206131040 metadata/md5-cache/dev-python/tblib-1.7.0-r1
 2206131040 metadata/md5-cache/dev-python/traitlets-5.2.2_p1
 2206131040 metadata/md5-cache/dev-python/u-msgpack-python-2.7.1-r1
 2206131040 metadata/md5-cache/dev-python/versioningit-2.0.0
 2206131040 metadata/md5-cache/dev-python/webcolors-1.12
 2206131040 metadata/md5-cache/dev-python/webencodings-0.5.1-r2
+2206160740 metadata/md5-cache/dev-python/Babel-2.10.2
+2206162010 metadata/md5-cache/dev-python/Manifest.gz
+2206140740 metadata/md5-cache/dev-python/PyPDF2-2.2.0
+2206151440 metadata/md5-cache/dev-python/aesara-2.7.2
+2206161310 metadata/md5-cache/dev-python/aiosignal-1.2.0-r1
+2206161210 metadata/md5-cache/dev-python/alabaster-0.7.12-r1
+2206152140 metadata/md5-cache/dev-python/alagitpull-0.0.23-r2
+2206161210 metadata/md5-cache/dev-python/anyio-3.6.1
+2206140740 metadata/md5-cache/dev-python/anyqt-0.1.1
+2206132010 metadata/md5-cache/dev-python/astroid-2.11.6
+2206131940 metadata/md5-cache/dev-python/authres-1.2.0-r1
+2206142240 metadata/md5-cache/dev-python/automat-20.2.0-r1
+2206161210 metadata/md5-cache/dev-python/bleach-5.0.0-r1
+2206160840 metadata/md5-cache/dev-python/boto3-1.24.10
+2206140740 metadata/md5-cache/dev-python/boto3-1.24.8
+2206151440 metadata/md5-cache/dev-python/boto3-1.24.9
+2206160840 metadata/md5-cache/dev-python/botocore-1.27.10
+2206140740 metadata/md5-cache/dev-python/botocore-1.27.8
+2206151440 metadata/md5-cache/dev-python/botocore-1.27.9
+2206141040 metadata/md5-cache/dev-python/brotlicffi-1.0.9.2-r1
+2206161210 metadata/md5-cache/dev-python/cachelib-0.7.0
+2206140740 metadata/md5-cache/dev-python/cachelib-0.8.0
+2206161210 metadata/md5-cache/dev-python/cachetools-5.2.0
+2206161210 metadata/md5-cache/dev-python/cerberus-1.3.4-r1
+2206141040 metadata/md5-cache/dev-python/cffi-1.15.0-r1
+2206161240 metadata/md5-cache/dev-python/cloudpickle-2.1.0
+2206161240 metadata/md5-cache/dev-python/cookies-2.2.1-r2
+2206161910 metadata/md5-cache/dev-python/coverage-6.4.1
+2206161840 metadata/md5-cache/dev-python/croniter-1.3.5
+2206141040 metadata/md5-cache/dev-python/cssutils-2.4.2
+2206151040 metadata/md5-cache/dev-python/cython-0.29.30
+2206161110 metadata/md5-cache/dev-python/dbus-next-0.2.3-r1
+2206161210 metadata/md5-cache/dev-python/decorator-5.1.1-r1
+2206161840 metadata/md5-cache/dev-python/defcon-0.10.1
+2206161240 metadata/md5-cache/dev-python/deprecated-1.2.13-r1
+2206151440 metadata/md5-cache/dev-python/discogs-client-2.3.15
+2206151440 metadata/md5-cache/dev-python/discogs-client-9999
+2206161210 metadata/md5-cache/dev-python/docutils-0.17.1-r1
+2206161310 metadata/md5-cache/dev-python/docutils-0.18.1-r1
+2206161310 metadata/md5-cache/dev-python/eventlet-0.33.1
+2206150040 metadata/md5-cache/dev-python/exceptiongroup-1.0.0_rc8
+2206161240 metadata/md5-cache/dev-python/filelock-3.7.1
+2206150040 metadata/md5-cache/dev-python/flit_scm-1.6.2
+2206162010 metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-3.0
+2206131940 metadata/md5-cache/dev-python/gmpy-2.1.2-r1
+2206160940 metadata/md5-cache/dev-python/google-api-core-2.8.2
+2206151440 metadata/md5-cache/dev-python/google-api-python-client-2.51.0
+2206151440 metadata/md5-cache/dev-python/google-auth-2.8.0
+2206161240 metadata/md5-cache/dev-python/googleapis-common-protos-1.56.2
+2206131940 metadata/md5-cache/dev-python/greenlet-1.1.2-r1
+2206162010 metadata/md5-cache/dev-python/happybase-1.2.0
+2206140040 metadata/md5-cache/dev-python/hatch-vcs-0.2.0
+2206160940 metadata/md5-cache/dev-python/hatchling-1.3.1
+2206161240 metadata/md5-cache/dev-python/httpretty-1.1.4-r1
+2206150040 metadata/md5-cache/dev-python/hypothesis-6.47.2
+2206151440 metadata/md5-cache/dev-python/hypothesis-6.47.3
+2206160940 metadata/md5-cache/dev-python/ifaddr-0.2.0
+2206161240 metadata/md5-cache/dev-python/imagesize-1.3.0-r1
+2206160940 metadata/md5-cache/dev-python/importlib_resources-5.8.0
+2206140740 metadata/md5-cache/dev-python/ipykernel-6.14.0
+2206160940 metadata/md5-cache/dev-python/ipykernel-6.15.0
+2206141040 metadata/md5-cache/dev-python/ipyparallel-8.3.0
+2206140910 metadata/md5-cache/dev-python/ipython-8.3.0-r1
+2206161240 metadata/md5-cache/dev-python/jaraco-collections-3.5.1-r1
+2206161840 metadata/md5-cache/dev-python/jaraco-stream-3.0.3-r1
+2206141040 metadata/md5-cache/dev-python/jaraco-test-5.1.0
+2206160940 metadata/md5-cache/dev-python/jc-1.20.1
+2206161240 metadata/md5-cache/dev-python/jdcal-1.4.1-r1
+2206132040 metadata/md5-cache/dev-python/js2py-0.71_p20210918
+2206141040 metadata/md5-cache/dev-python/jupyter_server-1.17.0
+2206161240 metadata/md5-cache/dev-python/k5test-0.10.1-r1
+2206161240 metadata/md5-cache/dev-python/kaitaistruct-0.9-r1
+2206161310 metadata/md5-cache/dev-python/keep-2.10.1-r1
+2206132010 metadata/md5-cache/dev-python/kiwisolver-1.4.3
+2206161340 metadata/md5-cache/dev-python/lazy-object-proxy-1.7.1-r1
+2206161310 metadata/md5-cache/dev-python/manuel-1.11.2
+2206161210 metadata/md5-cache/dev-python/markdown-3.3.7
+2206151440 metadata/md5-cache/dev-python/networkx-2.8.4
+2206151440 metadata/md5-cache/dev-python/outcome-1.2.0
+2206151310 metadata/md5-cache/dev-python/pivy-0.6.7
+2206140040 metadata/md5-cache/dev-python/platformdirs-2.5.2
+2206151440 metadata/md5-cache/dev-python/proto-plus-1.20.6
+2206160940 metadata/md5-cache/dev-python/psycopg-3.0.15
+2206161410 metadata/md5-cache/dev-python/pybind11-2.9.2-r1
+2206161410 metadata/md5-cache/dev-python/pycurl-7.44.1-r1
+2206150040 metadata/md5-cache/dev-python/pydantic-1.9.1
+2206151110 metadata/md5-cache/dev-python/pydevd-2.8.0-r1
+2206151440 metadata/md5-cache/dev-python/pyghmi-1.5.47
+2206161310 metadata/md5-cache/dev-python/pyglet-1.5.26
+2206151440 metadata/md5-cache/dev-python/pylint-2.14.2
+2206161340 metadata/md5-cache/dev-python/pynacl-1.5.0-r1
+2206161310 metadata/md5-cache/dev-python/pypy3-7.3.9_p1
+2206161240 metadata/md5-cache/dev-python/pyquery-1.4.3-r1
+2206161940 metadata/md5-cache/dev-python/pyroute2-0.5.19
+2206131940 metadata/md5-cache/dev-python/pyrsistent-0.18.1-r1
+2206161310 metadata/md5-cache/dev-python/pytest-describe-2.0.1-r1
+2206161310 metadata/md5-cache/dev-python/pytest-env-0.6.2-r1
+2206161310 metadata/md5-cache/dev-python/pytest-faulthandler-2.0.1-r1
+2206161310 metadata/md5-cache/dev-python/pytest-shell-utilities-1.5.0
+2206161310 metadata/md5-cache/dev-python/python-bugzilla-3.2.0-r1
+2206151440 metadata/md5-cache/dev-python/python-debian-0.1.44
+2206161910 metadata/md5-cache/dev-python/python-ldap-3.4.0_p20220420
+2206161840 metadata/md5-cache/dev-python/python-utils-3.3.3
+2206131940 metadata/md5-cache/dev-python/pyyaml-6.0-r1
+2206150040 metadata/md5-cache/dev-python/qtawesome-1.1.1-r1
+2206141040 metadata/md5-cache/dev-python/qtconsole-5.3.0
+2206161310 metadata/md5-cache/dev-python/re-assert-1.1.0-r1
+2206161240 metadata/md5-cache/dev-python/requests-2.27.1-r1
+2206161210 metadata/md5-cache/dev-python/rfc3986-2.0.0-r1
+2206161310 metadata/md5-cache/dev-python/rsa-4.8-r1
+2206140740 metadata/md5-cache/dev-python/setuptools-62.4.0
+2206161310 metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.1-r5
+2206161240 metadata/md5-cache/dev-python/sh-1.14.2-r1
+2206161940 metadata/md5-cache/dev-python/shiboken2-5.15.2-r1
+2206131940 metadata/md5-cache/dev-python/simplejson-3.17.6
+2206161210 metadata/md5-cache/dev-python/sniffio-1.2.0-r1
+2206161240 metadata/md5-cache/dev-python/snowballstemmer-2.2.0-r1
+2206160940 metadata/md5-cache/dev-python/stack_data-0.3.0
+2206161240 metadata/md5-cache/dev-python/sure-2.0.0-r1
+2206161240 metadata/md5-cache/dev-python/tappy-3.1-r1
+2206161310 metadata/md5-cache/dev-python/tempora-5.0.1
+2206161210 metadata/md5-cache/dev-python/terminado-0.15.0
+2206160910 metadata/md5-cache/dev-python/texttable-1.6.4-r1
+2206162010 metadata/md5-cache/dev-python/thriftpy2-0.4.14-r1
+2206161510 metadata/md5-cache/dev-python/tinycss-0.4-r1
+2206140910 metadata/md5-cache/dev-python/tlsh-4.8.2
+2206161240 metadata/md5-cache/dev-python/toolz-0.11.2-r1
+2206132110 metadata/md5-cache/dev-python/translate-toolkit-3.7.0
+2206161240 metadata/md5-cache/dev-python/trustme-0.9.0-r1
+2206161340 metadata/md5-cache/dev-python/ukkonen-1.0.1-r1
+2206161310 metadata/md5-cache/dev-python/untangle-1.1.1-r1
+2206161340 metadata/md5-cache/dev-python/uritemplate-4.1.1
+2206161240 metadata/md5-cache/dev-python/urllib3-1.26.9-r1
+2206161910 metadata/md5-cache/dev-python/urwid-2.1.2-r1
+2206161340 metadata/md5-cache/dev-python/vdf-3.4-r1
+2206161340 metadata/md5-cache/dev-python/vobject-0.9.6.1-r3
+2206161910 metadata/md5-cache/dev-python/watchdog-2.1.8
+2206161210 metadata/md5-cache/dev-python/webob-1.8.7-r1
+2206161240 metadata/md5-cache/dev-python/webtest-3.0.0-r1
+2206161910 metadata/md5-cache/dev-python/whoosh-2.7.4-r2
+2206161340 metadata/md5-cache/dev-python/wrapt-1.14.1
+2206161210 metadata/md5-cache/dev-python/wsgiproxy2-0.5.1-r1
+2206161240 metadata/md5-cache/dev-python/xmlschema-1.11.1
+2206161410 metadata/md5-cache/dev-python/yarl-1.7.2-r3
+2206161940 metadata/md5-cache/dev-python/yaxmldiff-0.1.0
+2206151440 metadata/md5-cache/dev-python/zeroconf-0.38.7
 2205170654 metadata/md5-cache/dev-qt/assistant-5.15.3
 2205170654 metadata/md5-cache/dev-qt/designer-5.15.3
 2205170654 metadata/md5-cache/dev-qt/linguist-5.15.3
@@ -44137,53 +43845,40 @@
 2205170654 metadata/md5-cache/dev-qt/pixeltool-5.15.3
 2205170654 metadata/md5-cache/dev-qt/qdbus-5.15.3
 2205170654 metadata/md5-cache/dev-qt/qdbusviewer-5.15.3
-2205170654 metadata/md5-cache/dev-qt/qdoc-5.15.3
 2205170654 metadata/md5-cache/dev-qt/qt-creator-6.0.0
 2205170654 metadata/md5-cache/dev-qt/qt-creator-9999
 2205170654 metadata/md5-cache/dev-qt/qt-docs-5.15.2_p202011130614
-2205170654 metadata/md5-cache/dev-qt/qtbluetooth-5.15.3
 2205170654 metadata/md5-cache/dev-qt/qtchooser-66-r2
 2205170654 metadata/md5-cache/dev-qt/qtconcurrent-5.15.3
 2205190840 metadata/md5-cache/dev-qt/qtcore-5.15.3
-2205170654 metadata/md5-cache/dev-qt/qtdatavis3d-5.15.3
 2205170654 metadata/md5-cache/dev-qt/qtdbus-5.15.3
-2205170654 metadata/md5-cache/dev-qt/qtdiag-5.15.3
-2205170654 metadata/md5-cache/dev-qt/qtgamepad-5.15.3
 2205170654 metadata/md5-cache/dev-qt/qtgraphicaleffects-5.15.3
 2205170654 metadata/md5-cache/dev-qt/qtgui-5.15.3
 2205170654 metadata/md5-cache/dev-qt/qthelp-5.15.3
 2205170654 metadata/md5-cache/dev-qt/qtimageformats-5.15.3
-2205170654 metadata/md5-cache/dev-qt/qtlocation-5.15.3-r1
 2205170654 metadata/md5-cache/dev-qt/qtlockedfile-2.4.1_p20171024
 2205170654 metadata/md5-cache/dev-qt/qtmultimedia-5.15.3
 2205170654 metadata/md5-cache/dev-qt/qtnetwork-5.15.3
-2205170654 metadata/md5-cache/dev-qt/qtnetworkauth-5.15.3
 2205170654 metadata/md5-cache/dev-qt/qtopengl-5.15.3
 2205170654 metadata/md5-cache/dev-qt/qtpaths-5.15.3
 2205170654 metadata/md5-cache/dev-qt/qtplugininfo-5.15.3
 2205170654 metadata/md5-cache/dev-qt/qtpositioning-5.15.3
 2205170654 metadata/md5-cache/dev-qt/qtprintsupport-5.15.3
 2205170654 metadata/md5-cache/dev-qt/qtquickcontrols-5.15.3
-2205170654 metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.3
-2205170654 metadata/md5-cache/dev-qt/qtquicktimeline-5.15.3
 2205170654 metadata/md5-cache/dev-qt/qtscript-5.15.3
-2205170654 metadata/md5-cache/dev-qt/qtscxml-5.15.3
 2205170654 metadata/md5-cache/dev-qt/qtsensors-5.15.3
 2205170654 metadata/md5-cache/dev-qt/qtserialbus-5.15.3
 2205170654 metadata/md5-cache/dev-qt/qtserialport-5.15.3
 2205170654 metadata/md5-cache/dev-qt/qtsingleapplication-2.6.1_p20171024
-2205170654 metadata/md5-cache/dev-qt/qtspeech-5.15.3
 2205170654 metadata/md5-cache/dev-qt/qtsql-5.15.3
 2205170654 metadata/md5-cache/dev-qt/qtstyleplugins-5.0.0_p20170311-r1
 2205170654 metadata/md5-cache/dev-qt/qtsvg-5.15.3
 2205170654 metadata/md5-cache/dev-qt/qttest-5.15.3
 2205170654 metadata/md5-cache/dev-qt/qttranslations-5.15.3
-2205170654 metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.3
 2205170654 metadata/md5-cache/dev-qt/qtwayland-5.15.3-r1
 2205170654 metadata/md5-cache/dev-qt/qtwaylandscanner-5.15.3
 2205170654 metadata/md5-cache/dev-qt/qtwebchannel-5.15.3
 2205170654 metadata/md5-cache/dev-qt/qtwebsockets-5.15.3
-2205170654 metadata/md5-cache/dev-qt/qtwebview-5.15.3
 2205170654 metadata/md5-cache/dev-qt/qtwidgets-5.15.3
 2205170654 metadata/md5-cache/dev-qt/qtx11extras-5.15.3
 2205190840 metadata/md5-cache/dev-qt/qtxml-5.15.3
@@ -44193,70 +43888,67 @@
 2205202310 metadata/md5-cache/dev-qt/qtserialbus-5.15.4
 2205202310 metadata/md5-cache/dev-qt/qtwebview-5.15.4
 2205232210 metadata/md5-cache/dev-qt/qtcharts-5.15.3
-2206031540 metadata/md5-cache/dev-qt/qt3d-5.15.3-r1
 2206071015 metadata/md5-cache/dev-qt/qtdeclarative-5.15.3-r1
-2206100640 metadata/md5-cache/dev-qt/assistant-5.15.4
-2206100640 metadata/md5-cache/dev-qt/designer-5.15.4
-2206100640 metadata/md5-cache/dev-qt/linguist-5.15.4
-2206100640 metadata/md5-cache/dev-qt/linguist-tools-5.15.4
 2206091740 metadata/md5-cache/dev-qt/linguist-tools-5.15.4-r1
-2206100640 metadata/md5-cache/dev-qt/pixeltool-5.15.4
-2206100640 metadata/md5-cache/dev-qt/qdbus-5.15.4
-2206100640 metadata/md5-cache/dev-qt/qdbusviewer-5.15.4
-2206100640 metadata/md5-cache/dev-qt/qdoc-5.15.4
-2206100640 metadata/md5-cache/dev-qt/qt3d-5.15.4-r1
-2206100640 metadata/md5-cache/dev-qt/qtbluetooth-5.15.4
-2206100640 metadata/md5-cache/dev-qt/qtcharts-5.15.4
-2206100640 metadata/md5-cache/dev-qt/qtconcurrent-5.15.4
-2206100640 metadata/md5-cache/dev-qt/qtcore-5.15.4-r2
 2206091740 metadata/md5-cache/dev-qt/qtcore-5.15.4-r3
-2206100640 metadata/md5-cache/dev-qt/qtdatavis3d-5.15.4
-2206100640 metadata/md5-cache/dev-qt/qtdbus-5.15.4
-2206100640 metadata/md5-cache/dev-qt/qtdeclarative-5.15.4
-2206100640 metadata/md5-cache/dev-qt/qtdiag-5.15.4
-2206100640 metadata/md5-cache/dev-qt/qtgamepad-5.15.4
-2206100640 metadata/md5-cache/dev-qt/qtgraphicaleffects-5.15.4
-2206100640 metadata/md5-cache/dev-qt/qtgui-5.15.4
-2206100640 metadata/md5-cache/dev-qt/qthelp-5.15.4
-2206100640 metadata/md5-cache/dev-qt/qtimageformats-5.15.4
-2206100640 metadata/md5-cache/dev-qt/qtlocation-5.15.4
-2206100640 metadata/md5-cache/dev-qt/qtmultimedia-5.15.4-r1
-2206100640 metadata/md5-cache/dev-qt/qtnetwork-5.15.4
-2206100640 metadata/md5-cache/dev-qt/qtnetworkauth-5.15.4
-2206100640 metadata/md5-cache/dev-qt/qtopengl-5.15.4
-2206100640 metadata/md5-cache/dev-qt/qtpaths-5.15.4
-2206100640 metadata/md5-cache/dev-qt/qtpositioning-5.15.4
-2206100640 metadata/md5-cache/dev-qt/qtprintsupport-5.15.4
 2206091740 metadata/md5-cache/dev-qt/qtprintsupport-5.15.4-r1
-2206100640 metadata/md5-cache/dev-qt/qtquickcontrols-5.15.4
-2206100640 metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.4
-2206100640 metadata/md5-cache/dev-qt/qtscript-5.15.4
-2206100640 metadata/md5-cache/dev-qt/qtscxml-5.15.4
-2206100640 metadata/md5-cache/dev-qt/qtsensors-5.15.4
-2206100640 metadata/md5-cache/dev-qt/qtserialport-5.15.4
-2206100640 metadata/md5-cache/dev-qt/qtspeech-5.15.4
-2206100640 metadata/md5-cache/dev-qt/qtsql-5.15.4
-2206100640 metadata/md5-cache/dev-qt/qtsvg-5.15.4
-2206100640 metadata/md5-cache/dev-qt/qttest-5.15.4
 2206091740 metadata/md5-cache/dev-qt/qttest-5.15.4-r1
-2206100640 metadata/md5-cache/dev-qt/qttranslations-5.15.4
-2206100640 metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.4
-2206100640 metadata/md5-cache/dev-qt/qtwayland-5.15.4
-2206100640 metadata/md5-cache/dev-qt/qtwaylandscanner-5.15.4
-2206100640 metadata/md5-cache/dev-qt/qtwebchannel-5.15.4
-2206101110 metadata/md5-cache/dev-qt/qtwebengine-5.15.3_p20220406
-2206101110 metadata/md5-cache/dev-qt/qtwebengine-5.15.4_p20220505
-2206101110 metadata/md5-cache/dev-qt/qtwebengine-5.15.4_p20220526
-2206100640 metadata/md5-cache/dev-qt/qtwebsockets-5.15.4
-2206100640 metadata/md5-cache/dev-qt/qtwidgets-5.15.4-r1
 2206091740 metadata/md5-cache/dev-qt/qtwidgets-5.15.4-r2
-2206100640 metadata/md5-cache/dev-qt/qtx11extras-5.15.4
-2206100640 metadata/md5-cache/dev-qt/qtxml-5.15.4
-2206100640 metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.4
-2206122310 metadata/md5-cache/dev-qt/Manifest.gz
 2206122310 metadata/md5-cache/dev-qt/qtdeclarative-5.15.4-r1
 2206122310 metadata/md5-cache/dev-qt/qtgui-5.15.4-r2
 2206122310 metadata/md5-cache/dev-qt/qtimageformats-5.15.4-r1
+2206142040 metadata/md5-cache/dev-qt/Manifest.gz
+2206141640 metadata/md5-cache/dev-qt/assistant-5.15.4
+2206141640 metadata/md5-cache/dev-qt/designer-5.15.4
+2206141640 metadata/md5-cache/dev-qt/linguist-5.15.4
+2206141640 metadata/md5-cache/dev-qt/linguist-tools-5.15.4
+2206141640 metadata/md5-cache/dev-qt/pixeltool-5.15.4
+2206141640 metadata/md5-cache/dev-qt/qdbus-5.15.4
+2206141640 metadata/md5-cache/dev-qt/qdbusviewer-5.15.4
+2206141640 metadata/md5-cache/dev-qt/qdoc-5.15.4
+2206141640 metadata/md5-cache/dev-qt/qt3d-5.15.4-r1
+2206141640 metadata/md5-cache/dev-qt/qtbluetooth-5.15.4
+2206141640 metadata/md5-cache/dev-qt/qtcharts-5.15.4
+2206141640 metadata/md5-cache/dev-qt/qtconcurrent-5.15.4
+2206141640 metadata/md5-cache/dev-qt/qtcore-5.15.4-r2
+2206141640 metadata/md5-cache/dev-qt/qtdatavis3d-5.15.4
+2206141640 metadata/md5-cache/dev-qt/qtdbus-5.15.4
+2206141640 metadata/md5-cache/dev-qt/qtdeclarative-5.15.4
+2206141040 metadata/md5-cache/dev-qt/qtdiag-5.15.4
+2206141640 metadata/md5-cache/dev-qt/qtgamepad-5.15.4
+2206141640 metadata/md5-cache/dev-qt/qtgraphicaleffects-5.15.4
+2206141640 metadata/md5-cache/dev-qt/qtgui-5.15.4
+2206141640 metadata/md5-cache/dev-qt/qthelp-5.15.4
+2206141640 metadata/md5-cache/dev-qt/qtimageformats-5.15.4
+2206141640 metadata/md5-cache/dev-qt/qtlocation-5.15.4
+2206141640 metadata/md5-cache/dev-qt/qtmultimedia-5.15.4-r1
+2206141640 metadata/md5-cache/dev-qt/qtnetwork-5.15.4
+2206141640 metadata/md5-cache/dev-qt/qtnetworkauth-5.15.4
+2206141640 metadata/md5-cache/dev-qt/qtopengl-5.15.4
+2206141640 metadata/md5-cache/dev-qt/qtpaths-5.15.4
+2206141640 metadata/md5-cache/dev-qt/qtpositioning-5.15.4
+2206141640 metadata/md5-cache/dev-qt/qtprintsupport-5.15.4
+2206141640 metadata/md5-cache/dev-qt/qtquickcontrols-5.15.4
+2206141640 metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.4
+2206141640 metadata/md5-cache/dev-qt/qtscript-5.15.4
+2206141640 metadata/md5-cache/dev-qt/qtscxml-5.15.4
+2206141640 metadata/md5-cache/dev-qt/qtsensors-5.15.4
+2206141640 metadata/md5-cache/dev-qt/qtserialport-5.15.4
+2206141640 metadata/md5-cache/dev-qt/qtspeech-5.15.4
+2206141640 metadata/md5-cache/dev-qt/qtsql-5.15.4
+2206141640 metadata/md5-cache/dev-qt/qtsvg-5.15.4
+2206141640 metadata/md5-cache/dev-qt/qttest-5.15.4
+2206141640 metadata/md5-cache/dev-qt/qttranslations-5.15.4
+2206141640 metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.4
+2206141640 metadata/md5-cache/dev-qt/qtwayland-5.15.4
+2206141640 metadata/md5-cache/dev-qt/qtwaylandscanner-5.15.4
+2206141640 metadata/md5-cache/dev-qt/qtwebchannel-5.15.4
+2206141640 metadata/md5-cache/dev-qt/qtwebengine-5.15.4_p20220526
+2206141640 metadata/md5-cache/dev-qt/qtwebsockets-5.15.4
+2206141640 metadata/md5-cache/dev-qt/qtwidgets-5.15.4-r1
+2206141640 metadata/md5-cache/dev-qt/qtx11extras-5.15.4
+2206141640 metadata/md5-cache/dev-qt/qtxml-5.15.4
+2206141640 metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.4
 2206071015 metadata/md5-cache/dev-ros/actionlib-1.13.2-r1
 2206071015 metadata/md5-cache/dev-ros/actionlib-9999
 2206071015 metadata/md5-cache/dev-ros/actionlib_msgs-1.13.0
@@ -45875,14 +45567,11 @@
 2205220911 metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0-r1
 2205220911 metadata/md5-cache/dev-ruby/hiera-3.8.0
 2205220911 metadata/md5-cache/dev-ruby/hiera-3.9.0
-2205220911 metadata/md5-cache/dev-ruby/hiera-eyaml-3.1.1
-2205220911 metadata/md5-cache/dev-ruby/hiera-eyaml-3.2.2
 2205220911 metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.7.4
 2205220911 metadata/md5-cache/dev-ruby/hiera-eyaml-plaintext-0.6-r2
 2205220911 metadata/md5-cache/dev-ruby/highline-2.0.3
 2205220911 metadata/md5-cache/dev-ruby/highline-2.0.3-r1
 2205220911 metadata/md5-cache/dev-ruby/hipchat-1.6.0
-2205220911 metadata/md5-cache/dev-ruby/hiredis-0.6.3-r1
 2205220911 metadata/md5-cache/dev-ruby/histogram-0.2.4.1
 2205220911 metadata/md5-cache/dev-ruby/hitimes-2.0.0
 2205220911 metadata/md5-cache/dev-ruby/hitimes-2.0.0-r1
@@ -46400,8 +46089,6 @@
 2205220911 metadata/md5-cache/dev-ruby/rubytest-0.8.1-r1
 2205220911 metadata/md5-cache/dev-ruby/rubytest-cli-0.2.0-r1
 2205220911 metadata/md5-cache/dev-ruby/rubytter-1.5.1-r2
-2205220911 metadata/md5-cache/dev-ruby/rubyzip-1.3.0
-2205220911 metadata/md5-cache/dev-ruby/rubyzip-2.3.2-r1
 2205220911 metadata/md5-cache/dev-ruby/safe_yaml-1.0.5-r1
 2205220911 metadata/md5-cache/dev-ruby/sanitize-6.0.0
 2205220911 metadata/md5-cache/dev-ruby/sass-3.4.25
@@ -46411,7 +46098,6 @@
 2205220911 metadata/md5-cache/dev-ruby/sass-3.7.4
 2205220911 metadata/md5-cache/dev-ruby/sass-rails-5.0.8
 2205220911 metadata/md5-cache/dev-ruby/sass-rails-5.1.0
-2205220911 metadata/md5-cache/dev-ruby/sassc-2.4.0-r1
 2205220911 metadata/md5-cache/dev-ruby/sassc-rails-2.1.2-r1
 2205220911 metadata/md5-cache/dev-ruby/sawyer-0.8.2-r1
 2205220911 metadata/md5-cache/dev-ruby/sdoc-1.1.0
@@ -46620,7 +46306,6 @@
 2205261410 metadata/md5-cache/dev-ruby/podcast-0.0.4-r3
 2205261410 metadata/md5-cache/dev-ruby/prime-0.1.2-r1
 2205261410 metadata/md5-cache/dev-ruby/ruby-hmac-0.4.0-r2
-2205261410 metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.10-r1
 2205261410 metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r3
 2205261410 metadata/md5-cache/dev-ruby/vlad-2.7.1
 2205270910 metadata/md5-cache/dev-ruby/hoe-3.23.1
@@ -46675,7 +46360,6 @@
 2206121142 metadata/md5-cache/dev-ruby/uuidtools-2.2.0
 2206090810 metadata/md5-cache/dev-ruby/warden-1.2.9-r1
 2206121142 metadata/md5-cache/dev-ruby/yard-0.9.28
-2206131140 metadata/md5-cache/dev-ruby/Manifest.gz
 2206131140 metadata/md5-cache/dev-ruby/actioncable-7.0.3
 2206131140 metadata/md5-cache/dev-ruby/actionmailbox-7.0.3
 2206131140 metadata/md5-cache/dev-ruby/actionmailer-7.0.3
@@ -46698,6 +46382,19 @@
 2206131140 metadata/md5-cache/dev-ruby/uglifier-4.2.0-r1
 2206131140 metadata/md5-cache/dev-ruby/websocket-driver-0.7.5
 2206131140 metadata/md5-cache/dev-ruby/websocket-extensions-0.1.5-r1
+2206161940 metadata/md5-cache/dev-ruby/Manifest.gz
+2206161940 metadata/md5-cache/dev-ruby/hiera-eyaml-3.1.1
+2206161940 metadata/md5-cache/dev-ruby/hiera-eyaml-3.2.2
+2206161940 metadata/md5-cache/dev-ruby/hiredis-0.6.3-r1
+2206150810 metadata/md5-cache/dev-ruby/minitest-5.16.0
+2206161940 metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.10-r1
+2206161940 metadata/md5-cache/dev-ruby/rubyzip-1.3.0
+2206161940 metadata/md5-cache/dev-ruby/rubyzip-2.3.2-r1
+2206161940 metadata/md5-cache/dev-ruby/sassc-2.4.0-r1
+2206140840 metadata/md5-cache/dev-ruby/serverengine-2.3.0
+2206140810 metadata/md5-cache/dev-ruby/sqlite3-1.4.3
+2206160910 metadata/md5-cache/dev-ruby/sqlite3-1.4.4
+2206140810 metadata/md5-cache/dev-ruby/zeitwerk-2.6.0
 1912150139 metadata/md5-cache/dev-scheme/elk-3.99.8
 2111181609 metadata/md5-cache/dev-scheme/gauche-mecab-1.0.2-r1
 1708031509 metadata/md5-cache/dev-scheme/scmxlate-20090410-r1
@@ -46759,7 +46456,6 @@
 2205180040 metadata/md5-cache/dev-scheme/guile-reader-0.6.3-r2
 2205170654 metadata/md5-cache/dev-scheme/guile-sqlite3-0.1.3
 2205170654 metadata/md5-cache/dev-scheme/jscheme-7.2-r1
-2205170654 metadata/md5-cache/dev-scheme/kawa-1.14-r2
 2205170654 metadata/md5-cache/dev-scheme/kawa-3.1.1-r1
 2205170654 metadata/md5-cache/dev-scheme/owl-lisp-0.2
 2205170654 metadata/md5-cache/dev-scheme/owl-lisp-9999
@@ -46771,8 +46467,9 @@
 2205170654 metadata/md5-cache/dev-scheme/tinyscheme-1.42
 2205170654 metadata/md5-cache/dev-scheme/ypsilon-0.9.6_p3-r2
 2205231740 metadata/md5-cache/dev-scheme/chicken-5.3.0
-2205291040 metadata/md5-cache/dev-scheme/Manifest.gz
 2205291040 metadata/md5-cache/dev-scheme/chez-9.5.8
+2206161940 metadata/md5-cache/dev-scheme/Manifest.gz
+2206161940 metadata/md5-cache/dev-scheme/kawa-1.14-r2
 2005292239 metadata/md5-cache/dev-tcltk/expect-lite-4.9.0
 2109152309 metadata/md5-cache/dev-tcltk/itcl-4.1.1
 2111052109 metadata/md5-cache/dev-tcltk/itcl-4.2.0
@@ -46903,13 +46600,14 @@
 2203240726 metadata/md5-cache/dev-texlive/texlive-pstricks-2021
 2203240726 metadata/md5-cache/dev-texlive/texlive-publishers-2021
 2204032209 metadata/md5-cache/dev-texlive/texlive-xetex-2021-r1
-2205141340 metadata/md5-cache/dev-texlive/Manifest.gz
 2205141340 metadata/md5-cache/dev-texlive/texlive-basic-2021
 2205141340 metadata/md5-cache/dev-texlive/texlive-fontsrecommended-2021
 2205141340 metadata/md5-cache/dev-texlive/texlive-fontutils-2021
 2205141340 metadata/md5-cache/dev-texlive/texlive-latex-2021
 2205141340 metadata/md5-cache/dev-texlive/texlive-latexrecommended-2021
 2205141340 metadata/md5-cache/dev-texlive/texlive-plaingeneric-2021
+2206160140 metadata/md5-cache/dev-texlive/Manifest.gz
+2206160140 metadata/md5-cache/dev-texlive/texlive-luatex-2021-r1
 2108111010 metadata/md5-cache/dev-util/abi-compliance-checker-2.3
 1709052039 metadata/md5-cache/dev-util/abi-dumper-1.1
 1910181539 metadata/md5-cache/dev-util/autoproject-0.20_p5
@@ -47016,7 +46714,6 @@
 2204011845 metadata/md5-cache/dev-util/intel-ocl-sdk-4.4.0.117-r3
 2204011845 metadata/md5-cache/dev-util/pycharm-community-2021.1.2-r1
 2204041539 metadata/md5-cache/dev-util/shc-4.0.3
-2204051139 metadata/md5-cache/dev-util/pycharm-community-2021.3.3
 2204070510 metadata/md5-cache/dev-util/flatpak-builder-1.2.2
 2204090610 metadata/md5-cache/dev-util/kup-0.3.4-r1
 2204101840 metadata/md5-cache/dev-util/poke-2.3
@@ -47041,7 +46738,6 @@
 2204150511 metadata/md5-cache/dev-util/src-cli-3.38.0
 2204150511 metadata/md5-cache/dev-util/webhook-2.7.0
 2204172340 metadata/md5-cache/dev-util/cflow-1.7
-2204211009 metadata/md5-cache/dev-util/packer-1.7.10
 2204220309 metadata/md5-cache/dev-util/kup-0.3.6-r1
 2204291110 metadata/md5-cache/dev-util/gperf-3.1
 2204291110 metadata/md5-cache/dev-util/gtk-doc-am-1.33.2
@@ -47191,7 +46887,6 @@
 2205170654 metadata/md5-cache/dev-util/hip-4.3.0
 2205170654 metadata/md5-cache/dev-util/hip-4.3.0-r1
 2205170654 metadata/md5-cache/dev-util/hip-4.3.0-r2
-2205170654 metadata/md5-cache/dev-util/hip-5.0.2
 2205170654 metadata/md5-cache/dev-util/huc-0.1-r1
 2205170654 metadata/md5-cache/dev-util/hxd-0.70.02-r2
 2205170654 metadata/md5-cache/dev-util/icemon-3.3
@@ -47233,16 +46928,11 @@
 2205170654 metadata/md5-cache/dev-util/massif-visualizer-0.7.0-r1
 2205170654 metadata/md5-cache/dev-util/maxcso-1.13.0
 2205170654 metadata/md5-cache/dev-util/maxcso-9999
-2205170654 metadata/md5-cache/dev-util/mdds-1.7.0
 2205170654 metadata/md5-cache/dev-util/mdds-9999
 2205170654 metadata/md5-cache/dev-util/min-cscope-16.1.0-r1
 2205170654 metadata/md5-cache/dev-util/ninka-2.0_pre1_p20170402
 2205170654 metadata/md5-cache/dev-util/numdiff-5.9.0
 2205170654 metadata/md5-cache/dev-util/nvidia-cuda-sdk-11.5.1
-2205170654 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.5.1-r1
-2205170654 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.6.0
-2205170654 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.6.1
-2205170654 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.6.2
 2205170654 metadata/md5-cache/dev-util/objconv-2.51
 2205170654 metadata/md5-cache/dev-util/oprofile-1.4.0
 2205170654 metadata/md5-cache/dev-util/ostree-2021.3-r3
@@ -47250,7 +46940,6 @@
 2205170654 metadata/md5-cache/dev-util/patchelf-0.14.5
 2205170654 metadata/md5-cache/dev-util/peg-0.1.18
 2205170654 metadata/md5-cache/dev-util/plan9port-0_pre20210321
-2205200511 metadata/md5-cache/dev-util/ply-2.1.1-r1
 2205170654 metadata/md5-cache/dev-util/premake-5.0.0_alpha16
 2205170654 metadata/md5-cache/dev-util/pscan-20000721-r1
 2205170654 metadata/md5-cache/dev-util/qbs-1.18.0
@@ -47424,7 +47113,6 @@
 2206021110 metadata/md5-cache/dev-util/strace-5.17
 2206011740 metadata/md5-cache/dev-util/vulkan-headers-1.3.211
 2206031110 metadata/md5-cache/dev-util/bats-1.7.0
-2206031640 metadata/md5-cache/dev-util/clion-2022.1.1
 2206051040 metadata/md5-cache/dev-util/dmake-4.13.1
 2206080340 metadata/md5-cache/dev-util/android-sdk-update-manager-24.4.1-r1
 2206071015 metadata/md5-cache/dev-util/apitrace-9.0-r3
@@ -47435,7 +47123,6 @@
 2206071015 metadata/md5-cache/dev-util/bpftool-5.17.7
 2206071015 metadata/md5-cache/dev-util/bpftool-5.18.1
 2206080740 metadata/md5-cache/dev-util/ccls-9999
-2206071015 metadata/md5-cache/dev-util/clazy-1.10-r2
 2206071015 metadata/md5-cache/dev-util/clazy-1.11-r1
 2206071015 metadata/md5-cache/dev-util/clippy-8.2.2
 2206071015 metadata/md5-cache/dev-util/clippy-8.2.2-r1
@@ -47448,8 +47135,6 @@
 2206071015 metadata/md5-cache/dev-util/devhelp-41.2
 2206071015 metadata/md5-cache/dev-util/edi-0.8.0-r1
 2206071015 metadata/md5-cache/dev-util/edi-0.8.0-r2
-2206071140 metadata/md5-cache/dev-util/geany-1.38
-2206071140 metadata/md5-cache/dev-util/geany-plugins-1.38-r1
 2206071015 metadata/md5-cache/dev-util/gef-2021.10-r1
 2206071015 metadata/md5-cache/dev-util/gef-2022.01
 2206071015 metadata/md5-cache/dev-util/gef-9999
@@ -47491,8 +47176,6 @@
 2206071015 metadata/md5-cache/dev-util/rizin-0.3.4-r1
 2206071015 metadata/md5-cache/dev-util/rocm-smi-4.0.0
 2206071015 metadata/md5-cache/dev-util/roctracer-4.2.0-r1
-2206071015 metadata/md5-cache/dev-util/roctracer-4.3.0-r1
-2206071015 metadata/md5-cache/dev-util/roctracer-5.0.2
 2206071015 metadata/md5-cache/dev-util/rpmdevtools-9.5
 2206071015 metadata/md5-cache/dev-util/rr-5.5.0
 2206071015 metadata/md5-cache/dev-util/rt-tests-2.3
@@ -47529,7 +47212,6 @@
 2206121142 metadata/md5-cache/dev-util/android-tools-31.0.3_p1
 2206121142 metadata/md5-cache/dev-util/bcc-0.23.0-r5
 2206121142 metadata/md5-cache/dev-util/bcc-0.24.0-r1
-2206100640 metadata/md5-cache/dev-util/boost-build-1.79.0
 2206092240 metadata/md5-cache/dev-util/breakpad-2022.06.04
 2206121142 metadata/md5-cache/dev-util/buildbot-3.4.0
 2206121142 metadata/md5-cache/dev-util/buildbot-3.5.0
@@ -47576,7 +47258,6 @@
 2206121142 metadata/md5-cache/dev-util/diffoscope-207
 2206121142 metadata/md5-cache/dev-util/diffoscope-214
 2206121142 metadata/md5-cache/dev-util/diffoscope-214-r1
-2206121142 metadata/md5-cache/dev-util/diffoscope-216
 2206121142 metadata/md5-cache/dev-util/diffuse-0.7.5
 2206121142 metadata/md5-cache/dev-util/distro-info-1.0
 2206121142 metadata/md5-cache/dev-util/dogtail-0.9.11
@@ -47613,9 +47294,7 @@
 2206112210 metadata/md5-cache/dev-util/lttng-modules-2.12.8
 2206112210 metadata/md5-cache/dev-util/lttng-modules-2.13.3
 2206121142 metadata/md5-cache/dev-util/maturin-0.12.17
-2206121142 metadata/md5-cache/dev-util/maturin-0.12.18
 2206121142 metadata/md5-cache/dev-util/maturin-0.12.19
-2206100640 metadata/md5-cache/dev-util/mdds-2.0.3
 2206121142 metadata/md5-cache/dev-util/meld-3.20.4
 2206121142 metadata/md5-cache/dev-util/meson-0.60.3
 2206121142 metadata/md5-cache/dev-util/meson-0.61.4-r2
@@ -47624,18 +47303,12 @@
 2206121142 metadata/md5-cache/dev-util/meson-9999
 2206121142 metadata/md5-cache/dev-util/meson-format-array-0
 2206091240 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.7.0
-2206121142 metadata/md5-cache/dev-util/perf-5.15-r1
-2206121142 metadata/md5-cache/dev-util/perf-5.17.1
-2206121142 metadata/md5-cache/dev-util/perf-5.18
 2206121142 metadata/md5-cache/dev-util/pkgcheck-0.10.10
 2206121142 metadata/md5-cache/dev-util/pkgcheck-0.10.11
 2206121142 metadata/md5-cache/dev-util/pkgcheck-0.10.9-r1
 2206121142 metadata/md5-cache/dev-util/pkgcheck-9999
 2206120340 metadata/md5-cache/dev-util/pkgconf-1.8.0-r1
 2206120340 metadata/md5-cache/dev-util/pkgconf-9999
-2206121142 metadata/md5-cache/dev-util/pkgdev-0.1.9
-2206121142 metadata/md5-cache/dev-util/pkgdev-0.2.0
-2206121142 metadata/md5-cache/dev-util/pkgdev-0.2.1
 2206121142 metadata/md5-cache/dev-util/rbtools-2.0.1
 2206121142 metadata/md5-cache/dev-util/rbtools-3.1
 2206111710 metadata/md5-cache/dev-util/rocm-clang-ocl-5.0.2
@@ -47667,13 +47340,39 @@
 2206121142 metadata/md5-cache/dev-util/wstool-9999
 2206121142 metadata/md5-cache/dev-util/yamllint-1.26.3-r1
 2206121142 metadata/md5-cache/dev-util/ydiff-1.2
-2206131340 metadata/md5-cache/dev-util/Manifest.gz
 2206122310 metadata/md5-cache/dev-util/glslang-9999
-2206122110 metadata/md5-cache/dev-util/pkgdev-0.2.1-r1
 2206122110 metadata/md5-cache/dev-util/pkgdev-9999
 2206122310 metadata/md5-cache/dev-util/spirv-tools-99999999
-2206131340 metadata/md5-cache/dev-util/systemtap-4.5-r1
 2206122310 metadata/md5-cache/dev-util/vulkan-tools-9999
+2206162010 metadata/md5-cache/dev-util/Manifest.gz
+2206142110 metadata/md5-cache/dev-util/boost-build-1.79.0
+2206141040 metadata/md5-cache/dev-util/clion-2022.1.1-r1
+2206140910 metadata/md5-cache/dev-util/diffoscope-216
+2206152140 metadata/md5-cache/dev-util/difftastic-0.29.1
+2206161940 metadata/md5-cache/dev-util/gcovr-5.1
+2206161210 metadata/md5-cache/dev-util/geany-1.38
+2206161210 metadata/md5-cache/dev-util/geany-plugins-1.38-r1
+2206131510 metadata/md5-cache/dev-util/hip-5.0.2-r1
+2206162010 metadata/md5-cache/dev-util/kernelshark-2.1.0
+2206161640 metadata/md5-cache/dev-util/maturin-0.12.20
+2206141640 metadata/md5-cache/dev-util/mdds-2.0.3
+2206161940 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.5.1-r1
+2206161940 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.6.0
+2206161940 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.6.1
+2206161940 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.6.2
+2206140940 metadata/md5-cache/dev-util/packer-1.7.10
+2206161240 metadata/md5-cache/dev-util/perf-5.15-r1
+2206161240 metadata/md5-cache/dev-util/perf-5.17.1
+2206161240 metadata/md5-cache/dev-util/perf-5.18
+2206140040 metadata/md5-cache/dev-util/pkgdev-0.2.1-r1
+2206150740 metadata/md5-cache/dev-util/ply-2.1.1-r1
+2206161740 metadata/md5-cache/dev-util/pycharm-community-2022.1.2
+2206131510 metadata/md5-cache/dev-util/rocprofiler-4.3.0
+2206131510 metadata/md5-cache/dev-util/rocprofiler-5.0.2
+2206131510 metadata/md5-cache/dev-util/roctracer-4.3.0-r2
+2206131510 metadata/md5-cache/dev-util/roctracer-5.0.2
+2206141040 metadata/md5-cache/dev-util/systemtap-4.5-r1
+2206162010 metadata/md5-cache/dev-util/trace-cmd-3.0.2
 2101070210 metadata/md5-cache/dev-vcs/colorsvn-0.3.3
 1902111809 metadata/md5-cache/dev-vcs/cvs2cl-2.71-r1
 2002230040 metadata/md5-cache/dev-vcs/cvsgraph-1.7.0
@@ -47707,7 +47406,6 @@
 2205082340 metadata/md5-cache/dev-vcs/gitolite-3.6.12
 2205150440 metadata/md5-cache/dev-vcs/git-sizer-1.5.0
 2205170654 metadata/md5-cache/dev-vcs/cssc-1.4.1
-2205170654 metadata/md5-cache/dev-vcs/cvs-1.12.12-r14
 2205170654 metadata/md5-cache/dev-vcs/cvs-fast-export-1.57
 2205170654 metadata/md5-cache/dev-vcs/cvs-fast-export-1.59
 2205170654 metadata/md5-cache/dev-vcs/cvsps-2.2_beta1-r1
@@ -47788,7 +47486,6 @@
 2206121142 metadata/md5-cache/dev-vcs/repo-2.17
 2206121142 metadata/md5-cache/dev-vcs/repo-2.21
 2206121142 metadata/md5-cache/dev-vcs/stgit-1.5
-2206121142 metadata/md5-cache/dev-vcs/subversion-1.14.1
 2206121142 metadata/md5-cache/dev-vcs/subversion-1.14.2-r1
 2206121142 metadata/md5-cache/dev-vcs/svneverever-1.5.0
 2206121142 metadata/md5-cache/dev-vcs/svneverever-1.6.0
@@ -47800,9 +47497,12 @@
 2206121142 metadata/md5-cache/dev-vcs/tortoisehg-6.1
 2206121142 metadata/md5-cache/dev-vcs/tortoisehg-6.1.2
 2206121142 metadata/md5-cache/dev-vcs/tortoisehg-9999
-2206121910 metadata/md5-cache/dev-vcs/Manifest.gz
 2206121910 metadata/md5-cache/dev-vcs/mercurial-6.1.3-r1
 2206121910 metadata/md5-cache/dev-vcs/mercurial-9999
+2206161940 metadata/md5-cache/dev-vcs/Manifest.gz
+2206161940 metadata/md5-cache/dev-vcs/cvs-1.12.12-r14
+2206161440 metadata/md5-cache/dev-vcs/git-2.37.0_rc0
+2206161940 metadata/md5-cache/dev-vcs/subversion-1.14.1
 2110190339 metadata/md5-cache/games-action/descent1-freedata-1
 2110190339 metadata/md5-cache/games-action/descent2-demodata-1.0-r1
 2110190339 metadata/md5-cache/games-action/descent2-freedata-1
@@ -47861,7 +47561,6 @@
 2205170654 metadata/md5-cache/games-action/moon-buggy-1.0.51-r2
 2205170654 metadata/md5-cache/games-action/multimc-bin-1.6.1-r1
 2205200010 metadata/md5-cache/games-action/nighthawk-4.0
-2205170654 metadata/md5-cache/games-action/noiz2sa-0.51a-r1
 2205170654 metadata/md5-cache/games-action/orbital-eunuchs-sniper-1.30-r1
 2205170654 metadata/md5-cache/games-action/powermanga-0.93.1-r1
 2205170654 metadata/md5-cache/games-action/rive-1.15
@@ -47891,8 +47590,9 @@
 2206081111 metadata/md5-cache/games-action/supertuxkart-1.3
 2206071015 metadata/md5-cache/games-action/teeworlds-0.7.5-r1
 2206110110 metadata/md5-cache/games-action/extreme-tuxracer-0.8.0
-2206122340 metadata/md5-cache/games-action/Manifest.gz
 2206122340 metadata/md5-cache/games-action/polymc-1.3.2
+2206160340 metadata/md5-cache/games-action/Manifest.gz
+2206160340 metadata/md5-cache/games-action/noiz2sa-0.51a-r2
 2102241843 metadata/md5-cache/games-arcade/amphetamine-0.8.10-r1
 2109180739 metadata/md5-cache/games-arcade/apricots-0.2.7
 2104040939 metadata/md5-cache/games-arcade/bumprace-1.5.3-r1
@@ -47944,8 +47644,6 @@
 2205170654 metadata/md5-cache/games-arcade/briquolo-0.5.7
 2205170654 metadata/md5-cache/games-arcade/burgerspace-1.9.3-r1
 2205170654 metadata/md5-cache/games-arcade/cavezofphear-0.5.1-r1
-2205170654 metadata/md5-cache/games-arcade/cdogs-sdl-1.2.0
-2205170654 metadata/md5-cache/games-arcade/cdogs-sdl-1.3.0
 2205170654 metadata/md5-cache/games-arcade/ceferino-0.97.8-r3
 2205170654 metadata/md5-cache/games-arcade/circuslinux-1.0.3-r2
 2205170654 metadata/md5-cache/games-arcade/conveysdl-1.3-r1
@@ -48013,7 +47711,6 @@
 2205170654 metadata/md5-cache/games-arcade/xtux-20030306-r1
 2205261010 metadata/md5-cache/games-arcade/oshu-2.0.2
 2205261010 metadata/md5-cache/games-arcade/oshu-9999
-2206071015 metadata/md5-cache/games-arcade/Manifest.gz
 2206071015 metadata/md5-cache/games-arcade/commandergenius-2.4.0
 2206071015 metadata/md5-cache/games-arcade/funnyboat-1.5_p11-r3
 2206071015 metadata/md5-cache/games-arcade/gnome-nibbles-3.38.2
@@ -48021,6 +47718,8 @@
 2206071015 metadata/md5-cache/games-arcade/jumpnbump-1.61_p20210421
 2206071015 metadata/md5-cache/games-arcade/solarwolf-1.5_p3
 2206071015 metadata/md5-cache/games-arcade/whichwayisup-0.7.9_p8
+2206161640 metadata/md5-cache/games-arcade/Manifest.gz
+2206140340 metadata/md5-cache/games-arcade/cdogs-sdl-1.3.1
 2106290509 metadata/md5-cache/games-board/awale-1.6
 2104190739 metadata/md5-cache/games-board/gnuchess-book-1.02-r1
 2102241843 metadata/md5-cache/games-board/gnushogi-1.4.1-r1
@@ -48086,9 +47785,10 @@
 2206071015 metadata/md5-cache/games-board/iagno-3.38.1
 2206071015 metadata/md5-cache/games-board/scid-4.7.0
 2206071015 metadata/md5-cache/games-board/tali-40.7
-2206121142 metadata/md5-cache/games-board/Manifest.gz
 2206121142 metadata/md5-cache/games-board/pychess-1.0.3-r2
 2206121142 metadata/md5-cache/games-board/pysolfc-2.16.0
+2206151940 metadata/md5-cache/games-board/Manifest.gz
+2206151940 metadata/md5-cache/games-board/tablebase-syzygy-0_pre20131213-r101
 2109031939 metadata/md5-cache/games-emulation/emutos-1.1.1
 2103100539 metadata/md5-cache/games-emulation/jrommanager-1.8_p27-r1
 1808150339 metadata/md5-cache/games-emulation/libretro-info-0.0.1_pre20180723
@@ -48134,9 +47834,6 @@
 2205170654 metadata/md5-cache/games-emulation/mednafen-1.29.0
 2205170654 metadata/md5-cache/games-emulation/melonds-0.9.3-r2
 2205170654 metadata/md5-cache/games-emulation/melonds-0.9.4_p1-r1
-2205170654 metadata/md5-cache/games-emulation/mgba-0.9.2
-2205170654 metadata/md5-cache/games-emulation/mgba-0.9.3
-2205170654 metadata/md5-cache/games-emulation/mgba-9999
 2205170654 metadata/md5-cache/games-emulation/mupen64plus-audio-sdl-2.5.9
 2205170654 metadata/md5-cache/games-emulation/mupen64plus-core-2.5.9-r2
 2205170654 metadata/md5-cache/games-emulation/mupen64plus-input-sdl-2.5.9
@@ -48168,12 +47865,15 @@
 2206071015 metadata/md5-cache/games-emulation/dosbox-staging-0.78.0
 2206071015 metadata/md5-cache/games-emulation/dosbox-staging-0.78.1
 2206071015 metadata/md5-cache/games-emulation/hatari-2.3.1-r1
-2206081540 metadata/md5-cache/games-emulation/mgba-0.9.3-r1
 2206071015 metadata/md5-cache/games-emulation/openmsx-17.0
 2206071015 metadata/md5-cache/games-emulation/snes9x-1.61
-2206121142 metadata/md5-cache/games-emulation/Manifest.gz
 2206121142 metadata/md5-cache/games-emulation/m64py-0.2.5
 2206121142 metadata/md5-cache/games-emulation/m64py-0.2.5_p20211222
+2206161940 metadata/md5-cache/games-emulation/Manifest.gz
+2206161940 metadata/md5-cache/games-emulation/mgba-0.9.2
+2206161940 metadata/md5-cache/games-emulation/mgba-0.9.3
+2206161940 metadata/md5-cache/games-emulation/mgba-0.9.3-r1
+2206161940 metadata/md5-cache/games-emulation/mgba-9999
 2202012143 metadata/md5-cache/games-engines/nazghul-0.7.1-r1
 2204021210 metadata/md5-cache/games-engines/zoom-1.1.5-r1
 2205170654 metadata/md5-cache/games-engines/box2d-2.4.1
@@ -48277,13 +47977,13 @@
 2205170654 metadata/md5-cache/games-fps/ut2004-data-3186-r5
 2205170654 metadata/md5-cache/games-fps/ut2004-demo-3334-r3
 2205170654 metadata/md5-cache/games-fps/xonotic-0.8.2
-2205170654 metadata/md5-cache/games-fps/yamagi-quake2-8.01
-2206080240 metadata/md5-cache/games-fps/Manifest.gz
 2206071015 metadata/md5-cache/games-fps/chocolate-doom-3.0.1-r1
 2206080240 metadata/md5-cache/games-fps/doomsday-2.3.1
 2206071015 metadata/md5-cache/games-fps/freedm-data-0.12.1-r1
 2206071015 metadata/md5-cache/games-fps/freedoom-data-0.12.1-r1
 2206080210 metadata/md5-cache/games-fps/ut2003-2225-r6
+2206161210 metadata/md5-cache/games-fps/Manifest.gz
+2206161210 metadata/md5-cache/games-fps/yamagi-quake2-8.01
 2102241843 metadata/md5-cache/games-kids/lletters-0.1.95-r4
 2203240726 metadata/md5-cache/games-kids/tuxmath-2.0.3-r2
 2205170654 metadata/md5-cache/games-kids/gcompris-1.0
@@ -48730,17 +48430,16 @@
 2206071015 metadata/md5-cache/games-util/gamemode-9999
 2206080340 metadata/md5-cache/games-util/joycond-0.1.0_p20210730-r1
 2206080340 metadata/md5-cache/games-util/joystick-1.8.1
-2206071015 metadata/md5-cache/games-util/pyfa-2.33.0
-2206071015 metadata/md5-cache/games-util/pyfa-2.37.0
 2206071015 metadata/md5-cache/games-util/pyfa-9999
 2206080340 metadata/md5-cache/games-util/xboxdrv-0.8.8_p20190118-r1
-2206121142 metadata/md5-cache/games-util/Manifest.gz
 2206121142 metadata/md5-cache/games-util/lutris-0.5.10.1
 2206121142 metadata/md5-cache/games-util/lutris-9999
 2206121142 metadata/md5-cache/games-util/nml-0.6.1
 2206121142 metadata/md5-cache/games-util/sc-controller-0.4.8.6_p20211211
 2206112210 metadata/md5-cache/games-util/xpadneo-0.9.3
 2206112210 metadata/md5-cache/games-util/xpadneo-9999
+2206162010 metadata/md5-cache/games-util/Manifest.gz
+2206162010 metadata/md5-cache/games-util/pyfa-2.43.0
 2108271840 metadata/md5-cache/gnome-base/gnome-light-40.0
 2202080810 metadata/md5-cache/gnome-base/gnome-40.0
 2203131809 metadata/md5-cache/gnome-base/gnome-core-apps-41.3
@@ -48760,10 +48459,8 @@
 2206071015 metadata/md5-cache/gnome-base/dconf-0.40.0
 2206071015 metadata/md5-cache/gnome-base/dconf-editor-3.38.3
 2206071015 metadata/md5-cache/gnome-base/gconf-3.2.6-r5
-2206080340 metadata/md5-cache/gnome-base/gdm-42.0
 2206071015 metadata/md5-cache/gnome-base/gnome-control-center-42.1
 2206071015 metadata/md5-cache/gnome-base/gnome-control-center-42.2
-2206071015 metadata/md5-cache/gnome-base/gnome-desktop-42.1-r300
 2206071015 metadata/md5-cache/gnome-base/gnome-desktop-42.1-r400
 2206071015 metadata/md5-cache/gnome-base/gnome-desktop-42.2-r300
 2206071015 metadata/md5-cache/gnome-base/gnome-desktop-42.2-r400
@@ -48782,8 +48479,10 @@
 2206071015 metadata/md5-cache/gnome-base/librsvg-2.54.3
 2206071015 metadata/md5-cache/gnome-base/nautilus-42.1.1
 2206071015 metadata/md5-cache/gnome-base/nautilus-42.2
-2206110710 metadata/md5-cache/gnome-base/Manifest.gz
 2206110710 metadata/md5-cache/gnome-base/librsvg-2.54.4
+2206161940 metadata/md5-cache/gnome-base/Manifest.gz
+2206161940 metadata/md5-cache/gnome-base/gdm-42.0
+2206161940 metadata/md5-cache/gnome-base/gnome-desktop-42.1-r300
 2203240726 metadata/md5-cache/gnome-extra/gnome-getting-started-docs-3.38.1
 2205050610 metadata/md5-cache/gnome-extra/cinnamon-translations-5.2.2
 2205170654 metadata/md5-cache/gnome-extra/eiciel-0.9.13.1
@@ -48877,8 +48576,9 @@
 2206080110 metadata/md5-cache/gnome-extra/nm-applet-1.28.0
 2206071015 metadata/md5-cache/gnome-extra/sushi-41.2
 2206071015 metadata/md5-cache/gnome-extra/zenity-3.42.1
-2206121142 metadata/md5-cache/gnome-extra/Manifest.gz
 2206121142 metadata/md5-cache/gnome-extra/gnome-integration-spotify-20140907-r2
+2206151910 metadata/md5-cache/gnome-extra/Manifest.gz
+2206151910 metadata/md5-cache/gnome-extra/gnome-calendar-42.2
 2205170654 metadata/md5-cache/gnustep-apps/aclock-0.4.0-r1
 2205170654 metadata/md5-cache/gnustep-apps/addresses-0.4.8-r1
 2205170654 metadata/md5-cache/gnustep-apps/affiche-0.6.0-r4
@@ -48938,9 +48638,7 @@
 2205170654 metadata/md5-cache/gnustep-base/libobjc2-2.1
 2205170654 metadata/md5-cache/gnustep-base/mknfonts-0.5-r2
 2205170654 metadata/md5-cache/gnustep-base/mknfonts-0.5-r3
-2205170654 metadata/md5-cache/gnustep-libs/Manifest.gz
 2205170654 metadata/md5-cache/gnustep-libs/cenonlibrary-4.0.0
-2205170654 metadata/md5-cache/gnustep-libs/dbuskit-0.1.1-r1
 2205170654 metadata/md5-cache/gnustep-libs/gsldap-0.0.1_pre20070219-r1
 2205170654 metadata/md5-cache/gnustep-libs/highlighterkit-0.1.3-r1
 2205170654 metadata/md5-cache/gnustep-libs/netclasses-1.1.0
@@ -48950,13 +48648,14 @@
 2205170654 metadata/md5-cache/gnustep-libs/sope-5.1.1-r1
 2205170654 metadata/md5-cache/gnustep-libs/sope-5.2.0-r1
 2205170654 metadata/md5-cache/gnustep-libs/sqlclient-1.8.1-r1
+2206161940 metadata/md5-cache/gnustep-libs/Manifest.gz
+2206161940 metadata/md5-cache/gnustep-libs/dbuskit-0.1.1-r1
 2202150009 metadata/md5-cache/gui-apps/foot-terminfo-1.11.0-r1
 2204281340 metadata/md5-cache/gui-apps/foot-terminfo-1.12.1
 2205170654 metadata/md5-cache/gui-apps/nm-tray-0.4.3-r1
 2205170654 metadata/md5-cache/gui-apps/nm-tray-0.5.0
 2205170654 metadata/md5-cache/gui-apps/tuigreet-0.7.2
 2205170654 metadata/md5-cache/gui-apps/tuigreet-9999
-2206071015 metadata/md5-cache/gui-apps/Manifest.gz
 2206071015 metadata/md5-cache/gui-apps/foot-1.11.0-r1
 2206071015 metadata/md5-cache/gui-apps/foot-1.12.1
 2206071015 metadata/md5-cache/gui-apps/grim-1.3.1
@@ -49000,11 +48699,13 @@
 2206071015 metadata/md5-cache/gui-apps/wcm-0.7.0
 2206071015 metadata/md5-cache/gui-apps/wcm-9999
 2206071015 metadata/md5-cache/gui-apps/wf-recorder-0.2.1-r1
-2206071015 metadata/md5-cache/gui-apps/wf-recorder-9999
 2206071015 metadata/md5-cache/gui-apps/wf-shell-0.7.0
 2206071015 metadata/md5-cache/gui-apps/wf-shell-9999
 2206071015 metadata/md5-cache/gui-apps/wl-clipboard-2.1.0
 2206071015 metadata/md5-cache/gui-apps/wl-clipboard-9999
+2206152140 metadata/md5-cache/gui-apps/Manifest.gz
+2206152140 metadata/md5-cache/gui-apps/wf-recorder-0.3.0-r1
+2206152110 metadata/md5-cache/gui-apps/wf-recorder-9999
 2202140410 metadata/md5-cache/gui-libs/eglexternalplatform-1.1
 2205100440 metadata/md5-cache/gui-libs/display-manager-init-1.0-r3
 2205170654 metadata/md5-cache/gui-libs/amtk-5.2.0
@@ -49047,8 +48748,9 @@
 2206071015 metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-0.5.0
 2206071015 metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-9999
 2206101440 metadata/md5-cache/gui-libs/gdk-pixbuf-loader-webp-0.0.5
-2206121910 metadata/md5-cache/gui-libs/Manifest.gz
 2206121910 metadata/md5-cache/gui-libs/egl-wayland-1.1.10
+2206140610 metadata/md5-cache/gui-libs/Manifest.gz
+2206140610 metadata/md5-cache/gui-libs/gtksourceview-5.4.2
 2205170654 metadata/md5-cache/gui-wm/hikari-2.3.3
 2206071015 metadata/md5-cache/gui-wm/Manifest.gz
 2206071015 metadata/md5-cache/gui-wm/sway-1.7
@@ -49511,169 +49213,88 @@
 2206091440 metadata/md5-cache/kde-apps/yakuake-22.04.2
 2206091440 metadata/md5-cache/kde-apps/zeroconf-ioslave-22.04.2
 2205170654 metadata/md5-cache/kde-frameworks/attica-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/attica-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/baloo-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/baloo-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/countryflags-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/countryflags-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/frameworkintegration-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/frameworkintegration-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/kactivities-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/kactivities-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/kactivities-stats-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/kactivities-stats-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/karchive-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/karchive-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/kauth-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/kauth-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/kbookmarks-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/kbookmarks-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/kcalendarcore-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/kcalendarcore-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/kcmutils-5.92.0-r1
-2205170654 metadata/md5-cache/kde-frameworks/kcmutils-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/kcodecs-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/kcodecs-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/kcompletion-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/kcompletion-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/kconfig-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/kconfig-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/kconfigwidgets-5.92.0-r1
-2205170654 metadata/md5-cache/kde-frameworks/kconfigwidgets-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/kcontacts-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/kcontacts-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/kcoreaddons-5.92.0
 2205170654 metadata/md5-cache/kde-frameworks/kdav-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/kdav-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/kdbusaddons-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/kdbusaddons-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/kdeclarative-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/kdeclarative-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/kded-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/kded-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/kdelibs4support-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/kdelibs4support-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/kdesu-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/kdesu-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/kdnssd-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/kdnssd-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/kdoctools-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/kdoctools-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/kemoticons-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/kemoticons-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/kglobalaccel-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/kglobalaccel-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/kguiaddons-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/kguiaddons-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/kholidays-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/kholidays-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/khtml-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/khtml-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/kiconthemes-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/kiconthemes-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/kidletime-5.92.0-r1
-2205170654 metadata/md5-cache/kde-frameworks/kidletime-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/kimageformats-5.92.0-r2
-2205170654 metadata/md5-cache/kde-frameworks/kimageformats-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/kinit-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/kinit-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/kio-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/kio-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/kirigami-5.92.0-r1
-2205170654 metadata/md5-cache/kde-frameworks/kirigami-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/kitemmodels-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/kitemmodels-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/kitemviews-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/kitemviews-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/kjobwidgets-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/kjobwidgets-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/kjs-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/kjs-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/knewstuff-5.92.0-r2
 2205170654 metadata/md5-cache/kde-frameworks/knotifications-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/knotifications-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/knotifyconfig-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/knotifyconfig-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/kpackage-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/kpackage-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/kparts-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/kparts-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/kpeople-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/kpeople-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/kplotting-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/kplotting-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/kpty-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/kpty-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/kquickcharts-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/kquickcharts-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/kross-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/kross-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/krunner-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/krunner-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/kservice-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/kservice-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/ktexteditor-5.92.0-r1
-2205170654 metadata/md5-cache/kde-frameworks/ktexteditor-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/ktextwidgets-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/ktextwidgets-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/kunitconversion-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/kunitconversion-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/kwallet-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/kwallet-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/kwayland-5.92.0
 2205170654 metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/kwindowsystem-5.92.0
 2205170654 metadata/md5-cache/kde-frameworks/kxmlgui-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/kxmlgui-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/modemmanager-qt-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/modemmanager-qt-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/networkmanager-qt-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/networkmanager-qt-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/oxygen-icons-5.92.0
 2205170654 metadata/md5-cache/kde-frameworks/plasma-5.92.0-r2
 2205170654 metadata/md5-cache/kde-frameworks/prison-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/prison-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/purpose-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/purpose-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/solid-5.92.0
 2205170654 metadata/md5-cache/kde-frameworks/sonnet-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/sonnet-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/syndication-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/syndication-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/syntax-highlighting-5.92.0-r1
-2205170654 metadata/md5-cache/kde-frameworks/syntax-highlighting-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/threadweaver-5.92.0
-2205170654 metadata/md5-cache/kde-frameworks/threadweaver-5.94.0
-2205251440 metadata/md5-cache/kde-frameworks/kcoreaddons-5.94.0
 2205251440 metadata/md5-cache/kde-frameworks/kf-env-5
-2205251440 metadata/md5-cache/kde-frameworks/kwayland-5.94.0
-2205251440 metadata/md5-cache/kde-frameworks/kwindowsystem-5.94.0
-2205251440 metadata/md5-cache/kde-frameworks/oxygen-icons-5.94.0
-2205251440 metadata/md5-cache/kde-frameworks/solid-5.94.0
-2205301940 metadata/md5-cache/kde-frameworks/knewstuff-5.94.0-r1
 2206080340 metadata/md5-cache/kde-frameworks/bluez-qt-5.92.0
-2206080340 metadata/md5-cache/kde-frameworks/bluez-qt-5.94.0
 2206071015 metadata/md5-cache/kde-frameworks/breeze-icons-5.92.0
-2206071015 metadata/md5-cache/kde-frameworks/breeze-icons-5.94.0
 2206071015 metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.92.0
-2206071015 metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.94.0
 2206071015 metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.92.0
-2206071015 metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.94.0
 2206071015 metadata/md5-cache/kde-frameworks/kfilemetadata-5.92.0
-2206071015 metadata/md5-cache/kde-frameworks/kfilemetadata-5.94.0
 2206071015 metadata/md5-cache/kde-frameworks/ki18n-5.92.0
-2206071015 metadata/md5-cache/kde-frameworks/ki18n-5.94.0
 2206121142 metadata/md5-cache/kde-frameworks/kapidox-5.92.0
-2206121142 metadata/md5-cache/kde-frameworks/kapidox-5.94.0
 2206081840 metadata/md5-cache/kde-frameworks/kcrash-5.92.0
-2206081840 metadata/md5-cache/kde-frameworks/kcrash-5.94.0
-2206130110 metadata/md5-cache/kde-frameworks/Manifest.gz
 2206122310 metadata/md5-cache/kde-frameworks/attica-5.95.0
 2206122310 metadata/md5-cache/kde-frameworks/baloo-5.95.0
-2206122310 metadata/md5-cache/kde-frameworks/bluez-qt-5.95.0
 2206122310 metadata/md5-cache/kde-frameworks/breeze-icons-5.95.0
 2206122310 metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.95.0
 2206122310 metadata/md5-cache/kde-frameworks/countryflags-5.95.0
@@ -49742,8 +49363,6 @@
 2206122310 metadata/md5-cache/kde-frameworks/modemmanager-qt-5.95.0
 2206122310 metadata/md5-cache/kde-frameworks/networkmanager-qt-5.95.0
 2206122310 metadata/md5-cache/kde-frameworks/oxygen-icons-5.95.0
-2206130110 metadata/md5-cache/kde-frameworks/plasma-5.94.0
-2206130110 metadata/md5-cache/kde-frameworks/plasma-5.95.0-r2
 2206122310 metadata/md5-cache/kde-frameworks/prison-5.95.0
 2206122310 metadata/md5-cache/kde-frameworks/purpose-5.95.0
 2206122310 metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.95.0
@@ -49752,6 +49371,9 @@
 2206122310 metadata/md5-cache/kde-frameworks/syndication-5.95.0
 2206122310 metadata/md5-cache/kde-frameworks/syntax-highlighting-5.95.0
 2206122310 metadata/md5-cache/kde-frameworks/threadweaver-5.95.0
+2206141610 metadata/md5-cache/kde-frameworks/Manifest.gz
+2206141610 metadata/md5-cache/kde-frameworks/bluez-qt-5.95.0-r1
+2206141610 metadata/md5-cache/kde-frameworks/plasma-5.95.0-r3
 2205170654 metadata/md5-cache/kde-misc/basket-2.49b
 2205170654 metadata/md5-cache/kde-misc/colord-kde-0.5.0-r2
 2205170654 metadata/md5-cache/kde-misc/kdeconnect-21.12.3
@@ -49841,9 +49463,61 @@
 2205282340 metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.24.5
 2206071015 metadata/md5-cache/kde-plasma/breeze-gtk-5.24.5
 2206071015 metadata/md5-cache/kde-plasma/plasma-firewall-5.24.5
-2206101010 metadata/md5-cache/kde-plasma/Manifest.gz
-2206101010 metadata/md5-cache/kde-plasma/kscreen-5.24.5-r2
-2206101010 metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.24.5-r2
+2206141610 metadata/md5-cache/kde-plasma/Manifest.gz
+2206141610 metadata/md5-cache/kde-plasma/bluedevil-5.25.0
+2206141610 metadata/md5-cache/kde-plasma/breeze-5.25.0
+2206141610 metadata/md5-cache/kde-plasma/breeze-grub-5.25.0
+2206141610 metadata/md5-cache/kde-plasma/breeze-gtk-5.25.0
+2206141610 metadata/md5-cache/kde-plasma/breeze-plymouth-5.25.0
+2206141610 metadata/md5-cache/kde-plasma/discover-5.25.0
+2206141610 metadata/md5-cache/kde-plasma/drkonqi-5.25.0
+2206141610 metadata/md5-cache/kde-plasma/kactivitymanagerd-5.25.0
+2206141610 metadata/md5-cache/kde-plasma/kde-cli-tools-5.25.0
+2206141610 metadata/md5-cache/kde-plasma/kde-gtk-config-5.25.0
+2206141610 metadata/md5-cache/kde-plasma/kdecoration-5.25.0
+2206141610 metadata/md5-cache/kde-plasma/kdeplasma-addons-5.25.0
+2206141610 metadata/md5-cache/kde-plasma/kgamma-5.25.0
+2206141610 metadata/md5-cache/kde-plasma/khotkeys-5.25.0
+2206141610 metadata/md5-cache/kde-plasma/kinfocenter-5.25.0
+2206141610 metadata/md5-cache/kde-plasma/kmenuedit-5.25.0
+2206140040 metadata/md5-cache/kde-plasma/kscreen-5.24.5-r2
+2206141610 metadata/md5-cache/kde-plasma/kscreen-5.25.0
+2206141610 metadata/md5-cache/kde-plasma/kscreenlocker-5.25.0
+2206141610 metadata/md5-cache/kde-plasma/ksshaskpass-5.25.0
+2206141610 metadata/md5-cache/kde-plasma/ksystemstats-5.25.0
+2206141610 metadata/md5-cache/kde-plasma/kwallet-pam-5.25.0
+2206141610 metadata/md5-cache/kde-plasma/kwayland-integration-5.25.0
+2206141610 metadata/md5-cache/kde-plasma/kwin-5.25.0
+2206141610 metadata/md5-cache/kde-plasma/kwrited-5.25.0
+2206141610 metadata/md5-cache/kde-plasma/layer-shell-qt-5.25.0
+2206141610 metadata/md5-cache/kde-plasma/libkscreen-5.25.0
+2206141610 metadata/md5-cache/kde-plasma/libksysguard-5.25.0
+2206141610 metadata/md5-cache/kde-plasma/libkworkspace-5.25.0
+2206141610 metadata/md5-cache/kde-plasma/milou-5.25.0
+2206141610 metadata/md5-cache/kde-plasma/oxygen-5.25.0
+2206141610 metadata/md5-cache/kde-plasma/oxygen-sounds-5.25.0
+2206141610 metadata/md5-cache/kde-plasma/plasma-browser-integration-5.25.0
+2206141610 metadata/md5-cache/kde-plasma/plasma-desktop-5.25.0
+2206141610 metadata/md5-cache/kde-plasma/plasma-disks-5.25.0
+2206141610 metadata/md5-cache/kde-plasma/plasma-firewall-5.25.0
+2206141610 metadata/md5-cache/kde-plasma/plasma-integration-5.25.0
+2206141610 metadata/md5-cache/kde-plasma/plasma-meta-5.25.0
+2206141610 metadata/md5-cache/kde-plasma/plasma-nm-5.25.0
+2206141610 metadata/md5-cache/kde-plasma/plasma-pa-5.25.0
+2206141610 metadata/md5-cache/kde-plasma/plasma-sdk-5.25.0
+2206141610 metadata/md5-cache/kde-plasma/plasma-systemmonitor-5.25.0
+2206141610 metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.25.0
+2206141610 metadata/md5-cache/kde-plasma/plasma-vault-5.25.0
+2206141610 metadata/md5-cache/kde-plasma/plasma-workspace-5.25.0
+2206141610 metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.25.0
+2206141610 metadata/md5-cache/kde-plasma/plymouth-kcm-5.25.0
+2206141610 metadata/md5-cache/kde-plasma/polkit-kde-agent-5.25.0
+2206141610 metadata/md5-cache/kde-plasma/powerdevil-5.25.0
+2206141610 metadata/md5-cache/kde-plasma/sddm-kcm-5.25.0
+2206141610 metadata/md5-cache/kde-plasma/systemsettings-5.25.0
+2206140040 metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.24.5-r2
+2206141610 metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.25.0
+2206141610 metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.25.0
 2107230909 metadata/md5-cache/lxde-base/lxappearance-obconf-0.2.3-r1
 2107211809 metadata/md5-cache/lxde-base/lxde-common-0.99.2-r1
 2107211809 metadata/md5-cache/lxde-base/lxde-meta-0.5.5-r7
@@ -49929,12 +49603,6 @@
 2205170654 metadata/md5-cache/mail-client/mailx-8.1.2.20180807
 2205170654 metadata/md5-cache/mail-client/mailx-support-20060102-r2
 2205170654 metadata/md5-cache/mail-client/mutt-2.2.3
-2205170654 metadata/md5-cache/mail-client/neomutt-20211029
-2205170654 metadata/md5-cache/mail-client/neomutt-20211029-r1
-2205170654 metadata/md5-cache/mail-client/neomutt-20220408
-2205170654 metadata/md5-cache/mail-client/neomutt-20220415
-2205170654 metadata/md5-cache/mail-client/neomutt-20220429
-2205170654 metadata/md5-cache/mail-client/neomutt-99999999
 2205170654 metadata/md5-cache/mail-client/novell-groupwise-client-8.0.2.96933-r1
 2205170654 metadata/md5-cache/mail-client/s-nail-14.9.22
 2205170654 metadata/md5-cache/mail-client/s-nail-14.9.24
@@ -49956,9 +49624,16 @@
 2206121142 metadata/md5-cache/mail-client/alot-9999
 2206100610 metadata/md5-cache/mail-client/alpine-2.25-r3
 2206092140 metadata/md5-cache/mail-client/thunderbird-91.10.0
-2206121640 metadata/md5-cache/mail-client/Manifest.gz
 2206121640 metadata/md5-cache/mail-client/sylpheed-3.7.0-r4
 2206121640 metadata/md5-cache/mail-client/sylpheed-3.7.0-r5
+2206161940 metadata/md5-cache/mail-client/Manifest.gz
+2206161940 metadata/md5-cache/mail-client/neomutt-20211029
+2206161940 metadata/md5-cache/mail-client/neomutt-20211029-r1
+2206161940 metadata/md5-cache/mail-client/neomutt-20220408
+2206161940 metadata/md5-cache/mail-client/neomutt-20220415
+2206161940 metadata/md5-cache/mail-client/neomutt-20220429
+2206161940 metadata/md5-cache/mail-client/neomutt-99999999
+2206131710 metadata/md5-cache/mail-client/roundcube-1.6_rc
 2111071239 metadata/md5-cache/mail-filter/dkimproxy-1.4.1
 2105021209 metadata/md5-cache/mail-filter/mailfilter-0.8.4
 2107120039 metadata/md5-cache/mail-filter/mimedefang-2.84-r1
@@ -50262,7 +49937,6 @@
 2205251140 metadata/md5-cache/media-fonts/mikachan-font-ttc-9.1
 2205251140 metadata/md5-cache/media-fonts/mikachan-font-ttf-8.9-r2
 2205251140 metadata/md5-cache/media-fonts/mix-mplus-ipa-20130617-r1
-2205251140 metadata/md5-cache/media-fonts/monafont-2.90-r2
 2205251140 metadata/md5-cache/media-fonts/monoid-0.61
 2205251140 metadata/md5-cache/media-fonts/montecarlo-0-r1
 2205251140 metadata/md5-cache/media-fonts/mplus-fonts-2.2.4-r1
@@ -50340,7 +50014,8 @@
 2206071015 metadata/md5-cache/media-fonts/noto-emoji-20210715
 2206071015 metadata/md5-cache/media-fonts/noto-emoji-20211101
 2206071015 metadata/md5-cache/media-fonts/terminus-font-4.49.1
-2206101110 metadata/md5-cache/media-fonts/Manifest.gz
+2206161940 metadata/md5-cache/media-fonts/Manifest.gz
+2206161940 metadata/md5-cache/media-fonts/monafont-2.90-r2
 2107180709 metadata/md5-cache/media-gfx/album-4.15-r1
 2009111309 metadata/md5-cache/media-gfx/dpic-20200901
 2101181809 metadata/md5-cache/media-gfx/exif-0.6.22
@@ -50429,12 +50104,6 @@
 2205191040 metadata/md5-cache/media-gfx/fbgrab-1.5
 2205170654 metadata/md5-cache/media-gfx/fbida-2.14-r3
 2205170654 metadata/md5-cache/media-gfx/fdm-materials-4.13.0
-2205170654 metadata/md5-cache/media-gfx/feh-3.6
-2205170654 metadata/md5-cache/media-gfx/feh-3.6.1
-2205170654 metadata/md5-cache/media-gfx/feh-3.6.2
-2205170654 metadata/md5-cache/media-gfx/feh-3.6.3
-2205170654 metadata/md5-cache/media-gfx/feh-3.7
-2205170654 metadata/md5-cache/media-gfx/feh-3.7.1
 2205170654 metadata/md5-cache/media-gfx/feh-3.7.2
 2205170654 metadata/md5-cache/media-gfx/figurine-1.0.5-r1
 2205170654 metadata/md5-cache/media-gfx/fim-0.5_rc3
@@ -50462,7 +50131,6 @@
 2205170654 metadata/md5-cache/media-gfx/gozer-0.7-r3
 2205170654 metadata/md5-cache/media-gfx/gphoto2-2.5.28
 2205170654 metadata/md5-cache/media-gfx/graphicsmagick-1.3.37
-2205170654 metadata/md5-cache/media-gfx/graphicsmagick-1.3.38
 2205170654 metadata/md5-cache/media-gfx/graphicsmagick-9999
 2205170654 metadata/md5-cache/media-gfx/gtkimageview-1.6.4
 2205170654 metadata/md5-cache/media-gfx/hp2xx-3.4.4-r1
@@ -50474,7 +50142,6 @@
 2205170654 metadata/md5-cache/media-gfx/imagemagick-9999
 2205170654 metadata/md5-cache/media-gfx/iscan-2.30.4.2-r1
 2205170654 metadata/md5-cache/media-gfx/iscan-plugin-network-nt-1.1.3
-2205170654 metadata/md5-cache/media-gfx/jpeg2ps-1.9-r2
 2205170654 metadata/md5-cache/media-gfx/jpeginfo-1.6.1-r1
 2205170654 metadata/md5-cache/media-gfx/jpegtoavi-1.5
 2205170654 metadata/md5-cache/media-gfx/kcoloredit-2.0.0_p20171121-r1
@@ -50525,8 +50192,6 @@
 2205170654 metadata/md5-cache/media-gfx/pngtools-0.4-r2
 2205170654 metadata/md5-cache/media-gfx/potrace-1.15
 2205171610 metadata/md5-cache/media-gfx/potrace-1.16
-2205170654 metadata/md5-cache/media-gfx/povray-3.7.0.0-r1
-2205170654 metadata/md5-cache/media-gfx/povray-3.7.0.0-r2
 2205170654 metadata/md5-cache/media-gfx/pqiv-2.11
 2205170654 metadata/md5-cache/media-gfx/pqiv-9999
 2205170654 metadata/md5-cache/media-gfx/prusaslicer-2.4.0-r2
@@ -50556,7 +50221,6 @@
 2205170654 metadata/md5-cache/media-gfx/transfig-3.2.5e-r1
 2205170654 metadata/md5-cache/media-gfx/ttygif-1.80_p20181218
 2205170654 metadata/md5-cache/media-gfx/tuxpaint-0.9.24-r1
-2205170654 metadata/md5-cache/media-gfx/tuxpaint-0.9.27
 2205170654 metadata/md5-cache/media-gfx/valentina-0.6.1-r1
 2205170654 metadata/md5-cache/media-gfx/valentina-9999
 2205170654 metadata/md5-cache/media-gfx/viewer-0.8.0-r1
@@ -50584,18 +50248,6 @@
 2206080340 metadata/md5-cache/media-gfx/argyllcms-2.2.0
 2206080340 metadata/md5-cache/media-gfx/argyllcms-2.2.1
 2206080340 metadata/md5-cache/media-gfx/argyllcms-2.3.0
-2206071015 metadata/md5-cache/media-gfx/blender-2.93.0-r1
-2206071015 metadata/md5-cache/media-gfx/blender-2.93.6
-2206071015 metadata/md5-cache/media-gfx/blender-2.93.8-r4
-2206071015 metadata/md5-cache/media-gfx/blender-2.93.8-r5
-2206071340 metadata/md5-cache/media-gfx/blender-2.93.9
-2206071015 metadata/md5-cache/media-gfx/blender-3.0.0-r1
-2206071015 metadata/md5-cache/media-gfx/blender-3.0.1-r4
-2206071015 metadata/md5-cache/media-gfx/blender-3.0.1-r5
-2206071015 metadata/md5-cache/media-gfx/blender-3.1.0
-2206071015 metadata/md5-cache/media-gfx/blender-3.1.1
-2206071015 metadata/md5-cache/media-gfx/blender-3.1.2
-2206071015 metadata/md5-cache/media-gfx/blender-9999
 2206061910 metadata/md5-cache/media-gfx/chafa-1.10.3
 2206071015 metadata/md5-cache/media-gfx/cura-4.13.1-r1
 2206071015 metadata/md5-cache/media-gfx/entangle-3.0
@@ -50641,8 +50293,6 @@
 2206071015 metadata/md5-cache/media-gfx/inkscape-9999
 2206080340 metadata/md5-cache/media-gfx/iscan-3.65.0
 2206080340 metadata/md5-cache/media-gfx/iscan-data-1.39.0.1
-2206071015 metadata/md5-cache/media-gfx/krita-5.0.2
-2206071015 metadata/md5-cache/media-gfx/krita-5.0.8
 2206071015 metadata/md5-cache/media-gfx/libredwg-0.12.4
 2206071015 metadata/md5-cache/media-gfx/libredwg-0.12.5-r1
 2206071015 metadata/md5-cache/media-gfx/openvdb-7.0.0-r4
@@ -50664,9 +50314,6 @@
 2206071015 metadata/md5-cache/media-gfx/yafaray-3.4.1
 2206071015 metadata/md5-cache/media-gfx/yafaray-3.5.1-r1
 2206071015 metadata/md5-cache/media-gfx/zbar-0.23.90
-2206121142 metadata/md5-cache/media-gfx/Manifest.gz
-2206121142 metadata/md5-cache/media-gfx/asymptote-2.70-r1
-2206121142 metadata/md5-cache/media-gfx/asymptote-2.77
 2206121142 metadata/md5-cache/media-gfx/asymptote-2.78
 2206121142 metadata/md5-cache/media-gfx/asymptote-2.80
 2206121142 metadata/md5-cache/media-gfx/cairosvg-2.5.2
@@ -50693,6 +50340,28 @@
 2206121142 metadata/md5-cache/media-gfx/word_cloud-1.8.1
 2206121142 metadata/md5-cache/media-gfx/xdot-1.2
 2206121142 metadata/md5-cache/media-gfx/xdot-9999
+2206161940 metadata/md5-cache/media-gfx/Manifest.gz
+2206161940 metadata/md5-cache/media-gfx/blender-2.93.0-r1
+2206161940 metadata/md5-cache/media-gfx/blender-2.93.6
+2206161940 metadata/md5-cache/media-gfx/blender-2.93.8-r4
+2206161940 metadata/md5-cache/media-gfx/blender-2.93.8-r5
+2206161940 metadata/md5-cache/media-gfx/blender-2.93.9
+2206161940 metadata/md5-cache/media-gfx/blender-3.0.0-r1
+2206161940 metadata/md5-cache/media-gfx/blender-3.0.1-r4
+2206161940 metadata/md5-cache/media-gfx/blender-3.0.1-r5
+2206161940 metadata/md5-cache/media-gfx/blender-3.1.0
+2206161940 metadata/md5-cache/media-gfx/blender-3.1.1
+2206161940 metadata/md5-cache/media-gfx/blender-3.1.2
+2206160410 metadata/md5-cache/media-gfx/blender-3.2.0
+2206161940 metadata/md5-cache/media-gfx/blender-9999
+2206161510 metadata/md5-cache/media-gfx/feh-3.9-r1
+2206160010 metadata/md5-cache/media-gfx/gimp-2.10.32
+2206151740 metadata/md5-cache/media-gfx/graphicsmagick-1.3.38
+2206151210 metadata/md5-cache/media-gfx/jpeg2ps-1.9-r3
+2206150040 metadata/md5-cache/media-gfx/krita-5.0.8
+2206161940 metadata/md5-cache/media-gfx/povray-3.7.0.0-r1
+2206161940 metadata/md5-cache/media-gfx/povray-3.7.0.0-r2
+2206161940 metadata/md5-cache/media-gfx/tuxpaint-0.9.27
 2109230439 metadata/md5-cache/media-libs/alsa-topology-conf-1.2.4
 1802221208 metadata/md5-cache/media-libs/blib-1.1.7-r2
 2012270139 metadata/md5-cache/media-libs/cimg-2.9.3
@@ -50923,7 +50592,6 @@
 2205170654 metadata/md5-cache/media-libs/libirman-0.4.5
 2205170654 metadata/md5-cache/media-libs/libjpeg-turbo-2.1.1-r2
 2205170654 metadata/md5-cache/media-libs/libjsw-1.5.8
-2205170654 metadata/md5-cache/media-libs/libjxl-0.7.0_pre20220329
 2205170654 metadata/md5-cache/media-libs/libjxl-0.7.0_pre20220511
 2205170654 metadata/md5-cache/media-libs/libjxl-9999
 2205170654 metadata/md5-cache/media-libs/libkate-0.4.1-r4
@@ -51071,8 +50739,6 @@
 2205170654 metadata/md5-cache/media-libs/sdl-ttf-2.0.11-r1
 2205170654 metadata/md5-cache/media-libs/sdl2-gfx-1.0.4
 2205191540 metadata/md5-cache/media-libs/sdl2-image-2.0.5_p20210328
-2205170654 metadata/md5-cache/media-libs/sdl2-mixer-2.0.4
-2205170654 metadata/md5-cache/media-libs/sdl2-mixer-2.0.4-r1
 2205170654 metadata/md5-cache/media-libs/sdl2-net-2.0.1
 2205170654 metadata/md5-cache/media-libs/sdl2-ttf-2.0.15
 2205170654 metadata/md5-cache/media-libs/sdl2-ttf-2.0.18-r1
@@ -51110,7 +50776,6 @@
 2205170654 metadata/md5-cache/media-libs/vo-amrwbenc-9999
 2205170654 metadata/md5-cache/media-libs/vulkan-loader-9999
 2205170654 metadata/md5-cache/media-libs/webrtc-audio-processing-0.3.1
-2205171640 metadata/md5-cache/media-libs/woff2-1.0.2-r5
 2205170654 metadata/md5-cache/media-libs/wxsvg-1.5.11-r1
 2205170654 metadata/md5-cache/media-libs/wxsvg-1.5.23
 2205170654 metadata/md5-cache/media-libs/x264-0.0.20190903-r1
@@ -51134,8 +50799,6 @@
 2205170654 metadata/md5-cache/media-libs/zita-resampler-1.8.0
 2205170654 metadata/md5-cache/media-libs/zmusic-1.1.4
 2205170654 metadata/md5-cache/media-libs/zvbi-0.2.35-r2
-2205170654 metadata/md5-cache/media-libs/zxing-cpp-1.2.0
-2205170654 metadata/md5-cache/media-libs/zxing-cpp-1.3.0
 2205220940 metadata/md5-cache/media-libs/libaacs-0.11.1-r1
 2205220940 metadata/md5-cache/media-libs/libbdplus-0.2.0
 2205221110 metadata/md5-cache/media-libs/libxmp-4.5.0
@@ -51174,10 +50837,6 @@
 2206071015 metadata/md5-cache/media-libs/dav1d-0.9.2
 2206071015 metadata/md5-cache/media-libs/dav1d-1.0.0
 2206071015 metadata/md5-cache/media-libs/dav1d-9999
-2206071015 metadata/md5-cache/media-libs/fcft-3.0.0
-2206071015 metadata/md5-cache/media-libs/fcft-3.0.1
-2206071015 metadata/md5-cache/media-libs/fcft-3.1.1
-2206071015 metadata/md5-cache/media-libs/fcft-3.1.2
 2206071015 metadata/md5-cache/media-libs/ganv-1.8.0-r1
 2206071015 metadata/md5-cache/media-libs/gegl-0.4.34
 2206071015 metadata/md5-cache/media-libs/gegl-0.4.36-r1
@@ -51234,7 +50893,6 @@
 2206071015 metadata/md5-cache/media-libs/libplacebo-9999
 2206071015 metadata/md5-cache/media-libs/libsndfile-1.1.0-r1
 2206071015 metadata/md5-cache/media-libs/libsndfile-9999
-2206071015 metadata/md5-cache/media-libs/libvmaf-2.3.0-r2
 2206071015 metadata/md5-cache/media-libs/lilv-0.24.12
 2206071015 metadata/md5-cache/media-libs/lilv-0.24.14
 2206071015 metadata/md5-cache/media-libs/lv2-1.18.2
@@ -51243,7 +50901,6 @@
 2206071015 metadata/md5-cache/media-libs/mesa-21.3.8
 2206071015 metadata/md5-cache/media-libs/mesa-22.0.3
 2206071015 metadata/md5-cache/media-libs/mesa-22.0.4
-2206071015 metadata/md5-cache/media-libs/mesa-22.0.5
 2206071015 metadata/md5-cache/media-libs/mesa-22.1.0
 2206071015 metadata/md5-cache/media-libs/mesa-22.1.1
 2206071015 metadata/md5-cache/media-libs/mesa-9999
@@ -51289,10 +50946,8 @@
 2206121142 metadata/md5-cache/media-libs/gexiv2-0.14.0
 2206121142 metadata/md5-cache/media-libs/gstreamer-editing-services-1.16.3
 2206121142 metadata/md5-cache/media-libs/gstreamer-editing-services-1.20.2
-2206100640 metadata/md5-cache/media-libs/harfbuzz-4.2.1
 2206101010 metadata/md5-cache/media-libs/libopenshot-0.2.7
 2206101010 metadata/md5-cache/media-libs/libopenshot-audio-0.2.2
-2206121142 metadata/md5-cache/media-libs/libpulse-16.0
 2206110110 metadata/md5-cache/media-libs/libsfml-2.5.1
 2206121142 metadata/md5-cache/media-libs/libsixel-1.10.3
 2206121142 metadata/md5-cache/media-libs/libsixel-1.8.6
@@ -51306,9 +50961,19 @@
 2206121142 metadata/md5-cache/media-libs/vigra-1.11.1-r4
 2206121142 metadata/md5-cache/media-libs/vigra-1.11.1-r6
 2206121142 metadata/md5-cache/media-libs/vigra-9999
-2206122310 metadata/md5-cache/media-libs/Manifest.gz
 2206122240 metadata/md5-cache/media-libs/mesa-amber-21.3.9
 2206122310 metadata/md5-cache/media-libs/vulkan-layers-9999
+2206161940 metadata/md5-cache/media-libs/Manifest.gz
+2206141040 metadata/md5-cache/media-libs/fcft-3.1.2-r1
+2206142110 metadata/md5-cache/media-libs/harfbuzz-4.2.1
+2206151740 metadata/md5-cache/media-libs/libjxl-0.7.0_pre20220329
+2206160110 metadata/md5-cache/media-libs/libpulse-16.0
+2206161940 metadata/md5-cache/media-libs/libvmaf-2.3.0-r2
+2206161840 metadata/md5-cache/media-libs/mesa-22.0.5
+2206161940 metadata/md5-cache/media-libs/sdl2-mixer-2.0.4
+2206161940 metadata/md5-cache/media-libs/sdl2-mixer-2.0.4-r1
+2206161940 metadata/md5-cache/media-libs/woff2-1.0.2-r5
+2206151110 metadata/md5-cache/media-libs/zxing-cpp-1.3.0
 2109230909 metadata/md5-cache/media-plugins/audacious-plugins-4.0.5
 2011090239 metadata/md5-cache/media-plugins/gimp-lqr-0.7.2-r1
 2006152009 metadata/md5-cache/media-plugins/gmpc-alarm-11.8.16
@@ -52060,8 +51725,6 @@
 2205170654 metadata/md5-cache/media-sound/pianobar-9999
 2205170654 metadata/md5-cache/media-sound/picoxine-0.0.7
 2205170654 metadata/md5-cache/media-sound/pitchtune-0.0.4
-2205170654 metadata/md5-cache/media-sound/pms-0.42_p20170508-r1
-2205170654 metadata/md5-cache/media-sound/pms-9999
 2205170654 metadata/md5-cache/media-sound/pnmixer-0.7.2-r1
 2205170654 metadata/md5-cache/media-sound/poc-0.4.1
 2205170654 metadata/md5-cache/media-sound/ptabtools-0.5.0
@@ -52211,8 +51874,6 @@
 2206071015 metadata/md5-cache/media-sound/lilypond-2.23.2-r1
 2206071015 metadata/md5-cache/media-sound/lilypond-9999
 2206071015 metadata/md5-cache/media-sound/lollypop-1.4.29
-2206080340 metadata/md5-cache/media-sound/mixxx-2.3.2
-2206080340 metadata/md5-cache/media-sound/mixxx-2.3.9999
 2206080340 metadata/md5-cache/media-sound/mixxx-9999
 2206071015 metadata/md5-cache/media-sound/mpc-0.33
 2206071015 metadata/md5-cache/media-sound/mpc-0.34
@@ -52264,7 +51925,6 @@
 2206121142 metadata/md5-cache/media-sound/pithos-1.5.1-r1
 2206121142 metadata/md5-cache/media-sound/puddletag-2.1.1
 2206121142 metadata/md5-cache/media-sound/pulseaudio-16.0
-2206121142 metadata/md5-cache/media-sound/pulseaudio-daemon-16.0-r1
 2206121142 metadata/md5-cache/media-sound/pulsemixer-1.5.1
 2206121142 metadata/md5-cache/media-sound/pulsemixer-9999
 2206121142 metadata/md5-cache/media-sound/quodlibet-4.5.0
@@ -52274,7 +51934,14 @@
 2206110910 metadata/md5-cache/media-sound/strawberry-1.0.5
 2206121142 metadata/md5-cache/media-sound/whipper-0.10.0
 2206121142 metadata/md5-cache/media-sound/whipper-0.9.0
-2206130710 metadata/md5-cache/media-sound/Manifest.gz
+2206161940 metadata/md5-cache/media-sound/Manifest.gz
+2206160710 metadata/md5-cache/media-sound/abcmidi-2022.06.14
+2206161940 metadata/md5-cache/media-sound/klick-0.12.2-r3
+2206161940 metadata/md5-cache/media-sound/mixxx-2.3.2
+2206161940 metadata/md5-cache/media-sound/mixxx-2.3.9999
+2206132010 metadata/md5-cache/media-sound/pms-0.42_p20170508-r1
+2206160110 metadata/md5-cache/media-sound/pulseaudio-daemon-16.0-r1
+2206160240 metadata/md5-cache/media-sound/pulseaudio-daemon-16.0-r4
 2101060224 metadata/md5-cache/media-tv/dtv-scan-tables-0_p20171003
 2101060224 metadata/md5-cache/media-tv/dtv-scan-tables-0_p20190922
 2110160409 metadata/md5-cache/media-tv/dtv-scan-tables-0_p20210430
@@ -52302,18 +51969,19 @@
 2206071015 metadata/md5-cache/media-tv/kodi-19.1-r2
 2206071015 metadata/md5-cache/media-tv/kodi-19.2-r1
 2206071015 metadata/md5-cache/media-tv/kodi-19.3-r1
-2206071015 metadata/md5-cache/media-tv/kodi-19.9999
-2206071015 metadata/md5-cache/media-tv/kodi-9999
 2206071015 metadata/md5-cache/media-tv/mythtv-31.0-r7
 2206071015 metadata/md5-cache/media-tv/mythtv-31.0_p20210731-r2
 2206071015 metadata/md5-cache/media-tv/mythtv-32.0-r2
 2206071015 metadata/md5-cache/media-tv/tvheadend-4.2.8-r2
 2206071015 metadata/md5-cache/media-tv/tvheadend-9999
 2206080340 metadata/md5-cache/media-tv/v4l-utils-1.22.1
-2206121142 metadata/md5-cache/media-tv/Manifest.gz
 2206091040 metadata/md5-cache/media-tv/kodi-19.4
 2206121142 metadata/md5-cache/media-tv/tvnamer-3.0.2
 2206112210 metadata/md5-cache/media-tv/v4l-dvb-saa716x-0.0.1_p20170225-r5
+2206162010 metadata/md5-cache/media-tv/Manifest.gz
+2206141710 metadata/md5-cache/media-tv/kodi-19.4-r1
+2206141710 metadata/md5-cache/media-tv/kodi-19.9999
+2206162010 metadata/md5-cache/media-tv/kodi-9999
 2107272139 metadata/md5-cache/media-video/binkplayer-1.99w
 1810060109 metadata/md5-cache/media-video/blinkensim-2.7-r1
 1904012039 metadata/md5-cache/media-video/blinkenthemes-0.10-r1
@@ -52344,7 +52012,6 @@
 2006291709 metadata/md5-cache/media-video/vdrtools-genindex-0.1.3-r2
 2107180709 metadata/md5-cache/media-video/xvid4conf-1.12
 2111292209 metadata/md5-cache/media-video/videotrans-1.6.1-r2
-2112260340 metadata/md5-cache/media-video/jellyfin-web-jmp-bin-10.7.6
 2203240726 metadata/md5-cache/media-video/h264enc-10.4.7-r1
 2203240726 metadata/md5-cache/media-video/parole-4.16.0
 2204212209 metadata/md5-cache/media-video/movit-1.6.3-r1
@@ -52361,7 +52028,6 @@
 2205170654 metadata/md5-cache/media-video/atomicparsley-0.9.6_p20210715_p151551
 2205170654 metadata/md5-cache/media-video/avidemux-2.7.8
 2205170654 metadata/md5-cache/media-video/baka-mplayer-2.0.4
-2205170654 metadata/md5-cache/media-video/baka-mplayer-2.0.4-r1
 2205170654 metadata/md5-cache/media-video/baka-mplayer-9999
 2205170654 metadata/md5-cache/media-video/bashnapi-2.0.0
 2205170654 metadata/md5-cache/media-video/bbtools-1.9
@@ -52475,9 +52141,6 @@
 2205170654 metadata/md5-cache/media-video/ushare-1.1a_p20210221
 2205170654 metadata/md5-cache/media-video/vamps-0.99.2-r2
 2205170654 metadata/md5-cache/media-video/vcdimager-2.0.1
-2205170654 metadata/md5-cache/media-video/vdr-2.2.0-r6
-2205170654 metadata/md5-cache/media-video/vdr-2.2.0-r7
-2205170654 metadata/md5-cache/media-video/vdr-2.4.7-r1
 2205170654 metadata/md5-cache/media-video/vdr2jpeg-0.2.0-r5
 2205180240 metadata/md5-cache/media-video/vlc-3.0.16-r8
 2205170654 metadata/md5-cache/media-video/vobcopy-1.2.0
@@ -52510,7 +52173,6 @@
 2206071015 metadata/md5-cache/media-video/handbrake-1.5.1
 2206071015 metadata/md5-cache/media-video/handbrake-9999
 2206080340 metadata/md5-cache/media-video/isight-firmware-tools-1.6-r2
-2206071015 metadata/md5-cache/media-video/jellyfin-media-player-1.6.1
 2206080340 metadata/md5-cache/media-video/kino-1.3.4-r2
 2206071015 metadata/md5-cache/media-video/libva-utils-2.14.0
 2206071015 metadata/md5-cache/media-video/libva-utils-9999
@@ -52520,20 +52182,12 @@
 2206071015 metadata/md5-cache/media-video/peek-1.5.1
 2206080340 metadata/md5-cache/media-video/pipewire-0.3.30-r2
 2206080340 metadata/md5-cache/media-video/pipewire-0.3.36
-2206080340 metadata/md5-cache/media-video/pipewire-0.3.49-r1
-2206080340 metadata/md5-cache/media-video/pipewire-0.3.50-r3
-2206080340 metadata/md5-cache/media-video/pipewire-0.3.51-r1
 2206071015 metadata/md5-cache/media-video/pitivi-0.999-r5
 2206071015 metadata/md5-cache/media-video/pitivi-2021.05-r1
 2206071015 metadata/md5-cache/media-video/rage-0.4.0-r1
 2206070240 metadata/md5-cache/media-video/simplescreenrecorder-0.4.4
 2206071015 metadata/md5-cache/media-video/totem-42.0-r1
-2206071015 metadata/md5-cache/media-video/wireplumber-0.4.10-r1
-2206071015 metadata/md5-cache/media-video/wireplumber-0.4.10-r3
-2206071015 metadata/md5-cache/media-video/wireplumber-0.4.9
-2206071015 metadata/md5-cache/media-video/wireplumber-0.4.9-r1
 2206071015 metadata/md5-cache/media-video/wireplumber-9999
-2206121142 metadata/md5-cache/media-video/Manifest.gz
 2206121142 metadata/md5-cache/media-video/devedeng-4.16.0-r2
 2206121142 metadata/md5-cache/media-video/devedeng-4.17.0
 2206112210 metadata/md5-cache/media-video/droidcam-1.8.2
@@ -52545,8 +52199,6 @@
 2206121142 metadata/md5-cache/media-video/mpv-0.34.1-r1
 2206121142 metadata/md5-cache/media-video/mpv-9999
 2206121142 metadata/md5-cache/media-video/openshot-2.6.1
-2206100410 metadata/md5-cache/media-video/pipewire-0.3.52
-2206100410 metadata/md5-cache/media-video/pipewire-9999
 2206121142 metadata/md5-cache/media-video/streamdeck-ui-0.0_p20200102-r1
 2206121142 metadata/md5-cache/media-video/streamdeck-ui-9999
 2206121142 metadata/md5-cache/media-video/subliminal-2.1.0-r1
@@ -52561,6 +52213,21 @@
 2206121142 metadata/md5-cache/media-video/vidify-audiosync-0.3.0-r1
 2206121142 metadata/md5-cache/media-video/yle-dl-20220531
 2206121142 metadata/md5-cache/media-video/yle-dl-20220610
+2206161940 metadata/md5-cache/media-video/Manifest.gz
+2206141140 metadata/md5-cache/media-video/baka-mplayer-2.0.4-r1
+2206131810 metadata/md5-cache/media-video/jellyfin-media-player-1.7.0
+2206131810 metadata/md5-cache/media-video/jellyfin-web-jmp-bin-10.8.0
+2206160110 metadata/md5-cache/media-video/pipewire-0.3.49-r2
+2206160940 metadata/md5-cache/media-video/pipewire-0.3.51-r2
+2206160110 metadata/md5-cache/media-video/pipewire-0.3.52-r1
+2206160140 metadata/md5-cache/media-video/pipewire-9999
+2206161940 metadata/md5-cache/media-video/vdr-2.2.0-r6
+2206161940 metadata/md5-cache/media-video/vdr-2.2.0-r7
+2206161940 metadata/md5-cache/media-video/vdr-2.4.7-r1
+2206161940 metadata/md5-cache/media-video/wireplumber-0.4.10-r1
+2206160940 metadata/md5-cache/media-video/wireplumber-0.4.10-r3
+2206161940 metadata/md5-cache/media-video/wireplumber-0.4.9
+2206161940 metadata/md5-cache/media-video/wireplumber-0.4.9-r1
 2110212239 metadata/md5-cache/net-analyzer/arptools-1.0.2-r1
 1906051110 metadata/md5-cache/net-analyzer/authforce-0.9.9-r2
 2101201239 metadata/md5-cache/net-analyzer/authforce-0.9.9-r3
@@ -52719,7 +52386,6 @@
 2205170654 metadata/md5-cache/net-analyzer/hydra-9.2-r1
 2205170654 metadata/md5-cache/net-analyzer/hydra-9.3-r1
 2205170654 metadata/md5-cache/net-analyzer/hydra-9999999
-2205170654 metadata/md5-cache/net-analyzer/icinga2-2.13.2-r3
 2205172040 metadata/md5-cache/net-analyzer/icinga2-2.13.3
 2205170654 metadata/md5-cache/net-analyzer/icinga2-9999
 2205170654 metadata/md5-cache/net-analyzer/ifstat-1.1-r2
@@ -52732,7 +52398,6 @@
 2205170654 metadata/md5-cache/net-analyzer/ipband-0.8.1-r2
 2205170654 metadata/md5-cache/net-analyzer/ipcad-3.7.3
 2205170654 metadata/md5-cache/net-analyzer/ipgen-9999
-2205170654 metadata/md5-cache/net-analyzer/ipguard-1.04-r1
 2205170654 metadata/md5-cache/net-analyzer/iplog-2.2.3-r3
 2205170654 metadata/md5-cache/net-analyzer/ippl-1.4.14-r6
 2205170654 metadata/md5-cache/net-analyzer/iptraf-ng-1.2.1
@@ -52892,7 +52557,6 @@
 2205170654 metadata/md5-cache/net-analyzer/vnstat-9999
 2205170654 metadata/md5-cache/net-analyzer/webfuzzer-0.2.0-r2
 2205170654 metadata/md5-cache/net-analyzer/xnetload-1.11.3-r1
-2205170654 metadata/md5-cache/net-analyzer/xprobe-0.3-r1
 2205170654 metadata/md5-cache/net-analyzer/yersinia-0.8.2
 2205170654 metadata/md5-cache/net-analyzer/yersinia-9999
 2205170654 metadata/md5-cache/net-analyzer/zmap-2.1.1-r4
@@ -52930,7 +52594,6 @@
 2206071015 metadata/md5-cache/net-analyzer/wireshark-3.6.5
 2206071015 metadata/md5-cache/net-analyzer/wireshark-9999
 2206121142 metadata/md5-cache/net-analyzer/2ping-4.5.1
-2206121142 metadata/md5-cache/net-analyzer/Manifest.gz
 2206121142 metadata/md5-cache/net-analyzer/carl-0.9-r5
 2206121142 metadata/md5-cache/net-analyzer/fail2ban-0.11.2-r4
 2206121142 metadata/md5-cache/net-analyzer/fail2ban-9999
@@ -52977,6 +52640,10 @@
 2206101240 metadata/md5-cache/net-analyzer/zabbix-5.0.24
 2206101240 metadata/md5-cache/net-analyzer/zabbix-6.0.3
 2206101240 metadata/md5-cache/net-analyzer/zabbix-6.0.5
+2206162110 metadata/md5-cache/net-analyzer/Manifest.gz
+2206161940 metadata/md5-cache/net-analyzer/ipguard-1.04-r1
+2206162110 metadata/md5-cache/net-analyzer/wireshark-3.6.6
+2206160110 metadata/md5-cache/net-analyzer/xprobe-0.3-r1
 1704281609 metadata/md5-cache/net-dialup/dial-1.2-r2
 2104161439 metadata/md5-cache/net-dialup/sercd-3.0.0-r2
 2111292209 metadata/md5-cache/net-dialup/pppconfig-2.3.21
@@ -53016,11 +52683,11 @@
 2206071015 metadata/md5-cache/net-dialup/freeradius-3.0.21-r5
 2206071015 metadata/md5-cache/net-dialup/freeradius-3.0.22-r4
 2206071015 metadata/md5-cache/net-dialup/freeradius-3.0.25-r2
-2206121142 metadata/md5-cache/net-dialup/Manifest.gz
 2206112210 metadata/md5-cache/net-dialup/accel-ppp-1.12.0_p20210430
 2206112210 metadata/md5-cache/net-dialup/accel-ppp-9999
 2206110810 metadata/md5-cache/net-dialup/freeradius-3.2.0
-2206121142 metadata/md5-cache/net-dialup/ppp-2.4.9-r8
+2206140010 metadata/md5-cache/net-dialup/Manifest.gz
+2206140010 metadata/md5-cache/net-dialup/ppp-2.4.9-r8
 1910111739 metadata/md5-cache/net-dns/dnscap-1.10.3
 2101061809 metadata/md5-cache/net-dns/dnswalk-2.0.2
 2105311239 metadata/md5-cache/net-dns/idnkit-2.3
@@ -53102,7 +52769,6 @@
 2206071015 metadata/md5-cache/net-dns/unbound-1.13.2-r1
 2206071015 metadata/md5-cache/net-dns/unbound-1.14.0-r1
 2206071015 metadata/md5-cache/net-dns/unbound-1.15.0
-2206121142 metadata/md5-cache/net-dns/Manifest.gz
 2206121142 metadata/md5-cache/net-dns/bind-9.16.27-r1
 2206121142 metadata/md5-cache/net-dns/bind-9.16.29
 2206121142 metadata/md5-cache/net-dns/bind-9.16.29-r1
@@ -53110,6 +52776,9 @@
 2206121142 metadata/md5-cache/net-dns/dnsviz-0.9.2
 2206121142 metadata/md5-cache/net-dns/dnsviz-0.9.3
 2206121142 metadata/md5-cache/net-dns/dnsviz-0.9.4
+2206162110 metadata/md5-cache/net-dns/Manifest.gz
+2206162110 metadata/md5-cache/net-dns/bind-9.16.30
+2206162110 metadata/md5-cache/net-dns/bind-tools-9.16.30
 1902190039 metadata/md5-cache/net-firewall/ipkungfu-0.6.1-r1
 2001260341 metadata/md5-cache/net-firewall/lutelwall-0.99-r1
 2205170654 metadata/md5-cache/net-firewall/arno-iptables-firewall-2.1.1
@@ -53189,8 +52858,8 @@
 2206121142 metadata/md5-cache/net-fs/btfs-2.24
 2206112210 metadata/md5-cache/net-fs/openafs-1.8.7
 2206112210 metadata/md5-cache/net-fs/openafs-1.8.8.1-r1
-2206131040 metadata/md5-cache/net-fs/Manifest.gz
-2206131040 metadata/md5-cache/net-fs/libnfs-5.0.1
+2206131940 metadata/md5-cache/net-fs/Manifest.gz
+2206131940 metadata/md5-cache/net-fs/libnfs-5.0.1
 2201032209 metadata/md5-cache/net-ftp/uftpd-2.15
 2203240726 metadata/md5-cache/net-ftp/pureadmin-0.4-r3
 2204111309 metadata/md5-cache/net-ftp/cmdftp-0.9.8
@@ -53204,8 +52873,6 @@
 2205170654 metadata/md5-cache/net-ftp/gftp-2.0.19-r3
 2205170654 metadata/md5-cache/net-ftp/gftp-2.9.1b
 2205170654 metadata/md5-cache/net-ftp/gproftpd-8.3.2-r3
-2205170654 metadata/md5-cache/net-ftp/lftp-4.9.2
-2205170654 metadata/md5-cache/net-ftp/lftp-9999
 2205170654 metadata/md5-cache/net-ftp/linksys-tftp-1.2.1-r3
 2205170654 metadata/md5-cache/net-ftp/ncftp-3.2.6-r4
 2205170654 metadata/md5-cache/net-ftp/proftpd-1.3.7a-r3
@@ -53218,8 +52885,11 @@
 2205170654 metadata/md5-cache/net-ftp/vsftpd-3.0.5-r1
 2205170654 metadata/md5-cache/net-ftp/yafc-1.3.7-r1
 2205272040 metadata/md5-cache/net-ftp/pure-ftpd-1.0.50-r3
-2206021910 metadata/md5-cache/net-ftp/Manifest.gz
 2206021910 metadata/md5-cache/net-ftp/filezilla-3.60.1
+2206161940 metadata/md5-cache/net-ftp/Manifest.gz
+2206161940 metadata/md5-cache/net-ftp/lftp-4.9.2
+2206161940 metadata/md5-cache/net-ftp/lftp-9999
+2206142310 metadata/md5-cache/net-ftp/pure-ftpd-1.0.51
 2102160539 metadata/md5-cache/net-im/centerim-5.0.1-r1
 2104192239 metadata/md5-cache/net-im/cpop-0.0.4-r1
 2011142339 metadata/md5-cache/net-im/librvp-0.9.7
@@ -53303,7 +52973,6 @@
 2206071015 metadata/md5-cache/net-im/telegram-desktop-3.6.1-r1
 2206071015 metadata/md5-cache/net-im/telepathy-logger-0.8.2-r1
 2206071015 metadata/md5-cache/net-im/telepathy-mission-control-5.16.6
-2206071015 metadata/md5-cache/net-im/toxic-0.10.1-r1
 2206071015 metadata/md5-cache/net-im/toxic-0.11.1
 2206071015 metadata/md5-cache/net-im/toxic-0.11.3
 2206082140 metadata/md5-cache/net-im/discord-bin-0.0.18
@@ -53323,13 +52992,12 @@
 2206101310 metadata/md5-cache/net-im/rocketchat-desktop-bin-3.8.7
 2206121142 metadata/md5-cache/net-im/transwhat-0.2.2_p20190426-r3
 2206121142 metadata/md5-cache/net-im/yowsup-3.3.0
-2206131210 metadata/md5-cache/net-im/Manifest.gz
 2206131210 metadata/md5-cache/net-im/wazzapp-bin-0.4.2-r1
+2206161940 metadata/md5-cache/net-im/Manifest.gz
 2106302209 metadata/md5-cache/net-irc/bnc-2.9.4-r2
 2002230040 metadata/md5-cache/net-irc/ircmap-0.99-r1
 2106302209 metadata/md5-cache/net-irc/muh-2.2a-r2
 2104161439 metadata/md5-cache/net-irc/onis-0.8.2-r1
-2008302209 metadata/md5-cache/net-irc/znc-clientbuffer-1.0.48
 2008302209 metadata/md5-cache/net-irc/znc-igloo-push-20200520
 2008302209 metadata/md5-cache/net-irc/znc-playback-20200510
 2202012143 metadata/md5-cache/net-irc/limnoria-plugins-chantracker-1.6_p20211103
@@ -53396,7 +53064,6 @@
 2206071015 metadata/md5-cache/net-irc/znc-1.8.2-r1
 2206071015 metadata/md5-cache/net-irc/znc-9999
 2206071015 metadata/md5-cache/net-irc/znc-palaver-1.2.1-r1
-2206121410 metadata/md5-cache/net-irc/Manifest.gz
 2206121410 metadata/md5-cache/net-irc/irssi-1.4.1
 2206120840 metadata/md5-cache/net-irc/irssi-9999
 2206121410 metadata/md5-cache/net-irc/irssi-xmpp-0.54-r1
@@ -53407,6 +53074,9 @@
 2206121142 metadata/md5-cache/net-irc/limnoria-99999999
 2206121142 metadata/md5-cache/net-irc/quasselgrep-0_p20200830
 2206120410 metadata/md5-cache/net-irc/znc-clientbuffer-1.0.48-r1
+2206161940 metadata/md5-cache/net-irc/Manifest.gz
+2206160210 metadata/md5-cache/net-irc/ngircd-26.1-r5
+2206161940 metadata/md5-cache/net-irc/znc-clientbuffer-1.0.48
 2103061309 metadata/md5-cache/net-libs/courier-unicode-2.1.2
 2010101039 metadata/md5-cache/net-libs/enet-1.2.2-r1
 2109121739 metadata/md5-cache/net-libs/enet-1.3.17
@@ -53473,7 +53143,6 @@
 2205170654 metadata/md5-cache/net-libs/kdsoap-ws-discovery-client-0.2_pre20200927
 2205170654 metadata/md5-cache/net-libs/kimap2-0.3.0
 2205170654 metadata/md5-cache/net-libs/libad9361-iio-0.2
-2205170654 metadata/md5-cache/net-libs/libad9361-iio-9999
 2205190840 metadata/md5-cache/net-libs/libasyncns-0.8-r4
 2205170654 metadata/md5-cache/net-libs/libaxc-0.3.6
 2205170654 metadata/md5-cache/net-libs/libaxc-0.3.7
@@ -53544,7 +53213,6 @@
 2205170654 metadata/md5-cache/net-libs/libnipper-0.12.6-r1
 2205170654 metadata/md5-cache/net-libs/libnsl-0-r1
 2205170654 metadata/md5-cache/net-libs/libnsl-1.3.0-r2
-2205170654 metadata/md5-cache/net-libs/libnsl-2.0.0-r1
 2205171510 metadata/md5-cache/net-libs/libntlm-1.6
 2205170654 metadata/md5-cache/net-libs/libomemo-0.8.1
 2205170654 metadata/md5-cache/net-libs/libosmo-dsp-0.4.0
@@ -53641,9 +53309,7 @@
 2205170654 metadata/md5-cache/net-libs/srt-1.4.3
 2205170654 metadata/md5-cache/net-libs/srt-9999
 2205170654 metadata/md5-cache/net-libs/telepathy-farstream-0.6.2-r1
-2205170654 metadata/md5-cache/net-libs/tox-0.2.12-r1
 2205170654 metadata/md5-cache/net-libs/tox-0.2.13
-2205170654 metadata/md5-cache/net-libs/tox-9999
 2205170654 metadata/md5-cache/net-libs/tox_extension_messages-0.0.3
 2205170654 metadata/md5-cache/net-libs/udns-0.4
 2205170654 metadata/md5-cache/net-libs/usrsctp-0.9.3.0_p20201102
@@ -53714,8 +53380,6 @@
 2206071015 metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.16
 2206071015 metadata/md5-cache/net-libs/libtorrent-rasterbar-2.0.5
 2206071015 metadata/md5-cache/net-libs/libtorrent-rasterbar-2.0.6
-2206071015 metadata/md5-cache/net-libs/nodejs-14.19.0
-2206071015 metadata/md5-cache/net-libs/nodejs-16.14.2
 2206071015 metadata/md5-cache/net-libs/nodejs-99999999
 2206080340 metadata/md5-cache/net-libs/phodav-2.5
 2206071015 metadata/md5-cache/net-libs/serf-1.3.9-r3
@@ -53725,10 +53389,7 @@
 2206071015 metadata/md5-cache/net-libs/telepathy-qt-0.9.8-r1
 2206071015 metadata/md5-cache/net-libs/telepathy-qt-9999
 2206071015 metadata/md5-cache/net-libs/webkit-gtk-2.36.1
-2206071015 metadata/md5-cache/net-libs/webkit-gtk-2.36.3
 2206071015 metadata/md5-cache/net-libs/xrootd-5.0.3-r1
-2206121142 metadata/md5-cache/net-libs/Manifest.gz
-2206100640 metadata/md5-cache/net-libs/gnutls-3.7.6
 2206121142 metadata/md5-cache/net-libs/libaccounts-glib-1.25-r2
 2206091440 metadata/md5-cache/net-libs/libktorrent-22.04.2
 2206082210 metadata/md5-cache/net-libs/libqrtr-glib-1.2.2
@@ -53744,6 +53405,19 @@
 2206110910 metadata/md5-cache/net-libs/xdp-tools-1.2.3
 2206101840 metadata/md5-cache/net-libs/xrootd-5.4.3
 2206101840 metadata/md5-cache/net-libs/xrootd-ceph-5.4.3
+2206161940 metadata/md5-cache/net-libs/Manifest.gz
+2206160110 metadata/md5-cache/net-libs/gloox-1.0.24-r1
+2206142110 metadata/md5-cache/net-libs/gnutls-3.7.6
+2206142240 metadata/md5-cache/net-libs/libad9361-iio-0.2-r1
+2206142240 metadata/md5-cache/net-libs/libad9361-iio-9999
+2206151640 metadata/md5-cache/net-libs/libnftnl-1.2.2-r1
+2206131540 metadata/md5-cache/net-libs/libnipper-0.12.6-r2
+2206152140 metadata/md5-cache/net-libs/libnma-1.8.40
+2206141140 metadata/md5-cache/net-libs/libnsl-2.0.0-r1
+2206151640 metadata/md5-cache/net-libs/pjproject-2.12.1
+2206161940 metadata/md5-cache/net-libs/tox-0.2.18
+2206161940 metadata/md5-cache/net-libs/tox-9999
+2206151140 metadata/md5-cache/net-libs/webkit-gtk-2.36.3
 2104060140 metadata/md5-cache/net-mail/autorespond-2.0.4
 2007210509 metadata/md5-cache/net-mail/autorespond-2.0.5
 2009050439 metadata/md5-cache/net-mail/email-3.1.3-r1
@@ -53794,8 +53468,6 @@
 2205170654 metadata/md5-cache/net-mail/dbmail-3.2.3-r5
 2205170654 metadata/md5-cache/net-mail/dbmail-3.2.5-r2
 2205191710 metadata/md5-cache/net-mail/dovecot-2.3.18-r1
-2205170654 metadata/md5-cache/net-mail/dovecot-2.3.18-r2
-2205170654 metadata/md5-cache/net-mail/dovecot-2.3.19
 2205170654 metadata/md5-cache/net-mail/eps-1.7-r1
 2205170654 metadata/md5-cache/net-mail/gnubiff-2.2.17-r2
 2205170654 metadata/md5-cache/net-mail/isync-9999
@@ -53818,9 +53490,6 @@
 2205170654 metadata/md5-cache/net-mail/qmailanalog-0.70-r1
 2205170654 metadata/md5-cache/net-mail/qtools-0.56
 2205170654 metadata/md5-cache/net-mail/queue-fix-1.4-r3
-2205170654 metadata/md5-cache/net-mail/relay-ctrl-3.1.1-r2
-2205170654 metadata/md5-cache/net-mail/relay-ctrl-3.1.1-r3
-2205170654 metadata/md5-cache/net-mail/relay-ctrl-3.2
 2205170654 metadata/md5-cache/net-mail/ripmime-1.4.0.10-r1
 2205170654 metadata/md5-cache/net-mail/ripole-0.2.2
 2205170654 metadata/md5-cache/net-mail/safecat-1.13
@@ -53849,9 +53518,6 @@
 2206071015 metadata/md5-cache/net-mail/mu-1.7.23
 2206072340 metadata/md5-cache/net-mail/postfix-logwatch-1.40.04
 2206071015 metadata/md5-cache/net-mail/queue-repair-0.9.0-r2
-2206121142 metadata/md5-cache/net-mail/Manifest.gz
-2206121142 metadata/md5-cache/net-mail/automx2-2022.0
-2206121142 metadata/md5-cache/net-mail/automx2-2022.1
 2206121142 metadata/md5-cache/net-mail/b4-0.8.0
 2206121142 metadata/md5-cache/net-mail/getmail-6.14
 2206121142 metadata/md5-cache/net-mail/getmail-6.18.9
@@ -53862,6 +53528,14 @@
 2206121142 metadata/md5-cache/net-mail/onionrouter-0.6.2
 2206121142 metadata/md5-cache/net-mail/onionrouter-9999
 2206121142 metadata/md5-cache/net-mail/rss2email-3.13.1
+2206161940 metadata/md5-cache/net-mail/Manifest.gz
+2206161940 metadata/md5-cache/net-mail/automx2-2022.0
+2206161940 metadata/md5-cache/net-mail/automx2-2022.1
+2206141710 metadata/md5-cache/net-mail/dovecot-2.3.19.1
+2206151540 metadata/md5-cache/net-mail/postfix-logwatch-1.40.05
+2206161940 metadata/md5-cache/net-mail/relay-ctrl-3.1.1-r2
+2206161940 metadata/md5-cache/net-mail/relay-ctrl-3.1.1-r3
+2206161940 metadata/md5-cache/net-mail/relay-ctrl-3.2
 2007201539 metadata/md5-cache/net-misc/asterisk-core-sounds-1.6.1-r1
 2007201539 metadata/md5-cache/net-misc/asterisk-extra-sounds-1.5.2
 2105261539 metadata/md5-cache/net-misc/asterisk-opus-13.0.1.3.0-r1
@@ -53977,7 +53651,6 @@
 2205152110 metadata/md5-cache/net-misc/drive-0.4.0_p20210208
 2205132310 metadata/md5-cache/net-misc/ip-sentinel-0.12-r2
 2205141510 metadata/md5-cache/net-misc/ipv6calc-4.0.0
-2205140410 metadata/md5-cache/net-misc/tigervnc-xorg-module-1.12.0
 2205160310 metadata/md5-cache/net-misc/websocketd-0.4.1
 2205170654 metadata/md5-cache/net-misc/adjtimex-1.29-r2
 2205170654 metadata/md5-cache/net-misc/aget-0.4.1-r2
@@ -54001,7 +53674,6 @@
 2205170654 metadata/md5-cache/net-misc/astmanproxy-1.28.2
 2205170654 metadata/md5-cache/net-misc/autoupnp-9999
 2205170654 metadata/md5-cache/net-misc/balance-3.57-r1
-2205170654 metadata/md5-cache/net-misc/batctl-2021.4
 2205170654 metadata/md5-cache/net-misc/bgpq3-0.1.35
 2205170654 metadata/md5-cache/net-misc/bgpq3-0.1.36
 2205170654 metadata/md5-cache/net-misc/bird-2.0.9
@@ -54041,8 +53713,6 @@
 2205170654 metadata/md5-cache/net-misc/dibbler-1.0.1-r3
 2205170654 metadata/md5-cache/net-misc/dropbear-2020.81-r3
 2205170654 metadata/md5-cache/net-misc/dropbear-2022.82
-2205170654 metadata/md5-cache/net-misc/dropbox-147.4.4800
-2205170654 metadata/md5-cache/net-misc/dropbox-148.4.4519
 2205170654 metadata/md5-cache/net-misc/efax-0.9a_p19_p1
 2205170654 metadata/md5-cache/net-misc/endlessh-1.1-r2
 2205170654 metadata/md5-cache/net-misc/endlessh-9999
@@ -54234,7 +53904,6 @@
 2205170654 metadata/md5-cache/net-misc/telnet-bsd-1.2-r2
 2205170654 metadata/md5-cache/net-misc/throttle-1.2-r1
 2205170654 metadata/md5-cache/net-misc/tigervnc-1.12.0-r5
-2205170654 metadata/md5-cache/net-misc/tigervnc-1.12.0-r6
 2205170654 metadata/md5-cache/net-misc/tigervnc-9999
 2205170654 metadata/md5-cache/net-misc/turbovnc-2.2.7-r2
 2205170654 metadata/md5-cache/net-misc/ubridge-0.9.18
@@ -54307,7 +53976,6 @@
 2206071015 metadata/md5-cache/net-misc/connman-notify-0_pre20191003-r3
 2206080340 metadata/md5-cache/net-misc/dahdi-tools-3.1.0-r2
 2206071015 metadata/md5-cache/net-misc/dleyna-server-0.7.2
-2206081510 metadata/md5-cache/net-misc/dropbox-150.4.5000
 2206071015 metadata/md5-cache/net-misc/econnman-1.1_p20160305
 2206071015 metadata/md5-cache/net-misc/eventd-0.27.0-r1
 2206071015 metadata/md5-cache/net-misc/frr-8.2.2
@@ -54398,7 +54066,6 @@
 2206121142 metadata/md5-cache/net-misc/pyhoca-cli-0.6.1.2
 2206121142 metadata/md5-cache/net-misc/pyhoca-gui-0.6.1.1
 2206121142 metadata/md5-cache/net-misc/python-x2go-0.6.1.3
-2206112210 metadata/md5-cache/net-misc/r8125-9.008.00
 2206112210 metadata/md5-cache/net-misc/r8168-8.049.02-r1
 2206112210 metadata/md5-cache/net-misc/r8168-8.050.00
 2206112210 metadata/md5-cache/net-misc/r8168-8.050.02
@@ -54417,15 +54084,22 @@
 2206121142 metadata/md5-cache/net-misc/you-get-0.4.1602
 2206121142 metadata/md5-cache/net-misc/youtube-dl-2021.12.17-r1
 2206121142 metadata/md5-cache/net-misc/youtube-dl-9999
-2206121142 metadata/md5-cache/net-misc/yt-dlp-2022.4.8
 2206121142 metadata/md5-cache/net-misc/yt-dlp-2022.5.18
 2206121142 metadata/md5-cache/net-misc/ytmdl-2022.3.16
-2206130010 metadata/md5-cache/net-misc/Manifest.gz
 2206121510 metadata/md5-cache/net-misc/ntpsec-1.2.1-r5
-2206121840 metadata/md5-cache/net-misc/ntpsec-1.2.1-r6
 2206121840 metadata/md5-cache/net-misc/ntpsec-9999
-2206130010 metadata/md5-cache/net-misc/spice-gtk-0.40
-2206121710 metadata/md5-cache/net-misc/spice-gtk-9999
+2206162010 metadata/md5-cache/net-misc/Manifest.gz
+2206131810 metadata/md5-cache/net-misc/batctl-2022.1
+2206132010 metadata/md5-cache/net-misc/dropbox-150.4.5000
+2206151310 metadata/md5-cache/net-misc/ntpsec-1.2.1-r6
+2206141810 metadata/md5-cache/net-misc/omniORB-4.3.0
+2206162010 metadata/md5-cache/net-misc/r8125-9.008.00
+2206162010 metadata/md5-cache/net-misc/r8125-9.009.01
+2206140140 metadata/md5-cache/net-misc/spice-gtk-0.40
+2206140140 metadata/md5-cache/net-misc/spice-gtk-9999
+2206161340 metadata/md5-cache/net-misc/tigervnc-1.12.0-r6
+2206161340 metadata/md5-cache/net-misc/tigervnc-xorg-module-1.12.0
+2206160040 metadata/md5-cache/net-misc/turbovnc-3.0
 1911091712 metadata/md5-cache/net-nds/led-1.111
 2203040040 metadata/md5-cache/net-nds/gssproxy-0.8.4-r2
 2203282310 metadata/md5-cache/net-nds/phpldapadmin-1.2.5
@@ -54464,10 +54138,12 @@
 2206071015 metadata/md5-cache/net-news/liferea-1.12.9
 2206071015 metadata/md5-cache/net-news/liferea-1.12.9-r1
 2206071015 metadata/md5-cache/net-news/liferea-1.12.9-r2
-2206121142 metadata/md5-cache/net-news/Manifest.gz
 2206121142 metadata/md5-cache/net-news/canto-curses-0.9.9
 2206121142 metadata/md5-cache/net-news/canto-daemon-0.9.8
 2206090410 metadata/md5-cache/net-news/rssguard-4.2.3
+2206162010 metadata/md5-cache/net-news/Manifest.gz
+2206162010 metadata/md5-cache/net-news/sfeed-1.5
+2206160340 metadata/md5-cache/net-news/snownews-1.9-r1
 2109091440 metadata/md5-cache/net-nntp/slrn-1.0.3-r1
 2201021310 metadata/md5-cache/net-nntp/leafnode-1.11.11-r1
 2203040410 metadata/md5-cache/net-nntp/brag-1.4.3
@@ -54544,9 +54220,6 @@
 2205170654 metadata/md5-cache/net-p2p/rtorrent-0.9.8
 2205170654 metadata/md5-cache/net-p2p/rtorrent-0.9.8-r1
 2205170654 metadata/md5-cache/net-p2p/syncthing-1.19.2
-2205170654 metadata/md5-cache/net-p2p/transmission-3.00-r1
-2205172340 metadata/md5-cache/net-p2p/transmission-3.00-r4
-2205172340 metadata/md5-cache/net-p2p/transmission-9999
 2205170654 metadata/md5-cache/net-p2p/vuze-5.7.6.0-r2
 2205260210 metadata/md5-cache/net-p2p/qbittorrent-4.4.3.1
 2205240140 metadata/md5-cache/net-p2p/qbittorrent-9999
@@ -54563,7 +54236,6 @@
 2206071015 metadata/md5-cache/net-p2p/transmission-remote-gtk-1.5.1
 2206071015 metadata/md5-cache/net-p2p/tremc-0.9.2_p20201101
 2206071015 metadata/md5-cache/net-p2p/tremc-0.9.3
-2206121142 metadata/md5-cache/net-p2p/Manifest.gz
 2206121142 metadata/md5-cache/net-p2p/bittornado-0.4.1_p20160925-r4
 2206121142 metadata/md5-cache/net-p2p/deluge-2.0.5-r1
 2206121142 metadata/md5-cache/net-p2p/deluge-9999
@@ -54574,9 +54246,13 @@
 2206121142 metadata/md5-cache/net-p2p/nicotine+-3.1.1
 2206121142 metadata/md5-cache/net-p2p/nicotine+-3.2.0
 2206121142 metadata/md5-cache/net-p2p/nicotine+-3.2.1
-2206121142 metadata/md5-cache/net-p2p/nicotine+-3.2.2-r1
 2206090210 metadata/md5-cache/net-p2p/syncthing-1.20.2
 2206121142 metadata/md5-cache/net-p2p/torrentinfo-1.8.6-r2
+2206151040 metadata/md5-cache/net-p2p/Manifest.gz
+2206151040 metadata/md5-cache/net-p2p/nicotine+-3.2.2-r1
+2206132110 metadata/md5-cache/net-p2p/transmission-3.00-r1
+2206132110 metadata/md5-cache/net-p2p/transmission-3.00-r4
+2206132110 metadata/md5-cache/net-p2p/transmission-9999
 2010020309 metadata/md5-cache/net-print/apsfilter-7.2.8-r1
 2011290239 metadata/md5-cache/net-print/c2esp-27
 2104060140 metadata/md5-cache/net-print/cups-windows-6.0-r1
@@ -54595,7 +54271,6 @@
 2205170654 metadata/md5-cache/net-print/brlaser-6
 2205170654 metadata/md5-cache/net-print/cndrvcups-common-lb-3.70
 2205170654 metadata/md5-cache/net-print/cndrvcups-lb-3.70
-2205170654 metadata/md5-cache/net-print/cnijfilter2-5.90
 2205170654 metadata/md5-cache/net-print/cnrdrvcups-lb-5.40
 2205181110 metadata/md5-cache/net-print/cups-2.3.3_p2-r3
 2205170654 metadata/md5-cache/net-print/cups-filters-1.28.10-r3
@@ -54619,8 +54294,9 @@
 2205291610 metadata/md5-cache/net-print/hplip-plugin-3.22.4
 2206080340 metadata/md5-cache/net-print/hplip-3.22.2
 2206080340 metadata/md5-cache/net-print/hplip-3.22.4
-2206100340 metadata/md5-cache/net-print/Manifest.gz
 2206100340 metadata/md5-cache/net-print/cups-filters-1.28.15
+2206161940 metadata/md5-cache/net-print/Manifest.gz
+2206161940 metadata/md5-cache/net-print/cnijfilter2-5.90
 2104192239 metadata/md5-cache/net-proxy/adzapper-20110915-r2
 2104172239 metadata/md5-cache/net-proxy/wwwoffle-2.9i-r2
 2011290239 metadata/md5-cache/net-proxy/ziproxy-3.3.1-r2
@@ -54634,13 +54310,6 @@
 2205170654 metadata/md5-cache/net-proxy/haproxy-2.2.21
 2205170654 metadata/md5-cache/net-proxy/haproxy-2.2.24
 2205170654 metadata/md5-cache/net-proxy/haproxy-2.2.9999
-2205170654 metadata/md5-cache/net-proxy/haproxy-2.4.14
-2205170654 metadata/md5-cache/net-proxy/haproxy-2.4.17
-2205170654 metadata/md5-cache/net-proxy/haproxy-2.4.9999
-2205170654 metadata/md5-cache/net-proxy/haproxy-2.5.4
-2205170654 metadata/md5-cache/net-proxy/haproxy-2.5.7
-2205170654 metadata/md5-cache/net-proxy/haproxy-2.5.9999
-2205170654 metadata/md5-cache/net-proxy/haproxy-9999
 2205170654 metadata/md5-cache/net-proxy/havp-0.92a-r3
 2205170654 metadata/md5-cache/net-proxy/microsocks-1.0.2
 2205170654 metadata/md5-cache/net-proxy/nutcracker-0.4.1-r1
@@ -54669,12 +54338,19 @@
 2206011440 metadata/md5-cache/net-proxy/haproxy-2.6.0
 2206011440 metadata/md5-cache/net-proxy/haproxy-2.6.9999
 2206071015 metadata/md5-cache/net-proxy/trojan-1.16.0-r2
-2206121142 metadata/md5-cache/net-proxy/Manifest.gz
 2206121142 metadata/md5-cache/net-proxy/hatop-0.8.1
 2206121142 metadata/md5-cache/net-proxy/mitmproxy-7.0.4
 2206121142 metadata/md5-cache/net-proxy/mitmproxy-8.0.0
 2206121142 metadata/md5-cache/net-proxy/mitmproxy-8.1.0
 2206121142 metadata/md5-cache/net-proxy/sshuttle-1.1.0
+2206161940 metadata/md5-cache/net-proxy/Manifest.gz
+2206161940 metadata/md5-cache/net-proxy/haproxy-2.4.14
+2206161940 metadata/md5-cache/net-proxy/haproxy-2.4.17
+2206161940 metadata/md5-cache/net-proxy/haproxy-2.4.9999
+2206161940 metadata/md5-cache/net-proxy/haproxy-2.5.4
+2206161940 metadata/md5-cache/net-proxy/haproxy-2.5.7
+2206161940 metadata/md5-cache/net-proxy/haproxy-2.5.9999
+2206161940 metadata/md5-cache/net-proxy/haproxy-9999
 2205170654 metadata/md5-cache/net-voip/captagent-6.3.1-r1
 2205170654 metadata/md5-cache/net-voip/yate-6.2.0
 2205170654 metadata/md5-cache/net-voip/yate-9999
@@ -54767,7 +54443,6 @@
 1808172339 metadata/md5-cache/net-wireless/portapack-havoc-0.0_p20180612
 2002112051 metadata/md5-cache/net-wireless/reaver-1.6.5
 2102092009 metadata/md5-cache/net-wireless/wepdecrypt-0.8-r2
-2203240726 metadata/md5-cache/net-wireless/iwgtk-0.4
 2203240726 metadata/md5-cache/net-wireless/kismetmobiledashboard-9999
 2204041809 metadata/md5-cache/net-wireless/wireless-regdb-20220218
 2204302110 metadata/md5-cache/net-wireless/bladerf-firmware-2.4.0
@@ -54781,7 +54456,6 @@
 2205170654 metadata/md5-cache/net-wireless/crackle-0.1-r1
 2205170654 metadata/md5-cache/net-wireless/dump1090-4.0
 2205170654 metadata/md5-cache/net-wireless/dump1090-5.0
-2205170654 metadata/md5-cache/net-wireless/dump1090-6.1
 2205170654 metadata/md5-cache/net-wireless/dump1090-9999
 2205170654 metadata/md5-cache/net-wireless/gqrx-2.14.6
 2205170654 metadata/md5-cache/net-wireless/gqrx-2.15.8
@@ -54818,7 +54492,6 @@
 2205170654 metadata/md5-cache/net-wireless/rfkill-0.5-r3
 2205170654 metadata/md5-cache/net-wireless/rfkill-1.0
 2205170654 metadata/md5-cache/net-wireless/rtl-sdr-0.6.0_p2020802
-2205170654 metadata/md5-cache/net-wireless/rtl-sdr-9999
 2205170654 metadata/md5-cache/net-wireless/rtl_433-21.12
 2205170654 metadata/md5-cache/net-wireless/rtl_433-9999
 2205170654 metadata/md5-cache/net-wireless/sigdigger-0.1.0
@@ -54862,14 +54535,10 @@
 2206071015 metadata/md5-cache/net-wireless/gnome-bluetooth-42.0-r2
 2206071015 metadata/md5-cache/net-wireless/gnuradio-3.8.4.0
 2206080340 metadata/md5-cache/net-wireless/gobi_loader-0.7-r2
-2206071015 metadata/md5-cache/net-wireless/gr-ieee802154-0.0_p20200812
 2206071015 metadata/md5-cache/net-wireless/gr-ieee802154-9999
 2206071015 metadata/md5-cache/net-wireless/gr-osmosdr-9999
 2206071015 metadata/md5-cache/net-wireless/gr-paint-9999
-2206071015 metadata/md5-cache/net-wireless/gr-rds-0.0_p20200807
-2206071015 metadata/md5-cache/net-wireless/gr-rds-9999
 2206072240 metadata/md5-cache/net-wireless/iwd-1.28
-2206072240 metadata/md5-cache/net-wireless/iwgtk-0.5
 2206080340 metadata/md5-cache/net-wireless/kismet-2021.08.1-r1
 2206080340 metadata/md5-cache/net-wireless/kismet-2022.01.3
 2206080340 metadata/md5-cache/net-wireless/kismet-2022.02.1
@@ -54892,7 +54561,6 @@
 2206080340 metadata/md5-cache/net-wireless/uhd-4.1.0.5
 2206080340 metadata/md5-cache/net-wireless/uhd-4.2.0.0
 2206062010 metadata/md5-cache/net-wireless/wireless-regdb-20220606
-2206121142 metadata/md5-cache/net-wireless/Manifest.gz
 2206121142 metadata/md5-cache/net-wireless/aircrack-ng-1.6_p20200722-r1
 2206121142 metadata/md5-cache/net-wireless/aircrack-ng-1.7
 2206121142 metadata/md5-cache/net-wireless/aircrack-ng-9999
@@ -54925,6 +54593,14 @@
 2206121142 metadata/md5-cache/net-wireless/soapysdr-9999
 2206121142 metadata/md5-cache/net-wireless/urh-2.9.3
 2206121142 metadata/md5-cache/net-wireless/urh-9999
+2206142110 metadata/md5-cache/net-wireless/Manifest.gz
+2206141610 metadata/md5-cache/net-wireless/dump1090-6.1
+2206142110 metadata/md5-cache/net-wireless/gr-ieee802154-0.0_p20200812
+2206141440 metadata/md5-cache/net-wireless/gr-rds-0.0_p20200807
+2206141440 metadata/md5-cache/net-wireless/gr-rds-9999
+2206141640 metadata/md5-cache/net-wireless/iwgtk-0.6
+2206141610 metadata/md5-cache/net-wireless/rtl-sdr-0.6.0_p2020802-r1
+2206141610 metadata/md5-cache/net-wireless/rtl-sdr-9999
 2205011048 metadata/md5-cache/perl-core/CPAN-2.290.0-r1
 2205011048 metadata/md5-cache/perl-core/Encode-3.120.0
 2205011048 metadata/md5-cache/perl-core/File-Temp-0.231.100
@@ -55239,7 +54915,6 @@
 2205170654 metadata/md5-cache/sci-biology/maq-0.7.1-r2
 2205170654 metadata/md5-cache/sci-biology/maqview-0.2.5-r3
 2205170654 metadata/md5-cache/sci-biology/mcl-14.137
-2205170654 metadata/md5-cache/sci-biology/mosaik-2.2.30
 2205170654 metadata/md5-cache/sci-biology/mothur-1.27.0-r1
 2205170654 metadata/md5-cache/sci-biology/mrbayes-3.1.2-r2
 2205170654 metadata/md5-cache/sci-biology/mummer-3.23
@@ -55289,13 +54964,14 @@
 2206071015 metadata/md5-cache/sci-biology/bowtie-2.4.4
 2206121142 metadata/md5-cache/sci-biology/HTSeq-0.12.4
 2206121142 metadata/md5-cache/sci-biology/HTSeq-9999
-2206121142 metadata/md5-cache/sci-biology/Manifest.gz
 2206101610 metadata/md5-cache/sci-biology/bcftools-1.15.1
 2206121142 metadata/md5-cache/sci-biology/biopandas-0.2.7
 2206121142 metadata/md5-cache/sci-biology/biopython-1.79
 2206121142 metadata/md5-cache/sci-biology/pysam-0.17.0
 2206121142 metadata/md5-cache/sci-biology/pysam-0.19.1
 2206101610 metadata/md5-cache/sci-biology/samtools-1.15.1
+2206131540 metadata/md5-cache/sci-biology/Manifest.gz
+2206131540 metadata/md5-cache/sci-biology/mosaik-2.2.30
 2110190609 metadata/md5-cache/sci-calculators/bc-gh-5.1.1
 2111101409 metadata/md5-cache/sci-calculators/bc-gh-5.2.0
 2106222139 metadata/md5-cache/sci-calculators/datamash-1.7-r1
@@ -55396,7 +55072,6 @@
 2206121142 metadata/md5-cache/sci-chemistry/mdtraj-1.9.4
 2206121142 metadata/md5-cache/sci-chemistry/mdtraj-1.9.7
 2206121142 metadata/md5-cache/sci-chemistry/modeller-9.25
-2206121142 metadata/md5-cache/sci-chemistry/molequeue-0.9.0-r1
 2206091010 metadata/md5-cache/sci-chemistry/molsketch-0.7.2-r1
 2206121142 metadata/md5-cache/sci-chemistry/nmrglue-0.7
 2206121410 metadata/md5-cache/sci-chemistry/openbabel-3.1.1_p20210225
@@ -55404,8 +55079,9 @@
 2206121142 metadata/md5-cache/sci-chemistry/propka-3.2.0
 2206121142 metadata/md5-cache/sci-chemistry/pymol-2.5.0
 2206121142 metadata/md5-cache/sci-chemistry/pymol-2.5.0-r1
-2206131040 metadata/md5-cache/sci-chemistry/Manifest.gz
 2206131040 metadata/md5-cache/sci-chemistry/votca-2022
+2206151710 metadata/md5-cache/sci-chemistry/Manifest.gz
+2206151710 metadata/md5-cache/sci-chemistry/molequeue-0.9.0-r1
 1702282330 metadata/md5-cache/sci-electronics/freehdl-0.0.8
 2003201239 metadata/md5-cache/sci-electronics/geda-suite-20171223-r1
 2108222309 metadata/md5-cache/sci-electronics/irsim-9.7.93
@@ -55488,13 +55164,14 @@
 2206071015 metadata/md5-cache/sci-electronics/klayout-9999
 2206080340 metadata/md5-cache/sci-electronics/labone-21.08.20515-r1
 2206071015 metadata/md5-cache/sci-electronics/magic-8.3.309
-2206101110 metadata/md5-cache/sci-electronics/Manifest.gz
 2206101110 metadata/md5-cache/sci-electronics/kicad-6.0.5
 2206101110 metadata/md5-cache/sci-electronics/kicad-footprints-6.0.5
 2206101110 metadata/md5-cache/sci-electronics/kicad-meta-6.0.5
 2206101110 metadata/md5-cache/sci-electronics/kicad-packages3d-6.0.5
 2206101110 metadata/md5-cache/sci-electronics/kicad-symbols-6.0.5
 2206101110 metadata/md5-cache/sci-electronics/kicad-templates-6.0.5
+2206162010 metadata/md5-cache/sci-electronics/Manifest.gz
+2206162010 metadata/md5-cache/sci-electronics/systemc-2.3.4-r2
 2105311239 metadata/md5-cache/sci-geosciences/congen-1.6.2-r1
 2006040939 metadata/md5-cache/sci-geosciences/dcw-gmt-1.1.4
 2002171539 metadata/md5-cache/sci-geosciences/gshhg-gmt-2.3.7
@@ -55593,7 +55270,6 @@
 2206071015 metadata/md5-cache/sci-geosciences/grass-7.8.6-r1
 2206071015 metadata/md5-cache/sci-geosciences/grass-7.8.7
 2206071015 metadata/md5-cache/sci-geosciences/grass-8.0.1-r1
-2206071015 metadata/md5-cache/sci-geosciences/grass-8.0.2
 2206071015 metadata/md5-cache/sci-geosciences/grass-8.2.0
 2206071015 metadata/md5-cache/sci-geosciences/grass-9999
 2206081140 metadata/md5-cache/sci-geosciences/josm-bin-18463
@@ -55611,11 +55287,10 @@
 2206121142 metadata/md5-cache/sci-geosciences/mapserver-7.6.4
 2206100610 metadata/md5-cache/sci-geosciences/qgis-3.22.7-r2
 2206100610 metadata/md5-cache/sci-geosciences/qgis-9999
-2206121142 metadata/md5-cache/sci-geosciences/routino-3.3.3
-2206121142 metadata/md5-cache/sci-geosciences/routino-3.3.3-r1
 2206121840 metadata/md5-cache/sci-geosciences/GeographicLib-1.52-r1
-2206121840 metadata/md5-cache/sci-geosciences/Manifest.gz
-2206121840 metadata/md5-cache/sci-geosciences/routino-3.3.3-r2
+2206161710 metadata/md5-cache/sci-geosciences/Manifest.gz
+2206152140 metadata/md5-cache/sci-geosciences/grass-8.0.2
+2206150040 metadata/md5-cache/sci-geosciences/routino-3.3.3-r2
 2002230040 metadata/md5-cache/sci-libs/beagle-3.0.3-r1
 2107141939 metadata/md5-cache/sci-libs/ccolamd-2.9.6
 2110211309 metadata/md5-cache/sci-libs/clashscore-db-3.17-r1
@@ -55923,10 +55598,6 @@
 2206021510 metadata/md5-cache/sci-libs/fplll-5.4.2
 2206031540 metadata/md5-cache/sci-libs/dealii-9.3.1-r5
 2206031540 metadata/md5-cache/sci-libs/dealii-9.3.3-r1
-2206031410 metadata/md5-cache/sci-libs/opencascade-7.5.2-r6
-2206031410 metadata/md5-cache/sci-libs/opencascade-7.5.3-r7
-2206031410 metadata/md5-cache/sci-libs/opencascade-7.6.0-r4
-2206031410 metadata/md5-cache/sci-libs/opencascade-7.6.1-r1
 2206030910 metadata/md5-cache/sci-libs/pdal-2.4.0-r1
 2206071015 metadata/md5-cache/sci-libs/NNPACK-2020.12.22
 2206071015 metadata/md5-cache/sci-libs/blis-0.6.0
@@ -55942,11 +55613,8 @@
 2206071015 metadata/md5-cache/sci-libs/eccodes-2.18.0
 2206071015 metadata/md5-cache/sci-libs/gdal-3.5.0-r3
 2206071015 metadata/md5-cache/sci-libs/gdal-3.5.0-r4
-2206071015 metadata/md5-cache/sci-libs/gmsh-4.10.3
-2206071015 metadata/md5-cache/sci-libs/gmsh-4.9.5-r2
 2206080340 metadata/md5-cache/sci-libs/indilib-1.9.2
 2206080340 metadata/md5-cache/sci-libs/indilib-1.9.5.1
-2206080340 metadata/md5-cache/sci-libs/indilib-1.9.6
 2206071015 metadata/md5-cache/sci-libs/kineto-2021.11.17
 2206071015 metadata/md5-cache/sci-libs/kissfft-131.1.0
 2206071015 metadata/md5-cache/sci-libs/kissfft-9999
@@ -55957,7 +55625,6 @@
 2206071015 metadata/md5-cache/sci-libs/med-4.1.0
 2206071015 metadata/md5-cache/sci-libs/onnx-1.11.0-r1
 2206071015 metadata/md5-cache/sci-libs/pastix-6.0.3
-2206071015 metadata/md5-cache/sci-libs/plplot-5.15.0-r102
 2206071015 metadata/md5-cache/sci-libs/rocBLAS-4.3.0
 2206071015 metadata/md5-cache/sci-libs/rocBLAS-4.3.0-r1
 2206071015 metadata/md5-cache/sci-libs/rocFFT-4.3.0-r1
@@ -56019,12 +55686,23 @@
 2206121142 metadata/md5-cache/sci-libs/tensorflow-estimator-2.7.0
 2206121142 metadata/md5-cache/sci-libs/tensorflow-estimator-2.8.0
 2206120710 metadata/md5-cache/sci-libs/trilinos-13.0.1-r4
-2206120940 metadata/md5-cache/sci-libs/trilinos-13.4.0-r1
-2206131410 metadata/md5-cache/sci-libs/Manifest.gz
-2206131040 metadata/md5-cache/sci-libs/hdf5-1.12.2-r2
 2206131040 metadata/md5-cache/sci-libs/netcdf-4.8.1-r2
 2206131410 metadata/md5-cache/sci-libs/scikit-image-0.19.2
 2206131410 metadata/md5-cache/sci-libs/scikit-learn-1.1.1
+2206141910 metadata/md5-cache/sci-libs/Manifest.gz
+2206141340 metadata/md5-cache/sci-libs/foxi-2021.05.27
+2206131610 metadata/md5-cache/sci-libs/gmsh-4.10.3
+2206131610 metadata/md5-cache/sci-libs/gmsh-4.9.5-r2
+2206140910 metadata/md5-cache/sci-libs/hdf5-1.12.2-r2
+2206141610 metadata/md5-cache/sci-libs/indilib-1.9.6-r1
+2206141910 metadata/md5-cache/sci-libs/opencascade-7.5.2-r6
+2206141910 metadata/md5-cache/sci-libs/opencascade-7.5.3-r7
+2206141910 metadata/md5-cache/sci-libs/opencascade-7.6.0-r4
+2206141910 metadata/md5-cache/sci-libs/opencascade-7.6.1-r1
+2206141910 metadata/md5-cache/sci-libs/opencascade-7.6.2
+2206141640 metadata/md5-cache/sci-libs/plplot-5.15.0-r102
+2206140710 metadata/md5-cache/sci-libs/trilinos-13.2.0
+2206140710 metadata/md5-cache/sci-libs/trilinos-13.4.0-r3
 2101170739 metadata/md5-cache/sci-mathematics/alt-ergo-2.3.0
 2111031339 metadata/md5-cache/sci-mathematics/eclib-20210625
 2101061839 metadata/md5-cache/sci-mathematics/flintqs-1.0
@@ -56182,15 +55860,18 @@
 2206071015 metadata/md5-cache/sci-mathematics/slepc-3.17.1
 2206071015 metadata/md5-cache/sci-mathematics/stp-2.3.3-r1
 2206071015 metadata/md5-cache/sci-mathematics/z3-4.8.17
-2206121142 metadata/md5-cache/sci-mathematics/alectryon-1.4.0-r1
 2206090210 metadata/md5-cache/sci-mathematics/cgal-5.2-r2
 2206090140 metadata/md5-cache/sci-mathematics/cgal-5.4.1
 2206121142 metadata/md5-cache/sci-mathematics/dunshire-0.1.1-r2
 2206121142 metadata/md5-cache/sci-mathematics/mathlib-tools-1.1.0-r1
 2206121142 metadata/md5-cache/sci-mathematics/mathlib-tools-1.1.1
-2206130310 metadata/md5-cache/sci-mathematics/Manifest.gz
 2206130040 metadata/md5-cache/sci-mathematics/lcalc-2.0.5-r2
 2206130310 metadata/md5-cache/sci-mathematics/planarity-3.0.2.0
+2206152240 metadata/md5-cache/sci-mathematics/Manifest.gz
+2206141340 metadata/md5-cache/sci-mathematics/alectryon-1.4.0-r1
+2206152240 metadata/md5-cache/sci-mathematics/polymake-4.6-r1
+2206131440 metadata/md5-cache/sci-mathematics/primecount-7.3
+2206131440 metadata/md5-cache/sci-mathematics/primesieve-7.9
 2104180939 metadata/md5-cache/sci-misc/ViSP-images-3.3.0
 2203231439 metadata/md5-cache/sci-misc/flashdot-1.1.4-r1
 2205022240 metadata/md5-cache/sci-misc/netlogo-bin-6.2.0
@@ -56270,7 +55951,6 @@
 2205170654 metadata/md5-cache/sci-visualization/gr-0.53.0
 2205170654 metadata/md5-cache/sci-visualization/grace-5.1.25_p9-r1
 2205170654 metadata/md5-cache/sci-visualization/gwyddion-2.56
-2205170654 metadata/md5-cache/sci-visualization/gwyddion-2.60
 2205170654 metadata/md5-cache/sci-visualization/kst-2.0.8-r2
 2205170654 metadata/md5-cache/sci-visualization/labplot-2.9.0-r1
 2205170654 metadata/md5-cache/sci-visualization/labplot-9999
@@ -56287,7 +55967,6 @@
 2205170654 metadata/md5-cache/sci-visualization/zhu3d-4.2.6-r1
 2206071015 metadata/md5-cache/sci-visualization/paraview-5.10.1
 2206071015 metadata/md5-cache/sci-visualization/pythonprop-0.30
-2206121142 metadata/md5-cache/sci-visualization/Manifest.gz
 2206121142 metadata/md5-cache/sci-visualization/dash-1.20.0-r1
 2206121142 metadata/md5-cache/sci-visualization/dash-1.21.0
 2206121142 metadata/md5-cache/sci-visualization/dash-core-components-1.16.0
@@ -56302,6 +55981,9 @@
 2206121142 metadata/md5-cache/sci-visualization/tensorboard-2.7.0
 2206121142 metadata/md5-cache/sci-visualization/tensorboard-2.8.0
 2206121142 metadata/md5-cache/sci-visualization/veusz-3.3.1
+2206140040 metadata/md5-cache/sci-visualization/Manifest.gz
+2206140040 metadata/md5-cache/sci-visualization/gwyddion-2.60
+2206131510 metadata/md5-cache/sci-visualization/gwyddion-2.61
 2012081009 metadata/md5-cache/sec-policy/apparmor-profiles-3.0.1
 2111120539 metadata/md5-cache/sec-policy/apparmor-profiles-3.0.3
 2203240726 metadata/md5-cache/sec-policy/apparmor-profiles-9999
@@ -57570,10 +57252,7 @@
 2205170654 metadata/md5-cache/sys-apps/rkflashtool-6.1
 2205170654 metadata/md5-cache/sys-apps/rng-tools-6.14-r2
 2205191710 metadata/md5-cache/sys-apps/rng-tools-6.15
-2205170654 metadata/md5-cache/sys-apps/s6-2.11.0.1
-2205170654 metadata/md5-cache/sys-apps/s6-linux-init-1.0.7.1
 2205170654 metadata/md5-cache/sys-apps/s6-linux-utils-2.5.1.7
-2205170654 metadata/md5-cache/sys-apps/s6-portable-utils-2.2.3.4
 2205170654 metadata/md5-cache/sys-apps/s6-rc-0.5.3.0
 2205170654 metadata/md5-cache/sys-apps/salinfo-1.2
 2205170654 metadata/md5-cache/sys-apps/sandbox-2.24
@@ -57671,7 +57350,6 @@
 2206030840 metadata/md5-cache/sys-apps/daisydog-2014.05.30-r1
 2206030540 metadata/md5-cache/sys-apps/kbd-2.4.0
 2206030540 metadata/md5-cache/sys-apps/kbd-2.5.0
-2206030540 metadata/md5-cache/sys-apps/kbd-9999
 2206030740 metadata/md5-cache/sys-apps/likwid-5.2.1
 2206040410 metadata/md5-cache/sys-apps/mcstrans-3.4
 2206040410 metadata/md5-cache/sys-apps/restorecond-3.4
@@ -57693,16 +57371,13 @@
 2206071015 metadata/md5-cache/sys-apps/dbus-1.12.22-r1
 2206071015 metadata/md5-cache/sys-apps/dbus-1.14.0-r1
 2206071015 metadata/md5-cache/sys-apps/dbus-broker-29
-2206071015 metadata/md5-cache/sys-apps/dbus-broker-31
 2206071015 metadata/md5-cache/sys-apps/dbus-broker-9999
 2206071015 metadata/md5-cache/sys-apps/edid-fixdim-1
 2206060210 metadata/md5-cache/sys-apps/etckeeper-1.18.16-r1
 2206060210 metadata/md5-cache/sys-apps/etckeeper-1.18.17
 2206071015 metadata/md5-cache/sys-apps/findutils-4.8.0-r1
 2206071015 metadata/md5-cache/sys-apps/findutils-4.9.0
-2206071015 metadata/md5-cache/sys-apps/firejail-0.9.68
 2206071015 metadata/md5-cache/sys-apps/firejail-0.9.68-r1
-2206071015 metadata/md5-cache/sys-apps/firejail-9999
 2206071015 metadata/md5-cache/sys-apps/flashrom-1.2-r3
 2206071015 metadata/md5-cache/sys-apps/flatpak-1.12.3
 2206071015 metadata/md5-cache/sys-apps/flatpak-1.12.7
@@ -57710,7 +57385,6 @@
 2206071015 metadata/md5-cache/sys-apps/fwupd-1.7.5
 2206071015 metadata/md5-cache/sys-apps/fwupd-1.7.7-r2
 2206071015 metadata/md5-cache/sys-apps/fwupd-1.8.0-r1
-2206071015 metadata/md5-cache/sys-apps/fwupd-1.8.1
 2206071015 metadata/md5-cache/sys-apps/fwupd-efi-1.1
 2206071015 metadata/md5-cache/sys-apps/fwupd-efi-1.2
 2206071015 metadata/md5-cache/sys-apps/fwupd-efi-1.3
@@ -57722,7 +57396,6 @@
 2206080340 metadata/md5-cache/sys-apps/gradm-3.1.201608131257
 2206080340 metadata/md5-cache/sys-apps/gradm-3.1.201708012022
 2206080340 metadata/md5-cache/sys-apps/gradm-3.1.201903191516
-2206072110 metadata/md5-cache/sys-apps/memtest86+-6.00_beta2
 2206080340 metadata/md5-cache/sys-apps/nvme-cli-1.16
 2206080340 metadata/md5-cache/sys-apps/nvme-cli-2.0
 2206080340 metadata/md5-cache/sys-apps/onerng-3.6-r4
@@ -57739,15 +57412,9 @@
 2206080340 metadata/md5-cache/sys-apps/s390-tools-2.12.0
 2206080340 metadata/md5-cache/sys-apps/s390-tools-2.9.0
 2206081640 metadata/md5-cache/sys-apps/systemd-250.4-r2
-2206081640 metadata/md5-cache/sys-apps/systemd-250.6
-2206081640 metadata/md5-cache/sys-apps/systemd-250.7
-2206081640 metadata/md5-cache/sys-apps/systemd-251.2
-2206081640 metadata/md5-cache/sys-apps/systemd-9999
 2206080340 metadata/md5-cache/sys-apps/systemd-readahead-216
 2206071015 metadata/md5-cache/sys-apps/systemd-tmpfiles-249.7
 2206071015 metadata/md5-cache/sys-apps/systemd-tmpfiles-249.9
-2206080340 metadata/md5-cache/sys-apps/systemd-utils-250.6
-2206080340 metadata/md5-cache/sys-apps/systemd-utils-250.7
 2206071015 metadata/md5-cache/sys-apps/tuned-2.17.0
 2206071015 metadata/md5-cache/sys-apps/tuned-2.18.0
 2206080340 metadata/md5-cache/sys-apps/uam-0.3.2-r1
@@ -57777,7 +57444,6 @@
 2206121142 metadata/md5-cache/sys-apps/kcheck-0.0.2-r1
 2206121142 metadata/md5-cache/sys-apps/kcheck-9999
 2206121142 metadata/md5-cache/sys-apps/kmod-29
-2206121142 metadata/md5-cache/sys-apps/kmod-9999
 2206110910 metadata/md5-cache/sys-apps/minijail-17
 2206082310 metadata/md5-cache/sys-apps/openrc-0.44.10
 2206101910 metadata/md5-cache/sys-apps/openrc-0.45.1
@@ -57804,10 +57470,26 @@
 2206121142 metadata/md5-cache/sys-apps/util-linux-2.38
 2206121142 metadata/md5-cache/sys-apps/util-linux-9999
 2206092310 metadata/md5-cache/sys-apps/xdg-desktop-portal-gnome-42.1
-2206130040 metadata/md5-cache/sys-apps/Manifest.gz
 2206121610 metadata/md5-cache/sys-apps/inxi-3.3.17.1
 2206121440 metadata/md5-cache/sys-apps/pcsc-lite-1.9.8
 2206130040 metadata/md5-cache/sys-apps/usbguard-1.1.1-r2
+2206162110 metadata/md5-cache/sys-apps/Manifest.gz
+2206150040 metadata/md5-cache/sys-apps/dbus-broker-31
+2206141510 metadata/md5-cache/sys-apps/ethtool-5.18
+2206150910 metadata/md5-cache/sys-apps/firejail-0.9.70
+2206132310 metadata/md5-cache/sys-apps/fwupd-1.8.1
+2206162110 metadata/md5-cache/sys-apps/kbd-2.5.1
+2206162110 metadata/md5-cache/sys-apps/kbd-9999
+2206161910 metadata/md5-cache/sys-apps/kmod-29-r1
+2206161910 metadata/md5-cache/sys-apps/kmod-9999
+2206141910 metadata/md5-cache/sys-apps/kmscon-8_p20220214-r1
+2206141910 metadata/md5-cache/sys-apps/memtest86+-6.00_beta2
+2206141840 metadata/md5-cache/sys-apps/systemd-250.6
+2206141840 metadata/md5-cache/sys-apps/systemd-250.7
+2206141840 metadata/md5-cache/sys-apps/systemd-251.2
+2206141840 metadata/md5-cache/sys-apps/systemd-9999
+2206141840 metadata/md5-cache/sys-apps/systemd-utils-250.6
+2206141840 metadata/md5-cache/sys-apps/systemd-utils-250.7
 2110110009 metadata/md5-cache/sys-auth/libyubikey-1.13
 2108271840 metadata/md5-cache/sys-auth/nss-myhostname-0.3-r1
 2011160239 metadata/md5-cache/sys-auth/ykclient-2.15
@@ -57887,12 +57569,14 @@
 2206071015 metadata/md5-cache/sys-auth/sssd-2.6.0-r2
 2206080340 metadata/md5-cache/sys-auth/thinkfinger-0.3-r3
 2206080340 metadata/md5-cache/sys-auth/ykpers-1.20.0
-2206121142 metadata/md5-cache/sys-auth/Manifest.gz
 2206121142 metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.12-r1
 2206090610 metadata/md5-cache/sys-auth/polkit-0.120_p20220509
 2206121142 metadata/md5-cache/sys-auth/solo1-0.1.1
 2206121142 metadata/md5-cache/sys-auth/ssh-ldap-pubkey-1.3.3
 2206121142 metadata/md5-cache/sys-auth/ssh-ldap-pubkey-1.4.0
+2206151310 metadata/md5-cache/sys-auth/Manifest.gz
+2206150040 metadata/md5-cache/sys-auth/ssh-import-id-5.11
+2206151310 metadata/md5-cache/sys-auth/ykpers-1.20.0-r1
 1910191339 metadata/md5-cache/sys-block/devio-1.2
 1911072009 metadata/md5-cache/sys-block/endpoint-0.1.0-r1
 1702282333 metadata/md5-cache/sys-block/hdrecover-0.5
@@ -58146,7 +57830,6 @@
 2205170654 metadata/md5-cache/sys-cluster/minikube-1.25.2
 2205170654 metadata/md5-cache/sys-cluster/mpich-3.4.3
 2205170654 metadata/md5-cache/sys-cluster/native-mpi-0-r1
-2205170654 metadata/md5-cache/sys-cluster/nomad-1.2.6
 2205170654 metadata/md5-cache/sys-cluster/nullmpi-0.7-r1
 2205170654 metadata/md5-cache/sys-cluster/openmpi-4.1.2
 2205170654 metadata/md5-cache/sys-cluster/pconsole-1.0-r4
@@ -58228,9 +57911,11 @@
 2206112210 metadata/md5-cache/sys-cluster/knem-9999
 2206121142 metadata/md5-cache/sys-cluster/sanlock-3.8.2
 2206121142 metadata/md5-cache/sys-cluster/sanlock-3.8.4
-2206130210 metadata/md5-cache/sys-cluster/Manifest.gz
 2206130140 metadata/md5-cache/sys-cluster/k3s-1.23.7_p1
 2206130210 metadata/md5-cache/sys-cluster/k3s-1.24.1_p1
+2206151640 metadata/md5-cache/sys-cluster/Manifest.gz
+2206151640 metadata/md5-cache/sys-cluster/glusterfs-10.2
+2206141040 metadata/md5-cache/sys-cluster/nomad-1.2.6
 2104060140 metadata/md5-cache/sys-devel/autoconf-2.64-r1
 2104060140 metadata/md5-cache/sys-devel/autoconf-2.69-r5
 2105131939 metadata/md5-cache/sys-devel/autoconf-archive-2021.02.19
@@ -58298,7 +57983,6 @@
 2205170654 metadata/md5-cache/sys-devel/icecream-1.3.1
 2205170654 metadata/md5-cache/sys-devel/icecream-1.4
 2205170654 metadata/md5-cache/sys-devel/libtool-2.4.6-r6
-2205170654 metadata/md5-cache/sys-devel/libtool-2.4.7
 2205170654 metadata/md5-cache/sys-devel/libtool-9999
 2205170654 metadata/md5-cache/sys-devel/llvm-roc-3.10.0
 2205170654 metadata/md5-cache/sys-devel/llvm-roc-3.7.0-r1
@@ -58329,8 +58013,6 @@
 2205170654 metadata/md5-cache/sys-devel/smatch-1.60
 2205170654 metadata/md5-cache/sys-devel/smatch-1.72
 2205170654 metadata/md5-cache/sys-devel/smatch-9999
-2205170654 metadata/md5-cache/sys-devel/sparse-0.6.4-r1
-2205170654 metadata/md5-cache/sys-devel/sparse-9999
 2205221440 metadata/md5-cache/sys-devel/autoconf-wrapper-20220130
 2205251910 metadata/md5-cache/sys-devel/autoconf-2.13-r1
 2205300940 metadata/md5-cache/sys-devel/binutils-2.38-r2
@@ -58380,7 +58062,6 @@
 2206120910 metadata/md5-cache/sys-devel/llvm-common-14.0.4
 2206120910 metadata/md5-cache/sys-devel/llvm-common-14.0.5
 2206120910 metadata/md5-cache/sys-devel/llvm-common-15.0.0.9999
-2206131040 metadata/md5-cache/sys-devel/Manifest.gz
 2206131040 metadata/md5-cache/sys-devel/autoconf-archive-2022.02.11
 2206122310 metadata/md5-cache/sys-devel/binutils-2.37_p1-r3
 2206122310 metadata/md5-cache/sys-devel/binutils-2.38-r3
@@ -58405,13 +58086,18 @@
 2206121540 metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r3
 2206121640 metadata/md5-cache/sys-devel/gdb-11.2
 2206121640 metadata/md5-cache/sys-devel/gdb-12.1
-2206121640 metadata/md5-cache/sys-devel/gdb-9999
 2206131040 metadata/md5-cache/sys-devel/gnuconfig-20220508
 2206121540 metadata/md5-cache/sys-devel/kgcc64-10.3.0
 2206121540 metadata/md5-cache/sys-devel/kgcc64-11.2.1_p20220115
 2206121540 metadata/md5-cache/sys-devel/kgcc64-11.3.0
 2206121540 metadata/md5-cache/sys-devel/kgcc64-9.3.0-r2
 2206121540 metadata/md5-cache/sys-devel/kgcc64-9.4.0
+2206161510 metadata/md5-cache/sys-devel/Manifest.gz
+2206160140 metadata/md5-cache/sys-devel/gdb-12.1-r1
+2206160140 metadata/md5-cache/sys-devel/gdb-9999
+2206141040 metadata/md5-cache/sys-devel/libtool-2.4.7
+2206161510 metadata/md5-cache/sys-devel/sparse-0.6.4-r2
+2206161110 metadata/md5-cache/sys-devel/sparse-9999
 2205170654 metadata/md5-cache/sys-fabric/Manifest.gz
 2205170654 metadata/md5-cache/sys-fabric/mstflint-4.18.0_p1-r1
 2205170654 metadata/md5-cache/sys-fabric/opensm-3.3.23-r1
@@ -58635,18 +58321,9 @@
 2206071015 metadata/md5-cache/sys-fs/android-file-transfer-linux-4.1
 2206071015 metadata/md5-cache/sys-fs/android-file-transfer-linux-4.2
 2206071015 metadata/md5-cache/sys-fs/android-file-transfer-linux-9999
-2206071015 metadata/md5-cache/sys-fs/btrfs-progs-5.10.1-r1
-2206071015 metadata/md5-cache/sys-fs/btrfs-progs-5.15.1
-2206071015 metadata/md5-cache/sys-fs/btrfs-progs-5.16
-2206071015 metadata/md5-cache/sys-fs/btrfs-progs-5.16.2
-2206080340 metadata/md5-cache/sys-fs/btrfs-progs-5.17
-2206080340 metadata/md5-cache/sys-fs/btrfs-progs-5.18
-2206080340 metadata/md5-cache/sys-fs/btrfs-progs-5.18.1-r1
-2206080340 metadata/md5-cache/sys-fs/btrfs-progs-9999
 2206071015 metadata/md5-cache/sys-fs/cryfs-0.10.3-r1
 2206072340 metadata/md5-cache/sys-fs/cryptmount-5.3.3-r2
 2206080340 metadata/md5-cache/sys-fs/e2fsprogs-1.46.5-r1
-2206080340 metadata/md5-cache/sys-fs/eudev-9999
 2206080340 metadata/md5-cache/sys-fs/fuse-2.9.9-r1
 2206080340 metadata/md5-cache/sys-fs/fuse-3.10.5
 2206080340 metadata/md5-cache/sys-fs/fuse-3.11.0
@@ -58673,9 +58350,6 @@
 2206071015 metadata/md5-cache/sys-fs/unionfs-fuse-2.2-r1
 2206071015 metadata/md5-cache/sys-fs/unionfs-fuse-9999
 2206081710 metadata/md5-cache/sys-fs/zerofree-1.1.1-r1
-2206121142 metadata/md5-cache/sys-fs/bcache-tools-1.1-r1
-2206121142 metadata/md5-cache/sys-fs/bcache-tools-9999
-2206100610 metadata/md5-cache/sys-fs/eudev-3.2.12_pre2
 2206102310 metadata/md5-cache/sys-fs/fuse-overlayfs-1.9
 2206112210 metadata/md5-cache/sys-fs/loop-aes-3.7v
 2206112210 metadata/md5-cache/sys-fs/loop-aes-3.7w
@@ -58690,9 +58364,21 @@
 2206112210 metadata/md5-cache/sys-fs/zfs-kmod-2.0.7
 2206112210 metadata/md5-cache/sys-fs/zfs-kmod-2.1.4-r1
 2206112210 metadata/md5-cache/sys-fs/zfs-kmod-9999
-2206131040 metadata/md5-cache/sys-fs/Manifest.gz
 2206131040 metadata/md5-cache/sys-fs/libeatmydata-130
-2206121940 metadata/md5-cache/sys-fs/lxcfs-5.0.0_p20220524
+2206161510 metadata/md5-cache/sys-fs/Manifest.gz
+2206161510 metadata/md5-cache/sys-fs/bcache-tools-1.1-r1
+2206161510 metadata/md5-cache/sys-fs/bcache-tools-9999
+2206151910 metadata/md5-cache/sys-fs/btrfs-progs-5.10.1-r1
+2206151910 metadata/md5-cache/sys-fs/btrfs-progs-5.15.1
+2206151910 metadata/md5-cache/sys-fs/btrfs-progs-5.16
+2206151910 metadata/md5-cache/sys-fs/btrfs-progs-5.16.2
+2206151910 metadata/md5-cache/sys-fs/btrfs-progs-5.17
+2206151910 metadata/md5-cache/sys-fs/btrfs-progs-5.18
+2206151910 metadata/md5-cache/sys-fs/btrfs-progs-5.18.1-r1
+2206151910 metadata/md5-cache/sys-fs/btrfs-progs-9999
+2206160410 metadata/md5-cache/sys-fs/eudev-3.2.12_pre3
+2206160410 metadata/md5-cache/sys-fs/eudev-9999
+2206141740 metadata/md5-cache/sys-fs/lxcfs-5.0.0_p20220524
 2106270109 metadata/md5-cache/sys-kernel/installkernel-systemd-boot-1
 2112140909 metadata/md5-cache/sys-kernel/raspberrypi-image-4.14.98_p20190215
 2112140909 metadata/md5-cache/sys-kernel/raspberrypi-image-4.19.75_p20190925
@@ -58701,7 +58387,6 @@
 2112140909 metadata/md5-cache/sys-kernel/raspberrypi-image-5.4.79_p20201201
 2203240726 metadata/md5-cache/sys-kernel/linux-next-9999
 2203240726 metadata/md5-cache/sys-kernel/raspberrypi-image-9999
-2203252323 metadata/md5-cache/sys-kernel/linux-firmware-20210518
 2203252323 metadata/md5-cache/sys-kernel/linux-firmware-20210629
 2203252323 metadata/md5-cache/sys-kernel/linux-firmware-20210716
 2203252323 metadata/md5-cache/sys-kernel/linux-firmware-20210818
@@ -58742,10 +58427,6 @@
 2205170654 metadata/md5-cache/sys-kernel/raspberrypi-sources-5.10.63_p20211029
 2205170654 metadata/md5-cache/sys-kernel/raspberrypi-sources-5.10.9999
 2205170654 metadata/md5-cache/sys-kernel/raspberrypi-sources-5.15.32_p20220331-r1
-2205170654 metadata/md5-cache/sys-kernel/rt-sources-4.19.235_p106
-2205170654 metadata/md5-cache/sys-kernel/rt-sources-4.19.237_p107
-2205170654 metadata/md5-cache/sys-kernel/rt-sources-5.10.106_p64
-2205170654 metadata/md5-cache/sys-kernel/rt-sources-5.4.182_p72-r1
 2205170654 metadata/md5-cache/sys-kernel/zen-sources-5.15.10
 2205170654 metadata/md5-cache/sys-kernel/zen-sources-5.17.1
 2205220940 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.117
@@ -58802,11 +58483,9 @@
 2206081310 metadata/md5-cache/sys-kernel/gentoo-kernel-5.17.9
 2206081310 metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.195
 2206081310 metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.196
-2206081310 metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.197
 2206062040 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.120
 2206062040 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.45
 2206062040 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.17.13
-2206070810 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.197
 2206061542 metadata/md5-cache/sys-kernel/gentoo-sources-4.14.282
 2206061542 metadata/md5-cache/sys-kernel/gentoo-sources-4.19.246
 2206061542 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.317
@@ -58818,8 +58497,6 @@
 2206061542 metadata/md5-cache/sys-kernel/git-sources-5.19_rc1
 2206071015 metadata/md5-cache/sys-kernel/linux-docs-5.15.33
 2206060140 metadata/md5-cache/sys-kernel/linux-headers-5.18-r1
-2206071015 metadata/md5-cache/sys-kernel/rt-sources-5.15.29_p37
-2206071015 metadata/md5-cache/sys-kernel/rt-sources-5.16.2_p19
 2206081310 metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.117
 2206081310 metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.118
 2206081310 metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.119
@@ -58835,37 +58512,74 @@
 2206081310 metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.195
 2206081310 metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.196
 2206081310 metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.197
-2206061040 metadata/md5-cache/sys-kernel/vanilla-sources-4.14.282
-2206061040 metadata/md5-cache/sys-kernel/vanilla-sources-4.19.246
-2206061040 metadata/md5-cache/sys-kernel/vanilla-sources-4.9.317
-2206061040 metadata/md5-cache/sys-kernel/vanilla-sources-5.4.197
 2206112210 metadata/md5-cache/sys-kernel/cryptodev-1.11
 2206112210 metadata/md5-cache/sys-kernel/cryptodev-1.12
 2206112210 metadata/md5-cache/sys-kernel/cryptodev-9999
-2206092140 metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.121
-2206092140 metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.46
 2206092140 metadata/md5-cache/sys-kernel/gentoo-kernel-5.17.14
-2206092140 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.121
-2206092140 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.46
 2206092140 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.17.14
 2206091540 metadata/md5-cache/sys-kernel/gentoo-sources-5.10.121
 2206091540 metadata/md5-cache/sys-kernel/gentoo-sources-5.15.46
 2206091540 metadata/md5-cache/sys-kernel/gentoo-sources-5.17.14
 2206091540 metadata/md5-cache/sys-kernel/gentoo-sources-5.18.3
 2206121142 metadata/md5-cache/sys-kernel/kergen-0.1.5
-2206112210 metadata/md5-cache/sys-kernel/kpatch-0.6.3-r1
-2206112210 metadata/md5-cache/sys-kernel/kpatch-0.7.1-r1
 2206112210 metadata/md5-cache/sys-kernel/kpatch-0.9.4
 2206112210 metadata/md5-cache/sys-kernel/kpatch-9999
 2206092140 metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.121
 2206092140 metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.46
 2206092140 metadata/md5-cache/sys-kernel/vanilla-kernel-5.17.14
-2206091410 metadata/md5-cache/sys-kernel/vanilla-sources-5.10.121
-2206091410 metadata/md5-cache/sys-kernel/vanilla-sources-5.15.46
-2206091410 metadata/md5-cache/sys-kernel/vanilla-sources-5.17.14
-2206091410 metadata/md5-cache/sys-kernel/vanilla-sources-5.18.3
-2206130340 metadata/md5-cache/sys-kernel/Manifest.gz
 2206130340 metadata/md5-cache/sys-kernel/git-sources-5.19_rc2
+2206161910 metadata/md5-cache/sys-kernel/Manifest.gz
+2206161910 metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.121
+2206151740 metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.122
+2206161910 metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.46
+2206151740 metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.47
+2206151740 metadata/md5-cache/sys-kernel/gentoo-kernel-5.17.15
+2206152240 metadata/md5-cache/sys-kernel/gentoo-kernel-5.18.4
+2206161910 metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.197
+2206151740 metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.198
+2206161910 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.121
+2206151740 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.122
+2206161910 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.46
+2206151740 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.47
+2206151740 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.17.15
+2206152240 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.18.4
+2206161910 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.197
+2206151740 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.198
+2206141940 metadata/md5-cache/sys-kernel/gentoo-sources-4.14.283
+2206161540 metadata/md5-cache/sys-kernel/gentoo-sources-4.14.284
+2206141940 metadata/md5-cache/sys-kernel/gentoo-sources-4.19.247
+2206161540 metadata/md5-cache/sys-kernel/gentoo-sources-4.19.248
+2206141940 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.318
+2206161540 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.319
+2206142110 metadata/md5-cache/sys-kernel/gentoo-sources-5.10.122
+2206161540 metadata/md5-cache/sys-kernel/gentoo-sources-5.10.123
+2206142110 metadata/md5-cache/sys-kernel/gentoo-sources-5.15.47
+2206161540 metadata/md5-cache/sys-kernel/gentoo-sources-5.15.48
+2206142110 metadata/md5-cache/sys-kernel/gentoo-sources-5.17.15
+2206142110 metadata/md5-cache/sys-kernel/gentoo-sources-5.18.4
+2206161540 metadata/md5-cache/sys-kernel/gentoo-sources-5.18.5
+2206142110 metadata/md5-cache/sys-kernel/gentoo-sources-5.4.198
+2206161540 metadata/md5-cache/sys-kernel/gentoo-sources-5.4.199
+2206152110 metadata/md5-cache/sys-kernel/kpatch-0.9.6
+2206131440 metadata/md5-cache/sys-kernel/linux-firmware-20220610
+2206151940 metadata/md5-cache/sys-kernel/rt-sources-4.19.246_p110
+2206151940 metadata/md5-cache/sys-kernel/rt-sources-5.10.120_p70
+2206151940 metadata/md5-cache/sys-kernel/rt-sources-5.15.44_p46
+2206151940 metadata/md5-cache/sys-kernel/rt-sources-5.18_p11
+2206151940 metadata/md5-cache/sys-kernel/rt-sources-5.4.193_p74
+2206151740 metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.122
+2206151740 metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.47
+2206151740 metadata/md5-cache/sys-kernel/vanilla-kernel-5.17.15
+2206152240 metadata/md5-cache/sys-kernel/vanilla-kernel-5.18.4
+2206151740 metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.198
+2206161510 metadata/md5-cache/sys-kernel/vanilla-sources-4.14.284
+2206161510 metadata/md5-cache/sys-kernel/vanilla-sources-4.19.248
+2206161510 metadata/md5-cache/sys-kernel/vanilla-sources-4.9.319
+2206161510 metadata/md5-cache/sys-kernel/vanilla-sources-5.10.123
+2206161510 metadata/md5-cache/sys-kernel/vanilla-sources-5.15.48
+2206142040 metadata/md5-cache/sys-kernel/vanilla-sources-5.17.15
+2206161510 metadata/md5-cache/sys-kernel/vanilla-sources-5.18.5
+2206161510 metadata/md5-cache/sys-kernel/vanilla-sources-5.4.199
 2106100309 metadata/md5-cache/sys-libs/fortify-headers-1.1
 1908101709 metadata/md5-cache/sys-libs/libservicelog-1.1.18
 2107081310 metadata/md5-cache/sys-libs/lwp-2.8
@@ -58907,7 +58621,6 @@
 2205170654 metadata/md5-cache/sys-libs/kpmcore-21.12.3
 2205170654 metadata/md5-cache/sys-libs/libaal-1.0.7-r2
 2205190840 metadata/md5-cache/sys-libs/libavc1394-0.5.4-r2
-2205170654 metadata/md5-cache/sys-libs/libcap-2.63
 2205170654 metadata/md5-cache/sys-libs/libcap-9999
 2205170654 metadata/md5-cache/sys-libs/libfaketime-0.9.6-r4
 2205191240 metadata/md5-cache/sys-libs/libfaketime-0.9.9
@@ -59078,8 +58791,8 @@
 2206121142 metadata/md5-cache/sys-libs/pam_wrapper-1.1.3-r3
 2206121142 metadata/md5-cache/sys-libs/pam_wrapper-1.1.4-r1
 2206091110 metadata/md5-cache/sys-libs/zlib-1.2.12-r2
-2206121910 metadata/md5-cache/sys-libs/Manifest.gz
-2206121910 metadata/md5-cache/sys-libs/libapparmor-3.0.3-r1
+2206150040 metadata/md5-cache/sys-libs/Manifest.gz
+2206150040 metadata/md5-cache/sys-libs/libapparmor-3.0.3-r1
 2110201309 metadata/md5-cache/sys-power/acpi-1.7-r1
 2104252209 metadata/md5-cache/sys-power/acpitool-0.5.1-r2
 1901132309 metadata/md5-cache/sys-power/hibernate-script-2.0-r6
@@ -59114,18 +58827,18 @@
 2205270240 metadata/md5-cache/sys-power/iasl-20200717
 2206032210 metadata/md5-cache/sys-power/cpupower-5.18
 2206080340 metadata/md5-cache/sys-power/acpilight-1.2-r3
-2206080340 metadata/md5-cache/sys-power/apcupsd-3.14.14-r3
 2206080340 metadata/md5-cache/sys-power/sispmctl-4.1-r1
 2206071015 metadata/md5-cache/sys-power/switcheroo-control-2.4
 2206080340 metadata/md5-cache/sys-power/upower-0.99.17
 2206080340 metadata/md5-cache/sys-power/upower-0.99.18
-2206112210 metadata/md5-cache/sys-power/Manifest.gz
 2206112210 metadata/md5-cache/sys-power/acpi_call-1.2.2
 2206112210 metadata/md5-cache/sys-power/acpi_call-9999
 2206091110 metadata/md5-cache/sys-power/acpilight-1.2-r4
 2206112210 metadata/md5-cache/sys-power/bbswitch-0.8_p20211129
 2206112210 metadata/md5-cache/sys-power/tuxedo-cc-wmi-0.1.4-r1
 2206082110 metadata/md5-cache/sys-power/upower-0.99.19
+2206161940 metadata/md5-cache/sys-power/Manifest.gz
+2206161940 metadata/md5-cache/sys-power/apcupsd-3.14.14-r3
 2005291309 metadata/md5-cache/sys-process/minicoredumper-2.0.1-r1
 2002112051 metadata/md5-cache/sys-process/supervise-scripts-4.0-r1
 2009171809 metadata/md5-cache/sys-process/xjobs-20200726
@@ -59465,11 +59178,7 @@
 2206062040 metadata/md5-cache/virtual/dist-kernel-5.10.120
 2206062040 metadata/md5-cache/virtual/dist-kernel-5.15.45
 2206062040 metadata/md5-cache/virtual/dist-kernel-5.17.13
-2206070810 metadata/md5-cache/virtual/dist-kernel-5.4.197
 2206072240 metadata/md5-cache/virtual/pandoc-0
-2206121142 metadata/md5-cache/virtual/Manifest.gz
-2206092140 metadata/md5-cache/virtual/dist-kernel-5.10.121
-2206092140 metadata/md5-cache/virtual/dist-kernel-5.15.46
 2206092140 metadata/md5-cache/virtual/dist-kernel-5.17.14
 2206091110 metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.103.0-r2
 2206091110 metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.103.0-r1
@@ -59478,6 +59187,15 @@
 2206121142 metadata/md5-cache/virtual/python-cffi-1
 2206121142 metadata/md5-cache/virtual/python-greenlet-1.0-r2
 2206101010 metadata/md5-cache/virtual/rust-1.60.0
+2206161910 metadata/md5-cache/virtual/Manifest.gz
+2206161910 metadata/md5-cache/virtual/dist-kernel-5.10.121
+2206151740 metadata/md5-cache/virtual/dist-kernel-5.10.122
+2206161910 metadata/md5-cache/virtual/dist-kernel-5.15.46
+2206151740 metadata/md5-cache/virtual/dist-kernel-5.15.47
+2206151740 metadata/md5-cache/virtual/dist-kernel-5.17.15
+2206152240 metadata/md5-cache/virtual/dist-kernel-5.18.4
+2206161910 metadata/md5-cache/virtual/dist-kernel-5.4.197
+2206151740 metadata/md5-cache/virtual/dist-kernel-5.4.198
 2112220410 metadata/md5-cache/www-apache/modsecurity-crs-3.3.2
 2203240726 metadata/md5-cache/www-apache/mod_auth_radius-1.6.0
 2203240726 metadata/md5-cache/www-apache/mod_auth_tkt-2.1.0-r2
@@ -59678,7 +59396,6 @@
 2205170654 metadata/md5-cache/www-client/luakit-9999
 2205170654 metadata/md5-cache/www-client/netrik-1.16.1-r3
 2205170654 metadata/md5-cache/www-client/netsurf-3.10-r6
-2205191940 metadata/md5-cache/www-client/opera-beta-88.0.4412.13
 2205170654 metadata/md5-cache/www-client/otter-1.0.03
 2205170654 metadata/md5-cache/www-client/otter-9999
 2205170654 metadata/md5-cache/www-client/surfraw-2.3.0-r3
@@ -59689,58 +59406,57 @@
 2205170654 metadata/md5-cache/www-client/w3m-0.5.3_p20220429
 2205170654 metadata/md5-cache/www-client/w3mmee-0.3.2_p24-r12
 2205202210 metadata/md5-cache/www-client/falkon-3.2.0-r1
-2205242210 metadata/md5-cache/www-client/opera-developer-89.0.4428.0
 2205261010 metadata/md5-cache/www-client/links-2.26-r1
 2205302240 metadata/md5-cache/www-client/links-2.27
-2205271640 metadata/md5-cache/www-client/opera-beta-88.0.4412.18
 2205311340 metadata/md5-cache/www-client/opera-developer-89.0.4436.0
 2206010840 metadata/md5-cache/www-client/firefox-bin-91.10.0
 2205312340 metadata/md5-cache/www-client/microsoft-edge-dev-103.0.1264.11
 2206021440 metadata/md5-cache/www-client/microsoft-edge-dev-104.0.1271.2
 2206030910 metadata/md5-cache/www-client/microsoft-edge-beta-103.0.1264.13
-2206030910 metadata/md5-cache/www-client/opera-beta-88.0.4412.20
 2206071015 metadata/md5-cache/www-client/chromium-102.0.5005.61
 2206071015 metadata/md5-cache/www-client/chromium-103.0.5060.33
 2206071015 metadata/md5-cache/www-client/elinks-0.13.5-r100
 2206071015 metadata/md5-cache/www-client/elinks-9999
 2206071015 metadata/md5-cache/www-client/epiphany-42.2
-2206071015 metadata/md5-cache/www-client/firefox-101.0
-2206071015 metadata/md5-cache/www-client/firefox-101.0-r10
 2206071040 metadata/md5-cache/www-client/microsoft-edge-beta-103.0.1264.17
 2206071040 metadata/md5-cache/www-client/opera-developer-89.0.4443.0
 2206071015 metadata/md5-cache/www-client/seamonkey-2.53.10.2
 2206071015 metadata/md5-cache/www-client/seamonkey-2.53.11
 2206071015 metadata/md5-cache/www-client/seamonkey-2.53.11-r1
 2206071015 metadata/md5-cache/www-client/seamonkey-2.53.11.1
-2206071015 metadata/md5-cache/www-client/seamonkey-2.53.12
-2206081140 metadata/md5-cache/www-client/vivaldi-snapshot-5.3.2679.46
-2206121142 metadata/md5-cache/www-client/Manifest.gz
-2206101540 metadata/md5-cache/www-client/chromium-102.0.5005.115
-2206111410 metadata/md5-cache/www-client/chromium-104.0.5110.0
 2206112110 metadata/md5-cache/www-client/chromium-bin-102.0.5005.115
 2206091440 metadata/md5-cache/www-client/falkon-22.04.2
-2206091940 metadata/md5-cache/www-client/firefox-101.0.1
-2206092010 metadata/md5-cache/www-client/firefox-101.0.1-r10
 2206092140 metadata/md5-cache/www-client/firefox-91.10.0
 2206090910 metadata/md5-cache/www-client/firefox-bin-101.0.1
 2206101540 metadata/md5-cache/www-client/google-chrome-102.0.5005.115
 2206091140 metadata/md5-cache/www-client/google-chrome-beta-103.0.5060.42
 2206111410 metadata/md5-cache/www-client/google-chrome-unstable-104.0.5110.0
-2206101540 metadata/md5-cache/www-client/microsoft-edge-102.0.1245.39
 2206111410 metadata/md5-cache/www-client/microsoft-edge-beta-103.0.1264.21
 2206091140 metadata/md5-cache/www-client/microsoft-edge-dev-104.0.1278.2
-2206091140 metadata/md5-cache/www-client/opera-88.0.4412.27
 2206121142 metadata/md5-cache/www-client/pybugz-0.13-r1
 2206121142 metadata/md5-cache/www-client/pybugz-0.13-r2
 2206121142 metadata/md5-cache/www-client/pybugz-9999
 2206121142 metadata/md5-cache/www-client/qutebrowser-2.5.0
-2206121142 metadata/md5-cache/www-client/qutebrowser-2.5.1
 2206121142 metadata/md5-cache/www-client/qutebrowser-9999
 2206091110 metadata/md5-cache/www-client/surf-2.1-r1
 2206091110 metadata/md5-cache/www-client/surf-9999
 2206121142 metadata/md5-cache/www-client/vivaldi-5.3.2679.51
 2206121142 metadata/md5-cache/www-client/vivaldi-5.3.2679.55
 2206111410 metadata/md5-cache/www-client/vivaldi-snapshot-5.3.2679.50
+2206161940 metadata/md5-cache/www-client/Manifest.gz
+2206140040 metadata/md5-cache/www-client/chromium-102.0.5005.115
+2206142010 metadata/md5-cache/www-client/chromium-104.0.5110.0
+2206151440 metadata/md5-cache/www-client/firefox-101.0.1
+2206151440 metadata/md5-cache/www-client/firefox-101.0.1-r10
+2206141210 metadata/md5-cache/www-client/microsoft-edge-102.0.1245.41
+2206141210 metadata/md5-cache/www-client/opera-88.0.4412.40
+2206141210 metadata/md5-cache/www-client/opera-beta-88.0.4412.18-r1
+2206141210 metadata/md5-cache/www-client/opera-beta-88.0.4412.20-r1
+2206151940 metadata/md5-cache/www-client/opera-beta-89.0.4447.12
+2206141210 metadata/md5-cache/www-client/opera-developer-90.0.4450.0
+2206161640 metadata/md5-cache/www-client/qutebrowser-2.5.1
+2206161940 metadata/md5-cache/www-client/seamonkey-2.53.12
+2206160140 metadata/md5-cache/www-client/vivaldi-snapshot-5.4.2704.3
 2104161439 metadata/md5-cache/www-misc/awstats-7.8-r1
 1910071209 metadata/md5-cache/www-misc/profile-sync-daemon-5.75
 1910090839 metadata/md5-cache/www-misc/profile-sync-daemon-6.35
@@ -59806,14 +59522,11 @@
 2205170654 metadata/md5-cache/www-servers/sniproxy-0.6.0-r1
 2205170654 metadata/md5-cache/www-servers/thttpd-2.27.1-r2
 2205170654 metadata/md5-cache/www-servers/thttpd-9999
-2205170654 metadata/md5-cache/www-servers/tomcat-10.0.21
-2205170654 metadata/md5-cache/www-servers/tomcat-9.0.63
 2205170654 metadata/md5-cache/www-servers/webfs-1.21
 2205170654 metadata/md5-cache/www-servers/xsp-3.8_p2014120900-r1
 2205170654 metadata/md5-cache/www-servers/xsp-4.7.1-r1
 2205220911 metadata/md5-cache/www-servers/adsf-1.4.6-r1
 2205220911 metadata/md5-cache/www-servers/thin-1.8.1
-2205241040 metadata/md5-cache/www-servers/tomcat-8.5.79
 2205311040 metadata/md5-cache/www-servers/tomcat-10.0.20
 2205311040 metadata/md5-cache/www-servers/tomcat-9.0.62
 2206011440 metadata/md5-cache/www-servers/tomcat-7.0.109-r1
@@ -59824,7 +59537,6 @@
 2206081210 metadata/md5-cache/www-servers/nginx-1.21.6-r1
 2206071015 metadata/md5-cache/www-servers/nginx-unit-1.26.1
 2206071015 metadata/md5-cache/www-servers/pshs-0.4.1
-2206121142 metadata/md5-cache/www-servers/Manifest.gz
 2206121142 metadata/md5-cache/www-servers/gunicorn-20.1.0
 2206121142 metadata/md5-cache/www-servers/gunicorn-20.1.0-r1
 2206110840 metadata/md5-cache/www-servers/pound-3.0
@@ -59841,6 +59553,11 @@
 2206121142 metadata/md5-cache/www-servers/varnish-6.6.1
 2206121142 metadata/md5-cache/www-servers/varnish-7.0.1
 2206121142 metadata/md5-cache/www-servers/varnish-7.1.0
+2206160940 metadata/md5-cache/www-servers/Manifest.gz
+2206160940 metadata/md5-cache/www-servers/tomcat-10.0.21
+2206160940 metadata/md5-cache/www-servers/tomcat-8.5.79
+2206140710 metadata/md5-cache/www-servers/tomcat-8.5.81
+2206160940 metadata/md5-cache/www-servers/tomcat-9.0.63
 2112190440 metadata/md5-cache/x11-apps/mesa-progs-8.4.0-r1
 2205100440 metadata/md5-cache/x11-apps/luit-20220111
 2205170654 metadata/md5-cache/x11-apps/bdftopcf-1.1-r1
@@ -59947,15 +59664,15 @@
 2206071015 metadata/md5-cache/x11-base/xorg-server-21.1.3-r2
 2206071015 metadata/md5-cache/x11-base/xorg-server-9999
 2206071015 metadata/md5-cache/x11-base/xwayland-22.1.1
-2206071015 metadata/md5-cache/x11-base/xwayland-22.1.2
 2206071015 metadata/md5-cache/x11-base/xwayland-9999
-2206121142 metadata/md5-cache/x11-base/Manifest.gz
 2206121142 metadata/md5-cache/x11-base/xcb-proto-1.14.1
-2206121142 metadata/md5-cache/x11-base/xcb-proto-1.15
 2206101040 metadata/md5-cache/x11-base/xorg-server-21.1.3-r3
+2206161940 metadata/md5-cache/x11-base/Manifest.gz
+2206161840 metadata/md5-cache/x11-base/xcb-proto-1.15
+2206161940 metadata/md5-cache/x11-base/xcb-proto-1.15.1
+2206161840 metadata/md5-cache/x11-base/xwayland-22.1.2
 2202012143 metadata/md5-cache/x11-drivers/xf86-input-mtrack-0.5.0
 2205170654 metadata/md5-cache/x11-drivers/xf86-input-libinput-1.2.0
-2205170654 metadata/md5-cache/x11-drivers/xf86-input-libinput-1.2.1
 2205170654 metadata/md5-cache/x11-drivers/xf86-video-ast-1.1.5
 2205170654 metadata/md5-cache/x11-drivers/xf86-video-fbdev-0.5.0-r1
 2205170654 metadata/md5-cache/x11-drivers/xf86-video-geode-2.11.20
@@ -59987,12 +59704,13 @@
 2206080340 metadata/md5-cache/x11-drivers/xf86-input-wacom-0.40.0
 2206080340 metadata/md5-cache/x11-drivers/xf86-input-wacom-1.0.0
 2206071015 metadata/md5-cache/x11-drivers/xf86-video-qxl-0.1.5_p20200205-r1
-2206122010 metadata/md5-cache/x11-drivers/Manifest.gz
 2206122010 metadata/md5-cache/x11-drivers/nvidia-drivers-390.151
 2206122010 metadata/md5-cache/x11-drivers/nvidia-drivers-470.129.06
 2206122010 metadata/md5-cache/x11-drivers/nvidia-drivers-470.62.30
 2206122010 metadata/md5-cache/x11-drivers/nvidia-drivers-510.73.05-r1
 2206122010 metadata/md5-cache/x11-drivers/nvidia-drivers-515.48.07
+2206161840 metadata/md5-cache/x11-drivers/Manifest.gz
+2206161840 metadata/md5-cache/x11-drivers/xf86-input-libinput-1.2.1
 2102271539 metadata/md5-cache/x11-libs/fox-wrapper-3
 2104031909 metadata/md5-cache/x11-libs/gtkdatabox-0.9.3.0
 2002101739 metadata/md5-cache/x11-libs/libGLw-8.0.0-r1
@@ -60091,7 +59809,6 @@
 2205170654 metadata/md5-cache/x11-libs/libxklavier-5.4
 2205170654 metadata/md5-cache/x11-libs/libxshmfence-1.3-r2
 2205170654 metadata/md5-cache/x11-libs/motif-2.3.8-r2
-2205170654 metadata/md5-cache/x11-libs/motif-2.3.8-r3
 2205170654 metadata/md5-cache/x11-libs/pango-1.42.4-r2
 2205170654 metadata/md5-cache/x11-libs/qscintilla-2.11.6
 2205170654 metadata/md5-cache/x11-libs/qtermwidget-0.17.0
@@ -60145,7 +59862,6 @@
 2206071015 metadata/md5-cache/x11-libs/libXvMC-1.0.13
 2206052140 metadata/md5-cache/x11-libs/libcryptui-3.12.2-r1
 2206071015 metadata/md5-cache/x11-libs/libdrm-2.4.110
-2206071015 metadata/md5-cache/x11-libs/libdrm-2.4.111
 2206071015 metadata/md5-cache/x11-libs/libdrm-9999
 2206071015 metadata/md5-cache/x11-libs/libnotify-0.7.12
 2206071015 metadata/md5-cache/x11-libs/libnotify-0.7.9-r1
@@ -60154,19 +59870,22 @@
 2206071015 metadata/md5-cache/x11-libs/libvdpau-1.5
 2206071015 metadata/md5-cache/x11-libs/libwnck-40.1
 2206071015 metadata/md5-cache/x11-libs/libxcb-1.14
-2206071015 metadata/md5-cache/x11-libs/libxcb-1.15
 2206071015 metadata/md5-cache/x11-libs/libxcvt-0.1.1
 2206071015 metadata/md5-cache/x11-libs/libxcvt-9999
 2206071015 metadata/md5-cache/x11-libs/libxkbcommon-1.4.0
-2206071015 metadata/md5-cache/x11-libs/libxkbcommon-1.4.1
-2206071015 metadata/md5-cache/x11-libs/pango-1.50.7
 2206071015 metadata/md5-cache/x11-libs/pixman-0.40.0
 2206071015 metadata/md5-cache/x11-libs/pixman-9999
 2206070940 metadata/md5-cache/x11-libs/spread-sheet-widget-0.7
 2206071015 metadata/md5-cache/x11-libs/vte-0.68.0
 2206121142 metadata/md5-cache/x11-libs/xapp-2.2.8
-2206122240 metadata/md5-cache/x11-libs/Manifest.gz
 2206122240 metadata/md5-cache/x11-libs/libX11-1.8.1
+2206161840 metadata/md5-cache/x11-libs/Manifest.gz
+2206161840 metadata/md5-cache/x11-libs/libdrm-2.4.111
+2206132240 metadata/md5-cache/x11-libs/libva-intel-media-driver-22.4.3
+2206161840 metadata/md5-cache/x11-libs/libxcb-1.15
+2206161840 metadata/md5-cache/x11-libs/libxkbcommon-1.4.1
+2206161210 metadata/md5-cache/x11-libs/motif-2.3.8-r3
+2206141840 metadata/md5-cache/x11-libs/pango-1.50.7
 1703221038 metadata/md5-cache/x11-misc/3dfm-1.0-r1
 1805220439 metadata/md5-cache/x11-misc/autocutsel-0.10.0
 1910111911 metadata/md5-cache/x11-misc/bblaunch-0.0.3
@@ -60528,7 +60247,6 @@
 2206071015 metadata/md5-cache/x11-misc/shared-mime-info-2.1
 2206071015 metadata/md5-cache/x11-misc/shared-mime-info-2.2
 2206071015 metadata/md5-cache/x11-misc/xkeyboard-config-2.35.1
-2206071015 metadata/md5-cache/x11-misc/xkeyboard-config-2.36
 2206071015 metadata/md5-cache/x11-misc/xkeyboard-config-9999
 2206121142 metadata/md5-cache/x11-misc/arandr-0.1.10-r2
 2206121142 metadata/md5-cache/x11-misc/autorandr-1.11-r1
@@ -60544,7 +60262,6 @@
 2206121142 metadata/md5-cache/x11-misc/mugshot-0.4.3-r1
 2206121142 metadata/md5-cache/x11-misc/picom-9.1
 2206121410 metadata/md5-cache/x11-misc/piedock-1.6.9
-2206121142 metadata/md5-cache/x11-misc/py3status-3.44
 2206121142 metadata/md5-cache/x11-misc/redshift-1.12-r3
 2206121142 metadata/md5-cache/x11-misc/redshift-1.12-r4
 2206121142 metadata/md5-cache/x11-misc/redshift-1.12-r5
@@ -60565,8 +60282,10 @@
 2206121142 metadata/md5-cache/x11-misc/zim-0.74.1
 2206121142 metadata/md5-cache/x11-misc/zim-0.74.2
 2206121142 metadata/md5-cache/x11-misc/zim-0.74.3
-2206122240 metadata/md5-cache/x11-misc/Manifest.gz
 2206122240 metadata/md5-cache/x11-misc/compose-tables-1.8.1
+2206161840 metadata/md5-cache/x11-misc/Manifest.gz
+2206161710 metadata/md5-cache/x11-misc/py3status-3.45
+2206161840 metadata/md5-cache/x11-misc/xkeyboard-config-2.36
 1908180209 metadata/md5-cache/x11-plugins/e16-epplets-0.16
 1905230009 metadata/md5-cache/x11-plugins/gkrellm-plugins-2.0
 2104120442 metadata/md5-cache/x11-plugins/guifications-2.16
@@ -60632,7 +60351,6 @@
 2205170654 metadata/md5-cache/x11-plugins/astime-2.8-r2
 2205170654 metadata/md5-cache/x11-plugins/bfm-0.6.4-r3
 2205170654 metadata/md5-cache/x11-plugins/bubblemon-1.46-r3
-2205170654 metadata/md5-cache/x11-plugins/cputnik-0.2.0-r1
 2205170654 metadata/md5-cache/x11-plugins/docker-1.5-r2
 2205170654 metadata/md5-cache/x11-plugins/gkrellaclock-0.3.4-r1
 2205170654 metadata/md5-cache/x11-plugins/gkrellfire-0.4.2-r1
@@ -60770,8 +60488,10 @@
 2206071015 metadata/md5-cache/x11-plugins/enigmail-2.0.12-r1
 2206071015 metadata/md5-cache/x11-plugins/enigmail-2.2.4
 2206071015 metadata/md5-cache/x11-plugins/enigmail-9999
-2206110110 metadata/md5-cache/x11-plugins/Manifest.gz
 2206110110 metadata/md5-cache/x11-plugins/wmbattery-2.56
+2206152340 metadata/md5-cache/x11-plugins/Manifest.gz
+2206152340 metadata/md5-cache/x11-plugins/asclock-2.0.12-r4
+2206152340 metadata/md5-cache/x11-plugins/cputnik-0.2.0-r1
 2107171439 metadata/md5-cache/x11-terms/mlterm-3.9.1-r2
 2201091240 metadata/md5-cache/x11-terms/st-terminfo-0.8.5
 2203240726 metadata/md5-cache/x11-terms/kitty-terminfo-9999
@@ -60812,18 +60532,18 @@
 2206071015 metadata/md5-cache/x11-terms/gnome-terminal-3.44.0
 2206071015 metadata/md5-cache/x11-terms/gnome-terminal-3.44.1
 2206071015 metadata/md5-cache/x11-terms/kitty-0.25.1
-2206071310 metadata/md5-cache/x11-terms/kitty-0.25.2
 2206071015 metadata/md5-cache/x11-terms/kitty-9999
-2206071310 metadata/md5-cache/x11-terms/kitty-shell-integration-0.25.2
-2206071310 metadata/md5-cache/x11-terms/kitty-terminfo-0.25.2
 2206071015 metadata/md5-cache/x11-terms/terminology-1.11.0
 2206071015 metadata/md5-cache/x11-terms/terminology-1.12.1-r1
 2206071015 metadata/md5-cache/x11-terms/zutty-0.11
 2206071015 metadata/md5-cache/x11-terms/zutty-0.12
-2206121142 metadata/md5-cache/x11-terms/Manifest.gz
 2206121142 metadata/md5-cache/x11-terms/guake-3.8.5
 2206121142 metadata/md5-cache/x11-terms/terminator-2.1.1
 2206121142 metadata/md5-cache/x11-terms/terminator-2.1.1-r1
+2206161640 metadata/md5-cache/x11-terms/Manifest.gz
+2206161640 metadata/md5-cache/x11-terms/kitty-0.25.2
+2206161640 metadata/md5-cache/x11-terms/kitty-shell-integration-0.25.2
+2206161640 metadata/md5-cache/x11-terms/kitty-terminfo-0.25.2
 2104262239 metadata/md5-cache/x11-themes/blueglass-xcursors-0.4-r1
 2107020739 metadata/md5-cache/x11-themes/comix-xcursors-0.9.2
 2012311940 metadata/md5-cache/x11-themes/commonbox-styles-0.6
@@ -61031,7 +60751,6 @@
 2205170654 metadata/md5-cache/x11-wm/muffin-5.2.0
 2205170654 metadata/md5-cache/x11-wm/musca-0.9.24_p20100226-r4
 2205170654 metadata/md5-cache/x11-wm/notion-3_p2015061300-r100
-2205170654 metadata/md5-cache/x11-wm/notion-9999
 2205170654 metadata/md5-cache/x11-wm/page-1.9.8
 2205170654 metadata/md5-cache/x11-wm/page-1.9.9-r3
 2205170654 metadata/md5-cache/x11-wm/pekwm-0.1.18
@@ -61081,9 +60800,13 @@
 2206121142 metadata/md5-cache/x11-wm/xpra-4.2
 2206121142 metadata/md5-cache/x11-wm/xpra-4.3.3
 2206121142 metadata/md5-cache/x11-wm/xpra-9999
-2206131240 metadata/md5-cache/x11-wm/Manifest.gz
 2206122310 metadata/md5-cache/x11-wm/blackbox-0.77
 2206131240 metadata/md5-cache/x11-wm/herbstluftwm-0.9.4
+2206152340 metadata/md5-cache/x11-wm/Manifest.gz
+2206131610 metadata/md5-cache/x11-wm/notion-4.0.2_p20220613
+2206131610 metadata/md5-cache/x11-wm/notion-9999
+2206152340 metadata/md5-cache/x11-wm/windowlab-1.40-r2
+2206141610 metadata/md5-cache/x11-wm/wmii-3.9.2-r7
 2107251109 metadata/md5-cache/xfce-base/xfce4-meta-4.16-r2
 2203240726 metadata/md5-cache/xfce-base/exo-4.17.1
 2203240726 metadata/md5-cache/xfce-base/garcon-0.8.0
@@ -61106,9 +60829,9 @@
 2205230840 metadata/md5-cache/xfce-base/xfce4-panel-4.17.1
 2206071310 metadata/md5-cache/xfce-base/xfce4-panel-4.16.4
 2206071015 metadata/md5-cache/xfce-base/xfce4-settings-4.16.2
-2206121142 metadata/md5-cache/xfce-base/Manifest.gz
-2206121142 metadata/md5-cache/xfce-base/exo-4.16.4
 2206111440 metadata/md5-cache/xfce-base/exo-4.17.2
+2206150040 metadata/md5-cache/xfce-base/Manifest.gz
+2206150040 metadata/md5-cache/xfce-base/exo-4.16.4
 2102190139 metadata/md5-cache/xfce-extra/xfce4-verve-plugin-2.0.1
 2111190939 metadata/md5-cache/xfce-extra/thunar-media-tags-plugin-0.3.0
 2111190939 metadata/md5-cache/xfce-extra/thunar-shares-plugin-0.3.1
@@ -61160,8 +60883,9 @@
 2206071015 metadata/md5-cache/xfce-extra/xfce4-alsa-plugin-0.3.0
 2206061341 metadata/md5-cache/xfce-extra/xfce4-eyes-plugin-4.6.0
 2206071015 metadata/md5-cache/xfce-extra/xfce4-panel-profiles-1.0.13
-2206121340 metadata/md5-cache/xfce-extra/Manifest.gz
 2206121340 metadata/md5-cache/xfce-extra/tumbler-4.17.1
+2206141910 metadata/md5-cache/xfce-extra/Manifest.gz
+2206141910 metadata/md5-cache/xfce-extra/xfce4-wavelan-plugin-0.6.3
 2112201210 metadata/md5-cache/app-containers/docker-bench-security-1.3.2
 2112201210 metadata/md5-cache/app-containers/docker-bench-security-1.3.3
 2112201210 metadata/md5-cache/app-containers/s6-overlay-2.1.0.2-r1
@@ -61205,8 +60929,6 @@
 2205170654 metadata/md5-cache/app-containers/docker-cli-20.10.12
 2205170654 metadata/md5-cache/app-containers/docker-cli-20.10.14
 2205171840 metadata/md5-cache/app-containers/docker-cli-20.10.16
-2205170654 metadata/md5-cache/app-containers/docker-compose-2.3.3-r2
-2205170654 metadata/md5-cache/app-containers/docker-compose-2.4.1
 2205170654 metadata/md5-cache/app-containers/docker-compose-2.5.0
 2205171810 metadata/md5-cache/app-containers/docker-proxy-0.8.0_p20220315
 2205170654 metadata/md5-cache/app-containers/docker-registry-2.7.1-r1
@@ -61227,7 +60949,6 @@
 2205170654 metadata/md5-cache/app-containers/slirp4netns-1.1.12-r1
 2205170654 metadata/md5-cache/app-containers/slirp4netns-1.1.9
 2205170654 metadata/md5-cache/app-containers/slirp4netns-1.2.0
-2205221140 metadata/md5-cache/app-containers/lxd-4.0.9-r3
 2205230010 metadata/md5-cache/app-containers/snapd-2.56
 2205232240 metadata/md5-cache/app-containers/cadvisor-0.36.0
 2205300140 metadata/md5-cache/app-containers/apptainer-1.0.2
@@ -61241,10 +60962,13 @@
 2206080340 metadata/md5-cache/app-containers/docker-20.10.14
 2206080340 metadata/md5-cache/app-containers/docker-20.10.16
 2206051940 metadata/md5-cache/app-containers/k3d-5.4.2
-2206121142 metadata/md5-cache/app-containers/Manifest.gz
 2206121142 metadata/md5-cache/app-containers/docker-compose-1.29.2-r1
-2206111240 metadata/md5-cache/app-containers/lxd-5.0.0
 2206121142 metadata/md5-cache/app-containers/sen-0.6.1_p20200905
+2206161940 metadata/md5-cache/app-containers/Manifest.gz
+2206150440 metadata/md5-cache/app-containers/grype-0.39.0
+2206161940 metadata/md5-cache/app-containers/lxd-4.0.9-r3
+2206141740 metadata/md5-cache/app-containers/lxd-5.0.0
+2206150440 metadata/md5-cache/app-containers/syft-0.47.0
 2204291439 metadata/md5-cache/sec-keys/openpgp-keys-adamspiers-20210426
 2204291439 metadata/md5-cache/sec-keys/openpgp-keys-alexbarton-20210416
 2204291439 metadata/md5-cache/sec-keys/openpgp-keys-antoniodiazdiaz-20220406
@@ -61338,4 +61062,4 @@
 2206111440 metadata/md5-cache/sec-keys/Manifest.gz
 2206110511 metadata/md5-cache/sec-keys/openpgp-keys-file-20220611
 2206111440 metadata/md5-cache/sec-keys/openpgp-keys-llvm-14
-2206131410 metadata/md5-cache/Manifest.gz
+2206162110 metadata/md5-cache/Manifest.gz
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 6fc0152f384d..8318700cbe20 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 13 Jun 2022 11:30:01 +0000
+Thu, 16 Jun 2022 18:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 7bf1e9ada0b0..fd54dd5ae4da 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-63fee1bfbad880001446a6a18073cb1da826d780 1655117848 2022-06-13T10:57:28+00:00
+021fec8c9f1ee142fd85131d3b83706e1fbeacb5 1655401488 2022-06-16T17:44:48+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 831ed701ebf0..c2d911ab861d 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1655118601 Mon 13 Jun 2022 11:10:01 AM UTC
+1655403001 Thu 16 Jun 2022 06:10:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 068f07b813dd..bb1e6ffcdb51 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 13 Jun 2022 11:09:35 +0000
+Thu, 16 Jun 2022 18:09:47 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 4aa6ae932b6d..f1234d686697 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 0e3e6d9ae88a..a01b09bff498 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,9 +1,6 @@
 AUX icinga2.initd 2276 BLAKE2B 9573c876cb1fc6ff641d4503d5446840725d94ac2a824cd124872af84032519a5ee1237b0ebc38783e673cb87169feb48b7690978e9b7d2e38549a7272f403fc SHA512 5b31f748eda8f52d8efe2c744c3c1adacffdb40c04d93cdaf7ee82129d632783362f6ea51b5a4c05ca9cd98d3343abfcfc86c98e99afd429d6bce390b9ffd082
 AUX icinga2.initd-3 2390 BLAKE2B 1ead1dd958d978324dfa043abcc58be7ed389207e2bf4dc4786bd2705f94c70a03b84f34a55435f6d9dfcc0483e35da60c1f536dec1060bdc232108c622e0615 SHA512 a43911717fe891e70690647daa57426f70d10f9cb02c721962be4c13cfe8a95bc3ff84b9ba2a293adafc8ddacf8ea6771bd66e7ff6dabe3e732176bf6e6e474a
-DIST icinga2-2.13.2-9092.patch 1118 BLAKE2B c63342b8eff6afead9bf3ccec5c6df6583c2e327edb1433731ca14743ce9c6b0bde0797c6f251480e3bbfb5e6cdaae3444ea6ae6f6740bc228bd6aae5380044d SHA512 1056ff8bd66f2da86afb9664e3415d713be03b80def6d256b6db57f0864d150bc26c0fd3ce05d836da126a2616f2c70ecce05a83bb5425c25f6204d7e522ef94
-DIST icinga2-2.13.2.tar.gz 7589357 BLAKE2B 6e1ba570e0286f09f37b3cea3b1cd833fd3005c5788e24b750edb100346c46958e97ed5df05947dc47c2bbf856cc6090d661e741072f473b8308aee5e1c0e94e SHA512 39a6f996bca671a2a22fc04e5995714b874e027888a7c9e479d5b526b23104915b7f99afb1220d440af482013043e5b969b0a0145041ac55009d1a81053e2906
 DIST icinga2-2.13.3.tar.gz 7529976 BLAKE2B f661919b0a7b420eba663d6cb01f2223c15b2be7f4ad649e1e09b7b4068d1122d63c6baac490ff3a0bd808066b759138748e70de364eea4d89f560168a448c72 SHA512 818eb565c6d46bfb538d70b9e33bb7424ab6fb98289da9eb947ec1f36b7e3b0e3869db789acd565b5e5b3d8b4819fe991000f4df362e28686dd9e3394cec3743
-EBUILD icinga2-2.13.2-r3.ebuild 4216 BLAKE2B ec5403e9a11550f681cb7009d83ef9d0e2b51ee05144b34b838f60961335d3cadef2ec4b007b8df640dba5ed5d7e843faae71d980d529539ee1d2d53a368c348 SHA512 ccf8629da48e4b499051206ba349a3d641dafc8c5d403f53349241a04db2d5621d65791362356f604790884303ab2eff884c554305a7db753944270c67bf2422
 EBUILD icinga2-2.13.3.ebuild 3992 BLAKE2B bd30da34efda8d4462a26c9341143d1448041dcf3bd478e9e40197ac5de8e75584bec8dac41a2c0eafd1e52243cf4a60c266052c715470ccbf640e13e823aa3b SHA512 fcff3842f02f39e902b1fa16a8fc5603fca0d021f9d17a137248c85b72cb3648df0869936e838b549889cfa61fa397e7dcf2db9ad502f854185e09a8c702ceb3
 EBUILD icinga2-9999.ebuild 3994 BLAKE2B 1ab39f8060c4d052b299d79c4481edba30662e69754cc7595d267e3a68c743115341ca3ec0cfbc0e3f3d4122f27de9bf58b02ffc7942b5df2c6e18fde7f404ea SHA512 b0189c1ea6d4eaffdd0a9f749fb323f31810f51e5e7e71d951df7ef3b0aea9ec5e07f508177655692f853385c50c01a869a3608c590d15140edd82ac7d2364f2
 MISC metadata.xml 871 BLAKE2B ffd6aeebf603ed90bfa4cc34d557e947e435d204c84e062532cedecd3e811710d9bd39f9f43dd70afd575104be5661b5f7e7de3f79365a961d45f61835a602c6 SHA512 3ca0916252061c1705d194066a30a8fc19cfe4341911646b7ed797e131e02f40eeddc91c2449a5b049888be749d16a5103e70678e5d6c1604db0ac3fe9f4e0d7
diff --git a/net-analyzer/icinga2/icinga2-2.13.2-r3.ebuild b/net-analyzer/icinga2/icinga2-2.13.2-r3.ebuild
deleted file mode 100644
index f485dd354e56..000000000000
--- a/net-analyzer/icinga2/icinga2-2.13.2-r3.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-if [[ ${PV} != 9999 ]]; then
-	SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		https://github.com/Icinga/icinga2/commit/8cde21ddfd66a0fcfac704544a0fd7990cfc94ec.patch -> ${P}-9092.patch"
-	KEYWORDS="amd64 ~arm64 x86"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
-fi
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="https://icinga.com/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax"
-
-# Add accounts to DEPEND because of fowners in src_install
-DEPEND="
-	dev-libs/openssl:0=
-	>=dev-libs/boost-1.66.0:=[context]
-	console? ( dev-libs/libedit )
-	mariadb? ( dev-db/mariadb-connector-c:= )
-	mysql? ( dev-db/mysql-connector-c:= )
-	postgres? ( dev-db/postgresql:= )
-	dev-libs/yajl:=
-	acct-user/icinga
-	acct-group/icinga
-	acct-group/icingacmd"
-BDEPEND="
-	sys-devel/bison
-	>=sys-devel/flex-2.5.35"
-RDEPEND="
-	${DEPEND}
-	plugins? ( || (
-		net-analyzer/monitoring-plugins
-		net-analyzer/nagios-plugins
-	) )
-	mail? ( virtual/mailx )
-	acct-group/nagios"
-
-REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
-
-PATCHES=(
-	# https://github.com/Icinga/icinga2/issues/8185#issuecomment-680875875
-	"${DISTDIR}/${P}-9092.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DICINGA2_UNITY_BUILD=$(usex jumbo-build)
-		-DCMAKE_INSTALL_SYSCONFDIR=/etc
-		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
-		-DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
-		-DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
-		-DICINGA2_USER=icinga
-		-DICINGA2_GROUP=icingacmd
-		-DICINGA2_COMMAND_GROUP=icingacmd
-		-DICINGA2_RUNDIR=/run
-		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
-		-DUSE_SYSTEMD=$(usex systemd)
-		-DLOGROTATE_HAS_SU=ON
-		-DICINGA2_LTO_BUILD=$(usex lto)
-	)
-	# default to off if minimal, allow the flags to be set otherwise
-	if use minimal; then
-		mycmakeargs+=(
-			-DICINGA2_WITH_MYSQL=OFF
-			-DICINGA2_WITH_PGSQL=OFF
-		)
-	else
-		mycmakeargs+=(
-			-DICINGA2_WITH_PGSQL=$(usex postgres)
-			-DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb))
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
-
-	if use mysql || use mariadb; then
-		docinto schema
-		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
-		docinto schema/upgrade
-		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
-	fi
-	if use postgres; then
-		docinto schema
-		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
-		docinto schema/upgrade
-		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/*
-	fi
-
-	keepdir /etc/icinga2
-	keepdir /var/lib/icinga2/api/zones
-	keepdir /var/lib/icinga2/api/repository
-	keepdir /var/lib/icinga2/api/log
-	keepdir /var/spool/icinga2/perfdata
-
-	rm -r "${D}/run" || die "failed to remove /run"
-	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
-
-	fowners -R icinga:icinga /etc/icinga2
-	fperms 0750 /etc/icinga2
-	fowners icinga:icinga /var/lib/icinga2
-	fowners -R icinga:icingacmd /var/lib/icinga2/api
-	fowners -R icinga:icingacmd /var/lib/icinga2/certificate-requests
-	fowners -R icinga:icingacmd /var/lib/icinga2/certs
-	fowners icinga:icinga /var/spool/icinga2
-	fowners icinga:icinga /var/spool/icinga2/perfdata
-	fowners icinga:icingacmd /var/log/icinga2
-
-	fperms ug+rwX,o-rwx /etc/icinga2
-	fperms ug+rwX,o-rwx /var/lib/icinga2
-	fperms ug+rwX,o-rwx /var/spool/icinga2
-	fperms ug+rwX,o-rwx /var/log/icinga2
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles
-		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect
-		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax
-	fi
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	if [[ "${PV}" != 9999 ]]; then
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test "${PV}" -gt "${v}"; then
-				elog "DB IDO schema upgrade may be required."
-				elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
-			fi
-		done
-	fi
-}
diff --git a/net-analyzer/ipguard/Manifest b/net-analyzer/ipguard/Manifest
index a422ce6fc9df..9bc1dbb1986a 100644
--- a/net-analyzer/ipguard/Manifest
+++ b/net-analyzer/ipguard/Manifest
@@ -4,5 +4,5 @@ AUX ipguard-1.04-init.d.patch 931 BLAKE2B e18d1a5d9058f34a47262c0033e9a93118ee9c
 AUX ipguard-1.04-runpath.patch 288 BLAKE2B 45658be6e0478b1d4e29f27f9b6e39999368202b985b2ebc9ff4fd20c71388974250f555b9c9790b985095190d12df13625b83200636cbb31c1f6de2d0acb353 SHA512 49b07785bbf188ed1fd522591f3ee1af7a4001bf9baffabe63de6a27738a365f79ffc268d039ae9567622c26898cc68ffee61cb8ecf31bddd207f69897ed5a7c
 AUX ipguard.confd 186 BLAKE2B cd3e58efb088134c2ff340360be06ab0f9159b14c766b159dcb546d0136ccd65807b7c33bb89d45565179ead01d43f8da29bfdb19dfe59ba5e0008dc81dc2e82 SHA512 efb47689d944ce77863b7cd1722bba974fbf573af2e1051c08166a535dd8284f2cc820a624531d1c60e099e6da06d59f3659ab52b4b3557f3e1f4bf5c572f58d
 DIST ipguard-1.04.tar.gz 24566 BLAKE2B c9d543e6f7886c3b6377fbfe95e91e2d786da6a92fe445c9500c8b7ea6fb859bf8550daf9c83de425494376d0ed7197158e5ff9499a97417793b439e82004326 SHA512 c29c3f594e09ad1c06ca7297f794ddfada48da7ec2b98786694cd6af7508cbff232889e0c90718d96519297870b93132b7b0f9f310a0e4d7a7c2d54a30ca893c
-EBUILD ipguard-1.04-r1.ebuild 985 BLAKE2B 404c02520d8f631fac23115b861fa1ac5111af1f4fd27d5d29c32e58053ba1dec61618bc101a50e42dd3f796d90d0da852c1a087f0a3d831abcad1316c5ff6a5 SHA512 9acf89372f70d6b081bb542a7ca59fddf189c0643991f91e4b94b076c9517530b694baa58a51c1a504bbde74b8c2f515805666bf03453e8af799555533ccec2a
+EBUILD ipguard-1.04-r1.ebuild 989 BLAKE2B f57623b3c37a617c4db3102350383e66ce0ce262cefdc4fdeeb30e41c116fc0e339914f90aa6c63fc01f88bc3f35f95c9e02cc7ca662d469f410d90713f317d4 SHA512 1bb9fdc02e32d64df61e2959a4c14cf579b79792092575562030f38329ffa85d268f10fcc06c35ffd458a3b8c72329c85c831eb5cc904eb179bd18e8a783d573
 MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-analyzer/ipguard/ipguard-1.04-r1.ebuild b/net-analyzer/ipguard/ipguard-1.04-r1.ebuild
index 3677434a94be..0b9d630790e5 100644
--- a/net-analyzer/ipguard/ipguard-1.04-r1.ebuild
+++ b/net-analyzer/ipguard/ipguard-1.04-r1.ebuild
@@ -31,14 +31,14 @@ src_compile() {
 	emake \
 		CC="$(tc-getCC)" \
 		LIBNET_CONFIG="$(tc-getPKG_CONFIG) libnet" \
-		PREFIX=\"${EPREFIX:-/usr}\"
+		PREFIX=\""${EPREFIX:-/usr}"\"
 }
 
 src_install() {
 	emake \
 		DESTDIR="${D}" \
 		LIBNET_CONFIG="$(tc-getPKG_CONFIG) libnet" \
-		PREFIX=\"${EPREFIX:-/usr}\" \
+		PREFIX=\""${EPREFIX:-/usr}"\" \
 		install
 
 	newinitd doc/${PN}.gentoo ${PN}
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index b854763e046a..6869689d42fe 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -5,9 +5,11 @@ DIST wireshark-3.4.11.tar.xz 32354216 BLAKE2B 3e08d01f2d89f5ddd74c4e2215e6852f30
 DIST wireshark-3.6.2.tar.xz 39654296 BLAKE2B 585cf925892ec9d5b6413ccc53c49035eba8a7cd9206f1354f0a808daec9b0f20fc72b3427a2b592f196dd6b2ab67fd35e73d152a20c16fb0f0153c6a03d3156 SHA512 cd4a8077629632e9a924600f9af2ffd01917726fd64504d6f3b4a2a1cb5340c9c0bac23e4abab63743952a0a78efd2e09bb125b127d24e85eca6fa41928fd070
 DIST wireshark-3.6.3.tar.xz 39935892 BLAKE2B 3b636867d946f0cf748eb719874e815c919ee9cedd21a7e9034d54b4cb87ae4a09ec02a199e1ec8051e421fe2929983d659f340ccfd12ab35e1ecd52000964fd SHA512 4415216f791caee23757f3c754dd88ce8fd8eb8d2d64c1bd011b40c7451a1ef56cf41bcf1cdcf41221f196bf17be550f9271f05b82a017a02cac5c241785b7e6
 DIST wireshark-3.6.5.tar.xz 39939340 BLAKE2B 4df1abce2563f20e91fac169ef1ab65851a5f63423aceba487db8cd4b954c4a2ba5673e032878b33a43992cb2ee4628899eee8b0065220cd0c79a8c98a589ef0 SHA512 9aa60721401fbd1f3c6b912312792433c9f8a09583cf684a4f1a24c839f4786a54a0abbfd88c04ba222e5a7af09f7bc67c292a0f944c9b717a71509655fe2fe5
+DIST wireshark-3.6.6.tar.xz 39950276 BLAKE2B cb74c4ed307b83ba509fa3b56356a33df11d9d1effb29054f73f248ca1c7107806676539d0802cc71e07687831a838145194104183afa4ae1825eb1fb85062b1 SHA512 c32d5aafb3091dc1475896a3c4cfcb5a47af002e53f011a65697271c611e690743153841f5db1021a6cbea6d427dc661dce7b85208832251200258fb46aad84b
 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 7089 BLAKE2B d96ebead8d7ae42562e2223cb26b3c36d2f4505a1e1e0716d96148a86b727ce7c230ce16847029507b49832917378edcb2d5e082842ab883655958207d77badc SHA512 8458db633a1522889362382aab665a89002d57b150b23f84909b5a0fb884d45748144a8cc30e32255d43a9f9de1494cb2f6540911e4a5a2da629359f62fb3267
 EBUILD wireshark-3.6.5.ebuild 7290 BLAKE2B 9488d17dfd2e7bb6b9664b75ef4f9cc35f3f8faba148701f9a376f43f7f5a01dba5dd145b8a3e822e85d2a2eecb6919b8906f7dca3268a61d85b5d1f204f3c0c SHA512 c97d5d8b388441536cd27ec737312cc0278f05947efb28a9d8a304350b84c103bf642b7668cadb476e599284ecb80c8bd80ade64af57e960cae3d0dde9458bed
+EBUILD wireshark-3.6.6.ebuild 7290 BLAKE2B 9488d17dfd2e7bb6b9664b75ef4f9cc35f3f8faba148701f9a376f43f7f5a01dba5dd145b8a3e822e85d2a2eecb6919b8906f7dca3268a61d85b5d1f204f3c0c SHA512 c97d5d8b388441536cd27ec737312cc0278f05947efb28a9d8a304350b84c103bf642b7668cadb476e599284ecb80c8bd80ade64af57e960cae3d0dde9458bed
 EBUILD wireshark-9999.ebuild 7270 BLAKE2B 16cfb9618d7c251a1131ff1a1b8ceda2ff7975e8e4b8416e6835143e1387ed3d089287df9200416c1ed686eecfe7076564336d47b0d0dff671729782b74214cb SHA512 9d0d259670da93e2e0ecb15e8dc8d318a1d12093c948b86cbb9d51e96631b91841e807c4a8dec9111929c9b84e8c274730d7e3ddcacc2bd8e4eeb6fd7044b972
 MISC metadata.xml 5328 BLAKE2B a030872929b89f0ead3794d8bbff20354b3a1b7a35aa7c3ce37baf5170ced9d39bdc665bd23e03e70d94550085a88224ec6cd260679b2d01501b272c595442d0 SHA512 cbadc90c858ef008b763253ef548e3634643b98bf90069b3fa34bd4f947d93ee8d4a2f3c6d9c7fe4c93b4169e34681e00905b28e64f8edcff02f23867d75b265
diff --git a/net-analyzer/wireshark/wireshark-3.6.6.ebuild b/net-analyzer/wireshark/wireshark-3.6.6.ebuild
new file mode 100644
index 000000000000..fffca9343012
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.6.6.ebuild
@@ -0,0 +1,269 @@
+# 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/_/}"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
+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 )"
+
+# bug #753062 for speexdsp
+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_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:= )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd:= )"
+DEPEND="${RDEPEND}"
+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)
+		-DDISABLE_WERROR=ON
+		-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 ws_diag_control.h ws_symbol_export.h \
+		"${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 image/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 image/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/xprobe/Manifest b/net-analyzer/xprobe/Manifest
index a061154484b0..ed1bb255756d 100644
--- a/net-analyzer/xprobe/Manifest
+++ b/net-analyzer/xprobe/Manifest
@@ -1,5 +1,6 @@
 AUX xprobe-0.3-cxx11.patch 251 BLAKE2B 568fed378da0f4943a328a8f662cf8d02e489a78ff77815b3a73618b7f15ac1a67d71784a8c67d8af54eeb33c51b01b86b8c032862654c6e9e51b1d6ac13f1dd SHA512 f4b6cf1048b9868d4119b063babbf91caa7b98f9ad8a511e4652c053be2d9692b03c62c3be3ea10831d55ddfb5b5f989c029237ce8d7a48da3c05ce9fd96c429
+AUX xprobe-0.3-gcc-12.patch 452 BLAKE2B 91a78501f058700d26ad32e114887acc184a57b3e9fd58ae7b35fceafc45828ebb6d9e00582085003035dd6a3f8ffb85f799a6c7ebdaa0231548512db8083362 SHA512 ad3d08338e804f203ce4c4943c1d71dcf1dd77b84939c76168a56661d110348d7ca7bf7f35272fc89b78b413628a7bef87d91cfa16ef96df758006d0f94df605
 AUX xprobe-0.3-gcc43.patch 655 BLAKE2B 83831f0420e69a4d673eef69a5f81b63b81ad3897078f60ff761064e31552dafc16b35f93cf83c75027bfdf8485f201c4fef1339b89cc73c5dad51e27f1bf229 SHA512 7ab58b18fe7593f2389d72cc5d9160a65500866f44045c219e8a4fc6d860e34080a50d9e295d38d801c8af3d1b0ceab4f98fec296aa2eb49415561bbe9903950
 DIST xprobe2-0.3.tar.gz 533636 BLAKE2B 1f106a3c08bfc6e205731a2e8c64f7e9f2e52caba38374ab7980fcae95113b6790297a59f5d4d6ad8e09d2145b68801403472b07690ff27b42dec8c6b7d97895 SHA512 fd499ada22be5df3e01630948cb72d1a9e648e0c7bfaf2a688386a61c67bb36a326a9e2f3f2b9960a6a49128343010aafe8a3f04ec05e89420a1384215e41f21
-EBUILD xprobe-0.3-r1.ebuild 771 BLAKE2B 26cb564e6153eb06d22359f0a708ffe91b83dc5458c1f6cbc22020b27bbc2ffb7001df4bfef1b5fd8c1bd67cd874071ca6e4d6c44cc0761f0b10966db4637c01 SHA512 822cacdda125bb2833724488dc878c3cce6a28e5b98e80d23f39be6816ce6adfbe2f3317e00a607155247df8a97ee12dc465cc169df4bd5e05d904a7ecd84e49
+EBUILD xprobe-0.3-r1.ebuild 810 BLAKE2B 5d1fe0cbd58cb74802a957f98ee0fcb82e32d0426132503b9ac07e95365390b16d52811ffd87d8ea3b2066b8cf8bffad0c92da647477b9423b3918fce24f45b1 SHA512 d468e53a668352b9358225108465aa1944f53341db3669ca404d1fbd630bcbdd2919dd07234164144eca8eaadfb5a5acdd154e5ca39583487a5d1f38ae0244c6
 MISC metadata.xml 679 BLAKE2B 8088f2ebf18dac2fe3a99b20f8385b113388b244c6893a4231044d6eb16e2f3dd7af02c4ccfbedcd3fe3a25b8ff410d72315f77e0a3ed3a384fac780ab44a699 SHA512 56fa84dbb79392f31ab91a45f8e6712a1a978deaaa846216a92f19fbc10d77bf134d6faac8c06b9bab2374e2b9404293d02e2918672f619d13d637b1367a2f79
diff --git a/net-analyzer/xprobe/files/xprobe-0.3-gcc-12.patch b/net-analyzer/xprobe/files/xprobe-0.3-gcc-12.patch
new file mode 100644
index 000000000000..534d17cb019b
--- /dev/null
+++ b/net-analyzer/xprobe/files/xprobe-0.3-gcc-12.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/852119
+--- a/libs-external/USI++/src/datalink.cc
++++ b/libs-external/USI++/src/datalink.cc
+@@ -15,6 +15,7 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <errno.h>
++#include <ctime>
+ #include <sys/ioctl.h>
+ 
+ #ifdef IMMEDIATE
+--- a/libs-external/USI++/src/tcp.cc
++++ b/libs-external/USI++/src/tcp.cc
+@@ -16,6 +16,7 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <errno.h>
++#include <ctime>
+ 
+ namespace usipp {
+ 
diff --git a/net-analyzer/xprobe/xprobe-0.3-r1.ebuild b/net-analyzer/xprobe/xprobe-0.3-r1.ebuild
index db0208e8db4a..d630b7fd1214 100644
--- a/net-analyzer/xprobe/xprobe-0.3-r1.ebuild
+++ b/net-analyzer/xprobe/xprobe-0.3-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit toolchain-funcs
 
 MY_P=${PN}2-${PV}
@@ -9,6 +10,7 @@ MY_P=${PN}2-${PV}
 DESCRIPTION="Active OS fingerprinting tool - this is Xprobe2"
 HOMEPAGE="http://sys-security.com/blog/xprobe2"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -16,14 +18,16 @@ KEYWORDS="~amd64 ~ppc ~sparc x86"
 
 DEPEND="net-libs/libpcap"
 RDEPEND="${DEPEND}"
+
 PATCHES=(
 	"${FILESDIR}"/${P}-gcc43.patch
 	"${FILESDIR}"/${P}-cxx11.patch
+	"${FILESDIR}"/${P}-gcc-12.patch
 )
-S=${WORKDIR}/${MY_P}
 
 src_prepare() {
 	default
+
 	sed -i -e 's:strip:true:' src/Makefile.in || die
 	sed -i -e 's:ar cr:$(AR) cr:g' $(find -name '*Makefile*') || die
 
@@ -32,5 +36,6 @@ src_prepare() {
 
 src_install() {
 	default
+
 	dodoc AUTHORS CHANGELOG CREDITS README TODO docs/*.{txt,pdf}
 }
diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index f6974e9786cd..6578922ebb68 100644
Binary files a/net-dialup/Manifest.gz and b/net-dialup/Manifest.gz differ
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index 631bbb09ac0a..44c7fe72dfb7 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -9,5 +9,5 @@ DIST ppp-dhcpc.tgz 33497 BLAKE2B ca59130012f007cf45af6bcfa468c112b0d521c8b11f42d
 EBUILD ppp-2.4.9-r5.ebuild 7546 BLAKE2B f3f5a24b4a0ee7d706e10e1f5283d09f5622737ece4e71444336244725ddf4893269689b0c7b7f5f7b8b070186a4012eec0b68ff1cdabfc3ce21ee67aeec130e SHA512 5f886041a674f9b0ed15f40ef93475345e64d2bdd9bba5f81a6dccdc406e96d824411901b13bb10d43359eb6e6eec80a8f01a53c31b2c7df9a6bb1d1a78c9ab2
 EBUILD ppp-2.4.9-r6.ebuild 7652 BLAKE2B f57e3410de49bc40aa9ab5655995653a4978ac23c7bb267b16a48e447c57b744646d1e2863fae6b7d7426ae019d51ffd1674412cc83471928ec648c5d06ff156 SHA512 5fe8afc84d2e44b191a9f3588088183ffa7b71eed733c6129e4b158f96840da2964fb9654042d41e21410ec607caef188da370ee853d9b8e696a10701e144231
 EBUILD ppp-2.4.9-r7.ebuild 7707 BLAKE2B 13f59f0f09300dfbe5bef2f1ea4024d68d083cd9ef55858eb306c482b3b01c454398f27a936ea15c5a204bfaf609b49f8af12d36c5dabb727e006a6924e99264 SHA512 e98f79fa9e83ecc95588f95a102f058c4109ec1f025f7616868c7acef729ad39d56fdc7092665e48b044fc77be6decf307425f1621bfa639941cb40e0befeede
-EBUILD ppp-2.4.9-r8.ebuild 7820 BLAKE2B ef91a7f2016f692f3b0dace0c6255da62814b3e247306feb9e939cfced66251e860c11ae9fed5eaae462dc660d9c7be587ce016f41631b913310e73951a60125 SHA512 ebade0876b6e82c35f9c86692b5a7c9b518018be9416d1488848571e176ed3ba900c9cf694ef8d122b6a1f07d50d74c0dcd39c67e8e50b2d25d5b9fd9167f943
+EBUILD ppp-2.4.9-r8.ebuild 7819 BLAKE2B 34256667e43c310b5a9abe2ad4e902ba68b6bab142d3b59d17d224c23d7487e113f0f0223b1afb86f48a0f2097f388cca9818db1793ba7c587724105359e1b24 SHA512 edb72438225c88ff9d9ca2b310f08c23e8c92b71e5fe1f0ea2e06a1897b8c924c15d6ebaddf3df85b091c6b67c9c2170d4333a1b76b824c8483bd0689a061b69
 MISC metadata.xml 1097 BLAKE2B 3d78c2f7a4c8e17834d8eb4f7763d1cc7f03154f8e5ccb5c7da948e01bc43467df928cdd0f946244d7c17bc53755962151a3e0247e802c4b42f713f415009e44 SHA512 0d1d82342808d9a599004e66874fe2b661857d0a55d2db56ef853011829dc8dc5924378364fc1069b666a9f0132617e0c00b822efecfbd82b9f54e6cee39f45c
diff --git a/net-dialup/ppp/ppp-2.4.9-r8.ebuild b/net-dialup/ppp/ppp-2.4.9-r8.ebuild
index 6d0f3841eecb..bd9aed59ed9f 100644
--- a/net-dialup/ppp/ppp-2.4.9-r8.ebuild
+++ b/net-dialup/ppp/ppp-2.4.9-r8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/paulusmack/ppp/archive/${P}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="activefilter atm dhcp +eap-tls gtk ipv6 pam radius systemd"
 
 DEPEND="
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index e32eaef01f7b..4102525219af 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index 7c47334b1764..44c511155dac 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -6,6 +6,7 @@ DIST bind-9.16.22.tar.xz 5059000 BLAKE2B c4853a8be268f9666f3677adf2e64c6d74f7df4
 DIST bind-9.16.25.tar.xz 5086780 BLAKE2B cb62d0d4e25f508f1a77fae6a11ff144d2436346c45a936d572df4c843cd72ec81cffacd0a81dcb74eb73b8bca7d0762a5746baadda36f260b79b72eade24d18 SHA512 e43c0e59159d3a5642db051f3982d8767fb726426380c32960fefe4b9afd05708ed8f7e80a98b803a580b048e1a368c888e2dd5695fa5fcd7b8b75574a27cb62
 DIST bind-9.16.27.tar.xz 5084340 BLAKE2B 37b49ce81aa5122493a4feb2bb7be53c5d46ff2ce28456aec31ce1332520a09c10bb2293c736bffe7badbc2bc3d156c05f83367678bd101e17b99ca3ff69bebf SHA512 5c71f228db83aa8cc9e65466d6e5afca4a9f80c693358111a003fe09e1a14522175eb2b6a0f11e2a2cd4fdba01f2ae315de52e394a441b3861ca2a011e02af62
 DIST bind-9.16.29.tar.xz 5088348 BLAKE2B 17ee1443926327c30f1d5820110b01a193c53eb24e23385b713217a4e49d9c2b5ddb6e1c49cb80d2c9083c71ce7872a26fe3597209f2e3215e6cc7e930e68004 SHA512 b4acbafed370438ac53e73468ccb5ea5745a1c8f764dd96f9c9a027594a3b7ce0d486e7f01138b39795b456265e0e6116cd76e44f5a3329687cd718550ca79fb
+DIST bind-9.16.30.tar.xz 5086288 BLAKE2B 35fe14b58a018df25563e58a9632b4431f740bc7a708eb823117541548d23b1855e43058cf7323361ca904d5e59d687e282abb73dc8b617e4eb25ef113168e93 SHA512 cc9bcbedf63c2efe0a23f14db3e57fdae46f0509aac58e5840a6805ce4fbd76cad5bfde4d461442adb88c4d947f8d79bf979aeb24aeb9303b6adc8d169b7118c
 EBUILD bind-tools-9.16.15.ebuild 3404 BLAKE2B 366a20661af50d30017201916c796e8ffda13d6621909e2df2e28e5834623699c5e27d7b3e12f603b2b9eeb5ac5b38e06f67b5c1750a57dfb3b2f645795b3097 SHA512 53cdf632ed2c18e4f39692d35c5d51fff1d1c944d576365f287a5f0176c24df090430342f601efbf59301faa6a7f512f69e112fef481d3cf70ac6addff5f3631
 EBUILD bind-tools-9.16.18.ebuild 3411 BLAKE2B 807ef0b010a90ac23c7df0303d1ca6a9013854b2646d9724f07421e749e3a89c1a7934df46a5f339095950fe382f84548f0b964e7d850f9c9edab17f31fa35d8 SHA512 7efea06b5792ed8a61b8f9eed76fa1dbd9ed308831ef2c235a7a7ded2cc549330159d2455396329ed4b25cacfb5574939e5c1f16df527e696130ce1d62b8dba9
 EBUILD bind-tools-9.16.21.ebuild 3411 BLAKE2B 807ef0b010a90ac23c7df0303d1ca6a9013854b2646d9724f07421e749e3a89c1a7934df46a5f339095950fe382f84548f0b964e7d850f9c9edab17f31fa35d8 SHA512 7efea06b5792ed8a61b8f9eed76fa1dbd9ed308831ef2c235a7a7ded2cc549330159d2455396329ed4b25cacfb5574939e5c1f16df527e696130ce1d62b8dba9
@@ -14,4 +15,5 @@ EBUILD bind-tools-9.16.25.ebuild 3430 BLAKE2B 9ada7340be99524687fa0d1d3370b628f6
 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.29.ebuild 3627 BLAKE2B 9964f625d984cbf271221cfdfe7f18ef02bc2df9eed8f65758d3df1915c4ea02d1942842002752ce03f73ef462064422b37022445db5d68734d303b0b3d9999d SHA512 a115230d78e0def5f885de8e742d841a1f466eb1776deb79acd14e55c273ca4d1c046d03f181d147f3c3e758ddf6ad6b813709a838f6e6ce1d8401ea7999ab68
+EBUILD bind-tools-9.16.30.ebuild 3703 BLAKE2B 7b5d5d6ed76fadd0fc462dd62039a0c7204227430f458af19e5978b60d76162f48e00bc2e746745284d23ffcf678e48dfee7a01ad3144a71b6e272455b502602 SHA512 6998cc9f0f954d24c2f0f368980d8aece33a806516ea143dddd90ac178d0907c433369118e79d1c26554d837f39b188915d83e370a15777ce28437c88fc185a5
 MISC metadata.xml 424 BLAKE2B cb17be35f118db8adb22f75f4b52fce963eb58b7c502cb090fb8ca7a269820e85f77aaa63a880b42f319482000ef43fff82f77c61ed68cb4e21180c2bae66db6 SHA512 a39b3205586616deb59191c2b9d3251cc424e3184f0ff98b0db3251732d96b45d8e6c37e59116917ee17c51b37a048457031b3504329472f0033e360fbd56b1a
diff --git a/net-dns/bind-tools/bind-tools-9.16.30.ebuild b/net-dns/bind-tools/bind-tools-9.16.30.ebuild
new file mode 100644
index 000000000000..17f2f93f411d
--- /dev/null
+++ b/net-dns/bind-tools/bind-tools-9.16.30.ebuild
@@ -0,0 +1,156 @@
+# 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"
+SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+caps doc gssapi idn ipv6 libedit readline 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
+	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 26a55cdb62a8..521826cf2572 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -11,8 +11,10 @@ AUX named.init-r14 6167 BLAKE2B 7c3deb3492a50d2655814f9fb492706b671e08ccdc406be0
 AUX named.service-r1 327 BLAKE2B b0471100b425a1d4db29c1ef577dd6f14b2c3d040fd826bed03105f514bf1ea2c58c19d59557d0eafe27a96588adaf60156f31b6befdd9be96a8ca1fe8613678 SHA512 1d3dbf9d1de0c23c398a523b05c0fb266b6b699e54d232818b28205f697ca227acae9f2778d6f41309b117a6cd78eee170b745594b786b1c1571d5f66d6c3de4
 DIST bind-9.16.27.tar.xz 5084340 BLAKE2B 37b49ce81aa5122493a4feb2bb7be53c5d46ff2ce28456aec31ce1332520a09c10bb2293c736bffe7badbc2bc3d156c05f83367678bd101e17b99ca3ff69bebf SHA512 5c71f228db83aa8cc9e65466d6e5afca4a9f80c693358111a003fe09e1a14522175eb2b6a0f11e2a2cd4fdba01f2ae315de52e394a441b3861ca2a011e02af62
 DIST bind-9.16.29.tar.xz 5088348 BLAKE2B 17ee1443926327c30f1d5820110b01a193c53eb24e23385b713217a4e49d9c2b5ddb6e1c49cb80d2c9083c71ce7872a26fe3597209f2e3215e6cc7e930e68004 SHA512 b4acbafed370438ac53e73468ccb5ea5745a1c8f764dd96f9c9a027594a3b7ce0d486e7f01138b39795b456265e0e6116cd76e44f5a3329687cd718550ca79fb
+DIST bind-9.16.30.tar.xz 5086288 BLAKE2B 35fe14b58a018df25563e58a9632b4431f740bc7a708eb823117541548d23b1855e43058cf7323361ca904d5e59d687e282abb73dc8b617e4eb25ef113168e93 SHA512 cc9bcbedf63c2efe0a23f14db3e57fdae46f0509aac58e5840a6805ce4fbd76cad5bfde4d461442adb88c4d947f8d79bf979aeb24aeb9303b6adc8d169b7118c
 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 11100 BLAKE2B 158bc6a20fbb17f952f1926667c82518a5e0c4776059e4d595d22d28677a205d7913a90c4630a8d0301e42613f731d5df90b336a9870a47b9d3e3829c4b8efaf SHA512 b1aa20ae7133eb6bbe369d91cab1490688939de3b611bb7222f6f055139b6124d0235b4b8163b6b9c1ab532aa8306a112cd0c6dd84e1d453974f703242287288
 MISC metadata.xml 974 BLAKE2B a2d3d119e1632c8c5565f0bdedd807c7eaab97f721c34e585ed19483db9b9e25ef364d1950d416acf1c7342cef8d763357c3a4e464b0704013e4a4b66788e6c7 SHA512 0255ae6a504d4f36fb7fe8b14b25328810bc500f610b4dcdb04a79d34a3dcb0ea8eb0a2298c1f69679d8679d89125cb34fc46be2897dbcb408827d718a9eb9d1
diff --git a/net-dns/bind/bind-9.16.30.ebuild b/net-dns/bind/bind-9.16.30.ebuild
new file mode 100644
index 000000000000..04723e087386
--- /dev/null
+++ b/net-dns/bind/bind-9.16.30.ebuild
@@ -0,0 +1,381 @@
+# 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"
+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
+	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-fs/Manifest.gz b/net-fs/Manifest.gz
index 39179b2d98b1..2a70f8159b11 100644
Binary files a/net-fs/Manifest.gz and b/net-fs/Manifest.gz differ
diff --git a/net-fs/libnfs/Manifest b/net-fs/libnfs/Manifest
index 1d66f439380d..471dafb401e4 100644
--- a/net-fs/libnfs/Manifest
+++ b/net-fs/libnfs/Manifest
@@ -2,6 +2,6 @@ AUX libnfs-5.0.1-pthread-configure.patch 1220 BLAKE2B c8a21a2bd75aa60d890336bd39
 DIST libnfs-4.0.0.tar.gz 251662 BLAKE2B b6c33c42eb1715b8a996a432b0cc28af1a98cca3389a779378df0931e4d37418937e3ea4938efb4d075b39aac33facca86df3a02bd62d2c7b262859e8d04ecc1 SHA512 3d93d83d1909f24de304c0d47fa6240da7ecf43ce2488a242a58ddabe51d774caf813f5a90ae720a8edd251a765b30e88c0e5b6a13ecb254dfecdc98e30737fa
 DIST libnfs-5.0.1.tar.gz 279550 BLAKE2B d27e97f3dce1385cabd8076b673d2bbfe339ff5a34295ca13bfea2f9c2048f4c6dd07a0b54b7cc7e44aecda58dd21520732dc6ee82260f0694a01fec59875a6a SHA512 71f2dcfa8945c1cb6402f5fca10b1f7a4720f7589807d6130eb55361f05ef4684f9cc9a177ece4e13d3847ac6606924115fac7b27749cecc2f5aca6fa9c63ebf
 EBUILD libnfs-4.0.0.ebuild 1223 BLAKE2B 85ef61529fb309a6c8bbb3da4ad17326d0191f99aaf44c617f6725c02a3d28110c185d81e4e15f2468cc4a9799789fc005c55f5c20f30f892745e15c953b0e40 SHA512 751cd29ef229f14c52336bfddcce70aceed788a6088b9ed8b6c1d6341b91a0edfacca4d81863c97b601e53f06aa14c899c8148863412eec1e0e7d682db7305dd
-EBUILD libnfs-5.0.1.ebuild 1349 BLAKE2B f017506789b9d33a6527851e17bc1d086b523a0808358dd2a1db5d6ced5e156682771453e06a10a5fae036717014c48bb3a7286edd477146906fb5f39e3310d5 SHA512 45cef1ce7ac6aa33af3157549e75f41a34db144747e72fc8bd5ebf8c07d1c0ad8f89bfec82cd88e75bad78ca9515075b14f6baf1e5c81dfda88b57e45e003e1d
+EBUILD libnfs-5.0.1.ebuild 1348 BLAKE2B 56e0e90b0cacca05e4b4f057c65cdc11c0ad97cface8d1abbe433d9127e5c7681a39f83204627b7680921a121c6388cd4ac66ecf6873130d7d6dc4aaab33a7d5 SHA512 9328194e0fea542124a1f300e0482eb7d0b8f8c7c2d13997732839dfb49ba4cbbb9a1d4098276e59113195ceb44cd21d4aee2bdc214f86b97f4b7e9437a5bd77
 EBUILD libnfs-9999.ebuild 1289 BLAKE2B f82d438f3fb46371e0b76ab9ae6ef6d4e8ddba32bfd578cb9b44076d081e98ec525a17b39a174e4cbf3729e41cb6dee664dd6e8040b11cc0cf54f6493e576647 SHA512 5640c14b70b8d26faab56169c99ffd3c861d0f63303d8f47a41230227757c613fbe2c66c5d7d5dc937cdf82b3e12683c5cb7eb17a7ba3953dab4715315ea95ff
 MISC metadata.xml 417 BLAKE2B f9c2243fdec47c029b7e581f7e731889342332b5740973d261dd2e353db0cca2728c9b61bcf610204254ebee62bb1eb7cf51b37236d2959536807f6460343fd5 SHA512 f64ea69505b03c25f70e632645efbfcab90ae974ed3909dc90c9cb5df7aefa519a0a54b457df0b3a19b033b9d6c56155163db5b58244cae1f4e8eaa76beeecc7
diff --git a/net-fs/libnfs/libnfs-5.0.1.ebuild b/net-fs/libnfs/libnfs-5.0.1.ebuild
index 573c2cdcf141..04425c5f0208 100644
--- a/net-fs/libnfs/libnfs-5.0.1.ebuild
+++ b/net-fs/libnfs/libnfs-5.0.1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/sahlberg/${PN}.git"
 else
 	SRC_URI="https://github.com/sahlberg/${PN}/archive/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 x86"
 	S="${WORKDIR}"/${PN}-${P}
 fi
 
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index db0bf5c5b857..3ea619d99960 100644
Binary files a/net-ftp/Manifest.gz and b/net-ftp/Manifest.gz differ
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index 57ddfed15d4a..26fe7a2d48e5 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -10,6 +10,6 @@ AUX lftp-4.8.2-libdir-zlib.patch 714 BLAKE2B a770bc7a3f974ece766883e644403691de8
 AUX lftp-4.9.1-libdir-readline.patch 404 BLAKE2B 88746dbfd082202950e54270519fa25c8a2042d3479342443394918722a8f0b7b2cde1580c7ac07c0c3408f86c12a83fa1973391ef25a9b3f348b7ad1afa68ac SHA512 e6ab456b237613f31c3e7e450a5127b5fac74a9d24d4bd5ca95f9b28d6c810ad0253d71d710e1daf15c43d0b2d5d2ecdb2b1fb7bbdaa4c3bc0b610d6cc6caf3b
 AUX lftp-4.9.2-ac-270.patch 1298 BLAKE2B 3431c649aa1f772a94640c1d1508b584eff0892098400eea5390c754ece5f23a877aa2eccb814bf1ece93e329980a29190aa784f4cc2b41efccc58c2921409d8 SHA512 efabe7cd6b3467b9212d47669842bf3b1b981ad6c8615bdfda4122d1a217e10fc0fda167903172502a13c63341ddab8e5bba91e5f39721c6fd304e29e6647a08
 DIST lftp-4.9.2.tar.xz 1654960 BLAKE2B 04f168576ae6e001e0ffffb2e93e36d5bffa5ed1e2e671edb6210a54aa0ecedc280885450dcee890d05b64464eb641e7e63c8d4dd170100317dec3fe734ec483 SHA512 cda8698e7e34d748715a6fe5dc06c758240302621c7957402f0cc67577acf1a96b436fda4282408dee8171dc84a31e0be432df99a30f0a10057a8e7ea9ec64ad
-EBUILD lftp-4.9.2.ebuild 2584 BLAKE2B 92db441ae1e3c985db59568f2bedc3ea2f0b94b7acdf0ed4d7cb257eadc6ebf8dd185459e8c71f6ab6e6cf427a855700afecb26bd7abf1e7ee317eec2c4506ea SHA512 d32de85536f7f2a812c0148c9934408e4ec56b3d89b821bbd89c3830a2431a304acee57bc7f6e87d4c18f1c387bb9b96d23036b24c5940a404a68e1519aadc3c
-EBUILD lftp-9999.ebuild 2372 BLAKE2B bba2c782aa65d11736ff859793425c38f4d3cc9c2130db3755e99a0e5af3f68ef9cc21076219913182d8c351c7807a79e6f94853e2671a6ad91a77bfac0e6989 SHA512 34c37decd8a2de8965ee521aacd34a505c9a36f5369f48a13f9980497e199e2ac331c98c590dc7b5cd63f3f97d774b97c8f069ccc4110535492b58fa7526ccd6
+EBUILD lftp-4.9.2.ebuild 2586 BLAKE2B 8353ae30cb7195095bd8133c88bff2d83b9e773a38a5b9b255e0878a885982fa3a7d4c86f88a1ef68215521c815c66fbb0e16a016682cd2b1751099c0ee1960e SHA512 21959ae878c0eeaa003775a936262084e7ed1e18bffcc7227d3a9992b45dc9e6edaefd64875f1ec9e3cf129ed5fad643808cdc4c52e4345d230a0389262ff8a3
+EBUILD lftp-9999.ebuild 2374 BLAKE2B 2236a918cc97d22729e4af0417b6a99f89d7758e4750c27c24e6e03c62c524c1f8fcec3f65b7728090aad3a1d618920fa976001416ea59a8cbb01e32f1878adc SHA512 2e46ce89ff4969c8f3bfc8672dc1be0f652858b4ceb6c7853f65560a2195f00b387fc7825d3f78a77ba89f68ba30a44b328bfa1b780ba25144317045ca3bf093
 MISC metadata.xml 481 BLAKE2B 7a61be735ad5538cf472fa7bdd22a17449c02584804d2711b626433945dc62db58746302cd0ae83ce35350627720e2bce8297757858deb2d66bb30f0c9981e33 SHA512 4977624bcad3dce392d8e42d28071918a50c1850c6ad139c56aaa59195869f517c1654dbd2c18a0ea6335a984299c2472b22f139fcd67808f55e92f0e6a5ecb0
diff --git a/net-ftp/lftp/lftp-4.9.2.ebuild b/net-ftp/lftp/lftp-4.9.2.ebuild
index 9f9b8e1d00ef..8e4953d3e242 100644
--- a/net-ftp/lftp/lftp-4.9.2.ebuild
+++ b/net-ftp/lftp/lftp-4.9.2.ebuild
@@ -76,7 +76,7 @@ src_configure() {
 		$(use_enable nls) \
 		$(use_with idn libidn2) \
 		$(use_with socks5 socksdante "${EPREFIX}"/usr) \
-		$(usex ssl "$(use_with !gnutls openssl ${EPREFIX}/usr)" '--without-openssl') \
+		$(usex ssl "$(use_with !gnutls openssl "${EPREFIX}"/usr)" '--without-openssl') \
 		$(usex ssl "$(use_with gnutls)" '--without-gnutls') \
 		--enable-packager-mode \
 		--sysconfdir="${EPREFIX}"/etc/${PN} \
diff --git a/net-ftp/lftp/lftp-9999.ebuild b/net-ftp/lftp/lftp-9999.ebuild
index 000bb5b4c9a1..915bfc33d101 100644
--- a/net-ftp/lftp/lftp-9999.ebuild
+++ b/net-ftp/lftp/lftp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -74,7 +74,7 @@ src_configure() {
 		$(use_enable nls) \
 		$(use_with idn libidn2) \
 		$(use_with socks5 socksdante "${EPREFIX}"/usr) \
-		$(usex ssl "$(use_with !gnutls openssl ${EPREFIX}/usr)" '--without-openssl') \
+		$(usex ssl "$(use_with !gnutls openssl "${EPREFIX}"/usr)" '--without-openssl') \
 		$(usex ssl "$(use_with gnutls)" '--without-gnutls') \
 		--enable-packager-mode \
 		--sysconfdir="${EPREFIX}"/etc/${PN} \
diff --git a/net-ftp/pure-ftpd/Manifest b/net-ftp/pure-ftpd/Manifest
index 05ca86ee7186..adb75f31f124 100644
--- a/net-ftp/pure-ftpd/Manifest
+++ b/net-ftp/pure-ftpd/Manifest
@@ -7,6 +7,8 @@ AUX pure-ftpd.xinetd 247 BLAKE2B aa2b0f8b4b6ff45e9b8dd632af5ff680ddd5abe51647dda
 AUX pure-uploadscript.confd 368 BLAKE2B 675e5349b2f808dd2a3cbaf2536a0541f40d42d300b7411163bc8232470c6f63a1d92cef393271693a02bcb5129624d38de77a99ca030a77bab00cc1fbe797c4 SHA512 2632be874a5afb25b8c8c1acbdfef929542d80dc9a8f280b4a9b0b6878be63f901ccd2c29c2ae0f9f74f45e41df1b7e69d1cef6f77e93c9b235709a7094480af
 AUX pure-uploadscript.initd-r1 776 BLAKE2B 1e382300a92fabb5308aa2636de2f427418d8595859fa2d7e6ee0a62297a0a17386f2f4c55de03ad282ed0545cc97ea6c0df67fe5fe6af736789d01e18c69f97 SHA512 3bb735bf0dc12434bc283ea9948c5b7feeaf72a26382a65a3c8eaec87a13f82239699e4687e5b36be5478bcab801974633b17771d9a583b6be508503118899e4
 DIST pure-ftpd-1.0.50.tar.bz2 520167 BLAKE2B 0c694ed48e896be13d907a71a24357f8676daf2c66bdaac41d31b162741164fe5ab1560499acc08b11e4fdb2a678c81c81c03e65a8181fcfd960ffbfe4b731d4 SHA512 8fbd24fb0450b9ed8e47335c97c3bc1cbcd0ee2ac7ebea95721b9dbddb7f61d8bedaa1710ba94213d96c79e12ec9b2b555ddb5f494c8961ca2339b176a52fe12
+DIST pure-ftpd-1.0.51.tar.bz2 520648 BLAKE2B 0b82fee114986140eb74d2669b7d91582a48f1b366936895acda913afb7d3bca1578295a930f7857f8674e593bd1bf8094c36f2ae8db6cf1a62cacfd4234cf13 SHA512 3615ac1ec42813855f3328dde200f60025e1f2ca7d1e17ea042967fd4164079260d058f3e2586acd778334660f387a280b35850a9e2091dd913fb84ef929bdca
 EBUILD pure-ftpd-1.0.50-r3.ebuild 4363 BLAKE2B 48e2aa70ff578e49bd35d21e4ff002a63399b9c18e1466946b171a1e5fce5f226ba1bdd42df6164ab04005ca685d9c90c902a59a00c7b356ee6a7aad292d5212 SHA512 f29ce9b3262c80f75b8ea722763def4e52441fb735d0ebc1a564b43f018b05e1203de04ec2b344cd7a7aff9ca34cceca2377ac3736c1ee127bd67962baf676b2
+EBUILD pure-ftpd-1.0.51.ebuild 4369 BLAKE2B b44d87e95f8a73dfec5819b89fc69666809158a61fc4a3e5b31bec0abc299ab788735d3fa414a20f7835c15c610370eabebbd53cd2a56aed11089e8e4bb4b145 SHA512 f4ec59f90bce535f39d135cb07f3ecaa40c16c17d9bfb5b5bfbf25f244ce70445621e5b0a937363970875ba64ed5317242400e949b383476d48f72891f3569f7
 EBUILD pure-ftpd-9999.ebuild 4369 BLAKE2B b44d87e95f8a73dfec5819b89fc69666809158a61fc4a3e5b31bec0abc299ab788735d3fa414a20f7835c15c610370eabebbd53cd2a56aed11089e8e4bb4b145 SHA512 f4ec59f90bce535f39d135cb07f3ecaa40c16c17d9bfb5b5bfbf25f244ce70445621e5b0a937363970875ba64ed5317242400e949b383476d48f72891f3569f7
 MISC metadata.xml 1177 BLAKE2B 7662da71f87d60d342e0a304c73c02f95a1006a0e6614c40ee3f3333a01430cb0a50ebd7e190569fcac25f9cefdd48fef68649c97006846977a2596333d78c34 SHA512 6c79218bba944381fbf0bfc86e27adde1e95e5e2ac5e7e2c5d637820f8fb4bb1bbd5e91a53f6fbc4ef641d03be6490e1d137895176576f7e2da798662590fb0a
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.51.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.51.ebuild
new file mode 100644
index 000000000000..712fefda22b2
--- /dev/null
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.51.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic
+
+DESCRIPTION="Fast, production-quality, standard-conformant FTP server"
+HOMEPAGE="https://www.pureftpd.org/project/pure-ftpd/"
+if [[ "${PV}" == 9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/jedisct1/pure-ftpd.git"
+else
+	SRC_URI="
+		ftp://ftp.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2
+		http://download.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2
+	"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+IUSE="anondel anonperm anonren anonres caps implicittls ldap mysql noiplog pam paranoidmsg postgres resolveids selinux ssl sysquota vchroot xinetd"
+REQUIRED_USE="implicittls? ( ssl )"
+
+DEPEND="
+	dev-libs/libsodium:=
+	virtual/libcrypt:=
+	caps? ( sys-libs/libcap )
+	ldap? ( >=net-nds/openldap-2.0.25:= )
+	mysql? ( || (
+			dev-db/mariadb-connector-c
+			dev-db/mysql-connector-c
+		)
+	)
+	pam? ( sys-libs/pam )
+	postgres? ( dev-db/postgresql:= )
+	ssl? ( dev-libs/openssl:0=[-bindist(-)]	)
+	sysquota? ( sys-fs/quota[-rpc] )
+	xinetd? ( virtual/inetd )
+"
+
+RDEPEND="
+	${DEPEND}
+	net-ftp/ftpbase
+	selinux? ( sec-policy/selinux-ftp )
+"
+
+BDEPEND="sys-devel/autoconf-archive"
+
+PATCHES=( "${FILESDIR}/${PN}-1.0.28-pam.patch" )
+
+src_prepare() {
+	default
+
+	[[ "${PV}" == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	# Those features are only configurable like this, see bug #179375.
+	use anondel	&& append-cppflags -DANON_CAN_DELETE
+	use anonperm	&& append-cppflags -DANON_CAN_CHANGE_PERMS
+	use anonren	&& append-cppflags -DANON_CAN_RENAME
+	use anonres	&& append-cppflags -DANON_CAN_RESUME
+	use resolveids	&& append-cppflags -DALWAYS_RESOLVE_IDS
+
+	# Do not auto-use SSP -- let the user select this.
+	export ax_cv_check_cflags___fstack_protector_all=no
+
+	local myeconfargs=(
+		--enable-largefile
+		# Required for correct pid file location.
+		# Pure-FTPd appends "/run/pure-ftpd.pid" to the localstatedir
+		# path, and tries to write to that file even when being
+		# started in foreground. So we need to pin this to /
+		--localstatedir="${EPREFIX}"/
+		--with-altlog
+		--with-cookie
+		--with-diraliases
+		--with-extauth
+		--with-ftpwho
+		--with-language=${PUREFTPD_LANG:=english}
+		--with-peruserlimits
+		--with-privsep
+		--with-puredb
+		--with-quotas
+		--with-ratios
+		--with-throttling
+		--with-uploadscript
+		--with-virtualhosts
+		$(use_with implicittls)
+		$(use_with ldap)
+		$(use_with mysql)
+		$(use_with pam)
+		$(use_with paranoidmsg)
+		$(use_with postgres pgsql)
+		$(use_with ssl tls)
+		$(use_with sysquota sysquotas)
+		$(use_with vchroot virtualchroot)
+		$(usex caps '' '--without-capabilities')
+		$(usex noiplog '--without-iplogging' '')
+		$(usex xinetd '' '--without-inetd')
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}/pure-ftpd.initd-r12" pure-ftpd
+	newconfd "${FILESDIR}/pure-ftpd.confd-r4" pure-ftpd
+
+	newinitd "${FILESDIR}/pure-uploadscript.initd-r1" pure-uploadscript
+	newconfd "${FILESDIR}/pure-uploadscript.confd" pure-uploadscript
+
+	if use implicittls ; then
+		sed -e '/^# Bind/s@21@990@' -i "${ED}"/etc/pure-ftpd.conf || die
+	fi
+
+	if use ssl ; then
+		newinitd "${FILESDIR}/pure-certd.initd" pure-certd
+
+		exeinto /etc
+		newexe "${FILESDIR}/pure-certd.script" pure-certd.sh
+	fi
+
+	if use ldap ; then
+		insinto /etc/openldap/schema
+		doins pureftpd.schema
+		insinto /etc/openldap
+		insopts -m 0600
+		doins pureftpd-ldap.conf
+	fi
+
+	if use xinetd  ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/pure-ftpd.xinetd" pure-ftpd
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		# This is a new installation
+		elog
+		elog "Before starting Pure-FTPd, you have to edit the /etc/pure-ftpd.conf file!"
+		elog
+		ewarn "It's *really* important to read the README provided with Pure-FTPd!"
+		ewarn "Check out http://download.pureftpd.org/pub/pure-ftpd/doc/README for general info"
+		ewarn "and http://download.pureftpd.org/pub/pure-ftpd/doc/README.TLS for SSL/TLS info."
+		ewarn
+	else
+		for v in ${REPLACING_VERSIONS} ; do
+			if ver_test "${v}" -le "1.0.50" ; then
+				einfo "Configuration through /etc/conf.d/pure-ftpd is now deprecated!"
+				einfo "Please migrate your settings to the new configuration file."
+				einfo "Use /etc/pure-ftpd.conf to adjust your settings."
+			fi
+		done
+	fi
+}
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 5e67ad2beefa..5f97a4306006 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/toxic/Manifest b/net-im/toxic/Manifest
index 0ae13818614d..b607b4579059 100644
--- a/net-im/toxic/Manifest
+++ b/net-im/toxic/Manifest
@@ -1,10 +1,7 @@
-AUX toxic-0.10.1-NAME_MAX-and-PATH_MAX.patch 1221 BLAKE2B 2410d954710fd59ae26a308490aca577680f1db283cbf4e6b1c403e778492bd9b889c2d7f32674a844a36b8ee4f396129fa6a3ee4a65c3c13f0b130efdb860d4 SHA512 21c493de57a1d0bc72ddccf6c1b42348ae4aae48ff009e1bc006dd22d7bfc5bfd70b76a40db1b63a03156514306fb240965053844b841988adcab15d666effbc
 AUX toxic-0.11.1-NAME_MAX-and-PATH_MAX.patch 1274 BLAKE2B cb5f7b6e7d73c6f42b8ef30ac09ea6e9cc33d46ed4089c9fd29176ee92c1fa763108b2dd0c0cba199000c8011bb9189ab82c5aa3345341c883b31c12862d45a5 SHA512 0acd682f2657f57975ca01f353cf172b68d34edf9f08b4489b6904f956d516966ab65b38e13af3f7df5a139d3626e6efc1769e57c353daf1c29b86a5a80d6d59
 AUX toxic-0.11.3-NAME_MAX-and-PATH_MAX.patch 746 BLAKE2B 36f533e0d6ae288f034a130c82d633d83eb881e87a724cb850dab9f0588722e509722a5f186791b542a5fb6e3a100ca60cae2e195a2adee1cf108c281e3c09ef SHA512 fa8274d334aa073919664aea8e3bdfa15e138b4acd424a8250ad9cc7652bdde2836cd108ff6a92b39570ff2405ffa27fcdcd1e04884253989acba978ddd51f14
-DIST toxic-0.10.1.tar.gz 1165118 BLAKE2B d367039bef9c97c23c8e5453b607cf72f70776e8c86c41da0480eb04725a901bf33bb89727aee3010ad97d33ef2aa653ff09ea49b597cdf2008ff976c395065c SHA512 aec2e6612d639e0210ae68db3368b656647575e3d927444d0726422ff2cf9718dd5a8b3f37a8253cdc3714f09f9f96828dfccf7a7ae12f8a41ce3207f92a684d
 DIST toxic-0.11.1.tar.gz 1204163 BLAKE2B 1e388982236badf1a27cb1cfd9e84ec635be6a576a0719a7394f32ac82f23796f94236ab807180620cbfa8c0c42f43ff244d2d99d27cd5ab3258c1ce69acc545 SHA512 53fba05271020547e779d63bea777f90f56b61e3eb2775afabe92e047a8347b4a9166628bb59d2eaab2e36a1121d791206ac68ff6604cb06fac6aaddbb05e787
 DIST toxic-0.11.3.tar.gz 1197252 BLAKE2B 4a7a3c4eed270330c6d79ad400778debda1b98b66beed1196cf4e36858d300141c468c4963d012b77d8232f7b3b3b419138505e46098bfac3cde48e9bc0b0e1c SHA512 2c8408004d9644b52cbe9477d7c486622fcef52f1d10a1bcdf7555656a2f2e1bd4c6f0594a7b0b3156fd6908c470c5b41c55e6e0914c3eb2067614013f0f259f
-EBUILD toxic-0.10.1-r1.ebuild 3051 BLAKE2B 44a340be721ec9ae43739225f3ed695ca98f3561deece983f1e9b196d7b530b568dab07dc9118536b28cc620ebe0e064128ca3c29a459ccc3c4ca86735b330c4 SHA512 670856e91e0074648fc9decbfec57dd3a4d707dae7a680f6c83e729829065157ae79efd48798f1dddadcb6c8193f7a91688683735230ae871edfffc93cf4a835
 EBUILD toxic-0.11.1.ebuild 3025 BLAKE2B b081ad285865a067de261e4a3ea49f65c4a1777f5c7bac07978a2ab5c9a2b0b38fa32fa1b037916a7dc3defdc6860ef3549b9454b6fc36ca7e5e7ebc93832213 SHA512 e2d54f02e91f4de80a3f6d50701b4adacc785b411e6e5feee1303dc70634e16b7449d079b8427fa9b2140d1b8d1383e81613d3892d24f2611c98bcd7892a4983
 EBUILD toxic-0.11.3.ebuild 3027 BLAKE2B cf907853a96a89ed1c5a59e2cdb328c796821bcb730da1670cd7d82d4933aef902deea0243b60476aedcc1a5e44ce503290807481cc3ed0c6229c835bff9b7e5 SHA512 fd34ee65ca8d421fbcacbb72b2bfce86236f878db42b250adb36b9107c9f96c67e1e8b541812220d796b70266a3710fd57ea56f6df08a29c64879c4ad1f1d91e
 MISC metadata.xml 1213 BLAKE2B 27cb3884fcbdaf0f702710b26b6a28ea42ed810a0c9eaa024d6067d4a8f20b79020f84abb4b730ef8ae01694b0dbfaa13e72f843f43efd6741b3d487894485a9 SHA512 1997d11602350b2cc9d8a684c2720876ab97319c89a055b9629540ee17fe7fad946ac28472f1ef6d3f0680fc4be4210aeec1f14775e0ad1bb6b236742369015a
diff --git a/net-im/toxic/files/toxic-0.10.1-NAME_MAX-and-PATH_MAX.patch b/net-im/toxic/files/toxic-0.10.1-NAME_MAX-and-PATH_MAX.patch
deleted file mode 100644
index 68cb0bb59ccc..000000000000
--- a/net-im/toxic/files/toxic-0.10.1-NAME_MAX-and-PATH_MAX.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -ruN src/autocomplete.c src/autocomplete.c
---- src/autocomplete.c	2021-07-26 15:04:59.172715491 -0400
-+++ src/autocomplete.c	2021-07-26 15:22:06.652686609 -0400
-@@ -25,10 +25,12 @@
- #include <string.h>
- 
- #ifdef __APPLE__
--#include <sys/types.h>
- #include <sys/dir.h>
-+#include <sys/types.h>
-+#include <sys/sysinfo.h>
- #else
- #include <dirent.h>
-+#include <linux/limits.h>
- #endif /* __APPLE__ */
- 
- #include "configdir.h"
-diff -ruN src/file_transfers.h src/file_transfers.h
---- src/file_transfers.h	2021-07-26 15:39:36.765990567 -0400
-+++ src/file_transfers.h	2021-07-26 15:39:41.899323757 -0400
-@@ -24,6 +24,12 @@
- #define FILE_TRANSFERS_H
- 
- #include <limits.h>
-+//This includes NAME_MAX and PATH_MAX
-+#ifdef __APPLE__
-+#include <sys/sysinfo.h>
-+#elif __linux__
-+#include <linux/limits.h>
-+#endif
- 
- #include "notify.h"
- #include "toxic.h"
-diff -ruN src/settings.h src/settings.h
---- src/settings.h	2021-07-26 15:04:59.176048823 -0400
-+++ src/settings.h	2021-07-26 15:12:01.772703590 -0400
-@@ -24,6 +24,12 @@
- #define SETTINGS_H
- 
- #include <limits.h>
-+//This includes NAME_MAX and PATH_MAX
-+#ifdef __APPLE__
-+#include <sys/sysinfo.h>
-+#elif __linux__
-+#include <linux/limits.h>
-+#endif
- 
- #include <tox/tox.h>
- 
diff --git a/net-im/toxic/toxic-0.10.1-r1.ebuild b/net-im/toxic/toxic-0.10.1-r1.ebuild
deleted file mode 100644
index 931dd62fc29a..000000000000
--- a/net-im/toxic/toxic-0.10.1-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit python-single-r1 xdg
-
-DESCRIPTION="A curses-based client for Tox"
-HOMEPAGE="https://github.com/JFreegman/toxic"
-SRC_URI="https://github.com/JFreegman/toxic/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+audio-notify debug doc llvm notification png python qrcode +sound +video +X"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-	video? ( sound X ) "
-
-BDEPEND="dev-libs/libconfig"
-
-RDEPEND="net-libs/tox:=
-	net-misc/curl
-	sys-libs/ncurses:=
-	sys-kernel/linux-headers
-	audio-notify? (
-		media-libs/freealut
-		media-libs/openal
-	)
-	notification? ( x11-libs/libnotify )
-	debug? ( llvm? ( sys-devel/llvm:* ) )
-	python? ( ${PYTHON_DEPS} )
-	qrcode? (
-		media-gfx/qrencode:=
-		png? ( media-libs/libpng )
-	)
-	sound? (
-		media-libs/openal
-		net-libs/tox:=[av]
-	)
-	X? (
-		x11-base/xorg-proto
-		x11-libs/libX11
-	)"
-
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	#prevent man files from being compressed.
-	sed -i -e "/gzip/d" cfg/targets/install.mk || die "Unable to prevent compression of man pages."
-	#Fix incorrect linkage of pthread (may be optional)
-	sed -i -e 's/pthread/lpthread/g' Makefile || die "Unable to fix linking of pthread."
-	#Makefile sets some required CFLAGS only if CFLAGS variable is undefined,
-	#This line changes the "lazy set if absent" assignment to a "lazy set" assignment.
-	#look below in src_configure to see how CFLAGS are passed to the makefile in USER_CFLAGS
-	sed -i -e 's/?=/=/g' Makefile || die "Unable to force CFLAGS and LDFLAGS"
-	#Fix incomplete invocation of python-config
-	sed -i -e "s/--ldflags/--ldflags --embed/" cfg/checks/python.mk || die "Unable to fix python linking"
-	#Fix incorrect include statements for NAME_MAX and PATH_MAX macros
-	eapply -p0 "${FILESDIR}/${P}-NAME_MAX-and-PATH_MAX.patch" || die "Unable to fix header inclusion"
-}
-
-src_configure() {
-	if ! use audio-notify; then
-		USER_CFLAGS+="-DDISABLE_SOUND_NOTIFY=1 "
-	fi
-	if use debug; then
-		USER_CFLAGS+="-DENABLE_RELEASE=0 "
-		if use llvm; then
-			USER_CFLAGS+="-DENABLE_ASAN=1 "
-		fi
-	fi
-	if ! use notification; then
-		USER_CFLAGS+="-DDISABLE_DESKTOP_NOTIFY=1 "
-	fi
-	if ! use png; then
-		USER_CFLAGS+="-DDISABLE_QRPNG=1 "
-	fi
-	if use python; then
-		USER_CFLAGS+="-DENABLE_PYTHON=1"
-	fi
-	if ! use qrcode; then
-		USER_CFLAGS+="-DDISABLE_QRCODE=1"
-	fi
-	if ! use sound; then
-		USER_CFLAGS+="-DDISABLE_AV=1 "
-	fi
-	if ! use video; then
-		USER_CFLAGS+="-DDISABLE_VI=1"
-	fi
-	if ! use X; then
-		USER_CFLAGS+="-DDISABLE_X11=1 "
-	fi
-	USER_CFLAGS+="${CFLAGS}"
-	export USER_CFLAGS
-	export USER_LDFLAGS="${LDFLAGS}"
-	#set install directory to /usr.
-	sed -i -e "s,/usr/local,${EPREFIX}/usr,g" cfg/global_vars.mk || die "Failed to set install directory!"
-}
-
-src_install() {
-	default
-	if ! use audio-notify; then
-		rm -r "${ED}"/usr/share/"${PN}"/sounds || die "Could not remove sounds directory"
-	fi
-}
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 49051868bbaf..0bea3bad14ba 100644
Binary files a/net-irc/Manifest.gz and b/net-irc/Manifest.gz differ
diff --git a/net-irc/ngircd/Manifest b/net-irc/ngircd/Manifest
index 6dbb7294765c..d3249dfcc0dc 100644
--- a/net-irc/ngircd/Manifest
+++ b/net-irc/ngircd/Manifest
@@ -1,7 +1,9 @@
+AUX ngircd-26.1-systemd-unit.patch 674 BLAKE2B 275a8b73b550b4431f529846ccb70fcb73e193ef44bae04f130377495c8817693c634b3dd327bc4ce986be8af1db17ea1249987dafc5beb35ee614be4a1af7a6 SHA512 c631192434cc55130cb885c94b596e164bd7733dd3f854ea8fc2e4440529e64b1603015fbea7d5dcbf86feb2c60849bfd053206f1b9c15196b4588676a833ab4
 AUX ngircd.conf 35 BLAKE2B 59c5b7c2444d5d2561884db7d532fb7d4ce03cfffacf679f2e72ee0e06415bdf292bfd4f959d47f2b598254902a954a07eb48d4d5ab170e356f89d3f8fb9f15e SHA512 24525591e0ca0249aaff10746d0526fcdc7ff5a8844e98b7d31a5fd710cf92c5905653628ec03e2a491f8cc5890d63f4b05f00bb2adeba502d60c317ad2d3e1c
 AUX ngircd.conf.d 166 BLAKE2B a7e6e149bfe04bb54e97820f6d4fda2f7d81c224fb0975335a190fc41f80aa7edad5b5f509831acf9fdd0949d02e49fa8661860b62f7409c225cecac604cce6d SHA512 0c71a27130f0d918d3ba78f4e19d882bd1089e7f6e899cf89456d1e249d27fe5fe8678bccc90b5fa5eb73c0976240a7fe0722b3094d7553fbfa919dbce235d6a
 AUX ngircd.init-r2.d 1271 BLAKE2B f385805c7ae63f4046cee12449b60bc4309007fe69b52a2933a8562f5c05bd356cee49e0bd9bed389d9f42b92e94dbc37387db34eb3c5946e6cc92ea8ebf8ec2 SHA512 ceaeee66b31463273ff88c5356c63bc9b25c272dd038940adba95a8b7e3d4f4d0bd0c96bd9c99fb522b7dafa3a413b5611ecb748951ef5cc7a944384983cf45e
 DIST ngircd-26.1.tar.xz 375812 BLAKE2B 4bd7dae47b579bdfaceee0e3ff1b30ac7c70326cd9d609a128192b1efbec17ac50010cb1bf27f4ca6d921700b7bd8cf3d0e8fb5bc569a84d6a101be10ec5832a SHA512 6333244e3fb2dc00ee9812c8c45990baa95ff473a7037a0a11ca495bed86fa438110ad5151d86b9274b6187d86b7b5712fdca2b74b8cb92f7f66fa10cf1961ee
 DIST ngircd-26.1.tar.xz.sig 310 BLAKE2B 6bf3330387ef01af32c0026e12e5fe5a9a34f5d5fc221a66931312fb70d17832259b94e370ddc49f8834d0d29b9c53b52f11ddec3bfc12655472e046cc569e99 SHA512 c1bbc481dd92e487706fa0b3b18dffd214018946fad8ced77feccc1105a65fcc33c82b0e93529a14ad103ef784da20e3bf86358a8f26cdddeac9f947833d6848
 EBUILD ngircd-26.1-r4.ebuild 2533 BLAKE2B bb5d0f9d2653184ab0964afb08eb7fd803041af9005b9675e7446a13c3a63ed305e88c53d7e7fa4e116c8519a4f8edb63fa075be4845b4c94728ce49e1045120 SHA512 744ff2b19724127235a91c8b88e2f937ba7903a0ac0073e4d298276d3410171f231b907d5c114a7fd9da6157bf41186baf4a51243867a2af5b89672cf29062c5
+EBUILD ngircd-26.1-r5.ebuild 2672 BLAKE2B f9976614ed4baca6453e3713d7cf220b34eb7b76962ccc7938585c25838888a2775de74c1ca8ae868d4ac566abd2d4416137d544cb48501c6ed7fd19fba44783 SHA512 bdb0c5e4d37cee8d0a8afde1623215e647bc321f9cf1f1cab4040ee6921e5d6905588017a4d75bc5be9af6e2297de5460a95a539a13d08d1898f92bac48b8963
 MISC metadata.xml 651 BLAKE2B ba57a0fffdef6acaf3510f62bc146c9dbfec0805b9e6a5e889360fee39c3a3e539aaead44fa42c72523957c492c066a9729c2f362c84f56c0ab27627b8e92f36 SHA512 82529647ece0d29898c2ad7f5794d6376f919d0e1d30cdc7dea0bea97418c9fba26e9e9748232a7e9963d329d5a8b5f4f8d2c6acc03682a231ec3984c63980f7
diff --git a/net-irc/ngircd/files/ngircd-26.1-systemd-unit.patch b/net-irc/ngircd/files/ngircd-26.1-systemd-unit.patch
new file mode 100644
index 000000000000..f15025cc4856
--- /dev/null
+++ b/net-irc/ngircd/files/ngircd-26.1-systemd-unit.patch
@@ -0,0 +1,24 @@
+diff --git a/contrib/ngircd.service b/contrib/ngircd.service
+index e4c30e2..ba1b513 100644
+--- a/contrib/ngircd.service
++++ b/contrib/ngircd.service
+@@ -12,8 +12,8 @@ Before=bopm.service
+ 
+ [Service]
+ Type=forking
+-User=irc
+-Group=irc
++User=ngircd
++Group=ngircd
+ # Settings & limits:
+ CapabilityBoundingSet=CAP_SYS_CHROOT CAP_NET_BIND_SERVICE
+ MemoryDenyWriteExecute=yes
+@@ -27,7 +27,7 @@ ProtectKernelTunables=yes
+ ProtectSystem=full
+ RestrictAddressFamilies=AF_INET AF_INET6 AF_UNIX
+ RestrictRealtime=yes
+-RuntimeDirectory=ircd
++RuntimeDirectory=ngircd
+ RuntimeDirectoryMode=750
+ # Try to load "default files" from any Debian package variant to keep this
+ # unit generic.
diff --git a/net-irc/ngircd/ngircd-26.1-r5.ebuild b/net-irc/ngircd/ngircd-26.1-r5.ebuild
new file mode 100644
index 000000000000..4c6293a77170
--- /dev/null
+++ b/net-irc/ngircd/ngircd-26.1-r5.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/alexbarton.asc
+inherit tmpfiles systemd verify-sig
+
+DESCRIPTION="An IRC server written from scratch"
+HOMEPAGE="https://ngircd.barton.de/"
+SRC_URI="https://arthur.barton.de/pub/${PN}/${P}.tar.xz"
+SRC_URI+=" verify-sig? ( https://arthur.barton.de/pub/${PN}/${P}.tar.xz.sig )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+IUSE="debug gnutls ident irc-plus +ipv6 pam +ssl strict-rfc tcpd test zlib"
+
+# Flaky test needs investigation (bug #719256)
+RESTRICT="test"
+
+RDEPEND="
+	acct-user/ngircd
+	irc-plus? ( virtual/libiconv )
+	ident? ( net-libs/libident )
+	pam? ( sys-libs/pam )
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? (
+			dev-libs/openssl:0=
+		)
+	)
+	tcpd? ( sys-apps/tcp-wrappers )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		dev-tcltk/expect
+		net-misc/netkit-telnetd
+	)
+	verify-sig? ( sec-keys/openpgp-keys-alexbarton )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-26.1-systemd-unit.patch
+)
+
+src_prepare() {
+	default
+
+	if ! use prefix ; then
+		sed -i \
+			-e "/;ServerUID = /s/65534/ngircd/" \
+			-e "/;ServerGID = /s/65534/ngircd/" \
+			doc/sample-ngircd.conf.tmpl || die
+	fi
+
+	# Make pidfiles work out-of-the-box
+	sed -i \
+		-e "/;PidFile = /s/;//" \
+		-e "/;ServerUID = /s/;//" \
+		-e "/;ServerGID = /s/;//" \
+		doc/sample-ngircd.conf.tmpl || die
+
+	# Note that if we need to use automake, we need a certain version (for now):
+	# https://github.com/ngircd/ngircd/issues/261
+	# WANT_AUTOMAKE=1.11
+	# eautomake
+}
+
+src_configure() {
+	local myeconfargs=(
+		--sysconfdir="${EPREFIX}"/etc/${PN}
+
+		$(use_enable debug sniffer)
+		$(use_enable debug)
+		$(use_enable irc-plus ircplus)
+		$(use_enable ipv6)
+		$(use_enable strict-rfc)
+		$(use_with irc-plus iconv)
+		$(use_with ident)
+		$(use_with pam)
+		$(use_with tcpd tcp-wrappers)
+		$(use_with zlib)
+	)
+
+	if use ssl ; then
+		if use gnutls ; then
+			myeconfargs+=(
+				$( use_with gnutls )
+			)
+		else
+			myeconfargs+=(
+				$( use_with !gnutls openssl )
+			)
+		fi
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	fowners ngircd:ngircd /etc/ngircd/ngircd.conf
+
+	newinitd "${FILESDIR}"/ngircd.init-r2.d ngircd
+	newconfd "${FILESDIR}"/ngircd.conf.d ngircd
+
+	systemd_dounit contrib/ngircd.{service,socket}
+
+	dotmpfiles "${FILESDIR}"/ngircd.conf
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] && use pam ; then
+		elog "ngircd will use PAMIsOptionalPAM by default, please change this option."
+		elog "You may not be able to login until you change this."
+	fi
+
+	tmpfiles_process ngircd.conf
+}
diff --git a/net-irc/znc-clientbuffer/Manifest b/net-irc/znc-clientbuffer/Manifest
index 13e46bd22138..4a651889209b 100644
--- a/net-irc/znc-clientbuffer/Manifest
+++ b/net-irc/znc-clientbuffer/Manifest
@@ -1,5 +1,5 @@
 AUX CMakeLists.txt 356 BLAKE2B 334684d49d81258425935399e73d597ce038d2d685341df15766469a0cb03d8324f7b7b697930e05871b6eaa467804ebbbde98bf26126dd495f78a315f3c6a03 SHA512 d935beadd25cdebe3dc0b793d7057b1a10fbfd39d5340bdd51071341500f9db2cc272c9702a0d84f5e8146895888ef36b04fe69f2cf4f10c3645cae17540bbc5
 DIST znc-clientbuffer-1.0.48.tar.gz 5602 BLAKE2B 16a2c807df7371619f9e8456e3a65226dfd60e37872a86af11861d2130aa75fbfcfdc1c326baa0676cc253f27dda32893110638d4747a283e224bd672a49e0b1 SHA512 eac4d748b670a8e3563a424fcb5c9c411af6c9b1f9965f065936ddfcfbff946783e34e0d6b32de18fb3b87fb27db129ff58bedfb179473c804750a9b770897f6
 EBUILD znc-clientbuffer-1.0.48-r1.ebuild 679 BLAKE2B 5406a7dbcdefa00962d42f3e6be1b0d8eca2904370ba40cc9ca4dd146bde26e543bfbd6b10ff702ca8f23053ada9cce547793b746c2e06f25c734e549e62636f SHA512 9ac441b75a2ced50175e21605f160754bd97820019e53e80de9bd116e027f61bcf1e1c6a786fd84b9fc618b1f6dfa192d28dd71da73f580dfc3f35cd003cbcea
-EBUILD znc-clientbuffer-1.0.48.ebuild 631 BLAKE2B 930e00213b4bc809065c099fe177aeece25d4df7f81e44d2eecb7d8e01613f4d9f293ac4fd287f67e89020fc798c0870a3c78066abb9f75e185558218f08b05d SHA512 f3fa7f4c26f28f77ee227c75e12e1ca1253d73da37f66a6bb6e2109064f6ecf56caee94aa2731b0907a7ffb6736b631c8670f11338325aa16727f43b1c5772b9
+EBUILD znc-clientbuffer-1.0.48.ebuild 635 BLAKE2B 1a9b17f40c36972941b8dffa5440dcb334fd691ea4914d9f5e4aebd3f3c7e62438b26222945696c8b09fd597439b2ee65bb6b74c1e53493775c7d2e28c5b0b0c SHA512 157909102e799181feaea3033d743c579865740e8d41bffd5b830fe6b6eb2c4c3a36d7a91dc81e764b411910f278893ab20146e6c52a0bf7da947d910be7db28
 MISC metadata.xml 557 BLAKE2B 26d334308b729dceee1f3e11f5883a4a540aecaccd7143d7d29761a05aedf0d22aa38e9a47f54755eacf28d19c6f625ae8671c4fd118dccc4775c01a7ed4f602 SHA512 9f6a7e3b0d7d1c4e41b75ab87cf2d66cb34ea03df5b8f23d29ad4e70647192821311c0d93438db5744277ca969dca3aa69e7688c8586ab3e6d00d6ba374dccd6
diff --git a/net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48.ebuild b/net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48.ebuild
index 7ad332d77a02..2491cc61317b 100644
--- a/net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48.ebuild
+++ b/net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,7 +21,7 @@ DOCS=( README.md )
 _emake() {
 	emake \
 		-j1 \
-		PREFIX=${EPREFIX}/usr \
+		PREFIX="${EPREFIX}"/usr \
 		LIBDIR=/$(get_libdir) \
 		"$@"
 }
@@ -31,7 +31,7 @@ src_compile() {
 }
 
 src_install() {
-	_emake DESTDIR=${ED} install
+	_emake DESTDIR="${ED}" install
 
 	einstalldocs
 }
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index b96c40247f16..97da1b1b19b8 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/gloox/Manifest b/net-libs/gloox/Manifest
index ee928655eef4..d2b94110bde8 100644
--- a/net-libs/gloox/Manifest
+++ b/net-libs/gloox/Manifest
@@ -1,7 +1,10 @@
 AUX gloox-1.0.24-Makefile.patch 664 BLAKE2B cf2e193f4378f8bea9798053f61044037ae69710328836970f3f56770fb07504c901fa083e81b227d3ccf1b43434cf51ba86cd602a3d7929c7017614ac9be987 SHA512 e54676464e08e9ee4fe7a5e19fd5abfad8333ebafbabb31a99b326e7725733f6ee18ae65329461a4b5fe89b398a10415d518780da685a1bc728a76ef45b2c2e1
+AUX gloox-1.0.24-bashism-configure.patch 529 BLAKE2B eef0f671386ae33a81c0ae667330a9432cdf1351c5d71d07dd244f9e21d3da7f7c4d4cf9ef748d039ba2845bb2b7b4784b759c3ceacf0faa7fad0b1de95d3753 SHA512 6c9aea8282d30637cdc3f9cb01ee7d1b0578ded4316129ec141e8b6207ae12c0b4b123f8a5ac73a24a23375c70345e9fd95e30690ada2d3175a6113a387637f6
+AUX gloox-1.0.24-fix-gcc12-time.patch 483 BLAKE2B 96149086b679aa2be6bee8a854b14e50e618334dad26a22c6c20deb507e6f5fa695e7baf87f226be767eecd36a3d8bee5f9eb523a201bad12a5eb92fc78fec9f SHA512 0d54a8956a46d34de1efeb26b42662db095059d87e39e177560753f1971f3816442ac884a6699cab05ba0ee12bfac2395d812d46b471cd01b91aff1d05c72877
 AUX gloox-1.0.24-musl.patch 339 BLAKE2B e3cb58c64057fb991050544b4886827031b574ba95eea10eaffc8d49e741f69499aefa197995ce9525554f9079ce54ff4bf72634810bb1823133585198cd4b9d SHA512 d19dbd9f4e2db63b6b05a514357c6165900c4557de180a87691e815cf72f2a116b806854eef1060b08b30ffda0679956fd8d374f87a714be48b95bb32c388f68
 AUX gloox-1.0.24-pthread-link.patch 566 BLAKE2B 50437d74410f7f6992b3d2a191fe51ebb0346dfe0d36d2d8aa77404e132a9ced7bff3b680fb11ec697a8d4fab5c9f74c15cfd5322a0d6b84ea56afd371e1d936 SHA512 c1f1c0e52bc765c263e31b0c533ccae78184c418720b74541555b52e12c5283d691330f912aeed143e871313bfb6b3f725ee4258cfce6e5a3bc3f561ff9299a3
 AUX gloox-1.0.24-slibtool.patch 503 BLAKE2B c760faea8d4aaa9adb3d70494b55a0a327456f8976f8c017dd3326cde93147f126d9e53390e9b47c0555ae9a8a7bd0259cff8b0e86b4f845aef99222bf3c001e SHA512 bede6b41aa5695de8d7caff391eda0c75a2fbeffd0d3bc2a8e0cb943123283fca7519d4406c3d5f5db1585976dd84d2023554c7f5a42c74683fb38336d1f3904
 DIST gloox-1.0.24.tar.bz2 727442 BLAKE2B 57e8916ddf057c115350e005a027e3a81684269f688dd80126bf3753a8dd71a8d64a86e1eb59de2886a6657ad1dac5f9431549db79f314173f49233044b52cb5 SHA512 e3ddb331a57e635b8da5d8cd36a89fa9521599301d1108a025a3526a02df5bf73555d54bccd3706fdffd857134716b23df6bf57a59a17be4f6a7873a810268ee
+EBUILD gloox-1.0.24-r1.ebuild 1459 BLAKE2B 87776f7fba6cf508b46b5489dc5a98375b0e81553e51e14227e046fa038c5fa2de5c8c14a0985234b79134d91da8d326b56c73e39b1a616e6851519ceecd5129 SHA512 dfc20149ab7c496e6a644727913102142a744e3629cd8a5033d78ed5cdd4a566f78cd3d9a8d0cc4337776d14f4d837b9c9684a63e551b118aa4c39b2bd087bdb
 EBUILD gloox-1.0.24.ebuild 1356 BLAKE2B f715cda112cf9a07be23d75f8a67c650c8ff181dae24c69143e2cfa033d575933657d46e4a119ed66b3a3396329f3d1dfe9f2ee58a0c905978963a17113f9004 SHA512 ae0b80b556a8aba9d1c75964b5ca5e23c7f6110d6cd289a8d0e53c1c41dadeb0b3b42778b0dc40a14ca4913e6626642df670b89792f9eb8a974bb813af9731d4
 MISC metadata.xml 254 BLAKE2B 6df9f9f117e6404d21549d2fcf1c42687a10067493455f5fae06939105c6907689c41ae0eb2adabadf662c22c40c0755624bbb3ea042794f9f197024ff3554ec SHA512 2f0148fc50acb99e01438869f0e7792a9d6b7b9591371d882592c372a4eeebff00c9410829006093ccb73fd00fefc0db4b7521975d41d86481aaa111e69e9711
diff --git a/net-libs/gloox/files/gloox-1.0.24-bashism-configure.patch b/net-libs/gloox/files/gloox-1.0.24-bashism-configure.patch
new file mode 100644
index 000000000000..a9e09f113bcc
--- /dev/null
+++ b/net-libs/gloox/files/gloox-1.0.24-bashism-configure.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -51,7 +51,7 @@ if test -z "`${CC} check_atomicbuiltins.c -o check_atomicbuiltins 2>&1`" ; then
+ 	HAVE_GCC_ATOMIC_BUILTINS=yes
+ 	AC_DEFINE(HAVE_GCC_ATOMIC_BUILTINS, 1, [Define to 1 if GCC atomic builtins are available])
+ 	AC_MSG_RESULT([yes])
+-	if test $cross_compiling == "yes"; then
++	if test $cross_compiling = "yes"; then
+ 		# Some platforms don't seem to be fully happy for libraries using GCC atomic builtins
+ 		#  unless -lgcc and -lgcc_s are explicitly included.
+ 		# (Errors like
diff --git a/net-libs/gloox/files/gloox-1.0.24-fix-gcc12-time.patch b/net-libs/gloox/files/gloox-1.0.24-fix-gcc12-time.patch
new file mode 100644
index 000000000000..dc0c4cd1aced
--- /dev/null
+++ b/net-libs/gloox/files/gloox-1.0.24-fix-gcc12-time.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/852182
+--- a/src/tests/tag/tag_perf.cpp
++++ b/src/tests/tag/tag_perf.cpp
+@@ -20,6 +20,7 @@ using namespace gloox;
+ #include <cstdlib>
+ #include <string>
+ #include <cstdio> // [s]print[f]
++#include <ctime>
+ 
+ #include <sys/time.h>
+ 
+--- a/src/tests/zlib/zlib_perf.cpp
++++ b/src/tests/zlib/zlib_perf.cpp
+@@ -24,6 +24,7 @@ using namespace gloox;
+ #include <string>
+ #include <sys/time.h>
+ #include <cstdio> // [s]print[f]
++#include <ctime>
+ 
+ #ifdef HAVE_ZLIB
+ 
diff --git a/net-libs/gloox/gloox-1.0.24-r1.ebuild b/net-libs/gloox/gloox-1.0.24-r1.ebuild
new file mode 100644
index 000000000000..4cef23c79743
--- /dev/null
+++ b/net-libs/gloox/gloox-1.0.24-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+MY_P="${P/_/-}"
+DESCRIPTION="A portable high-level Jabber/XMPP library for C++"
+HOMEPAGE="https://camaya.net/gloox/"
+SRC_URI="https://camaya.net/download/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+# Check upstream changelog: https://camaya.net/gloox/changelog/
+SLOT="0/18"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug gnutls idn ssl static-libs test zlib"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	idn? ( net-dns/libidn:= )
+	gnutls? ( net-libs/gnutls:= )
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	zlib? ( sys-libs/zlib )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.24-musl.patch"
+	"${FILESDIR}/${PN}-1.0.24-Makefile.patch"
+	"${FILESDIR}/${PN}-1.0.24-slibtool.patch"
+	"${FILESDIR}/${PN}-1.0.24-pthread-link.patch"
+	"${FILESDIR}/${PN}-1.0.24-bashism-configure.patch"
+	"${FILESDIR}/${PN}-1.0.24-fix-gcc12-time.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# Examples are not installed anyway, so - why should we build them?
+	local myeconfargs=(
+		--without-examples
+		$(usex debug "--enable-debug" '')
+		$(use_enable static-libs static)
+		$(use_with idn libidn)
+		$(use_with gnutls)
+		$(use_with ssl openssl)
+		$(use_with test tests)
+		$(use_with zlib)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 85d9a11db347..e894b05df277 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -7,5 +7,5 @@ DIST gnutls-3.7.6.tar.xz.sig 685 BLAKE2B eae022d6cb0d772e465257411381afd97f3dfd1
 EBUILD gnutls-3.7.2.ebuild 4235 BLAKE2B 262daac5098ec971880045c668f61e138a2838f3e5b2e18e150bc1917de96b768cbd2716b9585893aa96737f3def5e78c3925a11ca0bffc438ea0ea008b6b70a SHA512 1f5a728084f2bf7bd634a96243b279ca29c88bfd2c51bff13767f158e9168a9f84419eb1270edcd18de0479451e1e59723a329f141c9bf25f7b8cfe7693611f6
 EBUILD gnutls-3.7.3-r1.ebuild 3964 BLAKE2B d334c886ac00f1436cccbcdbbddc4515f6c09d65ae4bd7c2844ddf56da3d4affff1468b47b50e97157423dd8b07d93f480cfe5956472a16da1e00ed97dd70d84 SHA512 3f3cdef700bf11937627ae986d42c945163527f591aba62092b2f5b383fd997cff53f0c0be9b75bf9912cb04d83e07f0de2a0719a8c826e788fb139dec97cbcd
 EBUILD gnutls-3.7.5.ebuild 4775 BLAKE2B 5c2c43d122336f14df9597f6cc801424db4ad8bf0f109b781b7ad57d101e9b7d556e0589e149eecdf23089303d3558e392d765751693b1f0c88a45d4cedeffd4 SHA512 56801bf41c6f9b63e9f6c12728588f98be0bb498b0acdd4142447cc36616c5cf94742a4b810969034eef55273367435f33e8026682787e3992fd05170cc9275b
-EBUILD gnutls-3.7.6.ebuild 4774 BLAKE2B 1be370770921e38e098c30eb6f6aa4b76e09e2adaee0a6fc9a926b5e62f12b66eaba6466119845183144a013929b7a88299fdba3b50b63b5acc4260c36b605a7 SHA512 ed2fba46361e7a85025084643141a321966c0aa5247727ed9987dc97c7181761ad6752a2bce0faef5c89c20f82c38970227f0709f238fb9c7d00bb19b91a6153
+EBUILD gnutls-3.7.6.ebuild 4770 BLAKE2B 29eb4c77b45918feb791b2410734aabb8f6689397983d5094af2c13de023d663ca9de62f6342afd4eab1b33d0fc89593fdb88eee06019316fb9ce033efb226e2 SHA512 13fe64753ba2b83c1de2b327a0731387187ef04063fdf2c4f36f5eee188648f9788db4eb803a58a821dfaac781186116d28103c828550385ba4ce233f5256e7e
 MISC metadata.xml 1369 BLAKE2B 586c5d851b4188a27db257e76ac6676e4f90b932e719f12be0d02c891cd943108a1747cfb572c56bad2489b8dbbe40c5ca6aa72d704e3d4445dad7419e0944ff SHA512 4bc3e4f0e896f75ef489922c9e3d7e43e485fa3b8498c5fe393c28f88c3754b116d5bdb152163cc987c28e168a3b5b9a7213990053e4ba9c80686f71aa655fc5
diff --git a/net-libs/gnutls/gnutls-3.7.6.ebuild b/net-libs/gnutls/gnutls-3.7.6.ebuild
index b14401d958f0..58031b3bf77a 100644
--- a/net-libs/gnutls/gnutls-3.7.6.ebuild
+++ b/net-libs/gnutls/gnutls-3.7.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz.sig )
 
 LICENSE="GPL-3 LGPL-2.1+"
 SLOT="0/30.30" # <libgnutls.so number>.<libgnutlsxx.so number>
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="brotli +cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib zstd"
 
 REQUIRED_USE="test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )"
diff --git a/net-libs/libad9361-iio/Manifest b/net-libs/libad9361-iio/Manifest
index b02a34b9c59f..13b3c65712cf 100644
--- a/net-libs/libad9361-iio/Manifest
+++ b/net-libs/libad9361-iio/Manifest
@@ -1,4 +1,8 @@
+AUX libad9361-iio-0.2-cmake-gnuinstalldirs.patch 1815 BLAKE2B b6836af3ce9f1bf3d8eae92ff42cf38e11227fe02af032246c3f3344e92a2399175a6e0f1faf09e2e2124615fbc95283a5817aba7aad4d7b3dc500f01750bf37 SHA512 546e2d0e71ff6c0fc201a3ef41fb0d63e728da72fc89c5a92a0a5bf17cd8f7fb63bb094ebd82573d4ac26abd484857bd5d998a6e220a3ab8e0775304c20b1971
+AUX libad9361-iio-0.2-fix-lld-tests.patch 2089 BLAKE2B fb462846e61b94e9b1a0aaa444c24fbdec12c12d19761dac402b70914ed7b88ed0821015d2d9bf6a6eef8b860b40642727649597f74af2a4d6a4cb18b5ffd8fc SHA512 6d79873358441229e024b99c722138bd76f8a228d5aad79432c212be88b6bfc3e662fa63ccce355ac4ea1e732f20d3c51ded1fbf51785f68e57eea6668ef32b1
+AUX libad9361-iio-0.2-libdir-pkgconfig.patch 513 BLAKE2B 77291cea5d1dfa99646673881b5c7acf248928103476605946aa4decc09bc87aaf210378bea2846cd1ab1b8717ed54baa8c1028c0223b53a28b86a06021fe2e2 SHA512 9d161de025db149ad27b6e6ce6b9b1a7b4f4c6293b3936a2f8bb004bcdc70e88680d781c76e882cd2d1b2afcecd0b3624e45e8864f2b45bb19b20bc3f80dacb1
 DIST libad9361-iio-0.2.tar.gz 167678 BLAKE2B 9880114bc53f3d4975dbe0773f8d112e40b0df47e34985bdc68c5b6740aee2c140ced39353929a793c2b327b5811461436ceb2934c2a71fc7b92b218092d468d SHA512 f95fa955531198ab33c16d41685d23140e875b2eafa1da10cdf60a7bf1ae760e86e2d3d28c9ab36a3a7b7a90e36bb53456dec1d6e537a1574a5505b7595e764c
+EBUILD libad9361-iio-0.2-r1.ebuild 758 BLAKE2B d81208c182f607eee214db6105ba729fdcfa9bf3dd7d5df44986ee7592732498fed33e10e6ad34f44ffab2349233a38b2b6ddcc2b3a946e190b87f13c6c98272 SHA512 7b1dfa6f5520e84dc6dacc02baeb2be2aee6a115f1c794a6cbc41b2938c55679508cc1742f7da57ac0306e0d264dfc3d8d9a8a578870dc3d1d9da53e235e3410
 EBUILD libad9361-iio-0.2.ebuild 826 BLAKE2B 832a9a9aced0c02089ef6394db31edddee0a70e0f384012c668e63926a0e4b9f197f6376c62ee45f1600d582daaa433860050530bf3fa06069ec14e917dbeedc SHA512 60b37610799f64713e44eacd6e2f459cdbe5af370404c4525b72859c62c88e3fbd79ec7e0226fb9980bd3705af2cc07901da233e8bd5109364bb9613607a3620
-EBUILD libad9361-iio-9999.ebuild 819 BLAKE2B 44f462e8370973c1b815982283c272a1c46ef6a5bbd7c6e7eea20af219bf7e3893519825ddd19993bdbf5dc4f160bf23187c4cd81dd3e85d955c5f6369fdb5a1 SHA512 d6aa9a469260bf74e53ba27e3ec1217cc98bc5889edb876a1fee132804e0b9edbc8d6507f2f42e296b374215c6855f79eff4ee2c6690b6420cf3caea637f3d6e
+EBUILD libad9361-iio-9999.ebuild 758 BLAKE2B d81208c182f607eee214db6105ba729fdcfa9bf3dd7d5df44986ee7592732498fed33e10e6ad34f44ffab2349233a38b2b6ddcc2b3a946e190b87f13c6c98272 SHA512 7b1dfa6f5520e84dc6dacc02baeb2be2aee6a115f1c794a6cbc41b2938c55679508cc1742f7da57ac0306e0d264dfc3d8d9a8a578870dc3d1d9da53e235e3410
 MISC metadata.xml 442 BLAKE2B 4aaee897fc8e0ec7c1081c20bcee1470aaeebd3f14252177861cbaff053a29c4b4b6a5476015252d8a75e8dd191d45e3c3c6f0cd6a08f41d3374831f3c392ac0 SHA512 b8e19d2f3382733f2756c406a7f08635956973c32cd8ec400bed18445dffb51d0595c09040de74bf907d32f6119976326b4ba914d29e74e65a9bc7eb1d3016cc
diff --git a/net-libs/libad9361-iio/files/libad9361-iio-0.2-cmake-gnuinstalldirs.patch b/net-libs/libad9361-iio/files/libad9361-iio-0.2-cmake-gnuinstalldirs.patch
new file mode 100644
index 000000000000..5a69010eb184
--- /dev/null
+++ b/net-libs/libad9361-iio/files/libad9361-iio-0.2-cmake-gnuinstalldirs.patch
@@ -0,0 +1,50 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -13,6 +13,8 @@
+ cmake_minimum_required(VERSION 2.8.7)
+ project(ad9361 C)
+ 
++include(GNUInstallDirs)
++
+ set(LIBAD9361_VERSION_MAJOR 0)
+ set(LIBAD9361_VERSION_MINOR 2)
+ set(VERSION ${LIBAD9361_VERSION_MAJOR}.${LIBAD9361_VERSION_MINOR})
+@@ -59,10 +61,6 @@ endif()
+ 
+ add_definitions(-D_POSIX_C_SOURCE=199309L -DLIBAD9361_EXPORTS=1)
+ 
+-set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib"
+-	CACHE PATH "Installation directory for libraries")
+-mark_as_advanced(INSTALL_LIB_DIR)
+-
+ find_library(LIBIIO_LIBRARIES iio)
+ find_path(LIBIIO_INCLUDEDIR iio.h)
+ 
+@@ -98,21 +96,17 @@ configure_file(libad9361-iio.iss.cmakein ${CMAKE_CURRENT_BINARY_DIR}/libad9361-i
+ 
+ set(LIBAD9361_PC ${CMAKE_CURRENT_BINARY_DIR}/libad9361.pc)
+ configure_file(libad9361.pc.cmakein ${LIBAD9361_PC} @ONLY)
+-install(FILES ${LIBAD9361_PC} DESTINATION ${INSTALL_LIB_DIR}/pkgconfig)
++install(FILES ${LIBAD9361_PC} DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+ 
+ if(NOT SKIP_INSTALL_ALL)
+ 	install(TARGETS ad9361
+-		ARCHIVE DESTINATION lib
+-		LIBRARY DESTINATION "${INSTALL_LIB_DIR}"
+-		RUNTIME DESTINATION bin
+-		FRAMEWORK DESTINATION lib
+-		PUBLIC_HEADER DESTINATION include)
++		ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++		LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++		RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
++		FRAMEWORK DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++		PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+ endif()
+ 
+-set(CMAKE_INSTALL_DOCDIR "" CACHE PATH "documentation root (DATAROOTDIR/doc/${PROJECT_NAME}${LIBAD9361_VERSION_MAJOR}-doc)")
+-include(GNUInstallDirs)
+-set(CMAKE_INSTALL_DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${PROJECT_NAME}${LIBAD9361_VERSION_MAJOR}-doc")
+-
+ find_package(Doxygen)
+ if(DOXYGEN_FOUND)
+ 	option(WITH_DOC "Generate documentation with Doxygen" ON)
diff --git a/net-libs/libad9361-iio/files/libad9361-iio-0.2-fix-lld-tests.patch b/net-libs/libad9361-iio/files/libad9361-iio-0.2-fix-lld-tests.patch
new file mode 100644
index 000000000000..00ef9e0a6869
--- /dev/null
+++ b/net-libs/libad9361-iio/files/libad9361-iio-0.2-fix-lld-tests.patch
@@ -0,0 +1,49 @@
+https://bugs.gentoo.org/831322
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -1,17 +1,29 @@
+ add_executable(FilterDesignerTest filter_designer_test.c)
+-target_link_libraries(FilterDesignerTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361)
++if(WIN32)
++  target_link_libraries(FilterDesignerTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361)
++else()
++  target_link_libraries(FilterDesignerTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361 m)
++endif()
+ add_test(NAME FilterDesignerTest
+          COMMAND FilterDesignerTest
+          WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+ 
+ add_executable(GenerateRatesTest gen_rates_test.c)
+-target_link_libraries(GenerateRatesTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361)
++if(WIN32)
++  target_link_libraries(GenerateRatesTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361)
++else()
++  target_link_libraries(GenerateRatesTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361 m)
++endif()
+ add_test(NAME GenerateRatesTest
+          COMMAND GenerateRatesTest
+          WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+ 
+ add_executable(FilterDesignerHardwareTest filter_designer_hw.c)
+-target_link_libraries(FilterDesignerHardwareTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361)
++if(WIN32)
++  target_link_libraries(FilterDesignerHardwareTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361)
++else()
++  target_link_libraries(FilterDesignerHardwareTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361 m)
++endif()
+ add_test(NAME FilterDesignerHardwareTest
+          COMMAND FilterDesignerHardwareTest
+          WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+@@ -27,7 +39,11 @@ add_test(NAME FMComms5SyncTest
+          WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+ 
+ add_executable(AutoRateTest auto_rate_test_hw.c)
+-target_link_libraries(AutoRateTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361)
++if(WIN32)
++  target_link_libraries(AutoRateTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361)
++else()
++  target_link_libraries(AutoRateTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361 m)
++endif()
+ add_test(NAME AutoRateTest
+          COMMAND AutoRateTest
+          WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/net-libs/libad9361-iio/files/libad9361-iio-0.2-libdir-pkgconfig.patch b/net-libs/libad9361-iio/files/libad9361-iio-0.2-libdir-pkgconfig.patch
new file mode 100644
index 000000000000..a23205e44da9
--- /dev/null
+++ b/net-libs/libad9361-iio/files/libad9361-iio-0.2-libdir-pkgconfig.patch
@@ -0,0 +1,14 @@
+--- a/libad9361.pc.cmakein
++++ b/libad9361.pc.cmakein
+@@ -1,8 +1,8 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=@CMAKE_INSTALL_PREFIX@/lib
+-sharedlibdir=@CMAKE_INSTALL_PREFIX@/lib
+-includedir=@CMAKE_INSTALL_PREFIX@/include
++libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
++sharedlibdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
++includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@
+ 
+ Name: libad9361
+ Description: Device specific library for AD936X transceivers
diff --git a/net-libs/libad9361-iio/libad9361-iio-0.2-r1.ebuild b/net-libs/libad9361-iio/libad9361-iio-0.2-r1.ebuild
new file mode 100644
index 000000000000..596e74764626
--- /dev/null
+++ b/net-libs/libad9361-iio/libad9361-iio-0.2-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="IIO AD9361 library for filter design and handling, multi-chip sync, etc"
+HOMEPAGE="https://github.com/analogdevicesinc/libad9361-iio"
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/analogdevicesinc/libad9361-iio"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/analogdevicesinc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~riscv ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+
+RDEPEND="net-libs/libiio:="
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.2-fix-lld-tests.patch
+	"${FILESDIR}"/${PN}-0.2-libdir-pkgconfig.patch
+	"${FILESDIR}"/${PN}-0.2-cmake-gnuinstalldirs.patch
+)
diff --git a/net-libs/libad9361-iio/libad9361-iio-9999.ebuild b/net-libs/libad9361-iio/libad9361-iio-9999.ebuild
index 630cb27fb6e9..596e74764626 100644
--- a/net-libs/libad9361-iio/libad9361-iio-9999.ebuild
+++ b/net-libs/libad9361-iio/libad9361-iio-9999.ebuild
@@ -1,17 +1,18 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 inherit cmake
 
-DESCRIPTION="IIO AD9361 library for filter design and handling, multi-chip sync, etc."
+DESCRIPTION="IIO AD9361 library for filter design and handling, multi-chip sync, etc"
 HOMEPAGE="https://github.com/analogdevicesinc/libad9361-iio"
-if [ "${PV}" = "9999" ]; then
+if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/analogdevicesinc/libad9361-iio"
 	inherit git-r3
 else
 	SRC_URI="https://github.com/analogdevicesinc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~riscv ~x86"
 fi
 
 LICENSE="LGPL-2.1"
@@ -20,9 +21,8 @@ SLOT="0/${PV}"
 RDEPEND="net-libs/libiio:="
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	sed -i -e "s:"${CMAKE_INSTALL_PREFIX}/lib":"${CMAKE_INSTALL_PREFIX}/$(get_libdir)":g" \
-		-e "s:\${PROJECT_NAME}\${LIBAD9361_VERSION_MAJOR}-doc:${P}:" CMakeLists.txt || die
-	cmake_src_prepare
-	eapply_user
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.2-fix-lld-tests.patch
+	"${FILESDIR}"/${PN}-0.2-libdir-pkgconfig.patch
+	"${FILESDIR}"/${PN}-0.2-cmake-gnuinstalldirs.patch
+)
diff --git a/net-libs/libnftnl/Manifest b/net-libs/libnftnl/Manifest
index 849f1e7ce794..356538cb3f22 100644
--- a/net-libs/libnftnl/Manifest
+++ b/net-libs/libnftnl/Manifest
@@ -1,10 +1,12 @@
 AUX libnftnl-1.2.1-missing-export-set_elem.patch 640 BLAKE2B 6b5a1470c2e8175a1ed9667f7dc8dba09f074b57d20b3b5baff27f3cc3cc08014070744022b004573255c29f8124b6a0bc5a2d569fdf955c1e566a7646ead773 SHA512 afe61d68f2348c9ad02386a452611cb38b88eaf32cbbe565efc0cc929d73db89541b3675301773bd195e09c1834c006b22be92d1c7e923aeb2095d8db78ea54a
 DIST libnftnl-1.2.1.tar.bz2 395299 BLAKE2B 9f525eb540ed959075199aab4b4217bdcf0f67d6744e58d7eab9f7a50aca2d22c6d65419b15c98d24772ef020c3ed2662eba7a0812a5919a840cee5aa589b056 SHA512 cabe6896210c451d7917d1abde5e73a65594d53f011486f75dd7be5b4804c49d10f0e508675e091e1faf0363b82670b3f3a167a85db91d52742dc69445888b6a
 DIST libnftnl-1.2.1.tar.bz2.sig 566 BLAKE2B dd37a52dc185ef2e8af8f0fe32037a03bf8f50101d566be1d40217ea092ec1a9af08281b22193bb274a1ad462c081980ccc8da35c76d910cf0d613ecb0235449 SHA512 dc589d7fcd7d4b0e5e7d50b02967f265ef11b2de69018c8eb264251eb5fab4b4fabb147b8b934f29cdbf66e7bee3f030ef9f02b5872bd76c4cf3523f7e38b94b
+DIST libnftnl-1.2.2-clang-fortify-source.patch.xz 2704 BLAKE2B 107c90a2875e7477a5e8b7af8ff4c2139d2117e41a4ca9a7656b5f15c430668572c18a43e9b14a5af36c60818289e00bc082cad5d601b4c489335ca7161e5871 SHA512 c024607cb138748adcd28a511b858bbf51f2f09e13afa48d3090ba5ecd7bff1c1e87fcf38330eb24ae52c79d1a8bfce91f75be5dc81cfec6f0bc5334dd2f7456
 DIST libnftnl-1.2.2.tar.bz2 394955 BLAKE2B 69c3338e295dd158faad812ec05db8b8ab12c5626d0f33db14ee830a14d73dc5c3cd764a563cbb4fdeaa2657c99487a99fb0cc4f324a2832d5de21d922acd451 SHA512 657d48aa263043b80daa39eb8e2647c84c03b3e3a4a30b85bec1d8e4a0976075a71ad233bb384f4460d5f6662f285c12947feb8c1a6c9a534a2c9cf7ba04eee3
 DIST libnftnl-1.2.2.tar.bz2.sig 566 BLAKE2B ffdb35811e57f55ba30dfdd3e6656166b5f515348f99ee11c771b7460fd1b26b1e598146afdf76f4765e865ae76472d7071eabb30604cf78964e2fcbd6a39508 SHA512 dc4263e744a79f2b7e4ea619e740d66d6013e62aab655f040150552a6f069794ac59b8cc87a9f630dd42f087ef60523ecf08dc89cd1194637d988f85f67aaf43
 EBUILD libnftnl-1.2.1-r1.ebuild 1669 BLAKE2B 4844b4918c355fc65ad861eb1eb392605a707275a455ec302295899d53eca6516fd17cd12ede41e322947d879794832ac38d095baf861dbb87d045906d105dfa SHA512 9af24f8b7b40720caa9d4791ffba71b64de5886290d246ccedc3c9f84fa71ad2ada69cf93fa9e764e75baffe2dde4d8193bbd917550f50c8522001d426433922
 EBUILD libnftnl-1.2.1.ebuild 1596 BLAKE2B 4f0df58ffaba293aaee147690535e20e22a9f1e7bc6d115b0a5bac9039fd616b3d861786552c27661d3a7569f7ad8675bdabb818fd22a1bc57f5e00af1146e47 SHA512 bbf0ae2f34d3d3a9e102e11a3c466664989f37f145eb757587887bb3538c75b863073ebe8b61b9ad26dc8d8af071c66ae5680dea6ad98b4d82af13892f192cba
+EBUILD libnftnl-1.2.2-r1.ebuild 1963 BLAKE2B 329c5a51fb5bfaae4786f5026abf160619da328defe43faf08f9f4bb055595a1f227bbbef2d7ca3712ea234b280cab0b92766305916511449e55c615cdf1f893 SHA512 ce644a086b81d06859b252006352fed172d1ff2a2860c44cbae6cf1b3b71946e0d96eb7d5c26f98c1f2249c67712614cb79bc6864b9388dbb72f00ce8d2ddf65
 EBUILD libnftnl-1.2.2.ebuild 1616 BLAKE2B 33da1ea7acb7744a89396efd68da7b2bd4318d876e73fffbcf9734b810b3e37adb89b60e44b554d33a938f132a9264c0ea244c2b71798708da646817a8a59348 SHA512 ae5f73c91cf326c33900ed53a601b3550dcbbd07b0f65cf0823c5870eb55dddce4ed5e80d4edc822ffc20065f72c34613c0258fd8732361c39006482b4880ba4
 EBUILD libnftnl-9999.ebuild 1669 BLAKE2B 4844b4918c355fc65ad861eb1eb392605a707275a455ec302295899d53eca6516fd17cd12ede41e322947d879794832ac38d095baf861dbb87d045906d105dfa SHA512 9af24f8b7b40720caa9d4791ffba71b64de5886290d246ccedc3c9f84fa71ad2ada69cf93fa9e764e75baffe2dde4d8193bbd917550f50c8522001d426433922
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/net-libs/libnftnl/libnftnl-1.2.2-r1.ebuild b/net-libs/libnftnl/libnftnl-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..1515dc6be1b4
--- /dev/null
+++ b/net-libs/libnftnl/libnftnl-1.2.2-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
+inherit linux-info usr-ldscript verify-sig
+
+DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem"
+HOMEPAGE="https://netfilter.org/projects/nftables/"
+
+if [[ ${PV} =~ ^[9]{4,}$ ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://git.netfilter.org/${PN}"
+else
+	SRC_URI="
+		https://netfilter.org/projects/${PN}/files/${P}.tar.bz2
+		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-clang-fortify-source.patch.xz
+		verify-sig? ( https://netfilter.org/projects/${PN}/files/${P}.tar.bz2.sig )
+	"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/11" # libnftnl.so version
+IUSE="examples static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=net-libs/libmnl-1.0.4:=
+"
+BDEPEND+="
+	virtual/pkgconfig
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${WORKDIR}"/${P}-clang-fortify-source.patch
+)
+
+pkg_setup() {
+	if kernel_is ge 3 13; then
+		CONFIG_CHECK="~NF_TABLES"
+		linux-info_pkg_setup
+	else
+		eerror "This package requires kernel version 3.13 or newer to work properly."
+	fi
+}
+
+src_unpack() {
+	# Drop this phase definition once fortify source patch is in next release
+	if use verify-sig ; then
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.bz2{,.sig}
+	fi
+
+	default
+}
+
+src_prepare() {
+	default
+
+	[[ ${PV} =~ ^[9]{4,}$ ]] && eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	gen_usr_ldscript -a nftnl
+
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	if use examples; then
+		find examples/ -name 'Makefile*' -delete || die "Could not rm examples"
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/net-libs/libnipper/Manifest b/net-libs/libnipper/Manifest
index 3866f1fc67a4..a264069725ab 100644
--- a/net-libs/libnipper/Manifest
+++ b/net-libs/libnipper/Manifest
@@ -1,6 +1,9 @@
+AUX libnipper-0.12.6-gcc12-time.patch 316 BLAKE2B 8398f94e9545f93056ead1aee25e2842325754024f70cb067c1d99f44da88eec30f02a8d9f6892e8d44dbd06fec2f14fc31a7346a1d5d4f485b1bd6445603527 SHA512 5804199fe39df688a9971e0e429ea41f0c9118aec0791965d6ea99f86cb3d45adfd437630a099af1c5bb749a179a75e2fe16d6de80096ea49b973d92cec22b28
 AUX libnipper-0.12.6-gcc47.patch 272 BLAKE2B 4849ed6671881029fb0963c09cfa0b9e9f0e738e714672ad6e17241a354e0f0067e42f01ac04defc62c681ea77183dc98ca7b77e864941fa48c6542ccc500d06 SHA512 fa6e326a97d5d6e72fc04fc2aebf6fb56be0c3683b5d1a02fcb907a944d2b3cb41d91a750c69c69a73e0fbec670d288b16bfcf718a3ec43a1689dbfb67411edf
 AUX libnipper-0.12.6-glibc-2.10.patch 418 BLAKE2B f981208efc23c3eb37aef0ee75a6e0740867b2a732e2bf2776cbedeafbaec0bd23e1692b2d5e4cf335f74b4fd03146ca12a67f94a3261f905d42e9c204f6a48d SHA512 0111563759771a4fbb9464c41cb66358a8a12c461709b3cb5638663b6d39ea594aa4402eb488080992a173ad1d639790c6632ca5e8f0c85ce60af5c6e1fc54ea
 AUX libnipper-0.12.6-multilib-strict.patch 523 BLAKE2B c59c2e2a9b3a09be2a17bb7d6839a03bdde7981a4bed0c761809ab9e024dc764cbc7bf7e61bd47a56669e3355980aa67c2eb479e8793da8fca44a4cbf06dad20 SHA512 4290a1b5afdf3215d25d1eb173a0dca421f209335cbe413aa3f051df31c132e85dcafaec89eee52709ece258aba37b507cc4499369e9ad403aa7ecb2b7ba04a6
+AUX libnipper-0.12.6-wformat-security.patch 467 BLAKE2B 1b254d11470f49db592190946752e935149c17d8dc5e1859db30d1175db0b08058f164707701a79d7b8f62557bf9f37d261db392ca697eaf7d13d0c95ac1e7f0 SHA512 73f32a285ad3e3071a3b8596538ceff2f56453dc8e4bfea086a6db6d592f270d9a302593ee231ac86f88baef0f2cd2ec52828704d987d498d5d5c64fb3d62546
 DIST libnipper-0.12.6.tgz 444578 BLAKE2B 66a9d9158a132a447e5acfb2da51618c2be09f51a8bea3b47bb953a8734e5be5666a6d330e20ec9b5ad6455ac98fbc651a673dd4c47045f916cc3894ff40f5c2 SHA512 eb6eabce06a71463f8dad59a2aca13583e9ae8113b6997a7946b9bbafe54cd0668189c915f917ffcb7ffe3b5dc6dbbf7d37874ec226e5bd8cdd3c8999f9e10b0
 EBUILD libnipper-0.12.6-r1.ebuild 451 BLAKE2B 2950029c9076b196c54d29842f7d56655fc7b38ae0eb04fb768f2e7586f71c9f5f46dc30223db5de5896df90b64cfe34921eb687849c0f370c758f5854a4fe61 SHA512 396b52619b331747de0105615b060520b7777968abed0bed2e13836827e78531d5b3dd59596cf5c90c20b0a6ef6977e9ddd21ea7b6b0b930a39a0f1f9ee0fd8a
+EBUILD libnipper-0.12.6-r2.ebuild 531 BLAKE2B d486a14da0c920ef84fe2da8f0c91674fdd3f2560e1cbcdbcce1aec02f9f84401efc4fd3c921d68f6135ac74c025319be86c3f93aa3cde8c10b8ea7ab666a3a7 SHA512 e156e9a2932e6e857ba14e57e402b04ce36858ce2c3cf7e86bd3905974db4457d2d94113d9a5ca23820a31ae8d7ddf98c02d589dc092ee463099cb1578655fa3
 MISC metadata.xml 244 BLAKE2B 38ffb6f9295d8117c9ae13bf37fb4c5dfd57ffcaa0e2fed5557e69757b81feb119a74b620c6ce789ddba42e7d7e4e99d4868d299ff652e23abd3189943bdd687 SHA512 ab6444f29b3bbe2e6f4449d96acb0d2d2ad7d15e54a40744cd237c1ef1f1d5b5b291d16c0cde225d4842fb251adecc622cbec095d7fd619e9e338fb68a1cda9e
diff --git a/net-libs/libnipper/files/libnipper-0.12.6-gcc12-time.patch b/net-libs/libnipper/files/libnipper-0.12.6-gcc12-time.patch
new file mode 100644
index 000000000000..b07c640a37d1
--- /dev/null
+++ b/net-libs/libnipper/files/libnipper-0.12.6-gcc12-time.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/851666
+--- a/report/report-text.cpp
++++ b/report/report-text.cpp
+@@ -34,6 +34,7 @@
+ #include "../device/general/general.h"
+ #include "report.h"
+ 
++#include <ctime>
+ 
+ int Report::writeText(const char *theText, Device::paragraphStruct *paragraph, bool expandAbbreviations, bool hideMarkup)
+ {
diff --git a/net-libs/libnipper/files/libnipper-0.12.6-wformat-security.patch b/net-libs/libnipper/files/libnipper-0.12.6-wformat-security.patch
new file mode 100644
index 000000000000..d2bf917a9c59
--- /dev/null
+++ b/net-libs/libnipper/files/libnipper-0.12.6-wformat-security.patch
@@ -0,0 +1,11 @@
+--- a/report/report-table.cpp
++++ b/report/report-table.cpp
+@@ -359,7 +359,7 @@ int Report::writeTable(Device::paragraphStruct *paragraph)
+ 				else if (config->reportFormat == Config::XML)
+ 					fprintf(outFile, ">");
+ 				if (cellPointer->cellData.empty())
+-					fprintf(outFile, config->emptyTableCell);
++					fprintf(outFile, "%s", config->emptyTableCell);
+ 				else
+ 					errorCode = writeText(cellPointer->cellData.c_str(), paragraph);
+ 				if (errorCode != 0)
diff --git a/net-libs/libnipper/libnipper-0.12.6-r2.ebuild b/net-libs/libnipper/libnipper-0.12.6-r2.ebuild
new file mode 100644
index 000000000000..2fe749ff81af
--- /dev/null
+++ b/net-libs/libnipper/libnipper-0.12.6-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A router configuration security analysis library"
+HOMEPAGE="http://nipper.titania.co.uk/"
+SRC_URI="mirror://sourceforge/nipper/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=(
+	"${FILESDIR}/${P}-glibc-2.10.patch"
+	"${FILESDIR}/${P}-gcc47.patch"
+	"${FILESDIR}/${P}-multilib-strict.patch"
+	"${FILESDIR}/${P}-gcc12-time.patch"
+	"${FILESDIR}/${P}-wformat-security.patch"
+)
diff --git a/net-libs/libnma/Manifest b/net-libs/libnma/Manifest
index 3309d3d04fc4..7429c9d8b08e 100644
--- a/net-libs/libnma/Manifest
+++ b/net-libs/libnma/Manifest
@@ -1,3 +1,5 @@
 DIST libnma-1.8.38.tar.xz 1347004 BLAKE2B 108fc7d0a01ca72c84a738f831d442d82990f7b82301de3a47d8331af1e080a33c10806fb75830463fbfb8a4a1f556cdf5272ee52dbc4616ea3dbca1959cd128 SHA512 0421c598ccb6e3659f182b596eec76ffd695e51c11fd11b8325c2d08cb259536d7e74c11bbaac3ccb841016a0bc69a87f1c682b934a9eb569a74116e677eba63
+DIST libnma-1.8.40.tar.xz 1350560 BLAKE2B 9c5124a1dcaa801c7d0135ef64dedccd098988fdd199938e2409e80bee86df71bf368cada113dceae4046a5c2c5fe954aa9fc0c19519721a4e8ec7b8f7ea8d44 SHA512 28f4704f97941308f43b27a309fd14050e8ac7e0c6665cada3cc08a759e140f043a80b21ccfe02ce348f8490cad8107b4fe27026dbaafed46ec1c7c46824e3b8
 EBUILD libnma-1.8.38.ebuild 1676 BLAKE2B 4d25b6609021722dc209259e3414444f3419a94153e42c1decebb7cf3e9e5ca0d0103150ed6da3b1b2f3039dc4ecb3fd4e3a682b374b239718836d13813e03d7 SHA512 68e5d459f420a05512b69cc722c1a69e9f65e31ad10d8081fe635250a452e42c6febfcf9826741a3c67464e7e7241d452bd9084b43951423df08adf4f6a121bc
+EBUILD libnma-1.8.40.ebuild 1682 BLAKE2B 5f2d2a76d3a776776cf254135180bd8ae493f74163dcde431cdc5d89da0722bf364392b8597e105326ddca5318378b3e086b5c8e33d0abcdbe3b6ba9c1a3f074 SHA512 434dd3138a59e226de5c97e3de69b5738d87f9f6d52752a19bd5331aea3b8bbd3aeda8680065bb9756c7ac139880387e891643da009393679208cf7877eb9869
 MISC metadata.xml 373 BLAKE2B 4107438e2ffa5c0e8a276745f518001ab71a5322ac3136fa2b23b1a767958f76c775ea551dd587877512ef18520926cbe74ebad8b36f9c2d4263645990ea3781 SHA512 488b3102778233f87a8fd06bf516ba31d62df2edd22dd9d556e7090483707c00ff12db7d2d372f396d9e5dda9d2f48a77415cf6de0e08c6279a541f43221d68d
diff --git a/net-libs/libnma/libnma-1.8.40.ebuild b/net-libs/libnma/libnma-1.8.40.ebuild
new file mode 100644
index 000000000000..76713c40ed01
--- /dev/null
+++ b/net-libs/libnma/libnma-1.8.40.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson xdg vala
+
+DESCRIPTION="NetworkManager GUI library"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+# pkcs11 default enabled as it's a small dep often already present by libnma users, and it was default enabled as IUSE=+gcr in nm-applet before
+IUSE="gtk-doc +introspection +pkcs11 vala"
+REQUIRED_USE="vala? ( introspection )"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+DEPEND="
+	>=gui-libs/gtk-4.0:4
+	app-text/iso-codes
+	net-misc/mobile-broadband-provider-info
+	>=dev-libs/glib-2.38:2
+	>=x11-libs/gtk+-3.12:3[introspection?]
+	>=net-misc/networkmanager-1.7[introspection?]
+	pkcs11? ( >=app-crypt/gcr-3.14:= )
+	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
+"
+RDEPEND="${DEPEND}
+	!<gnome-extra/nm-applet-1.16.0" # gschema moved to here before nm-applet-1.16.0
+BDEPEND="
+	dev-libs/libxml2
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3 )
+	vala? ( $(vala_depend)
+		net-misc/networkmanager[vala]
+	)
+"
+
+src_prepare() {
+	default
+	use vala && vala_setup
+	xdg_environment_reset
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dlibnma_gtk4=true
+		$(meson_use pkcs11 gcr)
+		-Dmore_asserts=0
+		-Dgcr_gtk4=false
+		-Diso_codes=true
+		-Dmobile_broadband_provider_info=true
+		-Dld_gc=false
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use introspection)
+		$(meson_use vala vapi)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/net-libs/libnsl/Manifest b/net-libs/libnsl/Manifest
index 264a9556fb1f..d023cdb742b4 100644
--- a/net-libs/libnsl/Manifest
+++ b/net-libs/libnsl/Manifest
@@ -3,5 +3,5 @@ DIST libnsl-1.3.0.tar.xz 321488 BLAKE2B 25cb4fa2b3f161ce4cd06ca5cc0a716bf981620d
 DIST libnsl-2.0.0.tar.xz 284408 BLAKE2B 843cd0346b45a688c59b88caebd9c5c938b0ef4b5e751b27599ae725a19f0ba2b88bc23b861edc75d79ae6c6bb829e4f82e9e3cd994d25d3385b1a75b9b58b8e SHA512 02ff41d335b7e965182c1f47a6448c1a71ae991a4d5a86ae5472cea7b38633a36b736469cc0d9fc407c706f3f144f90e4b7c9653643976805aa96fc319a69784
 EBUILD libnsl-0-r1.ebuild 565 BLAKE2B f1227ef218ff7edb1c5f299fd31d12d4b91467991a5c3036227284accf455bc7524a58f352b13f591396a0535877e5b49d6cf301aaec4da3a8f5124b23b99a74 SHA512 ea2b7ced6307d96991b3a05ba7152b6817c10f21712e14d4e7b389bd0728d3482894e4f0de604ebb381edc091870fd05369d4046df786b64661ec75da8e7dc56
 EBUILD libnsl-1.3.0-r2.ebuild 947 BLAKE2B 490faf6aec16d8c70d880da369b9251590013081f0ea66d97f35205b624c72ec3b33616cb83bc68eb710150c51e42f230183dd85582d75f747756f23f0f72a57 SHA512 3b0846f669028294648d603bf32aca1d2916b9a16ee7e8965f86ebd712a8f29b3731af2242a61aaafa5b0592063b7f3fad85484be546f467ea075fa7bb34ba9a
-EBUILD libnsl-2.0.0-r1.ebuild 1243 BLAKE2B 6ff2d0a324928fe6cf7d0f7119ee5cee70da3a3fd221f2126ff78a8794e6fa1e97f5389e899b61179a6d5e0003099c6009869793943d7d40ab285548563c18bf SHA512 b77830136c7c028483d49fcbaf934ac96b583d707917256225627c5dc1c5bc89b931c450b2406ca34db53aa3f2f99a3bed5d010db961d01d3f9a9d07c5a03ad0
+EBUILD libnsl-2.0.0-r1.ebuild 1235 BLAKE2B 2d43425808e79ae1f163adc5f725bba42d14a4ca5f66847eda759b8f81880523c26957c46326a9f9a4ef717298574f259a703dc68ba3358cf0a4e10a47165a2e SHA512 6704ed03f53815206c546a790f06556b852241b0ef3b23f01f58d57ff5a3250924e52ea60b491f48a632fc20e8583c60376981fa11f551b4f138cad7890e73f8
 MISC metadata.xml 380 BLAKE2B fa4dc82ad37eb111b813c74a2f06e2afc3205abf41fc2287490a5542ea82e49096f6c4fba6ca284b318679d1962e4b32cb1e9c0e29027b04b56019ed4ed0d98e SHA512 f8e686cb3c4d25abe584f58ccb47b9265eaea8ae35ed5beabdb40158f35ffcec8263045d113e782a41791840530c8dd53dfab03ec916a38edfd573a5fb94e2af
diff --git a/net-libs/libnsl/libnsl-2.0.0-r1.ebuild b/net-libs/libnsl/libnsl-2.0.0-r1.ebuild
index 01b37a843834..8e1a8de95539 100644
--- a/net-libs/libnsl/libnsl-2.0.0-r1.ebuild
+++ b/net-libs/libnsl/libnsl-2.0.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/thkukuk/${PN}/releases/download/v${PV}/${P}.tar.xz"
 # changes.
 SLOT="0/3"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND=">=net-libs/libtirpc-1.2.0:=[${MULTILIB_USEDEP}]"
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index a2b2381031bc..d648cef9ed62 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -7,14 +7,10 @@ AUX nodejs-15.2.0-global-npm-config.patch 582 BLAKE2B ee05b2b54a0d2f0b7d6d2a1215
 AUX nodejs-16.4.2-paxmarking.patch 4257 BLAKE2B c088deb4f9207d0cfbc43d71111230ec23a30c6fc86df67ab9bf17b3ca6de276e4d84980b58855bb94f0caa865fa5ab9af19fa4db72b7edb9394798b739fa939 SHA512 a96de4f57589db222eb493fcdcddbd67e051728165cdabde675aeb3bbdce857f13a9708b7495acc64cd88f7fa3994d89ade006a1292895b2299ef6b5162ec6a3
 AUX nodejs-18.0.0-paxmarking.patch 4343 BLAKE2B 92ddc9c5911b077eb0dcb42aeb8bc2486474d0294532cdee6ecf4c5141ce1953c15ac64432d3f527cf44d504dd8165fef35d458e713b4dea5b3ecc4288c5d5d2 SHA512 c60e389136e0876149f0c5945832195455f8c51f125ef006d40604d6306d990c1751bd36ef02db8a27596aa7d88b8bf94b90e640c0505b0d32dedef7831384f2
 AUX nodejs-18.3.0-paxmarking.patch 3303 BLAKE2B 627ef3dac873d7967181cbe44b3566080b98bbc08ff7d75dfcf0cbded2e71e8af2ec6ccf2386b4d67ee20f612a49b03d2d81d50c845a5e5447194d94146ae035 SHA512 59be93e86373993fcd5235b7b6fa9fe85df3e2bdd9e61e2374cedccf69a6a36263bf1ce10f3294fdb9bf04a85a6f0dba209d4d7f9dc24b52af83bce48f51b22c
-DIST node-v14.19.0.tar.xz 34486868 BLAKE2B 12e571a366c1d4b2475ef258e338f516bb81e9c08f7e6b7f951decbf371028cdcf32c72181d8504d0890496eaecce0d6b23437b8dad6c6e498d30bf6636bd1e7 SHA512 80573fa3a0882c1f2a40b991f187f49714748ca4c56c78133e2d2be0322f201816eb059a1a7d38ea8a925229c1b1324d0ffc28ff4002d0115bfae44fe87efe97
 DIST node-v14.19.3.tar.xz 34483792 BLAKE2B 24b598b4c613ad63f8a2ffa15b2ad5663eef68e75842fac4ef988b43f8e6f9c1a242c9b352c411661dc7d1c9f6800426e12934fc4e7788061a8b9f918491a9b7 SHA512 0d03d9efee23664faf368a6ab42fa7d653033aebda1f2730c80692577825e31ff5522f1a940933245050a6f9af4ee64b6d65fc890e3d2ecfced327a909b63b6f
-DIST node-v16.14.2.tar.xz 34332624 BLAKE2B 756895f81ecabbacf30b1e513890d100192c367443a5d041cd3e383985acb6fae189213f44b7a533b43d1b759d5a2677a5ee787c72d3abdb480879d6d24cc95e SHA512 b97274f6e0d63f19e01497c43af36e6561f019e7b0b5b4f6ea19d0fbe2cb4d3c514c06f49e237d1e327936db03c3f437ae0d0b2f830a35f1b7c3a723fbe2a1be
 DIST node-v16.15.1.tar.xz 34618208 BLAKE2B 6bba1dcc01cf18710e75b998d90b2b1f75476052c85e730a1309a6fecf2994530ce65b45e53ff0cee17bfe07728d4f3eb166f460337cc74f3c7975aee858a6cf SHA512 18c05876f0afe6fd402a11824d1987ddadcb103d3ac16d5b500371536a5d53632c9cbf651b6f4a8d69b69e8bda2575beb7b68675c67fd6cd53e205acfba11038
 DIST node-v18.3.0.tar.xz 36941104 BLAKE2B 947d38aa8637f01421fcf5261832b2fd3f53a5f38868fd03b6c9213c2ba3bdff214be12585a60c4cf88dd9390673e068eb08da07d7da28443a9c56cd024186fc SHA512 c793459c38d72d65d5caaa7fbab37269fe6031766609ab2fd7c921b205d314b1ddebc40738b292669bbbaf166a97328f64af7a0a1aaac111903a42cf98057afd
-EBUILD nodejs-14.19.0.ebuild 7061 BLAKE2B 62a88a7e6f68a322ef54aa422ee5f79ae403867934f4a1bbdc7931c84ede3015121f433c43809385ec93c5de6cf21c7fcf02ffc2da7217112e454ad012010966 SHA512 a544ca4359152390106b09634629386f9b25a982eb56d9d602baa59f1f9dec4e39abc5113584b7fa94bb2b24303185f81c970e93bbc80252613ca722a198db9f
 EBUILD nodejs-14.19.3.ebuild 6640 BLAKE2B a926d525e227ec2a8f09be3b5ca58807f711df9b19993f4c41360d84d51e28bb9f2297753026b8e8c8d93ceeb011dbd8336f03007de6f5fe5cd4f6c8620fc1fe SHA512 24dda7157f0b267da8e561e0283a6cf03699b470b82fc2df6d0094e8391ec79c971b6072620162744c1ca911a20335ec83d849614174fee6b3e21a6aa7985068
-EBUILD nodejs-16.14.2.ebuild 6577 BLAKE2B 260b4353a320f178b57d53ac9ee5cd0a0fcdac760b412eaf3a45d1fc95498d33c1761cf0ee7767ad13a5a10cca54cb2f90eeb05ed6b2a21756a8b43e805fea5c SHA512 af6f235c078204f477d198e1a0a6794cb4fc5d8b897144479a74286ee14250ffafa03ec27dd826924715a2e2237ce91ab74d3baa735d05ecc49e3816c757327e
 EBUILD nodejs-16.15.1.ebuild 6254 BLAKE2B 98cc5726d97d0bd474c67ec3377cc96fbd99cc643ea538db1a7ab8dc2df01449ce9ad4439e6f9a9bb484be2a97eebfe5b50557f52ef0667b7bad6055867f1673 SHA512 b403db60b341c67594f8c171d5e001cca8b458b7ec0dbc64e026e550b4dc9440afcc81d8eda737e23437064b945cef75acdd72688bdafeeb522e02a6fd7bc349
 EBUILD nodejs-18.3.0.ebuild 6259 BLAKE2B 2babcb0352dffd9cd8aee43da7b474139cabd8dc2c1edb18fdfda3843f92c226fba1d498f96e0d9e7f25c67016e7a7f923dbe3f1ea082b6150c7d860fdcf9aa2 SHA512 bd050889a11048ecac5db807e772e4fc897dcc28e4c37c7141e9f945caec41f890b1acc6d39f56d2db3880d5c72671280bed55eba03aaff3913c252c4e5753b1
 EBUILD nodejs-99999999.ebuild 6166 BLAKE2B f847ec568c0498ffcbdaa57120fbcb9e3c8695d036cf9bf9954c8153277a224d20548da922f2c69e3a0cbc64daec4bb36fa8781f063ad780eae612bdd1be1465 SHA512 b5ea6a7cc3949724f7d3bd2c24a79bffc9361dcd092cf187fce4466885f3f4dda6313a6d592d5954f356763b9d7e6672e9926789ef7217e687af6af1ddde487b
diff --git a/net-libs/nodejs/nodejs-14.19.0.ebuild b/net-libs/nodejs/nodejs-14.19.0.ebuild
deleted file mode 100644
index e92c0ee58991..000000000000
--- a/net-libs/nodejs/nodejs-14.19.0.ebuild
+++ /dev/null
@@ -1,241 +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="threads(+)"
-
-inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/nodejs/node"
-	SLOT="0"
-else
-	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
-	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="amd64 arm arm64 ppc64 -riscv x86 ~amd64-linux ~x64-macos"
-	S="${WORKDIR}/node-v${PV}"
-fi
-
-IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl systemtap test"
-REQUIRED_USE="inspector? ( icu ssl )
-	npm? ( ssl )
-	system-icu? ( icu )
-	system-ssl? ( ssl )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=app-arch/brotli-1.0.9:=
-	>=dev-libs/libuv-1.40.0:=
-	>=net-dns/c-ares-1.17.2:=
-	>=net-libs/nghttp2-1.41.0:=
-	sys-libs/zlib
-	system-icu? ( >=dev-libs/icu-67:= )
-	system-ssl? (
-		>=dev-libs/openssl-1.1.1:0=
-		<dev-libs/openssl-3.0.0_beta1:0=
-	)"
-BDEPEND="${PYTHON_DEPS}
-	sys-apps/coreutils
-	virtual/pkgconfig
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )
-	pax-kernel? ( sys-apps/elfix )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-12.22.5-shared_c-ares_nameser_h.patch
-	"${FILESDIR}"/${PN}-14.15.0-fix_ppc64_crashes.patch
-	"${FILESDIR}"/${P}-global-npm-config.patch
-)
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	if [[ ${MERGE_TYPE} != "binary" ]]; then
-		if use lto; then
-			if tc-is-gcc; then
-				if [[ $(gcc-major-version) -ge 11 ]]; then
-					# Bug #787158
-					die "LTO builds of ${PN} using gcc-11+ currently fail tests and produce runtime errors. Either switch to gcc-10 or unset USE=lto for this ebuild"
-				fi
-			else
-				# configure.py will abort on this later if we do not
-				die "${PN} only supports LTO for gcc"
-			fi
-		fi
-	fi
-}
-
-src_prepare() {
-	tc-export AR CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
-
-	# All this test does is check if the npm CLI produces warnings of any sort,
-	# failing if it does. Overkill, much? Especially given one possible warning
-	# is that there is a newer version of npm available upstream (yes, it does
-	# use the network if available), thus making it a real possibility for this
-	# test to begin failing one day even though it was fine before.
-	rm -f test/parallel/test-release-npm.js
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	# LTO compiler flags are handled by configure.py itself
-	filter-flags '-flto*'
-
-	local myconf=(
-		--shared-brotli
-		--shared-cares
-		--shared-libuv
-		--shared-nghttp2
-		--shared-zlib
-	)
-	use debug && myconf+=( --debug )
-	use lto && myconf+=( --enable-lto )
-	if use system-icu; then
-		myconf+=( --with-intl=system-icu )
-	elif use icu; then
-		myconf+=( --with-intl=full-icu )
-	else
-		myconf+=( --with-intl=none )
-	fi
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot || myconf+=( --without-node-snapshot )
-	if use ssl; then
-		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
-	else
-		myconf+=( --without-ssl )
-	fi
-
-	local myarch=""
-	case ${ABI} in
-		amd64) myarch="x64";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		ppc64) myarch="ppc64";;
-		x32) myarch="x32";;
-		x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${EPYTHON}" configure.py \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		$(use_with systemtap dtrace) \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	default
-
-	pax-mark -m "${ED}"/usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		docinto html
-		dodoc -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		dodir /etc/npm
-
-		# Install bash completion for `npm`
-		# We need to temporarily replace default config path since
-		# npm otherwise tries to write outside of the sandbox
-		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
-		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile}
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man}
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-
-	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	if has usersandbox ${FEATURES}; then
-		rm -f "${S}"/test/parallel/test-fs-mkdir.js
-		ewarn "You are emerging ${PN} with 'usersandbox' enabled. Excluding tests known to fail in this mode." \
-			"For full test coverage, emerge =${CATEGORY}/${PF} with 'FEATURES=-usersandbox'."
-	fi
-
-	out/${BUILDTYPE}/cctest || die
-	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die
-}
diff --git a/net-libs/nodejs/nodejs-16.14.2.ebuild b/net-libs/nodejs/nodejs-16.14.2.ebuild
deleted file mode 100644
index d6372f1fd51e..000000000000
--- a/net-libs/nodejs/nodejs-16.14.2.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/nodejs/node"
-	SLOT="0"
-else
-	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
-	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
-	S="${WORKDIR}/node-v${PV}"
-fi
-
-IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl systemtap test"
-REQUIRED_USE="inspector? ( icu ssl )
-	npm? ( ssl )
-	system-icu? ( icu )
-	system-ssl? ( ssl )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=app-arch/brotli-1.0.9:=
-	>=dev-libs/libuv-1.40.0:=
-	>=net-dns/c-ares-1.17.2:=
-	>=net-libs/nghttp2-1.41.0:=
-	sys-libs/zlib
-	system-icu? ( >=dev-libs/icu-67:= )
-	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )"
-BDEPEND="${PYTHON_DEPS}
-	sys-apps/coreutils
-	virtual/pkgconfig
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )
-	pax-kernel? ( sys-apps/elfix )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-12.22.5-shared_c-ares_nameser_h.patch
-	"${FILESDIR}"/${PN}-15.2.0-global-npm-config.patch
-)
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	if [[ ${MERGE_TYPE} != "binary" ]]; then
-		if use lto; then
-			if tc-is-gcc; then
-				if [[ $(gcc-major-version) -ge 11 ]]; then
-					# Bug #787158
-					die "LTO builds of ${PN} using gcc-11+ currently fail tests and produce runtime errors. Either switch to gcc-10 or unset USE=lto for this ebuild"
-				fi
-			fi
-		fi
-	fi
-}
-
-src_prepare() {
-	tc-export AR CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-16.4.2-paxmarking.patch )
-
-	# All this test does is check if the npm CLI produces warnings of any sort,
-	# failing if it does. Overkill, much? Especially given one possible warning
-	# is that there is a newer version of npm available upstream (yes, it does
-	# use the network if available), thus making it a real possibility for this
-	# test to begin failing one day even though it was fine before.
-	rm -f test/parallel/test-release-npm.js
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	# LTO compiler flags are handled by configure.py itself
-	filter-flags '-flto*'
-
-	local myconf=(
-		--shared-brotli
-		--shared-cares
-		--shared-libuv
-		--shared-nghttp2
-		--shared-zlib
-	)
-	use debug && myconf+=( --debug )
-	use lto && myconf+=( --enable-lto )
-	if use system-icu; then
-		myconf+=( --with-intl=system-icu )
-	elif use icu; then
-		myconf+=( --with-intl=full-icu )
-	else
-		myconf+=( --with-intl=none )
-	fi
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot || myconf+=( --without-node-snapshot )
-	if use ssl; then
-		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
-	else
-		myconf+=( --without-ssl )
-	fi
-
-	local myarch=""
-	case ${ABI} in
-		amd64) myarch="x64";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		lp64*) myarch="riscv64";;
-		ppc64) myarch="ppc64";;
-		x32) myarch="x32";;
-		x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${EPYTHON}" configure.py \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		$(use_with systemtap dtrace) \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	default
-
-	pax-mark -m "${ED}"/usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		docinto html
-		dodoc -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		keepdir /etc/npm
-
-		# Install bash completion for `npm`
-		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile}
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man}
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-
-	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	if has usersandbox ${FEATURES}; then
-		rm -f "${S}"/test/parallel/test-fs-mkdir.js
-		ewarn "You are emerging ${PN} with 'usersandbox' enabled. Excluding tests known to fail in this mode." \
-			"For full test coverage, emerge =${CATEGORY}/${PF} with 'FEATURES=-usersandbox'."
-	fi
-
-	out/${BUILDTYPE}/cctest || die
-	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die
-}
diff --git a/net-libs/pjproject/Manifest b/net-libs/pjproject/Manifest
index 081fd73ff537..a4f7310abc92 100644
--- a/net-libs/pjproject/Manifest
+++ b/net-libs/pjproject/Manifest
@@ -2,9 +2,12 @@ AUX pjproject-2.10-CVE-2020-15260-tls-hostname-check.patch 4724 BLAKE2B a098969c
 AUX pjproject-2.10-CVE-2021-21375-negotiation-failure-crash.patch 1564 BLAKE2B 30f7af19ae18c071b62e31a6a049e4e67f7b391a65ab52ef8d5270ef504a4057b35679c580ba056c9b1b3e5813fde5ccc8ca863bead4f62156e39f8c2947e4d2 SHA512 9fb5b8961e7c69cf8a902eaa28cb2147faf8f0809467911454758b793832831240992a3c27ecb722a4ea066df909c0cf12b4b1bf139037f647828eb4cc16fee0
 AUX pjproject-2.10-CVE-2021-32686-AST-2021-009-GHSA-cv8x-p47p-99wr.patch 10321 BLAKE2B 6e69e2476439d2f6ca97cd94376d3ffe924840289abe49bf33ecc10c1b67d33457e4231a47851b1e749600f3d7b4a4980b1e5bada06bfc1df5334f6a51b0e8f1 SHA512 58faf870bae4ec94cfc78ca9397e476b7db26c69bb4de5dd6bdaa63f6a8cca95438a182661b485afb04872899c41a8f8ff72c5cfbad35c41cbdc5e9831813c4a
 AUX pjproject-2.10-race-condition-between-transport-destroy-and-acquire.patch 3929 BLAKE2B fc7e12b7e8e9ff35556aa153496c2f7decd13bc78493d8c6f24449f063fe9c76b1772f6dc2b6cfc279c9731cc08735b27cd990ac6c4648c18e7f08c2c9fc3810 SHA512 e230041cff87d97947ad8caeb80c4858b8a1d435251d79b281fc0035da04aab549d1d5dc085681d98410da7e37359bb2ed721d132b321cce9a7326e4ff52c40f
+AUX pjproject-2.12.1-CVE-2022-31031.patch 1408 BLAKE2B 7a541dc0e0e9508374084121a81e258a19d4e050232c47cc5be67b8115da0fffb96de6e17a311a53e137ed5313109b2ac9513ff85bb17f3ecf7e066160c9019f SHA512 c6bb01cb3a50399075b264be7fb5f20f58c269cf6a71082e76865eda6393d6f546ddf4e09367e354db90b5064ea9ffd61e1783ad988e222eaccb523d90cda16b
 AUX pjproject-2.9-config_site.h 2168 BLAKE2B 39d526e7a2ca79ea2c1e453d95d420a6245e7a93641227a908660fea553a8b66d5dfb6b7108b49dc0686de6522c2485b72a6e7511096cbfe50bdb2800d559e6f SHA512 d6456b7fa36b3256613eea515b78f0884fa6b56705817cd421a962f3c3302bf0efa69006432dffca49400ef75dc99ebc7639d270aebe5bc2d4a9a9515cc56408
 AUX pjproject-2.9-ssl-enable.patch 3515 BLAKE2B d68479ba509513828d8488b60358ba00651c87d0b39b9bc800fe0d38294f2afad43fd7f4ee5c260bd62044d17b010112c59363277739f4ae7d20940943437539 SHA512 5fd3e681801e6e2cd56ec177d71a65422ec22b788adfad3920562616c737188f71097a545d9c59bd6a3d876ba143f90f731d165d8c68da25aa93b03c009753e8
 DIST pjproject-2.10.tar.gz 8768705 BLAKE2B 42d70867e2e0474313426f1e188586d203d6165c28a133a62dedacd2deb2899215212824d9402a48fcc66bb08a17b796d3625e1d51a8aedc9aa4b3a3bf1cb8fa SHA512 a67f083df175b536b4e6a7b7fe39e07d3ee805d6917ec64a50694542a7455c33a100889191044ab3fa679b6656774a6be045621aa53510b5f04cdde9ddd59893
+DIST pjproject-2.12.1.tar.gz 9660659 BLAKE2B d893f22d995c9570e4003f80adf15144cf39e09d5843a88e3a616a529a91164ec7b012ea66ede8d55bfe4ec0dc4eca7d230f07fc66f06dfafaea9d5ff72910fa SHA512 9087456024b8886e56660cebc45c7093b3b91cd6b08a3926fa2c0de452989ac84ceb4e27413c0311bde95f271341ee44d9681f81f83602a4e16151f1831d773b
 EBUILD pjproject-2.10-r1.ebuild 3339 BLAKE2B 7bdb4fd1731d2a32750b73970f06c70188309227b727f50f13819e435adcb897f42bb9408c0ef5c151a12dd6954a01205740b11aea657cb53ead6112a9c9036a SHA512 6b7f60dd30b96d600197d4ed5d1d3002df152c0101c359c644a45787ed7112dc1667065d96ab8001ffa1f8c9de0e8d505be9040aca3cd188b7cb155fa0caeb54
 EBUILD pjproject-2.10-r2.ebuild 3423 BLAKE2B 0e58af6dfdd8428c17fb46a02e80b2d88a8bf63ce56ad7c436790871ef0926994ac8040650a2f3dbf08f7c3d39a1ad50dcae3e39f10e4fd75964b1c0ecfe927d SHA512 3f7113dadd6d693b44b98148bdd2f78a41a55c108511da2f2316275d7f613225b8c6bf01ae6a8feab273e07bbfa74da9ea4e2824629d129bdd5fd23680636702
+EBUILD pjproject-2.12.1.ebuild 3158 BLAKE2B a99c10f66f5b1a3575a7d162a8344afdb9c34ab36fe760aad584311a05905ef22e69c184709c1324fd5c84088ab81ccac18e71b716fb36731128561967a44d5e SHA512 297000bbea349b45c8639f1bbd726a37d9be262c3674190f65f817a0b43ff60d7054e43a19d61469ac865e6ebeae4ac26189be69aacdc32608a215da2689d763
 MISC metadata.xml 1379 BLAKE2B f3506d3ae96c52e71f9c1a9bf455134094b3d13152e5ef25cb8fada275aa5fc876f6fcb058bafe2cd12a0fcb4462929ea97e2ba4e98953eed75cbbd3f39497a6 SHA512 22fe7d0284fba79bb1f69d15f2ccbcab8b95cc2f4b9151d2b1721b85c760e22dcdbb511eff52263dcb331bef686ed88695b71d78b2d94beaed8429e11322994d
diff --git a/net-libs/pjproject/files/pjproject-2.12.1-CVE-2022-31031.patch b/net-libs/pjproject/files/pjproject-2.12.1-CVE-2022-31031.patch
new file mode 100644
index 000000000000..637b7f374ffc
--- /dev/null
+++ b/net-libs/pjproject/files/pjproject-2.12.1-CVE-2022-31031.patch
@@ -0,0 +1,41 @@
+From 450baca94f475345542c6953832650c390889202 Mon Sep 17 00:00:00 2001
+From: sauwming <ming@teluu.com>
+Date: Tue, 7 Jun 2022 12:00:13 +0800
+Subject: [PATCH] Merge pull request from GHSA-26j7-ww69-c4qj
+
+---
+ pjlib-util/src/pjlib-util/stun_simple.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/pjlib-util/src/pjlib-util/stun_simple.c b/pjlib-util/src/pjlib-util/stun_simple.c
+index 722519584..d0549176d 100644
+--- a/pjlib-util/src/pjlib-util/stun_simple.c
++++ b/pjlib-util/src/pjlib-util/stun_simple.c
+@@ -54,6 +54,7 @@ PJ_DEF(pj_status_t) pjstun_parse_msg( void *buf, pj_size_t buf_len,
+ {
+     pj_uint16_t msg_type, msg_len;
+     char *p_attr;
++    int attr_max_cnt = PJ_ARRAY_SIZE(msg->attr);
+ 
+     PJ_CHECK_STACK();
+ 
+@@ -83,7 +84,7 @@ PJ_DEF(pj_status_t) pjstun_parse_msg( void *buf, pj_size_t buf_len,
+     msg->attr_count = 0;
+     p_attr = (char*)buf + sizeof(pjstun_msg_hdr);
+ 
+-    while (msg_len > 0) {
++    while (msg_len > 0 && msg->attr_count < attr_max_cnt) {
+ 	pjstun_attr_hdr **attr = &msg->attr[msg->attr_count];
+ 	pj_uint32_t len;
+ 	pj_uint16_t attr_type;
+@@ -111,6 +112,10 @@ PJ_DEF(pj_status_t) pjstun_parse_msg( void *buf, pj_size_t buf_len,
+ 	p_attr += len;
+ 	++msg->attr_count;
+     }
++    if (msg->attr_count == attr_max_cnt) {
++	PJ_LOG(4, (THIS_FILE, "Warning: max number attribute %d reached.",
++		   attr_max_cnt));
++    }
+ 
+     return PJ_SUCCESS;
+ }
diff --git a/net-libs/pjproject/pjproject-2.12.1.ebuild b/net-libs/pjproject/pjproject-2.12.1.ebuild
new file mode 100644
index 000000000000..e4b5b281a448
--- /dev/null
+++ b/net-libs/pjproject/pjproject-2.12.1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="Open source SIP, Media, and NAT Traversal Library"
+HOMEPAGE="https://www.pjsip.org/"
+SRC_URI="https://github.com/pjsip/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+
+# g729 not included due to special bcg729 handling.
+CODEC_FLAGS="g711 g722 g7221 gsm ilbc speex l16"
+VIDEO_FLAGS="sdl ffmpeg v4l2 openh264 libyuv vpx"
+SOUND_FLAGS="alsa portaudio"
+IUSE="amr debug epoll examples ipv6 opus resample silk ssl static-libs webrtc
+	${CODEC_FLAGS} g729
+	${VIDEO_FLAGS}
+	${SOUND_FLAGS}"
+
+RDEPEND="net-libs/libsrtp:=
+	alsa? ( media-libs/alsa-lib )
+	amr? ( media-libs/opencore-amr )
+	ffmpeg? ( media-video/ffmpeg:= )
+	g729? ( media-libs/bcg729 )
+	gsm? ( media-sound/gsm )
+	ilbc? ( media-libs/libilbc )
+	openh264? ( media-libs/openh264 )
+	opus? ( media-libs/opus )
+	portaudio? ( media-libs/portaudio )
+	resample? ( media-libs/libsamplerate )
+	sdl? ( media-libs/libsdl )
+	speex? (
+		media-libs/speex
+		media-libs/speexdsp
+	)
+	ssl? (
+		dev-libs/openssl:0=
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/pjproject-2.12.1-CVE-2022-31031.patch"
+)
+
+src_prepare() {
+	default
+	rm configure || die "Unable to remove unwanted wrapper"
+	mv aconfigure.ac configure.ac || die "Unable to rename configure script source"
+	eautoreconf
+
+	cp "${FILESDIR}/pjproject-2.9-config_site.h" "${S}/pjlib/include/pj/config_site.h" || die "Unable to create config_site.h"
+}
+
+_pj_enable() {
+	usex "$1" '' "--disable-${2:-$1}"
+}
+
+src_configure() {
+	local myconf=()
+	local videnable="--disable-video"
+	local t
+
+	use debug || append-cflags -DNDEBUG=1
+	use ipv6 && append-cflags -DPJ_HAS_IPV6=1
+	append-cflags -DPJMEDIA_HAS_SRTP=1
+
+	for t in ${CODEC_FLAGS}; do
+		myconf+=( $(_pj_enable ${t} ${t}-codec) )
+	done
+	myconf+=( $(_pj_enable g729 bcg729) )
+
+	for t in ${VIDEO_FLAGS}; do
+		myconf+=( $(_pj_enable ${t}) )
+		use "${t}" && videnable="--enable-video"
+	done
+
+	[ "${videnable}" = "--enable-video" ] && append-cflags -DPJMEDIA_HAS_VIDEO=1
+
+	LD="$(tc-getCC)" econf \
+		--enable-shared \
+		--with-external-srtp \
+		${videnable} \
+		$(_pj_enable alsa sound) \
+		$(_pj_enable amr opencore-amr) \
+		$(_pj_enable epoll) \
+		$(_pj_enable opus) \
+		$(_pj_enable portaudio ext-sound) \
+		$(_pj_enable resample libsamplerate) \
+		$(_pj_enable resample resample-dll) \
+		$(_pj_enable resample) \
+		$(_pj_enable silk) \
+		$(_pj_enable speex speex-aec) \
+		$(_pj_enable ssl) \
+		$(_pj_enable webrtc libwebrtc) \
+		$(use_with gsm external-gsm) \
+		$(use_with portaudio external-pa) \
+		$(use_with speex external-speex) \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	emake dep LD="$(tc-getCC)"
+	emake LD="$(tc-getCC)"
+}
+
+src_install() {
+	default
+
+	newbin pjsip-apps/bin/pjsua-${CHOST} pjsua
+	newbin pjsip-apps/bin/pjsystest-${CHOST} pjsystest
+
+	if use examples; then
+		insinto "/usr/share/doc/${PF}/examples"
+		doins -r pjsip-apps/src/samples
+	fi
+
+	use static-libs || rm "${ED}/usr/$(get_libdir)"/*.a || die "Error removing static archives"
+}
diff --git a/net-libs/tox/Manifest b/net-libs/tox/Manifest
index b73024694ec3..51dc08904cd4 100644
--- a/net-libs/tox/Manifest
+++ b/net-libs/tox/Manifest
@@ -2,9 +2,9 @@ AUX confd 27 BLAKE2B 16d0801db1dceed2044c14e9f1220ee4f31268622102a50669135dcb199
 AUX initd 655 BLAKE2B bc837b09c4d75cb086bc1757ba1b1963b60ae2123ba041a53557a2ae7c05145be0898ce5c10d60c894ef369c46afe2a65454ab9e2d2a23d1c859c074d80b8a86 SHA512 c7eaf934497329a369ea9fe5eefe061937719e34d965c464ccea6b72b12bf16c7b79bd821e3550fecb1fde3b014f40afad61c10cf4d7140f42d3d8ba964acdc6
 AUX tox-bootstrapd.conf 2397 BLAKE2B 336317dc2b2a7958420164d3ef3197ea2aefbb51822791d2feccb8e44cf09e90779986210bf854c0cff0d1b4519c1b4acd92723e92b8b262859f7d9da7ee55e9 SHA512 0d90ffb47e42013af68b5eb7ffb03d670523b20de17ba7fe63e227502188cfd72242450d09e94d381fa201cdff459307622c9ab19f3bf651d6948979e103e3c6
 AUX tox-bootstrapd.service 365 BLAKE2B f17891d280007180811414f85f1f8a4defd85436410113f11cffd60dd14a02cd24a0637c347a75ea11322c050e4030702e9f95f02810705aef512df6558e66d5 SHA512 d565430c53b91343d57b6db573884c9f11aaf8bbddfd70bf3a46a6dede91c01ab8f1371ae052b4dd529cc521bef28924069fc7f4bc3d610c01cbd6d6569707f8
-DIST c-toxcore-0.2.12.tar.gz 504832 BLAKE2B 625713142cc1e4b6583879144c05d47a40a1d98031a8a2bf0deec85a199f816a0ff6df5c76e9487a526d7c1c1650b37a10ed81be8233eaa1395707851378474f SHA512 c22f139cfff3a5aedf5fb08c33cae0dae3d6fbceec87867c81290e3bf9d2e13466a0e2bad8378a7a7ba1e9b7b9ad756712963461ae248102e4cab7d4691228d8
 DIST c-toxcore-0.2.13.tar.gz 511533 BLAKE2B 8c68180710e3d06eaaef9fc05dc0ff2492907586934d1d6f57f147e07bb78b262f78b0057911e4b5cd27d2d1efb51cb714f757b90caa269988e604cafa62cd00 SHA512 f4ed9ea4afb7f9c14a5afd949f3a52e7880838c910acaf5adc39acb09ad574406be08f43b76a9fbdd4fc4bd14f0d73212dc7bd10783565055c910c6c3e5e357a
-EBUILD tox-0.2.12-r1.ebuild 2905 BLAKE2B de657ca8b2815d0d165a41ea78026bd8f813aa4e601336db68f7123ffd52c0b97e9bd10c99591c3af9f27ec53974521ed3c37b90ee4509961a67bd667a7dd12c SHA512 0265c8c0ebdf18113f600f2d5ad8cb2d87965b3b43393502dba0acde2e587974981e077c69f18ad7303b1d419649ce814afa5102f2a9eb08d60ceb148a14d255
+DIST c-toxcore-0.2.18.tar.gz 653247 BLAKE2B c27da02753aede5056c42e5bf1949920fc30e98a23c058ab445c2fe345271e442885a3eeb011e8fde16d8fc8451376a015c5f821145785c75e7d0dda3a8b72eb SHA512 e9b0d73a2e0460290c8453a0a64fc91deed2e0cf87f945d0ba203b929f19a296571d7140f4df89b06f7e67f2b61894460ce4dd32ab9ecf6ea7d5b67538fadb23
 EBUILD tox-0.2.13.ebuild 2920 BLAKE2B 59bf6f61244b267d49a181359b3322186efe21217578b6561b41dcd798e50bc9104beb27dbd611485949a112a80ab11d774f4f17a18cdfb23f4ef106729383cc SHA512 8fdb59395d4ce07c6f2edbfc8a8672b021a0b32d62682ecc697e9e816be09d31587be9c41e9b5755aaab1570d9c7aa12d84e3ac6c7b68abdc0c1a099df35fb75
-EBUILD tox-9999.ebuild 2689 BLAKE2B 12827a3eaa9c54410ec4f3eefd12016e4fb8c4540cd94295c45e31b6dc6563edc866d81edff197347e155587c5dace9f5195ae33d6e7d0ac70e24a59f61e957d SHA512 0c362388a3157a103e5ef110fbd1e8e202a8e39140309529198c40cffd5a64bab163f19820f1da4c24340850421efc7216fdbffb0527e69f405581c8b0b67ad4
-MISC metadata.xml 901 BLAKE2B 5125123a0e27a8cda166ed3516d75fb0bb034d77e38f553ba96bdc58744d7cc1bffe58e0fa6d2467a2dcc0f5caf74a7a2c12697664065732d335f0b8bbb8bbad SHA512 7f76b178a4b0a25a3a0eadbe844c07cbaa2103cc4296674c37c3fb18ed626e3cfc7110b8ff4e04ed0f7a83b65a0dc19666074d71f87d0e7e75d84fb1aade3d16
+EBUILD tox-0.2.18.ebuild 3219 BLAKE2B 71e6793e8b3ab8d6a2be30ec3ad64554e07e676d5410ab78830d274bd166a26ca1903178c8bb64ac02e9e358b278f72565b32d053bc7de20b3b4cc539a17c18a SHA512 d5fc0c3825b006734542c19e06a52bf96f2344502da5230ce5aea036f94a16f78b32c320216011938aeafeb6fd4e086c33ff5ccbedcfc0582b92196a386df7cf
+EBUILD tox-9999.ebuild 3088 BLAKE2B 689337dbd95cf6b20186473cc642947763c4f8577c305df4aad55b6e74e6feb1cee7898a7d8651ea7e57491d85b3ff136c914c2c76bbce64db6059ecea3d7525 SHA512 8ed472219c205c7524ce1fca59948abe261de025713e5b2f1d90681f1411cc3c94bba5b096e1b164d59ae1a7b8eca9349b45d81189edbdc1c80240ab54691886
+MISC metadata.xml 985 BLAKE2B a77c49ccdcb1407dc40590f2fbcd4a932d1167dbaad973c878da09107def195cc9755c6d5f1a824cf22006543f1f6db3461d03e11ba7a21b3f321b6173c8aee8 SHA512 67eecd0db74c985cd97c840414ff6860a1d5a3ac9eaa00cd73c5c61e59831ff458a596251605af9515817f074d76eb342c12714409e7b31176d56e9ee311fc0c
diff --git a/net-libs/tox/metadata.xml b/net-libs/tox/metadata.xml
index fa963f9331e6..434e886648f5 100644
--- a/net-libs/tox/metadata.xml
+++ b/net-libs/tox/metadata.xml
@@ -12,6 +12,7 @@
 	<use>
 		<flag name="av">Adds support for audio and video.</flag>
 		<flag name="dht-node">Enables DHT Bootstrap Node.</flag> 
+		<flag name="key-utils">Builds utilities to create custom keys and profiles</flag>
 		<flag name="log-error">Log level: 1</flag>
 		<flag name="log-warn">Log level: 2</flag>
 		<flag name="log-info">Log level: 3</flag>
diff --git a/net-libs/tox/tox-0.2.12-r1.ebuild b/net-libs/tox/tox-0.2.18.ebuild
similarity index 65%
rename from net-libs/tox/tox-0.2.12-r1.ebuild
rename to net-libs/tox/tox-0.2.18.ebuild
index 62cb752a4e22..19cb445abe6f 100644
--- a/net-libs/tox/tox-0.2.12-r1.ebuild
+++ b/net-libs/tox/tox-0.2.18.ebuild
@@ -1,67 +1,71 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake systemd
 
-MY_P="c-toxcore-${PV}"
 DESCRIPTION="Encrypted P2P, messaging, and audio/video calling platform"
 HOMEPAGE="https://tox.chat https://github.com/TokTok/c-toxcore"
-SRC_URI="https://github.com/TokTok/c-toxcore/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+SRC_URI="https://github.com/TokTok/c-toxcore/releases/download/v${PV}/c-toxcore-${PV}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0/0.2"
-KEYWORDS="amd64 ~arm x86"
-IUSE="+av daemon dht-node ipv6 log-debug +log-error log-info log-trace log-warn static-libs test"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+av debug daemon dht-node ipv6 key-utils log-debug +log-error log-info log-trace log-warn test"
 
 REQUIRED_USE="?? ( log-debug log-error log-info log-trace log-warn )
 		daemon? ( dht-node )"
 RESTRICT="!test? ( test )"
 
 BDEPEND="virtual/pkgconfig"
-DEPEND="
-	>dev-libs/libsodium-0.6.1:=[asm,urandom,-minimal]
+DEPEND="dev-libs/libsodium:=[asm,urandom,-minimal]
+	dev-libs/msgpack
 	av? (
 		media-libs/libvpx:=
 		media-libs/opus
 	)
 	daemon? ( dev-libs/libconfig:= )"
-RDEPEND="
-	${DEPEND}
+
+RDEPEND="${DEPEND}
 	daemon? (
 		acct-group/tox
 		acct-user/tox
-	)"
+	)
+	key-utils? ( || ( sys-devel/gcc[openmp] sys-devel/clang-runtime[openmp] ) )"
 
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	cmake_src_prepare
 
-	# Remove faulty tests
-	local testname=
-	for testname in lan_discovery save_compatibility; do
-		sed -i -e "/^auto_test(${testname})$/d" CMakeLists.txt || die
+	#Remove faulty tests
+	for testname in lan_discovery save_load; do
+		sed -i -e "/^auto_test(${testname})$/d" ./auto_tests/CMakeLists.txt || die
 	done
 }
 
 src_configure() {
 	local mycmakeargs=(
-		-DAUTOTEST=$(usex test)
-		-DBOOTSTRAP_DAEMON=$(usex daemon)
-		-DBUILD_MISC_TESTS=$(usex test)
-		-DBUILD_TOXAV=$(usex av)
-		-DDHT_BOOTSTRAP=$(usex dht-node)
+		-DAUTOTEST=$(usex test ON OFF)
+		-DBOOTSTRAP_DAEMON=$(usex daemon ON OFF)
+		-DBUILD_FUN_UTILS=$(usex key-utils ON OFF)
+		-DBUILD_FUZZ_TESTS=OFF #Upstream reports that this breaks all other tests
+		-DBUILD_MISC_TESTS=$(usex test ON OFF)
+		-DBUILD_TOXAV=$(usex av ON OFF)
+		-DCMAKE_BUILD_TYPE=$(usex debug Debug Release)
+		-DDHT_BOOTSTRAP=$(usex dht-node ON OFF)
 		-DENABLE_SHARED=ON
-		-DENABLE_STATIC=$(usex static-libs)
-		-DMUST_BUILD_TOXAV=$(usex av)
+		-DENABLE_STATIC=OFF
+		-DFULLY_STATIC=OFF
+		-DMUST_BUILD_TOXAV=$(usex av ON OFF)
 	)
 
 	if use test; then
 		mycmakeargs+=(
-			-DTEST_TIMEOUT_SECONDS=120
-			-DUSE_IPV6=$(usex ipv6)
+			-DTEST_TIMEOUT_SECONDS=150
+			-DNON_HERMETIC_TESTS=OFF
+			-DUSE_IPV6=$(usex ipv6 ON OFF)
 		)
 	else
 		mycmakeargs+=(-DUSE_IPV6=OFF)
diff --git a/net-libs/tox/tox-9999.ebuild b/net-libs/tox/tox-9999.ebuild
index ba31cc1a5c28..ae60fff26c54 100644
--- a/net-libs/tox/tox-9999.ebuild
+++ b/net-libs/tox/tox-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ EGIT_REPO_URI="https://github.com/TokTok/c-toxcore.git"
 LICENSE="GPL-3+"
 SLOT="0/0.2"
 KEYWORDS=""
-IUSE="+av daemon dht-node ipv6 log-debug +log-error log-info log-trace log-warn test"
+IUSE="+av debug daemon dht-node ipv6 key-utils log-debug +log-error log-info log-trace log-warn test"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="?? ( log-debug log-error log-info log-trace log-warn )
@@ -21,6 +21,7 @@ REQUIRED_USE="?? ( log-debug log-error log-info log-trace log-warn )
 
 BDEPEND="virtual/pkgconfig"
 DEPEND="dev-libs/libsodium:=[asm,urandom,-minimal]
+	dev-libs/msgpack
 	av? (
 		media-libs/libvpx:=
 		media-libs/opus
@@ -31,14 +32,15 @@ RDEPEND="
 	daemon? (
 		acct-group/tox
 		acct-user/tox
-	)"
+	)
+	key-utils? ( || ( sys-devel/gcc[openmp] sys-devel/clang-runtime[openmp] ) )"
 
 src_prepare() {
 	cmake_src_prepare
 
 	#remove faulty tests
-	for testname in lan_discovery save_compatibility set_status_message; do
-		sed -i -e "/^auto_test(${testname})$/d" CMakeLists.txt || die
+	for testname in lan_discovery save_load; do
+		sed -i -e "/^auto_test(${testname})$/d" ./auto_tests/CMakeLists.txt || die
 	done
 }
 
@@ -46,15 +48,19 @@ src_configure() {
 	local mycmakeargs=(
 		-DAUTOTEST=$(usex test ON OFF)
 		-DBOOTSTRAP_DAEMON=$(usex daemon ON OFF)
+		-DBUILD_FUN_UTILS=$(usex key-utils ON OFF)
+		-DBUILD_FUZZ_TESTS=OFF #Upstream reports that this breaks all other tests
 		-DBUILD_MISC_TESTS=$(usex test ON OFF)
 		-DBUILD_TOXAV=$(usex av ON OFF)
+		-DCMAKE_BUILD_TYPE=$(usex debug Debug Release)
 		-DDHT_BOOTSTRAP=$(usex dht-node ON OFF)
 		-DENABLE_SHARED=ON
 		-DENABLE_STATIC=OFF
 		-DMUST_BUILD_TOXAV=$(usex av ON OFF))
 	if use test; then
 		mycmakeargs+=(
-			-DTEST_TIMEOUT_SECONDS=120
+			-DTEST_TIMEOUT_SECONDS=150
+			-DNON_HERMETIC_TESTS=OFF
 			-DUSE_IPV6=$(usex ipv6 ON OFF))
 	else
 		mycmakeargs+=(-DUSE_IPV6=OFF)
@@ -95,12 +101,13 @@ src_install() {
 
 pkg_postinst() {
 	if use dht-node; then
-		ewarn "There is currently an unresolved issuer with tox DHT"
-		ewarn "Bootstrap node that causes the program to be built"
-		ewarn "with a null libray reference. This causes an infinite"
-		ewarn "loop for certain revdep-rebuild commands. If you aren't"
-		ewarn "running a node, please consider disabling the dht node"
-		ewarn "use flag. For more information please refer to"
-		ewarn "https://github.com/toktok/c-toxcore/issues/1144"
+		ewarn "The QA notice regarding libmisc_tools.so is known by the upstream"
+		ewarn "developers and is on their TODO list. For more information,"
+		ewarn "please see 'https://github.com/toktok/c-toxcore/issues/1144'"
+		ewarn ""
+		ewarn "There is currently an unresolved issuer with tox DHT Bootstrap node"
+		ewarn "that causes the program to be built with a null libray reference."
+		ewarn "This causes an infinite loop for certain revdep-rebuild commands."
+		ewarn "If you aren't running a node, consider disabling the dht node use flag"
 	fi
 }
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 0eb7a120145b..fe73961ea43f 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,5 +1,5 @@
 DIST webkitgtk-2.36.1.tar.xz 27149816 BLAKE2B 8136caed8779c23f872d2d540f3ca934e0e718699c575c893f44c63dac0f5fd59a93ad6cd299531a544719d6b5715c8d33fac3c3288983bcef51a47a2d75db59 SHA512 c0574bd8924df89c1a82905a8c0c09b4be49f75639db659b38fc3123922128a22fa6f4cf099f08ef7742ecefbbde765177a77e00fd641db3a5eb509586e96ae4
 DIST webkitgtk-2.36.3.tar.xz 26600236 BLAKE2B 80c1127e75a12603e3646b840d6fd8cc4146b5a964d9a44966ff7d40e67f8743420c87f3c001f9299b2449f492401d86c02e55395e2db8938ff0e3bbb08790cb SHA512 dfd02e22a58d0080d9bf6c7dd2a710bb9d8698ff8a4226653629294b74cc981a3e35d4d93eed5ebad35c81b339ec8b96755ad0b36c0238da151b359e07bcb692
 EBUILD webkit-gtk-2.36.1.ebuild 7442 BLAKE2B e573bec3b57464a80aec549ad4759418d8a8a0f4ce812e510c8f17ca45bb760d41c0634c63c3973c328e7d4ce4275f01dfac4f77463d3170061f530f44ec0e26 SHA512 2acd23be1757f6e40f6be3e39d9bcc1c4a8ee885a4d621a2775d4ed6befc94d9755e7bd397300af0fc96177c4b3739740c3160532a747c384088013be30811ac
-EBUILD webkit-gtk-2.36.3.ebuild 7455 BLAKE2B 279467ccc502ee5f195b7275fb092969976bc99078782b490958daa04621fa5f9848effe622585c41a10ede9283a9d06c686cf04e9df8948401b450488cf85b6 SHA512 bcde0b8a846aa0fce3429d24cab8b60f138f0ce786382976ea546a9ab904841be14d0f94c2dd068f9c9e070bff204787b46ea518fde1f5d6ae0a79f3fa727fe9
+EBUILD webkit-gtk-2.36.3.ebuild 7413 BLAKE2B cdb302f41a47718a187a1295380df64fe8dbab43edc4d7f8320a80ff3c93242bb449cddea2a63a97843bbb131b7af730595d56de1f8b3ba778b3669f3a556daa SHA512 c4e5ad408ff224b1e679fcdb367a8eba189ce8778cbf225635d46c4d691e18bf19377ba4d56583d9739633e052ea57e91d4bd2bd51a9d20d3e42871ce3cf2364
 MISC metadata.xml 741 BLAKE2B a9445f675a7fb64e6e79f49de24759e8f797723c13e7c534e4f209d4116af79bafaeb7dd0132e07638ac6eaea75a7bcf7fec46adf87b8499c271db8899c18bb2 SHA512 53beb5307257e7d22b33c6824237654cab8941da9f3e5393499c3674257b5d94434b87c786491d91e5353058b7f9ffda2af6a094f2ad7f59a210f0896b852bbe
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild
index 4743940081ea..032eb1724043 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
 
@@ -107,6 +107,7 @@ BDEPEND="
 	${PYTHON_DEPS}
 	${RUBY_DEPS}
 	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
 	dev-util/glib-utils
 	>=dev-util/gperf-3.0.1
 	>=sys-devel/bison-2.4.3
@@ -120,8 +121,6 @@ BDEPEND="
 	virtual/perl-JSON-PP
 
 	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
-	geolocation? ( dev-util/gdbus-codegen )
-	>=dev-util/cmake-3.10
 "
 #	test? (
 #		dev-python/pygobject:3[python_targets_python2_7]
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 8e76897382f7..fa5ddb9538b3 100644
Binary files a/net-mail/Manifest.gz and b/net-mail/Manifest.gz differ
diff --git a/net-mail/automx2/Manifest b/net-mail/automx2/Manifest
index 5059b6b1f99d..713bfafeacc3 100644
--- a/net-mail/automx2/Manifest
+++ b/net-mail/automx2/Manifest
@@ -3,6 +3,6 @@ AUX confd 213 BLAKE2B 2573f19bdc9022357f2f92ff17d84a1e77078c6c05a46a09b6e57ab713
 AUX init-r1 608 BLAKE2B 7d2b93482c62fe0219c7194279ee495274e4b0b8319ccf2d24e7816abe7eb23452bc21c01305283deeb8224c3668641b1bd5a7f3fbf8fe783a28e58268511ace SHA512 4a1ed2c45e1414734b8e5cbb731377da2087bd4f1a1075b4acb81b5057a65c0557e9e1a05cdf6856da35067a589d9c56fcf13156e8872facfc8f161bb3cade0f
 DIST automx2-2022.0.tar.gz 183324 BLAKE2B 1fda53019cc20979806157db3b740d5bd0c41d545745471188ca6d200dee490c84abb1e353694f5fe45e75983ca8449258ad7fd75e085d10523fd8b0e6310e87 SHA512 2fde481c3b5459a8a0441edf0f8a664615734859a299924207edd35a2e254e2900d88c41e6ec6e7379effbe9c4b7ab7db39ffa81bfc8691a3de5643bbd20d4be
 DIST automx2-2022.1.tar.gz 182519 BLAKE2B baf2ecc801f6f024eb6a6fe2610d6cb7c3dd0726cfa877fdea76d94ebf16b9393addc5be8844f3017fd664b73adc74f2cd898736bbcad1fa0b2b3c1022cb638a SHA512 3d6fb9cf01cff641c78851560d72e3d80f9011cca4cd438cd49e999feef3f290bbd9495655f41319eb5456beac09bb8862dc327b521254266e0d53aa17b0bbd3
-EBUILD automx2-2022.0.ebuild 1143 BLAKE2B 249e963f9195d8d0e43b95b6587481d93c304a4099e4e27f396c5df5eb68c335f354545556f3252846915828a951395b0847885c79af0f142c8a78774242e010 SHA512 f96792ca093c2c4316ccadd35395446c7f3f0745b4aa8edc4ae1756920085f452e75e39bb3f3780d1897b1766968b40235c1a8adb977a1e5bf00740089229b3d
-EBUILD automx2-2022.1.ebuild 1176 BLAKE2B 6b619c4c075295697fb79e6df87de57deb41bdab760fdaa45432dade54cf5dcf2ca0f7ab19095a96e12c3d4bfd1547f4c9312b8c9a2917101a8ab8989e9a2e3e SHA512 5d41853b33c864fac3cf7f644b351b98fc8dcd4108fed4be721f01a20bf91001c80a6a3d5d1b1569d579e2c26ba2e746f064869467e5cb8fd909964249e5d25d
+EBUILD automx2-2022.0.ebuild 1149 BLAKE2B d9a19cb43b90c72230cfc6af5ad17cf6aa43ecb8aa6d6cc700399580c5a289b31e508fcdb4106ca1d4bc12bcf72e4b78814734d677bc3f1f73dfab9c037122a3 SHA512 62137e5f4a7c4d2d4277c56c43e2f24118b77dbf70eac85c3f8a02ea7a396a0381267cf03e958c3ddb4cebf65cf8a1428210151c39da3efd15c47de179fd4713
+EBUILD automx2-2022.1.ebuild 1182 BLAKE2B 370cfea84f89c7b2d667d35100df8bdd62f5044f5511c88c3d810a066861c65cef0e5086b6b571043dc26d20decc7c4b7114fbb748e30c43c8697eb190a334c5 SHA512 71c0c29386ff2453c14985e2fb6b8ce59df07b115c42ab0864de5fa2041470ce7ca51072e2eeb69aac27107997ad878db041c6beb8a6657014d751f00227556a
 MISC metadata.xml 918 BLAKE2B 8f693feed959a0394e8be4a0f489c4913e142aaec8e71920fc0ace1e3ef1f8b5c79a312139bca612c3d204854f6e222252b25b1343539829f3950d1ae344483c SHA512 77e8f20c9af068189d12ba06ac566d03f8b86435b3c88682c6819975fc0636e4e427ab07b76db9d0e32a5b51b7861715c60209f6ee5ae0d4fb0a19a53c4b98a0
diff --git a/net-mail/automx2/automx2-2022.0.ebuild b/net-mail/automx2/automx2-2022.0.ebuild
index 10bb53d7dc0d..20fbebce7c04 100644
--- a/net-mail/automx2/automx2-2022.0.ebuild
+++ b/net-mail/automx2/automx2-2022.0.ebuild
@@ -35,8 +35,8 @@ python_test() {
 }
 
 python_install_all() {
-	local DOCS=( ${S}/docs/*.adoc ${S}/contrib/*sample.conf )
-	local HTML_DOCS=( ${S}/docs/*.{html,svg} )
+	local DOCS=( "${S}"/docs/*.adoc "${S}"/contrib/*sample.conf )
+	local HTML_DOCS=( "${S}"/docs/*.{html,svg} )
 	newconfd "${FILESDIR}/confd" "${PN}"
 	newinitd "${FILESDIR}/init-r1" "${PN}"
 	insinto /etc
diff --git a/net-mail/automx2/automx2-2022.1.ebuild b/net-mail/automx2/automx2-2022.1.ebuild
index 58a4985460d2..43acbf695022 100644
--- a/net-mail/automx2/automx2-2022.1.ebuild
+++ b/net-mail/automx2/automx2-2022.1.ebuild
@@ -36,8 +36,8 @@ python_test() {
 }
 
 python_install_all() {
-	local DOCS=( ${S}/docs/*.adoc ${S}/contrib/*sample.conf )
-	local HTML_DOCS=( ${S}/docs/*.{html,svg} )
+	local DOCS=( "${S}"/docs/*.adoc "${S}"/contrib/*sample.conf )
+	local HTML_DOCS=( "${S}"/docs/*.{html,svg} )
 	newconfd "${FILESDIR}/confd" "${PN}"
 	newinitd "${FILESDIR}/init-r1" "${PN}"
 	insinto /etc
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index b29aee61c6bc..a6c8a517cfb9 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -4,8 +4,7 @@ AUX dovecot.init-r6 1573 BLAKE2B 206318cbf7a6ef0276cb93237b091dd34dc2603a00f13ed
 DIST dovecot-2.3-pigeonhole-0.5.18.tar.gz 1953892 BLAKE2B 478da07a2f507a3322c6b6035f8cb74a720c030cc9413496f90a793d165178617207e26b0b57f710a9b9c7671be3fffdbaccaacb8747198abf82943dcb4a24df SHA512 44c3d945a5aebb8935e6e46751e44f505f2abd529c31e3efb689d3b5b9cdf9bca4f5231fc42a8d19837cb95c7618f5b64dfdf5964f40a0a6987144a37cdbaaec
 DIST dovecot-2.3-pigeonhole-0.5.19.tar.gz 1954148 BLAKE2B 0c52293f9447260f3e95f31c5ea3c04a1971b1a5621b56be1c79a8575aceb4f7e7fef62e7d0a3d980dcb5b8e1a8eeec543adcf0b016b65eb34ca4a26e8d2fe23 SHA512 5b0a61c7711232ea3651b818a970b500b05bd340a04bcd5a5f0ea0529eda65f498912a845c8f3b3b80196d010bc22bd4a380e1f682cb42f62b80d2d43a94993a
 DIST dovecot-2.3.18.tar.gz 7763230 BLAKE2B ff3e0c2cad87d2e2632345a25825eebd0a6c1520376d85286453bde7505f22410d03911cd588a0d102b75f22cc1de051b01c43a57c90138340186e8cb024247a SHA512 b5eccf790a3960614876f122efb6296fe49ab7c523b08c10347fd4d10ed293fbd327279511c227b420f7c0786975186157eaa0fb5cd3aab1f3be9a4c5c3ad233
-DIST dovecot-2.3.19.tar.gz 7790661 BLAKE2B 060364dc83a5fcb7ee7a5a77467aedb79de13e65c5abfb1a9c1e76c7fac4b5b1ad07157917d095631ea72b194efdde38829d4c7274ced65dca7b457c0cc4bb13 SHA512 a61ce88b53c4f24faddf4951f16cb75dfe52aa7057d072c727566a7c9a683cc487d26cea9a83ad8aca161a053949d2f2196ba6a58015e3d33be897094aabf887
+DIST dovecot-2.3.19.1.tar.gz 7790851 BLAKE2B 6826977a0febfcb56eb99baf6e0dc0a130fc24a14f113ca7ce0f72b26b8c9755d8352999c5965e21320a62621787e02428c99dd6888768e8c35a46e4082ba071 SHA512 ceb87a5f76b6352d28fd030aae5ad2165a133e9a8a6309891e793911203fc0ada9fb254dc05d183eaaa7e2b9851d3f1755b33f08fa6ff5b4b415ac4272bfe150
 EBUILD dovecot-2.3.18-r1.ebuild 8859 BLAKE2B a022d5c3fb0da72559ecd071711ca2bbea7dbd999a75449f7b6e50047d74497895ad00a74de6c0653e61d78f76600d5aab9204133476558ee6c59b1628180438 SHA512 e3c1b3f2733a348344d3349091622b0e3827bdedd4575fef0ada44d13346f22bef33ef9817540c2cc5c15fd6142050a36bfdc32ecf905a64ee67e3283e6c6981
-EBUILD dovecot-2.3.18-r2.ebuild 8831 BLAKE2B a40f408980018005c8232064ad806132b11e448ef7f1aef0aa22b37a5b8583b1e575774b34a85346152c76b71bfcf2b66ea04dff7bcae7049e5baa5a592a0677 SHA512 e40c094f190fd94afb2722cc58f9f5f61b4a72c6bb0550e89619948ca54d195e8e2702d04552948cf58766430a1adbbb549d496d7c14cdb5075bbd2b0a07ee5b
-EBUILD dovecot-2.3.19.ebuild 8658 BLAKE2B d9edf93a3287d299403509f0991f1c0a976207a2693ee62404a323803c22574ced457503297c209432f0d2a942be60780a40e913f62c11e3d600449d63a481ff SHA512 85c3138977452eb8ef341d5c67c30694230606d47dccec99feea37efafb8d9e6fa956fbe6d43d3e3670cc3183e0a26cf390e264f634ed7e97d2acbe5a8a62f29
+EBUILD dovecot-2.3.19.1.ebuild 8658 BLAKE2B d9edf93a3287d299403509f0991f1c0a976207a2693ee62404a323803c22574ced457503297c209432f0d2a942be60780a40e913f62c11e3d600449d63a481ff SHA512 85c3138977452eb8ef341d5c67c30694230606d47dccec99feea37efafb8d9e6fa956fbe6d43d3e3670cc3183e0a26cf390e264f634ed7e97d2acbe5a8a62f29
 MISC metadata.xml 1025 BLAKE2B 5e9309f0cf659eb51dbf908776fd0f6a97c06c305380ff0b66f969d92382c78e1460310b0d4dd323e1193d622f5bd9cc796d31e8bda304e833d5ab974b934992 SHA512 befdb4837de276d9a73a77a926d972dae9a6c5a39a28137d4ef8f1e9e51c4885b8df24b8a144b9ba5d9533af7430ea531cada49944d529651bf63bc98aeff92f
diff --git a/net-mail/dovecot/dovecot-2.3.18-r2.ebuild b/net-mail/dovecot/dovecot-2.3.18-r2.ebuild
deleted file mode 100644
index a0a7853cfdc8..000000000000
--- a/net-mail/dovecot/dovecot-2.3.18-r2.ebuild
+++ /dev/null
@@ -1,307 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-1 lua5-3 )
-# do not add a ssl USE flag.  ssl is mandatory
-SSL_DEPS_SKIP=1
-inherit autotools flag-o-matic lua-single ssl-cert systemd toolchain-funcs
-
-MY_P="${P/_/.}"
-#MY_S="${PN}-ce-${PV}"
-major_minor="$(ver_cut 1-2)"
-sieve_version="0.5.18"
-if [[ ${PV} == *_rc* ]]; then
-	rc_dir="rc/"
-else
-	rc_dir=""
-fi
-SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
-	sieve? (
-	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	)
-	managesieve? (
-	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="https://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite"
-IUSE_DOVECOT_COMPRESS="lz4 zstd"
-IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 lucene managesieve rpc
-	selinux sieve solr static-libs stemmer suid systemd tcpd textcat unwind"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-
-DEPEND="
-	app-arch/bzip2
-	app-arch/xz-utils
-	dev-libs/icu:=
-	dev-libs/openssl:0=
-	sys-libs/zlib:=
-	virtual/libiconv
-	argon2? ( dev-libs/libsodium:= )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap:= )
-	lua? ( ${LUA_DEPS} )
-	lucene? ( >=dev-cpp/clucene-2.3 )
-	lz4? ( app-arch/lz4 )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	pam? ( sys-libs/pam:= )
-	postgres? ( dev-db/postgresql:* )
-	rpc? ( net-libs/libtirpc:= net-libs/rpcsvc-proto )
-	selinux? ( sec-policy/selinux-dovecot )
-	solr? ( net-misc/curl dev-libs/expat )
-	sqlite? ( dev-db/sqlite:* )
-	stemmer? ( dev-libs/snowball-stemmer:= )
-	suid? ( acct-group/mail )
-	systemd? ( sys-apps/systemd:= )
-	tcpd? ( sys-apps/tcp-wrappers )
-	textcat? ( app-text/libexttextcat )
-	unwind? ( sys-libs/libunwind:= )
-	zstd? ( app-arch/zstd:= )
-	virtual/libcrypt:=
-	"
-
-RDEPEND="
-	${DEPEND}
-	acct-group/dovecot
-	acct-group/dovenull
-	acct-user/dovecot
-	acct-user/dovenull
-	net-mail/mailbase
-	"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}"-autoconf-lua-version-v2.patch
-	"${FILESDIR}/${PN}"-socket-name-too-long.patch
-)
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	if use managesieve && ! use sieve; then
-		ewarn "managesieve USE flag selected but sieve USE flag unselected"
-		ewarn "sieve USE flag will be turned on"
-	fi
-}
-
-src_prepare() {
-	default
-	# bug 657108
-	#elibtoolize
-	eautoreconf
-
-	# Bug #727244
-	append-cflags -fasynchronous-unwind-tables
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	# turn valgrind tests off. Bug #340791
-	VALGRIND=no \
-	LUAPC="${ELUA}" \
-	systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-	econf \
-		--with-rundir="${EPREFIX}/run/dovecot" \
-		--with-statedir="${EPREFIX}/var/lib/dovecot" \
-		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-		--disable-rpath \
-		--with-bzlib \
-		--without-libbsd \
-		--with-lzma \
-		--with-icu \
-		--with-ssl \
-		--with-zlib \
-		$( use_with argon2 sodium ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with lua ) \
-		$( use_with ldap ) \
-		$( use_with lucene ) \
-		$( use_with lz4 ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with solr ) \
-		$( use_with stemmer ) \
-		$( use_with systemd ) \
-		$( use_with tcpd libwrap ) \
-		$( use_with textcat ) \
-		$( use_with unwind libunwind ) \
-		$( use_with zstd ) \
-		$( use_enable static-libs static ) \
-		${conf}
-
-	if use sieve || use managesieve; then
-		# The sieve plugin needs this file to be build to determine the plugin
-		# directory and the list of libraries to link to.
-		emake dovecot-config
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		econf \
-			$( use_enable static-libs static ) \
-			--localstatedir="${EPREFIX}/var" \
-			--enable-shared \
-			--with-dovecot="${S}" \
-			$( use_with ldap ) \
-			$( use_with managesieve )
-	fi
-}
-
-src_compile() {
-	default
-	if use sieve || use managesieve; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-	fi
-}
-
-src_test() {
-	default
-	if use sieve || use managesieve; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		default
-	fi
-}
-
-src_install() {
-	default
-
-	# insecure:
-	# use suid && fperms u+s /usr/libexec/dovecot/deliver
-	# better:
-	if use suid; then
-		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail "/usr/libexec/dovecot/dovecot-lda"
-		fperms 4750 "/usr/libexec/dovecot/dovecot-lda"
-	fi
-
-	newinitd "${FILESDIR}"/dovecot.init-r6 dovecot
-
-	rm -rf "${ED}"/usr/share/doc/dovecot
-
-	dodoc AUTHORS NEWS README TODO
-	dodoc doc/*.{txt,cnf,xml,sh}
-	docinto example-config
-	dodoc doc/example-config/*.{conf,ext}
-	docinto example-config/conf.d
-	dodoc doc/example-config/conf.d/*.{conf,ext}
-	docinto wiki
-	dodoc doc/wiki/*
-	doman doc/man/*.{1,7}
-
-	# Create the dovecot.conf file from the dovecot-example.conf file that
-	# the dovecot folks nicely left for us....
-	local conf="${ED}/etc/dovecot/dovecot.conf"
-	local confd="${ED}/etc/dovecot/conf.d"
-
-	insinto /etc/dovecot
-	doins doc/example-config/*.{conf,ext}
-	insinto /etc/dovecot/conf.d
-	doins doc/example-config/conf.d/*.{conf,ext}
-	fperms 0600 /etc/dovecot/dovecot-{ldap,sql}.conf.ext
-	rm -f "${confd}/../README"
-
-	# .maildir is the Gentoo default
-	local mail_location="maildir:~/.maildir"
-	sed -i -e \
-		"s|#mail_location =|mail_location = ${mail_location}|" \
-		"${confd}/10-mail.conf" \
-		|| die "failed to update mail location settings in 10-mail.conf"
-
-	# We're using pam files (imap and pop3) provided by mailbase
-	if use pam; then
-		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
-			"${confd}/auth-system.conf.ext" \
-			|| die "failed to update PAM settings in auth-system.conf.ext"
-		# mailbase does not provide a sieve pam file
-		use managesieve && dosym imap /etc/pam.d/sieve
-		sed -i -e \
-			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update PAM settings in 10-auth.conf"
-	fi
-
-	# Disable ipv6 if necessary
-	if ! use ipv6; then
-		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
-			|| die "failed to update listen settings in dovecot.conf"
-	fi
-
-	# Update ssl cert locations
-	sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-		|| die "ssl conf failed"
-	sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
-		-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
-		"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
-
-	# Install SQL configuration
-	if use mysql || use postgres; then
-		sed -i -e \
-			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
-			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
-			10-auth.conf"
-	fi
-
-	# Install LDAP configuration
-	if use ldap; then
-		sed -i -e \
-			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update ldap settings in 10-auth.conf"
-	fi
-
-	if use sieve || use managesieve; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake DESTDIR="${ED}" install
-		sed -i -e \
-			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-			|| die "failed to update sieve settings in 15-lda.conf"
-		rm -rf "${ED}"/usr/share/doc/dovecot
-		docinto example-config/conf.d
-		dodoc doc/example-config/conf.d/*.conf
-		insinto /etc/dovecot/conf.d
-		doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
-		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
-		docinto sieve/rfc
-		dodoc doc/rfc/*.txt
-		docinto sieve/devel
-		dodoc doc/devel/DESIGN
-		docinto plugins
-		dodoc doc/plugins/*.txt
-		docinto extensions
-		dodoc doc/extensions/*.txt
-		docinto locations
-		dodoc doc/locations/*.txt
-		doman doc/man/*.{1,7}
-	fi
-
-	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
-}
-
-pkg_postinst() {
-	# Let's not make a new certificate if we already have one
-	if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
-		einfo "Creating SSL	certificate"
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-		install_cert /etc/ssl/dovecot/server
-	fi
-
-	elog "Please read https://doc.dovecot.org/installation_guide/upgrading/ for upgrade notes."
-}
diff --git a/net-mail/dovecot/dovecot-2.3.19.ebuild b/net-mail/dovecot/dovecot-2.3.19.1.ebuild
similarity index 100%
rename from net-mail/dovecot/dovecot-2.3.19.ebuild
rename to net-mail/dovecot/dovecot-2.3.19.1.ebuild
diff --git a/net-mail/postfix-logwatch/Manifest b/net-mail/postfix-logwatch/Manifest
index a26e2ee31a62..f80346ad77b0 100644
--- a/net-mail/postfix-logwatch/Manifest
+++ b/net-mail/postfix-logwatch/Manifest
@@ -1,3 +1,5 @@
 DIST postfix-logwatch-1.40.04.tar.xz 78996 BLAKE2B fea2a08a7bc776cf0106a60bc0f86730c562d6c893629a1028183150a246803bda8ada6a5ec7e264685fe40016b82ce4140031af7e508ac4b1d9a34e552b865d SHA512 194917fe4d05e9808893da0c175859e932d5e48956d1dda96129dd5de7f9ee23131ae1831b558c8c2d32d03ffda80aa95cfd5048543b7766a0486a71efa6c19b
+DIST postfix-logwatch-1.40.05.tar.xz 79504 BLAKE2B 5d45a43ef2206b77092a90cd463a1718fada286fdd499df4416739aea7246c79b0670503585e7e057174ac715986767e3a72974d9790f33a2cd251221d883687 SHA512 15ba438701be110ce75c59bb6803cbb308bd53876428b01a457f42b3fb12e565c9b0c2d4559d71451475ec4986fccfc9f06854760035b4653c72508b968d5a0d
 EBUILD postfix-logwatch-1.40.04.ebuild 794 BLAKE2B 0658e0adb712ffae2973819c7ffc0c309f0030b209eaad9430284911c393e8d33440ad5bfdf72e1ece11cf34114eaec8200c7b79465f8b66490d9bc5a3166982 SHA512 d3b60889f683414a8ea6fa58d4c43068e20a96d1b004c4899f7e0404389d096764c33a93fe52427153574aae778483ad83c3ecd0ce179448ced50657ca8ec859
+EBUILD postfix-logwatch-1.40.05.ebuild 796 BLAKE2B 0ab46353e3f9518186cc515f4c37cdc703d4c8b9ae7fe72f6f06aa9f95bfa5217971009665fc134f4b104c3860030616db3a9eff86a0a536c353fa34805914f7 SHA512 5d833f806fc1d3fbec465dacadd2c6d6a6a6df1cd9d95ccb725608ef1188e4e70d27cbc3400a0b03d20985697e96140a9ff67150d221fcd683e373f1e30b49f8
 MISC metadata.xml 219 BLAKE2B 27094593eb47f098fe9df926d3a827b65c2ca39ac6b03d392efe2c19d646274e5b462f65a7177ba2556a9167c994544688e53a3df810dc7f86ae43c4a75fd59e SHA512 e990bf6d766d6c0380344187a03b66380e4ed7a1554dd7a900ccf1f6f2dd3a51b06b382cedd5c73e0ad75301436b351fea0e7f1fb720c3d1345a8958554d341c
diff --git a/net-mail/postfix-logwatch/postfix-logwatch-1.40.05.ebuild b/net-mail/postfix-logwatch/postfix-logwatch-1.40.05.ebuild
new file mode 100644
index 000000000000..dc661eb713af
--- /dev/null
+++ b/net-mail/postfix-logwatch/postfix-logwatch-1.40.05.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A log analyzer for postfix"
+HOMEPAGE="http://michael.orlitzky.com/code/postfix-logwatch.xhtml"
+SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-lang/perl"
+
+src_prepare() {
+	default
+	# Replace the default config file location with ours.
+	local cfg_default='/usr/local/etc/${progname_prefix}-logwatch.conf'
+	local cfg_gentoo='/etc/${progname_prefix}-logwatch.conf';
+	sed -i "s~${cfg_default}~${cfg_gentoo}~" ${PN} \
+		|| die 'failed to update the default config location'
+}
+
+src_install() {
+	dodoc Bugs Changes README ${PN}.conf-topn
+	doman ${PN}.1
+	dobin ${PN}
+	insinto /etc
+	doins ${PN}.conf
+}
diff --git a/net-mail/relay-ctrl/Manifest b/net-mail/relay-ctrl/Manifest
index 8379f558b51d..e8cf98a0861b 100644
--- a/net-mail/relay-ctrl/Manifest
+++ b/net-mail/relay-ctrl/Manifest
@@ -2,7 +2,7 @@ AUX authenticated.c-relayfixup.diff 702 BLAKE2B c597a6dbf6fc7161caa769aafc3938bc
 AUX relay-ctrl-3.1.1-NOFILE-overstep.patch 671 BLAKE2B 93af856d842f1493afa35addb3077b750345e7b2ce4d5274f01f23a3081b3e873d12a826281e23c0d6a1e4815082e98be7e32f539d70d98ec2412ae610bd20c4 SHA512 83508f61caf936196a7093e8124267663ce89302e66832de30383432b68f08cbee26026ef1d18c5125fbcfd1c59477c14e406917370bfa1d3ea33a5c6b405377
 DIST relay-ctrl-3.1.1.tar.gz 35046 BLAKE2B 91e4ce0f1f6ce5933f64e0d60407004d409474180f42bf40632bdb3bce1f3f974abdb597d34ab7ee4113e041323bd55965ce57f271fe79cfb8c56972fe8612b4 SHA512 738a001f6a058809955f04664919f261ff1a0bfc280ec5e805b870baf448b27664e1b376dd078100a2847e38248eb16651e23812f00609a437893e7b1dc9102c
 DIST relay-ctrl-3.2.tar.gz 23119 BLAKE2B 663a95e7ef075b1b1fa390ab4d144a83c02eec615aa2a359892da1c5878ffe44995ed28df792a7cf1c179c93c1f874c87ffe4b781a28694c5fd81cec38228056 SHA512 aa2c7516e330ba3c4f466848e59b60cf5649393c3f9c87a3a5e5dfa170f96b9b1ad519098dfa153f9e06f9e02bd48d2a22118e1e8ccfe3e2585250e8feb4e5af
-EBUILD relay-ctrl-3.1.1-r2.ebuild 2094 BLAKE2B 30a58a02ba1c68387251dafd38eb942aaea325224ae97f6b50a70c8d4ebdab3f18720c634afcb9fb004ec2ed1453ae672a6fe300a7dd8d654435cbf30ad8be40 SHA512 cfc96e7dabc169c21d7bf64a00e51a8a8565d16f13e4a59cbadc5508243d9d514b4e8d5dffb232fd29392e5132cbed787e2d586eec460dd4359e7ab0da84bb92
-EBUILD relay-ctrl-3.1.1-r3.ebuild 2406 BLAKE2B 25e961bcc5222f55d3ac911b368386acb2f431e4664ef2f146bff25dede2ef06669210f3985e94bbbf6b40da42f9e6b17263ed42071133f843c23373cef5067d SHA512 3352b06bf68173814b66ba8ad147e36d4517d9a5e86d4d1e907eeacfa437cb4d4d9d1541d3aadc5d97d88fef3ec908f428a9b8df3b75ad39eca7f28ea6b20a2a
-EBUILD relay-ctrl-3.2.ebuild 2469 BLAKE2B 5e7e0b212988705c418bdd65b63ba7771a5ba4e04e8603ad437810f0f616e5b04487415877d3601d359569c7f5471226872002fa8ae956c72ad58e2ba99d8ff5 SHA512 0ed0929b47c0ac6f7eb75c94e409579120ee73a1bcb2904d5a45710b91a0ac853cd04b1c48cbc0da4221c7ea9e3de5f11f31a2a38590c2b767e370c26563105f
+EBUILD relay-ctrl-3.1.1-r2.ebuild 2098 BLAKE2B a024d1bc382f7c7465cf66145ec90d1c97c7168397cfbc2d6f2d423c4127c660a1e4d4f91c568960e3de52472f3816e0e6417adc2630d40902c97c4229508dc8 SHA512 2d268a0e5c8b57b3c4f1ecc1c9027bb9ddee5f28ec0abf49cb8da91fb842fd585a9f447b7a32f549f98bccd93d3d19b60cc6648775ff285b81a590fa2541c068
+EBUILD relay-ctrl-3.1.1-r3.ebuild 2412 BLAKE2B 2ab11c630819e30aa2213c8aa15854d02c47b7e39c5faa60b310cf96a5338c3d9c634580f415d0f918af8c54c7c524105251dc1b2fa65972fbffeb2916472741 SHA512 adb323748637b92d72ffb5b957f89adb45d430cfac09b3df91292de53e9a8076a25248fbde8dc1860ab8830dc7ed1b8df979d83f7ec91db654c3e3042b3e8de4
+EBUILD relay-ctrl-3.2.ebuild 2475 BLAKE2B dfb42c15fb63858399f1010f9be53bb7a34eaa7476066428e7a4558cb0a724471b8a907177d1d93eab9b7c58f9d45d05091d13a1daf55d20922aa989e97396ff SHA512 ae2f50ee9bc4eb314d6f74c5367ca6cf6726e6e74bf5e6e561c4f4fefbdbdc1462a2119348482564371ee1c2947e07d37dc3b47f61a224bc300bb1e2fa26c99b
 MISC metadata.xml 269 BLAKE2B 43d9731cf9f56bf0639c05f7299cbdadfaaf03fe439dda719287de85a226d301d3bfee81ac2e7f37fc9f25d8e3a3045324f9214e0c1c6c0ff22b1c085a238414 SHA512 818b094a5a00192f09ca69f6ebdb6bfa91f9a94150d2c0861cfdaf0ff78919e5fdac9b58334f0beb73de1f0608372eb86f0c283cd095c0d67224efd9bb5d3ddb
diff --git a/net-mail/relay-ctrl/relay-ctrl-3.1.1-r2.ebuild b/net-mail/relay-ctrl/relay-ctrl-3.1.1-r2.ebuild
index 9a9a53077df7..71b22356857f 100644
--- a/net-mail/relay-ctrl/relay-ctrl-3.1.1-r2.ebuild
+++ b/net-mail/relay-ctrl/relay-ctrl-3.1.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -52,9 +52,9 @@ src_install() {
 
 	# tell it our storage dir
 	echo "${RELAYCTRL_BASE}/${RELAYCTRL_STORAGE}" \
-		> ${D}${RELAYCTRL_CONFDIR}/RELAY_CTRL_DIR || die
+		> "${D}"${RELAYCTRL_CONFDIR}/RELAY_CTRL_DIR || die
 	# default to 30 minutes
-	echo "1800" > ${D}${RELAYCTRL_CONFDIR}/RELAY_CTRL_EXPIRY || die
+	echo "1800" > "${D}"${RELAYCTRL_CONFDIR}/RELAY_CTRL_EXPIRY || die
 
 	dodir /etc/cron.hourly
 	echo "/usr/bin/envdir ${RELAYCTRL_CONFDIR} ${RELAYCTRL_BINDIR}/relay-ctrl-age" \
diff --git a/net-mail/relay-ctrl/relay-ctrl-3.1.1-r3.ebuild b/net-mail/relay-ctrl/relay-ctrl-3.1.1-r3.ebuild
index 9e71696f8480..d3a9174042cd 100644
--- a/net-mail/relay-ctrl/relay-ctrl-3.1.1-r3.ebuild
+++ b/net-mail/relay-ctrl/relay-ctrl-3.1.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -54,12 +54,12 @@ src_install() {
 
 	# tell it our storage dir
 	echo "${RELAYCTRL_BASE}/${RELAYCTRL_STORAGE}" \
-		> ${D}${RELAYCTRL_CONFDIR}/RELAY_CTRL_DIR || die
+		> "${D}"${RELAYCTRL_CONFDIR}/RELAY_CTRL_DIR || die
 	# default to 30 minutes
-	echo "1800" > ${D}${RELAYCTRL_CONFDIR}/RELAY_CTRL_EXPIRY || die
+	echo "1800" > "${D}"${RELAYCTRL_CONFDIR}/RELAY_CTRL_EXPIRY || die
 
 	dodir /etc/cron.hourly
-	echo "#!/bin/sh" > ${D}/etc/cron.hourly/relay-ctrl-age
+	echo "#!/bin/sh" > "${D}"/etc/cron.hourly/relay-ctrl-age
 	echo "/usr/bin/envdir ${RELAYCTRL_CONFDIR} ${RELAYCTRL_BINDIR}/relay-ctrl-age" \
 		>> "${D}"/etc/cron.hourly/relay-ctrl-age
 	fperms 755 /etc/cron.hourly/relay-ctrl-age
diff --git a/net-mail/relay-ctrl/relay-ctrl-3.2.ebuild b/net-mail/relay-ctrl/relay-ctrl-3.2.ebuild
index 2c858db5f652..a42ba4bce9b4 100644
--- a/net-mail/relay-ctrl/relay-ctrl-3.2.ebuild
+++ b/net-mail/relay-ctrl/relay-ctrl-3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -55,12 +55,12 @@ src_install() {
 
 	# tell it our storage dir
 	echo "${RELAYCTRL_BASE}/${RELAYCTRL_STORAGE}" \
-		> ${D}${RELAYCTRL_CONFDIR}/RELAY_CTRL_DIR || die
+		> "${D}"${RELAYCTRL_CONFDIR}/RELAY_CTRL_DIR || die
 	# default to 30 minutes
-	echo "1800" > ${D}${RELAYCTRL_CONFDIR}/RELAY_CTRL_EXPIRY || die
+	echo "1800" > "${D}"${RELAYCTRL_CONFDIR}/RELAY_CTRL_EXPIRY || die
 
 	dodir /etc/cron.hourly
-	echo "#!/bin/sh" > ${D}/etc/cron.hourly/relay-ctrl-age
+	echo "#!/bin/sh" > "${D}"/etc/cron.hourly/relay-ctrl-age
 	echo "/usr/bin/envdir ${RELAYCTRL_CONFDIR} ${RELAYCTRL_BINDIR}/relay-ctrl-age" \
 		>> "${D}"/etc/cron.hourly/relay-ctrl-age
 	fperms 755 /etc/cron.hourly/relay-ctrl-age
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 62c0a247dae9..5ccc9521a440 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/batctl/Manifest b/net-misc/batctl/Manifest
index c0bb88995f5c..0786f2b1ccfd 100644
--- a/net-misc/batctl/Manifest
+++ b/net-misc/batctl/Manifest
@@ -1,3 +1,3 @@
-DIST batctl-2021.4.tar.gz 116743 BLAKE2B 74dfecd1e07c5f6555fba9e184e887ecdb3c73d423f26af70ff5324acf2477e4ef0768197822e2fdd3e2626564d3b4e637c15a8af628f8e0d70ba48746c1186c SHA512 0a629ab6a52e503fc63b022abf5ada491e7ffd61e2ebda7a169b556b2362943452285d6a0177122634b8c7c0fafedc712d3d6fee82c03e6fd4e2d42d890f87da
-EBUILD batctl-2021.4.ebuild 768 BLAKE2B cac3d943b6214683adfc447a4b9ae70ff98b97d6ca3e91b3c226195b4d18365fbbe93fbf2e2207cf350c14890b524620be5308f7ca7bd75c320e079c67dcc589 SHA512 cbb03484a30693fc5881a167f349b65bb3d5d6ebf570211fdda7983f31bdf9553e2af0ddfc7e0caa813bafe09d8c0fab29c4d32ae52a54748d1f764fe098ebd0
+DIST batctl-2022.1.tar.gz 116858 BLAKE2B 1de12d207c9fc3201c557f02d06d81b42cb3038b82a2ae8c8255e20ae3078d25a8f9f2bf39a96f649c42541c5b1a4796baaf5f30d4534b40b24c2df06c17ddbe SHA512 4e268b5ec7cb07fed08b8688e10c603b788ccbe3cc3c84e536ba27cf2e54e306b49d86a9f9c657627c673a48029834d0454db53c0fa46d7fad5e2095823828f5
+EBUILD batctl-2022.1.ebuild 768 BLAKE2B 4171374cb921e00eddbca6b4c2fc7de061e28b8d592fcbba639f0a02aea6169cadd613ceed436678e90f64e91dc0c3862bc46de718e008329f5ca93e338e29f3 SHA512 948ca4773b735fe14111f121e4ff9e3fd0674139b19821af5a6fdd8a0def66968ea9f7d6e30f3bc43003118d0a589590bdfefbd558c51d200ed4215743c9a39a
 MISC metadata.xml 406 BLAKE2B 9d64c2ede4ba26b9540721299b25eff6d3037a209f51b7e81a646b924e2944a411f26d5511be5545d2648b4663323280fbb51d57198d81668d41dc20c8a49cb6 SHA512 17f94d08a64d16283477c9bf6d887b777118cc4727df5f7668cb345556570ed69c564d770f411ee2203f34437b1a265f16a41aec88b25b4ed4b66b3a71d65a99
diff --git a/net-misc/batctl/batctl-2021.4.ebuild b/net-misc/batctl/batctl-2022.1.ebuild
similarity index 95%
rename from net-misc/batctl/batctl-2021.4.ebuild
rename to net-misc/batctl/batctl-2022.1.ebuild
index 6dcab8083ac0..03a22398411e 100644
--- a/net-misc/batctl/batctl-2021.4.ebuild
+++ b/net-misc/batctl/batctl-2022.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 4b8818fc4f1c..b6e66bd7bf7f 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -2,13 +2,7 @@ AUX dropbox.conf 322 BLAKE2B db94efba3a73841cb56a0fcc75f4f6d7fb7424a35f48a7eb3ad
 AUX dropbox.initd 1581 BLAKE2B c23a753b7e4d1132d516d607e0eee35072130f6e66c59af008cedd9d9d8c104d9ae1c4644ad984a40ec48a498782b442f79058f499e61c3a3b7a700886353b4b SHA512 4275b7cca361978be6d4379f9d14edc75e51684708a61c1b9880f63e0a02e75c4eb165145bf5a2b4e0704daa5a506dc3506a953db6f5a95977f0101fbbda4912
 AUX dropbox_at.service-r2 1582 BLAKE2B 7a5d8eb1e99d6a9f6cc7d903d8d2cb6b124b4a5217e978d05f0afb08de90b3634bb802bd075a053b84b0ec4f5ef6643d2efb00beb964f9f14dd3dd234806358b SHA512 ce465614c848103ac19d3782bf55508ab9b3a3f1c0159cd0ccb7daa7374f014382b30a99bf2eb5488ab4474cad953ce0b4710c8222e5196ea49672db5d183b85
 DIST DropboxGlyph_Blue.svg 605 BLAKE2B 6c488bd261293b22da98035935ddfa9247bedbc6f4da2f9fc2470af802c1f4f597ac88b01b5bef9e77e1e717267f633d6a04af2ccfd3c5f9dbff22fbceaf9a91 SHA512 9202344b904dcd7955e5a355dadf537d1544140d74f8a33bdc40e18e36661e3a474d11cf17613eaebf4e76c170d8413d99abdedfb8635784bcd6892b4b259712
-DIST dropbox-lnx.x86-147.4.4800.tar.gz 102214911 BLAKE2B a35086b6787cf442a326d1f6a3e6bd1d453a6d76817ece33f9a43d6d35182b20c343eafded7a6023b37267fc2c3b99896e28f7913ed18f5541fe107b0235cbe9 SHA512 16b40b080ce0b97d0d3da86543a31f07331d27ec42dcf0c06a3632c4e5448ea11f4e2471f3796729de20d13af4bfbc0bf65ae1993eb592f0b170ab44fa441b62
-DIST dropbox-lnx.x86-148.4.4519.tar.gz 103388037 BLAKE2B 5bc5a7a211dd5d4bfa12070bfcac061fa5ecfce39a7390e945a00ac3e440d5aa82633581538cffe6525dd7d55dbaa68a00648b8e62c6545a395cc6810e0e7d01 SHA512 a063e2d3f6d2edc01df9ff40dfefbfef9e42decd8b1088605cab6a1482f73b75908a4350c3053fa05e0c9cf62dd44dbb319cdce8b882bcde6f738255e366c0e5
 DIST dropbox-lnx.x86-150.4.5000.tar.gz 103645837 BLAKE2B e6f304c99cfe419aed2afe58a6e4f86dbcb4c81ddc9aed82635b715f735c70b196827bcba169ac04f77520b74aa1ad87507072ab5e383398fd2e03a56f339af1 SHA512 90f5568ac372120497b090b60204b3a671b25c38aa93ec0b70d0071bf91c9d656001df3ff1fec2a66fdcf1acdee0b8cc70c110c4d7091d2fac63c389baa70607
-DIST dropbox-lnx.x86_64-147.4.4800.tar.gz 104476319 BLAKE2B 0bb282285df72bed5da4134b22500f0d3ee649d0b7902c3016288914bf331c40e6704fcbde7de21215ca93500f559f32fb503025f2d18832962650ad85ce6e74 SHA512 f54d083d901f0cb2ab53e5fc735f4fd69eb9bce87b5177c2ef9ba54913bab1d286ccd57f7ae13bc09b8dc7482a4209fc9ad792c9f74d550487daee311319c247
-DIST dropbox-lnx.x86_64-148.4.4519.tar.gz 105252627 BLAKE2B 923412d600c34daa248be2179a8c8d09b097bec9a9efb68bd9df5a8d68e0702336ef35f4c2f9cebb4a45f6bec4f2731d24e9b75a9696f6696216f1388a31d0dc SHA512 b51b06cc9a23a65c5cc75632f5c9b2cfa7e2bff9ced7527f1392c85631622c74bac2e0d3b106883f4e73012563b5eb8fd498e44d617a25bc15a41fe3c7d903cc
 DIST dropbox-lnx.x86_64-150.4.5000.tar.gz 105506526 BLAKE2B 44b13413b2480afd2849264c59e4d2fb17af014a56e9fbc7b75049b80e12d0ef86edfb1dfdfa3532f261280df7a19444307d862e9695dce3cf147ff39454742b SHA512 9f78e12047fad0c94331c4a12ef72d6afe0b8f044880a08cdc68ac7c9d2596325c5f732805870e656c36ab3825bcefed5542343f76c363811c68507cc8463cf7
-EBUILD dropbox-147.4.4800.ebuild 2865 BLAKE2B 05f3927207125b61497a4ce3c6e76d4e0380bf5f06ef104942036b4663ba6862b64c3ac140753d0199df66aa2556cbb10eb149720bf219f220c7609df970bd11 SHA512 4da3e90183b7f79ce35e50e1b231cd1a3cfb9aeb4fbeafe4cbb922ba45e805e39c2fe91176d52dda7073ff0b8cf300069222fac35fa928fc88ecc936937204d5
-EBUILD dropbox-148.4.4519.ebuild 2867 BLAKE2B 5cb3cbee274db23705e0e5804036332e08450993fe1ffe41ad7ba97b6b85a772b02aed8c4eede759406c65892dd757e49dcccee9be56d66bf47eff1f046add30 SHA512 56e3830c2c7eb74129c91a014ad2ba605df87c5b6e5a98020e2d226375a5343e891c817685375eaf1cc3449d10e427ff5921192cbb3a5373a736781b6e175820
-EBUILD dropbox-150.4.5000.ebuild 2867 BLAKE2B 5cb3cbee274db23705e0e5804036332e08450993fe1ffe41ad7ba97b6b85a772b02aed8c4eede759406c65892dd757e49dcccee9be56d66bf47eff1f046add30 SHA512 56e3830c2c7eb74129c91a014ad2ba605df87c5b6e5a98020e2d226375a5343e891c817685375eaf1cc3449d10e427ff5921192cbb3a5373a736781b6e175820
+EBUILD dropbox-150.4.5000.ebuild 2865 BLAKE2B 05f3927207125b61497a4ce3c6e76d4e0380bf5f06ef104942036b4663ba6862b64c3ac140753d0199df66aa2556cbb10eb149720bf219f220c7609df970bd11 SHA512 4da3e90183b7f79ce35e50e1b231cd1a3cfb9aeb4fbeafe4cbb922ba45e805e39c2fe91176d52dda7073ff0b8cf300069222fac35fa928fc88ecc936937204d5
 MISC metadata.xml 336 BLAKE2B 0932d5cb97ca50abfbfd49b3b209733da73c94ed41ef1087e6c43c4e65f3a09186f74c507cf0db5d64a1c5231d3560a7d6a8bb6130e95e1d5dbb7f3974801df3 SHA512 25bee9aa1ab64f01bb4544dec14b4b98bcb3877714ec33c6cbed4cdd3362d2a4cab58f425cad3723398e4ee0a2ba16a550ab38ff9f974cd0c5046df1b34b5eb0
diff --git a/net-misc/dropbox/dropbox-147.4.4800.ebuild b/net-misc/dropbox/dropbox-147.4.4800.ebuild
deleted file mode 100644
index f43dae64fff9..000000000000
--- a/net-misc/dropbox/dropbox-147.4.4800.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop pax-utils systemd xdg
-
-DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="https://www.dropbox.com/"
-SRC_URI="
-	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
-	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )
-	https://www.dropbox.com/sh/42f8d4kq6yt5lte/AAD69lhaw6gy46W8HfQAm0GSa/Glyph/Dropbox/SVG/DropboxGlyph_Blue.svg
-"
-
-LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-linux"
-IUSE="selinux X"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/.*"
-QA_EXECSTACK="opt/dropbox/dropbox"
-
-BDEPEND="dev-util/patchelf"
-
-# Be sure to have GLIBCXX_3.4.9, #393125
-RDEPEND="
-	X? (
-		x11-themes/hicolor-icon-theme
-	)
-	selinux? ( sec-policy/selinux-dropbox )
-	app-arch/bzip2
-	dev-libs/glib:2
-	dev-libs/libffi-compat:6
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/wget
-	sys-libs/zlib
-	sys-libs/ncurses-compat:5
-	virtual/opengl
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libxcb
-"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}" || die
-	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
-	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
-	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
-	rmdir .dropbox-dist || die
-}
-
-src_prepare() {
-	default
-	# we supply all of these in RDEPEND
-	rm -vf libGL.so.1 libX11* libffi.so.6 || die
-	# some of these do not appear to be used
-	rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \
-		PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.*  \
-		wmctrl libdrm.so.2 libpopt.so.0 || die
-	if use X ; then
-		mv images/hicolor/16x16/status "${T}" || die
-	else
-		rm -vrf images || die
-	fi
-	patchelf --set-rpath '$ORIGIN' \
-		apex._apex.*.so \
-		nucleus_python.*.so \
-		tprt.*.so \
-		|| die
-	pax-mark cm dropbox
-	mv README ACKNOWLEDGEMENTS "${T}" || die
-}
-
-src_install() {
-	local targetdir="/opt/dropbox"
-
-	insinto "${targetdir}"
-	doins -r *
-	fperms a+x "${targetdir}"/{dropbox,dropboxd}
-	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
-
-	if use X; then
-		doicon -s 16 -c status "${T}"/status
-		newicon -s scalable "${DISTDIR}/DropboxGlyph_Blue.svg" dropbox.svg
-	fi
-
-	make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo"
-
-	newinitd "${FILESDIR}"/dropbox.initd dropbox
-	newconfd "${FILESDIR}"/dropbox.conf dropbox
-	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
-
-	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
-}
-
-pkg_postinst() {
-	einfo "Warning: while running, dropbox may attempt to autoupdate itself in"
-	einfo " your user's home directory.  To prevent this, run the following as"
-	einfo " each user who will run dropbox:"
-	einfo ""
-	einfo "install -dm0 ~/.dropbox-dist"
-}
diff --git a/net-misc/dropbox/dropbox-148.4.4519.ebuild b/net-misc/dropbox/dropbox-148.4.4519.ebuild
deleted file mode 100644
index 0c3e0f739306..000000000000
--- a/net-misc/dropbox/dropbox-148.4.4519.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop pax-utils systemd xdg
-
-DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="https://www.dropbox.com/"
-SRC_URI="
-	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
-	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )
-	https://www.dropbox.com/sh/42f8d4kq6yt5lte/AAD69lhaw6gy46W8HfQAm0GSa/Glyph/Dropbox/SVG/DropboxGlyph_Blue.svg
-"
-
-LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
-IUSE="selinux X"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/.*"
-QA_EXECSTACK="opt/dropbox/dropbox"
-
-BDEPEND="dev-util/patchelf"
-
-# Be sure to have GLIBCXX_3.4.9, #393125
-RDEPEND="
-	X? (
-		x11-themes/hicolor-icon-theme
-	)
-	selinux? ( sec-policy/selinux-dropbox )
-	app-arch/bzip2
-	dev-libs/glib:2
-	dev-libs/libffi-compat:6
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/wget
-	sys-libs/zlib
-	sys-libs/ncurses-compat:5
-	virtual/opengl
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libxcb
-"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}" || die
-	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
-	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
-	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
-	rmdir .dropbox-dist || die
-}
-
-src_prepare() {
-	default
-	# we supply all of these in RDEPEND
-	rm -vf libGL.so.1 libX11* libffi.so.6 || die
-	# some of these do not appear to be used
-	rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \
-		PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.*  \
-		wmctrl libdrm.so.2 libpopt.so.0 || die
-	if use X ; then
-		mv images/hicolor/16x16/status "${T}" || die
-	else
-		rm -vrf images || die
-	fi
-	patchelf --set-rpath '$ORIGIN' \
-		apex._apex.*.so \
-		nucleus_python.*.so \
-		tprt.*.so \
-		|| die
-	pax-mark cm dropbox
-	mv README ACKNOWLEDGEMENTS "${T}" || die
-}
-
-src_install() {
-	local targetdir="/opt/dropbox"
-
-	insinto "${targetdir}"
-	doins -r *
-	fperms a+x "${targetdir}"/{dropbox,dropboxd}
-	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
-
-	if use X; then
-		doicon -s 16 -c status "${T}"/status
-		newicon -s scalable "${DISTDIR}/DropboxGlyph_Blue.svg" dropbox.svg
-	fi
-
-	make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo"
-
-	newinitd "${FILESDIR}"/dropbox.initd dropbox
-	newconfd "${FILESDIR}"/dropbox.conf dropbox
-	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
-
-	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
-}
-
-pkg_postinst() {
-	einfo "Warning: while running, dropbox may attempt to autoupdate itself in"
-	einfo " your user's home directory.  To prevent this, run the following as"
-	einfo " each user who will run dropbox:"
-	einfo ""
-	einfo "install -dm0 ~/.dropbox-dist"
-}
diff --git a/net-misc/dropbox/dropbox-150.4.5000.ebuild b/net-misc/dropbox/dropbox-150.4.5000.ebuild
index 0c3e0f739306..f43dae64fff9 100644
--- a/net-misc/dropbox/dropbox-150.4.5000.ebuild
+++ b/net-misc/dropbox/dropbox-150.4.5000.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
+KEYWORDS="amd64 x86 ~x86-linux"
 IUSE="selinux X"
 
 RESTRICT="mirror strip"
diff --git a/net-misc/ntpsec/Manifest b/net-misc/ntpsec/Manifest
index caf007a3a88a..f09b974d87a5 100644
--- a/net-misc/ntpsec/Manifest
+++ b/net-misc/ntpsec/Manifest
@@ -15,6 +15,6 @@ EBUILD ntpsec-1.2.1-r2.ebuild 4434 BLAKE2B fc33f87243be18fe8ccf1faccc5aa261a1626
 EBUILD ntpsec-1.2.1-r3.ebuild 4683 BLAKE2B 9106135c2355acd4bfefb24c0b68fb6ab1300773fd7cf8aa9dda380b210b61c8f1cc42555c7571b292b2131bc39bf1c0e9b3f6b7a09a0e152fa025bad9aff1c7 SHA512 253294ff11133d62bc54fe5f5bdd3c6b25cecbf02fe84676f99e190d752343cbf5783111d85fc183097d9fcb956385ae0342beb5f0428ea851218a3e8652f360
 EBUILD ntpsec-1.2.1-r4.ebuild 4686 BLAKE2B 94e74b206caf561809b32b1e369f2fe77d133caddfdbd499b36858a5510a62afc43a9dd0ffde54ee98d18da88a70af049d7679fd0e3bd0e40fca682085e1a6ae SHA512 f3e165bf6fc6c4074d3182c22fdae1ce51fd36dfe3e91947f1bbaabcae032bd80b402fd4341a0e38b83c46adc40551678ba5f2b560ef073cd60ddb0fa53b21a9
 EBUILD ntpsec-1.2.1-r5.ebuild 4731 BLAKE2B db85ef6514e13677bb2c405600c002e8c969771c0ae61495a272792ffde4331fb4d5f8abb219489e2e4d3131608f21a0447a900bfa6f48c1cd55c3e16e5b0251 SHA512 eb81825a8d3fbac628729b9f322cc88c0d68715627149fadf31bae01407536b75253467380edda64ce40b9e97b9346f0a5a1f86a7e840d2b5a9afe36f8ae69ca
-EBUILD ntpsec-1.2.1-r6.ebuild 4409 BLAKE2B 7befb17010acb227f5dd5a2a81c7b38b4954f8aa40a6a69f1f5be6b0d800fe9e0087fc7b13163cef0e853f7a90ae4e45f17676351d485f566fa5233f78e290c9 SHA512 700fdc06fdb2961e1a8024bd73aaad5080cc9458189d9e8b762abfe7cc1ee04042f07763762b28285b98a949a52d4ccd951e9404291ec1d9d4d7efbdda54aec1
+EBUILD ntpsec-1.2.1-r6.ebuild 4409 BLAKE2B d37be9180a2a584aeef352ab11c83f5859395ab711498cc4a87a311cdefd868004b63d69b9e68c674555afa242da2f94cea3c4e06db5e502e13eb274dd5b8150 SHA512 1524761291dc772a219a9ee07d907f49915dd68ec12b4778904ab2c7896a067399e1ad7606451b0382445beb582475870a1c34a371b730a07a366118dc38834c
 EBUILD ntpsec-9999.ebuild 4168 BLAKE2B d92e57770bd9a46330ff6057de0a2706745c48a4bf0c53921065e70cd059266af78c6d48c551391f0535679a7cdca017e8227e6d54aea7e3ee6f20d469521f0d SHA512 2dcd85192a8359975483500e31c501fec3f40fbb9c93ce60503779b51de4256aad3e8a375ef19df3eaaa1ac683af77fafcce62e2fc6053ed58ea03dcdd7baada
 MISC metadata.xml 1902 BLAKE2B d807dc3dae199835bfa1624e76b43e39a1392f07d736ab5936c48bd4cfd69fdc1bae71a02c3cd9f405aa0992e7ebe27f5ffb639eafed027deba96eaa99ace391 SHA512 a29e4dfebcda69c393487ccfccdefd2b9e4e5c63591d2ed7c008b54b7c04afea071938fd2e0ce6c67f26ccecf427053b1a2b8e946dfcc3e092f64d00bc28aadf
diff --git a/net-misc/ntpsec/ntpsec-1.2.1-r6.ebuild b/net-misc/ntpsec/ntpsec-1.2.1-r6.ebuild
index 74844e4dbb14..d595a8ac6425 100644
--- a/net-misc/ntpsec/ntpsec-1.2.1-r6.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.2.1-r6.ebuild
@@ -125,7 +125,6 @@ python_test() {
 
 src_install() {
 	distutils-r1_src_install
-	python_optimize
 
 	# Install heat generating scripts
 	use heat && dosbin "${S}"/contrib/ntpheat{,usb}
@@ -158,6 +157,7 @@ src_install() {
 python_install() {
 	waf-utils_src_install --notests
 	python_fix_shebang "${ED}"
+	python_optimize
 }
 
 pkg_postinst() {
diff --git a/net-misc/omniORB/Manifest b/net-misc/omniORB/Manifest
index cac07b17284e..3d0cdc503a04 100644
--- a/net-misc/omniORB/Manifest
+++ b/net-misc/omniORB/Manifest
@@ -1,4 +1,6 @@
 AUX omniNames 571 BLAKE2B d1a151abb6faf582478e3892b7b057f92263fa0278cb3f3fb82fec20ba60b3e40733fcc2b223286466c9f4eb60fbe49cd9ce239f95e7e1cccb5b5b1df2e88893 SHA512 98f08cd0bef699bdd8da026efbf211c5bf8dfa5bb24bd4438581dd4acf6cbabdb42e19de5a5d8ae9db74bafea86fb316ff75f3278c255cab7277f95681578044
 DIST omniORB-4.2.4.tar.bz2 2713397 BLAKE2B 5759b2563dca421b9a994bb13c30ce6dd98324a2357c4908130a42ce5baec357b881c22b4dff27809607ebde27e7cd65305a91aa5cbdb6d68a19df1f36524e72 SHA512 0b142b127175f16f844823e5adf5593b290528646e13a4c30f6cbd92d159d3998a81b952717039c3f0e386f79404ddd18a3de35fc45fa88383d1d9e51064d988
+DIST omniORB-4.3.0.tar.bz2 2762061 BLAKE2B f9103080011a7e683b7e63f6553e8a60947820a331d7c4e3559c961a7f36b17e235c5808e7b282d0227343e6e794106b9f2b93bf138b1a919716d1338e1c9cc2 SHA512 b081c1acbea3c7bee619a288fec209a0705b7d436f8e5fd4743675046356ef271a8c75882334fcbde4ff77d15f54d2da55f6cfcd117b01e42919d04fd29bfe2f
 EBUILD omniORB-4.2.4.ebuild 2356 BLAKE2B a245ac15e187ed3a520ed6c41d3673dfacc72b9ba94e9b4764b932627fcaf1b5915aa5af80d737e69d15703b0d2ee0b589c43d508bb7897680e697538480149d SHA512 25d9491129305db575442b6d732530048ae24c411224098dcf5633efcb1747e98c2cd900f769fc1e92371d0298eb7c41322d63b7f45ebeca8df68c336dacc36c
-MISC metadata.xml 248 BLAKE2B 6b95a9a2c894490085abcf451cc5d598f356cb34085ae0a247c4c3d4943a472c947983bf2f90242bb949e09485f95a4f7a368593a24f1638606c2bbb9a12e8fa SHA512 b1b79973bfd62795feea524b26a30a5e00b230d3f6416f94cd912899d8b1e22aa3a78e71f8333382a19a41a112e21b0af17b88993b137a87c5b38f81028e6670
+EBUILD omniORB-4.3.0.ebuild 2338 BLAKE2B 81b4181cf5389a16caee3df78ff2087dd23d4d9de2bc1ade1e01614dbb3fbb290c87833cb6c9e24cf135fd7884df4cac7680dc96a1b5506a1e10e04f96e9789d SHA512 dc84d1bef1aa5aec6e9991aff4eb19a331c4d5b929491a6c9a301354017b84fc5f989f121d9630faf361e40ecb6da364012f8bb011d7a257e50ff44d8261d4b8
+MISC metadata.xml 480 BLAKE2B 18c6b730f8a61f23ca0141f021af7106bcb9d47d66b9bebccf2caecb242b01e9256458da34b2a76d6451ef5f19e926c4c0362ade9a0bfff0dc5384c2f2949de2 SHA512 ee60840029f943440643b41e21daf17edb0c74e56210ce753ffcd0628aa5fc3191101f4c1b53a9b275df78cb8afddcca9c82795ea632cc1e2946fd0e371b33d7
diff --git a/net-misc/omniORB/metadata.xml b/net-misc/omniORB/metadata.xml
index fb1b00f74288..2178b72656c8 100644
--- a/net-misc/omniORB/metadata.xml
+++ b/net-misc/omniORB/metadata.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!--maintainer-needed-->
-  <upstream>
-    <remote-id type="sourceforge">omniorb</remote-id>
-  </upstream>
+	<maintainer type="person" proxied="yes">
+		<email>aliens.satin0y@icloud.com</email>
+		<name>Thomas Juerges</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">omniorb</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/omniORB/omniORB-4.3.0.ebuild b/net-misc/omniORB/omniORB-4.3.0.ebuild
new file mode 100644
index 000000000000..2ba601fe4528
--- /dev/null
+++ b/net-misc/omniORB/omniORB-4.3.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit python-single-r1
+
+MY_P="${P/_p/-}"
+DESCRIPTION="A robust, high-performance CORBA 2 ORB"
+HOMEPAGE="http://omniorb.sourceforge.net/"
+SRC_URI="mirror://sourceforge/omniorb/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-2 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc ipv6 ssl"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	ssl? ( dev-libs/openssl:= )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	# The OPTC(XX)FLAGS variables aren't present in these files, but we
+	# will set them when we call emake.
+	sed \
+		-e 's/^CXXDEBUGFLAGS.*/CXXDEBUGFLAGS = $(OPTCXXFLAGS)/' \
+		-e 's/^CDEBUGFLAGS.*/CDEBUGFLAGS = $(OPTCFLAGS)/' \
+		-i mk/beforeauto.mk.in mk/unix.mk || \
+		die "failed to switch CFLAGS variables in the makefile includes"
+
+	# The out-of-source build is suggested by upstream.
+	mkdir build || die "failed to create build directory"
+}
+
+src_configure() {
+	cd build || die "failed to change into the build directory"
+
+	ECONF_SOURCE=".." econf \
+				--disable-static \
+				--with-omniORB-config=/etc/omniorb/omniORB.cfg \
+				--with-omniNames-logdir=/var/log/omniORB \
+				--libdir="/usr/$(get_libdir)" \
+				$(use_enable ipv6) \
+				$(use_with ssl openssl "/usr")
+}
+
+src_compile() {
+	cd build || die "failed to change into the build directory"
+	emake OPTCFLAGS="${CFLAGS}" OPTCXXFLAGS="${CXXFLAGS}"
+}
+
+src_install() {
+	cd build || die "failed to change into the build directory"
+	default
+
+	rm "${ED}/usr/bin/omniidlrun.py" || \
+		die "failed to remove redundant omniidlrun.py"
+
+	cd "${S}" || die "failed to change into the ${S} directory"
+
+	dodoc CREDITS doc/*.html ReleaseNotes.txt update.log
+	dodoc -r doc/omniORB
+
+	if use doc; then
+		dodoc doc/*.pdf
+	fi
+
+	cat <<- EOF > "${T}/90omniORB"
+		PATH="/usr/share/omniORB/bin/scripts"
+		OMNIORB_CONFIG="/etc/omniorb/omniORB.cfg"
+	EOF
+	doenvd "${T}/90omniORB"
+	doinitd "${FILESDIR}"/omniNames
+
+	cp "sample.cfg" "${T}/omniORB.cfg" || die
+	cat <<- EOF >> "${T}/omniORB.cfg"
+		# resolve the omniNames running on localhost
+		InitRef = NameService=corbaname::localhost
+	EOF
+	insinto /etc/omniorb
+	doins "${T}"/omniORB.cfg
+
+	keepdir /var/log/omniORB
+
+	python_optimize
+	python_fix_shebang "${ED}"/usr/bin/omniidl
+}
diff --git a/net-misc/r8125/Manifest b/net-misc/r8125/Manifest
index 95944c164d5b..fc75ee2c9cbb 100644
--- a/net-misc/r8125/Manifest
+++ b/net-misc/r8125/Manifest
@@ -1,4 +1,7 @@
 AUX r8125-9.008.00-linux-5.17.patch 4449 BLAKE2B d00d43f1efae664d02a5c8e7fb6716114bd6cc1b78a5b94f99ea72400f9e9c776eaed60c5dc0593b32857e73aa27883e971b570e7b561cad4b85db1d706194b1 SHA512 a3459c78d55561ae703977e147965b04aa854eff1035c273a703936e6f069d5d501c91cf1db746d0ef93dbfe61c3d28b5d35be34a4982fcbe9f0c42d9204b1bf
+AUX r8125-9.008.00-linux-5.18.patch 1247 BLAKE2B 47f7aa546b6df11b8e1a95ff4be4c6964120421026da8977d67da0050395e5f1cff64f5cdbba28da5f502eff95e3db728b1acc834b82a8d186843b7fd0a14964 SHA512 577c0c5b69f6b41b4474404abd99bb946939373612eb23e320a9c014011f643d173c1597ba6f60a8a350f4c095eeddd99ce837fe5da884320229b047616309df
 DIST r8125-9.008.00.tar.bz2 89622 BLAKE2B d1106086d1bca53484f8536072cddd506087b5d49983cbb91e921e86674c074b38c8a01cb51d2ea5793d8ffbff6e97ab05e48720ff00a805c4096a1d62a0cc30 SHA512 ff740a49fcc94b3de826f6299c489ed3f92ba9123ca2b2fe3c9035eecd16d518b6a4e6c2fa2531bb670c52097a52a0fb2fdf71b721efb20c83bb59d94d99c6c6
-EBUILD r8125-9.008.00.ebuild 1339 BLAKE2B f2c89508a6f3342eb2a55dca67a43e08da455a9d816ca70ea61dfe557c60676ed74423d5da8b1ab2e417da4ccefe42467d6a807f21a06b296e5f16177b68be9d SHA512 2933786074e2524225d3ecbb641e48b51bf593cbeef76ef18c26e6a74be004b67a8de77f81abbe0016d151239716e697c9783a709eca901b1d7e377491e38527
+DIST r8125-9.009.01.tar.bz2 89897 BLAKE2B 65f64f504cedc7244bdae10fd1638e031eb103f562cd71d32b5f36b15541704086df8cea16829b289e8be61bacf3de559616884d1672a4d6b8e47211816de8d3 SHA512 8b717447e2048df0d88d8350da2edb58f704e893498fbebea4aa2a3ac45ea050d70e73e78d41ab94562228b9c01e6fe59810c501c5bb880db446c05b9b6aee0d
+EBUILD r8125-9.008.00.ebuild 1399 BLAKE2B 59bb8848b09ee1ca476abbfbb156ded1e7cb3961aa287359aff792be2bd0b96b19d74a923ff545c3f6a53427c8536f190ee50d7ba837d5665e1d1e182f677b5c SHA512 45950f83abd6ac72475b58969c3c665eb7aa9fa31e7c6b4ec7aa356e06c58a5c5acc6287c23663a1b24902c8257907c6bb7c333df5370f4fbbc37d36d7a112ac
+EBUILD r8125-9.009.01.ebuild 1185 BLAKE2B b50ff489d98dd5fdf4fa8439c2414a47c71dab9782e3cc0eb052ef833bce84b34ed73dfae16abaaf24fbcaa6b4e9e6e3d4a60653092874c64169e861b80ceae4 SHA512 856ce45440f4e1d47c910588d5f88f85506dcffb01295e868c7033b85289f00fa6d9b2e7727f6c74cf33a7854640da06d4492c8b77cf141c9fb5da4c665b8b9a
 MISC metadata.xml 840 BLAKE2B 6fa88a6b1b49f0abd18ca64abf2ab93a04e89d51c66ebb602ca5070c56723fbe79e4a0fcfa49b4cc90e3ec904730c8e39b1a2159fcae0f036035d5696537a5a4 SHA512 f15e195ac564002f169610c0490f1f377716260e758241d5228a3b6c7d481de135c03a4da1e5c2eb121e4539a2abceabc3a4e1d26d8d987e093b981dd6eaea9f
diff --git a/net-misc/r8125/files/r8125-9.008.00-linux-5.18.patch b/net-misc/r8125/files/r8125-9.008.00-linux-5.18.patch
new file mode 100644
index 000000000000..6da1bdae6b6a
--- /dev/null
+++ b/net-misc/r8125/files/r8125-9.008.00-linux-5.18.patch
@@ -0,0 +1,31 @@
+Added compatibility with Linux Kernel 5.18+.
+
+Author: Karlson2k (Evgeny Grin)
+Gentoo bug: https://bugs.gentoo.org/852311
+
+diff --git a/src/r8125_n.c b/src/r8125_n.c
+
+--- a/src/r8125_n.c
++++ b/src/r8125_n.c
+@@ -11852,11 +11852,20 @@ rtl8125_init_board(struct pci_dev *pdev,
+ 
+         if ((sizeof(dma_addr_t) > 4) &&
+             use_dac &&
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0)
+             !pci_set_dma_mask(pdev, DMA_BIT_MASK(64)) &&
+             !pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64))) {
++#else  // LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0)
++            !dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)) &&
++            !dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64))) {
++#endif // LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0)
+                 dev->features |= NETIF_F_HIGHDMA;
+         } else {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0)
+                 rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
++#else  // LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0)
++                rc = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
++#endif // LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0)
+                 if (rc < 0) {
+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
+                         if (netif_msg_probe(tp))
+
diff --git a/net-misc/r8125/r8125-9.008.00.ebuild b/net-misc/r8125/r8125-9.008.00.ebuild
index 7b0093e09b81..b848421ede7e 100644
--- a/net-misc/r8125/r8125-9.008.00.ebuild
+++ b/net-misc/r8125/r8125-9.008.00.ebuild
@@ -22,6 +22,7 @@ IUSE="+multi-tx-q ptp +rss use-firmware"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-9.008.00-linux-5.17.patch" # bug 839282
+	"${FILESDIR}/${PN}-9.008.00-linux-5.18.patch" # bug 852311
 )
 
 CONFIG_CHECK="~!R8169"
diff --git a/net-misc/r8125/r8125-9.009.01.ebuild b/net-misc/r8125/r8125-9.009.01.ebuild
new file mode 100644
index 000000000000..2a1b7c235358
--- /dev/null
+++ b/net-misc/r8125/r8125-9.009.01.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info linux-mod
+
+DESCRIPTION="r8125 vendor driver for Realtek RTL8125 PCI-E NICs"
+HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software"
+
+SRC_URI="http://rtitwww.realtek.com/rtdrivers/cn/nic1/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+MODULE_NAMES="r8125(net:${S}/src)"
+BUILD_TARGETS="modules"
+IUSE="+multi-tx-q ptp +rss use-firmware"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-9.008.00-linux-5.18.patch" # bug 852311
+)
+
+CONFIG_CHECK="~!R8169"
+WARNING_R8169="CONFIG_R8169 is enabled. ${PN} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED."
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERNELDIR=${KV_DIR}"
+	BUILD_PARAMS+=" ENABLE_PTP_SUPPORT=$(usex ptp y n)"
+	BUILD_PARAMS+=" ENABLE_RSS_SUPPORT=$(usex rss y n)"
+	BUILD_PARAMS+=" ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n)"
+	BUILD_PARAMS+=" ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)"
+}
+
+src_install() {
+	linux-mod_src_install
+	einstalldocs
+}
diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest
index bb4240fadbf7..e227d6b331e1 100644
--- a/net-misc/spice-gtk/Manifest
+++ b/net-misc/spice-gtk/Manifest
@@ -3,6 +3,6 @@ AUX spice-gtk-0.39-fix-finding-pyparsing.patch 634 BLAKE2B 232f39c0762c23553952e
 DIST spice-gtk-0.39.tar.xz 845528 BLAKE2B c886c4c9f0e51d7f2bf6dbfe574f1a2bcab249f863cb7da1f009410572cdaa7a35ef98fc370a7e74f7e490ad3bfe8ffa832601f8bb0b0894b90ec1de76495ce9 SHA512 ff0f3ca6b10a2c415f2fa8d61464c5710aaa2a46c2c83909f146fa45f01151e756d9c3d79cb162dd3d0c1279b6ef55a67fc5c1266af2cb5b46ac1eaa0254c8d2
 DIST spice-gtk-0.40.tar.xz 848688 BLAKE2B 1046361ca40037bca826759bd7dc86f522640d39c08b1579f8e25bc2a2510665034445f7421d4de0485df9ef868e19779000c643035842f18e16555e3a1936b3 SHA512 b6db8b56c5c36158d97b3f7690d18883c4d6076e4ed1de1763fc704f9a2397b60d6170b70882d7d0a977b32be334756b7a27d66849f53e4d3b82abb8a54a0892
 EBUILD spice-gtk-0.39-r2.ebuild 3205 BLAKE2B 70c637fc3edd032462b4a5eef134d03e7f8b5805a96d0b3fa72fb1bae49aa2e49cd7db7b3c1f7399051a3a754aa96402cea83a5618313ca3e3fbefd8ee8a0e65 SHA512 6bc020c385e9ac49cb8f23d259c69d4c578377d9baa068885ac268ae4acb5c60dc4624bb1606aca0d14c8e31e49e3ff3a940716c2912eb867a0062630b1e0e4e
-EBUILD spice-gtk-0.40.ebuild 3602 BLAKE2B fcfa1ea409a318dccc4a0b929bddd059ee115b98067ee0bbaedea76c8e534294e936c8786294d0958977fe5fcb69fc38bde4616b2210397415c7f1f12cbcf108 SHA512 5881c799b0a535b43ece074289f8936e118ce4b5c387062fd315e5312c981d6bbd5b26f5ba2687fdb8a918e8834255dacbdb119e9f4a419f21cfde2af1116adc
-EBUILD spice-gtk-9999.ebuild 3608 BLAKE2B 70071ea7d3aaa1be358beeb2227b0141478a1ac41b1e15361de044f9cc4e4c708c74cf3c6844698627b394f9e4036619657a6187137fee15ae3f2ed1aaadcb78 SHA512 59e6c81d6593b6f4b356f65f7668c761c437316f538ab950f747fd90a524546e0313e8d9d27728b72d8c474e579ac5562e44681bd928276968a33eb999eb6d01
+EBUILD spice-gtk-0.40.ebuild 3668 BLAKE2B 7363180cd7de7fe721a557043a7858268abdbfea8e89e9c4528bcbac5820ee492cb43b198f771aaa9d410051bc3ae3a4f30e9b114f6a1bfd1d25f53b7c0db8eb SHA512 37501a0ac3359e2df1c815b2d58b88b9472e8ed5f0b9126bf5bd6f3e2f7f42f5cbe4bac5539cbe0c87aad43a12aebca54eac27f14775971e52ace1e0e69b4de1
+EBUILD spice-gtk-9999.ebuild 3668 BLAKE2B 7363180cd7de7fe721a557043a7858268abdbfea8e89e9c4528bcbac5820ee492cb43b198f771aaa9d410051bc3ae3a4f30e9b114f6a1bfd1d25f53b7c0db8eb SHA512 37501a0ac3359e2df1c815b2d58b88b9472e8ed5f0b9126bf5bd6f3e2f7f42f5cbe4bac5539cbe0c87aad43a12aebca54eac27f14775971e52ace1e0e69b4de1
 MISC metadata.xml 786 BLAKE2B 92848ffe7209398af8bb17b6ec7017474aac7abfd9b2d1babdf9724c909ab364c53d23115d46c7cfc316ac2014c56d89a80590924e5fa31302b9a9016783e30d SHA512 1de921c89ecdeeaf601d8a362f025ed636a4125152a5042e51ca7c54c1b0dbe479566ad9528913c24209ac4c22c94c7b8a927bf6e352ea8223c65408af3a7dfa
diff --git a/net-misc/spice-gtk/spice-gtk-0.40.ebuild b/net-misc/spice-gtk/spice-gtk-0.40.ebuild
index 612d9476b1d0..357e2deefa6d 100644
--- a/net-misc/spice-gtk/spice-gtk-0.40.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.40.ebuild
@@ -125,9 +125,11 @@ src_configure() {
 src_install() {
 	meson_src_install
 
-	# bug #775554
-	fowners root:root /usr/libexec/spice-client-glib-usb-acl-helper
-	fperms 4755 /usr/libexec/spice-client-glib-usb-acl-helper
+	if use usbredir && use policykit; then
+		# bug #775554 (and bug #851657)
+		fowners root:root /usr/libexec/spice-client-glib-usb-acl-helper
+		fperms 4755 /usr/libexec/spice-client-glib-usb-acl-helper
+	fi
 
 	make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;"
 	readme.gentoo_create_doc
@@ -135,5 +137,6 @@ src_install() {
 
 pkg_postinst() {
 	xdg_pkg_postinst
+
 	optfeature "Sound support (via pulseaudio)" media-plugins/gst-plugins-pulse
 }
diff --git a/net-misc/spice-gtk/spice-gtk-9999.ebuild b/net-misc/spice-gtk/spice-gtk-9999.ebuild
index 7e642d9ecb49..357e2deefa6d 100644
--- a/net-misc/spice-gtk/spice-gtk-9999.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-9999.ebuild
@@ -94,7 +94,7 @@ python_check_deps() {
 src_prepare() {
 	default
 
-	use vala && vala_src_prepare
+	use vala && vala_setup
 }
 
 src_configure() {
@@ -125,9 +125,11 @@ src_configure() {
 src_install() {
 	meson_src_install
 
-	# bug #775554
-	fowners root:root /usr/libexec/spice-client-glib-usb-acl-helper
-	fperms 4755 /usr/libexec/spice-client-glib-usb-acl-helper
+	if use usbredir && use policykit; then
+		# bug #775554 (and bug #851657)
+		fowners root:root /usr/libexec/spice-client-glib-usb-acl-helper
+		fperms 4755 /usr/libexec/spice-client-glib-usb-acl-helper
+	fi
 
 	make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;"
 	readme.gentoo_create_doc
@@ -135,5 +137,6 @@ src_install() {
 
 pkg_postinst() {
 	xdg_pkg_postinst
+
 	optfeature "Sound support (via pulseaudio)" media-plugins/gst-plugins-pulse
 }
diff --git a/net-misc/tigervnc-xorg-module/Manifest b/net-misc/tigervnc-xorg-module/Manifest
index c4bc50495dbe..4c70dd855c94 100644
--- a/net-misc/tigervnc-xorg-module/Manifest
+++ b/net-misc/tigervnc-xorg-module/Manifest
@@ -1,2 +1,2 @@
-EBUILD tigervnc-xorg-module-1.12.0.ebuild 448 BLAKE2B 05c8bf1baf50d7c5629c55084bcf33ac48b7dd587df83fadac060619b03d41cfd8d788b303821acde2af10b4e0d881c90fb1fc1cb59dc88661a7f79e74ad4264 SHA512 195ca1d9734bcaf0c310d2f80435f71707d29eb365d3924a7ac61fb83f494f6e91d1701b670d5b9efe3ae1a549a9cf46ed03125b6ab57138edc0471fa7bf1753
+EBUILD tigervnc-xorg-module-1.12.0.ebuild 443 BLAKE2B b5b3b191f1bbcf91079432278455515737ddfb498b2ce1e1e4c903aa061dac3d68931d2bb22a1cce863eaf8dba401b305c813c7aa726a24374625d5e19ab7b01 SHA512 19304fe99969891af13f4561df79cdaba28c05ae7e075880b28bffeb041c4caa37b43544801991a3fb46bff1b04a516e75a6307b89edf8ae57c2e96b253dffc7
 MISC metadata.xml 485 BLAKE2B 60d5a68107539d984a06565930cdf14edbe85d5f3a00d1879d3d3ec57b5b345918b2a2041fd549552f732434f63161ab55e792778f4d15e11e4cbb072ba94bd8 SHA512 d5caf47966a216eda3136a98617c9acec6a67365048b53e832edfeb5f9c8159804116826901087f2903c769076dbe09f60f2387bdae14712ce78bc6cbc7a4954
diff --git a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.12.0.ebuild b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.12.0.ebuild
index 07bcc43dc9ea..5813135ac84c 100644
--- a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.12.0.ebuild
+++ b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.12.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.tigervnc.org"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	~net-misc/tigervnc-${PV}[server]
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 3755cf3f96e0..bd6862b18900 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -7,6 +7,6 @@ DIST tigervnc-1.12.0-xserver-21.patch 3642 BLAKE2B 690860c51d9d2e4606b16318237f8
 DIST tigervnc-1.12.0.tar.gz 1561898 BLAKE2B 891934e48e3c4f2c36c280ad1562874d3c22ca3118e8eda2f68f9ad7cca978c76b8825100f540774b7a6553e981bd9264e0f717c8313585553741d31706cafad SHA512 a16b15e9cda552a49a3934e4174e49d186d06494d90d11582599ab82559014332662aed7760619a6dfb32a8c95f7d63c68ac7d632c29dd662a6b713f036672bb
 DIST xorg-server-21.1.1.tar.xz 4958508 BLAKE2B fadac208773700b91003ef18d46e6f2c6b501e59b7491c943f406641e9ff3837a8126034c023e9b6d2d4131ee438c1ef94fa458af1828d4be325519b47069a79 SHA512 8608ed9c1537c95e8a3adea5e3e372a3c5eb841f8e27c84283093f22fb1909e16a800006510da684b13f8f237f33b8a4be3e2537f5f9ab9af4c5ad12770eef0d
 EBUILD tigervnc-1.12.0-r5.ebuild 4907 BLAKE2B b3b7f361196e6b58fbfac738b45f6ac1a873eee1af28db51054856829cff620f75c06d44a24ebb0eeca2348873afe517f6451616b90620bd4a37eefdd1557f93 SHA512 a00d73c9212f8ffb8208a391ae5c375841cc525bb62091d90386b9d5d2c2356ab5e3936bc56e358f18f31240744ad3d4a7dff6c769bf893f989f0532618f6769
-EBUILD tigervnc-1.12.0-r6.ebuild 4874 BLAKE2B b80b1c8a9a15c39b7c09d93e568566cfdd6264b0caf9c954d9488bb792673a7049067ae189f4de233ffb1da5922c95c04518f7a958becc46ec70f5b45c97f6ff SHA512 ea1f1508a0a211c2a93227a063083fd46b285ca39a6dd4b63fb5d021aa05d6ee1e607bc632911b91da67c05471590c6e02d4d413dd8eb855f8237353e673f6f4
+EBUILD tigervnc-1.12.0-r6.ebuild 4869 BLAKE2B fcc19219cd2e0ee342688d559c8617ff5389175fea7207e644a4340edc0dcf513352a8d8bcace7337a826ae1903d16a7d5cbb647ef15340c95cf778beeee0036 SHA512 6e298bf5dd7753e9a7273a6fd9521d101db8dfe052d2c1c8c6812ce0be57e31f2eeea94cc11ad19d620e9deceab14e3c429de81127163232c8404ad7af9b7baa
 EBUILD tigervnc-9999.ebuild 4772 BLAKE2B 3178336b98683506997a61e608e808176ff1cda1146935f07036a8616a2bf9117a63cafb94155cb2389a79ce7a48a9139ffb18bc683d6aabe893d72ea6aa3b46 SHA512 0e7881455d578c887b5455c78786d0af3337ffdd149aeb837102a4ee7473ca127e0e6f92a676f6bdc2808f84102155ee3fe437c7a614763ea7cf8df15ccf830c
 MISC metadata.xml 706 BLAKE2B 221033648808798dd4d0be5db1374b76552a2a92eb5dc7b57f11c3feb7774e8fd85fd81f740753e3007bfd431fee4d4686210a5c1f2e967c2a67b76dfe03bb7f SHA512 f69cadf29c700280cae57028179c5e94eca3a3a71c82093bb7236e908d4407e149622aa39fc0a71ab25eab93a6250750cc95cdaa7ae933fd7f332de50250f845
diff --git a/net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild b/net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild
index 2bb25923bd56..5bbb399656a0 100644
--- a/net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="dri3 +drm gnutls java nls +opengl +server xinerama"
 REQUIRED_USE="
 	dri3? ( drm )
diff --git a/net-misc/turbovnc/Manifest b/net-misc/turbovnc/Manifest
index 5d3b298ef5a5..1441d0afdcd9 100644
--- a/net-misc/turbovnc/Manifest
+++ b/net-misc/turbovnc/Manifest
@@ -1,4 +1,7 @@
 AUX turbovnc-2.2.7-fix-musl-compilation.patch 1535 BLAKE2B d0a95f7bffef46da41bb1faf3de3b3c3651890e3653ccb2d961e11921bb25c6910f9d4a049e9b6d867d214e1e0310de22ec3c423424acbebe7be2437d2ffb2ab SHA512 94ba2b53e02e9b2e32f70f2cfb4dd0cfb733726bb31383462113681c95afff4823dc82302641773947ab5e71fe6547a9f233b25146d9cd292f08da66faf8f786
+AUX turbovnc-3.0-fix-musl-compilation.patch 936 BLAKE2B d0785023ecf0ffa4f1c1d4f09ad8669d04780bf7c7159da06caf4ee8b58c2b46268d55c6148de95b9bfc8d4c695e2571338aa90c65ee848e1cf5886ffb909309 SHA512 dbf30af408a921a73e3100e5f05639beea2466c02cb8b3b2c8c498e904ba33bc84f92541f1e7d03ac6ae8301afcdfa537101ea9efe3c52245e2470903b13a517
 DIST turbovnc-2.2.7.tar.gz 8789325 BLAKE2B 257a9c9b3793b40668bf2f3bd9839b3003364f9130699caa52beaec24b75cb054830ee1b1aa67a22eb6173afc9af99c51e45fa3fa52e050c78e5226466ce99ce SHA512 932faa645a71b825e467bdcdb4b872e961ad688c959beb0adbdd35d77969d856bb5c82b893afe8f6b0aa8be18cac3fa9192ce05074295c92a83f1a2344468788
+DIST turbovnc-3.0.tar.gz 8665757 BLAKE2B 98600dc1f4fd91b30c8c48f2e465aa4cb9c53190c08611374ed6e1ef59be585f1694a1c6827939dec9cf259bd0e9a8fbdea9194653f5a3c66eb97cca1e12b09b SHA512 baa5f62fa1d76a09dc16262d853598b9d9ba8a12f3804c27df6af4983700b4dc1ad7f981ea02e2dc4d36c29b0cd7a1d7a7a8c98b7ae971cbc688ca30fd5c19ec
 EBUILD turbovnc-2.2.7-r2.ebuild 2696 BLAKE2B a03f3d8f43871bdaedf3010b914e05580827a45579bca9c400a7bb533514956c920cde88fd67b9e0211a9df1b0c28f149791021e5854e0a913c5cdd7413cec59 SHA512 7b04acfbcb3e34c12c11baa36d11ed5de8a05a42bac8fc3068a1fde118999d0850fad349b7db92b6de3e44759f83bfc7e31e57c699b5460018979c8964ab86bb
+EBUILD turbovnc-3.0.ebuild 2059 BLAKE2B 524fb9f0d232ad10f834d929b55769f6c7f474ab7027b63f61588894bdadc9efe71c80709d761168df8e58b686e1b501655ebf4b3784fd4890fb32ac7cfcd52b SHA512 69517cdf41a87d09b2401565929313f0904496f80ff37085f9914e4ba80507dc98d5c6db78797a064aead0ef93bedf14b9d0d672404329fdac3f2951a4ac1237
 MISC metadata.xml 784 BLAKE2B 55a8bba421a15da5ed9401949b8e056b9c376030875bac0b28dece1a71f50c07010949bf82792129db82df98068061959a80c31093c8e91afb94cbdee0b2f020 SHA512 1e15fc8d88a46e7027eec5cdb8f8f7d6973f2ff1ea586ba6cf2d46a6d09050c6ba0ba94eaa9f59a8624a9885b8b25ec7a2977f1f4d71c02517bd8f681c05bec9
diff --git a/net-misc/turbovnc/files/turbovnc-3.0-fix-musl-compilation.patch b/net-misc/turbovnc/files/turbovnc-3.0-fix-musl-compilation.patch
new file mode 100644
index 000000000000..d96b7bc1ca28
--- /dev/null
+++ b/net-misc/turbovnc/files/turbovnc-3.0-fix-musl-compilation.patch
@@ -0,0 +1,20 @@
+See bug https://bugs.gentoo.org/836723
+
+The error is this:
+
+/var/tmp/portage/net-misc/turbovnc-2.2.7-r2/work/turbovnc-2.2.7/unix/Xvnc/programs/Xserver/os/access.c: In function 'GetLocalClientCreds':
+/var/tmp/portage/net-misc/turbovnc-2.2.7-r2/work/turbovnc-2.2.7/unix/Xvnc/programs/Xserver/os/access.c:1178:18: error: storage size of 'peercred' isn't known
+ 1178 |     struct ucred peercred;
+      |                  ^~~~~~~~
+
+--- ./unix/Xvnc/programs/Xserver/os/CMakeLists.txt~	2022-06-12 15:41:05.980270914 +0300
++++ ./unix/Xvnc/programs/Xserver/os/CMakeLists.txt	2022-06-12 15:43:14.113823213 +0300
+@@ -1,7 +1,7 @@
+ include_directories(../render ../../../lib/libsha1)
+ 
+ add_definitions(-DUNIXCONN -DTCPCONN -DHASXDMAUTH ${ServerOSDefines} -DXDMCP
+-	-DHAVE_SHA1_IN_LIBSHA1)
++	-DHAVE_SHA1_IN_LIBSHA1 -D_GNU_SOURCE)
+ if(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
+ 	add_definitions(-DLOCALCONN)
+ elseif(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux")
diff --git a/net-misc/turbovnc/turbovnc-3.0.ebuild b/net-misc/turbovnc/turbovnc-3.0.ebuild
new file mode 100644
index 000000000000..26c0c3cbe94e
--- /dev/null
+++ b/net-misc/turbovnc/turbovnc-3.0.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop java-pkg-opt-2
+
+DESCRIPTION="A fast replacement for TigerVNC"
+HOMEPAGE="https://www.turbovnc.org/"
+SRC_URI="https://sourceforge.net/projects/turbovnc/files/${PV}/${P}.tar.gz/download -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+ssl"
+
+COMMON_DEPEND="
+	app-arch/bzip2
+	media-libs/freetype
+	>=media-libs/libjpeg-turbo-2.0.0:=[java?]
+	sys-libs/pam
+	sys-libs/zlib
+	virtual/opengl
+	x11-apps/xauth
+	x11-libs/libfontenc
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXfont2
+	x11-libs/libxkbfile
+	x11-libs/pixman
+	x11-misc/xkeyboard-config
+	java? (
+		>=virtual/jdk-1.8:*
+		x11-libs/libXi
+	)
+	ssl? ( dev-libs/openssl:= )
+	!net-misc/tigervnc
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-apps/xkbcomp
+"
+DEPEND="
+	${COMMON_DEPEND}
+	x11-libs/xtrans
+"
+
+PATCHES=( "${FILESDIR}"/"${P}"-fix-musl-compilation.patch )
+
+src_prepare() {
+	use java && java-pkg-opt-2_src_prepare
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DTVNC_SYSTEMX11=ON
+		-DTVNC_SYSTEMLIBS=ON
+		-DTVNC_BUILDVIEWER=$(usex java)
+		-DTVNC_BUILDHELPER=$(usex java)
+		-DXKB_BIN_DIRECTORY=/usr/bin
+		-DXKB_DFLT_RULES=base
+	)
+
+	if use ssl ; then
+		# Link properly against OpenSSL to ensure
+		# we catch e.g. ABI change
+		# (i.e. don't dlopen it)
+		mycmakeargs+=(
+			-DTVNC_USETLS=OpenSSL
+			-DTVNC_DLOPENSSL=OFF
+		)
+	else
+		mycmakeargs+=( -DTVNC_USETLS=OFF )
+	fi
+
+	if use java ; then
+		export JAVACFLAGS="$(java-pkg_javac-args)"
+		export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use java ; then
+		java-pkg_dojar "${BUILD_DIR}"/java/VncViewer.jar
+		make_desktop_entry vncviewer "TurboVNC Viewer" /usr/share/icons/hicolor/48x48/apps/${PN}.png
+	fi
+
+	# Don't install incompatible init script
+	rm -rf "${ED}"/etc/init.d/ || die
+	rm -rf "${ED}"/etc/sysconfig/ || die
+
+	find "${ED}"/usr/share/man/man1/ -name Xserver.1\* -delete || die
+
+	einstalldocs
+}
diff --git a/net-misc/yt-dlp/Manifest b/net-misc/yt-dlp/Manifest
index e24d6b735568..b5ccbfe85140 100644
--- a/net-misc/yt-dlp/Manifest
+++ b/net-misc/yt-dlp/Manifest
@@ -1,5 +1,3 @@
-DIST yt-dlp-2022.4.8.tar.gz 2257195 BLAKE2B 1d83ef14900789d0af0fc80bafcd6d80ca3162ede818d74382598161014c1a4c4450c0cdf57cdc79f3c5e2970a46004619eeffa9dfdb0d7af128bbe2a023ebf8 SHA512 b2d865682ba44dbd168cd76089105fc1d7ff2d79ba884c9626b3a4009c05f07eccaed2b8801318e89e3e197affc70aad68c1813590eef2a5148ded9c037bf0ce
 DIST yt-dlp-2022.5.18.tar.gz 2277146 BLAKE2B 95237fcb12aef9d849e5cc5603baeb5b8e6f416db2dad04d8ea7408b966dcd0d05ad3e276342fb9cc3551293a569b48d2b806c360e95c9c96ffb17dff4cbeb9a SHA512 d0c11e6dba336124898e73234c5935386163af8a9dbbe3e2c38ec834ff631557a763e5224c30747dcffcf98364b95b7f1b6121c50ef91ed56653e2ce453548b5
-EBUILD yt-dlp-2022.4.8.ebuild 1885 BLAKE2B f3f160e116976414a446feaa719a6da7bc4a046044a0e7731776322b27a1b2f999c498ff03fde4ae275fae29af08147abad25b93845700bbf63d5543ed46fc68 SHA512 805bda576fb2a811bb92820bafda501b02e2365bafdd9454957cfb0757547a769869475adb39eab666d2168ffe4151c9ad99bfb9e9539201c4dd8151d7969239
 EBUILD yt-dlp-2022.5.18.ebuild 1824 BLAKE2B a5be6f4534e7476a6a89961e4e38ada99f9ebff77c673332cd1795646a59b3a267d29c514e9aeb4eec3344c8f203859920c19e3dccaa4cf1b7a882d6ded1f823 SHA512 6931b2c14a083ee20476a5ca0abfecf14639d3f1ab628c507352c77ffb255095e7614f0b9010d7a63ac35bbb36d04b5cf3a1a7dde72df586a8ea518a437ecf69
 MISC metadata.xml 505 BLAKE2B 520725078c47caf245904b10aab8929bf9a9a357a70315fda67e7dd59b77cb0c1614e7de03029772288aefa76678c7c4c97c7153364552f5ebe0f951df651e9f SHA512 af72cc5782fe5ed5a6748dcd7ebe7c9393ff7a9ad6d5a1a3a8c2824d323e86f1a97036745570790898fe9a51047601f9a4d95befc0e02b8c16822b7cc94e0734
diff --git a/net-misc/yt-dlp/yt-dlp-2022.4.8.ebuild b/net-misc/yt-dlp/yt-dlp-2022.4.8.ebuild
deleted file mode 100644
index 2ffa0d03e5d3..000000000000
--- a/net-misc/yt-dlp/yt-dlp-2022.4.8.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-inherit bash-completion-r1 distutils-r1 optfeature
-
-DESCRIPTION="youtube-dl fork with additional features and fixes"
-HOMEPAGE="https://github.com/yt-dlp/yt-dlp"
-SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-	!net-misc/youtube-dl[-yt-dlp(-)]"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# adjust requires for pycryptodome and optional dependencies (bug #828466)
-	sed -ri requirements.txt \
-		-e "s/^(pycryptodome)x/\1/" \
-		-e "/^(brotli.*|certifi|mutagen|websockets)/d" || die
-}
-
-python_test() {
-	epytest -m 'not download' -p no:markdown
-}
-
-python_install_all() {
-	dodoc README.md Changelog.md supportedsites.md
-	doman yt-dlp.1
-
-	dobashcomp completions/bash/yt-dlp
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins completions/fish/yt-dlp.fish
-
-	insinto /usr/share/zsh/site-functions
-	doins completions/zsh/_yt-dlp
-
-	rm -r "${ED}"/usr/share/doc/yt_dlp || die
-
-	newbin - youtube-dl <<-EOF
-		#!/usr/bin/env sh
-		exec yt-dlp --compat-options youtube-dl "\${@}"
-	EOF
-}
-
-pkg_postinst() {
-	optfeature "various features (merging tracks, streamed content)" media-video/ffmpeg
-	has_version media-video/atomicparsley || # allow fallback but don't advertise
-		optfeature "embedding metadata thumbnails in MP4/M4A files" media-libs/mutagen
-
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog 'A wrapper using "yt-dlp --compat-options youtube-dl" was installed'
-		elog 'as "youtube-dl". This is strictly for compatibility and it is'
-		elog 'recommended to use "yt-dlp" directly, it may be removed in the future.'
-	fi
-}
diff --git a/net-news/Manifest.gz b/net-news/Manifest.gz
index b0ea87707171..d8de4cbf3f9f 100644
Binary files a/net-news/Manifest.gz and b/net-news/Manifest.gz differ
diff --git a/net-news/sfeed/Manifest b/net-news/sfeed/Manifest
index a14e26360646..b139fa934776 100644
--- a/net-news/sfeed/Manifest
+++ b/net-news/sfeed/Manifest
@@ -1,5 +1,7 @@
 DIST sfeed-1.3.tar.gz 63037 BLAKE2B 30e3b8a82380b15230e895bc281d7c4ee33126269233fbc281e223b02976c236ca95d20764e0e30238149b97df44fbf197ea5003382774503ef1fad929835039 SHA512 858ebe0bf76f119a3b1a1b1bdf03a13b8085802bb796ae68f0a5ccb85e13747cc55498c29ef0443401678e56326bdef2bf9688966144e9581ff2cae486b729be
 DIST sfeed-1.4.tar.gz 64312 BLAKE2B 517c25eb28ba120e3d1bb564812fdfd6453741ddf09d60ca2f6b5c30bda15f17fc187302e803cc91937d3582116654f732a030a7aa17dfc9b234a0c858770674 SHA512 9187692076cad9029dd65c58c666972b8aeaefe90155ce9105af32803cdd0365c3b66fafcb5bee485d466126142a3a26f6f38cc9696531c2623b7e8963c578fb
+DIST sfeed-1.5.tar.gz 65067 BLAKE2B 0f2fbe263d869d396aae9a13c482d381d0e7201ca62b86f795bedd4e4174bea1959c16d1b63d534013e9a100527d6885122b9965e060773809912d299a9a573e SHA512 9a027b092620968bd6a086b37ce5bc3e2d5ee8193b59251466d5318bc1514ca78d3edf894c1988504c99b94f0bb3af2a54ba3067b2d90d1109665a5650bfd8a2
 EBUILD sfeed-1.3.ebuild 2145 BLAKE2B 61f2343cd1e3c1122cc718efdc8664f500e4f4d3764acd033a0669be3275a380163cec323c8c7b658d7f4386f1ceb5a6a48d3035045b867aef9cc802add4e981 SHA512 c0b229f2147f3cf8c5775ac67239b184d34ed74c5576525c9a3a8866242137b779f652dab204cd903b9a6a29dca285e1fe7db5375ef9fb729a744d55c13b163e
 EBUILD sfeed-1.4.ebuild 2132 BLAKE2B 7195461d20e235a937c6c765edde55f1f6c04d3a2c7ea0f3970319294826ae8258b9ea5844f951102e5bc95f5aae29eec667d65cbb4832f638a3a17f0399fe23 SHA512 4e01e16822eea08bac1015d0472372a975d22e4cda4ab077ef2e484592873af8351859efeb8ea4f854760c563faff5be5cdc6ca756d6c9eca08e3262a351afac
+EBUILD sfeed-1.5.ebuild 2132 BLAKE2B 7195461d20e235a937c6c765edde55f1f6c04d3a2c7ea0f3970319294826ae8258b9ea5844f951102e5bc95f5aae29eec667d65cbb4832f638a3a17f0399fe23 SHA512 4e01e16822eea08bac1015d0472372a975d22e4cda4ab077ef2e484592873af8351859efeb8ea4f854760c563faff5be5cdc6ca756d6c9eca08e3262a351afac
 MISC metadata.xml 800 BLAKE2B 21467934f1d8fb7f3b77e26daa8595a19d4a2d4e87aebfcffbefd367348668fec28eb560e98505c4f4cb7a479b5c2e5e1e9992a8b7d66ee651ed37895bda8aa9 SHA512 08fa61b54e15a3968f168a4a542a55a14d33ee539a67bfe4a58770d6b2a4553483fdd8889a436287462858b2d56f0022c14b71f7c7b1834092c4c4a9f92b7387
diff --git a/net-news/sfeed/sfeed-1.5.ebuild b/net-news/sfeed/sfeed-1.5.ebuild
new file mode 100644
index 000000000000..31103b5adee3
--- /dev/null
+++ b/net-news/sfeed/sfeed-1.5.ebuild
@@ -0,0 +1,78 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs savedconfig optfeature
+
+DESCRIPTION="simple RSS and Atom parser"
+HOMEPAGE="https://codemadness.org/sfeed-simple-feed-parser.html"
+SRC_URI="https://codemadness.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+
+THEMES=( mono{,-highlight} newsboat templeos )
+IUSE="+ncurses +${THEMES[@]/#/theme-}"
+REQUIRED_USE="ncurses? ( ^^ ( "${THEMES[@]/#/theme-}" ) )"
+
+DEPEND="ncurses? ( sys-libs/ncurses:= )"
+RDEPEND="${DEPEND}"
+BDEPEND="ncurses? ( virtual/pkgconfig )"
+
+src_configure() {
+	local name
+	for name in "${THEMES[@]}"; do
+		use "theme-${name}" && SFEED_THEME="${name//-/_}"
+	done
+
+	restore_config $(printf "themes/%s.h " "${THEMES[@]//-/_}")
+}
+
+src_compile() {
+	local ncurses_ldflags=""
+	use ncurses && ncurses_ldflags="$($(tc-getPKG_CONFIG) --libs ncurses || die)"
+
+	emake \
+		CC="$(tc-getCC)" \
+		RANLIB="$(tc-getRANLIB)" \
+		AR="$(tc-getAR)" \
+		SFEED_CURSES="$(usex ncurses "sfeed_curses" "")" \
+		SFEED_THEME="${SFEED_THEME}" \
+		SFEED_CURSES_LDFLAGS="${LDFLAGS} ${ncurses_ldflags}"
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		MANPREFIX="${EPREFIX}/usr/share/man" \
+		DOCPREFIX="${EPREFIX}/usr/share/doc/${PF}" \
+		SFEED_CURSES="$(usex ncurses "sfeed_curses" "")" \
+		install
+
+	save_config $(printf "themes/%s.h " "${THEMES[@]//-/_}")
+}
+
+pkg_postinst() {
+	local optmsg
+
+	if use ncurses; then
+		optmsg="yanking the URL or enclosure in sfeed_curses. "
+		optmsg+="See \$SFEED_YANKER to change it."
+		optfeature "${optmsg}" x11-misc/xclip
+
+		optmsg="plumbing the URL or enclosure in sfeed_curses. "
+		optmsg+="See \$SFEED_PLUMBER to change it."
+		optfeature "${optmsg}" x11-misc/xdg-utils
+	fi
+
+	optmsg="converting HTML content via sfeed_content. "
+	optmsg+="See the ENVIRONMENT VARIABLES section in the man page to change it."
+	optfeature "${optmsg}" www-client/lynx
+
+	optmsg="fetching feeds. Used by sfeed_update as default. "
+	optmsg+="See OVERRIDE FUNCTIONS section on sfeedrc manpage to change it."
+	optfeature "${optmsg}" net-misc/curl
+}
diff --git a/net-news/snownews/Manifest b/net-news/snownews/Manifest
index c7b19d8891a6..0629e3321bc0 100644
--- a/net-news/snownews/Manifest
+++ b/net-news/snownews/Manifest
@@ -1,3 +1,5 @@
+AUX snownews-1.9-no-which.patch 1023 BLAKE2B 58cc7a8d643e7d7a7cdcd6d91274f19500509832ea48417a50dcbc7679d49a21a47c91ef0e81a00341d10a4b4ef27fee64a85548372a0adcb2ad7e9cff92a7e7 SHA512 95d9ea476c20931bc986c0ef1a9d0b6e71de6f131a083060902e143d21195bd61446a12230df7e8f7c79195dada97a9519d2166472edf265e3eff662bb30a07b
 DIST snownews-1.9.tar.gz 149935 BLAKE2B 331c94964a617871df8ab0ed7c8b36acea9386e7cb5057232dc5e93d148f04b56e64af96b9a212469115592d4509cba641bf183e927bddc9e12baff9f3936f20 SHA512 f833dbb41b5c0215c034b8388d787398360fac0ec9670f8f31b76c3ee2ffd974b4c6ebebc30aebb539b9904f513628124b393f4f473a92d4969f483caeca8596
+EBUILD snownews-1.9-r1.ebuild 969 BLAKE2B 51908cb2945d26b2c754eecd1ce706569a99d8e90cfcc4bb8c1915d52045d126da82a798a90cc42b91e8746a9d2be877da5feefa2720550ee312ee6d4172bce5 SHA512 c2461b5788f3ee9b8bd5d34ba00fe3833c05293d82538c4c128b2e70841ca970b34f7a68b4f62d15764ab47f85b8f94ba1797f9a385e4192cdc6d8c598f9be50
 EBUILD snownews-1.9.ebuild 901 BLAKE2B 8b8f43e73a1d81e321665e0609518b45e3e2bd61eb0e49db7900132877f5bf4cbc69ab4720979a8ac5ea615aeba83eea8485545c6c36f339d0e0588f2328f5f6 SHA512 ec024729790d45753c53de5cf9f8017d080b82d26fb5444581076f0a3546c836c12ca3586950ec20d07420cc6c3453df195d4fdc0375e4976c699a8c936aa9b7
 MISC metadata.xml 394 BLAKE2B 515ca6f962ff0fd4c3b57b0af00bb61e79b2a9f640d441ea5ad60c298780ce0ae8f9e090fe26d5293627448062cbd8bd78db844e923d61ad0db4644e1410b0bf SHA512 3492dae90b43f94860e1c6d08868d238a60ff13ea060bc6ec7619698d4a8830de6354d67b40b7459149e585209dfd886a94474b92191212f275ae974cc2abf1e
diff --git a/net-news/snownews/files/snownews-1.9-no-which.patch b/net-news/snownews/files/snownews-1.9-no-which.patch
new file mode 100644
index 000000000000..84335e93711b
--- /dev/null
+++ b/net-news/snownews/files/snownews-1.9-no-which.patch
@@ -0,0 +1,30 @@
+https://bugs.gentoo.org/844901
+--- a/configure
++++ b/configure
+@@ -164,7 +164,7 @@ s/@builddir@/\$\{TMPDIR\}\/make/g"
+ 
+ #### Find programs and libs ##########################################
+ 
+-# Programs found using which
++# Programs found using command -v
+ for i in $progs; do
+     pname=$(expr $i : '\([^=]*\)')
+     pcall=$(expr $i : '[^=]*=\([^=]*\)')
+@@ -172,7 +172,7 @@ for i in $progs; do
+     # First check if an environment variable is set
+     [ -n "$ppath" ] && sub "s/@$pname@/$ppath/g"
+     # Check if the program exists
+-    ppath=$(which $pcall 2>/dev/null)
++    ppath=$(command -v $pcall 2>/dev/null)
+     [ -n "$ppath" ] && [ -x "$ppath" ] && sub "s/@$pname@/$pcall/g"
+ done
+ # If nothing found in first loop, set the first pair anyway
+@@ -183,7 +183,7 @@ for i in $progs; do
+ done
+ 
+ # Packages found using pkg-config
+-pkgconfig=$(which pkg-config 2>/dev/null)
++pkgconfig=$(command -v pkg-config 2>/dev/null)
+ if [ -n "$pkgconfig" ] && [ -x "$pkgconfig" ]; then
+     faildeps=""
+     for i in $pkgs; do
diff --git a/net-news/snownews/snownews-1.9-r1.ebuild b/net-news/snownews/snownews-1.9-r1.ebuild
new file mode 100644
index 000000000000..da5e7bfd6e0a
--- /dev/null
+++ b/net-news/snownews/snownews-1.9-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Command-line RSS feed reader"
+HOMEPAGE="https://github.com/msharov/snownews"
+SRC_URI="https://github.com/msharov/snownews/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	dev-libs/libxml2
+	dev-libs/openssl:=
+	net-misc/curl
+	sys-libs/ncurses:=[unicode(+)]
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9-no-which.patch
+)
+
+src_prepare() {
+	default
+
+	tc-export CC
+
+	# Disable stripping in the build system - leave it to the package manager
+	sed -i -e '/ldflags/s/-s/-g -rdynamic/' -e '/cflags/s/-g0/-g/' Config.mk.in || die
+}
+
+src_configure() {
+	econf "$(use_with debug)"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 9e59d06d1ce9..12c75d116b58 100644
Binary files a/net-p2p/Manifest.gz and b/net-p2p/Manifest.gz differ
diff --git a/net-p2p/nicotine+/Manifest b/net-p2p/nicotine+/Manifest
index ee0e42c5109d..31b8ffe738ec 100644
--- a/net-p2p/nicotine+/Manifest
+++ b/net-p2p/nicotine+/Manifest
@@ -7,5 +7,5 @@ EBUILD nicotine+-2.2.2.ebuild 837 BLAKE2B 275ed5b79caeb4a8a6090c25ea3a6ad43e0360
 EBUILD nicotine+-3.1.1.ebuild 837 BLAKE2B da3b55c3ca0285ad172f542556f95b43c3e3c185428f3e1769567f3814f55f89602e5a0596bdfd641c9db0bf1d205d98a90906f09b33cba3ee31d021fd1e35a4 SHA512 daf7ed4ae4353eee61f4132d3c31ad93f14614d8870451ed0b678b1f9bc2b6253114e3ea259b01c1f6023b9347916f311763093ddeec4e371bee731fb4e1db74
 EBUILD nicotine+-3.2.0.ebuild 837 BLAKE2B da3b55c3ca0285ad172f542556f95b43c3e3c185428f3e1769567f3814f55f89602e5a0596bdfd641c9db0bf1d205d98a90906f09b33cba3ee31d021fd1e35a4 SHA512 daf7ed4ae4353eee61f4132d3c31ad93f14614d8870451ed0b678b1f9bc2b6253114e3ea259b01c1f6023b9347916f311763093ddeec4e371bee731fb4e1db74
 EBUILD nicotine+-3.2.1.ebuild 837 BLAKE2B da3b55c3ca0285ad172f542556f95b43c3e3c185428f3e1769567f3814f55f89602e5a0596bdfd641c9db0bf1d205d98a90906f09b33cba3ee31d021fd1e35a4 SHA512 daf7ed4ae4353eee61f4132d3c31ad93f14614d8870451ed0b678b1f9bc2b6253114e3ea259b01c1f6023b9347916f311763093ddeec4e371bee731fb4e1db74
-EBUILD nicotine+-3.2.2-r1.ebuild 927 BLAKE2B c60945ff89079bc4b8d24f96c71d766594606a916fec436c03e0530f82695eb83ffab241792e60f16051bd43ccb751cb63946ff1e3600b77d7d084304d3182b3 SHA512 17920b9d794caf786525dc499f0eee7d9366b4b2f511a95f4b06646a668de52438c749fb69598d2a251c2120352a28e76e4c0d7f5041e7e42b17bd845acd38e9
+EBUILD nicotine+-3.2.2-r1.ebuild 925 BLAKE2B 3d71cabcb5e4824122b46bee4849a68935b82feb035868cc820f37ffee466a1fca9a763d5e60ecb9f356c67a6dadee6ba5db893ab0b60f68af8e0cc54fdcf670 SHA512 a9a1eb8d47fa50beb44d72fb30cf11940ea4856c3d733f11d8bbc8a0831f68a2fdc9df7725094dfc1aca59a51aac5a0e40360015281e9380257b4a74ec66adde
 MISC metadata.xml 345 BLAKE2B 511ecb1a01b9dd891b37d035ec3a7e7835de48f147fd851e256a3c2cdfb356018f91c14a07f7ca4cf6f96ece8728454917fc02f70081ccaf142c32e8368a6a38 SHA512 a885286829ac4ddf04ccf11a9105d2b5ab5862a8a84eedaa547da4cf0c53b5b1c4957fe40826df87b23fd6de7f514a5dbf374b9f87f761c5f17385769a07dd8d
diff --git a/net-p2p/nicotine+/nicotine+-3.2.2-r1.ebuild b/net-p2p/nicotine+/nicotine+-3.2.2-r1.ebuild
index 3e03dc006a73..cc9c130b97f3 100644
--- a/net-p2p/nicotine+/nicotine+-3.2.2-r1.ebuild
+++ b/net-p2p/nicotine+/nicotine+-3.2.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Nicotine-Plus/nicotine-plus/archive/${PV}.tar.gz ->
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}"
diff --git a/net-p2p/transmission/Manifest b/net-p2p/transmission/Manifest
index 5dabe73af13b..b65c2a4808c5 100644
--- a/net-p2p/transmission/Manifest
+++ b/net-p2p/transmission/Manifest
@@ -5,7 +5,7 @@ AUX transmission-daemon.confd.4 735 BLAKE2B bc4c06dcf4a12282d36d446537ae8d3a461a
 AUX transmission-daemon.initd.10 1707 BLAKE2B 57857fa0b628f0c49ebaf13544b366bf9db39c70f31556a21262556ad89657a7f13c84e19f882839e4bc10f2b8afef96aa51f833478e38f215499244ca8b388b SHA512 30d9fe7d06ca3c92ff436e9bbe84729a5b343b52965f8d1d3d43f14f5fa25881dbc9676c5d3d916cff552aad5872ed41c2930e9ce3a5f7c958dbeec0d1ab1ac4
 AUX transmission-daemon.service.conf 69 BLAKE2B 6e38a28f54366850ae794896f2954c3af77afead303197c49970873fa604d6b375e71122de8d3645f9fcc8abed4f696ac257bd59ba87ebdc5cdd5839d32c0a7b SHA512 3dc02be596296fc1efbf1bc690be3953709af00c230f55db4d067ff592d87e1a465faa4067bc15d65a8a27fed2cf07d108abb2ed45fc76b47b0642ce2e182946
 DIST transmission-3.00.tar.xz 3995080 BLAKE2B fb1be44aa630e6a1cf15511ab4ab40156edb16f9410b83058c53548f466fb9502c23157756a29e921e4468db1ebac7832b755cfcf98451c663c64401559f5498 SHA512 c8fb96086ba4b18f04d6181a29f6e2af85864840c533f3470a202dfa686e9431caeccd25f12c975a9a8f9b7802ca0bd73c4edc1ca06bdbada682326cad188a76
-EBUILD transmission-3.00-r1.ebuild 3221 BLAKE2B 2f1e00ac4ed9b4ea681b34a7cb96d26ba0838f6d179bf83df3bf456cb4e97332e8298c160d6be3df76aced2aa70f36e9580766e6a2ced7533fd47b999f3b968e SHA512 6f87a0be3c0d505b0123dddf18a0ef90a604dc8c7b633cc950351df2a3f43050f1c2640057f563360128b58dba48eebe58ae1d06be16697b254bce73d0e00f34
-EBUILD transmission-3.00-r4.ebuild 3245 BLAKE2B b9bd4ebdf681ec27b5d948af9e6a04dd9bf32e81f9e5f991ee05a753559baf7fa735a3109a8f6438d23b8528e49dbde88b736962bbd7428c0dcdce3f92a88caa SHA512 a88a2c5683a0005e3eb60121071eb6b02f7e7e57457721ce3eb41a4f92f0b4f75dc2a851b451dabfcd9832a43f6bf87d3924a64abed458b1102cd7ebc5526337
-EBUILD transmission-9999.ebuild 3323 BLAKE2B 026acc07b35c8633a0f1ad82ec5908954732ab1ba310a2faf486c67c4d3c070f49d8922441cc230cddf183bed56c6a20b00880190619c3063064f19cd3583991 SHA512 91b35d43568e5c15e17782ca0f7fce9e7ce6639ebe3d67201a4392299c6373dcc52be93c86365db1a6949dd72d3c246ca81ccfbea0db311651b66b175f81702f
+EBUILD transmission-3.00-r1.ebuild 3202 BLAKE2B c093e0c41e133eb3e160e000aa11a1d770838c8854487eba439dd14f07ba426eda023b051102cf0df12b9a9bcdc4f4b6a1f492d4d0ab5c82d99d615f243bcc74 SHA512 4b01a479eb014d6fea216531bfaead80e85c911c5edabc33ae4da1cfc638303a76cf2856c2b744c5d2e1752b4ac770c83464fda5807b3fb6eecca872a47c8513
+EBUILD transmission-3.00-r4.ebuild 3226 BLAKE2B 04fd2f070ebce9d65cc8974881d7a1d429aecc13154f84924bfdd621241109ab4f7355e1712468157d09fb462d8aae8899eb2ff9bbd8c4d0740e208bf50bd9b7 SHA512 44d8084d18275708b774b15706eaba29be35cdce8dc1e71495801050540ebb6ecfb385ea0d8ac3ff2c2eac46587dcc7da09c4e0d35ac50f8fdcc8efe2e0e0dc4
+EBUILD transmission-9999.ebuild 3304 BLAKE2B b79c9371aceca10fe011a3c1e627c23e008eee02eaab1946cbaa968146022ddeada4bda8d6888120e033ed0c30c6df93f48ca6aa74d06ff18652885ededddaf6 SHA512 9ca215784353b02b2441cc6d860faed16cf30f9453df6f5703eae56b0bab75dbc807a8aec8fb17e56545148a925c7ca67a7fcd4b8adc43a0d215f4684cd3e00c
 MISC metadata.xml 564 BLAKE2B 708f42109f5c57d776242ad935684b78a7f6cc72c439e2bb76d2fb29fb770f5054c6765df0665244c650bc930eeb312957f4749967a9b2771b8a6d032767d3b0 SHA512 22f2e75b57b24f1367cdcfe28600cfa09dab9d741ff1ab84a25052dc455272b9d9d6d62d297bdbd23e9955d41cabb540f0348c0554c465371e81175525be1ddb
diff --git a/net-p2p/transmission/transmission-3.00-r1.ebuild b/net-p2p/transmission/transmission-3.00-r1.ebuild
index bf200a7a2c74..0c0ebb69824e 100644
--- a/net-p2p/transmission/transmission-3.00-r1.ebuild
+++ b/net-p2p/transmission/transmission-3.00-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/transmission/transmission"
 else
 	SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux"
+	KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="A fast, easy, and free BitTorrent client"
diff --git a/net-p2p/transmission/transmission-3.00-r4.ebuild b/net-p2p/transmission/transmission-3.00-r4.ebuild
index 9b4ded7eca6e..6065a88c228a 100644
--- a/net-p2p/transmission/transmission-3.00-r4.ebuild
+++ b/net-p2p/transmission/transmission-3.00-r4.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/transmission/transmission"
 else
 	SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="A fast, easy, and free BitTorrent client"
diff --git a/net-p2p/transmission/transmission-9999.ebuild b/net-p2p/transmission/transmission-9999.ebuild
index 29752a1fc96f..d5a07df0a9a8 100644
--- a/net-p2p/transmission/transmission-9999.ebuild
+++ b/net-p2p/transmission/transmission-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/transmission/transmission"
 else
 	SRC_URI="https://github.com/transmission/transmission-releases/raw/master/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 fi
 
 DESCRIPTION="A fast, easy, and free BitTorrent client"
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 2d422227ae7d..3846775ce82f 100644
Binary files a/net-print/Manifest.gz and b/net-print/Manifest.gz differ
diff --git a/net-print/cnijfilter2/Manifest b/net-print/cnijfilter2/Manifest
index 06bb00e4b6e1..cd4b9605ac02 100644
--- a/net-print/cnijfilter2/Manifest
+++ b/net-print/cnijfilter2/Manifest
@@ -2,5 +2,5 @@ AUX cnijfilter2-5.70-gentoo.patch 1786 BLAKE2B 96c0f8b919dbc896c7b749ef52cc1c6f3
 AUX cnijfilter2-5.80-cflags.patch 475 BLAKE2B 18cee126ff7bc58cce31e22bccbc220b3f3a149dce1d3e68a070739a08715d6093cb41e6db12bc8a3ade0d9e73ea18d9ed1b666c84f8364d263bf585a666c60f SHA512 ca36f72b0a4f5a1e9fa7c57722a55b3eb5f907fd86cdb92ec27cd1f8cd6bdba6f27b50612eb03c774d823a17598fcb475b1ea9fdba10b6de5d0acd575ddee07e
 AUX cnijfilter2-5.80-fno-common.patch 486 BLAKE2B 688d66202fddd0afeb757e7933fbf38af6cb65ee3a805e8af75a0c8c6bbf9e6951d2b5376c0204830c457a77d06d3f942a420496b98aafafe6df42f651b1da41 SHA512 fd5a21de395e93975b2118c06a6957de85157e4cac8b3c473f48f00cbd56e7178b59c03396ece47f21f49414eb7acdff53952469dca5498b875e0c488af80b53
 DIST cnijfilter2-source-5.90-1.tar.gz 1707084 BLAKE2B 3df5786785b12c410f4ae72e1d20fcd7686e0b8de60e7a713392076c2cd9edc1bd3d7f7494712ec6a4f50197fdb79e4cb708fcbe5f3b9e38cb3353e74cc8291a SHA512 d31f5133b6f81114d46cb067779260d5d74b5616e6e1b3924ef9db0db233fbb2b16132f7a003342e2ed14742c3123c644619dc1d5c93bca5d16425a77d45c632
-EBUILD cnijfilter2-5.90.ebuild 1825 BLAKE2B 928db61a0f4fde99e817d99e645f0046567ee2ffde897e2e2cd194c3514927f40a357f5600ac29d91438e8f9d86caee1ac077dd7b8129677f7bd6a9e1bc2878e SHA512 2b130c886c08fe38d7565e3c88c33022c1e23cb4818d25aa4c7b049553d7c73104697686355f3c1f4e7827557b81abcb7221276f53794eb3e7c5fe28a3830547
+EBUILD cnijfilter2-5.90.ebuild 1823 BLAKE2B 75dd8111a2cd69e59819e82bdd8d1b597ce39a951fc11ccbff51bb9ff18cdcd29540f83d3611bb3a638e5d5e81d3ed7f626f4d77da15cfbeae5a123f5a439459 SHA512 4a33e1354daf5e7b1d4ac0a9c3e19ae7c26d6cef8a97436b29e2cbb5d54fa548776c945728c25498c884042084de03b09cd0d10d7c72ae975397692ee59f3f45
 MISC metadata.xml 248 BLAKE2B a52f1b42e34917354d5d99824d47adca0f36afbe44b9f3398cc819976181e5b067ffc621d3d02f337cc080dbb8676864fd6ae0e5b48736a124687eeea01e11ba SHA512 7524a042ca62db175429683f3aee96e272e324d3e26f9d8c28d1737c5784b72962338d49dfeb28e172d171d55e46b9b889ac471eb3a26a0b58a0b3b20fb1d0b9
diff --git a/net-print/cnijfilter2/cnijfilter2-5.90.ebuild b/net-print/cnijfilter2/cnijfilter2-5.90.ebuild
index e687d7cce0cd..45b4aee3bda3 100644
--- a/net-print/cnijfilter2/cnijfilter2-5.90.ebuild
+++ b/net-print/cnijfilter2/cnijfilter2-5.90.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -66,7 +66,7 @@ src_prepare() {
 }
 
 src_configure() {
-	econf --enable-progpath="${EPREFIX}/usr/bin" LDFLAGS="-L"${S}"/${LIBDIR} ${LDFLAGS}"
+	econf --enable-progpath="${EPREFIX}/usr/bin" LDFLAGS="-L${S}/${LIBDIR} ${LDFLAGS}"
 }
 
 src_install() {
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index d5e95c089fb2..bdf2171467f8 100644
Binary files a/net-proxy/Manifest.gz and b/net-proxy/Manifest.gz differ
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 475fa3a59192..8371d48aca75 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -13,13 +13,13 @@ EBUILD haproxy-2.2.17.ebuild 5356 BLAKE2B 3e66fd23b24ac10f251ca4c0b20b9fc7f51c55
 EBUILD haproxy-2.2.21.ebuild 5358 BLAKE2B 74e840c6a726c6c00e26de01e8ed0e9923a7a7623a9984a67a5d2322fe7be38eb26559cce3fc1bcfadeb00246e42c0ed076a2b2662776f596e14a8f9ab1f5d12 SHA512 2049483a3f1eb1907573fcb134d9cfff2b27dc50a45df9025c3e734a1bde76d4cc7f5c0affdf52877889d267b32bb1fcc402dd1f8d9338004e9aac2aac879dd7
 EBUILD haproxy-2.2.24.ebuild 5333 BLAKE2B 8814d4213f00ee1a095d88361e4ec82530f29e6b2c616cd5953dbfb2a1a5e286f83c5995e6344e0f49cd1a9b057cc31ab9b68034587ff716e09d97227f1eb4f2 SHA512 359a68d2054f4260d0b375d46e19ba391aee72e6cbe5e51e8c098916b42e229372830668bccf44935eea81f01848d76751df85a00f10de74df0a86785b624490
 EBUILD haproxy-2.2.9999.ebuild 5333 BLAKE2B 8814d4213f00ee1a095d88361e4ec82530f29e6b2c616cd5953dbfb2a1a5e286f83c5995e6344e0f49cd1a9b057cc31ab9b68034587ff716e09d97227f1eb4f2 SHA512 359a68d2054f4260d0b375d46e19ba391aee72e6cbe5e51e8c098916b42e229372830668bccf44935eea81f01848d76751df85a00f10de74df0a86785b624490
-EBUILD haproxy-2.4.14.ebuild 5595 BLAKE2B 2c7a17200dd15b6ef8bc59f42914e1dfe4ffd74ab8aec5c2d3d3ecd889bf253581df48455a0620e33cc0874913dc3ad77e93aef62a4472b98de927054091e286 SHA512 b69000bb71d34920f46d981750e840af9c2cb89dc42cec9c3201cfdf1e8f2bd7358fd78810d7fc6a5e1c0fc6c91688f1d427485d86a388e1d9aae36cbb0f6c7b
-EBUILD haproxy-2.4.17.ebuild 5563 BLAKE2B 8199d8f64a3c48447ce0d0dcc0456178aae13ac678a7c676978b74d049e481db6431dc8e651b318b9c94c3df119a760ed4771bfc17e23f9caa77c6642c2248dc SHA512 d735985a274c1a3101a9ac7929b5640074530122047c6442aaf3c92cd74219e1e8687503189f82753d11877a268e66814a201267820f34fe58be655ed54e959c
-EBUILD haproxy-2.4.9999.ebuild 5563 BLAKE2B 8199d8f64a3c48447ce0d0dcc0456178aae13ac678a7c676978b74d049e481db6431dc8e651b318b9c94c3df119a760ed4771bfc17e23f9caa77c6642c2248dc SHA512 d735985a274c1a3101a9ac7929b5640074530122047c6442aaf3c92cd74219e1e8687503189f82753d11877a268e66814a201267820f34fe58be655ed54e959c
-EBUILD haproxy-2.5.4.ebuild 5595 BLAKE2B 2c7a17200dd15b6ef8bc59f42914e1dfe4ffd74ab8aec5c2d3d3ecd889bf253581df48455a0620e33cc0874913dc3ad77e93aef62a4472b98de927054091e286 SHA512 b69000bb71d34920f46d981750e840af9c2cb89dc42cec9c3201cfdf1e8f2bd7358fd78810d7fc6a5e1c0fc6c91688f1d427485d86a388e1d9aae36cbb0f6c7b
-EBUILD haproxy-2.5.7.ebuild 5563 BLAKE2B 8199d8f64a3c48447ce0d0dcc0456178aae13ac678a7c676978b74d049e481db6431dc8e651b318b9c94c3df119a760ed4771bfc17e23f9caa77c6642c2248dc SHA512 d735985a274c1a3101a9ac7929b5640074530122047c6442aaf3c92cd74219e1e8687503189f82753d11877a268e66814a201267820f34fe58be655ed54e959c
-EBUILD haproxy-2.5.9999.ebuild 5563 BLAKE2B 8199d8f64a3c48447ce0d0dcc0456178aae13ac678a7c676978b74d049e481db6431dc8e651b318b9c94c3df119a760ed4771bfc17e23f9caa77c6642c2248dc SHA512 d735985a274c1a3101a9ac7929b5640074530122047c6442aaf3c92cd74219e1e8687503189f82753d11877a268e66814a201267820f34fe58be655ed54e959c
+EBUILD haproxy-2.4.14.ebuild 5603 BLAKE2B fe8ce7c4e262f9c7ec28b0409192a4165eaba2beb70eaea23affe3623eb0c977a6402dfca1bc70e48e09441a8918caed2632c63855963799eb8d9cb3b07dbf10 SHA512 2d10f3f0aebc2ca6d8cb0835a5b58a37d74b19850e80be1b819256a330bd1d14666fddcd8f0f80551cd426e015953f44d4cabcf95fccc8b95bae9b7d41f91a97
+EBUILD haproxy-2.4.17.ebuild 5571 BLAKE2B 4a356c40d93c8f3aa2c88cb37bbe541fa897ab0fe0b7bb88302288c7b988d68e08f71a74f63a007b4fe5e701ffd74b44afd40ee8f7574f1d56ddce2259ab858d SHA512 33371bd457ddbfbd4e63d36a08841a1567ecac63cbebbc318fda193b634899deb6471b1c17e235655bd6152138f8360d7ddf1751d578b6e736233d181dde40bd
+EBUILD haproxy-2.4.9999.ebuild 5571 BLAKE2B 4a356c40d93c8f3aa2c88cb37bbe541fa897ab0fe0b7bb88302288c7b988d68e08f71a74f63a007b4fe5e701ffd74b44afd40ee8f7574f1d56ddce2259ab858d SHA512 33371bd457ddbfbd4e63d36a08841a1567ecac63cbebbc318fda193b634899deb6471b1c17e235655bd6152138f8360d7ddf1751d578b6e736233d181dde40bd
+EBUILD haproxy-2.5.4.ebuild 5603 BLAKE2B fe8ce7c4e262f9c7ec28b0409192a4165eaba2beb70eaea23affe3623eb0c977a6402dfca1bc70e48e09441a8918caed2632c63855963799eb8d9cb3b07dbf10 SHA512 2d10f3f0aebc2ca6d8cb0835a5b58a37d74b19850e80be1b819256a330bd1d14666fddcd8f0f80551cd426e015953f44d4cabcf95fccc8b95bae9b7d41f91a97
+EBUILD haproxy-2.5.7.ebuild 5571 BLAKE2B 4a356c40d93c8f3aa2c88cb37bbe541fa897ab0fe0b7bb88302288c7b988d68e08f71a74f63a007b4fe5e701ffd74b44afd40ee8f7574f1d56ddce2259ab858d SHA512 33371bd457ddbfbd4e63d36a08841a1567ecac63cbebbc318fda193b634899deb6471b1c17e235655bd6152138f8360d7ddf1751d578b6e736233d181dde40bd
+EBUILD haproxy-2.5.9999.ebuild 5571 BLAKE2B 4a356c40d93c8f3aa2c88cb37bbe541fa897ab0fe0b7bb88302288c7b988d68e08f71a74f63a007b4fe5e701ffd74b44afd40ee8f7574f1d56ddce2259ab858d SHA512 33371bd457ddbfbd4e63d36a08841a1567ecac63cbebbc318fda193b634899deb6471b1c17e235655bd6152138f8360d7ddf1751d578b6e736233d181dde40bd
 EBUILD haproxy-2.6.0.ebuild 5554 BLAKE2B d154b64099f67f7347e760cc8babedb166224d7d28e28c9e917742290d5038b6b28c55def2c510fdaa2817a8c9f5e95600b2a95e59bd9008f7d3d290ef1eed1a SHA512 1d3684c6f83d9b6682e6b38eefe1d5cbea375cd223520af80440af70bb535e171548d9ecb4ede2d92e603ad14d652703ed24d28efa373600af85bcd5683c4f1c
 EBUILD haproxy-2.6.9999.ebuild 5554 BLAKE2B d154b64099f67f7347e760cc8babedb166224d7d28e28c9e917742290d5038b6b28c55def2c510fdaa2817a8c9f5e95600b2a95e59bd9008f7d3d290ef1eed1a SHA512 1d3684c6f83d9b6682e6b38eefe1d5cbea375cd223520af80440af70bb535e171548d9ecb4ede2d92e603ad14d652703ed24d28efa373600af85bcd5683c4f1c
-EBUILD haproxy-9999.ebuild 5554 BLAKE2B d154b64099f67f7347e760cc8babedb166224d7d28e28c9e917742290d5038b6b28c55def2c510fdaa2817a8c9f5e95600b2a95e59bd9008f7d3d290ef1eed1a SHA512 1d3684c6f83d9b6682e6b38eefe1d5cbea375cd223520af80440af70bb535e171548d9ecb4ede2d92e603ad14d652703ed24d28efa373600af85bcd5683c4f1c
+EBUILD haproxy-9999.ebuild 5562 BLAKE2B 99a462ab68c63a26165e9c4cca9100aba5f85aaacf372639a689b9b3ed641420a3174e326d115a41c5cd2742c5866826184f11d935f4736a36887430d60df317 SHA512 8cf43a9530428c10aad8f508e23510a60fd20c7512f685b67b9eb70962c1582a943b4443d4589d1a8fd442ecf83ba4df3c280bb54029227d6d91d7d319f6ec08
 MISC metadata.xml 2063 BLAKE2B ddd51cff72847b617a457ac2baee4dd18a90a6a23e0982bc932ab8d3d101312dc2265884d38fcdc1a1cbb3d982b078e5b03a3c13fce07568d9d477688d210b09 SHA512 2198d3735f32f9c22787b1b43fd59bd6a0018ae25e104ee34ce0f27682ad8d6405a37c1c890b5eb41deabe5a5011d07d379e5df780bd8ab2877bd435bb875a1e
diff --git a/net-proxy/haproxy/haproxy-2.4.14.ebuild b/net-proxy/haproxy/haproxy-2.4.14.ebuild
index 931074ca6e03..177ad6df9650 100644
--- a/net-proxy/haproxy/haproxy-2.4.14.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.14.ebuild
@@ -99,15 +99,15 @@ src_compile() {
 	fi
 
 	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
-	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]}
-	emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) SBINDIR=/usr/sbin
+	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
+	emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) SBINDIR=/usr/sbin
 
 	if use tools ; then
 		for extra in ${EXTRAS[@]} ; do
 			if [ "${extra}" = "admin/halog" ]; then
-				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} admin/halog/halog
+				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
 			elif [ "${extra}" = "dev/hpack" ]; then
-				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
+				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
 			else
 				# Those two includes are a workaround for hpack Makefile missing those
 				emake -C ${extra} \
diff --git a/net-proxy/haproxy/haproxy-2.4.17.ebuild b/net-proxy/haproxy/haproxy-2.4.17.ebuild
index 959a7a9dac4f..2b772750ef60 100644
--- a/net-proxy/haproxy/haproxy-2.4.17.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.17.ebuild
@@ -97,15 +97,15 @@ src_compile() {
 	fi
 
 	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
-	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]}
-	emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) SBINDIR=/usr/sbin
+	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
+	emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) SBINDIR=/usr/sbin
 
 	if use tools ; then
 		for extra in ${EXTRAS[@]} ; do
 			if [ "${extra}" = "admin/halog" ]; then
-				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} admin/halog/halog
+				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
 			elif [ "${extra}" = "dev/hpack" ]; then
-				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
+				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
 			else
 				# Those two includes are a workaround for hpack Makefile missing those
 				emake -C ${extra} \
diff --git a/net-proxy/haproxy/haproxy-2.4.9999.ebuild b/net-proxy/haproxy/haproxy-2.4.9999.ebuild
index 959a7a9dac4f..2b772750ef60 100644
--- a/net-proxy/haproxy/haproxy-2.4.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.9999.ebuild
@@ -97,15 +97,15 @@ src_compile() {
 	fi
 
 	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
-	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]}
-	emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) SBINDIR=/usr/sbin
+	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
+	emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) SBINDIR=/usr/sbin
 
 	if use tools ; then
 		for extra in ${EXTRAS[@]} ; do
 			if [ "${extra}" = "admin/halog" ]; then
-				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} admin/halog/halog
+				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
 			elif [ "${extra}" = "dev/hpack" ]; then
-				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
+				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
 			else
 				# Those two includes are a workaround for hpack Makefile missing those
 				emake -C ${extra} \
diff --git a/net-proxy/haproxy/haproxy-2.5.4.ebuild b/net-proxy/haproxy/haproxy-2.5.4.ebuild
index 931074ca6e03..177ad6df9650 100644
--- a/net-proxy/haproxy/haproxy-2.5.4.ebuild
+++ b/net-proxy/haproxy/haproxy-2.5.4.ebuild
@@ -99,15 +99,15 @@ src_compile() {
 	fi
 
 	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
-	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]}
-	emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) SBINDIR=/usr/sbin
+	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
+	emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) SBINDIR=/usr/sbin
 
 	if use tools ; then
 		for extra in ${EXTRAS[@]} ; do
 			if [ "${extra}" = "admin/halog" ]; then
-				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} admin/halog/halog
+				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
 			elif [ "${extra}" = "dev/hpack" ]; then
-				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
+				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
 			else
 				# Those two includes are a workaround for hpack Makefile missing those
 				emake -C ${extra} \
diff --git a/net-proxy/haproxy/haproxy-2.5.7.ebuild b/net-proxy/haproxy/haproxy-2.5.7.ebuild
index 959a7a9dac4f..2b772750ef60 100644
--- a/net-proxy/haproxy/haproxy-2.5.7.ebuild
+++ b/net-proxy/haproxy/haproxy-2.5.7.ebuild
@@ -97,15 +97,15 @@ src_compile() {
 	fi
 
 	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
-	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]}
-	emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) SBINDIR=/usr/sbin
+	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
+	emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) SBINDIR=/usr/sbin
 
 	if use tools ; then
 		for extra in ${EXTRAS[@]} ; do
 			if [ "${extra}" = "admin/halog" ]; then
-				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} admin/halog/halog
+				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
 			elif [ "${extra}" = "dev/hpack" ]; then
-				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
+				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
 			else
 				# Those two includes are a workaround for hpack Makefile missing those
 				emake -C ${extra} \
diff --git a/net-proxy/haproxy/haproxy-2.5.9999.ebuild b/net-proxy/haproxy/haproxy-2.5.9999.ebuild
index 959a7a9dac4f..2b772750ef60 100644
--- a/net-proxy/haproxy/haproxy-2.5.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.5.9999.ebuild
@@ -97,15 +97,15 @@ src_compile() {
 	fi
 
 	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
-	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]}
-	emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) SBINDIR=/usr/sbin
+	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
+	emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) SBINDIR=/usr/sbin
 
 	if use tools ; then
 		for extra in ${EXTRAS[@]} ; do
 			if [ "${extra}" = "admin/halog" ]; then
-				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} admin/halog/halog
+				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
 			elif [ "${extra}" = "dev/hpack" ]; then
-				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
+				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
 			else
 				# Those two includes are a workaround for hpack Makefile missing those
 				emake -C ${extra} \
diff --git a/net-proxy/haproxy/haproxy-9999.ebuild b/net-proxy/haproxy/haproxy-9999.ebuild
index 9b0bc07daa75..53a61ef08341 100644
--- a/net-proxy/haproxy/haproxy-9999.ebuild
+++ b/net-proxy/haproxy/haproxy-9999.ebuild
@@ -97,15 +97,15 @@ src_compile() {
 	fi
 
 	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
-	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]}
-	emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) SBINDIR=/usr/sbin
+	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
+	emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) SBINDIR=/usr/sbin
 
 	if use tools ; then
 		for extra in ${EXTRAS[@]} ; do
 			if [ "${extra}" = "admin/halog" ]; then
-				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} admin/halog/halog
+				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
 			elif [ "${extra}" = "dev/hpack" ]; then
-				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
+				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
 			else
 				# Those two includes are a workaround for hpack Makefile missing those
 				emake -C ${extra} \
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index d65894ea49b8..0e18f05f76fe 100644
Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ
diff --git a/net-wireless/dump1090/Manifest b/net-wireless/dump1090/Manifest
index ae220792fcfd..b5eb04194966 100644
--- a/net-wireless/dump1090/Manifest
+++ b/net-wireless/dump1090/Manifest
@@ -2,12 +2,13 @@ AUX dump1090-5.0-32bit-fix.patch 610 BLAKE2B cca8cab42380856503831c59cfec13f9961
 AUX dump1090-5.0-further-32bit-fix.patch 1742 BLAKE2B 2cc502d6a88f4dd79a70efca538a8daaf9bbfa0cb122f7ae562943112b635ce19ca01197a4dce79bf0f81bbc5339f340534cfc6e7223510b6877c38f513212b1 SHA512 b3c3d3c8f63a1c3c149f5e44164c43b00d56829fe89a51ecbffc07fe201b7e88df9a49499c0d52add2f2a5d15f3ee80e7c4d287e863ca34453966487f2f7a587
 AUX dump1090-5.0.confd 927 BLAKE2B 144a8c2f51ba714b7c41a50ae58e893c1cfa2e9494a962c9033201c09fc889411b4b868b16934521709fe7402e593767be77ad6c43c0a4b4a9fba8b231756f58 SHA512 930267650aedb8012c2a92c1555d318789cf29ab42568109a9935a7d83a13fba4482cffff91b27062f74d9fde514e95060e0a53cb9438d39ede292ea9ca15b90
 AUX dump1090-5.0.initd 372 BLAKE2B f4e1ca0db565f56c104401b221af77966f499ad00f1fba5c804ee529fbc61fd75149c3d2d503d4a5e119784fcc10998ebbbad80cb09c1a27dba804a0d8a86c24 SHA512 0f9717d3f161658aefcd29f135bd3401bb539a0e83f40fdacf7326b48a96782d211dde1fc9237a822ee3d09a8b5b17ab22da63f6e93aceb526ff22c02eaa300e
+AUX dump1090-6.1-libdir.patch 586 BLAKE2B 20d358289b55e9f1ae11904b74035b8f1ba61061c741e7b71bf449350b255a630c1468b604f1ac98e02632346f26c5f8d7f34a00765e1b1a73dd232ab0a39e6d SHA512 470d8840b3da26f2bbb8be24f36ba17457a28d9b63080ea1483693b78e86ca38f69687a45209baf6767bac1e206bf62bd392024e9963926d4044fcf88e1fc5c6
 AUX tmpfilesd-dump1090-5.0.conf 212 BLAKE2B 081b8340377a40adbb3a9dfa87ede06729979ad50a138cb3caf6b0dac55203222df6c71714103c096b6fbdcd2b115dd2c40bd767b7e5ff1dd0360addc021882a SHA512 d44170620addbc3590d524ae540c38be31115d22f69fd55a075877ab482c0bbcdfe86e2eac3c3007c5476408c18623a0e179fadd2247beab01d1df296d7467b6
 DIST dump1090-4.0.tar.gz 6663754 BLAKE2B bf0a6c8dfd8b2da5ed0e7ae5f7b862c57a54e5d48bc24b29e42ebffec4e0606604fbe4b8502e85df60a3a618568bf9e2eba88e5ad2fdec7fb93043b823435362 SHA512 97dc872e4d0ac8df2f46e17b590e970a62a78baf81e18a9beeb23d37a4401a2e52591ca96cc01e1465b22aa234cf9e88f84a7b0f27d0144b3afeac62f6252c95
 DIST dump1090-5.0.tar.gz 10124422 BLAKE2B d6b26a444f73cccd002558b6863431537078e1fe9f61e4e240d4a5f06181b9ff713387aad623c2ee8257c2568bd4dd373746606c356ac3ff0f27f411d4949997 SHA512 1104982308db788993bf5dc130a5ca369c8bfaaae56cd5a435bbd22ed99b0633594789334d7f256bad2b288c4906923baf8bc73e2f7b7f9f52f7068b9b519142
 DIST dump1090-6.1.tar.gz 9879362 BLAKE2B 716c1abe6df7958fb5ec94c35ed6af75fdb6180a56cdfba72443a7b34d1614cede6ec29aaac22a1e15f31d05bf1d1971eebccdff21cf9442ae69617e7c535ae6 SHA512 5f20d52f1fda754e33774faab852252d802ae5da8694e768cbf92df56f7693cd2da788df9e0a422f1801603e62498fb0af0143f5ea3292e9d607296cd5983dc2
 EBUILD dump1090-4.0.ebuild 1250 BLAKE2B acd1dc457eced589b99528333cdbfa5bb0c29bacac3cb0eb18c6daaa902f3c5f498c7c6a6810c83f92155b87f6e3511fd87d1dff51fb46e462b48af47fa66948 SHA512 27c238ddb2d0d2223f1cbc286c0bf6860706d6ef6c76902af25c3c542deb6382ac71c5ab2f9b8576b2d0906633bd1acb72b6ba870f8cb62b9b353d96818cc5d9
 EBUILD dump1090-5.0.ebuild 2626 BLAKE2B dececa48e1b48005a4855cd056977490a1e0d6bdc412463b777ad006e3c96f74648e17362801b74ee9b751e38d58ff184390bd3c1142f8699b909677fc25c73d SHA512 36765019ee228703a9fc6798323323cf685a5647c8bac66557e095203b7e3ea3042ef8e7ee62f0d8897a53d09e5f90120a4a642ed4a2c0fb1e6b434a4dd513c1
-EBUILD dump1090-6.1.ebuild 2535 BLAKE2B 5560a564b3dbf4e3d89441afa783aa9f00e463dc68e11a3f6036ee18e81844477f3aaa79330ac61da5c381f81f355bd67e90e4b70e2fa987eb52d317ce555cd4 SHA512 e4f883236856a078c28fadddab095a2da894ad165ff0a200fdefd94b33dc3b1d54c0afc8942ae36fdfb1683e48ff977cc1fc0b8dd03703be8ec6d069abc49743
+EBUILD dump1090-6.1.ebuild 2586 BLAKE2B 8360ea1d8c8dee1320b39b9433c41c7a290f702f7ed32c4efd70cd0394eb98eef1c30068cf5f88aa27b7fde8a9829cb0e6b83e8a2733ef26ff55459ef1fae39b SHA512 4cfc533960815cdd2bae4c858be7788e2823a44c5d430f144bf3feebcdb43cab3dd9052c7d7e5ce866b3d5bcb749a768cf80f7df65bc217577a5f75a24846810
 EBUILD dump1090-9999.ebuild 2535 BLAKE2B 5560a564b3dbf4e3d89441afa783aa9f00e463dc68e11a3f6036ee18e81844477f3aaa79330ac61da5c381f81f355bd67e90e4b70e2fa987eb52d317ce555cd4 SHA512 e4f883236856a078c28fadddab095a2da894ad165ff0a200fdefd94b33dc3b1d54c0afc8942ae36fdfb1683e48ff977cc1fc0b8dd03703be8ec6d069abc49743
 MISC metadata.xml 658 BLAKE2B 6dd0aec90915a420b69849188a8b29211db8cad5824442d4c1d1c07cf1bd88c4d477a3fa35481b745c2dbfd7ea1c8459751cc2c037932430d230a6f24ccfbb64 SHA512 fb0c280c0bf81c614f91ff9a4dad532ac61db9419c48e335e86ed37a592183fd8181fe0f6ade7e165a16e734b1be50b05db57efc1f1b27c01ec38be68565a61d
diff --git a/net-wireless/dump1090/dump1090-6.1.ebuild b/net-wireless/dump1090/dump1090-6.1.ebuild
index 04ee546dcf91..0d8aaf94604b 100644
--- a/net-wireless/dump1090/dump1090-6.1.ebuild
+++ b/net-wireless/dump1090/dump1090-6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,6 +28,10 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1-libdir.patch
+)
+
 src_prepare() {
 	default
 	sed -i -e '/CFLAGS/s# -O3 -g -Wall -Wmissing-declarations -Werror -W # #' Makefile || die
diff --git a/net-wireless/dump1090/files/dump1090-6.1-libdir.patch b/net-wireless/dump1090/files/dump1090-6.1-libdir.patch
new file mode 100644
index 000000000000..b55fa95d2ea3
--- /dev/null
+++ b/net-wireless/dump1090/files/dump1090-6.1-libdir.patch
@@ -0,0 +1,16 @@
+diff --git a/Makefile b/Makefile
+index d4a5ff6..5d69505 100644
+--- a/Makefile
++++ b/Makefile
+@@ -99,9 +99,9 @@ ifeq ($(RTLSDR), yes)
+   ifdef RTLSDR_PREFIX
+     CPPFLAGS += -I$(RTLSDR_PREFIX)/include
+     ifeq ($(STATIC), yes)
+-      LIBS_SDR += -L$(RTLSDR_PREFIX)/lib -Wl,-Bstatic -lrtlsdr -Wl,-Bdynamic $(LIBS_USB)
++      LIBS_SDR += -Wl,-Bstatic -lrtlsdr -Wl,-Bdynamic $(LIBS_USB)
+     else
+-      LIBS_SDR += -L$(RTLSDR_PREFIX)/lib -lrtlsdr $(LIBS_USB)
++      LIBS_SDR += -lrtlsdr $(LIBS_USB)
+     endif
+   else
+     # some packaged .pc files are massively broken, try to handle it
diff --git a/net-wireless/gr-ieee802154/Manifest b/net-wireless/gr-ieee802154/Manifest
index 527031ef0a5f..150caba3029f 100644
--- a/net-wireless/gr-ieee802154/Manifest
+++ b/net-wireless/gr-ieee802154/Manifest
@@ -1,4 +1,4 @@
 DIST gr-ieee802154-0.0_p20200812.tar.gz 94491 BLAKE2B bfea628afb191fa88b2ffba7b99bccb05c5bc22e4799db85082ec5d0f1ccb98826a1aca728e8e5c096cd78d11ea7cf2b8ddf46b1783b33f2bd87da75d8f25c84 SHA512 5e012980436b7fff7226bbd9897b0eeceff60fa678fb41c4a83e59cd10b8d441eda2b378fa5d5767e0f24980863a6a756f5457e5cae346827481eb089fa719a9
-EBUILD gr-ieee802154-0.0_p20200812.ebuild 1404 BLAKE2B 389de76b31ba32d07a0ba071a5e8fdf6e1a175ac3a26df2fd9493b549c2fc8df6cb90bcbe21be5661b72363094473bf62339fc28a3a1038c11626fd78d09a452 SHA512 7de3085c26ccccce865117266fce2734b40183186c69f338e854d0cc81698a56670498227f4a17d7cd23e96c9106a74dffbffef014e353652ed9df4a578c8d18
+EBUILD gr-ieee802154-0.0_p20200812.ebuild 1406 BLAKE2B 5d4c3ca51054754733df35d33fff2547c92d9f10b6b0ad6222d02436bb61a4b2a7c607d895dfcd1865f8de49fbfeee3aca6ec221eadf743eb843c37b87a6c536 SHA512 15307a39d39759d2df744f4c19dcc648826edd06496056e09a167b24c390990ceff2c4334a29076ee406b58b1c4e416bf7046a30c8ebc89fbe2664c4450add95
 EBUILD gr-ieee802154-9999.ebuild 1404 BLAKE2B 389de76b31ba32d07a0ba071a5e8fdf6e1a175ac3a26df2fd9493b549c2fc8df6cb90bcbe21be5661b72363094473bf62339fc28a3a1038c11626fd78d09a452 SHA512 7de3085c26ccccce865117266fce2734b40183186c69f338e854d0cc81698a56670498227f4a17d7cd23e96c9106a74dffbffef014e353652ed9df4a578c8d18
 MISC metadata.xml 327 BLAKE2B 2c9e8d4809ade74a47f5ec1e0f208345c49edc0a994226a8a29739643b1558fa3fe426ce64636742708b32a5a2ac0e9472fbd91545d30d18d0e8755d2743c483 SHA512 dd940d9241b852de89bfcb8f921663ec946f2833c2741ddf39ab6cffcbb275c63e7407a97f8c650135d79351f26622c2a23b05251ca2d9b61eb5a64108ad0200
diff --git a/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20200812.ebuild b/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20200812.ebuild
index f58d5031539e..c8d81337e5ad 100644
--- a/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20200812.ebuild
+++ b/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20200812.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{8,9} )
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-single-r1
 
diff --git a/net-wireless/gr-rds/Manifest b/net-wireless/gr-rds/Manifest
index 89b339588e47..ccf3699fdd54 100644
--- a/net-wireless/gr-rds/Manifest
+++ b/net-wireless/gr-rds/Manifest
@@ -1,4 +1,4 @@
 DIST gr-rds-0.0_p20200807.tar.gz 210730 BLAKE2B be2ded79a744d97572f754458fbab6c4091eb9096fa01238e09cfb1703d50fc1f228000b973826456fe4fae7577ef4dcc871edb4f72bd4e2daacdf3d01330d03 SHA512 d04944db7c02d3a004beae5be96a42274dcc4503d94bd22b726c664fb49103c41479ce49f7b4f2e6fb86d7b6bdd01873375fd6a7a7cc4b04ec9bf033235743a2
-EBUILD gr-rds-0.0_p20200807.ebuild 1400 BLAKE2B 7b75c0ccd1471688d1924d03d5897e9cdf34abf54338cd21001c78c62d7edd767be57e56e879aed87db67cc2165af350a07265f54836484e86a2c73cea2a6a94 SHA512 928941a5dcef6a4dbbdf75e59929e8ed17fedbd130a24499f11794211f9f9f7717e5641e153d4afac5e85f277dbe3a3eb4be1bf044cec67db0f7a0dbcdcc602a
-EBUILD gr-rds-9999.ebuild 1400 BLAKE2B 7b75c0ccd1471688d1924d03d5897e9cdf34abf54338cd21001c78c62d7edd767be57e56e879aed87db67cc2165af350a07265f54836484e86a2c73cea2a6a94 SHA512 928941a5dcef6a4dbbdf75e59929e8ed17fedbd130a24499f11794211f9f9f7717e5641e153d4afac5e85f277dbe3a3eb4be1bf044cec67db0f7a0dbcdcc602a
+EBUILD gr-rds-0.0_p20200807.ebuild 1402 BLAKE2B 2efdbe01f9d9d67a8fcfb046da10dd0bf7a65e1bd02111126090df4da7a6660b8af6fa524847b5bfaf98772047f182e1c948e6d2c62aabb3d331292e1f8a6309 SHA512 ac5cd7087da3e031061b09f22ac9ee1e061fa806e276beb70d46220b21ca2498a89baa211dcadd8d35a6b236e1af963519f770e1ba5a3e77473e5ddcfea29d0e
+EBUILD gr-rds-9999.ebuild 1402 BLAKE2B 2efdbe01f9d9d67a8fcfb046da10dd0bf7a65e1bd02111126090df4da7a6660b8af6fa524847b5bfaf98772047f182e1c948e6d2c62aabb3d331292e1f8a6309 SHA512 ac5cd7087da3e031061b09f22ac9ee1e061fa806e276beb70d46220b21ca2498a89baa211dcadd8d35a6b236e1af963519f770e1ba5a3e77473e5ddcfea29d0e
 MISC metadata.xml 318 BLAKE2B 4eb17bc98ea42ef37762bf7d0017492b32e7c8837065ffbc615597e3153e20baea76501b2a43635abab8ef542f55ddde1f5bd30331741c19c9814ac8d58e6d87 SHA512 c6f75244cdb565c0d0b8653ffa05b5d4cf9af8faf56c54ee9e4fa2a8f45a031b28bdef22a52bd66f0b26f9cb2dbedafb4ca0ac3d5a6c3f8a11f6b39f4ea37a30
diff --git a/net-wireless/gr-rds/gr-rds-0.0_p20200807.ebuild b/net-wireless/gr-rds/gr-rds-0.0_p20200807.ebuild
index 2f2eb3797c78..8006fb8a3380 100644
--- a/net-wireless/gr-rds/gr-rds-0.0_p20200807.ebuild
+++ b/net-wireless/gr-rds/gr-rds-0.0_p20200807.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
diff --git a/net-wireless/gr-rds/gr-rds-9999.ebuild b/net-wireless/gr-rds/gr-rds-9999.ebuild
index 2f2eb3797c78..8006fb8a3380 100644
--- a/net-wireless/gr-rds/gr-rds-9999.ebuild
+++ b/net-wireless/gr-rds/gr-rds-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
diff --git a/net-wireless/iwgtk/Manifest b/net-wireless/iwgtk/Manifest
index 82156a0d1853..28a48c6152fe 100644
--- a/net-wireless/iwgtk/Manifest
+++ b/net-wireless/iwgtk/Manifest
@@ -1,5 +1,3 @@
-DIST iwgtk-0.4.tar.gz 103988 BLAKE2B 0a848f805509507066e9eb97c1a3ccd1f3e441a6a01789b7ec291a12f67a619227b7845249342c15301c755dd6e3594379a888d278dc71c20cf377322f9969a5 SHA512 7a6d55493fe7cad57dc8338aafe48236c1ececb688a64cbdeb5748c60f5d109ae7912182c6d4df094588baee2aff3bd5481f82a80c4c267283a5067a0127f9e0
-DIST iwgtk-0.5.tar.gz 111619 BLAKE2B 1992f722fef1fc940433a0a26ee9d418c93a2b5164cd88c6a5456143b3e91e6e2b7f78e40df55df0c7bcd37fbf837f7691cd3aefa8166a9a93d94621e463ceb6 SHA512 63858ace6e05943563cfc25d66b8c98f3f13927a2e9addce4e9655e77a911b0e6e429865251dcd9990e722bcb0af852fffe2d59d4c5b467930837e2092b45ab2
-EBUILD iwgtk-0.4.ebuild 828 BLAKE2B 02a2666efee59ffd6324f87a84165e50ea36cd6e7a8780db9fb5e9a09e61063ba8dfa3ded0b651e35945fae3a98b59f514096ffa196ae61f34dfae46e2de14a1 SHA512 b23ccbd8fe802913fdd1d5597f2b810b37aa3161b04e0f88ec19b1c650bc1c488cd54787eac3dd8b154ef4e14bbcd0a8c824612bedbe12d628d9faca1c94acef
-EBUILD iwgtk-0.5.ebuild 827 BLAKE2B 2a02c30087777e9950fbf7bb584b63ac0174e115a53598b0e9cc4008d48abf0febdc7df79ec8d24d66c980de046bbe8d014a2fc1838f2df2d46399a602d4bde8 SHA512 7bc734dc760ba1b8885b8d5d97be3b1072b84f3d58f2f1c4b05f78044cae63d55b1cea871204402984019dff806e4c9af5551fb5b1581423d60af996bb834845
+DIST iwgtk-0.6.tar.gz 112522 BLAKE2B 8366b79d4d3b386187815ba787340d2e90d1a94779ec88a4fa807fbd310a77acf6651e49f4bfd6bbae76ca99765678bd643eaf9bb584b8fc75c812216d45aaa9 SHA512 79874e65d7673100f9156e183387ed0e744de153f8ab3aa3295347ed263b53cd6109e1b7e2d32e7b735a4d09d60235a1124fa244beb989fa4e86044cf7547fb1
+EBUILD iwgtk-0.6.ebuild 837 BLAKE2B 64bf4b4b2ea4680877e95b3fc35f798c57c77a64fc0811a97a606824359f2a13165941f8962d4715993a21456948983f9ef6dab4721ad09a5ea77ed5d17cdd6b SHA512 ea0768894c6eb56ae879b979a675bc3c06a32a11b4d429f3c677bc27814fb3c550fbf3fb216b2fcb807916b0ad52e74986a2835ad879286903accd4f7638db79
 MISC metadata.xml 245 BLAKE2B 4988fa1366a9b8a3769e503545339cdd493a0bdc362ca9237b158b94549de1f061477546b00fd3b21dc9325812423f7207071e22e3234d5c0b88c755197557d2 SHA512 e00be68ab9ad3acfce3d2d48721c47cf50e2c6358c9ceb45a2a23fc5303826ea26b9205ce4f230121c2e40c9c467367f2dc57863680899b21e8005034aa9118c
diff --git a/net-wireless/iwgtk/iwgtk-0.4.ebuild b/net-wireless/iwgtk/iwgtk-0.4.ebuild
deleted file mode 100644
index eb3eb819b7af..000000000000
--- a/net-wireless/iwgtk/iwgtk-0.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit xdg
-
-DESCRIPTION="Lightweight, graphical wifi management utility for Linux"
-HOMEPAGE="https://github.com/J-Lentz/iwgtk"
-SRC_URI="https://github.com/J-Lentz/iwgtk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
-	dev-libs/atk:0
-	dev-libs/glib:2
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/pango:0
-"
-
-RDEPEND="
-	${DEPEND}
-	net-wireless/iwd
-"
-
-src_prepare() {
-	default
-	sed -i \
-		-e 's/^CC=/CC?=/' \
-		-e 's/^CFLAGS=/CFLAGS:=$(CFLAGS) /' \
-		-e 's/^LDLIBS=/LDLIBS:=$(LDFLAGS) /' \
-		-e 's/-O3$/${CFLAGS}/' \
-		Makefile || die
-}
-
-src_install() {
-	emake prefix="${ED}/usr" install
-	gunzip "${ED}/usr/share/man/man1/iwgtk.1.gz" || die
-}
diff --git a/net-wireless/iwgtk/iwgtk-0.5.ebuild b/net-wireless/iwgtk/iwgtk-0.6.ebuild
similarity index 94%
rename from net-wireless/iwgtk/iwgtk-0.5.ebuild
rename to net-wireless/iwgtk/iwgtk-0.6.ebuild
index 4b26ef061cad..acd1ec9a8514 100644
--- a/net-wireless/iwgtk/iwgtk-0.5.ebuild
+++ b/net-wireless/iwgtk/iwgtk-0.6.ebuild
@@ -38,6 +38,6 @@ src_prepare() {
 }
 
 src_install() {
-	emake PREFIX="${ED}/usr" install
+	emake DESTDIR="${D}" PREFIX="/usr" install
 	gunzip "${ED}/usr/share/man/man1/iwgtk.1.gz" || die
 }
diff --git a/net-wireless/rtl-sdr/Manifest b/net-wireless/rtl-sdr/Manifest
index 9d587d84050d..6c001aaa4423 100644
--- a/net-wireless/rtl-sdr/Manifest
+++ b/net-wireless/rtl-sdr/Manifest
@@ -1,6 +1,8 @@
+AUX rtl-sdl-0.6.0_p2020802-fix-pkgconfig-libdir.patch 423 BLAKE2B 885b014e776f0342d147e066b879d251a99850f86c907f573e7c89364bf04b2103de95c66c866dd6572c71ab91506760e72e9fb5a7777dcb637c3062562c061c SHA512 f559e5d72b36f9abe689e4726fb6b0b1ab571796acbca02d8b49d5e568f567fbd73579c3b8f0cfe343cd442dc7141d7743f9ba0a795f66e791239f65cb4859d0
 AUX rtl_tcp.confd 138 BLAKE2B 04df300f0add96490ab861d99301b53ae45d414891f808780f79ef7c6c1cd7b0a48696510933b0cb8fc04c65ef4b2cd23109bcf266472225a8ee4a2ff430d404 SHA512 48324164cc7adab2e7c7f44b45a3a590ef9bcb161b4f6b22a94b4c4abf989b353a37c7b28ad1d81ffdff96dda84c10ba36bc9948f70a6b1f1c767394dc03ab77
 AUX rtl_tcp.initd 483 BLAKE2B 1e2feb9f481677792319b60fa99d0a2ed5c4a489c85c97a3a0e54e65fc8fe0c4b1ed8c1c6d4ea5991736fa232d26bb17b3e31fa8e6d01c111ec4ccae4c9df924 SHA512 7ac01b0568b1c12e906ae0d102708070b9aacca97d590b61d80125dac9f84587438fe5b582765552d37b0a9b730e00fca8894f8d5ff0c6a518fa2fb5dd4fb407
 DIST rtl-sdr-0.6.0_p2020802.tar.gz 134107 BLAKE2B 18ff8fe93a0dfaa20614924c7f951b2e7ffbccb4e5a2ebb6af698321ceaeba5012e6b88be03c7ff4c7b5cd45ec8df2baaa4ae55b813cdf448d895877a6757f47 SHA512 355af98a887a978794b562aa8ef78c91d19c33a6d0eb5740eb3a9b1e1329f8b11ca688eebc81a2d61440972ba5121225205de7165a22882a7e32cf6608888f25
+EBUILD rtl-sdr-0.6.0_p2020802-r1.ebuild 1583 BLAKE2B 13adcf9c4fd65c18800e0177fb4be3c20721d4b8b1705db6e6ab092cfae23aefca0b7e7b228c935f06d39e933c7d682564dc3cc27a8d0187527fde52f196080e SHA512 b921b52eacca787c5fc5add6d1a5e31b2cc58d5a57bc0a2a863d7f7c35e27f5b6748600cba28dd4241ce4fcb8651b19ef596568bbc5d07093f81d8b690c2d0c5
 EBUILD rtl-sdr-0.6.0_p2020802.ebuild 1597 BLAKE2B bacdcdada679b958ec906cce9e50d79007a247bbec5a4222aa51d57b453de3c6516e95b07b9996057371522ac9ef04c51a021ce4cedb5dfd54a987f108c34ff8 SHA512 66509ad51b2ac62490257901eb919a50617204f158bb21fe5b0370e194232e9b2ed2c11f8af3b96d5b23111f6e516c46dfcbcc135bb5f6d740c42485100935a7
-EBUILD rtl-sdr-9999.ebuild 1603 BLAKE2B 33a129066b5b6b9c137f49b43912f81a5c477d443cf7fd58f3f6a3181689c421080960a4cd30ada8f77a2682011e9f2af022871d49445fd3b858b85f8f68f3f2 SHA512 17aea001e8fe4a4259161051f7125daefaaa13da4b77c0e10a8696874c390415fda5de68cb7e2f145d5fb0eaf1d91204982736325124021cdb5ec38693bc61d7
+EBUILD rtl-sdr-9999.ebuild 1583 BLAKE2B 13adcf9c4fd65c18800e0177fb4be3c20721d4b8b1705db6e6ab092cfae23aefca0b7e7b228c935f06d39e933c7d682564dc3cc27a8d0187527fde52f196080e SHA512 b921b52eacca787c5fc5add6d1a5e31b2cc58d5a57bc0a2a863d7f7c35e27f5b6748600cba28dd4241ce4fcb8651b19ef596568bbc5d07093f81d8b690c2d0c5
 MISC metadata.xml 327 BLAKE2B c850854368e94999292623351c2b09508b49ff74cf8a3cde1872340347a07766ead3427ab6445fde90788e1a0b264a53829114633c515d4b0b30713a65a3739e SHA512 7770f1736d4207f81194646409e8a971c4ee97a9b2285eb67aef37bc7ec1002191e775ee7b489726580f86b5be8d8d8d8f82e84b37fb480c364c29e5e77f683c
diff --git a/net-wireless/rtl-sdr/files/rtl-sdl-0.6.0_p2020802-fix-pkgconfig-libdir.patch b/net-wireless/rtl-sdr/files/rtl-sdl-0.6.0_p2020802-fix-pkgconfig-libdir.patch
new file mode 100644
index 000000000000..b71454b87828
--- /dev/null
+++ b/net-wireless/rtl-sdr/files/rtl-sdl-0.6.0_p2020802-fix-pkgconfig-libdir.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cc39bc3..4833602 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -160,7 +160,7 @@ ENDIF(CMAKE_CROSSCOMPILING)
+ set(prefix "${CMAKE_INSTALL_PREFIX}")
+ set(exec_prefix \${prefix})
+ set(includedir \${prefix}/include)
+-set(libdir \${exec_prefix}/lib)
++set(libdir \${exec_prefix}/${CMAKE_INSTALL_LIBDIR})
+ 
+ CONFIGURE_FILE(
+     ${CMAKE_CURRENT_SOURCE_DIR}/librtlsdr.pc.in
diff --git a/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802-r1.ebuild b/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802-r1.ebuild
new file mode 100644
index 000000000000..b00901863baa
--- /dev/null
+++ b/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Turns your Realtek RTL2832 based DVB dongle into a SDR receiver"
+HOMEPAGE="https://sdr.osmocom.org/trac/wiki/rtl-sdr"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="https://git.osmocom.org/${PN}"
+else
+	#git clone https://git.osmocom.org/rtl-sdr
+	#cd rtl-sdr
+	#git archive --format=tar --prefix=rtl-sdr-${PV}/ master | xz > ../rtl-sdr-${PV}.tar.xz
+	#SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
+
+	COMMIT="ed0317e6a58c098874ac58b769cf2e609c18d9a5"
+	SRC_URI="https://github.com/osmocom/rtl-sdr/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+zerocopy"
+
+DEPEND="virtual/libusb:1"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/rtl-sdl-0.6.0_p2020802-fix-pkgconfig-libdir.patch
+)
+
+src_prepare() {
+	sed -i 's#VERSION_INFO_PATCH_VERSION git#VERSION_INFO_PATCH_VERSION 0_p20200802#' CMakeLists.txt
+	cmake_src_prepare
+}
+
+src_configure() {
+	#the udev rules are 666, we don't want that
+	mycmakeargs=(
+		-DINSTALL_UDEV_RULES=OFF
+		-DDETACH_KERNEL_DRIVER=ON
+		-DENABLE_ZEROCOPY="$(usex zerocopy)"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	newinitd "${FILESDIR}"/rtl_tcp.initd rtl_tcp
+	newconfd "${FILESDIR}"/rtl_tcp.confd rtl_tcp
+}
+
+pkg_postinst() {
+	elog "Only users in the usb group can capture."
+	elog "Just run 'gpasswd -a <USER> usb', then have <USER> re-login."
+}
diff --git a/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild b/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild
index 4f87f3a82cdd..b00901863baa 100644
--- a/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild
+++ b/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit cmake multilib
+inherit cmake
 
-DESCRIPTION="turns your Realtek RTL2832 based DVB dongle into a SDR receiver"
+DESCRIPTION="Turns your Realtek RTL2832 based DVB dongle into a SDR receiver"
 HOMEPAGE="https://sdr.osmocom.org/trac/wiki/rtl-sdr"
 
 if [[ ${PV} == 9999* ]]; then
@@ -31,13 +31,9 @@ IUSE="+zerocopy"
 DEPEND="virtual/libusb:1"
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-	if [[ ${PV} == 9999* ]]; then
-		git-r3_src_unpack
-	else
-		default
-	fi
-}
+PATCHES=(
+	"${FILESDIR}"/rtl-sdl-0.6.0_p2020802-fix-pkgconfig-libdir.patch
+)
 
 src_prepare() {
 	sed -i 's#VERSION_INFO_PATCH_VERSION git#VERSION_INFO_PATCH_VERSION 0_p20200802#' CMakeLists.txt
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 7cce801b2cdb..7944e8d8192e 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch/arm/use.stable.mask b/profiles/arch/arm/use.stable.mask
index f4e2ecac1ba4..c0fee12811ec 100644
--- a/profiles/arch/arm/use.stable.mask
+++ b/profiles/arch/arm/use.stable.mask
@@ -27,10 +27,6 @@ java
 # media-gfx/gimp not yet stable
 gimp
 
-# Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2019‑08‑31)
-# Dependencies not yet stable.
-appindicator
-
 # Andrey Grozin <grozin@gentoo.org> (2014-05-16)
 # No stable gcl
 gcl
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index d67ae6fdf361..2b1b27feff7c 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -323,7 +323,7 @@ net-fs/samba addc addns ads cluster python test
 # Some more unkeyworded dependencies.
 dev-cpp/eigen test
 mate-base/mate help
-mate-base/mate-applets-meta appindicator sensors
+mate-base/mate-applets-meta sensors
 mate-extra/caja-extensions gajim
 sci-libs/gdal armadillo netcdf
 sys-fs/btrfs-progs reiserfs
@@ -410,7 +410,6 @@ net-libs/libpcap bluetooth
 # Mart Raudsepp <leio@gentoo.org> (2017-02-16)
 # Not yet tested features/dependencies
 app-text/evince dvi nautilus postscript t1lib xps
-net-wireless/blueman appindicator
 
 # Markus Meier <maekke@gentoo.org> (2013-12-26)
 # Unkeyworded deps, bug #488724
diff --git a/profiles/arch/arm64/use.mask b/profiles/arch/arm64/use.mask
index d32c7c4ee25c..5f525cc7abf0 100644
--- a/profiles/arch/arm64/use.mask
+++ b/profiles/arch/arm64/use.mask
@@ -50,10 +50,6 @@ cpu_flags_arm_neon
 -cpu_flags_arm_vfpv4
 -cpu_flags_arm_vfp-d32
 
-# Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2019‑08‑31)
-# Dependency not keyworded (dev-libs/libindicate).
-appindicator
-
 # Michał Górny <mgorny@gentoo.org> (2018-07-09)
 # No OpenCL provider is available on arm64.
 opencl
diff --git a/profiles/arch/hppa/use.mask b/profiles/arch/hppa/use.mask
index e561ee2f467c..447415da6a81 100644
--- a/profiles/arch/hppa/use.mask
+++ b/profiles/arch/hppa/use.mask
@@ -37,10 +37,6 @@ vulkan
 system-libvpx
 vpx
 
-# Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2019‑08‑31)
-# Dependency not keyworded (dev-libs/libappindicator).
-appindicator
-
 # Matt Turner <mattst88@gentoo.org> (2018-05-26)
 # Unmask systemd since it is keyworded here.
 -systemd
diff --git a/profiles/arch/ia64/use.mask b/profiles/arch/ia64/use.mask
index a3f9822da813..801512a035e5 100644
--- a/profiles/arch/ia64/use.mask
+++ b/profiles/arch/ia64/use.mask
@@ -38,10 +38,6 @@ ruby
 # - net-libs/gnome-online-accounts: depend on net-libs/webkit-gtk
 gnome-online-accounts
 
-# Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2019‑08‑31)
-# Dependency not keyworded (dev-libs/libindicate).
-appindicator
-
 # Sergei Trofimovich <slyfox@gentoo.org> (2017-06-17)
 # There is no luajit support on ia64. Bug #554376
 lua_single_target_luajit
diff --git a/profiles/arch/m68k/use.mask b/profiles/arch/m68k/use.mask
index d6c546d4c498..544b27bcfa5a 100644
--- a/profiles/arch/m68k/use.mask
+++ b/profiles/arch/m68k/use.mask
@@ -97,10 +97,6 @@ qt5
 # valgrind has no m68k port.
 valgrind
 
-# Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2019‑08‑31)
-# Dependencies not keyworded.
-appindicator
-
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-03-31)
 # sys-auth/elogind is not keyworded here.
 elogind
diff --git a/profiles/arch/mips/use.mask b/profiles/arch/mips/use.mask
index 85e68d05e19c..7c2cc1ebf1f6 100644
--- a/profiles/arch/mips/use.mask
+++ b/profiles/arch/mips/use.mask
@@ -45,10 +45,6 @@ gnome-online-accounts
 # Keywords lost on net-fs/samba over time, use.mask until re-keyworded
 samba
 
-# Mart Raudsepp <leio@gentoo.org> (2017-02-07)
-# dev-libs/libappindicator not tested
-appindicator
-
 # Anthony G. Basile <blueness@gentoo.org> (2015-08-01)
 # There is no luajit support on mips.  Bug #554376.
 luajittex
diff --git a/profiles/arch/s390/use.mask b/profiles/arch/s390/use.mask
index c4f3c6a8e82b..1a8fc49c64d4 100644
--- a/profiles/arch/s390/use.mask
+++ b/profiles/arch/s390/use.mask
@@ -58,10 +58,6 @@ libglvnd
 # Unmask ABI flags for this arch.
 -abi_s390_32
 
-# Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2019‑08‑31)
-# Dependencies not keyworded.
-appindicator
-
 # James Le Cuirot <chewi@gentoo.org> (2017-06-29)
 # Unmask as this profile is big endian.
 -big-endian
diff --git a/profiles/base/package.use b/profiles/base/package.use
index 77d07656fc52..137647598358 100644
--- a/profiles/base/package.use
+++ b/profiles/base/package.use
@@ -1,6 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas Sturmlechner <asturm@gentoo.org>
+# Only python 3.9 supported, bug #835921
+dev-util/kdevelop-python:5 python_single_target_python3_9
+
 # Patrick McLean <chutzpah@gentoo.org) (2022-05-04)
 # Default to lua 5.4 (upstream requires 5.3 or higher)
 >=sys-cluster/ceph-17.2.0 lua_single_target_lua5-4
diff --git a/profiles/package.mask b/profiles/package.mask
index 186c01921952..8970d66a8a71 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,18 @@
 
 #--- END OF EXAMPLES ---
 
+# Ulrich Müller <ulm@gentoo.org> (2022-06-16)
+# Last release in 2002. The distfile cannot be redistributed
+# and is no longer available upstream. Use media-gfx/imagemagick
+# ("convert" with eps2 or eps3 output format) as replacement.
+# Masked for removal in 30 days. Bug #851708.
+media-gfx/jpeg2ps
+
+# John Helmert III <ajak@gentoo.org> (2022-06-15)
+# Open security bug with patches for years. Upstream seems dead since
+# 2020. Removal on 2022-07-15.  Bug #718550.
+sys-cluster/csync2
+
 # Michał Górny <mgorny@gentoo.org> (2022-06-13)
 # Upstream has discontinued the fork.  No revdeps.  They recommend using
 # the original editdistance (not packaged on Gentoo)
@@ -47,13 +59,10 @@ dev-python/editdistance-s
 dev-cpp/commoncpp2
 
 # Michał Górny <mgorny@gentoo.org> (2022-06-08)
-# pyroute2 is pending version bump for over 1.5 years already.
-# The tests are restricted.  pulseaudio-dlna is the only revdep.
 # pulseaudio-dlna has not seen any upstream activity since 2017,
 # and has had its last release in 2016.  It does not feature a non-live
 # ebuild.
 # Removal on 2022-07-08.  Bug #813990.
-dev-python/pyroute2
 net-misc/pulseaudio-dlna
 
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2022-06-05)
@@ -184,11 +193,6 @@ dev-python/sphinxcontrib-openapi
 # Removal on 2022-06-23. Bug #846605
 gnome-extra/gnome-documents
 
-# Sam James <sam@gentoo.org> (2022-05-22)
-# Doesn't support Python 3.10, out of date, unmaintained in Gentoo.
-# Removal on 2022-06-22. bug #731674, bug #846158.
-net-misc/omniORB
-
 # Sam James <sam@gentoo.org> (2022-05-22)
 # No upstream activity since 2017. Doesn't support Python 3.10.
 # Removal on 2022-06-22. bug #845732.
diff --git a/profiles/prefix/darwin/macos/package.mask b/profiles/prefix/darwin/macos/package.mask
index 0b90c5562381..8a9a258d382f 100644
--- a/profiles/prefix/darwin/macos/package.mask
+++ b/profiles/prefix/darwin/macos/package.mask
@@ -1,6 +1,12 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Fabian Groffen <grobian@gentoo.org> (2022-06-14)
+# timer_create build-failure, corrected upstream in 5067
+# https://github.com/vim/vim/commit/f78b52ba24d8d294869cd013dcc4cd5d4a65cea7
+=app-editors/vim-8.2.5066
+=app-editors/vim-core-8.2.5066
+
 # Fabian Groffen <grobian@gentoo.org> (2022-01-08)
 # malloc crash during install on >=11.0, bug #830425
 =dev-util/cmake-3.22.1
diff --git a/profiles/targets/desktop/plasma/package.use b/profiles/targets/desktop/plasma/package.use
index 5e9ebf34903f..65c0002787a9 100644
--- a/profiles/targets/desktop/plasma/package.use
+++ b/profiles/targets/desktop/plasma/package.use
@@ -61,3 +61,6 @@ sys-libs/zlib minizip
 <app-office/calligra-3.3 phonon
 kde-apps/kio-extras phonon
 kde-apps/marble phonon
+
+# Required by kde-plasma/plasma-meta
+kde-plasma/kwin lock
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 56f3d8bd2293..b30268721057 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -3587,6 +3587,7 @@ kde-plasma/kde-cli-tools:kdesu - Build graphical frontend for kde-frameworks/kde
 kde-plasma/kdeplasma-addons:share - Enable applet for quickly sharing data to a variety of sources
 kde-plasma/kdeplasma-addons:webengine - Enable dictionary and web browser applets using dev-qt/qtwebengine
 kde-plasma/ksystemstats:networkmanager - Enable improved backend for Network statistics using kde-frameworks/networkmanager-qt
+kde-plasma/kwin:lock - Enable screen locking via kde-plasma/kscreenlocker
 kde-plasma/kwin:multimedia - Enable effect video button in desktop effects KCM
 kde-plasma/kwin:screencast - Enable screencast portal using media-video/pipewire
 kde-plasma/libksysguard:designer - Build plugins for dev-qt/designer
@@ -6163,6 +6164,7 @@ net-libs/telepathy-qt:farstream - Enable support for audio/video calls via farst
 net-libs/tox:av - Adds support for audio and video.
 net-libs/tox:daemon - Enable the DHT Bootstrap Daemon.
 net-libs/tox:dht-node - Enables DHT Bootstrap Node.
+net-libs/tox:key-utils - Builds utilities to create custom keys and profiles
 net-libs/tox:log-debug - Log level: 4
 net-libs/tox:log-error - Log level: 1
 net-libs/tox:log-info - Log level: 3
@@ -7466,6 +7468,7 @@ sci-libs/symengine:mpfr - Add support for multiprecision floating point rouding(
 sci-libs/tensorflow:cuda - Enable support for nVidia CUDA
 sci-libs/tensorflow:xla - XLA (Accelerated Linear Algebra) Optimizing Compiler for TensorFlow
 sci-libs/trilinos:adolc - Add support for adolc (sci-libs/adolc)
+sci-libs/trilinos:all-packages - Enable all supported Trilinos packages (per default only a subset is built)
 sci-libs/trilinos:arprec - Add support for arprec (sci-libs/arprec)
 sci-libs/trilinos:clp - Add support for clp (sci-libs/coinor-clp)
 sci-libs/trilinos:cuda - Add support for cuda (dev-util/nvidia-cuda-toolkit)
@@ -7751,7 +7754,6 @@ sys-apps/firejail:globalcfg - Enable global config file
 sys-apps/firejail:network - Enable networking features
 sys-apps/firejail:private-home - Enable private home feature
 sys-apps/firejail:userns - Enable attaching a new user namespace to a sandbox (--noroot option)
-sys-apps/firejail:whitelist - Enable whitelist
 sys-apps/firejail-lts:apparmor - Enable support for custom AppArmor profiles
 sys-apps/firejail-lts:globalcfg - Enable global config file
 sys-apps/firejail-lts:network - Enable networking features
diff --git a/sci-biology/Manifest.gz b/sci-biology/Manifest.gz
index f81a5cbe8cfa..01c75339f8a7 100644
Binary files a/sci-biology/Manifest.gz and b/sci-biology/Manifest.gz differ
diff --git a/sci-biology/mosaik/Manifest b/sci-biology/mosaik/Manifest
index 3ce1cb1c5223..e4124e1c6468 100644
--- a/sci-biology/mosaik/Manifest
+++ b/sci-biology/mosaik/Manifest
@@ -1,8 +1,9 @@
 AUX mosaik-2.2.30-Wformat-security.patch 3296 BLAKE2B f75a4dde6fb88e0175989ff9ddfd6dfd2450eb0df24e4e5f60943fbd9fcc40b798d7d7bca2d57e25c4201f6a7cbf8eb66b2f3573f54fc05b5b3a46e3e01a1ddb SHA512 e72fa7cac8798425ac1dd4d3358bfdff640cc831a01531749ee2fad99f8b53bd64e8c7fcdddce205e9f6dd312cc74376afcba395ab8d508d92416190b7eed1df
 AUX mosaik-2.2.30-fix-build-system.patch 8056 BLAKE2B 4c795e790718dca2a46e25fd67499612ad1226c6e6ad73d7543cd1c1aa1dacabc0ed77ade798b2602d8f661eeb9cd7b033bd8945d4384d01e2d279762f40fa14 SHA512 ed4a6efd9fb2fabd6c24adaa5894fde80024d8ee930450711c07388b62969a41e801f052ee88d7890355f1ddfc5ef9fbb40bfdabfbfae364c64c673ce08958c6
 AUX mosaik-2.2.30-gcc11.patch 1189 BLAKE2B 29b54205cf90bdf0815d16876db32a2109493f659cc06d4f0f3a9dffb3dcc6ef119a0b567197541226cd77ab8a33e8fab5f7d53ee107ff5ec987493e93ac8db8 SHA512 57aed21aca8b1c5c512bd77d7f5bf1a9846b9f30cb72890f614670930139c5ac8817d2b88b5e39c943c604c736a1a27ee91a01c3f0cdd9a534d8b4185cbdfcf6
+AUX mosaik-2.2.30-gcc12-time.patch 277 BLAKE2B e2fbd8f573238f78b9730c1e349a30b48ca8b38955a31a311ebc6e19ce69126afce95fb1fde197f8354304f684fe6ce2f64e0b34b6ffd0004f59faa20a692c2a SHA512 ee640a56833866feaa75917c223409541d98ff2aeaa016d3568409d1692f9d254e35ac85da7dfd56f062f8c94877197755c665be011bf5bb532f70c7ef6b41e6
 AUX mosaik-2.2.30-gcc7.patch 1252 BLAKE2B 896d662807c223cc69eacfa2e1fcb457c696e0d198dfa718f0f7eb9060d9c0491a18017901385227c2c0906e02c61a8fb9a9deb71f228d4c6195cdf0b5696515 SHA512 fc7dd31d2fcce7a4e624e759ee08b8997757bf4ce3ae3f98080e6e6252dfc647de4848f6a736b35090e8c8da37618baaf08e19be9ddfc408bbc5f7200f44cbba
 AUX mosaik-2.2.30-remove-platform-code.patch 399 BLAKE2B ec711a9b112efa87b2811e4545bfc58716393576915f71167ff700ccd809be4fad5e07bac7a5cb7df911615f4c996284cd711c1d1cb62c5a18695e719e6574c6 SHA512 4aec709660b41fb61bb9219a587255a5f416992a4478c2a7eb67374d1425f0a4e0b4d356827a9214e2f2718b635169c95d3288bf10388a74e50d498c39c2f259
 DIST mosaik-2.2.30.tar.gz 4387062 BLAKE2B 6f373aeae4f68be2455556e7f79a5850e25d804bd482d85a846b44f8adaabb2513ffc7ced774f5ead6dbc8fc9dca9d64f76f83bc5b55b1be4073a8cf309e121b SHA512 1acf534e6defc927fc22937a7bae6786e85ab7aa234b4209169f1267f1a9bd68415b441c6aed2e7cd667f694a562017ebc9457251958f77386259ffce9812b10
-EBUILD mosaik-2.2.30.ebuild 1137 BLAKE2B 74fd6384486e9cf6c92dd5b8aa96f9c1398ed80431eff23d748db70c9627450845164b1f3b4d496bdffdfeb79a36bac610558a0516057a771e1681dfa6f1eda6 SHA512 d59fbcc3b31cb8b94aba101e9743b522b7ef853ddf198608d022a3a0a091d55aeeeb2ca44a2bb7266fdd2980153a863cb0ae3bc21cd4ba9f2b2ab4a190b14513
+EBUILD mosaik-2.2.30.ebuild 1174 BLAKE2B 4ea2485f378fef5b2b0d67f42693b5c1ae3544df23ca97b1d0412bea7a06cbad083503a75a96b57208c23d270870d8d6404c638928e687fc422267cbb0551d30 SHA512 efcf58bbbec183a7b634e4f00b8abcd8cc33b5c4312a258e6d3376d790a11f696a91987f34b035c61d751fc04ea901f95911660c25c021d7425cd8287018f4fe
 MISC metadata.xml 415 BLAKE2B a1ecb68c52443bc41061019f246474a105586328dec03e3c26ec9f2ad9688a69b1bb7b2de1c9cd4bae1039927e2285c50dc7a0165e2464cfdef86b66e278becb SHA512 117976f4cd570fc0e481aa7419fecc7ddcbf3ac4484efc05bd293db239798e1591e6d775e9290f492b003860d135aa8a0bd08f93e7088410ebaac73b2fa8a37c
diff --git a/sci-biology/mosaik/files/mosaik-2.2.30-gcc12-time.patch b/sci-biology/mosaik/files/mosaik-2.2.30-gcc12-time.patch
new file mode 100644
index 000000000000..1bc63bfd4776
--- /dev/null
+++ b/sci-biology/mosaik/files/mosaik-2.2.30-gcc12-time.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/851669
+--- a/CommonSource/Utilities/SafeFunctions.h
++++ b/CommonSource/Utilities/SafeFunctions.h
+@@ -17,6 +17,7 @@
+ #include <cstdio>
+ #include <cstdarg>
+ #include <cstring>
++#include <ctime>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <errno.h>
diff --git a/sci-biology/mosaik/mosaik-2.2.30.ebuild b/sci-biology/mosaik/mosaik-2.2.30.ebuild
index 0aee0a2cfbd9..a929f1160f67 100644
--- a/sci-biology/mosaik/mosaik-2.2.30.ebuild
+++ b/sci-biology/mosaik/mosaik-2.2.30.ebuild
@@ -20,6 +20,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-Wformat-security.patch
 	"${FILESDIR}"/${P}-gcc7.patch
 	"${FILESDIR}"/${P}-gcc11.patch
+	"${FILESDIR}"/${P}-gcc12-time.patch
 )
 
 src_configure() {
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index 69ecab7b2fb1..c1214fd5f9a1 100644
Binary files a/sci-chemistry/Manifest.gz and b/sci-chemistry/Manifest.gz differ
diff --git a/sci-chemistry/molequeue/Manifest b/sci-chemistry/molequeue/Manifest
index 1f5a79a5f87e..b5b5335d9eef 100644
--- a/sci-chemistry/molequeue/Manifest
+++ b/sci-chemistry/molequeue/Manifest
@@ -1,3 +1,3 @@
 DIST molequeue-0.9.0.tar.gz 604015 BLAKE2B 37e7f404a0fefb40defb198295659372121fbe770269c2f9fb92e856aceb8222bec5e83939ecea061b76f925c0cbde1be0a854db41f992a92a2b2b9e0651f2e1 SHA512 87ddd8ca59227cab60c0ce2643e5bd435d9ac7e23b929659b95f190478734a5b71d4935f37d03eeadbc39939cbffb3604e0a283d50b0a23a1a000b57c1fce335
-EBUILD molequeue-0.9.0-r1.ebuild 1959 BLAKE2B a6e50572483f1670a2c743584ec1c2e7045fa145897418d01df5e68929e3a640b34d7b85d33973a6a47dd2e250862c0cc72fa7190fe62c2ed30ba32edeca4d8b SHA512 62405759c9d650a8ca21bc3a23208c93283111c194d721e334656a75daa42af70afb0c1ff7055b9d8b46f2c8193b37ce8b561ea7d1a2058cbc1eb57e64fe53b3
+EBUILD molequeue-0.9.0-r1.ebuild 2067 BLAKE2B 552c6b56e7b0907fa78b9e2d88f62f6768a5b08efe58afb6d039b1451e11324c21701ce4231086d685fdd1887f12a12d68e79a3cd444ec623c921b045a48c85a SHA512 7fe1f39d56b1d5131f01130d9b60e537b29c280835b69cca3f4d7f42b1a51d764de49301c22b41eeed72558e6419665af35447718aeb8fa3f14cc49951a9aa60
 MISC metadata.xml 1258 BLAKE2B db62408b81fa39c138916de98df72a14b7d66bfaa7ac50e6afe5e138ce4d3627cbb7f0544e075ecdaff70b04ee6023d5f2381bd0f130d5075b060c5ed8bfabb5 SHA512 b4b028602d96c58d8744d016176361d41a1ac4c3dbb0e14edb3526d683cfdd8607ba3c627529edcdd5fe97ba484cb8e1fcaf797e4c4d0253f0bb2321a2140512
diff --git a/sci-chemistry/molequeue/molequeue-0.9.0-r1.ebuild b/sci-chemistry/molequeue/molequeue-0.9.0-r1.ebuild
index 5c4f667b458d..8901b0f81ce5 100644
--- a/sci-chemistry/molequeue/molequeue-0.9.0-r1.ebuild
+++ b/sci-chemistry/molequeue/molequeue-0.9.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit cmake python-r1 virtualx
 
@@ -66,9 +66,14 @@ src_configure() {
 
 src_compile() {
 	if use zeromq; then
-		python_foreach_impl run_in_build_dir cmake_src_compile all $(usex doc documentation "")
+		my_src_compile() {
+			run_in_build_dir cmake_src_compile all $(usex doc documentation "")
+			use doc && export HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
+		}
+		python_foreach_impl my_src_compile
 	else
 		cmake_src_compile all $(usex doc documentation "")
+		use doc && export HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
 	fi
 }
 
@@ -81,7 +86,6 @@ src_test() {
 }
 
 src_install() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
 	if use zeromq; then
 		python_foreach_impl run_in_build_dir cmake_src_install
 		python_foreach_impl run_in_build_dir python_optimize
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index a74f7cfdd85c..d38d8ef277d4 100644
Binary files a/sci-electronics/Manifest.gz and b/sci-electronics/Manifest.gz differ
diff --git a/sci-electronics/systemc/Manifest b/sci-electronics/systemc/Manifest
index f022cdd88b99..4f6df16d8649 100644
--- a/sci-electronics/systemc/Manifest
+++ b/sci-electronics/systemc/Manifest
@@ -1,3 +1,4 @@
 DIST systemc-2.3.4.tar.gz 7142529 BLAKE2B 8a7e7e9f49b0131c1536d217dcc4fc420bc72ed962736a457cdaf3e40390be2a5051010317a62ba1eca17ee7ee4a171950979d2f07cb7fecc7286d028675540f SHA512 77fd1810fafeaa639cb21fcd77c7132c0ba3cf42309d3e09953c62c92f83b18e6de2e26620cee267683ca851503e5a8419523e7c9161f2ae33aea372af0be966
 EBUILD systemc-2.3.4-r1.ebuild 1181 BLAKE2B 06a618a1bd4c1951989b47b564cc6de6b29ef7be1483a0c934fa0db6caeba00bdbfd6afaa93e73e2e31c3268d2cd97a081e7142b73092686d20eea000e12727e SHA512 f21eed02ca3405c4dcd6715da92897f113baf6d16fe882626c31f5f3a5ce2be086320cf8b50edd6f46361724fc3a0a4895fdf8bb36f8799d550d0a071448c046
+EBUILD systemc-2.3.4-r2.ebuild 1223 BLAKE2B 8b15e91d089f634c838eb52e5dd413a7b10870680f4dd1fed4e50570fcfd7fb7cc0707248752d55348bf0373b1c623fea3f138151b05a81ca14579949b872009 SHA512 a2250d479f35b6e3cb6d41cf19a81e5c87799db4027daba948d91ca66f25cfb6b6b29d94d4143af80e7c1d3cb56208c86db9abdc559b7ac2125a34265ec2a194
 MISC metadata.xml 1094 BLAKE2B 8edeeea6726686d80ea047a7829ffdb313c8e31b80dd6b8c7e6da98102f66635807d4049da38a74197b270f67f25cf875a36234c7cddbe25649039f4fe5a5364 SHA512 e41a951f37b22345d5991e588d9a038df08fa379d7bfaf2b9860aeb2c6dd4795413d9d411a70bdce6f71a624c9b24c329dafd18aee9f2ee1d4368ff72376cd1c
diff --git a/sci-electronics/systemc/systemc-2.3.4-r2.ebuild b/sci-electronics/systemc/systemc-2.3.4-r2.ebuild
new file mode 100644
index 000000000000..9e61f04f5519
--- /dev/null
+++ b/sci-electronics/systemc/systemc-2.3.4-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PV="${PV}_pub_rev_20190614"
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="A C++ based modeling platform for VLSI and system-level co-design"
+HOMEPAGE="
+	https://systemc.org
+	https://github.com/accellera-official/systemc
+"
+
+if [[ "${PV}" == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/accellera-official/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/accellera-official/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="debug doc examples static-libs"
+REQUIRED_USE="examples? ( doc )"
+
+src_prepare() {
+	default
+	eautoconf --force
+}
+
+src_configure() {
+	econf CXX="$(tc-getCXX)" \
+		$(use_enable debug) \
+		$(use_enable static-libs static) \
+		--with-unix-layout
+}
+
+src_install() {
+	default
+	if use doc; then
+		if use examples; then
+			docompress -x /usr/share/doc/"${PF}"/examples
+		else
+			rm -r "${ED}"/usr/share/doc/"${PF}"/examples || die
+		fi
+	else
+		rm -r "${ED}"/usr/share/doc/"${PF}" || die
+	fi
+
+	if ! use static-libs; then
+		find "${ED}" -name "*.la" -delete || die
+	fi
+}
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 8f88545120b8..6b8edf686c7e 100644
Binary files a/sci-geosciences/Manifest.gz and b/sci-geosciences/Manifest.gz differ
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 88e199cedc57..bc740ef1725c 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -8,7 +8,7 @@ DIST grass-8.2.0.tar.gz 66819726 BLAKE2B e4398368dd8fd26324709202f42556033a0fea1
 EBUILD grass-7.8.6-r1.ebuild 7055 BLAKE2B e38aeec61d89be4a584760e6af906e8ff1e080176110a05a27fe8610b3b87109a49a2ab7160c2f7fe47047d203cdb52ac7be917982e744b4e827e746c34ff7d2 SHA512 3bf3595b0f1a1dc296f6c2f8a05eef8b6621ef6609e4f207d1710a916f9b8b6791e4424b0806b032fc3f925d7b714f43a48e9750aa700075e4c99a955d0ad930
 EBUILD grass-7.8.7.ebuild 7037 BLAKE2B 6c49c86b9360199a2b47340241d6ba7d350e91dcedf9d5e8f732e97ec624b312b75a36e520949a38a9c5684c0fac3fd85113fcebb0ea0886ec815045566cb3a0 SHA512 e24b41c9754db9edc469d9095d9f97303ad703e047e0ab6810afb5f7b42e28c453a5c0f2292f71b6bc2acd0fa4157e172fbae7966f456ef2eb7fb938f747bb75
 EBUILD grass-8.0.1-r1.ebuild 7292 BLAKE2B d45d05edc647ff2d69b019abe4b2737df553211e53c8224e3d294438c29305d0d66df9b5735a08e8cb4295f2483f9d162b1f8a4d61cba703a2f444539ba67fba SHA512 e2b772e401379d146cf5c1248248523846398b8d03104296458bed87bfaec6af6127c0e3a4098e27b37b38bb95a98bc3bfefd2979d92f4139dae38ba69b6bf3b
-EBUILD grass-8.0.2.ebuild 7397 BLAKE2B 50ed852fdd7f4cfbd7a4b80ecf246770ca2abb56cc5d6a5c9dadf81c3cbd963b2b2ac30ee774781b14c90e37e0785e69bd439844d6d911f720308eb76cdbe398 SHA512 3cf7e0ea57e1256fd92c246135aadcb335ddefac83b3aaee39c188a351faf904c103507a6620ea240ec6a4904c50e259440d5ba7d9329bcf3f8b09c5bdd12bfe
+EBUILD grass-8.0.2.ebuild 7395 BLAKE2B 26056fd3435579cd5c3582eb161a5555480da272f451c079eda08682d1b4c9abd2bf8c1dc0d0f03f9339c39357d91850a27317101fe4f50599da04df327609be SHA512 d3dfdcc2e453fbf902418bb0f6240e1a9abcbade55b9419ec0e5cc75ec1949219c2e411b1512d1e0a5e876366fb0bfd2fc34f7c3bb9d8428f67366b6fafae9a8
 EBUILD grass-8.2.0.ebuild 7397 BLAKE2B a6bb4a9721446eaf6ee91fe5f29153b7d7326d2d0c1eb5aeaa3bac6245e53c3c07abe0be711289981ce7a5e69a716b4a1086de948b80711e75048b132931c6f7 SHA512 2af79f67086685086cdf3b838f985a93e95543ceb3784fdaee48b30de85360722f83bb7075082637dbdeb500bc3a84b91b39adee7467e0dffc9bd65d435929b8
 EBUILD grass-9999.ebuild 7337 BLAKE2B 9e735ae65498174408f482f8f5f568c57c351113390a1836227f9787a5c5cde9fbcd22191ecda0dc1078e3ec7cb3b4a39bf75d087d6d23dfd36c892d479ac525 SHA512 364c581b765c13026d59f41123c34943b40e87307102a41f3b2906232cc70c7dad423c2fcc2bd3ebddd77bb8c36be78d206a218665365804a16567578fb0c43d
 MISC metadata.xml 1286 BLAKE2B 0f08cfaa427449162c2820db80f4d306c73bdf6a9edd337be482df034e40ace5fad0ab2f7acb08b3bde5e1db54ed9f9ac38669ab689968c30964aae15b4134a7 SHA512 2adc25985ec839ba9d1b9b15a196b3477f4a92cda7d83dfafa9259d88768bcc57ab559f45820314b9ad7dc8ce3d25332eb6a8e7500ce26d7b53011a90bc99211
diff --git a/sci-geosciences/grass/grass-8.0.2.ebuild b/sci-geosciences/grass/grass-8.0.2.ebuild
index bda087019d91..ff4658b5ba17 100644
--- a/sci-geosciences/grass/grass-8.0.2.ebuild
+++ b/sci-geosciences/grass/grass-8.0.2.ebuild
@@ -26,7 +26,7 @@ else
 	MY_P="${P/_rc/RC}"
 	SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~amd64 ~ppc ~x86"
+		KEYWORDS="amd64 ~ppc x86"
 	fi
 
 	S="${WORKDIR}/${MY_P}"
diff --git a/sci-geosciences/routino/Manifest b/sci-geosciences/routino/Manifest
index 9276aa8c61d4..bcfa5cb6f800 100644
--- a/sci-geosciences/routino/Manifest
+++ b/sci-geosciences/routino/Manifest
@@ -1,6 +1,4 @@
 AUX routino-3.3.2.patch 1771 BLAKE2B a40ebca2cbc81f479eca69222e679a1abef4c42bd3db8417bd8bcc62c8d15a5ed2f43ae8b55e56870ca037b98de2c424f258d139dff11c0128ac60940f09ace6 SHA512 52cbd47e68b25a7c735d32a4bb51436ea45867cdb9f86bc3a55304674b80d33dcc41f845527659db345e118f2f56036a2265a98a177744b4cb1029c7a18e202e
 DIST routino-3.3.3.tgz 2564198 BLAKE2B 0476e4afb2279c6a93b3d5192a1be580b0ee20fe07b5101c7d590bd3b74873e0205549c2fa621c6444eea0dd0cf0545c9fc054454e04f434d3e57ed750b1df3d SHA512 b037f6ef38b3abef4639d639c3564b42adc742d225108905d0cacb790e4a07593245c537b5550c43874cd6083f37b710b7aec02a0b0669c927804cf30ce34386
-EBUILD routino-3.3.3-r1.ebuild 1646 BLAKE2B 7ab46cb4982c133e993ca2591454d2c3b17f79bf498eebe885165fd4bf9ecb32d8e410ef9b9715bbf7783451c4e4db6b3c232b992e8b8b4ad50098a1f7fbbcf2 SHA512 4f12ebe1c0f8df172fd376307bea487a507b1f81fcbe2ba637979a1b89d82f828446bea2abb8d93eef7314a93b254a6ed79d704122b1bf4bdbff81dbd4e4552a
-EBUILD routino-3.3.3-r2.ebuild 1641 BLAKE2B 2c62da88cb76903330af98f6148f02432f206e58e355ed8866a9ce35cfd46dc97d5cdad1489db5b16a232b1b74c4edef63eef1bd69c4ba5adb754b4ceba85edc SHA512 e933bff3ca4883e74b0f7246676647f163a4e06f13b96e2d79b63a27afa2feb39bc44e42445c753205499c165517e54653435e86f61e205d31a33bdae97cd8de
-EBUILD routino-3.3.3.ebuild 1646 BLAKE2B ea2ffcbf13ac57706fd2f2f33aa0e7a61f02eef638ecead1628f7b8c2fa5ef1faba674e0f23734ba5e7169239ab60f22620fc1fbb84563d8d96980861b5d422d SHA512 f04972ec4cdc6bcbb5b7af24ab2295bf7d430e57c2eb5fe29884cb0bb4c9b02735c4ca310568cabdcb543955970d704f26bcdd5ecf56196752b630081c2947f1
+EBUILD routino-3.3.3-r2.ebuild 1639 BLAKE2B bfedac5a070ae7830d8b31036dd8cf5b3fd86e072f9fa8584b8e553f038b740183b92b297ef869221cf2d02f45f174905840b0fd302f9a15fc2aa0ae4ada4ff5 SHA512 7ca30165b7947eb305c57174d120d7c8f2b717e6adb729dff59499d0a680bdd41aaecc31924a9ac0430c4c4de7d9e2a2c21757290ece5f470ae11899ab3ef240
 MISC metadata.xml 894 BLAKE2B e9854b11005fdab70046e42a963c65a4e921f2d05572c4591e0ee581316a8ba3d3a5a0df39cf2aa500b1a89bde29fd1aaa459962abb68fdc71b49abd9681db54 SHA512 1397fb38a051f523925f04ab1d77044f2bbbcb2957a724696b54d6c057d49d67e758ae3d5b3c925fbce95f35e95c8b3a191724021bb82d4aa35ea61bc2c2153a
diff --git a/sci-geosciences/routino/routino-3.3.3-r1.ebuild b/sci-geosciences/routino/routino-3.3.3-r1.ebuild
deleted file mode 100644
index 19444e92886d..000000000000
--- a/sci-geosciences/routino/routino-3.3.3-r1.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_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{8..10} )
-inherit toolchain-funcs distutils-r1
-
-DESCRIPTION="Routing application based on openstreetmap data"
-HOMEPAGE="https://routino.org/"
-SRC_URI="https://routino.org/download/${P}.tgz"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="python test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	python? (
-		${PYTHON_DEPS}
-		dev-lang/swig[pcre]
-	)
-"
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.3.2.patch )
-
-src_prepare() {
-	default
-
-	sed -i -e "s@libdir=\(.*\)@libdir=\$(prefix)/$(get_libdir)@" \
-		-e "s@CC=gcc@CC=$(tc-getCC)@" \
-		-e "s@LD=gcc@LD=$(tc-getCC)@" \
-		Makefile.conf || die "failed sed"
-}
-
-src_compile() {
-	emake -j1
-	rm README.txt || die "rm README.txt failed"
-	mv doc/README.txt . || die "mv doc/README.txt . failed"
-	if use python; then
-		pushd python > /dev/null
-		python_compile() {
-			rm -f build/.timestamp || die
-			emake PYTHON=${EPYTHON}
-		}
-		python_foreach_impl python_compile
-		popd > /dev/null
-	fi
-}
-
-src_test() {
-	emake test
-#	if use python; then
-#		pushd python > /dev/null
-#		python_test() {
-#			echo "######## ${EPYTHON} ########"
-#			emake PYTHON=${EPYTHON} test
-#		}
-#		python_foreach_impl python_test
-#		popd > /dev/null
-#	fi
-}
-
-src_install() {
-	default
-	if use python; then
-		pushd python > /dev/null
-		python_install() {
-			esetup.py install
-			python_optimize
-		}
-		python_foreach_impl python_install
-		newdoc README.txt README_python.txt
-		popd > /dev/null
-	fi
-
-}
diff --git a/sci-geosciences/routino/routino-3.3.3-r2.ebuild b/sci-geosciences/routino/routino-3.3.3-r2.ebuild
index 1393713d8bf8..215869319f5a 100644
--- a/sci-geosciences/routino/routino-3.3.3-r2.ebuild
+++ b/sci-geosciences/routino/routino-3.3.3-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://routino.org/download/${P}.tgz"
 
 LICENSE="AGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="python test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sci-geosciences/routino/routino-3.3.3.ebuild b/sci-geosciences/routino/routino-3.3.3.ebuild
deleted file mode 100644
index f10841c69c91..000000000000
--- a/sci-geosciences/routino/routino-3.3.3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit toolchain-funcs distutils-r1
-
-DESCRIPTION="Routing application based on openstreetmap data"
-HOMEPAGE="https://routino.org/"
-SRC_URI="https://routino.org/download/${P}.tgz"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="python test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	python? (
-		${PYTHON_DEPS}
-		dev-lang/swig[pcre]
-	)
-"
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.3.2.patch )
-
-src_prepare() {
-	default
-
-	sed -i -e "s@libdir=\(.*\)@libdir=\$(prefix)/$(get_libdir)@" \
-		-e "s@CC=gcc@CC=$(tc-getCC)@" \
-		-e "s@LD=gcc@LD=$(tc-getCC)@" \
-		Makefile.conf || die "failed sed"
-}
-
-src_compile() {
-	emake -j1
-	rm README.txt || die "rm README.txt failed"
-	mv doc/README.txt . || die "mv doc/README.txt . failed"
-	if use python; then
-		pushd python > /dev/null
-		python_compile() {
-			rm -f build/.timestamp || die
-			emake PYTHON=${EPYTHON}
-		}
-		python_foreach_impl python_compile
-		popd > /dev/null
-	fi
-}
-
-src_test() {
-	emake test
-#	if use python; then
-#		pushd python > /dev/null
-#		python_test() {
-#			echo "######## ${EPYTHON} ########"
-#			emake PYTHON=${EPYTHON} test
-#		}
-#		python_foreach_impl python_test
-#		popd > /dev/null
-#	fi
-}
-
-src_install() {
-	default
-	if use python; then
-		pushd python > /dev/null
-		python_install() {
-			esetup.py install
-			python_optimize
-		}
-		python_foreach_impl python_install
-		newdoc README.txt README_python.txt
-		popd > /dev/null
-	fi
-
-}
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 7eeab7b26314..2b389f59bc77 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/foxi/Manifest b/sci-libs/foxi/Manifest
new file mode 100644
index 000000000000..13a9dc7d0725
--- /dev/null
+++ b/sci-libs/foxi/Manifest
@@ -0,0 +1,4 @@
+AUX foxi-2021.05.27-gentoo.patch 2398 BLAKE2B 53ed8efa8c86460768839ef071567632793fadca138d72b5e7f07619db769dbbd2d4497bfb71d63ba47c201b17fb6a415a116ee05f56083c8cbc1a00b147e31a SHA512 4b81687444653d1614226b6696ee6515e652b62746187e0b44dcff1db7bfea653cee4d9e20775d6b8e2aca7430f0f654db3da95e3a784d477373da528b05b39e
+DIST foxi-2021.05.27.tar.gz 28960 BLAKE2B 06c960f829b090eec4fe9e8c981e119578f358724e0b63991173bb7e318d23654261b901d1e15efeb6240bba75cc05fd45ab32fb30bbdf48369e139cf152f398 SHA512 ad42cfd70e40ba0f0a9187b34ae9e3bd361c8c0038669f4c1591c4f7421d12ad93f76f42b33c2575eea1a3ddb3ff781da2895cdc636df5b60422598f450203c7
+EBUILD foxi-2021.05.27.ebuild 545 BLAKE2B 042d2c219e2d64eedec13ec8f08088cb2b974bca10901a75bec3c4cc9f5336a3393887fcb8575007f0d0081678a58c7c7b3c1a60a69f81e0e10b14bb160031d7 SHA512 673a11afbc86b6d9dd01956e391caf26f284a2719a5ce6f2c1489b7b6e9193cceaed00442b2565ae183bdd99a83c342d06e4b9cb7edadf0c1876b4ec0cd3dc34
+MISC metadata.xml 327 BLAKE2B d9b056783fbf66675262cb93b1faf4cd410f1ea34c877480896602f07b1a6e136d7e4168d41725d4b4bd8743155508500e1f9d80b9158acce72bca7a84596953 SHA512 4598a70431dd411d24237ec4b97ec2ab57d9a46fcbcfd3416edfa1623baf7f10599c932ae22d6bd9d69f7898a1e51322ae084ececd2a44c2d73d07cc9817f863
diff --git a/sci-libs/foxi/files/foxi-2021.05.27-gentoo.patch b/sci-libs/foxi/files/foxi-2021.05.27-gentoo.patch
new file mode 100644
index 000000000000..f252ae4fcdb2
--- /dev/null
+++ b/sci-libs/foxi/files/foxi-2021.05.27-gentoo.patch
@@ -0,0 +1,73 @@
+--- a/CMakeLists.txt	2022-06-13 21:42:28.197087591 +0200
++++ b/CMakeLists.txt	2022-06-13 21:44:49.787170054 +0200
+@@ -77,6 +77,7 @@
+     OUTPUT_NAME "foxi"
+     POSITION_INDEPENDENT_CODE YES)
+   target_link_libraries(foxi_wrapper PRIVATE foxi_loader foxi)
++  target_link_options(foxi_wrapper PUBLIC "-Wl,-soname=libfoxi.so")
+   if(DEFINED FOXI_SEARCH_DIR)
+     target_compile_definitions(foxi_wrapper PRIVATE "FOXI_SEARCH_DIR=\"${FOXI_SEARCH_DIR}\"")
+   endif()
+@@ -115,11 +116,11 @@
+ 
+ install(TARGETS
+   foxi foxi_dummy foxi_loader
+-  EXPORT ONNXTargets DESTINATION lib)
++  EXPORT ONNXTargets DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ if(NOT ANDROID AND NOT IOS)
+   install(TARGETS foxi_wrapper
+-    EXPORT ONNXTargets DESTINATION lib)
++    EXPORT ONNXTargets DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ endif()
+ 
+ set(FOXI_INCLUDE_DIRS "${FOXI_ROOT}" "${CMAKE_CURRENT_BINARY_DIR}")
+--- a/foxi/onnxifi_wrapper.c	2022-06-14 08:07:07.351585673 +0200
++++ b/foxi/onnxifi_wrapper.c	2022-06-14 08:11:21.680855591 +0200
+@@ -761,7 +761,9 @@
+     const void* onnxModel,
+     uint32_t weightsCount,
+     const onnxTensorDescriptorV1* weightDescriptors,
+-    onnxGraph* graph)
++    onnxGraph* graph,
++    uint32_t maxSeqLength,
++    void* deferredWeightReader)
+ {
+   if (graph == NULL) {
+     return ONNXIFI_STATUS_INVALID_POINTER;
+@@ -797,7 +799,9 @@
+     onnxModel,
+     weightsCount,
+     weightDescriptors,
+-    &graph_wrapper->graph);
++    &graph_wrapper->graph,
++    maxSeqLength,
++    deferredWeightReader);
+   switch (status) {
+     case ONNXIFI_STATUS_SUCCESS:
+     case ONNXIFI_STATUS_FALLBACK:
+--- a/foxi/onnxifi_dummy.c	2022-06-14 08:14:02.484503254 +0200
++++ b/foxi/onnxifi_dummy.c	2022-06-14 08:17:01.408891030 +0200
+@@ -103,7 +103,9 @@
+     const void* onnxModel,
+     uint32_t weightCount,
+     const onnxTensorDescriptorV1* weightDescriptors,
+-    onnxGraph* graph) {
++    onnxGraph* graph,
++    uint32_t maxSeqLength,
++    void* deferredWeightReader) {
+   if (graph == NULL) {
+     return ONNXIFI_STATUS_INVALID_POINTER;
+   }
+@@ -215,6 +217,8 @@
+ onnxWaitEventFor(onnxEvent event,
+                  uint32_t timeoutMs,
+                  onnxEventState* eventState,
+-                 onnxStatus* eventStatus) {
++                 onnxStatus* eventStatus,
++                 char* message,
++                 size_t* messageLength) {
+   return ONNXIFI_STATUS_SUCCESS;
+-}
+\ No newline at end of file
++}
diff --git a/sci-libs/foxi/foxi-2021.05.27.ebuild b/sci-libs/foxi/foxi-2021.05.27.ebuild
new file mode 100644
index 000000000000..5a3d59c25fd3
--- /dev/null
+++ b/sci-libs/foxi/foxi-2021.05.27.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit cmake
+
+CommitId=c278588e34e535f0bb8f00df3880d26928038cad
+
+DESCRIPTION="ONNXIFI with Facebook Extension"
+HOMEPAGE="https://github.com/houseroad/foxi/"
+SRC_URI="https://github.com/houseroad/${PN}/archive/${CommitId}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=""
+RDEPEND="
+	${DEPEND}
+"
+RESTRICT="test" # No test available
+
+S="${WORKDIR}"/${PN}-${CommitId}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+)
diff --git a/sci-libs/foxi/metadata.xml b/sci-libs/foxi/metadata.xml
new file mode 100644
index 000000000000..2b6c8e44882d
--- /dev/null
+++ b/sci-libs/foxi/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tupone@gentoo.org</email>
+		<name>Tupone Alfredo</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">houseroad/foxi</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-libs/gmsh/Manifest b/sci-libs/gmsh/Manifest
index addb40c730dc..d99868f2dc62 100644
--- a/sci-libs/gmsh/Manifest
+++ b/sci-libs/gmsh/Manifest
@@ -1,6 +1,6 @@
 AUX gmsh-4.9.5-opencascade.patch 1136 BLAKE2B 3613e9a19c76c107eec2090a0a12474d94ac1d548cf6b5137644e3a7834c12a9a8c6dc63d217b8473c385b2ea5bd1ea3d9699e61cbc897bf7cdd121ba00bdff2 SHA512 3774335121ae1d7b4a2369b36e1dab84e9b08eb6336ad1ed6893e0b2260402cb750e202f0244d61c8772d809dd31d95adfb19d8deee5255185c968838e495cd5
 DIST gmsh-4.10.3-source.tgz 14994941 BLAKE2B b9229f81fc8daabdb3b3db3acd50a0a0e602fec1423bc67a0033a02217c908910eeb1f9bd1cbc57fe2d24b566f256b969fe92e9e9ceefe4cd5af34dd07cf1a9e SHA512 863c5a7fe13095afad37b4450855b2079d034222b5a595fc25b2b0d840d8ef63ceafbbf56ea642b3c3e9277faabe08a2cc19a7a3126a8e12e9d4117243244653
 DIST gmsh-4.9.5-source.tgz 14921704 BLAKE2B e805bd786154bf6ce8bebb2d2c38204a88d06a251c45fbe6dd37641a15e02291993c244f26a01faad2a6445a4852274e5481d4236b7a3d9b7ee65fc863f1b880 SHA512 4da61bdf03fb9466af80ac790e83c8888bab755c78d860d601474d7ebca220ac51cba620db310165021412dbecc1cf187ccdff47b8a78e0579339bb72cfa6484
-EBUILD gmsh-4.10.3.ebuild 2553 BLAKE2B d93462b59fcee825f314b78c1bedecc91e038f20a4a6ddae349f80563ff52e63f11ec72c52031bf16cfc3f31403d4492a58583a4fc585311c13b795b8764589d SHA512 c3a9e9e8f7e9d430cbb60db44a6d214fb145073efc7ee17e623d268931fc98910665473e99d551461edf5246e605dc4a74ffd809c6b527f8850ab5adf533f871
-EBUILD gmsh-4.9.5-r2.ebuild 1928 BLAKE2B 1b3fec59cf68b00f49ef86cd8a7eda60d78fe3eff7dfb220d21a44878fbd9af99d2fcd1fb1e2330c4543e3cfeee2b69616d3384fe9682856f8dc19a216b6432a SHA512 3903556958c2453ac820b34ffe764556c856e551b34d8930950ef6618550f678ab5db04c244b6003a6e1bbde30859e2e3512a3873b88f768bdbf876f9825ef0e
+EBUILD gmsh-4.10.3.ebuild 2640 BLAKE2B c0e979a42b57d719bc98962515676fde72740f481d53a214509452c2e4d057b9afacfe40abd4af46b0ff38ad900fb24563e71475ab751b92ef36856910f5a84b SHA512 579b92da1da3480491a2c1be72dfb2acc0fe6cc0715c892ea5bc162085d63d92e2b026f2fbfe0a07cebc1d2fb213e6839a1bd0cdb2ea4e2e09d1a9e5cb0f5508
+EBUILD gmsh-4.9.5-r2.ebuild 1914 BLAKE2B ba0bc6302edfa5e3cc21ae2dee9d4dcb30af22a1941b50bca489382fb93a50d98907bea6a1eb335eb24dc5bfbc797360965cf744f284ec47d1f15e81507695e5 SHA512 c8098c5fd7aa38efa369f3938c8ea958e6a6db91bf57a552e6d32427c1e5de3772520bf4d8980c9767f3eb05b520b872ab0544bceea5b5347b8d3d7855d21537
 MISC metadata.xml 1216 BLAKE2B d7a71c97766032f77b2152313368a583168c20a38b065b048bfdfc774c2b4006939806994751d0aecabd53372f587f846da3e8b7c04baf0e5beaefffc9163702 SHA512 b5cabe48e5ab3ba2e18bded74c15d7c886aac9421e0b18edffc81995cfacf5b11ab787fb68f890c3910e6a99a83ceb3bfef74bb6ce164b536b038c4d40ee6574
diff --git a/sci-libs/gmsh/gmsh-4.10.3.ebuild b/sci-libs/gmsh/gmsh-4.10.3.ebuild
index dfcc71135808..81dc07c58474 100644
--- a/sci-libs/gmsh/gmsh-4.10.3.ebuild
+++ b/sci-libs/gmsh/gmsh-4.10.3.ebuild
@@ -3,15 +3,22 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit cmake fortran-2 python-any-r1 toolchain-funcs
 
-DESCRIPTION="A three-dimensional finite element mesh generator"
-HOMEPAGE="http://www.geuz.org/gmsh/"
-SRC_URI="http://www.geuz.org/gmsh/src/${P}-source.tgz"
-
-LICENSE="GPL-3 free-noncomm"
+DESCRIPTION="Three-dimensional finite element mesh generator"
+HOMEPAGE="https://gmsh.info"
+SRC_URI="https://gmsh.info/src/${P}-source.tgz"
+
+LICENSE="
+	GPL-2+ free-noncomm
+	alglib? ( MIT )
+	gmm? ( LGPL-2.1+ )
+	metis? ( Apache-2.0 )
+	netgen? ( LGPL-2.1+ )
+	voro? ( BSD )
+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 ## cgns is not compiling ATM, maybe fix cgns lib first
@@ -61,7 +68,7 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}"/${P}-source
 
-PATCHES=( "${FILESDIR}"/$PN-4.9.5-opencascade.patch )
+PATCHES=( "${FILESDIR}"/${PN}-4.9.5-opencascade.patch )
 
 pkg_setup() {
 	fortran-2_pkg_setup
diff --git a/sci-libs/gmsh/gmsh-4.9.5-r2.ebuild b/sci-libs/gmsh/gmsh-4.9.5-r2.ebuild
index ece42634909b..48328b69280e 100644
--- a/sci-libs/gmsh/gmsh-4.9.5-r2.ebuild
+++ b/sci-libs/gmsh/gmsh-4.9.5-r2.ebuild
@@ -7,9 +7,9 @@ PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake fortran-2 python-any-r1 toolchain-funcs
 
-DESCRIPTION="A three-dimensional finite element mesh generator"
-HOMEPAGE="http://www.geuz.org/gmsh/"
-SRC_URI="http://www.geuz.org/gmsh/src/${P}-source.tgz"
+DESCRIPTION="Three-dimensional finite element mesh generator"
+HOMEPAGE="https://gmsh.info/"
+SRC_URI="https://gmsh.info/src/${P}-source.tgz"
 
 LICENSE="GPL-3 free-noncomm"
 SLOT="0"
@@ -40,7 +40,7 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}"/${P}-source
 
-PATCHES=( "${FILESDIR}"/$P-opencascade.patch )
+PATCHES=( "${FILESDIR}"/${P}-opencascade.patch )
 
 pkg_setup() {
 	fortran-2_pkg_setup
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index 3724c6b6b94b..f1012174eccd 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -11,5 +11,5 @@ EBUILD hdf5-1.10.5.ebuild 2770 BLAKE2B 33a671a87978ba04e1b43cbc048093f12d6303841
 EBUILD hdf5-1.12.1-r1.ebuild 3468 BLAKE2B da5ba395f8971076a6a3186332f94446dadc7be2817fbb488c612bf4f1b283fc927ea33b7eff23dfbe5b43c1c27a85d72d72ddd4fb617e37a79416fede96bd1b SHA512 96c6c2f95e13a7841f6a9fa63e838ad218819bd0c854c8994a382c15e2f3fff1ae11f099cd613c4b41efa726b1616ead0cf9c4a0d6aedf6d0c7b2d8ca0d8f7ea
 EBUILD hdf5-1.12.1.ebuild 3144 BLAKE2B 2bd023c0ade920fc795f4434260318095a34b200ddb6a458a6ee7d647fac79d4e31029f93a0d2aafede8682e515a9f9c9db46b5a976f07cd83d5086f77538079 SHA512 10ce8493fd3fa421d8c71267e7c57adaac490244742ed93166ce634f5b956b392efb3b86814c17ad8bfba3347c4e3be54b5688b8eec3af848f1d13c341bb8bcc
 EBUILD hdf5-1.12.2-r1.ebuild 3389 BLAKE2B 536c7a51533849c8b19f2a086b35352a9a845d89417ba10464ef53b0ee444fcab2fec0e369d5bdf9a1aa4746c0f004726200db1b60b67b3876eb425504d6d173 SHA512 1ccc6ce4ca8712bdd39d79e5acd82886a592d0578f14162ed374675e9bfcd2e8fe838354acea030298b340c9fac22f250913e205a9e943a4919237c0603766cc
-EBUILD hdf5-1.12.2-r2.ebuild 3457 BLAKE2B 49c04dc4ca35ab12c067b0f305057b6012a01db2bdde56c3ba2d61cec7ccedaf5043d8d356de15b3895d9f392926489142796fba68112c6b631e9e45c5b58a7b SHA512 3d723f4c3f89a474292d6b66d4dfdaa445aec7406d0828337db954b68d006723f025f05ec7557a46c310d07adf799be9898fae2ce6a0b8334eacc99dee50010a
+EBUILD hdf5-1.12.2-r2.ebuild 3456 BLAKE2B d59c684d4494e7f7f484dc87297ef1465998a8f9d75c2cf268e1d689353fd5e092c27dd0a61907ffe11cb35c424e2f9e972a7e3770f0938808bd704cdeca7961 SHA512 4e0b609458298ab12214aa68bb298063d35f64c12c4eff0cc656546b930dce5cc5891e9cdd6d030f7d616aa4ca13386dbbb020970cbea6d939bbe2356fb310ed
 MISC metadata.xml 935 BLAKE2B b9195ac707556cdb2ee2c4d032fabd88aad674ad4fa52a60fbeb31c47ae51b9511bb097d4271d19b05d1dbc3b59b3cafb3b7d407bd9b8095bfd449fa8728ab6a SHA512 57c4694ea2c024c7babdf34474a61b92165b6c322fa11ec7fefdf16d66b44f91f66d63eeb355311b121fbeec8da810e393e3e785a4c434ff658c7b4bd7baf22b
diff --git a/sci-libs/hdf5/hdf5-1.12.2-r2.ebuild b/sci-libs/hdf5/hdf5-1.12.2-r2.ebuild
index ca88f428c005..12d13c181a04 100644
--- a/sci-libs/hdf5/hdf5-1.12.2-r2.ebuild
+++ b/sci-libs/hdf5/hdf5-1.12.2-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.hdfgroup.org/ftp/HDF5/releases/${MAJOR_P}/${MY_P}/src/${MY_
 
 LICENSE="NCSA-HDF"
 SLOT="0/${PV%%_p*}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cxx debug doc examples fortran +hl mpi szip test threads unsupported zlib"
 
 REQUIRED_USE="
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index db2f8c48e669..2a4a56b46b92 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -3,5 +3,5 @@ DIST indilib-1.9.5.1.tar.gz 2420537 BLAKE2B 1be0f19a92cfb9d36ba88fc51adf55f5c397
 DIST indilib-1.9.6.tar.gz 2422813 BLAKE2B 5f45f1c53d4cc459d840aca3a27a9cefcd0b988fda7a4f7a3988aa2ef0b0c7c762403b76676160f14767fd8214b69f8d5ff183fcd4f1d951d7e3d2f1ba42e35b SHA512 f85cec8dc4bda4d4bf5b7787eec409bcebe5e569aa5abc7c21904c8bb8bb471b9c0a505394a0f7ce4965e233191ef859cfc2e76148af51753525788f80cf2ee6
 EBUILD indilib-1.9.2.ebuild 1537 BLAKE2B ae5d0101c31c4bd95bb688856b5113cbdfff59d7a494b98f916378c4e0d86c94d729c48386c04857e8806764d7f9684195b134e099b723408ba3d35259266ebf SHA512 df6496a6fad0246217468105f06ee3a4a368810cbcfaa4907481c230ea7bf8182d683d60292522bc61eeefdcdb75a1f3c28611bf331d86e10732db365e0a8468
 EBUILD indilib-1.9.5.1.ebuild 1538 BLAKE2B 726604e729b18065d8ee12a1411a7eae118311bad40e8c87d2c8d32ce157ce16432665c605ddd8b552f89e09f6915264f382c2812eab186d8e548bd3cc8c5181 SHA512 d3f8de3e30d5a5f8bf7bed35bd84f5e5ce9bb32a589f1c5bbe33f5876f5ddadf326c65196932173b67e02dce88c2adf4a394d84886069166bfd76cca4e50c8f4
-EBUILD indilib-1.9.6.ebuild 1541 BLAKE2B 2eb032352d2c0de268a872be07553bbc1189b35f6da14eb019aa3b3b501b351b1cbe97ab8e3b72e80039464dd3e0705adb3bd9de037b2eaf1ef7dca4d1955c0f SHA512 f9c8bc335a4289332adbfc83c5aa7a1beb8830895210d470cb0af3d0f67ea07aed8c3fe8674294906d6faac0996c653f5e5937190dbd2a14249ca4e43ac9ed27
+EBUILD indilib-1.9.6-r1.ebuild 1617 BLAKE2B 96313407382bd5b172fdddc86efa807af8a2d4751e51e2713d5054523881cabbd144bdcdee64c118b3efa84f0191bcce0a17a47674101d8ffbed989b5203ed17 SHA512 baa8de08f8443dcb00edad9168dccbdec79bf64e8d7307d2c89ccd765644d08935b96d8e160a997534aca0b9c12cf2d0e1fe495b1045c7088da8281c9d0e496d
 MISC metadata.xml 562 BLAKE2B 675fbd88b6ea5004a89e4d86f397e924317f56ad98743d1d8cd9758f92b516cf70386f4eb59c8869451acd6b312c50a05b37a9ca3cedac87599bd90cd46d6ddd SHA512 ebef1f64112d45534b6ea13ce54b2ee57349d11486b881be277d669e984891fe9d8ca3839aadbbece908f55bd027060739460929bd7e0400cd04e639c7d2186f
diff --git a/sci-libs/indilib/indilib-1.9.6.ebuild b/sci-libs/indilib/indilib-1.9.6-r1.ebuild
similarity index 94%
rename from sci-libs/indilib/indilib-1.9.6.ebuild
rename to sci-libs/indilib/indilib-1.9.6-r1.ebuild
index b6d000763a3b..9b77579efd30 100644
--- a/sci-libs/indilib/indilib-1.9.6.ebuild
+++ b/sci-libs/indilib/indilib-1.9.6-r1.ebuild
@@ -18,13 +18,13 @@ IUSE="ogg rtlsdr test websocket"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
+	media-libs/libjpeg-turbo:=
 	net-misc/curl
 	sci-libs/cfitsio:=
 	sci-libs/fftw:3.0=
 	sci-libs/gsl:=
 	sci-libs/libnova:=
 	sys-libs/zlib
-	virtual/jpeg:0
 	virtual/libusb:0
 	ogg? (
 		media-libs/libogg
@@ -67,3 +67,11 @@ src_test() {
 
 	BUILD_DIR="${BUILD_DIR}"/test cmake_src_test
 }
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index 6d17de72a052..0b8b324f320f 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -5,13 +5,16 @@ AUX opencascade-7.5.1-0004-fix-installation-of-cmake-config-files.patch 2207 BLA
 AUX opencascade-7.5.1-0005-fix-write-permissions-on-scripts.patch 2453 BLAKE2B 01b0ec99fb9ad032d6a90cceabb50900528abd0528b53e976484bf02f04eac9bc02b063bce5c221ae88782a126103e8077db9e90aa7f64f4f187dad00354d4d2 SHA512 fb3c374fe8aff8d2bac039a0eef754f2e823a97bfd7860bdd7e047c1b357202abfca0e37b46afc32220c7e354b5edb54805fbbbffde015bb4be2d7f4ded4a8da
 AUX opencascade-7.5.1-0006-fix-creation-of-custom.sh-script.patch 1245 BLAKE2B 1972c41e264a86761f8b3a3a649e67211776d0a4791b7e0f3adc859833e1d62e3a1d964484b2c53a516f5a33680ab2f32ad2010bf3fd531fca36373435307b68 SHA512 a2ffef88cb87acbc8215a7d1d7fe69ee17210392d39a64535d1538b2c08e43f5918c5b5e4a7540e8d636b1ba0df51670013e9d49f205bfc93a1e0d10a04388a7
 AUX opencascade-7.5.1-fix-AllValues-name-collision-with-vtk-9.0.patch 5749 BLAKE2B 9176a738ec6b39a1cd5da61f2d72d096b09f6019f63a5b7733c5aa00796529f2cc5e3becdf5c24cfa01e4ff5b9da5ae9cd359372e6974eeaae7bcdf87e8c03c8 SHA512 5f7970e1461652966c34b1adb6e2580cfd7e3e230abbf108193027f67afbd5e78fc7451b50bf632fa3889174626384e4a0044d693e4f49ab9ece84a2ec6bd04a
+AUX opencascade-7.6.2-avoid-pre-stripping-binaries.patch 1187 BLAKE2B fbfc9f3aafc4e69259cc37e82c266f7af979716bed7d80fd0f680b4b6d6fdad3b26b0214f06fbbc8ee09db08602572a4543ad0aa8ec7b1af98139312cdba291d SHA512 04c7f37e42eeafe6d8ee99df8c50bb5bf8bbc90c8b958fcf486adbfbf79fcba60c4a3bbbf7495388096f5902b0af7280f0561556eae6e6f030b73850df55ca2c
 AUX opencascade.env.in 4571 BLAKE2B 81780f83a476ba5a2691c003c7fde48fec14be4e355480080749800602307d64b88f779cde09aa94a7bb815849d669b054d5ca00908199d1a9857b07518b4f0d SHA512 98e6861469725f6880e38a2d7389f7bc748bcbdf54930aa3fe05ab6a5e1fab5249c4ffed4f45b6ef982325acece0d5acb7ffd8d92adac9be2db9a41ee5356019
 DIST opencascade-7.5.2.tar.gz 47812603 BLAKE2B 86995ea60e24329f91a2cbede26112a70794fb091b34d33614bef412b05b8cc9f1e770aecf78272b54a241c2524422c86f8ff722b3f27b54bf10fa5eda626288 SHA512 f951a941043a56f381cfd25e4d78bb9ae08e5cc29a894e6c0c35daf30aeabf1e44ee09af65bb6b7d62d9325be67741ddcf52266b7186b4c336c70ed8bcfa1676
 DIST opencascade-7.5.3.tar.gz 47817862 BLAKE2B be438a08997c18c3cb2c08c520fff2f439cc8a406cc3f471be3b24f874ac3bd892c4afe6fa37f742ffb5da21b5a29f9c8f737e3160dcbda35a217286218eb5e1 SHA512 2d7cf284a1b3ce8d05151085b41579cc2f4e29489b7920769cd04f86a6d76e49f533b570226d3cf041c75582894ed8a6aff889312c7c507fffae47d3e57c5c47
 DIST opencascade-7.6.0.tar.gz 48193117 BLAKE2B c16cd096f20e90267a00b6be21b17b22b491cf5d9aa1a311d64d7707042dc88380c60ececceb6728dbcdd4ff56a67558144292950e11518b21cbc49ace4e88cd SHA512 6839eb6641b9e0752474fce11cf1756223067febe0f5bcd5db249e3eccef29517a6952c124aae818220b6360070a792dacd1b0b4ce970b8351ce38598f31b4be
 DIST opencascade-7.6.1.tar.gz 48201174 BLAKE2B 7d13f0e17dfb9261ae77de9e66cf93053803313ac6848b3412a147f311e935c4ea9c930c7c9948bbce1f0172365ea9d326047f42b967ecdee435d68325093c61 SHA512 1466d95eea7539f5cf52a40ada712b2b0cfb9c1970271f5ea60d0408a1c3f1ae16b885dd36c3c0fcef3cedb05c420a7c637ee5168b5b081b0f55068cda412bb0
-EBUILD opencascade-7.5.2-r6.ebuild 4875 BLAKE2B 93f24e242694925b475e8d249c75c62143a78ec41c4a60af3fe550a27784f29d1c54b2b8eb0746498f0e769fd3d3a193fdeb0e718097d45579297cc227dcf249 SHA512 aa04fbc7dc6aa26a2a853e03f14aae2174ec84204d6956dc22943338df5b20b865adb2de034c418c35abdff8537cc5dbd3ab40ab06cb167d1aec460130f3036d
-EBUILD opencascade-7.5.3-r7.ebuild 4874 BLAKE2B c0fc9acb4cf8ddd470ebb2f2cc2e545066bad3095d0e91a1f099c236b943921f72cdb07a56c7c5eff8948fc9efe3fb6d7673cb40dc2a680807d583c97887db97 SHA512 93ee787e74efe89c9ec13d7c84254b5b937c732543a60997bcd98ee20566bdf78deee554b4f7bb67375c359a5b46a111c47484e82bfdfd3e0a3e54ba1b769ce7
-EBUILD opencascade-7.6.0-r4.ebuild 4578 BLAKE2B 78ce165fe7d9a9304bcf2e7fcc546624863dc434d815cc6847badc34a3efda944516315b45de71238293e122e47b69f888882afcb9a7733c2194ba24b83912b4 SHA512 870dfd871d3f21d533e9303e0c0506ca96da2b5e556312141c1ad5c71f877463854de99c9d30a32a758c7bc7e0bce534b5ccc4381dcc619e09717e2bfd573a51
-EBUILD opencascade-7.6.1-r1.ebuild 4578 BLAKE2B 78ce165fe7d9a9304bcf2e7fcc546624863dc434d815cc6847badc34a3efda944516315b45de71238293e122e47b69f888882afcb9a7733c2194ba24b83912b4 SHA512 870dfd871d3f21d533e9303e0c0506ca96da2b5e556312141c1ad5c71f877463854de99c9d30a32a758c7bc7e0bce534b5ccc4381dcc619e09717e2bfd573a51
+DIST opencascade-7.6.2.tar.gz 48207505 BLAKE2B 62d0015fdd6321036c4be02214730da46339d7032eec84969164497d1138bc8125c025f1af55beb3587e456845dbfa04596375085d694c0d2b5bc787ee18abeb SHA512 fa3874f0a7783c03fec863f28b87430ad794d1397147aa2c51604599bdd1510b08c8d98de799fef724100db5de5696eeeb170149a38228774864c692861f8ccc
+EBUILD opencascade-7.5.2-r6.ebuild 4937 BLAKE2B 7e864ea1414609e1475b222628d880142496e3e0cb0d5d1dbc850d92a484a17f2c7287b3d214ee9bf6d11ea11a2bbb427b8d28ccd6efafbc4b94de5747f56b1e SHA512 f689e21037b0aef011b2e9946d498eeaf52161e286a4112976c534f043e5aeab50a18fe67f49599a990d89c660cc37df4fde638657faa7e258774efad56d4ec2
+EBUILD opencascade-7.5.3-r7.ebuild 4936 BLAKE2B 16577288fe0ee953ca7343d4ed8709e3c8ac0bddc076e95d990abcaccf6d2968ad46978bfef56e7efd7f2c86a378bf874511504fc7e4b890e1540c3b08eace72 SHA512 5e4f0491f9a7aadf557dfccf2b2aaa62e568f7e49f1717e2660ed65bb99bd3716302d300d89fd0b2ad2e5ac55c664ef3b20fc841c521c4fa4acc929acbafa376
+EBUILD opencascade-7.6.0-r4.ebuild 4640 BLAKE2B 8104883094e99cbd458ff8f371d5ed5c0c0f7f136c8f8f3e664335a55765598a9bfedab84f16bb150a2fdace204bef978cc84a63ccd66911de4dd9c7643d0811 SHA512 1b5962dd11eacebaa86e1edfb9d37f3285b24d1229c581349ee6d722c077f47ce917b380acfa3093c1dd7d043e1e7ce7e8d203eb27f9c9ce4a8df927879400fe
+EBUILD opencascade-7.6.1-r1.ebuild 4640 BLAKE2B 8104883094e99cbd458ff8f371d5ed5c0c0f7f136c8f8f3e664335a55765598a9bfedab84f16bb150a2fdace204bef978cc84a63ccd66911de4dd9c7643d0811 SHA512 1b5962dd11eacebaa86e1edfb9d37f3285b24d1229c581349ee6d722c077f47ce917b380acfa3093c1dd7d043e1e7ce7e8d203eb27f9c9ce4a8df927879400fe
+EBUILD opencascade-7.6.2.ebuild 4659 BLAKE2B 95609c31c383ace2fe16fc1d07cdd40a28ff1eb5e588defd16d4108ff698fc99247cc5e9f52fe5252a86f8eadb2760f1dda19b6714bd6229cba710fe8232baa7 SHA512 268dd49fe2ea0d07fe8eccfe8104df89aae2cdeadf024256102a8634acf673d290d4905d0ffb0aa518c8087052d843cd9d4f7ac60cb9b8886fbba66ff10c4d0d
 MISC metadata.xml 1102 BLAKE2B 8569899b7ab437a4115ced11d3421f063d99233ed81bb5360228e580b20af2ee9753b41a8b3cb1291550160fa627058d915fde0e23514dcbed0f9cddc961ae11 SHA512 e9a38c41beec8eb54d6b9232447df3bc05635318f8dc727ddebc5f13be4d58b8d10576ddbb07a9fef41ba2adeb7ba1abcb4e10087b4711c4ff348d873c4916a8
diff --git a/sci-libs/opencascade/files/opencascade-7.6.2-avoid-pre-stripping-binaries.patch b/sci-libs/opencascade/files/opencascade-7.6.2-avoid-pre-stripping-binaries.patch
new file mode 100644
index 000000000000..144047fba163
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.6.2-avoid-pre-stripping-binaries.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/831800
+https://dev.opencascade.org/content/dont-pre-strip-binaries
+
+From 88e59e0199daaf66184833e366e9deb1299078a9 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Sun, 5 Jun 2022 09:48:09 +0200
+Subject: [PATCH] avoid pre-stripping binaries
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/adm/cmake/occt_defs_flags.cmake
++++ b/adm/cmake/occt_defs_flags.cmake
+@@ -133,8 +133,6 @@ if ("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xClang")
+     # does not support option "-std=c++0x"
+     set (CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS}")
+   endif()
+-  # Optimize size of binaries
+-  set (CMAKE_SHARED_LINKER_FLAGS "-Wl,-s ${CMAKE_SHARED_LINKER_FLAGS}")
+ elseif(MINGW)
+   add_definitions(-D_WIN32_WINNT=0x0601)
+   # _WIN32_WINNT=0x0601 (use Windows 7 SDK)
+@@ -150,9 +148,6 @@ elseif(MINGW)
+ elseif (DEFINED CMAKE_COMPILER_IS_GNUCXX)
+   # Require C++11
+   set (CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS}")
+-  # Optimize size of binaries
+-  set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")
+-  set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s")
+ endif()
+ 
+ if (BUILD_RELEASE_DISABLE_EXCEPTIONS)
+-- 
+2.35.1
+
diff --git a/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild b/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild
index 4ba6a2ccee23..d4500132ab1f 100644
--- a/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild
@@ -67,6 +67,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-7.5.1-0005-fix-write-permissions-on-scripts.patch
 	"${FILESDIR}"/${PN}-7.5.1-0006-fix-creation-of-custom.sh-script.patch
 	"${FILESDIR}"/${PN}-7.5.1-fix-AllValues-name-collision-with-vtk-9.0.patch
+	"${FILESDIR}"/${PN}-7.6.2-avoid-pre-stripping-binaries.patch
 )
 
 src_prepare() {
diff --git a/sci-libs/opencascade/opencascade-7.5.3-r7.ebuild b/sci-libs/opencascade/opencascade-7.5.3-r7.ebuild
index 7dc58dcd6393..8287de53da6b 100644
--- a/sci-libs/opencascade/opencascade-7.5.3-r7.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.3-r7.ebuild
@@ -67,6 +67,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-7.5.1-0005-fix-write-permissions-on-scripts.patch
 	"${FILESDIR}"/${PN}-7.5.1-0006-fix-creation-of-custom.sh-script.patch
 	"${FILESDIR}"/${PN}-7.5.1-fix-AllValues-name-collision-with-vtk-9.0.patch
+	"${FILESDIR}"/${PN}-7.6.2-avoid-pre-stripping-binaries.patch
 )
 
 src_prepare() {
diff --git a/sci-libs/opencascade/opencascade-7.6.0-r4.ebuild b/sci-libs/opencascade/opencascade-7.6.0-r4.ebuild
index cd8196d34d06..41e15cf2bd76 100644
--- a/sci-libs/opencascade/opencascade-7.6.0-r4.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.0-r4.ebuild
@@ -64,6 +64,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-7.5.1-0004-fix-installation-of-cmake-config-files.patch
 	"${FILESDIR}"/${PN}-7.5.1-0005-fix-write-permissions-on-scripts.patch
 	"${FILESDIR}"/${PN}-7.5.1-0006-fix-creation-of-custom.sh-script.patch
+	"${FILESDIR}"/${PN}-7.6.2-avoid-pre-stripping-binaries.patch
 )
 
 src_prepare() {
diff --git a/sci-libs/opencascade/opencascade-7.6.1-r1.ebuild b/sci-libs/opencascade/opencascade-7.6.1-r1.ebuild
index cd8196d34d06..41e15cf2bd76 100644
--- a/sci-libs/opencascade/opencascade-7.6.1-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.1-r1.ebuild
@@ -64,6 +64,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-7.5.1-0004-fix-installation-of-cmake-config-files.patch
 	"${FILESDIR}"/${PN}-7.5.1-0005-fix-write-permissions-on-scripts.patch
 	"${FILESDIR}"/${PN}-7.5.1-0006-fix-creation-of-custom.sh-script.patch
+	"${FILESDIR}"/${PN}-7.6.2-avoid-pre-stripping-binaries.patch
 )
 
 src_prepare() {
diff --git a/sci-libs/opencascade/opencascade-7.6.2.ebuild b/sci-libs/opencascade/opencascade-7.6.2.ebuild
new file mode 100644
index 000000000000..7914fe259a7e
--- /dev/null
+++ b/sci-libs/opencascade/opencascade-7.6.2.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_PV="$(ver_rs 1- '_')"
+MY_SLOT="$(ver_cut 1-2)"
+
+DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
+HOMEPAGE="https://www.opencascade.com"
+SRC_URI="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/V${MY_PV};sf=tgz -> ${P}.tar.gz"
+S="${WORKDIR}/occt-V${MY_PV}"
+
+LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
+SLOT="0/${MY_SLOT}"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="doc eigen examples ffmpeg freeimage gles2 json optimize tbb vtk"
+
+REQUIRED_USE="?? ( optimize tbb )"
+
+# There's no easy way to test. Testing needs a rather big environment
+# properly set up.
+RESTRICT="test"
+
+# ffmpeg: https://dev.opencascade.org/content/build-error-when-compiling-against-ffmpeg-5
+RDEPEND="
+	!app-eselect/eselect-opencascade
+	dev-lang/tcl:=
+	dev-lang/tk:=
+	dev-tcltk/itcl
+	dev-tcltk/itk
+	dev-tcltk/tix
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/ftgl
+	virtual/glu
+	virtual/opengl
+	x11-libs/libXmu
+	examples? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtquickcontrols2:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+	)
+	ffmpeg? ( <media-video/ffmpeg-5:= )
+	freeimage? ( media-libs/freeimage )
+	tbb? ( <dev-cpp/tbb-2021.4 )
+	vtk? ( sci-libs/vtk:=[rendering] )
+"
+DEPEND="
+	${RDEPEND}
+	eigen? ( dev-cpp/eigen )
+	json? ( dev-libs/rapidjson )
+	vtk? ( dev-libs/utfcpp )
+"
+BDEPEND="
+	doc? ( app-doc/doxygen[dot] )
+	examples? ( dev-qt/linguist-tools:5 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.5.1-0004-fix-installation-of-cmake-config-files.patch
+	"${FILESDIR}"/${PN}-7.5.1-0005-fix-write-permissions-on-scripts.patch
+	"${FILESDIR}"/${PN}-7.5.1-0006-fix-creation-of-custom.sh-script.patch
+	"${FILESDIR}"/${P}-avoid-pre-stripping-binaries.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e 's|/lib\$|/'$(get_libdir)'\$|' \
+		-i adm/templates/OpenCASCADEConfig.cmake.in || die
+
+	# There is an OCCT_UPDATE_TARGET_FILE cmake macro that fails due to some
+	# assumptions it makes about installation paths. Rather than fixing it, just
+	# get rid of the mechanism altogether - its purpose is to allow a
+	# side-by-side installation of release and debug libraries.
+	sed -e 's|\\${OCCT_INSTALL_BIN_LETTER}||' \
+		-i adm/cmake/occt_toolkit.cmake || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DOC_Overview=$(usex doc)
+		-DBUILD_Inspector=$(usex examples)
+		-DBUILD_RELEASE_DISABLE_EXCEPTIONS=OFF # bug #847916
+
+		-DINSTALL_DIR_BIN="$(get_libdir)/${PN}/bin"
+		-DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${PN}"
+		-DINSTALL_DIR_DATA="share/${PN}/data"
+		-DINSTALL_DIR_DOC="share/doc/${PF}"
+		-DINSTALL_DIR_INCLUDE="include/${PN}"
+		-DINSTALL_DIR_LIB="$(get_libdir)/${PN}"
+		-DINSTALL_DIR_RESOURCE="share/${PN}/resources"
+		-DINSTALL_DIR_SAMPLES="share/${PN}/samples"
+		-DINSTALL_DIR_SCRIPT="$(get_libdir)/${PN}/bin"
+		-DINSTALL_DIR_WITH_VERSION=OFF
+		-DINSTALL_SAMPLES=$(usex examples)
+		-DINSTALL_TEST_CASES=NO
+
+		-DUSE_D3D=NO
+		# no package yet in tree
+		-DUSE_DRACO=OFF
+		-DUSE_EIGEN=$(usex eigen)
+		-DUSE_FFMPEG=$(usex ffmpeg)
+		-DUSE_FREEIMAGE=$(usex freeimage)
+		-DUSE_FREETYPE=ON
+		-DUSE_GLES2=$(usex gles2)
+		# no package in tree
+		-DUSE_OPENVR=OFF
+		-DUSE_RAPIDJSON=$(usex json)
+		-DUSE_TBB=$(usex tbb)
+		-DUSE_VTK=$(usex vtk)
+		-DUSE_XLIB=ON
+	)
+
+	use doc && mycmakeargs+=( -DINSTALL_DOC_Overview=ON )
+
+	if use examples; then
+		mycmakeargs+=(
+			-D3RDPARTY_QT_DIR="${ESYSROOT}"/usr
+			-DBUILD_SAMPLES_QT=ON
+		)
+	fi
+
+	if use vtk; then
+		if has_version ">=sci-libs/vtk-9.1.0"; then
+			mycmakeargs+=(
+				-D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr
+				-D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.1
+				-D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir)
+			)
+		elif has_version ">=sci-libs/vtk-9.0.0"; then
+			mycmakeargs+=(
+				-D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr
+				-D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.0
+				-D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir)
+			)
+		fi
+	fi
+
+	cmake_src_configure
+
+	sed -e "s|lib/|$(get_libdir)/|" \
+		-e "s|VAR_CASROOT|${EPREFIX}/usr|" \
+		< "${FILESDIR}"/${PN}.env.in > "${T}"/99${PN} || die
+
+	# use TBB for memory allocation optimizations
+	if use tbb; then
+		sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=2|' -i "${T}"/99${PN} || die
+	fi
+
+	# use internal optimized memory manager and don't clear memory with this
+	# memory manager.
+	if use optimize ; then
+		sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=1|' \
+			-e 's|^#MMGT_CLEAR=1$|MMGT_CLEAR=0|' \
+			-i "${T}"/99${PN} || die
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	doenvd "${T}/99${PN}"
+
+	docompress -x /usr/share/doc/${PF}/overview/html
+}
diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest
index 3e62713f18e0..ab7fbd32ff95 100644
--- a/sci-libs/plplot/Manifest
+++ b/sci-libs/plplot/Manifest
@@ -6,5 +6,5 @@ AUX plplot-5.15.0-ocaml-rpath.patch 9583 BLAKE2B b475580f9e4da0ab660dc2d0dfbdbbf
 AUX plplot-5.15.0-ocaml.patch 3424 BLAKE2B ba1c9f758c319a76b0a457a287ee6934ee39300401e2d9a364c70446e12af679ce55c22eda0bf7aa7cb621fd4c76f56268afa649ba935a716495049f41706187 SHA512 1387625d1e784fb92ab3279a342c08d8f85fc055e0c69ce1af9656492102072c7a1d5a6498f8758dc3fd35e0543e80b65cd315641886f9baff60f7740583a0e3
 AUX plplot-5.9.6-python.patch 379 BLAKE2B cf08250c851c3405517183e8f3425f42ede2f850cc8bcd89828e3e1b89035731a8a3face0988750e9f9e5dce2fa0404b23b2721c5b315ff61aeac552fd6e05f2 SHA512 cb2022bda3d5408ef0b2dc280981ad8bdb2f7ecb20d827f7e71ce063fba60963e68aeaa5efd8eef87da8e3dc270b609f7cb342c1da175cd757c9f135173842e4
 DIST plplot-5.15.0.tar.gz 15380293 BLAKE2B 41f359c4e86c7a26fe53a9d82a9f02aeb97b5b6f44abca590621640c56e50a62823e8a03165a939689f5456cee419b8292ea34faccd07641bd4a953b6f1d73fe SHA512 54533245569b724a7ef90392cc6e9ae65873e6cbab923df0f841c8b43def5e4307690894c7681802209bd3c8df97f54285310a706428f79b3340cce3207087c8
-EBUILD plplot-5.15.0-r102.ebuild 7490 BLAKE2B b6eec0097527b227142d257e2e452c08d95a4b955cb42ba2433bf9671e55f7863f6d3d8c44072f183a656370b9294937faf73a8f1d370530a906a1d6ae4d0e13 SHA512 9dcb96928d40aba19f409d57343a426dc8bcfcb5504e2ab34730a5e1e1987821294a0ed8c24ab1a3a98cefa5433793fffe1c93289a9ef5e9d4c47cd508784fe1
+EBUILD plplot-5.15.0-r102.ebuild 7492 BLAKE2B a1ed7f8dda2ce12f77f73d7f30cef9c24f21ee53bf29a6a4f9fb17ff0304b73b7b027a98625d5a6986037753c454d877038b2dce9d8407467e96b0c382ebdcfc SHA512 19802f27b50ad824c997409be0ebc5cd8bd4af5fb72c2e44fe3d8c16b131944dbb62109e6bd2f76b8a9b81174bf591bfa6a20bf533121e22fc6d01e310a4a1ac
 MISC metadata.xml 1421 BLAKE2B a15479caf11e0f90cb45613ee48ca2d4270a18b57b8f409d4687cee5c55f660fca46a8a2a36c3c1c4a5d02a4c964b1d8db6ea4112039af8bcda808e50b4bf1f1 SHA512 fc99a3225ce54af9945e8fec3cd96f9c75cdc74b8ad4d5362bd5b1529b3872eddd06a190ea9f1cafa727d28e3e2086a27ecd5db89afd993d844ba8f299f2f317
diff --git a/sci-libs/plplot/plplot-5.15.0-r102.ebuild b/sci-libs/plplot/plplot-5.15.0-r102.ebuild
index c4d312740e5a..fca868efceea 100644
--- a/sci-libs/plplot/plplot-5.15.0-r102.ebuild
+++ b/sci-libs/plplot/plplot-5.15.0-r102.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 WX_GTK_VER=3.0-gtk3
 FORTRAN_NEEDED=fortran
 LUA_COMPAT=( lua5-1 )
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 # fails with ninja, due to USE=java missing swig output dependencies
 CMAKE_MAKEFILE_GENERATOR=emake
 
diff --git a/sci-libs/trilinos/Manifest b/sci-libs/trilinos/Manifest
index d3602141c9d5..2be47572d150 100644
--- a/sci-libs/trilinos/Manifest
+++ b/sci-libs/trilinos/Manifest
@@ -1,7 +1,10 @@
 DIST trilinos-13.0.0-patches-r0.tar.xz 7672 BLAKE2B 6412f1226549086ef2fca3c4d8bba3c5541489879f4fa37c3598a7271128e3232fa1cc56a51d44fb88d679458a79a082c3984085ddbe4bc0884b0cb45ba683c0 SHA512 91372fe0f47a1f5d4dbc1856e2cfb9d4f1eb8cc0de941013a7a6e791730c9e10decdcd4ca39b36bae836ac66040bee70af187b4a056d46b0da0fe72e8c5943fc
 DIST trilinos-13.0.1.tar.gz 157950374 BLAKE2B 79f337b02a0fe9ddf7b55334e035946204b3bb469b92fff4063896a378c82d9c5f04c0bf0e9ddd21603ecf9d84a91860606482b545916f16029a11d2b6c64aa0 SHA512 22241a9ad8b6b6ab9117aba254f65195fc0c8e1b52eacb16e763c999086b6da6b0c180d8864fbe421704e0fe0c433d37512099755d54e60f13ed525dc6c0fd57
+DIST trilinos-13.2.0-patches-r0.tar.xz 7896 BLAKE2B 7bd482fd17c7a9a0f7d536f6e65ac49d5921daf82d22803aab8cf3b24e9ce7776b5c68b20c3efdd4b1b83e558b3be3386a61ca637066828e4d535c2b0bc85138 SHA512 14824c9998152bd044d048da07787cde94636dda99999c25ad2c5d66cd59b1975bcf0618a48fe2a28d44c6e3769f2fcabc09b0ba21dca9a6beecf278c1ad2bff
+DIST trilinos-13.2.0.tar.gz 165860771 BLAKE2B 9ea8b27fd37a277aa1a988659919a012928edfd8b57a0fde240d9b9dce2832ab08fc0daf780aaab2a1422337bd02eddd6301fee203ab7ba4c213391cccd3be83 SHA512 b16dc9a815c8983f44786aac537b1b4ad7a43721eb553d6d33f07188280988f4297b4978b36d2d837a43faf16b518db29bf9b7997549318e3c95fd366eb16bc9
 DIST trilinos-13.4.0-patches-r0.tar.xz 8740 BLAKE2B 333ab9ff1acb2f4b08007c7b99b96f023f6c742e4f991fc0ab9dd6595be7e3e319a77d5e329790cedca72d7a9060df837549d28e8a6cb4b8a838570d455ae356 SHA512 f30c16801cadec2a612ab2f7d3ca05c5ddfdfc513343a182562253cdfb58d38fa8b771ab07f7bc6bcb2505d146469da2ddda478f74447de746d5eca850da123e
 DIST trilinos-13.4.0.tar.gz 168733479 BLAKE2B 3c4a1c89b792ec771c6347eebb6bb54a82fa5f172d1c5934bbd42c8bc9708a71451bd030ec0f5264191a62169b3c1305ac7a1290b3ab4845fb6e8ffef15ee03c SHA512 27a5636bac8106a0705948ca4705b739878f0d8afa74264d1cd31036811084457e27e03e86dfad59a80d5e9ee798237fa930b50574ec3e43979e53c6ab5da535
 EBUILD trilinos-13.0.1-r4.ebuild 6593 BLAKE2B 84736d151a7412e84999a31cc60a91a89e717d5d8c889c2e765403811b3db0fe7dbb4958f0363cb1dbabcd33827603a46dcfc9e13f97ac0dc83aee9d5f59ad64 SHA512 ccdbdb5ad13aac787d33b3259683b1e6f71e6ba875928b6f52a1b3e89ded59892c4160046cf9a3ea763433966137788fc4abc879ad182bf866b194855e57bf2f
-EBUILD trilinos-13.4.0-r1.ebuild 6602 BLAKE2B a2e2655b4abddca6332cd170fc13aebef0121e2eb429cab7073cdcdfd96e2d0272bd6002123d34551e4268fa4edfe013df42f1f92aa393ec1d39f72a9a0de989 SHA512 f6799f5edb1d8d7e232c71eb860f4f372419de7f08bb5cc1e06e023cc6daf4ee649b8603874befda15f00015c132c48720c3d114b1d5f11d99fdf60af18a6fb4
-MISC metadata.xml 2701 BLAKE2B 3899b8aa8424eca96d406c0ae3d66d30ed0d44a2070c9e5844b456730b89d8017feba10c5c75e1bcd6d3649a6ba37d044fa14f2822eb883b2b72bdb1667c32c7 SHA512 888dc051b32d4b3e227d3cca17bf64ec5885169c59669944a522d5d304ea2a5fa19854524b48e61ae3bb6c8483e717329d6384836301b691f6de15f6d13ed114
+EBUILD trilinos-13.2.0.ebuild 7360 BLAKE2B 92e46832f36d7de4a70967fb78a59b660f004c945624b3cc2b1d9c27b1d0172f99351fe55b17e545dce981b57895455d1c2e48ac5814b6517bedb582de66e313 SHA512 29d2d07511bb19c90353850a5573f6c4f7674134c2e24bfc77d371b86fab2ca229c81e13989463b5c35706016c417d24a0b77e34826cc427b42db3d9d75c85d0
+EBUILD trilinos-13.4.0-r3.ebuild 7360 BLAKE2B e166d328c767fd6a0ca36544e3911d0076f47dcf3c4a169a4dfea2d87871bd0a4f157bb59fe8afaa78f13264d3a3e200c488e6f05b6558c12153fa83f20ef033 SHA512 9a1c3cdab829e20806a0f4ccd95c41910fc7358e08db8ef20a7042e059af91945a5628e5dd4674560b43ba4bdd31ec38d2dab228374e25fa800f3f7223ba3816
+MISC metadata.xml 2812 BLAKE2B 2e800301cbcdb1e1a4fecb285a4e98901cf4dae3e84b33a257fd14be86a762fe396541480187044c0787ade12b8b3b142535352e29afbb2bcb1435d7016e47a0 SHA512 91c25350aac731a5a57b8def2678147e35b8e58e447bb02688f89fd3aca76728af1e85df1aedcc208a8dd7cf19118a69867d907ccf1ff6bb0fcb7c27cd701253
diff --git a/sci-libs/trilinos/metadata.xml b/sci-libs/trilinos/metadata.xml
index 8e99b0a5654f..75b56d669dac 100644
--- a/sci-libs/trilinos/metadata.xml
+++ b/sci-libs/trilinos/metadata.xml
@@ -16,6 +16,7 @@ of large-scale, complex multi-physics engineering and scientific problems.
 </longdescription>
 	<use>
 		<flag name="adolc">Add support for adolc (<pkg>sci-libs/adolc</pkg>)</flag>
+		<flag name="all-packages">Enable all supported Trilinos packages (per default only a subset is built)</flag>
 		<flag name="arprec">Add support for arprec (<pkg>sci-libs/arprec</pkg>)</flag>
 		<flag name="clp">Add support for clp (<pkg>sci-libs/coinor-clp</pkg>)</flag>
 		<flag name="cuda">Add support for cuda (<pkg>dev-util/nvidia-cuda-toolkit</pkg>)</flag>
diff --git a/sci-libs/trilinos/trilinos-13.2.0.ebuild b/sci-libs/trilinos/trilinos-13.2.0.ebuild
new file mode 100644
index 000000000000..b4df7074f964
--- /dev/null
+++ b/sci-libs/trilinos/trilinos-13.2.0.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR=emake
+inherit cmake toolchain-funcs
+
+DESCRIPTION="Scientific library collection for large scale problems"
+HOMEPAGE="http://trilinos.sandia.gov/"
+MY_PV="${PV//\./-}"
+PATCHSET="r0"
+SRC_URI="https://github.com/${PN}/Trilinos/archive/${PN}-release-${MY_PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~tamiko/distfiles/${P}-patches-${PATCHSET}.tar.xz"
+
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+LICENSE="BSD LGPL-2.1"
+SLOT="0"
+
+IUSE="
+	adolc all-packages arprec clp cuda eigen glpk gtest hdf5 hwloc hypre
+	matio metis mkl mumps netcdf openmp petsc qd scalapack scotch
+	sparse superlu taucs tbb test threads tvmet yaml zlib X
+"
+
+# TODO: fix export cmake function for tests
+RESTRICT="test"
+
+RDEPEND="
+	!dev-cpp/kokkos
+	dev-libs/boost:=
+	sys-libs/binutils-libs:=
+	virtual/blas
+	virtual/lapack
+	virtual/mpi
+	adolc? ( sci-libs/adolc )
+	arprec? ( sci-libs/arprec )
+	clp? ( sci-libs/coinor-clp )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-3.2 )
+	eigen? ( dev-cpp/eigen:3 )
+	glpk? ( sci-mathematics/glpk )
+	gtest? ( dev-cpp/gtest )
+	hdf5? ( sci-libs/hdf5:=[mpi] )
+	hypre? ( sci-libs/hypre:= )
+	hwloc? ( sys-apps/hwloc:= )
+	matio? ( sci-libs/matio )
+	mkl? ( sci-libs/mkl )
+	metis? ( sci-libs/metis )
+	mumps? ( sci-libs/mumps )
+	netcdf? ( sci-libs/netcdf:= )
+	petsc? ( sci-mathematics/petsc )
+	qd? ( sci-libs/qd )
+	scalapack? ( sci-libs/scalapack )
+	scotch? ( sci-libs/scotch:= )
+	sparse? ( sci-libs/cxsparse sci-libs/umfpack )
+	superlu? ( sci-libs/superlu:= )
+	taucs? ( sci-libs/taucs )
+	tbb? ( dev-cpp/tbb:= )
+	tvmet? ( dev-libs/tvmet )
+	yaml? ( dev-cpp/yaml-cpp:= )
+	zlib? ( sys-libs/zlib )
+	X? ( x11-libs/libX11 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/Trilinos-${PN}-release-${MY_PV}"
+
+PATCHES=(
+	"${WORKDIR}"/patches
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+trilinos_conf() {
+	local dirs libs d
+	for d in $($(tc-getPKG_CONFIG) --libs-only-L $1); do
+		dirs="${dirs};${d:2}"
+	done
+	[[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_LIBRARY_DIRS=${dirs:1}" )
+	for d in $($(tc-getPKG_CONFIG) --libs-only-l $1); do
+		libs="${libs};${d:2}"
+	done
+	[[ -n ${libs} ]] && mycmakeargs+=( "-D${2}_LIBRARY_NAMES=${libs:1}" )
+	dirs=""
+	for d in $($(tc-getPKG_CONFIG) --cflags-only-I $1); do
+		dirs="${dirs};${d:2}"
+	done
+	[[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_INCLUDE_DIRS=${dirs:1}" )
+}
+
+#
+# The following packages are currently disabled:
+#  - Adelus/Zadelus due to underlinkage.
+#  - Moertel due to underlinkage
+#  - SEACAS is incompatible with netcdf, see
+#    https://github.com/trilinos/Trilinos/tree/master/packages/seacas#netcdf
+#
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"
+		-DCMAKE_SKIP_INSTALL_RPATH=ON
+		-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF
+		-DTrilinos_INSTALL_CONFIG_DIR="${EPREFIX}/usr/$(get_libdir)/cmake"
+		-DTrilinos_INSTALL_INCLUDE_DIR="${EPREFIX}/usr/include/trilinos"
+		-DTrilinos_INSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)/trilinos"
+		-DTrilinos_ENABLE_ALL_PACKAGES="$(usex all-packages)"
+		-DTrilinos_ENABLE_Adelus=OFF
+		-DTrilinos_ENABLE_Moertel=OFF
+		-DTrilinos_ENABLE_PyTrilinos=OFF
+		-DTrilinos_ENABLE_SEACAS=OFF
+		-DTrilinos_ENABLE_Amesos=ON
+		-DTrilinos_ENABLE_AztecOO=ON
+		-DTrilinos_ENABLE_COMPLEX_DOUBLE=ON
+		-DTrilinos_ENABLE_COMPLEX_FLOAT=ON
+		-DTrilinos_ENABLE_EpetraExt=ON
+		-DTrilinos_ENABLE_Epetra=ON
+		-DTrilinos_ENABLE_Ifpack=ON
+		-DTrilinos_ENABLE_ML=ON
+		-DTrilinos_ENABLE_MueLu=ON
+		-DTrilinos_ENABLE_OpenMP="$(usex openmp)"
+		-DTrilinos_ENABLE_ROL=ON
+		-DTrilinos_ENABLE_Sacado=ON
+		-DTrilinos_ENABLE_Teuchos=ON
+		-DTrilinos_ENABLE_Tpetra=ON
+		-DTrilinos_ENABLE_Zoltan=ON
+		-DTrilinos_ENABLE_TESTS="$(usex test)"
+		-DTPL_ENABLE_BinUtils=ON
+		-DTPL_ENABLE_BLAS=ON
+		-DTPL_ENABLE_LAPACK=ON
+		-DTPL_ENABLE_MPI=ON
+		-DTPL_ENABLE_ADOLC="$(usex adolc)"
+		-DTPL_ENABLE_AMD="$(usex sparse)"
+		-DTPL_ENABLE_ARPREC="$(usex arprec)"
+		-DTPL_ENABLE_BLACS="$(usex scalapack)"
+		-DTPL_ENABLE_BoostLib=ON
+		-DTPL_ENABLE_Boost=ON
+		-DTPL_ENABLE_Clp="$(usex clp)"
+		-DTPL_ENABLE_CSparse="$(usex sparse)"
+		-DTPL_ENABLE_CUDA="$(usex cuda)"
+		-DTPL_ENABLE_CUSPARSE="$(usex cuda)"
+		-DTPL_ENABLE_Eigen="$(usex eigen)"
+		-DTPL_ENABLE_GLPK="$(usex glpk)"
+		-DTPL_ENABLE_gtest="$(usex gtest)"
+		-DTPL_ENABLE_HDF5="$(usex hdf5)"
+		-DTPL_ENABLE_HWLOC="$(usex hwloc)"
+		-DTPL_ENABLE_HYPRE="$(usex hypre)"
+		-DTPL_ENABLE_Matio="$(usex matio)"
+		-DTPL_ENABLE_METIS="$(usex metis)"
+		-DTPL_ENABLE_MKL="$(usex mkl)"
+		-DTPL_ENABLE_MUMPS="$(usex mumps)"
+		-DTPL_ENABLE_Netcdf="$(usex netcdf)"
+		-DTPL_ENABLE_PARDISO_MKL="$(usex mkl)"
+		-DTPL_ENABLE_PETSC="$(usex petsc)"
+		-DTPL_ENABLE_Pthread="$(usex threads)"
+		-DTPL_ENABLE_QD="$(usex qd)"
+		-DTPL_ENABLE_SCALAPACK="$(usex scalapack)"
+		-DTPL_ENABLE_Scotch="$(usex scotch)"
+		-DTPL_ENABLE_SuperLU="$(usex superlu)"
+		-DTPL_ENABLE_TAUCS="$(usex taucs)"
+		-DTPL_ENABLE_TBB="$(usex tbb)"
+		-DTPL_ENABLE_Thrust="$(usex cuda)"
+		-DTPL_ENABLE_TVMET="$(usex tvmet)"
+		-DTPL_ENABLE_UMFPACK="$(usex sparse)"
+		-DTPL_ENABLE_X11="$(usex X)"
+		-DTPL_ENABLE_yaml-cpp="$(usex yaml)"
+		-DTPL_ENABLE_Zlib="$(usex zlib)"
+	)
+
+	#
+	# Make sure some critical configuration options are always set
+	# correctly independently of what Trilinos dependency resolver thinks
+	# it should be doing.
+	#
+	local mycmakeargs+=(
+		-DAmesos2_ENABLE_LAPACK=ON
+		-DAmesos2_ENABLE_MUMPS=OFF
+		-DTpetra_INST_SERIAL=ON
+	)
+
+	use eigen && \
+		mycmakeargs+=(
+		-DEigen_INCLUDE_DIRS="${EPREFIX}/usr/include/eigen3"
+	)
+	use hypre && \
+		mycmakeargs+=(
+		-DHYPRE_INCLUDE_DIRS="${EPREFIX}/usr/include/hypre"
+	)
+	use scotch && \
+		mycmakeargs+=(
+		-DScotch_INCLUDE_DIRS="${EPREFIX}/usr/include/scotch"
+	)
+
+	# cxsparse is a rewrite of csparse + extras
+	use sparse && \
+		mycmakeargs+=(
+		-DCSparse_LIBRARY_NAMES="cxsparse"
+	)
+
+	# mandatory blas and lapack
+	trilinos_conf blas BLAS
+	trilinos_conf lapack LAPACK
+	use superlu && trilinos_conf superlu SuperLU
+	use metis && trilinos_conf metis METIS
+
+	# blacs library is included in scalapack these days
+	if use scalapack; then
+		trilinos_conf scalapack SCALAPACK
+		mycmakeargs+=(
+			-DBLACS_LIBRARY_NAMES="scalapack"
+			-DBLACS_INCLUDE_DIRS="${EPREFIX}/usr/include/blacs"
+		)
+	fi
+
+	#
+	# Make sure we use the compiler wrappers in order to build trilinos.
+	#
+	[ ! -z "${CC}"] && export OMPI_CC="${CC}" MPICH_CC="${CC}" && tc-export OMPI_CC MPICH_CC
+	[ ! -z "${CXX}"] && export OMPI_CXX="${CXX}" MPICH_CXX="${CXX}" && tc-export OMPI_CXX MPICH_CXX
+	export CC=mpicc CXX=mpicxx && tc-export CC CXX
+
+	# Trilinos needs a custom build type:
+	local CMAKE_BUILD_TYPE=Release
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# Clean up the mess:
+	mv "${ED}"/bin "${ED}/usr/$(get_libdir)"/trilinos || die "mv failed"
+	mv "${ED}/usr/$(get_libdir)"/trilinos/cmake/* "${ED}/usr/$(get_libdir)"/cmake || die "mv failed"
+	rmdir "${ED}/usr/$(get_libdir)/trilinos/cmake" || die "rmdir failed"
+
+	#
+	# register $(get_libdir)/trilinos in LDPATH so that the dynamic linker
+	# has a chance to pick up the libraries...
+	#
+	cat >> "${T}"/99trilinos <<- EOF
+	LDPATH="${EPREFIX}/usr/$(get_libdir)/trilinos"
+	PATH="${EPREFIX}/usr/$(get_libdir)/trilinos/bin"
+	EOF
+	doenvd "${T}"/99trilinos
+}
diff --git a/sci-libs/trilinos/trilinos-13.4.0-r1.ebuild b/sci-libs/trilinos/trilinos-13.4.0-r3.ebuild
similarity index 86%
rename from sci-libs/trilinos/trilinos-13.4.0-r1.ebuild
rename to sci-libs/trilinos/trilinos-13.4.0-r3.ebuild
index d3e3bb09dff8..9996b79bd35d 100644
--- a/sci-libs/trilinos/trilinos-13.4.0-r1.ebuild
+++ b/sci-libs/trilinos/trilinos-13.4.0-r3.ebuild
@@ -18,7 +18,7 @@ LICENSE="BSD LGPL-2.1"
 SLOT="0"
 
 IUSE="
-	adolc arprec clp cuda eigen glpk gtest hdf5 hwloc hypre
+	adolc all-packages arprec clp cuda eigen glpk gtest hdf5 hwloc hypre
 	matio metis mkl mumps netcdf openmp petsc qd scalapack scotch sparse
 	superlu taucs tbb test threads tvmet yaml zlib X
 "
@@ -111,15 +111,26 @@ src_configure() {
 		-DTrilinos_INSTALL_CONFIG_DIR="${EPREFIX}/usr/$(get_libdir)/cmake"
 		-DTrilinos_INSTALL_INCLUDE_DIR="${EPREFIX}/usr/include/trilinos"
 		-DTrilinos_INSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)/trilinos"
-		-DTrilinos_ENABLE_ALL_PACKAGES=ON
-		-DTrilinos_ENABLE_OpenMP="$(usex openmp)"
-		-DTrilinos_ENABLE_PyTrilinos=OFF
+		-DTrilinos_ENABLE_ALL_PACKAGES="$(usex all-packages)"
 		-DTrilinos_ENABLE_Adelus=OFF
 		-DTrilinos_ENABLE_Moertel=OFF
+		-DTrilinos_ENABLE_PyTrilinos=OFF
 		-DTrilinos_ENABLE_SEACAS=OFF
-		-DTrilinos_ENABLE_SEACASChaco=OFF
-		-DTrilinos_ENABLE_SEACASExodiff="$(usex netcdf)"
-		-DTrilinos_ENABLE_SEACASExodus="$(usex netcdf)"
+		-DTrilinos_ENABLE_Amesos=ON
+		-DTrilinos_ENABLE_AztecOO=ON
+		-DTrilinos_ENABLE_COMPLEX_DOUBLE=ON
+		-DTrilinos_ENABLE_COMPLEX_FLOAT=ON
+		-DTrilinos_ENABLE_EpetraExt=ON
+		-DTrilinos_ENABLE_Epetra=ON
+		-DTrilinos_ENABLE_Ifpack=ON
+		-DTrilinos_ENABLE_ML=ON
+		-DTrilinos_ENABLE_MueLu=ON
+		-DTrilinos_ENABLE_OpenMP="$(usex openmp)"
+		-DTrilinos_ENABLE_ROL=ON
+		-DTrilinos_ENABLE_Sacado=ON
+		-DTrilinos_ENABLE_Teuchos=ON
+		-DTrilinos_ENABLE_Tpetra=ON
+		-DTrilinos_ENABLE_Zoltan=ON
 		-DTrilinos_ENABLE_TESTS="$(usex test)"
 		-DTPL_ENABLE_BinUtils=ON
 		-DTPL_ENABLE_BLAS=ON
@@ -161,7 +172,17 @@ src_configure() {
 		-DTPL_ENABLE_X11="$(usex X)"
 		-DTPL_ENABLE_yaml-cpp="$(usex yaml)"
 		-DTPL_ENABLE_Zlib="$(usex zlib)"
-		-DML_ENABLE_SuperLU:BOOL=OFF
+	)
+
+	#
+	# Make sure some critical configuration options are always set
+	# correctly independently of what Trilinos dependency resolver thinks
+	# it should be doing.
+	#
+	local mycmakeargs+=(
+		-DAmesos2_ENABLE_LAPACK=ON
+		-DAmesos2_ENABLE_MUMPS=OFF
+		-DTpetra_INST_SERIAL=ON
 	)
 
 	use eigen && \
@@ -201,6 +222,8 @@ src_configure() {
 	#
 	# Make sure we use the compiler wrappers in order to build trilinos.
 	#
+	[ ! -z "${CC}"] && export OMPI_CC="${CC}" MPICH_CC="${CC}" && tc-export OMPI_CC MPICH_CC
+	[ ! -z "${CXX}"] && export OMPI_CXX="${CXX}" MPICH_CXX="${CXX}" && tc-export OMPI_CXX MPICH_CXX
 	export CC=mpicc CXX=mpicxx && tc-export CC CXX
 
 	# Trilinos needs a custom build type:
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 056fb3d1862a..046dfe4eb764 100644
Binary files a/sci-mathematics/Manifest.gz and b/sci-mathematics/Manifest.gz differ
diff --git a/sci-mathematics/alectryon/Manifest b/sci-mathematics/alectryon/Manifest
index ea95fb20fdb8..1d7cea9d07b8 100644
--- a/sci-mathematics/alectryon/Manifest
+++ b/sci-mathematics/alectryon/Manifest
@@ -1,5 +1,5 @@
 AUX 50alectryon-gentoo.el 155 BLAKE2B 6a83a0b6e7116a85d00b20799004eaec08033845661a23368b3340320184f2ea65c6b23db61664dadf2f829cabeabd8933f7f9e31d0971fcf2a0181c6d8ae956 SHA512 65fb668f29ba4737fc374302536c3223a02d45816a79256e425e255f30c134b19c8e88ccd19c13954a562182ad072cd10de08cd5047ae17b1b72efcfdc78f00f
 AUX alectryon-1.4.0-setup.cfg-version.patch 402 BLAKE2B 3f9969714ad120457b6a0f52c0a7fd85b3b747a95648b5d2ed5ad49deec7e8277630d98ece242964135b55cc12273d1cee0b1385e690ff9bf9bdcf2339cef106 SHA512 fbda296d11fbc67457448450bf5c752eb4f835f03a4a8e97274ebeab0078fdc08240a5e91824256759b7510bb2aaa6bb9e13403163f821f629527bc068745378
 DIST alectryon-1.4.0.tar.gz 312436 BLAKE2B 7f1e58670fbba0b31a4e4bc6502dffa72931ae3495c38b53987406a05aac9d3d1a34d75c89b7b85a6122ee6a7ce30970f8cf3190a5916e416e56854313077d4c SHA512 1310a04c8584147b38af8edb19cc95bd71043f5d00f55cbf4d5649dad9eede5bd01dba6fb23b85acf7cb9e9619fd01e5f83d8d37064f0b43f706589b9ec8aeef
-EBUILD alectryon-1.4.0-r1.ebuild 1816 BLAKE2B 96a4e471c01b9d64eb4bea463dba13c50354a0026b9fbcd9cedf5894fe88aede3b7d0e83f4d1670557935b7d1e8823135d2f50c900473fbba92566bc2638a39a SHA512 f801eda13d130dc8c636897cab6aa52d4784b141f490928ed3541ffefd61915e2475ead17ce7c6fd6be96b688d552221f82e301fda0380509f970e3d3ae8ca83
+EBUILD alectryon-1.4.0-r1.ebuild 1770 BLAKE2B e85be58b3d6ab2c72fbf0c7af3799c011d704ecb041aa1750f623196133f9d351accfa6f6ae490722e315cb95f512bad2095f7fa6ab6051f8d3c3b6cca825abe SHA512 5864f64e31aba7d9621944f8a9007629796b6d633752c9d3b2b1db2a60162d63c258ce384f342cf469f4aabb908122893caf6c60362fdd082781d7622e632bb6
 MISC metadata.xml 977 BLAKE2B 929c655f60171ee97c50a711e5ddaa4f5b6e5c7a2ffa2a2e3ff69665fa46a894af8a353e73efa8e43ed18fa87440e77d6a0d2abe7ecf740dcffe315d9bcddffa SHA512 a88e5341ebe5a4f239e73dbe0d843c46bdcc0f24dfa99e554b57ec715455d2a0526b4a157d2a2a2854b6d7e500b921f81cc29b6ab3c54db8ed228d94807d33fd
diff --git a/sci-mathematics/alectryon/alectryon-1.4.0-r1.ebuild b/sci-mathematics/alectryon/alectryon-1.4.0-r1.ebuild
index a15045952615..f582047527ae 100644
--- a/sci-mathematics/alectryon/alectryon-1.4.0-r1.ebuild
+++ b/sci-mathematics/alectryon/alectryon-1.4.0-r1.ebuild
@@ -47,14 +47,14 @@ PATCHES=( "${FILESDIR}"/${P}-setup.cfg-version.patch )
 SITEFILE="50${PN}-gentoo.el"
 
 src_compile() {
-	python_foreach_impl distutils-r1_python_compile
+	distutils-r1_src_compile
 
 	use doc && emake -C ./recipes/sphinx latexpdf
 	use emacs && elisp-compile ./etc/elisp/alectryon.el
 }
 
 src_install() {
-	python_foreach_impl distutils-r1_python_install
+	distutils-r1_src_install
 	einstalldocs
 
 	if use doc ; then
diff --git a/sci-mathematics/polymake/Manifest b/sci-mathematics/polymake/Manifest
index 95b4bb856f36..a2ef35f29bc2 100644
--- a/sci-mathematics/polymake/Manifest
+++ b/sci-mathematics/polymake/Manifest
@@ -1,3 +1,5 @@
+AUX polymake-4.6-perl-5.36.patch 659 BLAKE2B 4013b45b4edc79654fcfe77ffa17530ddaca8513eaf76fc338dae7fbcd1cf83f07f7b5ccaf2117051ae3f9fc951caa676b36fa06413988c271e0a5f01da28233 SHA512 0bf9f512c6b7439bf1660560d25a502f1fa16b7f0136f04f1c1c8812c1b1c5ab0ab5133e149777243985ca37e159d8a3de355b443441126328565063faa2ba8e
 DIST polymake-4.6-minimal.tar.bz2 5634651 BLAKE2B 6ee24fa6e70fdf746ea298d78e21e17fe38c5837ae2d3153e53656b4b003555b06897f463220b59474eed1111135dfa61c080d08d6363391afca51011f331122 SHA512 90f04c67bf297fb1b9f5a51d1654ff12385860b1fc80278a8b47f65970f11a1e0f33ede8a839b54a12422e772c8b76302ff78cc467712a2486f6e76ce0d5ab20
+EBUILD polymake-4.6-r1.ebuild 4119 BLAKE2B c04865bd05d7b52223b59c93f814e67a35a5d14ad4c7224be8e169ed3359aa67551e4aa174b54b88c4dde46c8468661cf5428c7fea5ba70574bd38183cac7ec0 SHA512 5d98adebe72237bca051cd0e4b9bbec533fae5ce182becd20e26bc7a32179693a5e283f7529952e0f7cd7a1662fefcc1718fd4c4ceff05950c634eba0211a3bf
 EBUILD polymake-4.6.ebuild 4028 BLAKE2B d3f194adf0566143a32e3914e5bfdeccee3e41e8d59236d3bfc22ee061cfa39039f46339b5a2a5e0e05ea6a8761387dfa506658d392cd7874c2d96f8745d9671 SHA512 9e8b93bc2b86c9ec895b44f5988d70e583f3b414c82d4993e3c0df2fcefd650f809a549325bdbdcb2ae4a6d7199cbd1d295775ab8f63b7883e655725ac64bda5
 MISC metadata.xml 1762 BLAKE2B 249af503c9e7e99118c87e4cd71c151cc962502972e80c4ba4f66ae3805c9f6c47601ecadef5e6e1b5c67a7e7779155f2524bace8d6f2f4fb260f2f4dce1b257 SHA512 fc887d14710c9529a9738a14ae8f6a41adae80c273354aa5bcd0a14ad695de09ff562e775a5d40582b23e3b6b1fd4e34a277fa9a6ff7131f19ad4f5cc98d6374
diff --git a/sci-mathematics/polymake/files/polymake-4.6-perl-5.36.patch b/sci-mathematics/polymake/files/polymake-4.6-perl-5.36.patch
new file mode 100644
index 000000000000..4a9d349ccb9a
--- /dev/null
+++ b/sci-mathematics/polymake/files/polymake-4.6-perl-5.36.patch
@@ -0,0 +1,15 @@
+diff -up lib/core/src/perl/RefHash.xxs.orig lib/core/src/perl/RefHash.xxs
+--- a/lib/core/src/perl/RefHash.xxs	2022-06-06 10:35:17.689807548 +0200
++++ b/lib/core/src/perl/RefHash.xxs	2022-06-06 10:37:12.935663947 +0200
+@@ -71,7 +71,11 @@ SV* tmp_keysv::set(SV* keysv)
+    Copy(obj.keyp, HEK_KEY(hekp), sizeof(SV*), char);
+    HEK_LEN(hekp) = sizeof(SV*);
+    HEK_HASH(hekp) = U32(obj.keyl >> 4);          // hash value
++#if PerlVersion < 5360
+    HEK_FLAGS(hekp) = HVhek_UNSHARED;
++#else
++   HEK_FLAGS(hekp) = HVhek_NOTSHARED;
++#endif
+    sv.sv_any = &xpv;
+    sv.sv_refcnt = 1;
+    sv.sv_flags = SVt_PVIV | SVf_IVisUV | SVf_POK | SVp_POK | PmFlagsForHashKey;
diff --git a/sci-mathematics/polymake/polymake-4.6-r1.ebuild b/sci-mathematics/polymake/polymake-4.6-r1.ebuild
new file mode 100644
index 000000000000..446fedbda04a
--- /dev/null
+++ b/sci-mathematics/polymake/polymake-4.6-r1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic ninja-utils toolchain-funcs
+
+DESCRIPTION="Tool for polyhedral geometry and combinatorics"
+SRC_URI="https://polymake.org/lib/exe/fetch.php/download/${P}-minimal.tar.bz2"
+HOMEPAGE="https://polymake.org/"
+
+# polymake itself is GPL-2, but even the minimal tarball bundles a lot
+# of other code. I've included everything that turns up with a
+#
+#   find ./ -name 'LICENSE' -o -name 'COPYING'
+#
+# in the list below. If any of these bother you, you may want to take a
+# closer look at how (or even if) the corresponding code is being used.
+LICENSE="BSD GPL-2 GPL-2+ MIT WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="bliss +cdd +flint +normaliz libpolymake lrs nauty ppl singular"
+
+REQUIRED_USE="^^ ( bliss nauty )"
+
+# The "configure" script isn't autotools; it basically exists just to
+# exec some other perl script but using the familiar name.
+BDEPEND="dev-util/ninja
+	dev-lang/perl"
+
+DEPEND="
+	libpolymake? ( dev-lang/perl )
+	dev-libs/boost:=
+	dev-libs/gmp:=
+	dev-libs/libxml2:2=
+	dev-libs/libxslt:=
+	dev-libs/mpfr:=
+	sys-libs/readline:=
+	bliss? ( sci-libs/bliss:=[gmp] )
+	cdd? ( sci-libs/cddlib:= )
+	flint? ( sci-mathematics/flint:= )
+	lrs? ( >=sci-libs/lrslib-051:=[gmp] )
+	nauty? ( sci-mathematics/nauty:= )
+	normaliz? ( >=sci-mathematics/normaliz-3.8:= )
+	ppl? ( dev-libs/ppl:= )
+	singular? ( sci-mathematics/singular:= )"
+
+RDEPEND="${DEPEND}
+	dev-lang/perl
+	dev-perl/JSON
+	dev-perl/Term-ReadLine-Gnu
+	dev-perl/TermReadKey
+	dev-perl/XML-SAX
+	dev-perl/XML-Writer"
+
+# Tests observed failing after upgrade to polymake-4.5. No idea if they
+# worked prior to that. Someone who actually understands polymake will
+# have to get these working (at least briefly) before we re-enable them.
+RESTRICT=test
+
+PATCHES=( "${FILESDIR}/${P}-perl-5.36.patch" )
+
+src_configure() {
+	# Without this, the build system tries to use "the highest possible"
+	# optimization level and will override what's in your CXXFLAGS.
+	export CXXOPT=""
+
+	tc-export CC CXX
+
+	# We need to define BLISS_USE_GMP if bliss was built with gmp support.
+	# Therefore we require gmp support on bliss, so that the package
+	# manager can prevent rebuilds with changed gmp flag. Yes, this should
+	# be append-cppflags; but the build system doesn't respect CPPFLAGS.
+	use bliss && append-cxxflags -DBLISS_USE_GMP
+
+	# This isn't an autotools ./configure script, so a lot of things
+	# don't work the way you'd expect. We disable openmp unconditionally
+	# because it's only supposedly only used for building the bundled
+	# libnormaliz (we unbundle it) and for something called to_simplex
+	# that I can't find anywhere in the polymake source.
+	./configure --prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--libexecdir="${EPREFIX}/usr/$(get_libdir)/polymake" \
+		$(usev !libpolymake "--without-callable") \
+		--without-java \
+		--without-javaview \
+		--without-native \
+		--without-scip \
+		--without-soplex \
+		--without-openmp \
+		$(use_with bliss bliss "${EPREFIX}/usr") \
+		$(use_with cdd cdd "${EPREFIX}/usr") \
+		$(use_with flint flint "${EPREFIX}/usr") \
+		$(use_with lrs lrs "${EPREFIX}/usr") \
+		$(use_with nauty nauty "${EPREFIX}/usr") \
+		$(use_with normaliz libnormaliz "${EPREFIX}/usr") \
+		$(use_with ppl ppl "${EPREFIX}/usr") \
+		$(use_with singular singular "${EPREFIX}/usr") \
+		|| die
+}
+
+# There is a backwards-compatible Makefile that would call ninja for us
+# in src_compile/src_install, but it doesn't handle MAKEOPTS correctly.
+src_compile() {
+	eninja -C build/Opt
+}
+
+src_install() {
+	# DESTDIR needs to find its way into the real install script,
+	# support/install.pl.
+	export DESTDIR="${D}"
+	eninja -C build/Opt install
+}
+
+src_test() {
+	perl/polymake --script run_testcases --emacs-style \
+		|| die "test suite failed"
+}
+
+pkg_postinst() {
+	elog "Additional features for polymake are available through external"
+	elog "software such as sci-mathematics/4ti2 and sci-mathematics/topcom."
+	elog "After installing new external software run 'polymake --reconfigure'."
+}
diff --git a/sci-mathematics/primecount/Manifest b/sci-mathematics/primecount/Manifest
index df6f5a1a44c7..625ec02d6d42 100644
--- a/sci-mathematics/primecount/Manifest
+++ b/sci-mathematics/primecount/Manifest
@@ -1,3 +1,5 @@
 DIST primecount-7.2.tar.gz 340799 BLAKE2B 5ce3661e322be363e2fe79de1dd134b5c3009269cbb10d36dc69bee4c23c9f41d2117b3ed7aa4c5f852e494832573c84a8d9c37cbe92cf80a5024bdec9b22c69 SHA512 df14929012434eddfab94410ba9165642094327f8abd139a6a1ba87e508bba56df91cb0dc9411e873e90a9aa4aa3ba4007396c930d593f5954be8c715fa26e84
+DIST primecount-7.3.tar.gz 360921 BLAKE2B 0d9ad7c791dba12b05e4c88703dc4bfc1f557a1443c8430f3921f1a6e99b740b437cb53f39e832d69c4148b597960b028e0f38e4f4d96e50434b1d020f4ea620 SHA512 56dcae60460c88368214e01f8e3618e6b61b13f2730bfd1f281721ef71d6136308ba6832e4bd25a1885e2c6142009c5772d6102f82c65e8522e990cb62c55e71
 EBUILD primecount-7.2-r1.ebuild 1277 BLAKE2B 92be849a95a336efd085be960af5ba8b6eceb1176db1e981f0c3f629767553a050e8e77bb966ab70930fc26b2df1ffa92537d1a2fcaebaa02221f68d7de6a656 SHA512 a7b515467366778defc734ae31fdea8cf32e2218ab85aa80f6bbbd082e9ff24056b3e9b01d232dbf76f4565c139f3f85f65ac6842dc8d9cae8cc08c9aa2bfcfc
+EBUILD primecount-7.3.ebuild 1278 BLAKE2B 6426ba4758d2551012983af953ca5235726d8d5c7b1c95fa9e2a7a1179077836a9fbe13a931308dcd17e20a6ebff1cbca9b8d1992217b01680d86cbd4795fb3b SHA512 0758650223b753382d87ce94943bfa152fc6f530cbe3870b8811e325075512ffda8e955e606430074f9c0d89064645c81e8b4114e2e1e3a9b4b21525387f39e5
 MISC metadata.xml 674 BLAKE2B 2d8321166afee1e9d0a20723ae6849f17a7ef0d5d474dc3ec0b1650519b197ad5b1360641faa6985a60121501741a137812b8bcf03cd708766278a1b014615f7 SHA512 7a4fa0c1cae4880bdc230065c98ec46dfb5f1b1adae6ffa5eac275f6f04f38ce0c24042e62f5aac6117f9f816890244daec8fb1c920ec4b6a0a124385e5d7e33
diff --git a/sci-mathematics/primecount/primecount-7.3.ebuild b/sci-mathematics/primecount/primecount-7.3.ebuild
new file mode 100644
index 000000000000..eb88741f1621
--- /dev/null
+++ b/sci-mathematics/primecount/primecount-7.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake toolchain-funcs
+
+DESCRIPTION="Highly optimized CLI and library to count primes"
+HOMEPAGE="https://github.com/kimwalisch/primecount"
+SRC_URI="https://github.com/kimwalisch/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/7"  # subslot is first component of libprimecount.so version
+KEYWORDS="~amd64"
+IUSE="cpu_flags_x86_popcnt +executable openmp test"
+RESTRICT="!test? ( test )"
+
+DEPEND="sci-mathematics/primesieve:="
+RDEPEND="${DEPEND}"
+
+DOCS=(
+	ChangeLog
+	README.md
+	doc/Credits.md
+	doc/Easy-Special-Leaves.md
+	doc/Hard-Special-Leaves.md
+	doc/Records.md
+	doc/References.md
+	doc/alpha-factor-dr.pdf
+	doc/alpha-factor-gourdon.pdf
+	doc/alpha-factor-lmo.pdf
+	doc/libprimecount.md
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_LIBPRIMESIEVE="OFF"
+		-DBUILD_PRIMECOUNT="$(usex executable)"
+		-DBUILD_STATIC_LIBS="OFF"
+		-DBUILD_TESTS="$(usex test)"
+		-DWITH_OPENMP="$(usex openmp)"
+		-DWITH_POPCNT="$(usex cpu_flags_x86_popcnt)"
+	)
+
+	cmake_src_configure
+}
diff --git a/sci-mathematics/primesieve/Manifest b/sci-mathematics/primesieve/Manifest
index 1d97ee491364..ace9355fbf0b 100644
--- a/sci-mathematics/primesieve/Manifest
+++ b/sci-mathematics/primesieve/Manifest
@@ -1,3 +1,5 @@
 DIST primesieve-7.7.tar.gz 101558 BLAKE2B cfaa91ddcf661e265d403f8a93461fe297ac48db843b096d0dd7828c4e3d11cdba60cb102197248359c79950fe2ac66c8e9295ab17b0d6bd0eed5a6260c7d115 SHA512 bbcc141a12afdf54386d2408e067b1c6af2dd9b5c9f44d71290269ddefc7c46ba6794064cde6728c8356724553cb6bc2e765bf18c24a18b6d5d1f472d2c6e6dd
+DIST primesieve-7.9.tar.gz 111361 BLAKE2B 8e227bd04a89dd5e8ea5dc5e79afa1c5254216863086fd6c3712fb45767ee7e5e23e72d166ada17295e56479e0c0e1ae7f215b72e124e5234a79fb20f340cb3f SHA512 fcfc3445e5becd555b66743f6d73dd4a0cbb48b1d4a3d0d22043261f1861e0631bdeb8702b1f942110f8b327a01173b231accd1f7595600308709832bbbafc06
 EBUILD primesieve-7.7.ebuild 1046 BLAKE2B 503fcab0c41dd30a22ad076b8e6404d24ca37a4c765a8059ffdbc91a48bfb87ff646779327a447b5cfbd96e1f5a9d88d50fda2ee0a1bf82ad4e12516d699f460 SHA512 e6038d77db1f87bc5c413a6e2c1a7ba689ec9920a579befcced2575379b808c0a60262b8ce2d130936e3d8a04df8d0fa6ee66ca2c74ea65f02fb53de37d704f3
+EBUILD primesieve-7.9.ebuild 1047 BLAKE2B 314c50fba490ce902b2fb4471068fb78db55ee04195565e40cf11452bd41332a908553965cb1ccebeed9fcee56b33d93060482f37cd106117b2315c2d61dc7f1 SHA512 0aa1eed9f2376c0f2e35744b983f7638e95ee9dc74ea92aa783c780cb30923c0f97330cb9ac90b92a29415e0a9ff9ee661ff05a8998a2144671df5256bbc52aa
 MISC metadata.xml 672 BLAKE2B e580c88061b6dcece5a34fde2cd13ce8c55264f3bac16fe3af6374df92d6280993452ebeea3d8446d9f8afcf7c1cb6927405c40e82a1c01a153d5060c77392fd SHA512 8ad3dd50c172ad3333d30a01b0e7ddb8f0f96b7666b61a0c6a1644e92abc49fa75f4f54c4c88eb72c2c8c7104d5e720d852bc7319fbc1a9569fcc5de85529b02
diff --git a/sci-mathematics/primesieve/primesieve-7.9.ebuild b/sci-mathematics/primesieve/primesieve-7.9.ebuild
new file mode 100644
index 000000000000..7502f3600271
--- /dev/null
+++ b/sci-mathematics/primesieve/primesieve-7.9.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="CLI and library for quickly generating prime numbers"
+HOMEPAGE="https://github.com/kimwalisch/primesieve"
+SRC_URI="https://github.com/kimwalisch/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD-2"
+SLOT="0/9"  # subslot is first component of libprimesieve.so version
+KEYWORDS="~amd64"
+IUSE="doc +executable test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="doc? ( app-doc/doxygen app-text/texlive media-gfx/graphviz )"
+DEPEND=""
+RDEPEND=""
+
+DOCS=(
+	ChangeLog
+	README.md
+	doc/ALGORITHMS.md
+	doc/CPP_Examples.md
+	doc/C_Examples.md
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DOC="$(usex doc)"
+		-DBUILD_PRIMESIEVE="$(usex executable)"
+		-DBUILD_STATIC_LIBS="OFF"
+		-DBUILD_TESTS="$(usex test)"
+	)
+
+	if use doc; then
+		DOCS+=(
+			"${BUILD_DIR}/doc/html"
+			"${BUILD_DIR}/doc/latex/refman.pdf"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_build doc
+}
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 881a40b4a368..2dd5f09c6733 100644
Binary files a/sci-visualization/Manifest.gz and b/sci-visualization/Manifest.gz differ
diff --git a/sci-visualization/gwyddion/Manifest b/sci-visualization/gwyddion/Manifest
index 50486de12148..953b32835d88 100644
--- a/sci-visualization/gwyddion/Manifest
+++ b/sci-visualization/gwyddion/Manifest
@@ -2,6 +2,8 @@ AUX gwyddion-2.56-automagic.patch 1522 BLAKE2B c760f952221ee4cd2e36572bef682ca45
 AUX gwyddion-2.60-automagic.patch 1552 BLAKE2B c106acfee1e00d8a4ade965cddab943bc79c246503fb51e53d20ba6a3b8b0a76cc433b75e867d448d7622ef190f1f54225b0f45be3860d32672397090be619d9 SHA512 50eca983c81bb14c33415e3ad69bf2e18be4a88fb674537dc335d8aa9986edb1baa962f7a4eead41d70b54828729165d413387c64696a0f4e1aa9ad49675afb0
 DIST gwyddion-2.56.tar.xz 4645620 BLAKE2B f4f2ce2bf119a24c3e1919b14db409a81ad286ef2242918f356d2b4c56b498f41cbafa03a136eac5d87b4905529e06982694f19bdf30933454e94d34526962c3 SHA512 cf4a40367ea5b0a671c5df70123ef93f6aecc25322af7eb05e4f32d40e54d9b0d48ddd1df9f2589c468eb511ada3f3ef409603c1513de33ba2482078a9415eae
 DIST gwyddion-2.60.tar.xz 4973404 BLAKE2B 6ded40f34bfcd70db2e897abc1f07b070aca78e08c90661ee4fe281d19f16337ca81b5a4e2adaeb29e1870e8194eb77976910a54248842c8474864065d64defd SHA512 e568df77ef580aaedfcdd1f746a78f3ca93676a07a331fc6e70f997780bb403d1c3967aa93440c7fa1f010bd01f5376700c869a38dacaf1f98b075c4c950cf54
+DIST gwyddion-2.61.tar.xz 4982092 BLAKE2B e4949558c52d2a6e97415b65e6816061c117868bdd2f39b341c3f740500f71dd38500323a389058b65f9c30feb9d5fd1e93bc29881b464cdb66981639fe280ed SHA512 c2fff49d52e4c439bf96e68be3534948c1fd48ade9b1e59e2d2d7d607170b5e7ce09e9cde3873ecca526de1561b028f39785dc363186f9f3d4ef0d259d313675
 EBUILD gwyddion-2.56.ebuild 1646 BLAKE2B 56173da9c59cff136b908ae5a1eac7767199a73a3fa09c2b1a5480cc9d5d191ba7604e731a1b0c43b2f65f19a0580481efe91742cdb0581645c43215daf8768c SHA512 1205b0dc85fd5c418089555b3a31ab555576ff91fcddfe925595e29a2f31de2d529269aa7092eb80e9a0995e4a0627dc19edbc6de88e58b35ab1e209c1b8e6da
-EBUILD gwyddion-2.60.ebuild 1940 BLAKE2B 20b7359a3232946696773dcdfd7ae65857638a970045632dc39516d32564e578d9d511d5ba64e6d8c953cf41d0df5e7c225027a4482eaf78c318c6d858c037bf SHA512 968338bb87644350ebf7240896cf0cd8fbbad643fe60719f43fa482e2499ebb163e2aa796c8d8d64d745159f123d972f4d0525d6c6f66be170b3d2b5dffc8cfb
+EBUILD gwyddion-2.60.ebuild 1938 BLAKE2B 0b84d6f9b360a1f801cd062e81eac4845db625366531058081da2d2703a65a5d38f5389307b3767a378418c8b6b9ab47ffe2943500fd4c6df0ff1c6eebaba1eb SHA512 8eda1fca9ce3e963517409c834a1467d5e561d1b523568be310f7a36e16bf7db5a9490d3d74568c158e9f097c11be11761efd24465caaa60113db99bf0de72ec
+EBUILD gwyddion-2.61.ebuild 2018 BLAKE2B 1bcccbf7b76d746711b37b22cbd69d7216eb0430c309ec59f8c481fa7880eeb93013d55fcd39ed7e3440df5a7c8c2cde7a4156d0bcda0d91f58b80bf7911669c SHA512 60996852800aae8ae7e4383251d6f553320b90f73b7a5224886072df60bdd4757fbaa70098c2d71e15a2819c3e45e250e927b6bb91e4b88f624aba48f197ec1e
 MISC metadata.xml 1152 BLAKE2B c3ab652b26ed500c74d53dd479fe33a3647749478881f79780f360a551bcd262a1652a0e96de7b9bc6ef5d694f40387926b919515c879c8aeb5e2275fe807583 SHA512 8ab81680f6e02090d84f1e43d05c459ae9856b4195341718080b5e8e41a4c722933c6258fb69ddb1c5b7f087356c80d35f8d4fb259c0cb5dabe2636a79b2c64e
diff --git a/sci-visualization/gwyddion/gwyddion-2.60.ebuild b/sci-visualization/gwyddion/gwyddion-2.60.ebuild
index 4680d9f429f2..1b65cd80be57 100644
--- a/sci-visualization/gwyddion/gwyddion-2.60.ebuild
+++ b/sci-visualization/gwyddion/gwyddion-2.60.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://gwyddion.net/download/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 doc fits jansson hdf5 nls openexr openmp perl ruby sourceview unique xml X zlib"
 
 RDEPEND="
diff --git a/sci-visualization/gwyddion/gwyddion-2.61.ebuild b/sci-visualization/gwyddion/gwyddion-2.61.ebuild
new file mode 100644
index 000000000000..7a324f0066a3
--- /dev/null
+++ b/sci-visualization/gwyddion/gwyddion-2.61.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools xdg
+
+DESCRIPTION="Framework for Scanning Mode Microscopy data analysis"
+HOMEPAGE="http://gwyddion.net/"
+SRC_URI="http://gwyddion.net/download/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 doc fits jansson hdf5 nls openexr openmp perl ruby sourceview unique xml X zlib"
+
+RDEPEND="
+	>=dev-libs/glib-2.32
+	dev-libs/libzip
+	media-libs/libpng:0=
+	>=sci-libs/fftw-3.1:3.0=[openmp?]
+	virtual/libiconv
+	virtual/libintl
+	x11-libs/cairo
+	>=x11-libs/gtk+-2.18:2
+	x11-libs/libXmu
+	x11-libs/pango
+	bzip2? ( app-arch/bzip2 )
+	fits? ( sci-libs/cfitsio[bzip2?] )
+	jansson? ( dev-libs/jansson )
+	hdf5? ( sci-libs/hdf5[zlib?] )
+	openexr? ( media-libs/openexr:= )
+	perl? ( dev-lang/perl:= )
+	ruby? ( dev-ruby/narray )
+	unique? ( dev-libs/libunique:3 )
+	sourceview? ( x11-libs/gtksourceview:2.0 )
+	xml? ( dev-libs/libxml2:2 )
+	zlib? ( sys-libs/zlib )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.60-automagic.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+# There are python bindings (--enable-pygwy) but they are py2 only
+# 3D opengl rendering requires deprecated GTK-2 x11-libs/gtkglext
+src_configure() {
+	# hack for bug 741840
+	use doc && export GTK_DOC_PATH=/usr/share/gtk-doc
+
+	econf \
+		--disable-rpath \
+		--without-kde4-thumbnailer \
+		$(use_enable doc gtk-doc) \
+		$(use_enable openmp) \
+		$(use_enable nls) \
+		--disable-pygwy \
+		--without-python \
+		$(use_with bzip2) \
+		$(use_with fits cfitsio) \
+		$(use_with hdf5) \
+		$(use_with jansson) \
+		$(use_with perl) \
+		$(use_with ruby) \
+		$(use_with openexr exr) \
+		--without-gl \
+		$(use_with sourceview gtksourceview) \
+		$(use_with unique) \
+		$(use_with xml libxml2) \
+		$(use_with X x) \
+		$(use_with zlib) \
+		--with-zip=libzip
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 5dc2210a4369..2dc3e44282f7 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/dbus-broker/Manifest b/sys-apps/dbus-broker/Manifest
index 021897c27b44..3bbec643f4cb 100644
--- a/sys-apps/dbus-broker/Manifest
+++ b/sys-apps/dbus-broker/Manifest
@@ -8,6 +8,6 @@ DIST c-utf8-0837214a9780b7d771a3b3ce9a49196ac0a9d52f.tar.gz 9340 BLAKE2B 4bfa39c
 DIST dbus-broker-29.tar.gz 216639 BLAKE2B 94c8b7ea01367eae176d9411af064a960a054d6fbeb2bdebe9ba983d0938443abeb521f32e0eb9ae28155d5c5ebcf461317223387ccfad624ddd24e6bc8e227b SHA512 4c31b8c15f5d1ada0eb9c63c905c9fc9b3b8336beb533974b9c2b2a6a89c306b77d029d1ddbccbad873f62cc0d02cc373a090907dd19eae1a8a7fc2e3a4c2113
 DIST dbus-broker-31.tar.xz 239520 BLAKE2B ba34308de7c598e72ac3874894fb90ebc6970840eb2fc193a2b3294033759b39d7d712695ddbc88c3b947842b0131e0a068ffe3cef616ce431d9a8c021f30593 SHA512 22fd53cff84e48ae1c11303b5340e16dc9b7124c9e562174c1f0af465c55d69bb8b2768063de281f6f791442126a29ab864ad6b8acf110247a500f6425eae5d9
 EBUILD dbus-broker-29.ebuild 1847 BLAKE2B 8d6fb46de8ff8d95c3ea0ec5e08ac4958cff7862d2db7db767d4e722fc5c3f736607b01dfdbb1f567701a38f9d20b33a8fd44684967bce8bac57fc5d63c9dc89 SHA512 779128c4987833c4773bf37d5c0d3716c2cd4e2d7c3933883b87d198155b29145485bba2ebc21dcd3fb25562613e6b577e2001a15b8c3b84711395e2b4bc26c1
-EBUILD dbus-broker-31.ebuild 1145 BLAKE2B 1921b4cd7bda537fecc3336c39e21378bf73ef2fa3820774bfa49ee9ca0a5a3895f2a538f00ef8a3f7c7ce35e00663887970a583443f69463fdd575896c0f3b7 SHA512 cfd7c4ebc82b1e70d56a9f1138c56115688bfe3e8d19d48f3089fb6c829037629d9b7f891a19554b1f5e5e541dd9f576257bbb7443ddb98a0496a7c29d3a19a9
+EBUILD dbus-broker-31.ebuild 1142 BLAKE2B 8ad73709c37e5c7e6aa134cdafb5f9226114af6378fb90c32d2f8e509b2529377cbb3f51d3e49ddaef9bca544f5b1a368495059688d6c86a7d55d50b18f89f54 SHA512 07fdd1101c415cfbc43d9aa1ed51a9ff72db52ef1f5e8044d43af922f1d82e6c6c48c2b1eddbf6db85ae8266a25cdd4c897755d7711ab4e5ef7b9be16f511c5f
 EBUILD dbus-broker-9999.ebuild 1145 BLAKE2B 1921b4cd7bda537fecc3336c39e21378bf73ef2fa3820774bfa49ee9ca0a5a3895f2a538f00ef8a3f7c7ce35e00663887970a583443f69463fdd575896c0f3b7 SHA512 cfd7c4ebc82b1e70d56a9f1138c56115688bfe3e8d19d48f3089fb6c829037629d9b7f891a19554b1f5e5e541dd9f576257bbb7443ddb98a0496a7c29d3a19a9
 MISC metadata.xml 328 BLAKE2B 8d8eea6a3d5e3309106ec3e6f248c4b5cad557ccd5095794bd153cd270c5f43de508363646afce491d5e6cc3bff1dca1ca024c2e87e656401432ac2d833cca90 SHA512 971b4214d0a9f9a68ca12a309096b7345014d2e0f57e85e6e10ff0a09b533d5cafe153fa8082ac01609e3417a31afc319cb285a822194c9c672a57ce316340c4
diff --git a/sys-apps/dbus-broker/dbus-broker-31.ebuild b/sys-apps/dbus-broker/dbus-broker-31.ebuild
index cf73e0592faf..e3ddd690c43e 100644
--- a/sys-apps/dbus-broker/dbus-broker-31.ebuild
+++ b/sys-apps/dbus-broker/dbus-broker-31.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/bus1/dbus-broker.git"
 else
 	SRC_URI="https://github.com/bus1/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+	KEYWORDS="amd64 arm64 ppc64 ~riscv"
 fi
 
 DESCRIPTION="Linux D-Bus Message Broker"
diff --git a/sys-apps/ethtool/Manifest b/sys-apps/ethtool/Manifest
index c10e42bb33da..4bd9988efa98 100644
--- a/sys-apps/ethtool/Manifest
+++ b/sys-apps/ethtool/Manifest
@@ -3,9 +3,11 @@ DIST ethtool-5.14.tar.xz 318536 BLAKE2B 09b5c9c8103635e33b22e55caff3b0f3751bf14d
 DIST ethtool-5.15.tar.xz 318864 BLAKE2B 855c07e388bfabf37637f20e2714c6ca27717f38d7f658be96e0e9ec9d4514e61f4ee29361fc0279510869606ad18126ccd2a47160f1097ab52b1e35216e9721 SHA512 28147468a92c179217b459907a3257ee4f2d2ed028cb87b074f1c7ca6eb91aca81c8a9f5c7fe74e81d16a516e6e7eb20137bf7a15b5479fd82a327c64954da12
 DIST ethtool-5.16.tar.xz 320308 BLAKE2B 198d76502510e533b7f51785fd9f0848e840a6b4237bfd0496d005978ce3e638be02bd7dee971501f57c83354a1ac2f34a7ef29f2255764e900d9299bad9254c SHA512 9f0c24323b3144cbc6e684dc8c545a7c5e4804a061f10e32c937ea7420cc25c0891137fd4be4f1b9cf44907d8a59970ead9db424051ec5b4a90c225038f04025
 DIST ethtool-5.17.tar.xz 321848 BLAKE2B 1695077d812b3ed8e287615d6a3aa15525a061110fa63563e4b2db3e5d4718b023415508db63e857c572fef248c6797564da596f17c80b833839899656840a5d SHA512 c9677829e3ed1f373bd993f72c710293a6e987bbd19829d437a436f42cf4e7995ee70a7db3590b1499ff6aa29c26815f4d0a3e4798ffb6992ae3f52b079cd3ff
+DIST ethtool-5.18.tar.xz 322600 BLAKE2B 5c06c74ac1453b66fa3f2a01a3face8c6483bdd6849a0b258f5a3d0c041712de4d628240843d09a54e69ec6256dfaac5fa3b08d5e1d2033b2810a01f9be04673 SHA512 bd53e64d5cfe0fe4c3fbc9ec84e64f77b72d0229bbb611575007fd1e4c5c13611440b292edc875f1916707477e1d1e19b8f46785285d6b88066e9b9aafba9753
 EBUILD ethtool-5.10.ebuild 583 BLAKE2B bbce36771a7b34b2b62b533a36df3d4039b913ac36e34cbd63fc5a28e7d717cb8449d65c1cc0cd80353f55ad3380eea3fa9d9f2cfacbc574b172bcff7f7e8910 SHA512 79631f2df71aa0c831e92578dac932d49f1fa9b946b9450d7f61d8fdf14dda1a218e79bb51ffc1ebe9534505c68ddaa9d547c7c8b6c2d271c1ddc34130e5fddc
 EBUILD ethtool-5.14.ebuild 598 BLAKE2B 31042341fe0493ba59c2feb21148535e5274acb673e039ceba4d119d28417af0964147c522174086c55da7d3aa9885118ed685de5014e26a6f3636758c3ce12d SHA512 d219a369422e72561a14985674b6faa17f77be2669ff8690858fd05d9aab2c380a6d851fff50ef0bd813057b2e7824a79ce151f8aafc46f04f58c4139e3527e9
 EBUILD ethtool-5.15.ebuild 590 BLAKE2B 8850ed177a2ac5d814239e4eec4c72a216d562496cda15c1698aee52784a60ef82d245e65fa66f712c66310e2bf33967834e741c7add499ce5f1c69b9f7c0245 SHA512 919c114df09392c26db2c1ecfdc7cedb4ded632c00c4270b6f9405b51559ccb7928d55e65ef5f4cc06d177674016774ee440ea92dad88da86fdf7e3b461d3af1
 EBUILD ethtool-5.16.ebuild 598 BLAKE2B baf3417913dc24fbd8d9f3bdb2e2e95f1ef4ced1d49b9a8de5e30d7658e4a84e0b4f7ffc90ffc09a1274ebb2e932b1285040e777aa7b0339acfc345975276a8f SHA512 00dec7c445440facc0a9a8008b7bc02373b6043ac0255e020db9c6715f4895d3749ef443bf7d6123c5fd1d4aefdeb416b408dfc8117e374e36be8652a313a663
 EBUILD ethtool-5.17.ebuild 605 BLAKE2B 211cc227d19ac68d86acdf7e50e73f8833e863941e2629d48b39760be6009c6f344bea645213905ae0edcdbb11cf1a78132e04480ada3dd345b1a37aaa6295b1 SHA512 9e690eae2077bd53704fec3e5f5fd5ff9fa902e158730b77c1a5a78af774dbf40bf9811e7e9265cad6c691ce672bf7a26aec963bbe2a3d024bfee1f0d00d70c5
+EBUILD ethtool-5.18.ebuild 605 BLAKE2B 1f0b0a87665434d31c5dc09d7902c629c118db82a39cbb3d63859bcfe7a60d69ac18e5a35c0244805926d9d044777e4ac6b4474d7526975436ed733970cb06bd SHA512 39862ccb79c301109d774a13e8862cc53654ff08278ac143a4a7b8b62178a47d6b2a341fa19804afd4d8691110c1c60cd4024f99b389bc9365ce82977f4996dc
 MISC metadata.xml 993 BLAKE2B 92777546a5d0d904b319409448ce71991ddd4b89941888b19d2cb093b9f3227361fac1ef39535524a5bcb7b1cfd91c90fb4557d5501b46d44df64e647fb7d3aa SHA512 696f633f299189a01bc9ff309faac585a849323e0d471e1ddb7631bc917c83220844bae7ba1568a181b08029f4109bb2cf0c3063cee5f0d91705a04abe353793
diff --git a/sys-apps/ethtool/ethtool-5.18.ebuild b/sys-apps/ethtool/ethtool-5.18.ebuild
new file mode 100644
index 000000000000..8d122a733c09
--- /dev/null
+++ b/sys-apps/ethtool/ethtool-5.18.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Utility for examining and tuning ethernet-based network interfaces"
+HOMEPAGE="https://www.kernel.org/pub/software/network/ethtool/"
+SRC_URI="https://www.kernel.org/pub/software/network/ethtool/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+netlink"
+
+RDEPEND="netlink? ( net-libs/libmnl )"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/xz-utils"
+
+src_configure() {
+	econf $(use_enable netlink)
+}
diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index 4ac2214afe34..a8c2c2c2a686 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -1,11 +1,13 @@
 AUX firejail-0.9.68-envlimits.patch 669 BLAKE2B 50b2f652e317ed7cc4da53d9ab990b8b857396b7489f0b76532477cd50c0cbbd58099f42d555b12e735a8131552d5b877f9cee4cee2594e112d6bded770728ad SHA512 c91cbe09aa565123a988d44b1a243d1d6c7f501dd97c29e193d1bee36ab674eda45f55cfded4b25b50b023b3d31e7ddb034fb6ad647ad83aeb97c82c60581423
 AUX firejail-0.9.68-firecfg.config.patch 1528 BLAKE2B 9d1408b5311f39fbf1de4f0ce7c3c4b60165fa5e5c6c31b3eb74970d09f1d4ff4d5de7cf8b1a5e6266a53c74ac5010d67a47f38bb565489cd6d49ddfd5323c02 SHA512 7e52918e2d076b01a87c7e420f2e4162be386c5591f8f0720c30301ceabd22c2c83e0e0bc2a94c3b4fc8d3f8f6f4c9363d54204f6a11e5b14acc7057a4497c02
+AUX firejail-0.9.70-envlimits.patch 669 BLAKE2B 315d6918b70ea06f7b7aaac95065efd11a309710fb3e23cf57b9960cfa2c8cf339c4e731f5347127c54972105cec4c956d2ff1f418a1b516fdf56ce1c7b354d5 SHA512 92cf47cc3d32f3efb5f203228af0e78cad0f55fe9954f27c4e107ed4c26f6ae39b364a8507d5fe481e92222ede7d572fbe9c0e553b7ac38d6e5b812cb6741516
+AUX firejail-0.9.70-firecfg.config.patch 1662 BLAKE2B 71f301c49c97da5794ae4af35c8e0bca20845ef41be5c1db07911cb9de4ae0b52d7e48e37f0400c24302a820f577fe284d5c86d1f19f5b96570d66e5b92dcc0f SHA512 ec10c2e401817bb2833caa01c5f689f623f69c52a5ba48704c52f942c664274ca05755c6afaab89372a2a14122113bf0bc063e121e6ab92aec3e9a30a2b8379d
 AUX profile_display.local 158 BLAKE2B 7bb73bfa3d1a6556f9e4840e425e0bb2ee6a1e9510100a7d22a01978975805f7b80fde9c596147ee42dcc7d098b07e4969e67eaf857e6286ef94a2795671a37c SHA512 d2c85a8de17ffc7d0bac0252f7b6624ff9ff9280ad2e33fc51b4085b72db4b764b4ad719fdb6a95fe62faaeb9c541b9704b3ad764245bedec142c9488ef1e20d
 AUX profile_patch.local 198 BLAKE2B 6a84eca54c8fa5429b171707d6d2b7617c918798f40a1ea26fd1c6778a3688aa1db2be9d74025b7b8b863969c94c22de92a610d2b872b37ba216377f50f0ceae SHA512 86829f6b4867564447d06c73119a38e4ae7b5a386253229d5d0603398b9ed4ca64714221fa8aee8a9660644c3c38d762386a7a5a161fb717e6b7d7df723aa9ad
 AUX profile_pdftotext.local 132 BLAKE2B 2c98ecf386cdceae4cbaf4e3623187c66ff81540d86f978467a6a0106d57a0f41f7626f1049602fee8b7545fa413ed6ca8e21e1fb1448a374b8d80e6ae72451b SHA512 c0121f1ba4db0a737acdd250834ccd73fcd441b5d7f8d5740f75230edbb10bd6bb038dd09772ba21cb24cf4224a474749a2e0f3d0e9567b4e207f4adf67c19d0
 AUX profile_wget.local 128 BLAKE2B d2069517fce414faec2b23f8704fe15683a956af210e6e39321ca9f65bde939c71a7980506fdd3b01a6b15fb6733ebb013c684a63589839c60c53616a52ca5b6 SHA512 ef0b97b11fac742464b6520c6e6293017519b84c137c4aa60976b53b3d072bc9a69588267ac0a79c9647cee1e802fb0cd0d28e1647778e30473518415ce4d699
 DIST firejail-0.9.68.tar.xz 477332 BLAKE2B 4d995715caa81b69bb9a16f604a2463b2db48fad5ba869bb5f353973ce8ec273dbabe07ee340b40094d6fe15bcef7e356cd07e7e7dfd0491d2d1632f64878a0e SHA512 8c03c145bb91fe696407052968bd1069defc44d274bd74d33fccebb28324121d259973fccc1d1cdc38fb2902bb842e921adc9440596a92a4aa13c4e06963e354
+DIST firejail-0.9.70.tar.xz 485096 BLAKE2B d5164ba5ee08e80415a84999e4152f1f9c897f50def669731098126cec117aed3cf4b21603aeb13ccbdb1bffa9d48de69dcb19fe7135691e891b9b83f48a5ca1 SHA512 a790ccb711da6c3e52677011d7eb38c482ffb5066498d4586018671ab4ee533e02edb31fda872e0647fd27c00014b04305eafcb56f1f1b07f470aa4fb701cbe5
 EBUILD firejail-0.9.68-r1.ebuild 3046 BLAKE2B 4cff4e74660fb224440831490502763abeaa7fdefc0e350f1480abf38ad842bd77df525effd479af9f8371a3d4c9ea95a8d663bbc95fc3022c144816c2157727 SHA512 a9f79e7f93fc9cbc9b4cce5784aa51b99c994b1262532c75fe6340d787b56fc6c85866c803a537c59909b80c53f17977de47bb1f97298e56f656d405411bdd2f
-EBUILD firejail-0.9.68.ebuild 3044 BLAKE2B d7e26bce7d9cfffa594b6a72d121ce9efab1f384b25bcd1b00b0d1cccd58c9258756bdb983f2d44a9f02522c210662e7c646900f510dd4c5ce12c7973746cb6e SHA512 16ea37dd99bbfef8bdc6b5e82788a61bd0325615ccc7d5738dee24a0d6dc4c154aa14aebfd6786a75340ff199f695cfe12eb5a664d6111bc2102347996eec5b6
-EBUILD firejail-9999.ebuild 2618 BLAKE2B 4c9aaf9b58dd8983b9e6acd92ba33d44cb0b6cd41d034f3a22cf235c92b7b12bb53b1cbc73e83cf50571bf9e42e8da9ae86ed8da6739c49ac22222f3876b618b SHA512 dae3515ea76d029b93e4e0254ab8596a3eaaf6f745919fe8a81d0d84a27cc46d7001d26bed45a93c1c8fb0d0d6f5583a54d2e71d4039d1531df01e3de82a1135
-MISC metadata.xml 1814 BLAKE2B f8216f60d54df8ced109e016f0e5cc58a59dde8e8ff79b50964274607d829245db281d342274fcf82e20750988db2f5a8dfc0c2d914e83d61ae3193c1bb5aa7b SHA512 44221d68c026110e2e457adb851c1269cc3095f1f35ac3185213f2692b2a0758b5adf5d7d5b9929b9bc63bafb5e47b3b1d836c65732a7061dd729ca62c45b956
+EBUILD firejail-0.9.70.ebuild 3047 BLAKE2B e252a0c657c1e92a2420ed26bb67203a54ea08db7c1335cca477dbd745b04e627c7b8839f22b1c07e291fc0a369bdc660c9f4b9a079bb6224c713535a82e8d78 SHA512 736281c43fca7aa3ca757c2733e9062594b0c4994c569e28a4bbe56f0a0a072b9c146b0cb5d2b5bb8cb186f8d01b28f94b46e4660171fed09010fe0e4fa3aa0e
+MISC metadata.xml 1765 BLAKE2B db5d033abde3f31c928bbf08c847cae4f9f665fb8e71e5e1a2cbe8756f6b384246c5bd771424b55479f17c86c652b13560aae1735b5c70e54ae87fb417a2a290 SHA512 de1377a8b37facd99de364c8b70895c3358cd27755ba5df4217f0e8554da978754bdb85ddd98544450ad952c41db1bcfbd46c6382f76d05afb8181204dfcf143
diff --git a/sys-apps/firejail/files/firejail-0.9.70-envlimits.patch b/sys-apps/firejail/files/firejail-0.9.70-envlimits.patch
new file mode 100644
index 000000000000..d99db424c052
--- /dev/null
+++ b/sys-apps/firejail/files/firejail-0.9.70-envlimits.patch
@@ -0,0 +1,12 @@
+diff -urP firejail-0.9.70.orig/src/firejail/firejail.h firejail-0.9.70/src/firejail/firejail.h
+--- firejail-0.9.70.orig/src/firejail/firejail.h	2022-06-08 07:42:50.000000000 -0600
++++ firejail-0.9.70/src/firejail/firejail.h	2022-06-09 13:06:04.094034022 -0600
+@@ -706,7 +706,7 @@
+ int check_kernel_procs(void);
+ void run_no_sandbox(int argc, char **argv) __attribute__((noreturn));
+ 
+-#define MAX_ENVS 256			// some sane maximum number of environment variables
++#define MAX_ENVS 2048			// some sane maximum number of environment variables
+ #define MAX_ENV_LEN (PATH_MAX + 32)	// FOOBAR=SOME_PATH, only applied to Firejail's own sandboxed apps
+ // env.c
+ typedef enum {
diff --git a/sys-apps/firejail/files/firejail-0.9.70-firecfg.config.patch b/sys-apps/firejail/files/firejail-0.9.70-firecfg.config.patch
new file mode 100644
index 000000000000..ff751b9dc684
--- /dev/null
+++ b/sys-apps/firejail/files/firejail-0.9.70-firecfg.config.patch
@@ -0,0 +1,82 @@
+diff -urP firejail-0.9.70.orig/src/firecfg/firecfg.config firejail-0.9.70/src/firecfg/firecfg.config
+--- firejail-0.9.70.orig/src/firecfg/firecfg.config	2022-06-08 07:42:50.000000000 -0600
++++ firejail-0.9.70/src/firecfg/firecfg.config	2022-06-09 13:06:38.646038407 -0600
+@@ -213,7 +213,8 @@
+ electron-mail
+ electrum
+ element-desktop
+-elinks
++# Breaks emerge/portage on Gentoo: 'too many environment variables'
++#elinks
+ empathy
+ enchant
+ enchant-2
+@@ -259,7 +260,8 @@
+ flameshot
+ flashpeak-slimjet
+ flowblade
+-fontforge
++# Breaks emerge/portage on Gentoo
++#fontforge
+ font-manager
+ fossamail
+ four-in-a-row
+@@ -490,11 +492,16 @@
+ luminance-hdr
+ lximage-qt
+ lxmusic
+-lynx
++# Breaks emerge/portage on Gentoo: 'too many environment variables'
++#lynx
+ lyx
+ macrofusion
+ magicor
+-man
++# Breaks: $ man chromium-browser
++# WARNING: terminal is not fully functional
++# Press RETURN to continue 
++# Manual page chromium-browser(1) byte 0/0 (END) (press h for help or q to quit)
++#man
+ manaplus
+ marker
+ masterpdfeditor
+@@ -571,7 +578,8 @@
+ musictube
+ musixmatch
+ mutool
+-mutt
++# Breaks when configs are under ~/.mutt/
++#mutt
+ mypaint
+ mypaint-ora-thumbnailer
+ natron
+@@ -635,7 +643,8 @@
+ palemoon
+ #pandoc
+ parole
+-patch
++# Breaks emerge/portage on Gentoo: 'too many environment variables', path issues
++#patch
+ pavucontrol
+ pavucontrol-qt
+ pcsxr
+@@ -761,7 +770,8 @@
+ stellarium
+ strawberry
+ straw-viewer
+-strings
++# Breaks emerge/portage on Gentoo
++#strings
+ studio.sh
+ subdownloader
+ supertux2
+@@ -880,7 +890,8 @@
+ weechat
+ weechat-curses
+ wesnoth
+-wget
++# Breaks emerge/portage on Gentoo: 'too many environment variables', path issues
++#wget
+ wget2
+ whalebird
+ whois
diff --git a/sys-apps/firejail/firejail-0.9.68.ebuild b/sys-apps/firejail/firejail-0.9.70.ebuild
similarity index 96%
rename from sys-apps/firejail/firejail-0.9.68.ebuild
rename to sys-apps/firejail/firejail-0.9.70.ebuild
index 50077c0d2db7..5c5a610f1024 100644
--- a/sys-apps/firejail/firejail-0.9.68.ebuild
+++ b/sys-apps/firejail/firejail-0.9.70.ebuild
@@ -9,7 +9,7 @@ inherit toolchain-funcs python-single-r1 linux-info
 
 if [[ ${PV} != 9999 ]]; then
 	SRC_URI="https://github.com/netblue30/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/netblue30/firejail.git"
@@ -21,7 +21,7 @@ HOMEPAGE="https://firejail.wordpress.com/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="apparmor +chroot contrib +dbusproxy +file-transfer +globalcfg +network +private-home test +userns +whitelist X"
+IUSE="apparmor +chroot contrib +dbusproxy +file-transfer +globalcfg +network +private-home test +userns X"
 # Needs a lot of work to function within sandbox/portage
 # bug #769731
 RESTRICT="test"
@@ -39,6 +39,7 @@ REQUIRED_USE="contrib? ( ${PYTHON_REQUIRED_USE} )"
 
 PATCHES=(
 	"${FILESDIR}/${P}-envlimits.patch"
+	"${FILESDIR}/${P}-firecfg.config.patch"
 	)
 
 pkg_setup() {
@@ -81,7 +82,6 @@ src_configure() {
 		$(use_enable network) \
 		$(use_enable private-home) \
 		$(use_enable userns) \
-		$(use_enable whitelist) \
 		$(use_enable X x11)
 
 	cat > 99firejail <<-EOF || die
diff --git a/sys-apps/firejail/firejail-9999.ebuild b/sys-apps/firejail/firejail-9999.ebuild
deleted file mode 100644
index 440d20af51ec..000000000000
--- a/sys-apps/firejail/firejail-9999.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit toolchain-funcs python-single-r1 linux-info
-
-if [[ ${PV} != 9999 ]]; then
-	SRC_URI="https://github.com/netblue30/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/netblue30/firejail.git"
-	EGIT_BRANCH="master"
-fi
-
-DESCRIPTION="Security sandbox for any type of processes"
-HOMEPAGE="https://firejail.wordpress.com/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="apparmor +chroot contrib +dbusproxy +file-transfer +globalcfg +network +private-home test +userns +whitelist X"
-# Needs a lot of work to function within sandbox/portage
-# bug #769731
-RESTRICT="test"
-
-RDEPEND="!sys-apps/firejail-lts
-	apparmor? ( sys-libs/libapparmor )
-	contrib? ( ${PYTHON_DEPS} )
-	dbusproxy? ( sys-apps/xdg-dbus-proxy )"
-
-DEPEND="${RDEPEND}
-	sys-libs/libseccomp
-	test? ( dev-tcltk/expect )"
-
-REQUIRED_USE="contrib? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	CONFIG_CHECK="~SQUASHFS"
-	local ERROR_SQUASHFS="CONFIG_SQUASHFS: required for firejail --appimage mode"
-	check_extra_config
-	use contrib && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	find -type f -name Makefile.in -exec sed -i -r -e '/CFLAGS/s: (-O2|-ggdb) : :g' {} + || die
-
-	sed -i -r -e '/CFLAGS/s: (-O2|-ggdb) : :g' ./src/common.mk.in || die
-
-	# fix up hardcoded paths to templates and docs
-	local files=$(grep -E -l -r '/usr/share/doc/firejail([^-]|$)' ./RELNOTES ./src/man/ ./etc/profile*/ ./test/ || die)
-	for file in ${files[@]} ; do
-		sed -i -r -e "s:/usr/share/doc/firejail([^-]|\$):/usr/share/doc/${PF}\1:" "${file}" || die
-	done
-
-	# remove compression of man pages
-	sed -i -r -e '/rm -f \$\$man.gz; \\/d; /gzip -9n \$\$man; \\/d; s|\*\.([[:digit:]])\) install -m 0644 \$\$man\.gz|\*\.\1\) install -m 0644 \$\$man|g' Makefile.in || die
-
-	if use contrib; then
-		python_fix_shebang -f contrib/*.py
-	fi
-}
-
-src_configure() {
-	econf \
-		--disable-firetunnel \
-		--enable-suid \
-		$(use_enable apparmor) \
-		$(use_enable chroot) \
-		$(use_enable dbusproxy) \
-		$(use_enable file-transfer) \
-		$(use_enable globalcfg) \
-		$(use_enable network) \
-		$(use_enable private-home) \
-		$(use_enable userns) \
-		$(use_enable whitelist) \
-		$(use_enable X x11)
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	default
-
-	rm "${ED}"/usr/share/doc/${PF}/COPYING || die
-
-	if use contrib; then
-		python_scriptinto /usr/$(get_libdir)/firejail
-		python_doscript contrib/*.py
-		insinto /usr/$(get_libdir)/firejail
-		dobin contrib/*.sh
-	fi
-}
diff --git a/sys-apps/firejail/metadata.xml b/sys-apps/firejail/metadata.xml
index ea3a52f878b9..91bf2e4aa95b 100644
--- a/sys-apps/firejail/metadata.xml
+++ b/sys-apps/firejail/metadata.xml
@@ -31,7 +31,6 @@
 		<flag name="network">Enable networking features</flag>
 		<flag name="private-home">Enable private home feature</flag>
 		<flag name="userns">Enable attaching a new user namespace to a sandbox (--noroot option)</flag>
-		<flag name="whitelist">Enable whitelist</flag>
 		<flag name="X">Enable X11 sandboxing</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index ddf8c08bf1af..eb058e628cf9 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -6,5 +6,5 @@ DIST fwupd-1.8.1.tar.gz 4143691 BLAKE2B 1606bc35e0bf15efe202ec906161e5c526d4fdd1
 EBUILD fwupd-1.7.5.ebuild 4666 BLAKE2B 947d030a4e6e65f90ce120d7c8f1b74c2096eeea9ea522da715e4ffa5359e2dc23315a79b823f016723b3f68507bf272fca29a8471e5c2388b1a1f1c6146231b SHA512 1899b4041033e23d658cc7991aed0c94252186a737616baa8d09595e97cf4cf16369478286ab2947441b81779227f48bf10b490ce3faae821e489f29a25053c2
 EBUILD fwupd-1.7.7-r2.ebuild 4684 BLAKE2B 2febf3c31449381b94a4c46589017fd7ba00f262a9fb22c9dfd660018ce2acdff582116984e5e21f8f7181345c013b8eb88f14df1052633a3c29a9cb6546af50 SHA512 677ee8f9c19fc7bcc016b301d0abc9277c3ec20f8fe21cf407f68acab52f2067bb6a3366afc8dfe175ebfdd71c5c701c27d8fc8f75e47a4544f5e7ce5cee2b1a
 EBUILD fwupd-1.8.0-r1.ebuild 4784 BLAKE2B eec6be280d70d15750bf9c15f875bcd5e09f4d77cb4c3b7f7f21707d45d935554cfd531dcb416fb9480849c6ce3534a31b1b78463b4bfed7f2fd79b197ea8ca1 SHA512 c1e21ddb6d20e994a7720bbcc546f1a84dfda34a813cd408ac96ba379a9d3cc2a77c5c447bc1733771dcf5553172b532fda48a9cfc2d002436c3fdf735c48588
-EBUILD fwupd-1.8.1.ebuild 4784 BLAKE2B eec6be280d70d15750bf9c15f875bcd5e09f4d77cb4c3b7f7f21707d45d935554cfd531dcb416fb9480849c6ce3534a31b1b78463b4bfed7f2fd79b197ea8ca1 SHA512 c1e21ddb6d20e994a7720bbcc546f1a84dfda34a813cd408ac96ba379a9d3cc2a77c5c447bc1733771dcf5553172b532fda48a9cfc2d002436c3fdf735c48588
+EBUILD fwupd-1.8.1.ebuild 4922 BLAKE2B 99f3888b9c3c2ce2f793f14ccfdf7a4ce725a6c9a026cf6cb9090aaad0e800d2524932fbfccd92b6f9c1753d06aa0de010beed72dec663fb384edc376accd831 SHA512 f333e07a813fd0e25d9b48731454f450f8467e60db6732a40855c4934e9e1354da4e6f6bbab6fb0991d3502445c694b329d40eabd4ce7104a27d5c54ab84a213
 MISC metadata.xml 1420 BLAKE2B c693daaed459aae7ee26d02c8f398c111b6ac91a1eb0297b4efcc7c46914149dbfb0020c413c3dbcf39e929d7760b18ef44b17843386f5fe082bac10858d9f4b SHA512 fbed15525f0f59daf359bb602474d0169dd48e9994ef506d87327ffca745d9fe838f815e7619f37579477668b8c8967a312445961a0235d13c9bebf744aaf511
diff --git a/sys-apps/fwupd/fwupd-1.8.1.ebuild b/sys-apps/fwupd/fwupd-1.8.1.ebuild
index cc9c6194035c..3852c4032a8d 100644
--- a/sys-apps/fwupd/fwupd-1.8.1.ebuild
+++ b/sys-apps/fwupd/fwupd-1.8.1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 
-inherit bash-completion-r1 linux-info meson python-single-r1 vala xdg
+inherit bash-completion-r1 linux-info meson python-single-r1 vala udev xdg
 
 DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
 HOMEPAGE="https://fwupd.org"
@@ -142,6 +142,7 @@ src_configure() {
 		-Ddocs="$(usex gtk-doc gtkdoc none)"
 		-Defi_binary="false"
 		-Dsupported_build="enabled"
+		-Dudevdir="${EPREFIX}$(get_udevdir)"
 		$(meson_feature archive libarchive)
 		$(meson_use bash-completion bash_completion)
 		$(meson_feature bluetooth bluez)
@@ -177,3 +178,11 @@ src_install() {
 		fi
 	fi
 }
+
+pkg_postinst() {
+	use minimal || udev_reload
+}
+
+pkg_postrm() {
+	use minimal || udev_reload
+}
diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest
index 3ea4ea037f54..8290b8a446a9 100644
--- a/sys-apps/kbd/Manifest
+++ b/sys-apps/kbd/Manifest
@@ -1,6 +1,8 @@
 DIST kbd-2.4.0.tar.xz 1120700 BLAKE2B aa5fc1067d3414b9fa18f35dd81dcc050cdf10bd8692221b6e5304e94c4f90055386ce1f79d2bd092241f9ce15ffd36d5c00d1a15725166d16183f475be4a2e3 SHA512 c3823e40878ed4cb5b90edf753dba37a7fc3189b7b08a2e59a7830cac23a7a7daf31dedef1fcc130698c7508bc2a037c8ab54e749d0cdbf51756e346f2ed5abb
 DIST kbd-2.5.0.tar.xz 1490112 BLAKE2B c123982d5c80fa3996f6328d7151a9dcc8c969e7beeb65e83204857b044355a3531dd1efe5634d844bc43f8d5715ec63e41120679a3d34888766ef7bf6014f2b SHA512 740c4c7b8a2729f5d0539399f691d4201dab97c6eec554b82cc8c80935e956072e9735a739f8f4febc9849c1e8d9d195318b1d0d4e10dce4d34b5fb6d84111d7
+DIST kbd-2.5.1.tar.xz 1491952 BLAKE2B aab4c3d78c28709bf562b54fe94c0533d5c33185e183bf3eb944f89147b250d9df9b30b64a06eb4742feafe8c05a6aa491a7f007b4d6d9077bc19a4628ba05ae SHA512 74855f486aff5fc2f93a6cb29460a590c94eac653b001574e1b4eb1300ea99dfed9222f9e5d1d3a05a112a6880591d5c44ed6e76b8a64edf744ecb0892f562d0
 EBUILD kbd-2.4.0.ebuild 1836 BLAKE2B 1797a7b563ec3ef7e55ce1d5c164ea035bbe7da3a3f1f0abb033a3de3015d2b676c4bb24c942e6b1ebfd9bd3f15120914f042ee6f3649130fbe5adfba74b7199 SHA512 7d74a77490c4fe1c041995f6a7bf3424ae4d7c33199e14ccec9a50837144121d8090446636a39e9675b02fc835f3098c97b99cf037631fbdd963aa6276d2f9d6
 EBUILD kbd-2.5.0.ebuild 2413 BLAKE2B 46ad09689cf6309becdef514dad09c83eee77c0f30cb481c34f295f5409e6a1b59ccec8aa49aa31607654462547fc79b9fd5dc806096bb9a671f070ed5e7b311 SHA512 48c0ce767259800a62d046c55af64ccb56d32b54f4fa19293f39e237743e40445ae2c36ac59a7505f58c9b5057e15a668e4ff752dab492879e0a1d16b6485581
-EBUILD kbd-9999.ebuild 2413 BLAKE2B 46ad09689cf6309becdef514dad09c83eee77c0f30cb481c34f295f5409e6a1b59ccec8aa49aa31607654462547fc79b9fd5dc806096bb9a671f070ed5e7b311 SHA512 48c0ce767259800a62d046c55af64ccb56d32b54f4fa19293f39e237743e40445ae2c36ac59a7505f58c9b5057e15a668e4ff752dab492879e0a1d16b6485581
+EBUILD kbd-2.5.1.ebuild 2027 BLAKE2B efa4617f0d185b8a6689977985af9da0b028077ca1e89aa135c292f0e534b2295da7bc75ab14039a2d3bda6497a015ff7b2ce16d3b9bd7317386cf02a1ead1b3 SHA512 cadc6fcd9ec5b2623722d3b12d53cb6e2abff2dccf7154068803b6eb01adc455b809b69beadb11dd6e20d2e30840d25e9801fa516aef8758cf64543a33e6af35
+EBUILD kbd-9999.ebuild 2027 BLAKE2B efa4617f0d185b8a6689977985af9da0b028077ca1e89aa135c292f0e534b2295da7bc75ab14039a2d3bda6497a015ff7b2ce16d3b9bd7317386cf02a1ead1b3 SHA512 cadc6fcd9ec5b2623722d3b12d53cb6e2abff2dccf7154068803b6eb01adc455b809b69beadb11dd6e20d2e30840d25e9801fa516aef8758cf64543a33e6af35
 MISC metadata.xml 335 BLAKE2B 3b00a31428edc76e9a758c347107ad15e2f91a440a49e5167878555eda6dad176f8936ca22acbbecb5ff4827d8605b28db53ca990284b4e18c536a04d46616ed SHA512 86a6b134e0403abf5c22e868e2013a2051f504401d5ff8aa1ad682638d866ab8d837470ed87434286b77933483d7675646f382b15aed19772b2fff17258fc0f7
diff --git a/sys-apps/kbd/kbd-2.5.1.ebuild b/sys-apps/kbd/kbd-2.5.1.ebuild
new file mode 100644
index 000000000000..a8607b2c1f1d
--- /dev/null
+++ b/sys-apps/kbd/kbd-2.5.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/legionus/kbd.git https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git"
+	EGIT_BRANCH="master"
+else
+	if [[ $(ver_cut 3) -lt 90 ]] ; then
+		SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	else
+		inherit autotools
+		SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	fi
+fi
+
+DESCRIPTION="Keyboard and console utilities"
+HOMEPAGE="https://kbd-project.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="nls pam test"
+RESTRICT="!test? ( test )"
+
+# Testsuite's Makefile.am calls missing(!)
+# ... but this seems to be consistent with the autoconf docs?
+# Needs more investigation: https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/autom4te-Invocation.html
+QA_AM_MAINTAINER_MODE=".*--run autom4te --language=autotest.*"
+
+RDEPEND="
+	app-arch/gzip
+	pam? (
+		!app-misc/vlock
+		sys-libs/pam
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( dev-libs/check )
+"
+
+src_prepare() {
+	default
+
+	# Rename conflicting keymaps to have unique names, bug #293228
+	# See also https://github.com/legionus/kbd/issues/76.
+	pushd "${S}"/data/keymaps/i386 &> /dev/null || die
+	mv fgGIod/trf.map fgGIod/trf-fgGIod.map || die
+	mv olpc/es.map olpc/es-olpc.map || die
+	mv olpc/pt.map olpc/pt-olpc.map || die
+	mv qwerty/cz.map qwerty/cz-qwerty.map || die
+	popd &> /dev/null || die
+
+	if [[ ${PV} == 9999 ]] || [[ $(ver_cut 3) -ge 90 ]] ; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-werror
+
+		$(use_enable nls)
+		$(use_enable pam vlock)
+		$(use_enable test tests)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	docinto html
+	dodoc docs/doc/*.html
+
+	# USE="test" installs .la files
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/sys-apps/kbd/kbd-9999.ebuild b/sys-apps/kbd/kbd-9999.ebuild
index d0f3a2573fa7..a8607b2c1f1d 100644
--- a/sys-apps/kbd/kbd-9999.ebuild
+++ b/sys-apps/kbd/kbd-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
@@ -43,24 +43,17 @@ BDEPEND="
 	test? ( dev-libs/check )
 "
 
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-	else
-		default
-	fi
-}
-
 src_prepare() {
 	default
 
 	# Rename conflicting keymaps to have unique names, bug #293228
 	# See also https://github.com/legionus/kbd/issues/76.
-	cd "${S}"/data/keymaps/i386 || die
+	pushd "${S}"/data/keymaps/i386 &> /dev/null || die
 	mv fgGIod/trf.map fgGIod/trf-fgGIod.map || die
 	mv olpc/es.map olpc/es-olpc.map || die
 	mv olpc/pt.map olpc/pt-olpc.map || die
 	mv qwerty/cz.map qwerty/cz-qwerty.map || die
+	popd &> /dev/null || die
 
 	if [[ ${PV} == 9999 ]] || [[ $(ver_cut 3) -ge 90 ]] ; then
 		eautoreconf
@@ -69,9 +62,8 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
-		# USE="test" installs .a files
-		--disable-static
 		--disable-werror
+
 		$(use_enable nls)
 		$(use_enable pam vlock)
 		$(use_enable test tests)
@@ -80,15 +72,6 @@ src_configure() {
 	econf "${myeconfargs[@]}"
 }
 
-src_test() {
-	# Cheesy hack for now for https://github.com/legionus/kbd/issues/76
-	mv "${S}"/data/keymaps/i386/qwerty/cz-qwerty.map "${S}"/data/keymaps/i386/qwerty/cz.map || die
-
-	default
-
-	mv "${S}"/data/keymaps/i386/qwerty/cz.map "${S}"/data/keymaps/i386/qwerty/cz-qwerty.map || die
-}
-
 src_install() {
 	default
 
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index 23eb6257b144..7f9b1b762a63 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -1,5 +1,6 @@
 AUX kmod-static-nodes-r1 500 BLAKE2B 44ae03377e6cc7b5a271063828fcb39ec6925d82e52207771e1b6b4f921d0a07e51e97a8e6f432b542d88fb0195e1298cd54ba92d462a828ddd94dab7f924eb3 SHA512 8210d90f5d0702aea626b6db00adbabbd550009d8275fe430c8b113fcb0593a4dfb9efb22c061dde259e1bd94390be49823415d3fd99909e22a2bbf7ae349f63
 DIST kmod-29.tar.xz 560160 BLAKE2B 1362b6e7c07f66594074f07239d0f7a64e6efeb928483ed027b22a4ac77b916c631d1c03780b0515714a87847a716c35341edb1ced04a1795b4c7f8942d3207a SHA512 557cdcaec75e5a1ceea2d10862c944e9a65ef54f6ee9da6dc98ce4582418fdc9958aab2e14a84807db61daf36ec4fcdc23a36376c39d5dc31d1823ca7cd47998
+EBUILD kmod-29-r1.ebuild 5291 BLAKE2B 434a7a9104f0d64f8a22dc8e0dbc57b1652b15e9c6796deaebbba2c6d57116a88fc7f569f5c435820d04e41770ef3ab7b23a282a24b6c4f5da8d367ea166ff71 SHA512 b948c27eb7e144ff067f5587c2d897847290046bb0d9d207a468ce1983bc602f9fb6e03e08067857f25230e9aa2fe19d94136a5ab2c9113614c520d6dfc406ca
 EBUILD kmod-29.ebuild 5236 BLAKE2B 8674297d2f9ba5382792f4ca756e3fc47e6558020dd11d07c590232098d14f358130163733d5338cecf13b55b0f90086011bab2e4a753de8fc17f17cd22c7e07 SHA512 f576e67fd863468a49fa0b17a70cc654cce65675a10080911a210a07392a9b542d5706d63eba6daf5662be4670e2e254afc70780c9d50a7fa6ba7c967df94a41
-EBUILD kmod-9999.ebuild 5237 BLAKE2B 6b8233ab744534061927afdd75bcd8d8a26c7f4243db2fa460729e5bbb78914d9279f0667e9d6f25ca5213eb4846d33fb18c3fa189dd8a68559507a68f513d49 SHA512 0739003537b94cff33ab4bb4a795df48dc01b2fb2cf15501e8f6b756a5734e0568d91b50787aff8e10e08db8e6a0c9a609db8bb473d50b10c1ea0add817ebe9c
+EBUILD kmod-9999.ebuild 5291 BLAKE2B 434a7a9104f0d64f8a22dc8e0dbc57b1652b15e9c6796deaebbba2c6d57116a88fc7f569f5c435820d04e41770ef3ab7b23a282a24b6c4f5da8d367ea166ff71 SHA512 b948c27eb7e144ff067f5587c2d897847290046bb0d9d207a468ce1983bc602f9fb6e03e08067857f25230e9aa2fe19d94136a5ab2c9113614c520d6dfc406ca
 MISC metadata.xml 611 BLAKE2B d356a4efdd4696d1a57b9e57a4c2c6cda612830c11dcedadb307db85f202ceb8d8f6e6aaacc0e1b69f9bf909cf226f4174fb270f5f4eded14a1b42d236e345e5 SHA512 bba19da08e022d4de0970d80646dfdcaaede388e2b0a020bb9d83ebcb0fe1e62864e944c29a9bb6692df12981e24c091803ccda6161c2d6186b0dd46c3074108
diff --git a/sys-apps/kmod/kmod-29-r1.ebuild b/sys-apps/kmod/kmod-29-r1.ebuild
new file mode 100644
index 000000000000..48747e41ed50
--- /dev/null
+++ b/sys-apps/kmod/kmod-29-r1.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit autotools libtool bash-completion-r1 python-r1
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="library and tools for managing linux kernel modules"
+HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="debug doc +lzma pkcs7 python static-libs +tools +zlib +zstd"
+
+# Upstream does not support running the test suite with custom configure flags.
+# I was also told that the test suite is intended for kmod developers.
+# So we have to restrict it.
+# See bug #408915.
+RESTRICT="test"
+
+# - >=zlib-1.2.6 required because of bug #427130
+# - Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch
+# - >=zstd-1.5.1-r3 required for bug #771078
+RDEPEND="!sys-apps/module-init-tools
+	!sys-apps/modutils
+	!<sys-apps/openrc-0.13.8
+	!<sys-apps/systemd-216-r3
+	lzma? ( >=app-arch/xz-utils-5.0.4-r1 )
+	python? ( ${PYTHON_DEPS} )
+	pkcs7? ( >=dev-libs/openssl-1.1.0:= )
+	zlib? ( >=sys-libs/zlib-1.2.6 )
+	zstd? ( >=app-arch/zstd-1.5.1-r3:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? (
+		dev-util/gtk-doc
+		dev-util/gtk-doc-am
+	)
+	lzma? ( virtual/pkgconfig )
+	python? (
+		dev-python/cython[${PYTHON_USEDEP}]
+		virtual/pkgconfig
+	)
+	zlib? ( virtual/pkgconfig )
+"
+if [[ ${PV} == 9999* ]]; then
+	BDEPEND="${BDEPEND}
+		dev-libs/libxslt"
+fi
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DOCS=( NEWS README TODO )
+
+src_prepare() {
+	default
+
+	if [[ ! -e configure ]] || use doc ; then
+		if use doc; then
+			cp "${BROOT}"/usr/share/aclocal/gtk-doc.m4 m4 || die
+			gtkdocize --copy --docdir libkmod/docs || die
+		else
+			touch libkmod/docs/gtk-doc.make
+		fi
+		eautoreconf
+	else
+		elibtoolize
+	fi
+
+	# Restore possibility of running --enable-static, bug #472608
+	sed -i \
+		-e '/--enable-static is not supported by kmod/s:as_fn_error:echo:' \
+		configure || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bindir="${EPREFIX}/bin"
+		--enable-shared
+		--with-bashcompletiondir="$(get_bashcompdir)"
+		--with-rootlibdir="${EPREFIX}/$(get_libdir)"
+		$(use_enable debug)
+		$(usex doc '--enable-gtk-doc' '')
+		$(use_enable static-libs static)
+		$(use_enable tools)
+		$(use_with lzma xz)
+		$(use_with pkcs7 openssl)
+		$(use_with zlib)
+		$(use_with zstd)
+	)
+
+	local ECONF_SOURCE="${S}"
+
+	kmod_configure() {
+		mkdir -p "${BUILD_DIR}" || die
+		run_in_build_dir econf "${myeconfargs[@]}" "$@"
+	}
+
+	BUILD_DIR="${WORKDIR}/build"
+	kmod_configure --disable-python
+
+	if use python; then
+		python_foreach_impl kmod_configure --enable-python
+	fi
+}
+
+src_compile() {
+	emake -C "${BUILD_DIR}"
+
+	if use python; then
+		local native_builddir="${BUILD_DIR}"
+
+		python_compile() {
+			emake -C "${BUILD_DIR}" -f Makefile -f - python \
+				VPATH="${native_builddir}:${S}" \
+				native_builddir="${native_builddir}" \
+				libkmod_python_kmod_{kmod,list,module,_util}_la_LIBADD='$(PYTHON_LIBS) $(native_builddir)/libkmod/libkmod.la' \
+				<<< 'python: $(pkgpyexec_LTLIBRARIES)'
+		}
+
+		python_foreach_impl python_compile
+	fi
+}
+
+src_install() {
+	emake -C "${BUILD_DIR}" DESTDIR="${D}" install
+
+	einstalldocs
+
+	if use python; then
+		local native_builddir="${BUILD_DIR}"
+
+		python_install() {
+			emake -C "${BUILD_DIR}" DESTDIR="${D}" \
+				VPATH="${native_builddir}:${S}" \
+				install-pkgpyexecLTLIBRARIES \
+				install-dist_pkgpyexecPYTHON
+			python_optimize
+		}
+
+		python_foreach_impl python_install
+	fi
+
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	if use tools; then
+		local cmd
+		for cmd in depmod insmod modprobe rmmod; do
+			dosym ../bin/kmod /sbin/${cmd}
+		done
+
+		# These are also usable as normal user
+		for cmd in lsmod modinfo; do
+			dosym kmod /bin/${cmd}
+		done
+	fi
+
+	cat <<-EOF > "${T}"/usb-load-ehci-first.conf
+	softdep uhci_hcd pre: ehci_hcd
+	softdep ohci_hcd pre: ehci_hcd
+	EOF
+
+	insinto /lib/modprobe.d
+	# bug #260139
+	doins "${T}"/usb-load-ehci-first.conf
+
+	newinitd "${FILESDIR}"/kmod-static-nodes-r1 kmod-static-nodes
+}
+
+pkg_postinst() {
+	if [[ -L ${EROOT}/etc/runlevels/boot/static-nodes ]]; then
+		ewarn "Removing old conflicting static-nodes init script from the boot runlevel"
+		rm -f "${EROOT}"/etc/runlevels/boot/static-nodes
+	fi
+
+	# Add kmod to the runlevel automatically if this is the first install of this package.
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		if [[ ! -d ${EROOT}/etc/runlevels/sysinit ]]; then
+			mkdir -p "${EROOT}"/etc/runlevels/sysinit
+		fi
+		if [[ -x ${EROOT}/etc/init.d/kmod-static-nodes ]]; then
+			ln -s /etc/init.d/kmod-static-nodes "${EROOT}"/etc/runlevels/sysinit/kmod-static-nodes
+		fi
+	fi
+
+	if [[ -e ${EROOT}/etc/runlevels/sysinit ]]; then
+		if ! has_version sys-apps/systemd && [[ ! -e ${EROOT}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
+			ewarn
+			ewarn "You need to add kmod-static-nodes to the sysinit runlevel for"
+			ewarn "kernel modules to have required static nodes!"
+			ewarn "Run this command:"
+			ewarn "\trc-update add kmod-static-nodes sysinit"
+		fi
+	fi
+}
diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
index c18aedb0e8f6..48747e41ed50 100644
--- a/sys-apps/kmod/kmod-9999.ebuild
+++ b/sys-apps/kmod/kmod-9999.ebuild
@@ -1,19 +1,18 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
-inherit autotools bash-completion-r1 multilib python-r1
+inherit autotools libtool bash-completion-r1 python-r1
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	#inherit libtool
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="library and tools for managing linux kernel modules"
@@ -21,7 +20,7 @@ HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"
 
 LICENSE="LGPL-2"
 SLOT="0"
-IUSE="debug doc +lzma pkcs7 python static-libs +tools +zlib zstd"
+IUSE="debug doc +lzma pkcs7 python static-libs +tools +zlib +zstd"
 
 # Upstream does not support running the test suite with custom configure flags.
 # I was also told that the test suite is intended for kmod developers.
@@ -29,17 +28,18 @@ IUSE="debug doc +lzma pkcs7 python static-libs +tools +zlib zstd"
 # See bug #408915.
 RESTRICT="test"
 
-# >=zlib-1.2.6 required because of bug #427130
-# Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch
+# - >=zlib-1.2.6 required because of bug #427130
+# - Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch
+# - >=zstd-1.5.1-r3 required for bug #771078
 RDEPEND="!sys-apps/module-init-tools
 	!sys-apps/modutils
 	!<sys-apps/openrc-0.13.8
 	!<sys-apps/systemd-216-r3
 	lzma? ( >=app-arch/xz-utils-5.0.4-r1 )
 	python? ( ${PYTHON_DEPS} )
-	pkcs7? ( >=dev-libs/openssl-1.1.0:0= )
+	pkcs7? ( >=dev-libs/openssl-1.1.0:= )
 	zlib? ( >=sys-libs/zlib-1.2.6 )
-	zstd? ( >=app-arch/zstd-1.4.4 )"
+	zstd? ( >=app-arch/zstd-1.5.1-r3:= )"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	doc? (
@@ -50,7 +50,7 @@ BDEPEND="
 	python? (
 		dev-python/cython[${PYTHON_USEDEP}]
 		virtual/pkgconfig
-		)
+	)
 	zlib? ( virtual/pkgconfig )
 "
 if [[ ${PV} == 9999* ]]; then
@@ -77,7 +77,7 @@ src_prepare() {
 		elibtoolize
 	fi
 
-	# Restore possibility of running --enable-static wrt #472608
+	# Restore possibility of running --enable-static, bug #472608
 	sed -i \
 		-e '/--enable-static is not supported by kmod/s:as_fn_error:echo:' \
 		configure || die
@@ -118,7 +118,7 @@ src_compile() {
 	emake -C "${BUILD_DIR}"
 
 	if use python; then
-		local native_builddir=${BUILD_DIR}
+		local native_builddir="${BUILD_DIR}"
 
 		python_compile() {
 			emake -C "${BUILD_DIR}" -f Makefile -f - python \
@@ -134,10 +134,11 @@ src_compile() {
 
 src_install() {
 	emake -C "${BUILD_DIR}" DESTDIR="${D}" install
+
 	einstalldocs
 
 	if use python; then
-		local native_builddir=${BUILD_DIR}
+		local native_builddir="${BUILD_DIR}"
 
 		python_install() {
 			emake -C "${BUILD_DIR}" DESTDIR="${D}" \
@@ -170,7 +171,8 @@ src_install() {
 	EOF
 
 	insinto /lib/modprobe.d
-	doins "${T}"/usb-load-ehci-first.conf #260139
+	# bug #260139
+	doins "${T}"/usb-load-ehci-first.conf
 
 	newinitd "${FILESDIR}"/kmod-static-nodes-r1 kmod-static-nodes
 }
diff --git a/sys-apps/kmscon/Manifest b/sys-apps/kmscon/Manifest
index fd06ea48a3ce..23984af8730f 100644
--- a/sys-apps/kmscon/Manifest
+++ b/sys-apps/kmscon/Manifest
@@ -1,5 +1,6 @@
 DIST kmscon-8_p20180906.tar.gz 1156350 BLAKE2B 52c024ca6e9652b468efb23d38cda34bf0c05e1e2bb4268435e17adb8858439ac6bf0e1783cfdd24a48fcb2dcf7c1cb20eee09aeb90db08c2e94224d01efeff7 SHA512 2ccdc5b30df6d96ac7a75d01d674b295bcdb0d445169716638a20c9884b090bbfe509e0aee79cb674a2d9b0eb18ea6284b9d4e2939cb5bf290cade4c1a02487a
 DIST kmscon-8_p20220214.tar.gz 1158069 BLAKE2B a64b19da4bc57e4baed8d3822cbf7cca472614a30fe604a09c53f8ab3e024725abdad7286c6c183e7de3b24bd80e01c5141d6c7f10794b9101530832602dad4f SHA512 837026b3f9702fe487d63d665140ea9e37a39975161e86f78a4c989b18eabd3c3429a4a6ebc384790389042b014dbaaa8225a136290f9310b113b606e551f4c2
 EBUILD kmscon-8_p20180906-r2.ebuild 2929 BLAKE2B 9fa4c899c776e7bd780b6dd40d1a8adc9880ab129a308479f60eabecd00843e389b886dbd632c4d5da4b2d5d04ba655e1af2b49d3bffabd1873b0f523fcb14e2 SHA512 ac8ca2c15773715a2b79b494fd82952f89bd805223a7b36c04a44aa1d81f5378129bde32ef970b1a8c19bcf2af75a44245b880e70dcb2dcad9b9a8ecb4e2f48d
+EBUILD kmscon-8_p20220214-r1.ebuild 3015 BLAKE2B c49d2f797ff8db10fe01affcf3a75dc03cbb233e654cfb2e898b09e065b84871cffa658f5ec81f29b53671cefd40b54b9abba79a9f61a568cbf23a21f930d388 SHA512 41dd8e5fc4de97d6e413a4830c2108a1cc0ddc20f55d0bc929164149b81707c8882584262253d2dbbc3e54dbbd9ba5e151d0d80376255ae6a93bec6b7040561a
 EBUILD kmscon-8_p20220214.ebuild 2929 BLAKE2B 77b35eb82062531590fad5fba956c9e50c0818635a59f437f090282dad52d7973408a6f1f14e5ad0dda660b816adcf113afddaeee6f2314618681add1c08c019 SHA512 28a613ece6af9b05330f52cf864a036ca8fdb25b9567d993d59617cd6e7eb77bcf2aeded9caf0f8ea37b29411097ef3ee79acde6510b35368f4b8db0b8ff4681
 MISC metadata.xml 665 BLAKE2B 3eda7f9e7848f5e1ee5161d8f124bd9cec1978c3bac41c3d3b90ffa1eb6300cb69a609233307731e7f71c89a30550c61f84d2690793a75f500853491bc137391 SHA512 d692f3f0cdabf80e3c5eb6c4a41efa457ab15b3e90ecadf741e829ea28a63f223e55439b4ca7f0ef15a61e8f9e77c2b9eb0952241940a939e801b97280dbda1a
diff --git a/sys-apps/kmscon/kmscon-8_p20220214-r1.ebuild b/sys-apps/kmscon/kmscon-8_p20220214-r1.ebuild
new file mode 100644
index 000000000000..21a91dd7c616
--- /dev/null
+++ b/sys-apps/kmscon/kmscon-8_p20220214-r1.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+COMMIT="5eed56cfc873df4d7606bc1c470e1d2bb4d42f1c"
+SRC_URI="https://github.com/Aetf/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+inherit autotools flag-o-matic systemd toolchain-funcs vcs-snapshot
+
+DESCRIPTION="KMS/DRM based virtual Console Emulator"
+HOMEPAGE="https://github.com/Aetf/kmscon"
+
+LICENSE="MIT LGPL-2.1 BSD-2"
+SLOT="0"
+IUSE="debug doc +drm +fbdev +gles2 +optimizations +pango pixman static-libs systemd +unicode"
+
+COMMON_DEPEND="
+	>=virtual/udev-172
+	x11-libs/libxkbcommon
+	>=dev-libs/libtsm-4.0.0:=
+	media-libs/mesa[X(+)]
+	drm? ( x11-libs/libdrm
+		>=media-libs/mesa-8.0.3[egl(+),gbm(+)] )
+	gles2? ( >=media-libs/mesa-8.0.3[gles2] )
+	systemd? ( sys-apps/systemd )
+	pango? ( x11-libs/pango dev-libs/glib:2 )
+	pixman? ( x11-libs/pixman )"
+RDEPEND="${COMMON_DEPEND}
+	x11-misc/xkeyboard-config"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )"
+
+REQUIRED_USE="gles2? ( drm )"
+
+# args - names of renderers to enable
+renderers_enable() {
+	if [[ "x${RENDER}" == "x" ]]; then
+		RENDER="$1"
+		shift
+	else
+		for i in $@; do
+			RENDER+=",${i}"
+		done
+	fi
+}
+
+# args - names of font renderer backends to enable
+fonts_enable() {
+	if [[ "x${FONTS}" == "x" ]]; then
+		FONTS="$1"
+		shift
+	else
+		for i in $@; do
+			FONTS+=",${i}"
+		done
+	fi
+}
+
+# args - names of video backends to enable
+video_enable() {
+	if [[ "x${VIDEO}" == "x" ]]; then
+		VIDEO="$1"
+		shift
+	else
+		for i in $@; do
+			VIDEO+=",${i}"
+		done
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+
+	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+src_configure() {
+	# Video backends
+
+	if use fbdev; then
+		video_enable fbdev
+	fi
+
+	if use drm; then
+		video_enable drm2d
+	fi
+
+	if use gles2; then
+		video_enable drm3d
+	fi
+
+	# Font rendering backends
+
+	if use unicode; then
+		fonts_enable unifont
+	fi
+
+	if use pango; then
+		fonts_enable pango
+	fi
+
+	# Console rendering backends
+
+	renderers_enable bbulk
+
+	if use gles2; then
+		renderers_enable gltex
+	fi
+
+	if use pixman; then
+		renderers_enable pixman
+	fi
+
+	# kmscon sets -ffast-math unconditionally
+	strip-flags
+
+	# xkbcommon not in portage
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable debug) \
+		$(use_enable optimizations) \
+		$(use_enable systemd multi-seat) \
+		--with-video=${VIDEO} \
+		--with-fonts=${FONTS} \
+		--with-renderers=${RENDER} \
+		--with-sessions=dummy,terminal
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	systemd_dounit "${S}/docs"/kmscon{,vt@}.service
+
+	insinto /usr/share/${PN}
+	doins -r fblog
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	grep -e "^ERASECHAR" "${EROOT}"/etc/login.defs && \
+	ewarn "It is recommended that you comment out the ERASECHAR line in" && \
+	ewarn " /etc/login.defs for proper backspace functionality at the" && \
+	ewarn " kmscon login prompt.  For details see:" && \
+	ewarn "https://github.com/dvdhrm/kmscon/issues/69#issuecomment-13827797"
+}
diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index 18934e53774f..42b487a852c5 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -12,5 +12,5 @@ AUX memtest86+-5.31b-test-random-cflags.patch 636 BLAKE2B ab14809232dfdb0475fa8d
 DIST memtest86+-5.31b.tar.gz 227779 BLAKE2B 14aced912bb84115278a3aff7650a3571918b823335aaf7d09880ef10374c320f64878765d93d2ee5a75e2b33ef6c9c4886a9a168955bd77c668f06f5c86a6ca SHA512 ad5891fd0c430ce7a5d0cde2d10dee20b66ad8060d47c3e70e038461d9cde3a78dfc13442b5b09da7c662741945a670353c72dbc08fd5ee8bae82256001a9541
 DIST memtest86+-6.00_beta2.tar.gz 214840 BLAKE2B 223c3023ba38d584c9ff1923e859ee37f1d943be657c80d4151d0b9ded79b4b363f3e2f7e51d58c7b2b637133ecada0f9a952fcdbbf03d8c34cb00a64762022c SHA512 78b13cc05f470e40e347f6eddb4441c2b377c47ea9aa0252096ef37c884f452bdfce1292452a36aa3ce0cf59c3eb0e53c0e069863b3f165dcd648d9eae9c76ea
 EBUILD memtest86+-5.31b-r3.ebuild 2858 BLAKE2B 47a6e5a68e77f6425b7761d5cc18378a13bc6f6b3febb2624277fa3bf24374e69265ab0c97a3854abbfa5acd96f984b2d1392acb29fb3cda37357370d57067c8 SHA512 8c8846addd0db5093b384c36a74eea8e853e66b174c7f9930d9a61abc71c41cdaf5e1967b01eaad77af68a4f81b7687517e0b23e26f26cd11ae104da0c49e881
-EBUILD memtest86+-6.00_beta2.ebuild 1600 BLAKE2B e9f4dd7dcdd2d798468247c61282143251fc79daf42797783bad0415ad952c1e656a25cffcd30655dcd17a2971d1ff6fbc29a5093630de86a829be565e26c71e SHA512 7c0607693793bae9ef561574d05bc422c1d17a177255e8765d2775c295fd0c32b737b12e83c213a9949bbb99801466682082c77831b3d97079a67ffd9750b2b4
+EBUILD memtest86+-6.00_beta2.ebuild 1611 BLAKE2B c0de373f6409919e2fcd15c8f2ebe0bdd17692d88016392173b9ab4a80e9f64ebfaaa5ce19bbb431e8f3635d1de838bd114db466653dfeb16a836c8c0ebca4db SHA512 2e07de7fd39f2f66c3cd337ee151e45fbf4f0b32a343290170727980232c75b212e910870f2d614abcea4ba912e4420d526e2ba90e8a3ed13fceb932fcdc37a3
 MISC metadata.xml 944 BLAKE2B fd7d12b3e27ea5dfa0ebf56502faf2bf43222f9a070fc718c7e983a03afb2cde239f71d5a45947548435005dc72faeff4d8b850f38a64f57f7def5f098896ac6 SHA512 e64965365707ad5c830fb07f4ed2a2c54dcf7703b5b898d24c87ea7c082312ac30277abb77af643c9a7c021c56578de0d8b9b2f12cb01017b68ddf61885a13d4
diff --git a/sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild b/sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild
index 0463eb856f04..2107fd4d4b8f 100644
--- a/sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild
+++ b/sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/memtest86plus/memtest86plus/archive/refs/tags/v${MY_
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 IUSE="bios32 bios64 +boot efi32 efi64 iso32 iso64"
 
 ISODEPS="
diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index 36a6f26c0fb8..91e9c01402ee 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -1,5 +1,3 @@
-DIST s6-linux-init-1.0.7.1.tar.gz 58373 BLAKE2B 02d2a3898882a41adea85dfcc3f0e03636dac16758aea88c09bb0309d61fa86526d8e678e0a24b915949d7b76e77b558809be65ccc7b0c0156b852c3d1a587ba SHA512 92ef82c00cd8e6de92adccfe1c61ef23130458f912a6c9a7d52447584a775660446bdef1954bbff3042ecba3de9587fb2dab8e329bc96a8e55b486668b4aaf64
 DIST s6-linux-init-1.0.7.3.tar.gz 58607 BLAKE2B 081c452761d96308b496e4ec3281c8b50d6cc1760b34d74647bd27cfef213e73f0cb1e1919c7d238242e8295c91a8fb3bf51638b1216e922516c71eb5718486a SHA512 ff4e1727f7d68ceb72db501de5abc36962b0083baef376899aefa4cd81420852c7966ca1c625339c052d205a28261cc928e87a2e5715854b5fcc4666c56eeff3
-EBUILD s6-linux-init-1.0.7.1.ebuild 1734 BLAKE2B 68c3cd8aa92cd63dc66997ef24291d83b78b735cbfe68bcecfe18eafbb4626ad4d28eea1f825ab9dc4b14e3ff290a7d84bfed9260882e846cf9bed321ec089d1 SHA512 bec91dde8777bd4694528cea56410a98d640f94b7fce97ec81763f0cefa5e59dc92fe1be8b6ec3aad027ce3eb6bb2c583c45ccab5f194744caafd9d4c9484b9b
 EBUILD s6-linux-init-1.0.7.3.ebuild 1734 BLAKE2B 07dab4e8bf35369ed28fe1a0a6118495cc62144382e4da690eb375baff40b8e8671cd59599fac4d6fad4a8e85661617d0906984240eb3c0dcada1f6dedcbcf2d SHA512 f78e875df2c7e1c33a91c2809f2cbd051dfc38d796682532b4bf00949ac5de5240e8984a84fa124b191c0ebbf113b84993c6de65310a81d5d8fceb005fdbebf9
 MISC metadata.xml 762 BLAKE2B c6fcd5da4965ab30aa041c568356cbe8fefb5df76f5396d5d47264d1463730be034b8a8fa96bfa8961bd27ea253495b340ce07da6f16f59ed1d657da560d36bc SHA512 ef5a96b38cc3b927841a7d7e9bdc27d6609c95f585b93c8e6496c57743cdb3d0335434c63d0634207c4554d8a0aaaebd2c0ec06e953d3065dd119db6972e1666
diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.0.7.1.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.0.7.1.ebuild
deleted file mode 100644
index 305a8b7a163c..000000000000
--- a/sys-apps/s6-linux-init/s6-linux-init-1.0.7.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Generates an init binary for s6-based init systems"
-HOMEPAGE="https://www.skarnet.org/software/s6-linux-init/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm x86"
-IUSE="static static-libs +sysv-utils"
-
-REQUIRED_USE="static? ( static-libs )"
-
-RDEPEND=">=dev-lang/execline-2.8.2.0:=[static-libs?]
-	>=dev-libs/skalibs-2.11.1.0:=[static-libs?]
-	>=sys-apps/s6-2.11.0.1:=[execline,static-libs?]
-	sysv-utils? (
-		!sys-apps/systemd[sysv-utils]
-		!sys-apps/sysvinit
-	)
-"
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-	default
-
-	# Avoid QA warning for LDFLAGS addition
-	sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
-
-	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
-	tc-export AR CC RANLIB
-
-	local myconf=(
-		--bindir=/bin
-		--dynlibdir=/usr/$(get_libdir)
-		--skeldir=/etc/s6-linux-init/skel
-		--libdir=/usr/$(get_libdir)/${PN}
-		--with-dynlib=/usr/$(get_libdir)
-		--with-lib=/usr/$(get_libdir)/s6
-		--with-lib=/usr/$(get_libdir)/skalibs
-		--with-sysdeps=/usr/$(get_libdir)/skalibs
-		--enable-shared
-		$(use_enable static allstatic)
-		$(use_enable static static-libc)
-		$(use_enable static-libs static)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	if use sysv-utils ; then
-		"${D}/bin/s6-linux-init-maker" -f "${D}/etc/s6-linux-init/skel" "${T}/dir" || die
-		into /
-		dosbin "${T}/dir/bin"/{halt,poweroff,reboot,shutdown,telinit}
-	fi
-}
-
-pkg_postinst() {
-	einfo "Read ${EROOT}/usr/share/doc/${PF}/html/quickstart.html"
-	einfo "for usage instructions."
-}
diff --git a/sys-apps/s6-portable-utils/Manifest b/sys-apps/s6-portable-utils/Manifest
index 913934d34885..f828d7f72dd8 100644
--- a/sys-apps/s6-portable-utils/Manifest
+++ b/sys-apps/s6-portable-utils/Manifest
@@ -1,5 +1,3 @@
-DIST s6-portable-utils-2.2.3.4.tar.gz 50120 BLAKE2B 17eecbf432b91720ed672e0388665e3dd7302fa2638225d0cdb9ad3c580fa29734ebf5f6e838e1bc4fdcec841ac4414d5b13d78ccb9167f5fad18dc763d8f611 SHA512 1bb9f7bd1c00d12d8434dbabb7061fe589ee9de9f0745399aacf560712bb0c9b4df2dbc221b0c8144c351e9976982c7a7e69dd127517281799d810596d8db5a2
 DIST s6-portable-utils-2.2.4.0.tar.gz 50343 BLAKE2B edfbe4ab48914ae485072f220931e6af4d53fc8d1c1dc5e1186bc1688a429e6d14a370b02dbe0a9b641a8204f65e6f6bfb6cb0c0c9318acf89d9f6ad7f7f914f SHA512 35b62aff76b9fbf978e81dad2f343a2542cb4a853530948cc3b446b20e8d5f976d1624194c2aad6e0277b73d23d5cecf2142e3f2916bd152ad62342fc30fe07a
-EBUILD s6-portable-utils-2.2.3.4.ebuild 1075 BLAKE2B f5b3b90648b618522c9a12658fc397010f8afa09329e6f13384e3d2e9f66a374a474ce456c646bf9914d56b8448f062278869356549ceaa4a2dae09a52b46304 SHA512 4e6a7ecd36e4525e07a4df1ebf2750aa2eb73b19b4c7bbb6f67c49f8908ccab0f11a2ed085491aff8b9c2c5bda8023b9e9b937f2c543537e0c673521f8f1ed3d
 EBUILD s6-portable-utils-2.2.4.0.ebuild 1075 BLAKE2B a25cf9c339bd5c7da9324d22531fe0f9b7b6f7600ffc63a9cbbfa6dd9dfb40921346926d32cc6a305024d9c50ee68a695829538afa79c7f3c6717b3c1dc555d3 SHA512 fff29b2d3008e501cc42b0a8d55018d926e0c6a5a01603e2fd9cfcbc01c8a5ddbc71a6cdf7bde953899c27856df3ef377a5694535fc38db03b65bf66cfc12e5a
 MISC metadata.xml 624 BLAKE2B 42e42ad932d528935b581814d0c4b07a6cf54d800b44e77eca63f0b8fab7f91d423b6aa8b74ade323f5bf9909b3d5e67af06caacab810bd8a5fad6ce4c127496 SHA512 6516bb423a7b7a18c226f5eab903fee5147d15aaf29bbe3def230ae70d6190c8360b9645fc379acf8163103f986ffad727096729d5feee7610899ad8d98764a9
diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.3.4.ebuild b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.3.4.ebuild
deleted file mode 100644
index e94c0ff91382..000000000000
--- a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.3.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Set of tiny portable unix utilities"
-HOMEPAGE="https://www.skarnet.org/software/s6-portable-utils/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="static"
-
-RDEPEND="!static? ( >=dev-libs/skalibs-2.11.1.0:= )"
-DEPEND="${RDEPEND}
-	static? ( >=dev-libs/skalibs-2.11.1.0[static-libs] )
-"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-	default
-
-	# Avoid QA warning for LDFLAGS addition
-	sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
-
-	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
-	tc-export AR CC RANLIB
-
-	local myconf=(
-		--bindir=/bin
-		--dynlibdir=/usr/$(get_libdir)
-		--libdir=/usr/$(get_libdir)/${PN}
-		--with-dynlib=/usr/$(get_libdir)
-		--with-lib=/usr/$(get_libdir)/skalibs
-		--with-sysdeps=/usr/$(get_libdir)/skalibs
-		$(use_enable static allstatic)
-		$(use_enable static static-libc)
-	)
-
-	econf "${myconf[@]}"
-}
diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index b463d69580c1..4180ac206211 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -1,5 +1,3 @@
-DIST s6-2.11.0.1.tar.gz 227802 BLAKE2B 76721fdbc4fdbcb11d20eff31b817e66c49a488290ac8564a0418c5cd2ba3a204625dac2ce0dedcc8fccb18f54c5178253627f6874160b748db323cb4a34f32e SHA512 e833ae42d7094a46eea4d914c8e9b07b030cab2c6010c1d7698a070d14adbb62a614822a9575a3064a6b8a5a856146fc9fa27661f0d84569dac14ad6cdbf84d9
 DIST s6-2.11.1.0.tar.gz 228745 BLAKE2B 872ac1f736337a8e6617c46af92f8e894c06a4b40501ebf58568dc6a58cb594fdf36654cdb8cfd8e922431c17f9b4f82441296a3ce8031ba8b1f27fa1ba8a051 SHA512 ab3cb4a61fae21537eacffdaa427a0a6b23b12088586f0cd8dc993e0de29e9863d04c8706cb044acdc08254002b19eb5f894262d37348d467f8c713d8124e738
-EBUILD s6-2.11.0.1.ebuild 1303 BLAKE2B 48e80812dfdecce6aca5998024b95aaa25533f0dd6c73e03a7c41ea7b898b1388b3941b32ccf111912e7da89821f658fa1e0c4a1447bcff16c84825b58b88748 SHA512 0b2ba15254cd187e8594d1124e0431e7d6a64ce21578f36dd6e6309da93e64452ddc80b5c56d6fcd10770358df47b4f45e78c140f35ff6adb9cc2abbf7a8e552
 EBUILD s6-2.11.1.0.ebuild 1303 BLAKE2B fb2b315a3bd6b52f310274e4b8acc53348bbf5d1d9bed421de83b4d66bdb765e0892f4bb14b0a4aef767bb1dadb872dd32debaad5344623c37cca1975d7f3b09 SHA512 42609b10c9694dea31d1ff7dfa2068384fdc474a2de0b085d9654a82f3c4fa9fa48fd088f3b18dcb202677f55fba94bab3d2e8758f24fbf3c39dc815a817f09d
 MISC metadata.xml 883 BLAKE2B 501518e15b1abd7badfd84007057b30f5ce972d7da8997ebbc218db6aa4001e06500f3b42f88ff259324bd3ba732231275cd33f27baa1588e28b9b80098befa9 SHA512 98b763747501225ebb0a5a1b8fb8a49757bb64c792c572f01c84dbdfe62ae83f03f72cb4ccfb905f58f9d24f06ded96a158602528ee26c1979c017477a4be183
diff --git a/sys-apps/s6/s6-2.11.0.1.ebuild b/sys-apps/s6/s6-2.11.0.1.ebuild
deleted file mode 100644
index 2f9f63992ca5..000000000000
--- a/sys-apps/s6/s6-2.11.0.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="skarnet.org's small and secure supervision software suite"
-HOMEPAGE="https://www.skarnet.org/software/s6/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm x86"
-IUSE="+execline static static-libs"
-
-REQUIRED_USE="static? ( static-libs )"
-
-RDEPEND="execline? ( >=dev-lang/execline-2.8.2.0:=[static-libs?] )
-	>=dev-libs/skalibs-2.11.1.0:=[static-libs?]
-"
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-	default
-
-	# Avoid QA warning for LDFLAGS addition
-	sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
-
-	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
-	tc-export AR CC RANLIB
-
-	local myconf=(
-		--bindir=/bin
-		--dynlibdir=/usr/$(get_libdir)
-		--libdir=/usr/$(get_libdir)/${PN}
-		--with-dynlib=/usr/$(get_libdir)
-		--with-lib=/usr/$(get_libdir)/execline
-		--with-lib=/usr/$(get_libdir)/skalibs
-		--with-sysdeps=/usr/$(get_libdir)/skalibs
-		$(usex execline '' '--disable-execline' )
-		--enable-shared
-		$(use_enable static allstatic)
-		$(use_enable static static-libc)
-		$(use_enable static-libs static)
-	)
-
-	econf "${myconf[@]}"
-}
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index e6399c0b072f..45735745e5ca 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -5,6 +5,6 @@ AUX systemd-tmpfiles-setup-dev 342 BLAKE2B 95956e57d4f2aa10a09f23c08045ceed6fac3
 DIST systemd-musl-patches-250.4.tar.gz 28065 BLAKE2B b8366c4bb29705e3f41f07d0105c4d252d543aaac178e968663660eeb573da034813aa50a96c74ac78ae5efeea379e00df33c5a039ec828cf93450ed23786252 SHA512 66e41fab1873021913c32e3f43300ea7babd18a36e6543838ab7fab4c44f5590c6a7414dd50c7ee81e5513b0e5aa01cb6df4231e8e06c609d63011a32b524213
 DIST systemd-stable-250.6.tar.gz 11212534 BLAKE2B faf065dbe5c02d9d3311202f93b9ad8984c4c9d127d32c17f305b81046f9e29cfc731cdd4abbd073965f448f4e1dff81d80313896b346548d2640939ad509365 SHA512 b625d5fb419370d238cf72f2e59c8fa6782972d94746835bde3a64a7746edd1d5fad901bbb01311f858b7dbdff6d759518b615708bb835a81964c16878d5644e
 DIST systemd-stable-250.7.tar.gz 11214975 BLAKE2B 5d94b4b1f8b0cd6e8284a89ac0d4bd373eccdad2c3d6e6c453df79c8df47ee0f9cfbde764b72b1f9d172d07e2d9f1f1f41c1ab254cf4abd0722469ebc3ad7cf8 SHA512 99bc6f0c9757b280cb694f3fb4d6fe04d5ce55583eb2bae5ddeb324bb5ee9930c1720fcc27293d90cddba188473653ec541a471ae8115710a5850c26d0ba215d
-EBUILD systemd-utils-250.6.ebuild 11305 BLAKE2B 8a3341755706a5163ddb829ea614b8138d022551aefbfad4788e84a49b4962a917b3fff90f099b8a920e239b7495a2a76ca590bccd87d813249757b6d2dca692 SHA512 e1a57e65e57f311d38cb76cea13b268c367698f01585d9bdbeef2de991ed571f3022bcf4c6103bd3278b6f616d3a23a256c3689e9ce01128103a03b4124267cc
-EBUILD systemd-utils-250.7.ebuild 11313 BLAKE2B c8ba9aab4a23191edf4681b4630c56dfd8f1e0c41a4df5bc6b45dd14f9b69318e0907fdecd9f1539d6302ca49d9f3dd1283680ebc35015d8c92ffa008f4f91d4 SHA512 6815bb2d9a34167efc106c5c9ecee5cd01fb462c7c5c837a78124be780e0fb3f3a4394244420d41be574b6bd5d86ac89e39c20aeb0acdf1d501cd577e072fb17
+EBUILD systemd-utils-250.6.ebuild 11342 BLAKE2B cbef57c68e15fe5fc76e2ba656fa6636d872781b2849c8558a61085e7ef8411b352469acb9b94b45be48fd5e6d29a5ff37fcff9ab2036870b23a811e3cb7af9a SHA512 3b3970ebd790cdcef1511879a1949e788ddfe0ff03866b3e9d5e932341f3e01be48618978559e4179118fdd025e74703bc5bccefce140740a656ea4751c06fdb
+EBUILD systemd-utils-250.7.ebuild 11350 BLAKE2B faf9c2a6685159fe9352e88ecc5855f38c7806f4a2da41e2e5ad1ce6124a4fbb9b42a71c351070297a821b093856a4b75263865b1ffe0d7fe16ebdced0dfdc64 SHA512 6ebec4e3a65f50467bc3b5995acb0ab483723e87dcfef8d4c5a7b4f26d8116049ed2c4c78f3f03f9216af5dc87767e69195f0bbff909644bfa91e688bf602058
 MISC metadata.xml 571 BLAKE2B 6b3a69524c5fd3fa0bbe534ccbf3598cedcbe51542d738237ca13b465fd342555f35b2ebd1d784b7a81664c58125e01404434ca48a07502343a24dd395618c4c SHA512 8184f6d8107be83d7411f63e86a8469c4b86c96bf4738ebfda8d654e4ecedf334b4319c9d442832c8373a34e7c35ca14b879e75eb4e006d48fa3d667be0a66e4
diff --git a/sys-apps/systemd-utils/systemd-utils-250.6.ebuild b/sys-apps/systemd-utils/systemd-utils-250.6.ebuild
index 9cc1a18823ff..dc655fae7a8c 100644
--- a/sys-apps/systemd-utils/systemd-utils-250.6.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-250.6.ebuild
@@ -94,6 +94,9 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
 python_check_deps() {
 	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
 }
diff --git a/sys-apps/systemd-utils/systemd-utils-250.7.ebuild b/sys-apps/systemd-utils/systemd-utils-250.7.ebuild
index 93edcbe9fa2c..9afc4a2e8c10 100644
--- a/sys-apps/systemd-utils/systemd-utils-250.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-250.7.ebuild
@@ -94,6 +94,9 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
 python_check_deps() {
 	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
 }
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 2d0bf256b82c..e97f85c03de2 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -13,8 +13,8 @@ DIST systemd-stable-250.6.tar.gz 11212534 BLAKE2B faf065dbe5c02d9d3311202f93b9ad
 DIST systemd-stable-250.7.tar.gz 11214975 BLAKE2B 5d94b4b1f8b0cd6e8284a89ac0d4bd373eccdad2c3d6e6c453df79c8df47ee0f9cfbde764b72b1f9d172d07e2d9f1f1f41c1ab254cf4abd0722469ebc3ad7cf8 SHA512 99bc6f0c9757b280cb694f3fb4d6fe04d5ce55583eb2bae5ddeb324bb5ee9930c1720fcc27293d90cddba188473653ec541a471ae8115710a5850c26d0ba215d
 DIST systemd-stable-251.2.tar.gz 11434645 BLAKE2B a7e118649a7d27b789206ea9f6f2d0314e44561367506ee763a9e98fb97579b3fc49c7a402c8da142945dc98444558f0e311557f52c50863cebc7532c17c651f SHA512 0c4011b685a1e8d535af123cbaf79ab53d59ea665ca5350ab1077ad4e962b49c1fd5b1b5bb3f28c3e28145dfd02aa83023f78de5edec15afe84e3e06e742a67c
 EBUILD systemd-250.4-r2.ebuild 15755 BLAKE2B 5934a91181220d8b80e0302e6b7b2e34efb44739c20cd907bda7d390a1f0aa442b87c270c8907f8bf9ca8337cb2ba9307f9496383fc551dadd837072bf73d9bc SHA512 33881d3746d7bff5e14e55115f883b692cf873cdd23650144b2b356e2635e0fdef6216e5883078f48576ecc80cef02c0bb5f696f9b3f4cc9bbfae5bd14efb7e0
-EBUILD systemd-250.6.ebuild 16316 BLAKE2B 34e994ec869750d2966d089db925b1f7079173c247167197dda10fe1e1db6ee774934ecbe1aa0bca24a378d14036e44fe180a9906d53eff09c54ee5eec39a4f2 SHA512 029246e5dd1900435c725011f6239b2af3d3b634b6faab9e2794b229eec0c8cd1c70ef7db419a668936fef2c7468c242b0d11b94606557f3664eb5ea591e3f6b
-EBUILD systemd-250.7.ebuild 16359 BLAKE2B 637c7fdf00f9b167dea8e3c32732a8db3024f1f517517bf2d0e916de503eee250f253782f663e66665c97a659f2104e1137b9717bc4ac213d57b2ffa0a2ab8ae SHA512 fd3c774be7f6f475f60e87824cefe8dab0b7af0250b76de2f7c3c35f55facbe53fc9a3ffbb657508c00f79e102f11e30ddada3db0984db9de51a8cd6ebbb414c
-EBUILD systemd-251.2.ebuild 15607 BLAKE2B 5c2646771b31d0b0a32d289f319ccf68cb07b54009c7cfea909b6dcde37230ff15345c847a831d6043782e5bb353c50eeebcc52d664cd85ae1d31dfd0d82f7b6 SHA512 be695ef4951f423578569ffdaaae580ca2137491573457ed9a1e6e3f5c42a71e543b0fb76e9697416f7d8fd6f951b60d756cc60411a0921a39f9725e5aae9a6e
-EBUILD systemd-9999.ebuild 15567 BLAKE2B 294a9bc4ef50afc9c6c83a7abeda99f8ecdefda5d59e366145ec17aef58f66f017d9536a439560eb65594843246d42b4f832835758890c4496e7e678c1b4fb23 SHA512 7fd4e3ef5c2a8a7e0240cb7ec72d4e5329207051d11cb082ae6144c2ffc954e186e87d39743e168a9323261324ab1b034a38fe1b45cf5711081a5c48ff899d72
+EBUILD systemd-250.6.ebuild 16332 BLAKE2B 02a861c7d18856a1153b84caba100bfa57c064ab2c62fc804d3acc188f0c2d95365d48123f380216505e3ec94a7537b8c88b54ab5e1204e4be7c51d53ca1273d SHA512 76e38f8e889dc0b5dae9951dcbe8b113c9482b1c5b1f133c1be358fe6177597bc69f80f819da5b20cecd08335d346a9c541ec32f2f29f6969a5234d4fd1aab37
+EBUILD systemd-250.7.ebuild 16375 BLAKE2B 82ebc74f59d662c0ae69975e8a527ccf8484cae035c934339a0548b3a594e5370fef1696a5326b822a092d907b0c6411fb339ebe6135d7c193faae26fbeea318 SHA512 a785f10307c68507b8371e79134a16d46de8317aac54770c48df13f5d348b6f63310ddce4330cb932f4938c36330d7eccda07ec3c0a3e16928a7db35d904205d
+EBUILD systemd-251.2.ebuild 15623 BLAKE2B 003543cc788018617ca266f2e9aa445676b81eb94e5e30aa4440037fd8b12ab16f340aca2da4f49be4846c607631cd96566a8f673281512f6f4c7ebd836a3a27 SHA512 e48e06ebfbcb334397907c3e3bdd5edbb0cf82df4cd983c568e5fc151f7f39489b63431f34477cd443218b200678165d3e7f9c0c9d0554825d35375d715a8a0e
+EBUILD systemd-9999.ebuild 15583 BLAKE2B 91c6882615f7ef4c1ddbe49d9b37fa9443715694e18719839813d8f214ace0fd668567f96fc5da0e4dc1c7988a7171fadf90958f2b655fac354344725bb7085b SHA512 afbfca7c3dbfc1a193eb8c9106b83e399f81c269bd36f0d5bc1151a75cea22880b9c5816eadfc2e65477b8b9f0c12a5b90da013eb5a561acd9072071367c0feb
 MISC metadata.xml 2594 BLAKE2B 9ef88b77dba5d66b6902cbc1a4f104e783fa530f7148f48692992dbe2edf8a88a3d96993f6ecc34708ff49f7e7b4d9bbcf001fad6ca5a8d097030bc83b9b3b57 SHA512 22bfbaaaa68142286b36005b685d6955c68b71df064e412f0edbd858c9610c6ad76b5d970292d30b06eb536a9a140af307a3b4fee897b7f281cee00083472430
diff --git a/sys-apps/systemd/systemd-250.6.ebuild b/sys-apps/systemd/systemd-250.6.ebuild
index 76650e86ec2a..56fa2b1cb927 100644
--- a/sys-apps/systemd/systemd-250.6.ebuild
+++ b/sys-apps/systemd/systemd-250.6.ebuild
@@ -6,6 +6,7 @@ PYTHON_COMPAT=( python3_{8..10} )
 
 # Avoid QA warnings
 TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
diff --git a/sys-apps/systemd/systemd-250.7.ebuild b/sys-apps/systemd/systemd-250.7.ebuild
index bb9ddeaa2b43..23d524b5aea7 100644
--- a/sys-apps/systemd/systemd-250.7.ebuild
+++ b/sys-apps/systemd/systemd-250.7.ebuild
@@ -6,6 +6,7 @@ PYTHON_COMPAT=( python3_{8..10} )
 
 # Avoid QA warnings
 TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
 
 QA_PKGCONFIG_VERSION=$(ver_cut 1)
 
diff --git a/sys-apps/systemd/systemd-251.2.ebuild b/sys-apps/systemd/systemd-251.2.ebuild
index 7a5710664f36..04abbae40454 100644
--- a/sys-apps/systemd/systemd-251.2.ebuild
+++ b/sys-apps/systemd/systemd-251.2.ebuild
@@ -6,6 +6,7 @@ PYTHON_COMPAT=( python3_{8..11} )
 
 # Avoid QA warnings
 TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
 
 QA_PKGCONFIG_VERSION=$(ver_cut 1)
 
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index a17a8a36c430..7f24477218f0 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -6,6 +6,7 @@ PYTHON_COMPAT=( python3_{8..11} )
 
 # Avoid QA warnings
 TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
 
 QA_PKGCONFIG_VERSION=$(ver_cut 1)
 
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 1f8748bc6e73..8558d68bebad 100644
Binary files a/sys-auth/Manifest.gz and b/sys-auth/Manifest.gz differ
diff --git a/sys-auth/ssh-import-id/Manifest b/sys-auth/ssh-import-id/Manifest
new file mode 100644
index 000000000000..d55d773e7d25
--- /dev/null
+++ b/sys-auth/ssh-import-id/Manifest
@@ -0,0 +1,3 @@
+DIST ssh-import-id-5.11.tar.gz 146064 BLAKE2B d869ec480d224aa906ef08b5b9acfbf9324d67bffafadcf1c0adae108ad53e76cdfbcf0d1905a947bda5df507fbd69e7ee121890bc48e452ca67c5acd92ac18c SHA512 49703b8b9c127f13bf0626fd013318b9498ec8a67a060fb7607c7a1894da3e3e3e7e995c9b68af8375237f4031d06abda20f2a9a73a1fabbe33055f2f434716b
+EBUILD ssh-import-id-5.11.ebuild 649 BLAKE2B 9c23b39010cb7ff830399334ee125d389a23f70908ac728b29742d77932b450c80066a46daf9b221bbf07a0921040bc29aa6ccca85b047bb8a1ab997d2433897 SHA512 f6a1095c3cd8c40ec39cb222d420f7e458136d26aac3af5bdcfb3d1c9062cdb7ae44aeee4c5bdc61afec710bff769cbc312e4b1169c158302248e38875d4342f
+MISC metadata.xml 253 BLAKE2B ac07d0a4457abddec76b322a6e7f175661559091067a6f3d92658d4e6c2f1f90a57f5d0c139de0a91a19a5a797fed39fc66fd90ca25bfd0c66497ee8e4088810 SHA512 40abc637528fae614d2eb151b5834c323cb151d5c9ebbee415d70efb4603df0fa7483e0d689ea1658a424ac1e54fb944d8eca37a4bd80bbc15222ed9259096df
diff --git a/sys-auth/ssh-import-id/metadata.xml b/sys-auth/ssh-import-id/metadata.xml
new file mode 100644
index 000000000000..8ac26ba5990d
--- /dev/null
+++ b/sys-auth/ssh-import-id/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>slashbeast@gentoo.org</email>
+		<name>Piotr Karbowski</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/sys-auth/ssh-import-id/ssh-import-id-5.11.ebuild b/sys-auth/ssh-import-id/ssh-import-id-5.11.ebuild
new file mode 100644
index 000000000000..4f66eb27a278
--- /dev/null
+++ b/sys-auth/ssh-import-id/ssh-import-id-5.11.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Utility to securely retrieve an SSH public key and install it locally"
+HOMEPAGE="https://launchpad.net/ssh-import-id"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="
+	dev-python/distro[${PYTHON_USEDEP}]
+"
+
+src_install() {
+	distutils-r1_src_install
+	doman usr/share/man/man1/ssh-import-id.1
+}
diff --git a/sys-auth/ykpers/Manifest b/sys-auth/ykpers/Manifest
index 1d32da30a705..f128787ab0df 100644
--- a/sys-auth/ykpers/Manifest
+++ b/sys-auth/ykpers/Manifest
@@ -1,5 +1,6 @@
 AUX ykpers-1.20.0-fix-gcc10-fno-common.patch 308 BLAKE2B 720da4ac3f20c4512987b47068d7589ac70db0450306ddd16aec8ce5dde2e36e0d58c6ca0e7ffa5765b9b7a85b53a120078a117782ac6e8bf76066db52dd78ca SHA512 762bea78a6c6c2e43221374c6baf20828741e01532fd2bdc420ab197e96bcbc0eb6a1b157971ac58da7e1a7d8b4717cd1a1be84af23b473f51adfe4af57d1f4b
 AUX ykpers-1.20.0-json-boolean.patch 3572 BLAKE2B 684b9dab508b8d100d4e9237d833cb9160c33314a4076476b9342858844627acccc8f7025da0f22524251ca4541feceededd0f663e03810e53935ea809d1e556 SHA512 a8bc7ae71d0a05476688abfaea070ca7dc2eaa68e033524d4a1b2b6240eec2932d867e9eeaa248874a04f254618cd79bf9ebaa17421938b0c2e62502bf90c055
 DIST ykpers-1.20.0.tar.gz 127975 BLAKE2B 8753332be4df3eeb6ef0489782037fca12883a263d5697cfaee901763e4698ca5415953da1c2f8b3512de041c1e78735c03a5e6ea2101c71ada36d4e6d5d3d2d SHA512 a38b26700793f0a801e5f5889bbbce4a3f728d22aaecf8d0890f1b5135e67bed16a78b7a36dbc323c5d296901f6dd420fa658a982492a0cd9f0bbf95a5fbc823
+EBUILD ykpers-1.20.0-r1.ebuild 1119 BLAKE2B 5dadf0ea3e1bd57f612f42ad997d4bdecb83b7b7e40d528f043fa70657c825119283204c501e44e95b0858ea66995e93273743d430b7eb302155693d0db6a767 SHA512 2df94918cd2d68db45662625e21131225070700e1eba860c94b60ff423dfdbfc546326c362775f142c49a7c424f1aab1c36daa000997beb0039b7b8631597967
 EBUILD ykpers-1.20.0.ebuild 1096 BLAKE2B 88adc37fd2dcd2e783a656e1e6ad15d0fb3aae9d15f72f3ba03cd8fbe1103f1b1b2505ef3b9fe135aabf8d9ed5fa2b0dfe4596a03b493cfb97df5529e43668c9 SHA512 1e66409f3fb4d9fdebe9ae8872f9e56fd4e64d2f40473f0a996755d949ee025249ca667f3eb006ea24d907532baea4c767b5c0e596ae0df4e36b208af08e2702
 MISC metadata.xml 419 BLAKE2B b4788083b4ed4628976fedb8c9ffb419e90f32eed892f4e360582ceade32353171364874f6dcc3f6b858a2df7e3c5b05675973a216b0338bea431ac999e55b20 SHA512 dd7fe5d412333da982aa9f9ae51e4d0d1d86ce527a8306c62b5a3c68a7f09958d53ce9f9aad64c564ac8b2df7118a917d1dc644f4a96f500c409f84cb0fa8c0d
diff --git a/sys-auth/ykpers/ykpers-1.20.0-r1.ebuild b/sys-auth/ykpers/ykpers-1.20.0-r1.ebuild
new file mode 100644
index 000000000000..839ecf070e7e
--- /dev/null
+++ b/sys-auth/ykpers/ykpers-1.20.0-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools udev
+
+MY_PN="yubikey-personalization"
+
+DESCRIPTION="Library and tool for personalization of Yubico's YubiKey"
+HOMEPAGE="https://github.com/Yubico/yubikey-personalization"
+SRC_URI="https://github.com/Yubico/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-libs/json-c:=
+	>=sys-auth/libyubikey-1.6
+	virtual/libusb:1"
+DEPEND="${RDEPEND}"
+BDEPEND="app-text/asciidoc
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.20.0-fix-gcc10-fno-common.patch
+	"${FILESDIR}"/${PN}-1.20.0-json-boolean.patch
+)
+
+DOCS=( doc/. AUTHORS NEWS README )
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--libdir=/usr/$(get_libdir)
+		--localstatedir=/var
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	udev_dorules 69-yubikey.rules
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 99468707ead3..513ae9ac1cc0 100644
Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index 8b6ec69ee370..95e5b6262668 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -1,14 +1,18 @@
 AUX 50glusterfs-mode-gentoo.el 169 BLAKE2B 461afb9f17ef9dee79348279e861039193400d61a926e9d8499351b7e42377cc1bffce6dc2c2d7f3b50b1de016a336bad69c7a79bb800b973288eef542baed85 SHA512 f90b3f49f53c08db5596a6795df64a834b390602a79fb79b56f6cfb6191c7ca8ce2bedd2885d049575e26cc3b321f80e2786e99055c02682f4fbf454d5ed5804
+AUX glusterd-10.2.initd 751 BLAKE2B 2023dac1c7ad777e159c7980c44a29b08869f6a0c292de6f69bbab7521d915d0fea6f654dcaaf465c1ed37ff107b876a5aad5a6c5eb90d7f2858cbc9b6245f3a SHA512 08430bdd7f5bfdef43659d96504ead60eef830b16eadf449727a6a122f11a67f11c80930027998f2bf5f34e2a739ea7e85a8e5ad84ac99625c6a9e3e33060f23
 AUX glusterd-r4.initd 747 BLAKE2B f0c1c6947e6c42d3fa1e52b7ee4d856aad9fb9218ae07df35d90039038437ca05bd5c382de609de9a8e35aea24592499dbd0f44d6f3c827e2667229242c3dc21 SHA512 9341b4f998bf5f0da24b84e5e83b2534b5693d018961800ac5ae19ab7246fe60b90b3a66f4c5576d7e1beebd3624e3e2d2c426d44f2ea4f766e1014b69441f60
 AUX glusterfs-r1.initd 3065 BLAKE2B 6bf49cfec1c6f685b4c72a79e956ca9823c742bca3d665f0bbffb59bbd2f81b314df62b8aab4eab5c4d23b9e88f43168160cb0faedece3307ddf2347f5282311 SHA512 28c5f401b2ff017d8faf7b290fa265cc5f1a9d60edf11dbae5801e943e7e0833fa8267880efa80c4fc07048d75afd446808c583d2b62a6c5a6bde25d317bde97
 AUX glusterfs.confd 129 BLAKE2B 17eeb707fe5ebeb335b0c64ce999268e5f5c6fb6d2ba48467f6f15e73f4c2e883b909da642e6144c637510302834c7c895ebf8b2558344c3bedc9cdc06a44766 SHA512 657c478dd3a60c144543821acd6a87f804d258d4679007aad5108790449e43eda7e0de8e8c0c8e13357a35afbb0d09065423101e5234285a9b96c9ac8b2e33b4
 AUX glusterfs.logrotate 611 BLAKE2B e79718d43b8123e8bcc63336977f972e58332536e0bccad84f3abb5e4afd87853d1c70ab689e2c454d94a8d74bb65122e7bf5a35150f60fb268c7757eea7b0d0 SHA512 568728fe77acecb686286b0be6c086fe3448d054d26da15c3846726a8f845ae963e6756c517b413a9eb4d6b646c61972887a35e89846d2d90d364b755e471791
 AUX glusterfs.vim 139 BLAKE2B 73fdcb49c0c252784718b461541d5483e118bf1b83f445a6ced3119600aa46c469291e19aa439e2c1e35ffc88c83a74977571d8ccfddf078f65c5c16a44ed3e0 SHA512 6ea3b56b71d7e206a57611dd68160b6b9242a19b5c927560f60881dc28d250f7958c50f788a7b9a41fb46010fdac2d67a8289b909ed1f05b793c900f37ccbfb7
+AUX glusterfsd-10.2.initd 3042 BLAKE2B 27b79e854164bc2e75a69936abad90f774c1372089bd3d6fc44feef6a6566be39ec6dfe76f26c479a8466b3f76995616aea59c38b092343484dabe20572df45e SHA512 101db0f73dee54703cfb7d196eb6e22f11e15a48f6a18507391caf6b129041f74740757d2cb22492229d5be962126b587c3fb69d688820120f3c0f3be9c58f44
 DIST glusterfs-10.1.tar.gz 8273640 BLAKE2B a29eb83fbc3a65e5f5a1db3694e6f46519973256a10f5e16419c832cb308a36961a4e3569fffd3f6e21e47b4b1ff78bcd2e687fce7b9710dfb25d88fca2d622f SHA512 38bec8ae33128641b17c645733589c32d554ebb771bda50a11d35019e71654f3b75ca95d24d0c0d1ec4eb460edd99983e843a7218092d422d2185a227345de42
+DIST glusterfs-10.2.tar.gz 8278598 BLAKE2B 48e70a244e34cc41a5befbe94635e945c95b87f26e5e1892b099d23a13c6fb70eefb2a66b247a564b03eeb0707ee480b50096b154b3ac5d2a13051e6371995b3 SHA512 290c701fbd3f100096ef26b589ee0714449fc620c35e62bcb5fe2fe8de5f64963b40d7d5fe1b97b274ba791fa45f4175305b6a112f184f6ce11a1e0dc9f7ea30
 DIST glusterfs-8.6.tar.gz 7826147 BLAKE2B 3a8a488c9a8e4b1daf3ed01fa5e52a62cf791349c1169aaf8609252bfb8bc0a0534f9fc23fac27cfab11ac6fb5e3e1d9588b4ec8080b02cf97e679bf2c8fb5c2 SHA512 bb1125e5d6b4d424234bc40786847f217e7a05cecad1462dd91248cf9559569914f04e1f909e829051cb1db4079ecf906440a38af9de2bbf3bcf53ca8fa1f349
 DIST glusterfs-9.4.tar.gz 8173625 BLAKE2B c35c63696717bf09f8fbf77dca16a6f45de278253e768c6ffc40c0c097da9ea1b32888233da412a5333281995e89e08d9ed23fd47aba7c506de84b08f9f80cea SHA512 2a17197bd2b425117e34af004a6177b7c5012807cd99b9c6d37a1081e0ab9def6b013bedd0ba4122d149969755e0e2985bef8aed9cf612a27a6452b8719a33bf
 DIST glusterfs-9.5.tar.gz 8174643 BLAKE2B d7527b7749b753768bde086e88e146564b461f835bb9108ce24da9626d7d87e7e4da1b2a340c6497da2d8bafe0cd43e87c01d4ba6639635ff96d8788997a8042 SHA512 3483068ba6d72a9c63cc6fcb2dbcb38dd5001564d755cc3a30dbf6402eeab9a7c80759a535be1c5c06eae88b61156a336444c89b12bbecdabf56a87f00328a44
 EBUILD glusterfs-10.1-r1.ebuild 5655 BLAKE2B b3eb6f557f2f9526e560b705896f294e11563ea0fb22343211d06dba2dbdc3c3667ac0b58d9f31e43085e1598c4f01368c7e25b8499787c69f017fe79131beb1 SHA512 2e204391b63c61a380ab6628d0a737070709763d5503aaf5ad3f114170179663551738e3b416776cd6b413ce16ea49057e4eaa55d9345432d5ea650dfc97b112
+EBUILD glusterfs-10.2.ebuild 5667 BLAKE2B 1a29ab3079b72b35e22667421b6cea71c6fb63b2ec4bc725017f66c66dff2462d47d493e225debe38a087a5d81427c1ce89372bd8dc0df880f1c2b310d3b9c12 SHA512 3395be111e11c3406d50dc715dc0c13d7b3299e1a2a56b41f5111727089fc9741e000edfa1997e0316edda11107001c70c658caded3f2d6749112b9f43a14d0a
 EBUILD glusterfs-8.6-r1.ebuild 5549 BLAKE2B b23f1ed817da27181bbe1d046446e1d608c177c0ad2f6a5f0b919d6b43f797aaa8ea53ec6327f60b60742ac8ff7e2027ef6d610136c107bf0a9282fb096933ab SHA512 0afb60317c4690aa7ae157619ec11c29b78d8d5e3b98f90e3feb519635b60b679dc391f37e128efb0f658b33aa17a16d4b3a2afd232119b176ef52e4d5051455
 EBUILD glusterfs-9.4-r1.ebuild 5571 BLAKE2B a2f69784255800f464e14f014a1316a128de51f03439a8ca68924d9c8320cb29a9f24fb97cb9727a858a235d2d9cecfed849692fde5813932b6506146b607698 SHA512 06bb48816431216637dcffb2bcf1c4ad783043b0b96b0060253c89f173ac1bba92beb4615c27c8f014ab30c74ad7399b24c9132591f2134891df30c41356674f
 EBUILD glusterfs-9.5-r1.ebuild 5574 BLAKE2B 0ad30d35d4bf908983e7070e0ae73c3499705a4465ebd4c416aab4416031eca82fe15dcca8b5aad6350dcf42d276f326987109b970d044708b8b352b1b1c2e35 SHA512 9cf9dd83174eb28b6ef1f56deebf5305c48bae8f86267dba73b9bbeb091273ec85abc2d83f4dd3623eedc5676c2f2f1de46cca1fa289227a0d16589fbd98d799
diff --git a/sys-cluster/glusterfs/files/glusterd-10.2.initd b/sys-cluster/glusterfs/files/glusterd-10.2.initd
new file mode 100644
index 000000000000..af8f941d87d7
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterd-10.2.initd
@@ -0,0 +1,32 @@
+#!/sbin/openrc-run
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="Gluster elastic volume management daemon"
+command="/usr/sbin/glusterd"
+pidfile="/run/${SVCNAME}.pid"
+command_args="-N"
+
+command_background="yes"
+
+depend() {
+	need net
+	before netmount
+}
+
+start_pre() {
+	# Ensure that the GlusterFS auxiliary mount parent directory exists
+	checkpath --directory --owner gluster:gluster --mode 0775 /run/gluster
+}
+
+start_post() {
+	local c=0
+	ebegin "Waiting for glusterd to start up"
+	while ! /usr/sbin/gluster volume list >/dev/null 2>&1 && [ "${c}" -lt "${glusterd_max_wait_start-60}" ]; do
+		$(( c=c+1 ))
+	done
+	[ "${c}" -lt "${glusterd_max_wait_start-60}" ]
+	eend $?
+
+	return 0
+}
diff --git a/sys-cluster/glusterfs/files/glusterfsd-10.2.initd b/sys-cluster/glusterfs/files/glusterfsd-10.2.initd
new file mode 100644
index 000000000000..c8b6562e02a2
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterfsd-10.2.initd
@@ -0,0 +1,121 @@
+#!/sbin/openrc-run
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+if [ "${SVCNAME}" != "glusterfs" ]
+then
+	GLUSTERFS_NAME="${SVCNAME#glusterfs.}"
+else
+	GLUSTERFS_NAME="glusterfs"
+fi
+
+GLUSTERFS_PIDFILE="/var/run/${SVCNAME}.pid"
+
+eval 'GLUSTERFS_LOGFILE="${'${GLUSTERFS_NAME}'_log:-/var/log/glusterfs/'${GLUSTERFS_NAME}'.log}"'
+eval 'GLUSTERFS_VOLFILE="${'${GLUSTERFS_NAME}'_vol:-/etc/glusterfs/'${GLUSTERFS_NAME}'.vol}"'
+eval 'GLUSTERFS_SERVER="${'${GLUSTERFS_NAME}'_server}"'
+eval 'GLUSTERFS_PORT="${'${GLUSTERFS_NAME}'_port:-6996}"'
+eval 'GLUSTERFS_TRANSPORT="${'${GLUSTERFS_NAME}'_transport:-socket}"'
+eval 'GLUSTERFS_OPTS="${'${GLUSTERFS_NAME}'_opts}"'
+eval 'GLUSTERFS_MOUNTPOINT="${'${GLUSTERFS_NAME}'_mountpoint}"'
+
+depend() {
+	need net 
+	[ -n "${GLUSTERFS_MOUNTPOINT}" ] && need fuse
+	use dns
+	before netmount
+	after firewall ntp-client ntpd
+}
+
+checkconfig() {
+	if [ -z "${GLUSTERFS_NAME}" ]
+	then
+		eerror "The service name is not properly formatted."
+		return 1
+	fi
+
+	if [ -z "${GLUSTERFS_SERVER}" ]
+	then
+		if [ -z "${GLUSTERFS_VOLFILE}" ]
+		then
+			eerror "No GlusterFS volume file source has been defined.  Edit /etc/conf.d/glusterfs"
+			eerror "and configure a volume file source for ${SVCNAME}."
+			return 1
+		else
+			if [ ! -f "${GLUSTERFS_VOLFILE}" ]
+			then
+				eerror "Cannot find volume file: ${GLUSTERFS_VOLFILE}"
+				return 1
+			fi
+		fi
+	fi
+
+	if [ -n "${GLUSTERFS_MOUNTPOINT}" -a ! -d "${GLUSTERFS_MOUNTPOINT}" ]
+	then
+		eerror "The mountpoint ${GLUSTERFS_MOUNTPOINT} does not exist."
+		return 1
+	fi
+}
+
+start() {
+	local status daemon
+
+	checkconfig || return 1
+
+	ebegin "Starting GlusterFS (${SVCNAME})"
+	eindent
+
+	if [ -z "${GLUSTERFS_MOUNTPOINT}" ]
+	then
+		einfo "Starting in server mode ..."
+		daemon="glusterfsd"
+	else
+		einfo "Starting in client mode. Mounting filesystem ..."
+		daemon="glusterfs"
+	fi
+
+	if [ -n "${GLUSTERFS_SERVER}" ]
+	then
+		einfo "Using server supplied volume file"
+		start-stop-daemon --start --pidfile ${GLUSTERFS_PIDFILE} \
+			--exec /usr/sbin/${daemon} -- \
+			--pid-file=${GLUSTERFS_PIDFILE} \
+			--log-file=${GLUSTERFS_LOGFILE} \
+			--volfile-server=${GLUSTERFS_SERVER} \
+			--volfile-server-port=${GLUSTERFS_PORT} \
+			--volfile-server-transport=${GLUSTERFS_TRANSPORT} \
+			${GLUSTERFS_OPTS} ${GLUSTERFS_MOUNTPOINT}
+		status="$?"
+	else
+		einfo "Using local volume file"
+		start-stop-daemon --start --pidfile ${GLUSTERFS_PIDFILE} \
+			--exec /usr/sbin/${daemon} -- \
+			--pid-file=${GLUSTERFS_PIDFILE} \
+			--log-file=${GLUSTERFS_LOGFILE} \
+			--volfile=${GLUSTERFS_VOLFILE} \
+			${GLUSTERFS_OPTS} ${GLUSTERFS_MOUNTPOINT}
+		status="$?"
+	fi
+
+	eoutdent
+	eend ${status}
+}
+
+stop() {
+	local status
+
+	ebegin "Stopping GlusterFS (${SVCNAME})"
+	eindent
+	if [ -z "${GLUSTERFS_MOUNTPOINT}" ]
+	then
+		einfo "Stopping server process ..."
+		start-stop-daemon --stop --pidfile ${GLUSTERFS_PIDFILE}
+		status="$?"
+	else
+		einfo "Unmounting ${GLUSTERFS_MOUNTPOINT} ..."
+		umount "${GLUSTERFS_MOUNTPOINT}"
+		status="$?"
+	fi
+	eoutdent
+	eend ${status}
+}
diff --git a/sys-cluster/glusterfs/glusterfs-10.2.ebuild b/sys-cluster/glusterfs/glusterfs-10.2.ebuild
new file mode 100644
index 000000000000..2551faf99a31
--- /dev/null
+++ b/sys-cluster/glusterfs/glusterfs-10.2.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit autotools elisp-common python-single-r1 tmpfiles systemd
+
+DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
+HOMEPAGE="https://www.gluster.org/ https://github.com/gluster/glusterfs/"
+SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 LGPL-3+ )"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+IUSE="debug emacs +fuse +georeplication ipv6 +libtirpc rsyslog static-libs tcmalloc test +xml"
+
+REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} xml )
+	ipv6? ( libtirpc )"
+
+# the tests must be run as root
+RESTRICT="test"
+
+# sys-apps/util-linux is required for libuuid
+RDEPEND="
+	acct-group/gluster
+	acct-user/gluster
+	dev-libs/libaio
+	dev-libs/openssl:=[-bindist(-)]
+	net-libs/rpcsvc-proto
+	dev-libs/userspace-rcu:=
+	sys-apps/util-linux
+	sys-libs/liburing:=
+	sys-libs/readline:=
+	!elibc_glibc? ( sys-libs/argp-standalone )
+	emacs? ( >=app-editors/emacs-23.1:* )
+	fuse? ( >=sys-fs/fuse-2.7.0:0 )
+	georeplication? ( ${PYTHON_DEPS} )
+	libtirpc? ( net-libs/libtirpc:= )
+	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
+	tcmalloc? ( dev-util/google-perftools )
+	xml? ( dev-libs/libxml2 )
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	virtual/acl
+	test? ( >=dev-util/cmocka-1.0.1
+		app-benchmarks/dbench
+		dev-vcs/git
+		net-fs/nfs-utils
+		virtual/perl-Test-Harness
+		dev-libs/yajl
+		sys-fs/xfsprogs
+		sys-apps/attr )
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
+
+# Maintainer notes:
+# * The build system will always configure & build argp-standalone but it'll never use it
+#   if the argp.h header is found in the system. Which should be the case with
+#   glibc or if argp-standalone is installed.
+
+pkg_setup() {
+	python_setup "python3*"
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# build rpc-transport and xlators only once as shared libs
+	find rpc/rpc-transport xlators -name Makefile.am -exec \
+		sed -i 's|.*$(top_srcdir).*\.sym|\0 -shared|' {} + || die
+
+	# fix execution permissions
+	chmod +x libglusterfs/src/gen-defaults.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-fusermount \
+		--disable-lto \
+		$(use_enable debug) \
+		$(use_enable fuse fuse-client) \
+		$(use_enable georeplication) \
+		$(use_enable static-libs static) \
+		$(use_enable test cmocka) \
+		$(use_enable xml xml-output) \
+		$(usex ipv6 --with-ipv6-default "") \
+		$(usex libtirpc "" --without-libtirpc) \
+		$(usex tcmalloc "" --without-tcmalloc) \
+		--with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \
+		--localstatedir="${EPREFIX}"/var
+}
+
+src_compile() {
+	default
+	use emacs && elisp-compile extras/glusterfs-mode.el
+}
+
+src_test() {
+	./run-tests.sh || die
+}
+
+src_install() {
+	default
+
+	rm \
+		"${ED}"/etc/glusterfs/glusterfs-{georep-,}logrotate \
+		"${ED}"/etc/glusterfs/gluster-rsyslog-*.conf \
+		"${ED}"/usr/share/doc/${PF}/glusterfs{-mode.el,.vim} || die "removing false files failed"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/glusterfs.logrotate glusterfs
+
+	if use rsyslog ; then
+		insinto /etc/rsyslog.d
+		newins extras/gluster-rsyslog-7.2.conf 60-gluster.conf
+	fi
+
+	if use emacs ; then
+		elisp-install ${PN} extras/glusterfs-mode.el*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
+	insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim
+
+	# insert some other tools which might be useful
+	insinto /usr/share/glusterfs/scripts
+	doins \
+		extras/backend-{cleanup,xattr-sanitize}.sh \
+		extras/clear_xattrs.sh \
+		extras/migrate-unify-to-distribute.sh
+
+	# correct permissions on installed scripts
+	# fperms 0755 /usr/share/glusterfs/scripts/*.sh
+	chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die
+
+	newinitd "${FILESDIR}/glusterfsd-10.2.initd" glusterfsd
+	newinitd "${FILESDIR}/glusterd-10.2.initd" glusterd
+	newconfd "${FILESDIR}/${PN}.confd" glusterfsd
+
+	keepdir /var/log/${PN}
+	keepdir /var/lib/glusterd/{events,glusterfind/.keys}
+
+	systemd_dounit extras/systemd/{glusterd,glustereventsd,glusterfssharedstorage,gluster-ta-volume}.service
+
+	# QA
+	rm -r "${ED}/var/run/" || die
+	if ! use static-libs; then
+		find "${D}" -type f -name '*.la' -delete || die
+	fi
+
+	python_optimize "${ED}"
+}
+
+pkg_postinst() {
+	tmpfiles_process gluster.conf
+
+	elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
+	elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
+	elog "  /etc/init.d/glusterd start"
+	echo
+	elog "For static configurations, the glusterfsd startup script can be multiplexed."
+	elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
+	elog "separate service.  To create additional instances of the glusterfsd service"
+	elog "simply create a symlink to the glusterfsd startup script."
+	echo
+	elog "Example:"
+	elog "    # ln -s glusterfsd /etc/init.d/glusterfsd2"
+	elog "    # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
+	elog "You can now treat glusterfsd2 like any other service"
+	echo
+	ewarn "You need to use a ntp client to keep the clocks synchronized across all"
+	ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
+	ewarn "run GlusterFS."
+	echo
+	elog "If you are upgrading from a previous version of ${PN}, please read:"
+	elog "  http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(ver_cut '1-2')/"
+
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/sys-cluster/nomad/Manifest b/sys-cluster/nomad/Manifest
index d6c8cee4a2b7..a29523e3c54b 100644
--- a/sys-cluster/nomad/Manifest
+++ b/sys-cluster/nomad/Manifest
@@ -4,5 +4,5 @@ AUX nomad.logrotated 83 BLAKE2B 2c970621c10520b2aaa17172d9c99a741737393db9a64242
 AUX nomad.service 726 BLAKE2B 68e67299c15e096e0fca66a9cf87d6d2bd6e0339be8c8489e59c401f84b5aec86e3b55d566e7b6b0598afb17918c9a03a7b7c36851fd8486511955de2f9a12cb SHA512 c8959bfba81b48116ce4a0fc4b0cb439a7f289b27c3d9fc4a08a5c0d3fa7e1652642cb8b459f3ec96bbabf66a12010be190c7484060ebfae39bc8d0e82ecf442
 DIST nomad-1.2.6-vendor.tar.xz 8019208 BLAKE2B f972a84d201328f95e13a68fdc6dc0f0db5aff6d7ff98f5478ef310c6349fb4c0d9e5aa9c638ae81fb9f2776fa4d252c3b1daed091d3b9ae6d86a75d79e2ac0e SHA512 8d53eaa771847d862f14c3fad286fe42b5c4426b242b18d2b900e4807221e6624b8bb129f34c560078d8863ce19b58c6637d2cc806950fffb5140b8d44f44c8f
 DIST nomad-1.2.6.tar.gz 29585632 BLAKE2B 1b9ecbb11ddc59f8078831c6d41b8547a572c3b8475a21d65b8333204bdd2a6ee646cc7c5ec2bdffaee6c1b3cdf2dc30a667464695057e49c2bca41128b61452 SHA512 93a3ed9b0d992ba25cb126496cb9ed250195d8b8011312ebc4cffdf5f9f8786bc43cbe18cefc820597b8a117a05f6118e2e4a88e25e738c1bd309c5504e93ed9
-EBUILD nomad-1.2.6.ebuild 1242 BLAKE2B 3a4d6982d3d91e3f43548fb594c48989afc55c10b3f62022826cf0c6c42e0056858219de8400f7e2fedb5868fb24175870b7d10d460ab9d4087b60821d234736 SHA512 d8aa9f9f44c07e9c46a6ace0f173f9b25812d01ee995b7f4ff48bc359f64c989a160c43d1e94470669dfa459085e15118eec90dafff9993fd34395509842d4f2
+EBUILD nomad-1.2.6.ebuild 1249 BLAKE2B 1429963add21d0f5fc1464b1529aab6efabbce7d063b2d57d89a8a6ce143d6fc11f55ab5c8dde9f49ab2587ccae5c9a9740b3adccf8873d9bf9f50e56092890d SHA512 093d6efa3ed9e30a8de740921a5f6893ec58af8c9edd560248f06898bc763192ebe647b31791566bbce3528efb17b36df365ba7f210c956260bccb8122e8c2a3
 MISC metadata.xml 325 BLAKE2B 00faa3d3eaaa071810bfe35c43e2a956c304098234e54a27ffd6630f4696323c29fdd9dfce086fb40d9432bd1ffabfebaa470da67566ddd8bdf5ec700a0a548d SHA512 dbbb8f548227eb2f79b51c02eb8e2ed6b45eb30e1b5808c60f6527fbf0c0504b20a1f51b556c97450e2837e05e5cea7179fc26548cc6e0dbf9a8c78c40768ca9
diff --git a/sys-cluster/nomad/nomad-1.2.6.ebuild b/sys-cluster/nomad/nomad-1.2.6.ebuild
index c4e5fd6850ed..3f80f72e6b1a 100644
--- a/sys-cluster/nomad/nomad-1.2.6.ebuild
+++ b/sys-cluster/nomad/nomad-1.2.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-vendor.tar.xz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="ui"
 
 RESTRICT=" test"
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index ec6db7f63e3c..fcdb3a8cf09c 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index 0893eed61035..d63690bbaea8 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -4,6 +4,7 @@ AUX gdb-8.3.1-verbose-build.patch 395 BLAKE2B e2e82307ceae64d16aa9b57a5e639eb5d2
 DIST gdb-11.2.tar.xz 22039420 BLAKE2B 66ce7e12c99c33c8b4e6ababa673204aab525e72c90ba54cc34a5fd69948a09dc2a9ef2050764b2464544231b1d1a6431279c2877388551ca6fbf384a3f9b464 SHA512 07e9026423438049b11f4f784d57401ece4e940570f613bd6958b3714fe7fbc2c048470bcce3e7d7d9f93331cdf3881d30dcc964cb113a071143a02b28e5b127
 DIST gdb-12.1.tar.xz 22470332 BLAKE2B 7f6f853d1640908cf2c79932cdc1ba02549a07721c005d9c7ce2946a715761719cc164a4e68235a18664ec8a029afe3a2a0cfb57e1635f280076d6bed91317fd SHA512 425568d2e84672177d0fb87b1ad7daafdde097648d605e30cf0656970f66adc6a82ca2d83375ea4be583e9683a340e5bfdf5819668ddf66728200141ae50ff2d
 EBUILD gdb-11.2.ebuild 7722 BLAKE2B 1bcbff793ff193619bb8a8d0fc066b4feadb66fde7561386b7cee2a4a21a2589e19581beaad9730d2d39542e34e62e030b4dcf0a27f3494963c61e890873e70b SHA512 2ec73b48268062d058757656a76a3b8c8934cf474850c0f580f7e6a0931c775cf649cbfa812aa2a70c707efb0ae74d0fef78c3faa7780499764adb5f04333e59
+EBUILD gdb-12.1-r1.ebuild 8183 BLAKE2B c5db7255d56993b78f66efc9b48bd577e3795b262ce9d53da118e4d6cbb1178a920a25f399162e21e2e9e38d2e85a10e3ab32275e76b083583fab083e8d04523 SHA512 1bddb8504f158c24d8f6b77b7fdf19821132e21eeea8f546905b6e2951c9555f729c7ecd0251b50519fb9ab50d3b5797163e298adcb0605d0344a851b42f59bd
 EBUILD gdb-12.1.ebuild 7708 BLAKE2B 13e0a83a1f30c21d973c8bdaa018406b7a60563fec76e73052ccb388308f88acbd613a3c0e115a02f2fa61ff1c2733d79203750e93c815ef85f5f75bd76b23b4 SHA512 3e9e0fd46b7680daf8c8a67200af8fcfb1d0422d372820e758d5a5e8bc0d674b7ae977e600446e2201d645be7e2a930a2165bcb6a09fce5113088aaa2f7bb2ca
-EBUILD gdb-9999.ebuild 7696 BLAKE2B 8386e4ede2d1369a237669d477c053ae3f84df5274ee9a4cd3c42a253a56d424710aab872627e562428cfd9157a8a54228e6ee98fcdb4852abac792e5ae09c00 SHA512 f85376e93ee5761188b0cac59105ab8e68a937344629c7cd5fbc3f54d345e1b5b928b4d3b525870c38aff20523a2e822413cd590b47526a43b060e85342ef218
+EBUILD gdb-9999.ebuild 8138 BLAKE2B b8a224bbaf457e8fe2df9dabdc8ca3a42ab5e04970d4f56c66b8ef9e76f8216a7eb02fba378f50a0b5966437ed71818dc0947ab6ae70fe1e3b6f633a4f9fa0b5 SHA512 86598fa68479b7cf165d35f1f1dcc70d543ffcac18c79efa0e05f83d9b8a999be04fed4ba4b4a7bb1e08af847db8d26dbb8bc5864b17b843c6901a24f4af483f
 MISC metadata.xml 1103 BLAKE2B e63ea2e52649ac2f4ac21381cadb7cc76525792e99a4a6581535475480b6c45e654c8222b0b58585435d4c858cf3eef00dcaecf7edecae2b2fd336f1b56e6e56 SHA512 f7f1b4da71b18cb68a2f32aa6faae6251528047069071c9bee1be504267d0baf2cbac4fb928e0cbe9df100e3a681e2c3b6c7be14514a45a2f52d30364a8626f4
diff --git a/sys-devel/gdb/gdb-12.1-r1.ebuild b/sys-devel/gdb/gdb-12.1-r1.ebuild
new file mode 100644
index 000000000000..993eca47f83f
--- /dev/null
+++ b/sys-devel/gdb/gdb-12.1-r1.ebuild
@@ -0,0 +1,296 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+inherit flag-o-matic python-single-r1 strip-linguas toolchain-funcs
+
+export CTARGET=${CTARGET:-${CHOST}}
+
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
+case ${PV} in
+	9999*)
+		# live git tree
+		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
+		inherit git-r3
+		SRC_URI=""
+		;;
+	*.*.50.2???????)
+		# weekly snapshots
+		SRC_URI="ftp://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${PV}.tar.xz"
+		;;
+	*)
+		# Normal upstream release
+		SRC_URI="mirror://gnu/gdb/${P}.tar.xz
+			ftp://sourceware.org/pub/gdb/releases/${P}.tar.xz"
+		;;
+esac
+
+PATCH_VER=""
+PATCH_DEV=""
+DESCRIPTION="GNU debugger"
+HOMEPAGE="https://sourceware.org/gdb/"
+SRC_URI="${SRC_URI}
+	${PATCH_DEV:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz}
+	${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}
+"
+
+LICENSE="GPL-3+ LGPL-2.1+"
+SLOT="0"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+IUSE="cet guile lzma multitarget nls +python +server source-highlight test vanilla xml xxhash"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# In fact, gdb's test suite needs some work to get passing.
+# See e.g. https://sourceware.org/gdb/wiki/TestingGDB.
+# As of 11.2, on amd64: "# of unexpected failures    8600"
+# ia64 kernel crashes when gdb testsuite is running
+# in fact, gdb's test suite needs some work to get passing.
+# See e.g. https://sourceware.org/gdb/wiki/TestingGDB.
+# As of 11.2, on amd64: "# of unexpected failures    8600"
+RESTRICT="
+	ia64? ( test )
+	!test? ( test )
+	test
+"
+
+RDEPEND="
+	dev-libs/mpfr:0=
+	dev-libs/gmp:=
+	>=sys-libs/ncurses-5.2-r2:0=
+	>=sys-libs/readline-7:0=
+	sys-libs/zlib
+	elibc_glibc? ( net-libs/libnsl:= )
+	lzma? ( app-arch/xz-utils )
+	python? ( ${PYTHON_DEPS} )
+	guile? ( >=dev-scheme/guile-2.0 )
+	xml? ( dev-libs/expat )
+	source-highlight? (
+		dev-util/source-highlight
+	)
+	xxhash? (
+		dev-libs/xxhash
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/xz-utils
+	sys-apps/texinfo
+	virtual/yacc
+	nls? ( sys-devel/gettext )
+	source-highlight? ( virtual/pkgconfig )
+	test? ( dev-util/dejagnu )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.3.1-verbose-build.patch
+	"${FILESDIR}"/${P}-readline-8.2-build.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	strip-linguas -u bfd/po opcodes/po
+
+	# Avoid using ancient termcap from host on Prefix systems
+	sed -i -e 's/termcap tinfow/tinfow/g' \
+		gdb/configure{.ac,} || die
+}
+
+gdb_branding() {
+	printf "Gentoo ${PV} "
+
+	if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then
+		printf "p${PATCH_VER}"
+	else
+		printf "vanilla"
+	fi
+
+	[[ -n ${EGIT_COMMIT} ]] && printf " ${EGIT_COMMIT}"
+}
+
+src_configure() {
+	strip-unsupported-flags
+
+	# See https://www.gnu.org/software/make/manual/html_node/Parallel-Output.html
+	# Avoid really confusing logs from subconfigure spam, makes logs far
+	# more legible.
+	MAKEOPTS="--output-sync=line ${MAKEOPTS}"
+
+	local myconf=(
+		# portage's econf() does not detect presence of --d-d-t
+		# because it greps only top-level ./configure. But not
+		# gnulib's or gdb's configure.
+		--disable-dependency-tracking
+
+		--with-pkgversion="$(gdb_branding)"
+		--with-bugurl='https://bugs.gentoo.org/'
+		--disable-werror
+		# Disable modules that are in a combined binutils/gdb tree. bug #490566
+		--disable-{binutils,etc,gas,gold,gprof,ld}
+
+		# avoid automagic dependency on (currently prefix) systems
+		# systems with debuginfod library, bug #754753
+		--without-debuginfod
+
+		$(use_enable test unit-tests)
+
+		# Allow user to opt into CET for host libraries.
+		# Ideally we would like automagic-or-disabled here.
+		# But the check does not quite work on i686: bug #760926.
+		$(use_enable cet)
+
+		# We need to set both configure options, --with-sysroot and --libdir,
+		# to fix cross build issues that happen when configuring gmp.
+		# We explicitly need --libdir. Having only --with-sysroot without
+		# --libdir would not fix the build issues.
+		# For some reason, it is not enough to set only --with-sysroot,
+		# also not enough to pass --with-gmp-xxx options.
+		--with-sysroot="${ESYSROOT}"
+		--libdir="${ESYSROOT}/usr/$(get_libdir)"
+	)
+
+	local sysroot="${EPREFIX}/usr/${CTARGET}"
+
+	is_cross && myconf+=(
+		--with-sysroot="${sysroot}"
+		--includedir="${sysroot}/usr/include"
+		--with-gdb-datadir="\${datadir}/gdb/${CTARGET}"
+	)
+
+	# gdbserver only works for native targets (CHOST==CTARGET).
+	# it also doesn't support all targets, so rather than duplicate
+	# the target list (which changes between versions), use the
+	# "auto" value when things are turned on, which is triggered
+	# whenever no --enable or --disable is given
+	if is_cross || use !server ; then
+		myconf+=( --disable-gdbserver )
+	fi
+
+	myconf+=(
+		--enable-64-bit-bfd
+		--disable-install-libbfd
+		--disable-install-libiberty
+		--enable-obsolete
+		# This only disables building in the readline subdir.
+		# For gdb itself, it'll use the system version.
+		--disable-readline
+		--with-system-readline
+		# This only disables building in the zlib subdir.
+		# For gdb itself, it'll use the system version.
+		--without-zlib
+		--with-system-zlib
+		--with-separate-debug-dir="${EPREFIX}"/usr/lib/debug
+		$(use_with xml expat)
+		$(use_with lzma)
+		$(use_enable nls)
+		$(use_enable source-highlight)
+		$(use multitarget && echo --enable-targets=all)
+		$(use_with python python "${EPYTHON}")
+		$(use_with xxhash)
+		$(use_with guile)
+	)
+
+	if use sparc-solaris || use x86-solaris ; then
+		# Disable largefile support
+		# https://sourceware.org/ml/gdb-patches/2014-12/msg00058.html
+		myconf+=( --disable-largefile )
+	fi
+
+	# source-highlight is detected with pkg-config: bug #716558
+	export ac_cv_path_pkg_config_prog_path="$(tc-getPKG_CONFIG)"
+
+	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
+
+	# ensure proper compiler is detected for Clang builds: bug #831202
+	export GCC_FOR_TARGET="${CC_FOR_TARGET:-$(tc-getCC)}"
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	emake V=1 DESTDIR="${D}" install
+
+	find "${ED}"/usr -name libiberty.a -delete || die
+
+	# Delete translations that conflict with binutils-libs. bug #528088
+	# Note: Should figure out how to store these in an internal gdb dir.
+	if use nls ; then
+		find "${ED}" \
+			-regextype posix-extended -regex '.*/(bfd|opcodes)[.]g?mo$' \
+			-delete || die
+	fi
+
+	# Don't install docs when building a cross-gdb
+	if [[ ${CTARGET} != ${CHOST} ]] ; then
+		rm -rf "${ED}"/usr/share/{doc,info,locale} || die
+		local f
+		for f in "${ED}"/usr/share/man/*/* ; do
+			if [[ ${f##*/} != ${CTARGET}-* ]] ; then
+				mv "${f}" "${f%/*}/${CTARGET}-${f##*/}" || die
+			fi
+		done
+		return 0
+	fi
+
+	# Install it by hand for now:
+	# https://sourceware.org/ml/gdb-patches/2011-12/msg00915.html
+	# Only install if it exists due to the twisted behavior (see
+	# notes in src_configure above).
+	[[ -e gdbserver/gdbreplay ]] && dobin gdbserver/gdbreplay
+
+	docinto gdb
+	dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
+		gdb/NEWS gdb/PROBLEMS
+	docinto sim
+	dodoc sim/{MAINTAINERS,README-HACKING}
+
+	if use server ; then
+		docinto gdbserver
+		dodoc gdbserver/README
+	fi
+
+	if [[ -n ${PATCH_VER} ]] ; then
+		dodoc "${WORKDIR}"/extra/gdbinit.sample
+	fi
+
+	# Remove shared info pages
+	rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,ctf-spec,standards}.info*
+
+	if use python ; then
+		python_optimize "${ED}"/usr/share/gdb/python/gdb
+	fi
+}
+
+pkg_postinst() {
+	# Portage doesn't unmerge files in /etc
+	rm -vf "${EROOT}"/etc/skel/.gdbinit
+
+	if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
+		ewarn "gdb is unable to get a mach task port when installed by Prefix"
+		ewarn "Portage, unprivileged.  To make gdb fully functional you'll"
+		ewarn "have to perform the following steps:"
+		ewarn "  % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb"
+		ewarn "  % sudo chmod g+s ${EPREFIX}/usr/bin/gdb"
+	fi
+}
diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-9999.ebuild
index 0eab4cadf89c..a431465d7f6a 100644
--- a/sys-devel/gdb/gdb-9999.ebuild
+++ b/sys-devel/gdb/gdb-9999.ebuild
@@ -154,6 +154,15 @@ src_configure() {
 		# Ideally we would like automagic-or-disabled here.
 		# But the check does not quite work on i686: bug #760926.
 		$(use_enable cet)
+
+		# We need to set both configure options, --with-sysroot and --libdir,
+		# to fix cross build issues that happen when configuring gmp.
+		# We explicitly need --libdir. Having only --with-sysroot without
+		# --libdir would not fix the build issues.
+		# For some reason, it is not enough to set only --with-sysroot,
+		# also not enough to pass --with-gmp-xxx options.
+		--with-sysroot="${ESYSROOT}"
+		--libdir="${ESYSROOT}/usr/$(get_libdir)"
 	)
 
 	local sysroot="${EPREFIX}/usr/${CTARGET}"
diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest
index 961cabe4e60b..511152219246 100644
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -16,6 +16,6 @@ AUX libtool-2.4.6-sed-quote-speedup.patch 7619 BLAKE2B 14e0341bb5b5878dd9bab5996
 DIST libtool-2.4.6.tar.xz 973080 BLAKE2B 0865af9f8701ca9dc62eec8294a088d24f4a3ff541bc76acfe7b69f70637d7e8261a17d69f7d54a4177f974c429be68467883a1560edb539061966cbf7d4a356 SHA512 a6eef35f3cbccf2c9e2667f44a476ebc80ab888725eb768e91a3a6c33b8c931afc46eb23efaee76c8696d3e4eed74ab1c71157bcb924f38ee912c8a90a6521a4
 DIST libtool-2.4.7.tar.xz 1016040 BLAKE2B 5e022586337637dd634bd40578ad944bec6e3b8de41f95d55777b90cc88cbc4badb3d76cbf0e638166ece1ea7de828e83590e1e6bac30c1e4b1c254a11a742f2 SHA512 47f4c6de40927254ff9ba452612c0702aea6f4edc7e797f0966c8c6bf0340d533598976cdba17f0bdc64545572e71cd319bbb587aa5f47cd2e7c1d96f873a3da
 EBUILD libtool-2.4.6-r6.ebuild 3594 BLAKE2B 1af42af727a1aa0a7f7392ab253a34a93b76715b605291cd9ff136708c41ddede5e4cfbdec7b7059f6f40780ac8b6b17fa2a4d0ae17959565e29ed4dfe0846e3 SHA512 425c6a82232cdac39f598c7c8cff46a7594a5644ab30331d56ec92bbbad32fd099c89b7995be568f8ba60e489b3bb7c306fbf79ef40782ef4f2bc1552babcf40
-EBUILD libtool-2.4.7.ebuild 3343 BLAKE2B 21d0043bc2f53e563afda38d7890cd7f909d9c871dfbab81539e3d6706d71d456ad361f82f514f7554ebee7aa28a35686adaea7533c4136848d83ec1adefd86f SHA512 372ea01ca18b3c9acb302fb0041359579bb62439d9b3c02f14e04df903b8e75a7a6380132dbfa61fa8d1dcb87dbf9fed0ecb9398c7b5995e5e99d579bf606d62
+EBUILD libtool-2.4.7.ebuild 3336 BLAKE2B ee22e5d4538cac9f65d7531f2abf01f87c9aa5adb467278adbf726056011fb8a25e7b1ffe03a7c36953284650f14906d3334f3e71ddd7e02e8b3128186ab74e1 SHA512 58ff7d1425137214ad8f324b82003b4a30c9db07927fbb5d157c78def1c239729fc5ac178a4643d73e32e22e3fe72b5df84d8ab243c6156a4a166db0a943182a
 EBUILD libtool-9999.ebuild 3336 BLAKE2B 36dcee7ed3244cfe60193a8121ae148b475bdb4a8dae055bca39fc01755eb1ae2c64fd00d79858ff1be326584dd8487474aa85463399cff5837fa8761b19dd75 SHA512 85b068a6a64a4869cb715591123a5b57be4d75d6a52f5c8be83a1c7159340974870d1ad8838bd56d2312a5aeafc5cdd61abdaa5d330dd20bd66edf9ee08687a2
 MISC metadata.xml 331 BLAKE2B 4a4cfaad20b2f1c22b0b5ab23b4557e1bef50dbc49d0b7d821d4099e06bf488fdc6c7cb4a29431910d0e1b8cfb7c8b565cd3296afb30925a08389e023c777150 SHA512 9ca8e937181de31beb06558475dc8c10e61765d5280a882576a2d1e4e87fb750bc1c2e99aafdfffe343343797e0565814c0a5f8c18c7fba5b7fe9275100f2609
diff --git a/sys-devel/libtool/libtool-2.4.7.ebuild b/sys-devel/libtool/libtool-2.4.7.ebuild
index bcc6bcca5e85..bfaaecf72587 100644
--- a/sys-devel/libtool/libtool-2.4.7.ebuild
+++ b/sys-devel/libtool/libtool-2.4.7.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 
 DESCRIPTION="A shared library tool for developers"
diff --git a/sys-devel/sparse/Manifest b/sys-devel/sparse/Manifest
index 4a4df456f193..0df8c6762076 100644
--- a/sys-devel/sparse/Manifest
+++ b/sys-devel/sparse/Manifest
@@ -1,4 +1,4 @@
 DIST sparse-0.6.4.tar.xz 370840 BLAKE2B 4b21d26c87df65f08928438c311582a45f4cbbb5ed2bb399c3521d1e40630006d794b4f1e545693e82225f086968cf686c5bfb29059644a31812120f07caebe2 SHA512 4ada31e588469d15862579dd7eb926ce1ad717bf96d38d425b9153f2efe73949fdda5bc59d05d926614a08d70e656e4ff531a5f0a1cf8e7725c596dcdba169f9
-EBUILD sparse-0.6.4-r1.ebuild 1535 BLAKE2B 238eca1c65002002a180f7fbe9567eade59476fd60d56501f7f358bcc4f5fe230d4f9a1e4d6dc874a864724bfe36af51dcbb968415332f23c08de8d47d65a72e SHA512 c73d158aef8146d82d36a619165d337f9fedf0ff60472bec028d8972aa570c1c13eb43eda2d7edbceeba155805862db295defefebb08048c4af385d03d831ae7
-EBUILD sparse-9999.ebuild 1535 BLAKE2B 238eca1c65002002a180f7fbe9567eade59476fd60d56501f7f358bcc4f5fe230d4f9a1e4d6dc874a864724bfe36af51dcbb968415332f23c08de8d47d65a72e SHA512 c73d158aef8146d82d36a619165d337f9fedf0ff60472bec028d8972aa570c1c13eb43eda2d7edbceeba155805862db295defefebb08048c4af385d03d831ae7
+EBUILD sparse-0.6.4-r2.ebuild 1535 BLAKE2B 02cab77dbdffbc56fc3a1dedea0117819a5c334903d65887cd505b4c902ccfa9923c0303950f9e1aa0cc84dc5fe6411e5dc15bca3684ccde519f2dbc5c8bf4d7 SHA512 4a1e9fb9302f87fc79960bcdb092a4410dc6bcbb7f1f93ce81cf54cd6f02ba3f222525eadd9923b4b7f8e1054fbed92df59f6690c5ed16d06c823b17bc031448
+EBUILD sparse-9999.ebuild 1535 BLAKE2B 02cab77dbdffbc56fc3a1dedea0117819a5c334903d65887cd505b4c902ccfa9923c0303950f9e1aa0cc84dc5fe6411e5dc15bca3684ccde519f2dbc5c8bf4d7 SHA512 4a1e9fb9302f87fc79960bcdb092a4410dc6bcbb7f1f93ce81cf54cd6f02ba3f222525eadd9923b4b7f8e1054fbed92df59f6690c5ed16d06c823b17bc031448
 MISC metadata.xml 629 BLAKE2B bdf97f2d921262f45cf7e07642748aede2a4d8a1cfa234ec96d5cffb7a0a83f1c7fce135dc389ab86b3f85f6a2f8560492c27f962be5ebb86bff1008bae80945 SHA512 2d699cf51a5dcf8c44c7ed8faf45f3dbc3a2cbe3e45a7fac2de0c2cd0609c996f344a85af4be3058d1307bad02b20fc23db034b2468e60a35629ca88df7421a2
diff --git a/sys-devel/sparse/sparse-0.6.4-r1.ebuild b/sys-devel/sparse/sparse-0.6.4-r2.ebuild
similarity index 98%
rename from sys-devel/sparse/sparse-0.6.4-r1.ebuild
rename to sys-devel/sparse/sparse-0.6.4-r2.ebuild
index a7c5b9dbc728..726fd8b0cfe3 100644
--- a/sys-devel/sparse/sparse-0.6.4-r1.ebuild
+++ b/sys-devel/sparse/sparse-0.6.4-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-LLVM_MAX_SLOT=12
+LLVM_MAX_SLOT=14
 inherit llvm toolchain-funcs
 
 DESCRIPTION="C semantic parser"
diff --git a/sys-devel/sparse/sparse-9999.ebuild b/sys-devel/sparse/sparse-9999.ebuild
index a7c5b9dbc728..726fd8b0cfe3 100644
--- a/sys-devel/sparse/sparse-9999.ebuild
+++ b/sys-devel/sparse/sparse-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-LLVM_MAX_SLOT=12
+LLVM_MAX_SLOT=14
 inherit llvm toolchain-funcs
 
 DESCRIPTION="C semantic parser"
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 8ce26f9e4429..5b5aea3b4d00 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/bcache-tools/Manifest b/sys-fs/bcache-tools/Manifest
index 8c23dcae1a9f..898dd1194a75 100644
--- a/sys-fs/bcache-tools/Manifest
+++ b/sys-fs/bcache-tools/Manifest
@@ -2,6 +2,6 @@ AUX 1.0.8_p20140220/bcache-tools-1.0.8-noprobe.patch 1335 BLAKE2B bb99576cd404dc
 AUX 1.1/bcache-tools-add-bcache-status.patch 13158 BLAKE2B e986d81d6fdf76f809ffcaad0c93869421e369e77efb7a51f81c1abe07b941c703bf80ce89e4c09bad42f5b4d76a7bb7c40fa5ad94c87f31237b676c40b41049 SHA512 bdcc2912d3b6e47781e9023433e2b152d628ce9fa538ae4ff7ed8385a495752786cdb32bd8f82d7a7c84ad068d49b22b3911c0125e235f561a729c20c8223363
 AUX 1.1/bcache-tools-add-man-page-bcache-status.8.patch 1431 BLAKE2B f88c54286ad07766e4ebe216a27b99838ee9eb63412bb50a1036c93e1e41d77ea9d02cc47c148105ab63115f954c4dcc52903e7c726399b2d2ec2066a7b24ecc SHA512 e6e5f073b01e0272710bc6effeecf5ce6786f1606986e12f18bf37a1124d25858a4ed25fa42f2da85bf04e95844e3c6156af2e83bed323bb83621601774b0802
 DIST bcache-tools-1.1.tar.gz 34548 BLAKE2B e6ebc0f609debe0cc123deba0e21076441c37cdbc6edd02bf2c16c0e36fe806f1fc160b9e9baed577f86f6358884182a4e3903f34bccee81943191c0ba6a2d11 SHA512 4ccbef47255bf3644a50242a79951b1f3720e71a55eb1e07dc6b8486df0245da99a77bba751b50197d489b4c5d738e5284aabc014c2f7f44816ddf6a1bb807ca
-EBUILD bcache-tools-1.1-r1.ebuild 1461 BLAKE2B 1f3a6847c05058f35ac9dcfbf1195f3d1b6b4a06116280deea9e4a4d3a9148d57c39d5a4d7abbce78c7f6f442c2ab5563153ee206c7a6bf73581a9f9133a3de0 SHA512 6d6053f8dd3972e683b3f8d6bb5a81623a7691aa14d85378a87715f43eddba9d76f21abd279c60c418c0ed55611cbb17fd8213cba0a07b8aaff7c05284935048
-EBUILD bcache-tools-9999.ebuild 1431 BLAKE2B ed6ab5aa846a1b8d819b99bb4e0d70b97bb66282dcb525f0813f5366876fa628fd080677171e4fb69704954adc12b61794e183696941b2c4b1dd30622e3c8c57 SHA512 7f4f3ba740f5ffe4211adf15cbf1abcdd28b51adcb6fd45f13ceb1fc865339b31f548fd32fa2ced1cc06c72d16251be1a9ecee7f27cfbbe93b60883919b2dd77
+EBUILD bcache-tools-1.1-r1.ebuild 1492 BLAKE2B 31ece9ffa87aeb37b09819625d5397171ab4d40b7d049018f1a952a5603bb2e1e06fd61184bd14aa374ab0e928e59bcd3bef2be2ae6f156b2469196d51c5ca9e SHA512 9c357c7ff24c97123fbb8281b0b0deca2e789edef2cc4a8513fe94ff41d294388a46ada6280e4dc0f66f73040c164aa33c97f15e22cd9aaf254a51df5a5ebaa3
+EBUILD bcache-tools-9999.ebuild 1462 BLAKE2B 35273095869cb29825c8c2677eab9a618feba6ac3642daa625d46070444128f690610074542f55e8d6886742ca75bdda678cc323d1dd8f3c7e42dd2a96cac2b9 SHA512 4b7f53a18f1f5dfce41aa4db443b9edb7bfc21dd3466fa659e1e9ae3385cbf227c8c7ca169c45c61149c33ca2cfff001f935b82c2220c938612bd8153f3c3539
 MISC metadata.xml 247 BLAKE2B 3cfe29afe8370e5f5195d26e19732debac8a921204f9788b2f0c2b803a4ffdb479c89b0a53f1b592764c1980ad587b5982c288b33e6fe522ecdcf5be3ed81750 SHA512 a9c3ee4b936ac1f2e739f4a46249a25e3b980b3a63f7ebc573743a33bf745cb8af2513e6724da71f73dc61931f69f4ff351df94a2dad348d4910a9d6f71d2d4c
diff --git a/sys-fs/bcache-tools/bcache-tools-1.1-r1.ebuild b/sys-fs/bcache-tools/bcache-tools-1.1-r1.ebuild
index f2e436d2fa27..9e6dc7c64771 100644
--- a/sys-fs/bcache-tools/bcache-tools-1.1-r1.ebuild
+++ b/sys-fs/bcache-tools/bcache-tools-1.1-r1.ebuild
@@ -69,3 +69,7 @@ src_install() {
 pkg_postinst() {
 	udev_reload
 }
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/sys-fs/bcache-tools/bcache-tools-9999.ebuild b/sys-fs/bcache-tools/bcache-tools-9999.ebuild
index 31a8bc178342..1afc686aacaf 100644
--- a/sys-fs/bcache-tools/bcache-tools-9999.ebuild
+++ b/sys-fs/bcache-tools/bcache-tools-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -67,3 +67,7 @@ src_install() {
 pkg_postinst() {
 	udev_reload
 }
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 9fd2272616ce..3038fc83890d 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -6,12 +6,12 @@ DIST btrfs-progs-v5.16.tar.xz 2327376 BLAKE2B 3bb3b630d465068373bf39776389f733e7
 DIST btrfs-progs-v5.17.tar.xz 2286016 BLAKE2B 013acc4f9ec294d8d88b04e9f0ee33c450bfa6621b029005d18885add7c0a1da7e645c1f984931749ebd8f3166e8d849ec128a0f95cc189c15878d45acc0901b SHA512 4c2bfafe0fcae47f01bad41910c2e2b3d48a12b88ca1891a9ea63ac1e65699c2e22f481492c7dd11fbea546647ab78718ab9b6997bb257fc29d1482fde9b08d1
 DIST btrfs-progs-v5.18.1.tar.xz 2293940 BLAKE2B ce2326cca51a4242895aada860e290c6af69a216dc6369673bb3321ab91bfe1c995fcc37dd0c1e15c8e28aabaedf3d6c9508bde393eb0ba4c7b9327c922f749a SHA512 265a03b0db00a231ad51bb75fb161dee0a7a51cd120a696ca0524f08ef635b18afe43b391fa9889a4a79734ccc3931e4374bd950eb26dc47ddc8482368efed0e
 DIST btrfs-progs-v5.18.tar.xz 2293620 BLAKE2B dd5da4618e53d7d1c6636b4dcf9adb0e24e2e735a13ff1858bc55d21a90ad31cb2a7a11ab12beddd44682c62673fda41ebc7517aa80c81cd61cc1b195668a0e1 SHA512 142d9c133a41c0843ab8442018a6caf5186757d6c8d73f9a69a2245f62590d93a448dae6fdde2ebc5f091cc39da9a79ad0e8c94e1873d75e6c723dcc79d74309
-EBUILD btrfs-progs-5.10.1-r1.ebuild 2981 BLAKE2B 0c1e13d87b5119c171447e3eebc0fe9439da77a7d05ae0b1130eb8904c24081716e6f15dcb39f700abbe68a0431331c78c18a9253cb631998e61a842bbbe9791 SHA512 715d72ae20791fa701e3116ae7540be89c6761cbee1b42589881482e3abab6d5f9621fcba2b22166ac858466fe821b1af32284a0eea0a25ec8d9b3f63518a7c7
-EBUILD btrfs-progs-5.15.1.ebuild 3019 BLAKE2B 2617d6d8b08f71e28b94243d75b6110a147edca8f73a097a01986c3e9b771a899bd94bef34d1037cd372fb18226e26e8d8a1587aa7dc44799cf19a4b4f1c0c21 SHA512 e2e75f4d2670faff35310a776cc375e64d1a967fb879bc0e37ecb48d13673be6e19da392855ba1d9c6c7ecbef30e887ad951705c986fb71eaf0c1abae6c4e922
-EBUILD btrfs-progs-5.16.2.ebuild 3074 BLAKE2B 55a72f9fbc7d61bed468e1a2d545c18ab9f9cf88a4880e508a75ab25673adfda3d9f376b203e62d93da6164782fc4d17c29e62385736d5252e74531c3cc7fd60 SHA512 19ba56e736a3f390e722b915c2b50f40657dbdf69e9e613b787721ab727ae5e025d0a076e1f94c3791aa0f91659399edc10f3eb1c7551163811c0d992eea9799
-EBUILD btrfs-progs-5.16.ebuild 3090 BLAKE2B 210cf293d434288818fcd88116ddc2ece4254ab6b6f0d027d0f7e5d777448ae01fe81dd5b1cb31a6690bd6909a29a763d573a49c5ebdca191ebbb7ea84bf986b SHA512 5d2b24a3b9878ac6b51d7f84f6630357f56e6b42f27ef8877df953778fef28ebd6aa693023bfdb1bbfbf1f3146dc13b3c52a9763612138e79140a3288bd0bbc9
-EBUILD btrfs-progs-5.17.ebuild 3048 BLAKE2B 0e98e5faaed1f27b9c9dea9de8c0d267c531a034713f5f53654d18482de4af21491ddec6f8ff6ca75dc631abb0ba8457ee9e05749868de6f70dad4c4e4212b0d SHA512 44c6e94c8ea05033ca8c60a2b9e42876c47bb5de5b46c0ecea087257e78e47d7e462b932fee3294258c213edc38927ced944000e5d4090e5915cafaffab0ea44
-EBUILD btrfs-progs-5.18.1-r1.ebuild 3250 BLAKE2B c02bc56dfbde7651d241f23d0baca8d380b13ab9d7cfce34813b163bafe0d389d5d0b7d2afe05175c7e09360d5d811cc11dcee063f616960afaf2ba8823aeb9a SHA512 3ae3522f7e81eb91011e647070504ab742bd0db04f70cf7a94d5a059320ea6d3082c48a1e24f67827d8d03434288f5f9b8a63dceabc861d3b1f2d04a73a38ac2
-EBUILD btrfs-progs-5.18.ebuild 3339 BLAKE2B 4908734e2f2ddeeebab8aaf642a2eb2e6a604fd80f4e004f9f0a5ce2068a02faced561082a17d21ae746ecf56c82aa0c88948792630c272e5ce7c0092b0de6c3 SHA512 9b88b2bdc7bf2e1d8a4b61cede4bb254eb98d5f4405ab43476656b3c478adb14a9c488d736b02f799aa7cca92db8507864c589b7d2ebbd4baf0d6106bc71131e
-EBUILD btrfs-progs-9999.ebuild 3250 BLAKE2B c02bc56dfbde7651d241f23d0baca8d380b13ab9d7cfce34813b163bafe0d389d5d0b7d2afe05175c7e09360d5d811cc11dcee063f616960afaf2ba8823aeb9a SHA512 3ae3522f7e81eb91011e647070504ab742bd0db04f70cf7a94d5a059320ea6d3082c48a1e24f67827d8d03434288f5f9b8a63dceabc861d3b1f2d04a73a38ac2
+EBUILD btrfs-progs-5.10.1-r1.ebuild 3046 BLAKE2B ca40892695507f2d8ded08d2d43b0cddead63279b84a621eb003e87cdc41b48d98a307363f2e04c5b3ef1d287fcf66c00805c5ac99acd60856abb50be04f2120 SHA512 9c0c0dc2d6991686f076cb2376edabac7253b916b4e4f9446dcce403b70eb10e3c40c7ab6c92035b755a08144e492eb87ea178c9717b20db71d9b4d21f3429e6
+EBUILD btrfs-progs-5.15.1.ebuild 3084 BLAKE2B 1e22d8639ca8792ddf3bc7840091d375831489ad63bab756e445342009f80e3681d1432761a5aad561727c8deb076ece57e74b9ddc32af2cfd7341979f6704a9 SHA512 61c2fa949b59a185cf70ed40ca3109f50d5038b924690a3da543d51962d79e61061042a15e3349a1a3f7ca9a42cae6cad80438ac343bfb78752452c0680d0fce
+EBUILD btrfs-progs-5.16.2.ebuild 3139 BLAKE2B 44cd4f768d4d2beffc54a0325b22572096e978742786916f55e539d0573ed2d8f13d452edd94b2adde51a4a17cc64e5d3abc279039a610faded84b2f64ad9fe6 SHA512 deb3b2a793d381a957d2273438e39cb4df1f3b7d9c63cb4a400f7ea4a6745360ca9d3ff2f8cce166daffc58bc1865c34e65b797da0330ef0fa80196a2211c43a
+EBUILD btrfs-progs-5.16.ebuild 3155 BLAKE2B 70bedb119f3bc6d90de05558963a3663f763b5919f02dd85c76e3c8d34b515e817e0f579eac4bbdbac9b7513be9e20e6da2445c8b855b6a209321a380255dc9b SHA512 d00762deb927876a4384ec874bcf527c8c69a384fa99a1c15a84805b8dc1e56e9a0fd6e5c4808ea759b0c4988f840ad7735d7fd1564bd8d7e3f870718c67bc78
+EBUILD btrfs-progs-5.17.ebuild 3113 BLAKE2B b55f749346e5a0dc1c004dae7d7f888bafc5da8a0bd1c5032697a1e38f53903950f45e8004fea86ff04cabe4e5488a0dc31f064349a357188c0c21634af76cca SHA512 9e6bc0163180246cc96b992cc90c7960e3141f4cec9bc81fdbe6547051ff1d8e3e7158e36c505cea14f2576125190a99fc81363c56e62f60f33a7c866c5baabe
+EBUILD btrfs-progs-5.18.1-r1.ebuild 3315 BLAKE2B 21bcee35074e908afed1b369f07609565bbcc864def87f3c28bc4c5c9b2f8e02e37d7591f655cfdfb640186b0a3bcf4160c7784c556b0754385b9830cf0477a1 SHA512 c483f3ae0784548120a6a9db16c4be656b51097e676e6e333df778a499ba1cce8c6486dd951455468be0be39f26441f798138c4623232fc9431868d8da2a9710
+EBUILD btrfs-progs-5.18.ebuild 3404 BLAKE2B ffca9e8d9839b900e8fe04ae8e0e33564fd994e63b91080c8b4ef857e3259465e7441156192fafbdf8009a1362bf7ca89e0cbe8d93585ab7b86f105899cb39e0 SHA512 b7dcfb64b5a8331330e26e950f448461905a28de523bb0f01cc3c7a7a85dc58b187ed48819113ff4c27ec6c68a927668efe38d26eb0b1c963eb7e28755307e1d
+EBUILD btrfs-progs-9999.ebuild 3315 BLAKE2B 21bcee35074e908afed1b369f07609565bbcc864def87f3c28bc4c5c9b2f8e02e37d7591f655cfdfb640186b0a3bcf4160c7784c556b0754385b9830cf0477a1 SHA512 c483f3ae0784548120a6a9db16c4be656b51097e676e6e333df778a499ba1cce8c6486dd951455468be0be39f26441f798138c4623232fc9431868d8da2a9710
 MISC metadata.xml 524 BLAKE2B 4e27833128aeb064271af7a4f3c05699b4603b1d993b32bef3d9d973182d3d0c88ac799c95f0f35495e9a99e645627afd96049273c08c3e1334d8fe1ccf0debe SHA512 471014a98bc3feb75e7930485e89daf6cb3390c37a330b8373d5c3b0b764b9180cbff133839ce4742a3c76f63e6f18895060d5906e6a113d2cd43af0df3b0d5a
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.10.1-r1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.10.1-r1.ebuild
index ec36b2152a52..01164d323b79 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.10.1-r1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.10.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2008-2021 Gentoo Authors
+# Copyright 2008-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -125,3 +125,7 @@ src_install() {
 	# install prebuilt subset of manuals
 	use doc || doman Documentation/*.[58]
 }
+
+pkg_postrm() {
+	[[ -n ${REPLACING_VERSIONS} ]] || udev_reload
+}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild
index 64cc91680915..8132f35bc6ac 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2008-2021 Gentoo Authors
+# Copyright 2008-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -126,3 +126,7 @@ src_install() {
 	# install prebuilt subset of manuals
 	use doc || doman Documentation/*.[58]
 }
+
+pkg_postrm() {
+	[[ -n ${REPLACING_VERSIONS} ]] || udev_reload
+}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.16.2.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.16.2.ebuild
index b9b56b46d14f..5c1aabd39fb4 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.16.2.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.16.2.ebuild
@@ -131,3 +131,7 @@ src_install() {
 	# install prebuilt subset of manuals
 	use doc || doman Documentation/*.[58]
 }
+
+pkg_postrm() {
+	[[ -n ${REPLACING_VERSIONS} ]] || udev_reload
+}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.16.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.16.ebuild
index 015b81367170..81d242c828ef 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.16.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.16.ebuild
@@ -134,3 +134,7 @@ src_install() {
 	# install prebuilt subset of manuals
 	use doc || doman Documentation/*.[58]
 }
+
+pkg_postrm() {
+	[[ -n ${REPLACING_VERSIONS} ]] || udev_reload
+}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.17.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.17.ebuild
index 70f276f2ea37..a8119d0182c4 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.17.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.17.ebuild
@@ -142,3 +142,7 @@ src_install() {
 pkg_postinst() {
 	udev_reload
 }
+
+pkg_postrm() {
+	[[ -n ${REPLACING_VERSIONS} ]] || udev_reload
+}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.18.1-r1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.18.1-r1.ebuild
index c408216229ce..cc8ae19c469e 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.18.1-r1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.18.1-r1.ebuild
@@ -143,3 +143,7 @@ src_install() {
 pkg_postinst() {
 	udev_reload
 }
+
+pkg_postrm() {
+	[[ -n ${REPLACING_VERSIONS} ]] || udev_reload
+}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.18.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.18.ebuild
index 011480b36dea..b6d87b7e0f05 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.18.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.18.ebuild
@@ -146,3 +146,7 @@ src_install() {
 pkg_postinst() {
 	udev_reload
 }
+
+pkg_postrm() {
+	[[ -n ${REPLACING_VERSIONS} ]] || udev_reload
+}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
index c408216229ce..cc8ae19c469e 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
@@ -143,3 +143,7 @@ src_install() {
 pkg_postinst() {
 	udev_reload
 }
+
+pkg_postrm() {
+	[[ -n ${REPLACING_VERSIONS} ]] || udev_reload
+}
diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest
index 7e81dbd87a47..80c3c7366574 100644
--- a/sys-fs/eudev/Manifest
+++ b/sys-fs/eudev/Manifest
@@ -1,8 +1,8 @@
 AUX 40-gentoo.rules 167 BLAKE2B 07116c6e5aab7de9fa8a88c6cdd9ad76a09d797d6f7bc3d0535c93ccf83486bbdae8f68d682714576b072a174df070505cce9c6f4b729e91a6f61ed89da72e8e SHA512 92e2be610839432f46cefab4d128825199dc9f2c5ef33119f9ff84dfe635ef56a4f7aaed64ba52ea2798868b00c3a1b7955caa33219aa298c6a2b8290181f94b
 AUX udev-postmount 1208 BLAKE2B bcfbaee26ea666304091092deabcc068c533c7707252917a0d8617812f26744c0454f10f5f829031f8668a345c35034ec68396cbf07792a4a83a87e3816001bb SHA512 8ef1b911843ab13acb1c1b9b7a0a5cd76659f395c3db9e579429556f23eacebb414507dc0231e2455e7589bc70054fa1e6b6dd93dd833f7101c0da0597aabf88
 DIST eudev-3.2.11.tar.gz 2254373 BLAKE2B cfa6235d6509b751fde93ff2b0961b93c3741458e561a7ad9b07b49a57779627532cff25ad3519e5f79320854fcedfcdc23642ef542505cebcd6b2803067389a SHA512 17b328365913af3e434abe667dd0498c3702a41c6cb66f3793ca2c195b05ac06397b0a401077f81df7dd25193e4eeea13657a221ca6cb3d237c4d91e31e30b33
-DIST eudev-3.2.12_pre2.tar.gz 2304806 BLAKE2B 86f497a88cffa96c6976b0910b44329cdee9615c7b3592fa619cfe681f14d6669b36f4272003f36d64b63c4d47de2e3b37d602e93c72d423e630007c418d079f SHA512 4e7a6c3f7f65b665486fa9ba8158186b2bac6279de780fd1439ac7fb766aa807ae8fd45063f990de6ab01809c57af2695560d36aed8fd90ae0557666d523e36d
+DIST eudev-3.2.12-pre3.tar.gz 2166940 BLAKE2B 46cb4e2daa7302380f169b2505e01483a1c879f83802537b718d1380b9411621db9b58454eaf828ca22aa8e913342b52b682593604c365d7159ddc1df82fe719 SHA512 a450ef8ccfb0ec8817e03ae666464cb43390849d1b340f057e047bc42b246ff30e13cfef148417c7452755316bce858ef0c89bf94abf27af143f87db7de9f446
 EBUILD eudev-3.2.11-r2.ebuild 6886 BLAKE2B 94227204719bde1e703882979a32202510de947c3581e6e1e7bfe59e9b0e39182685bc56e3c8b2ad2fd009ced10ee9b4668324c882cf04a2a9463ccb3b3e2dbe SHA512 faadb9ca00bbd9b7d8cafc4446fa7c9399c49455d63bcaf0f94a59f7c8d31ff220c5409d94de101c538c4b849f8823c176b8616c0347b7fcdbdb2fe02d8b3080
-EBUILD eudev-3.2.12_pre2.ebuild 6753 BLAKE2B fcf51165257bacd1fa07329bb5b8962703a86622ca0908e3c37cd1a1595d3d242ed5c26aeb368a3438257b885a46a30f204476bda1fe163ff3912e0b13fac5f0 SHA512 2d168dc8b2fc87c34a4ae9e28060ba8235dfaa1210ed35add86ad43bf751259b2d78ca55ad1a07840261d38a95c02ceb43973e36fc3b64c2c02247525d69dcd4
-EBUILD eudev-9999.ebuild 6753 BLAKE2B fcf51165257bacd1fa07329bb5b8962703a86622ca0908e3c37cd1a1595d3d242ed5c26aeb368a3438257b885a46a30f204476bda1fe163ff3912e0b13fac5f0 SHA512 2d168dc8b2fc87c34a4ae9e28060ba8235dfaa1210ed35add86ad43bf751259b2d78ca55ad1a07840261d38a95c02ceb43973e36fc3b64c2c02247525d69dcd4
+EBUILD eudev-3.2.12_pre3.ebuild 6790 BLAKE2B 4d1744b62f949e57bdf0594ff01ed3c784c9de9142feb21ccaac56284965999fb0fa669f30e06fb09231abccdb208049c964266085ae140bf22f20f498f5dbe0 SHA512 c7a07f52602b8dc7fef177f64d4b169fd8e9a99224989f52268fb8d6786155d41cdbcca918cb1e4caaa08cd50d63f06f395a5d1b33db4b5e73fd7c23ff7c54fb
+EBUILD eudev-9999.ebuild 6790 BLAKE2B 4d1744b62f949e57bdf0594ff01ed3c784c9de9142feb21ccaac56284965999fb0fa669f30e06fb09231abccdb208049c964266085ae140bf22f20f498f5dbe0 SHA512 c7a07f52602b8dc7fef177f64d4b169fd8e9a99224989f52268fb8d6786155d41cdbcca918cb1e4caaa08cd50d63f06f395a5d1b33db4b5e73fd7c23ff7c54fb
 MISC metadata.xml 629 BLAKE2B c67407dd805c6e8d4fb0c5152e897263ca56649d1d5c7692c74a69a751e7824a2b6084fe1ce0f8cd1b13dbdd0ae3f082430d6552807690a9d52d83c907f43f64 SHA512 204a04a68ee53fe8fec226ad82fdbb3f2ee478f538379466343bbf55fd0146a71889ac11742d59261ef954bb9b8e09e8d2b9416079da63cc78ab400efd2ba49b
diff --git a/sys-fs/eudev/eudev-3.2.12_pre2.ebuild b/sys-fs/eudev/eudev-3.2.12_pre3.ebuild
similarity index 96%
rename from sys-fs/eudev/eudev-3.2.12_pre2.ebuild
rename to sys-fs/eudev/eudev-3.2.12_pre3.ebuild
index 18823816ad13..d286cedd7a14 100644
--- a/sys-fs/eudev/eudev-3.2.12_pre2.ebuild
+++ b/sys-fs/eudev/eudev-3.2.12_pre3.ebuild
@@ -5,14 +5,14 @@ EAPI=8
 
 KV_MIN=2.6.39
 
-inherit autotools linux-info multilib-minimal toolchain-funcs udev
+inherit linux-info multilib-minimal toolchain-funcs udev
 
 if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/eudev-project/eudev.git"
-	inherit git-r3
+	inherit autotools git-r3
 else
 	MY_PV=${PV/_pre/-pre}
-	SRC_URI="https://github.com/eudev-project/eudev/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/eudev-project/eudev/releases/download/v${MY_PV}/${PN}-${MY_PV}.tar.gz"
 	S="${WORKDIR}"/${PN}-${MY_PV}
 
 	if [[ ${PV} != *_pre* ]] ; then
@@ -91,7 +91,9 @@ src_prepare() {
 	sed -e 's/GROUP="dialout"/GROUP="uucp"/' -i rules/*.rules \
 		|| die "failed to change group dialout to uucp"
 
-	eautoreconf
+	if [[ ${PV} == 9999* ]] ; then
+		eautoreconf
+	fi
 }
 
 multilib_src_configure() {
diff --git a/sys-fs/eudev/eudev-9999.ebuild b/sys-fs/eudev/eudev-9999.ebuild
index 18823816ad13..d286cedd7a14 100644
--- a/sys-fs/eudev/eudev-9999.ebuild
+++ b/sys-fs/eudev/eudev-9999.ebuild
@@ -5,14 +5,14 @@ EAPI=8
 
 KV_MIN=2.6.39
 
-inherit autotools linux-info multilib-minimal toolchain-funcs udev
+inherit linux-info multilib-minimal toolchain-funcs udev
 
 if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/eudev-project/eudev.git"
-	inherit git-r3
+	inherit autotools git-r3
 else
 	MY_PV=${PV/_pre/-pre}
-	SRC_URI="https://github.com/eudev-project/eudev/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/eudev-project/eudev/releases/download/v${MY_PV}/${PN}-${MY_PV}.tar.gz"
 	S="${WORKDIR}"/${PN}-${MY_PV}
 
 	if [[ ${PV} != *_pre* ]] ; then
@@ -91,7 +91,9 @@ src_prepare() {
 	sed -e 's/GROUP="dialout"/GROUP="uucp"/' -i rules/*.rules \
 		|| die "failed to change group dialout to uucp"
 
-	eautoreconf
+	if [[ ${PV} == 9999* ]] ; then
+		eautoreconf
+	fi
 }
 
 multilib_src_configure() {
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index ca7c50a34f7b..2bdd7610baf5 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -5,5 +5,5 @@ DIST lxcfs-4.0.12.tar.gz 461251 BLAKE2B c0d1cc699461eed2e29ddb1937e8f4719be78a8f
 DIST lxcfs-4.0.12.tar.gz.asc 833 BLAKE2B af8bf08039e7bc1f405c468de0dd628175cef3ea6087c5fa1c0d95f9153df939a84f9a5d9d895fb471c0262616eb88f03532ac789b0c6198ad1349cff9a6c5de SHA512 20f1919ff216f5459e8e387c78b1430b5122e662adec27bdd9c6fd4565645b73ed5bce5e7e843da05d8cfdc17f1a3e964c20c6ad47d4dbd5df68c3f9359fb362
 DIST lxcfs-5.0.0_p20220524.tar.gz 101563 BLAKE2B 2bf282aed5490d160a563ae97fdfbb887366a6ec60ea7f36f5400e4a11330c51ac3096d63c99dd4aa2ebe1a3497102af9df41ebd40e38b3bde6c6dcd4265b336 SHA512 c1183096dd2b74ef859183451b8c909f762e3c56dce0b9384ac163a6b6b3f7a17a63e840742f4cc5ac50b1f25d402583ca6cf31c1617754b35e21c5c991515f4
 EBUILD lxcfs-4.0.12.ebuild 1631 BLAKE2B 95bc1a1f7f7780d70e16e3d7eddefec64dacc2ec56d215b31d3c294ac59b81bed8462756bf104a14620446a440236173f7a4cd3d2558638b7e2b09c0c0537d71 SHA512 04851d0246d34ebac4846dbe5174c4de042213b82bc079ccf4709a61c57756a059ee875d975506d8e4a66e83aed738a4a8b731ef9fdd6ebaab03d9596208cca2
-EBUILD lxcfs-5.0.0_p20220524.ebuild 1729 BLAKE2B c613b8568dcb7aaa5f93a97e88829409f86b42d73b8b373d5c14827b807e073b2e1d73693513e6cb478b8d89edb8b9e82dc59c13651d17ae56e84d5e8660f12a SHA512 4dacd7717b128d7e91fcb2b283cb90909b6d3ca8f16372930a596c58ef5b51b72674a0949b24006d1ca6b3a8eef8703cb45fff42bdccf9cecaa8d82aadf6b5b4
+EBUILD lxcfs-5.0.0_p20220524.ebuild 1728 BLAKE2B 0b357a0906f9f7921d99948ce1721d4f6e3e076f3367ed2eae91078c4c71d20611cb49dad2c446675e200dd1e0060b06fbcadf304911145c1aae78f639b665b1 SHA512 67890b74409da3767b9169b727fc895fd4345abc62190414ee4ca3cb22fee4b24cdbe240b2c73162e99d0c0ce18a3eb340d91a6993c794ac6266f8fa898d4fe6
 MISC metadata.xml 710 BLAKE2B ac2111d3b67e2aa7286b98e3069e77e3b852f401b56a921795370febd8836434e13cfec4af92cc83a379037023c3d7af475516bea02545595fe9a58a188dcb2f SHA512 f07ff1acbf28cda31d9d962332ecf473197d2868488e7051185ab5ab792f5bb9405712d68e3f9c3b10f38024d2025784b98ce9513e2978f537c26bc7c4d7caab
diff --git a/sys-fs/lxcfs/lxcfs-5.0.0_p20220524.ebuild b/sys-fs/lxcfs/lxcfs-5.0.0_p20220524.ebuild
index 638e39e113e1..c9ff5e704ff7 100644
--- a/sys-fs/lxcfs/lxcfs-5.0.0_p20220524.ebuild
+++ b/sys-fs/lxcfs/lxcfs-5.0.0_p20220524.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/lxc/lxcfs/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0 LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv ~x86"
 IUSE="doc test"
 
 DEPEND="sys-fs/fuse:3"
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 0b25c5b81a7d..37cd20cca0cb 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index af2874bb9774..82472d53ebaa 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -8,6 +8,8 @@ DIST genpatches-5.10-129.base.tar.xz 3527080 BLAKE2B 91778a19b8905af40a0f80cc634
 DIST genpatches-5.10-129.extras.tar.xz 3868 BLAKE2B 85f4030ed0bd5aaac7c1e0d5f64412557a2684d0d53b1243357b0c5d3c521cad0cc5d72af7cdfad1fe8304454a3b1fb8adffd797aa0985353729911c48e17342 SHA512 69db79779a285aa4127339bb11bd77de8e2d9500eb85fc582473bf487a36983edff85b475bcee41b55417895503bc6799ae17f8260e056efcac43f88ff9c64a0
 DIST genpatches-5.10-130.base.tar.xz 3642656 BLAKE2B 6627de9e9ff113ed2a29e3815d0423708fe00b15f706b48e410b0770a4e78f848cbdeee48f0b5012f397f05efaf66c46fdaea888bb8b483c1c1d8c81998b0b0a SHA512 ca834e87815d241326de8c0cea3bceb31909103f86f4d569dda64784b959744200e6b10e794d8527fba2205cadb47fb31a7cafd183f298d67969b96a67146230
 DIST genpatches-5.10-130.extras.tar.xz 3868 BLAKE2B 2aac33beea74a4cec64d91e169444869d280a2b6ae3a03f18f1c9f2d7f212dbadad157f3af828edd2e2e9212d08c50fa33dc857f28d4a67464ec7256589dde77 SHA512 bd6451ee386262857c379d2e46a4e1929ea571dbf5f61b85f5c63e44684653d5dd0111e30929f73d3266ae1e7cca25e6e050935eba7d6708d261d87e6e633d6b
+DIST genpatches-5.10-131.base.tar.xz 3676828 BLAKE2B d16b120518abcd9e58861a9657189345f5fc113df3c291ba350f895092519972fca6757798e619725a5da3f833a712993a089a6c34bff53be983a6f0ea97096d SHA512 62ca509f6f43f996ab6a6d8d1effe26f999e2503fdc5ca041b6ec8229c09202e4d35b8a3e79777a717e6e2491560d578b8cf9c35fc03cac705c69e14f1d435f3
+DIST genpatches-5.10-131.extras.tar.xz 3868 BLAKE2B a873f7ad0c932107ab45a91981d89886fb65e5271bf9a9113d55404405c2a592286fb86dc1c24776601707494db6994f0aab649eb79cdc990843c3194114e8cc SHA512 e8386d12ea62a190315fd9097f148d01edcf9c6fed85a631678e1b85f64104fe580eaf1638b4ccc10cb83cd719522ca6b0fc23ebc67e72960e8f045cb8c13bcb
 DIST genpatches-5.15-45.base.tar.xz 1826632 BLAKE2B 77bb4d997b63723f677f82b91b33afd0f35367d9304051999a0daa84da26feb99fc76a61af77a5e477a5a8ded1a5c12316450563cd56b6c93a93e6df6421b107 SHA512 9435803d4dd65fa78d8e14e992681aeb016d3672b81d589b293d1cbacc024605e18429529803ba344ecae1610bb77150a7b2405cd43f00fc905e9c6babef04c1
 DIST genpatches-5.15-45.extras.tar.xz 3932 BLAKE2B e2c4132995b7b39c9d135e17cd21315013cfa8b9de9b222206d9ff9a5780c4f35be294eb6d71130a9f4b9fbd9c2f31ded41c1c6dfecb2fdc4401118411a7485a SHA512 5b1cf3281df2fe24eac3827b0753c83305dd956b23351899be1dd37a89d00917c771475e3df3f9980f6b0fd210420b479c6196c7d1ea2ea9a0d711fab50cfb64
 DIST genpatches-5.15-47.base.tar.xz 1869424 BLAKE2B 461735737047406f44d86088681cf3fbd591278c1878e7f1aebdfbdb726b5c8ccbffe43bf2c34e5baa57c04eb5fb08a723b9473b843639835383bbde464c1ade SHA512 e6ec4a4ab7abf3b91face2df9f8fa7089c054a7c5e44d8404742d05dac9bf7940e6c0f97f219519f8bce22f3cd3e40fd98c856da866b5cbd637094aee1bd884e
@@ -18,6 +20,8 @@ DIST genpatches-5.15-49.base.tar.xz 1924264 BLAKE2B 413b52e2d56b8da573f23def0f2f
 DIST genpatches-5.15-49.extras.tar.xz 3932 BLAKE2B f38c4df269bdaca692d05f2b478b3133d5c55810d2e2d8689850bfc50c9eb108943446ebaf44b87889f8619006f6f8789da09137963aef6e08a95784dae65b25 SHA512 9b00de23b1112f192a10284f5dd6f1846d42e3e0df74aa63d58d4523cfd66eea227854aa7088b0389fe70ffb4e945ee7f6e1d845fb299faf0bbd394902bd5473
 DIST genpatches-5.15-50.base.tar.xz 2105492 BLAKE2B 518b28b1244d4a84a02f0a51637989cd20e23e33eb1114da1a7102e8ff63c225e2cc8a425b0f34dea6caf1c14094427c479f5a6bca4f5c52440ee0dfe2745db8 SHA512 4fc7266870ca65f000e7a431757e78b7d2c2c4e9c1e2b39ed5492b7655190c6aba624be30dbcb88bf22c2e19b8a3f0849a4f4c388a406954241a47619c1cd0e9
 DIST genpatches-5.15-50.extras.tar.xz 3932 BLAKE2B 969f23628d80be3179e13aa7b09f19d104e13f656446e00bc4f25f3723184f104b18d835a28cfb16fed9fe1d9be68a274c14e294669beec631257f9c77d4557a SHA512 2ea8a7d58a0989198eb0df196757dfd8141cde484a6c652226fe09b030e12856793d2ec5f139096354c808840e572eaa3a236bf0952c47739ab9c13ba508286d
+DIST genpatches-5.15-51.base.tar.xz 2168832 BLAKE2B f27cc35f69f1a1d5ea36b9e21b3b935fe7c5dfeae4f925390b6df852b838e9d771261d64d252dbc0070b135afdc5713e4baec49965f426210d022ef99156a32a SHA512 30b2644ca4c40fc1c1892f022cf169dc180b996abe184d78d4831c435319c840d9f384260a29d1c38b8acaa1c2923a1c52a7f742d7a5f3c309d01dd76a485475
+DIST genpatches-5.15-51.extras.tar.xz 3932 BLAKE2B 14e232d43f8003b7dfc9f083dfa0a86ad8673d6cc0677fb5d56b0bf34dc76d05b903075e36421add28fa06cc1fe0774437e19ae0211f15dbbdba8e920218fd0c SHA512 06bc24ade088f2c7c0d74e308c90fd4689cc35152cda4019272ec78fe8da9129853f68115d7a446fbb05c8fbffec96b36f725427270b290e9a43ae6652a15e7f
 DIST genpatches-5.17-13.base.tar.xz 713196 BLAKE2B ecba47430d0aeaae2d09d586a9ea016b0b602e2005ae7bf04ffaea7967a7542660dd4bed6cbd5268f187416896c046fdcb7e1aeeccbf293012d11c7473c4d6aa SHA512 fad3e0c53a5bf450dd9dec4146233e322553e110c8b3bd93c53cdb664859aeeb3e5c861f5e04cfbd550014288b7dda9b5740e5d970c443c140c8bfe0559ab82c
 DIST genpatches-5.17-13.extras.tar.xz 3932 BLAKE2B 9aa42ee7af3c16e41f6bfffa91855a8f1949d795fd435f0334d89de5240238cdf5fd14b964236973d3178172db2aff98989bc3626f9ca6d9f9878711fc6bc581 SHA512 1cea0fe9035f02f8099768608bcc1d896234058af984db268bd03cd27e3f12c2ad108b3f6d90be11b7edd53983d19d7ae3a00de87f62c3e80f1eace1cb5660d7
 DIST genpatches-5.17-15.base.tar.xz 769140 BLAKE2B dface984138a5b7f75911c7d6a4b7fcc67349f8adfcf863aa960fdddfb0e426fb0e408cd2f725db8df17cc9d742a68f85e24c91c644b3f0c7ff142fc105fcf24 SHA512 8fed293b503b150507ecdca6d19011083cc1e3e5caa9ec4bc8527e282892c2dd35d24b746403d2b6a746586b526ee07c2fb50e97024ac409d03aefc50c372aad
@@ -28,12 +32,18 @@ DIST genpatches-5.17-17.base.tar.xz 823112 BLAKE2B de53871be24c0c7257de3b2ac384b
 DIST genpatches-5.17-17.extras.tar.xz 3932 BLAKE2B 8c858ea2d37aa0a60752e051af6a400253e79ad69eb186b5b358ef398992ee62bbd9896c68db0c5e16981ad020f24718f584e5765c6f16d4eab3dd6651940404 SHA512 1a032cbde503850d3ad3a81b8f4fe845d8cd2bb7da6979a676a4c4ed641ad9bffed6cf89aa870fd3f1e0cb9569668a431d7d30ff049ec7c669a06a11896f6c10
 DIST genpatches-5.17-18.base.tar.xz 1040972 BLAKE2B 71575497161db10073de3d7db41a8cb82a063ba8e175016e411f3f6bf822b810c1de4172a47acadced51ac750aa90f41aaee040f85e214b7f92d95b3054e660d SHA512 fe5f8ef1e5e7c662d0c7a6836a195bb07dcb616bfe6417c8226825a0db6c9727ca323840edb8c969480fe967e5f7ef9244ce14df14f369b620e4a2e60742dafd
 DIST genpatches-5.17-18.extras.tar.xz 3932 BLAKE2B 754c044fcf38d26a062d977505b3a25f663b90f1cadfa1aee524946aab3b84fc08463602bb8d5681b3303f459d6180e43bd1ac25b0c830f3163a9b8cce5029a1 SHA512 f135e3724cd1ff190d3d117c4afb5559a8908e1483e6be3cd783c42c05b8c4ae5b37c0a1537fddb88ed800d9faf4fa8996641201cf0a6891e31be2a3dda2c558
+DIST genpatches-5.17-19.base.tar.xz 1122576 BLAKE2B 62a8ef6da90d967676754daec496101b7638c1301ab5bbde5d94f8186d66f7f5672c55b8f97ca64cef9a83da00a46db7ab804cadff62d3137ecdd2bd41885be1 SHA512 b5aaa9013bf2372a658e885ce37e3171077002881e95bd81da87ff1a69645d4daed0f7717b4d35441f25ad647dcbbe92ecbd01318eb449101bdc415409c60e41
+DIST genpatches-5.17-19.extras.tar.xz 3932 BLAKE2B 87ea5b908c969c61d8da8067f13f0b674a4f72c4614b576a5b7648cf6d6880e88735931314faa43a3f4907c4d75baa3f705908bb609b95af3d9de582dfc7989a SHA512 191eed3aa27c2a2dff28b79a45db4d2c703bc45f5f63eaafbc6229541138601b6462df8262d808fcb5155eb7d632aed85e26d06e13a4095e305a493345dd02e3
+DIST genpatches-5.18-7.base.tar.xz 431972 BLAKE2B f35163850c12f2610d487c7ed42b80b1f88b982f10476124d6e19b942ef1e2a012100325ff98807fa3664adc62116e843cc584d068335767c374d29d24f33b76 SHA512 9967d15c984f731dbfe7fb7c9bdb1270678efb565bccde88dd9c4bde6b3e93720d52c96db943110e07aa257401431e9bdc9f4149f9bd1cd983605ce369277d0c
+DIST genpatches-5.18-7.extras.tar.xz 3920 BLAKE2B dac0cba1f0a14780c6b8af044fc505466671360b06bc15c3ea1dc4b69ed1ab3978030d68d8417b52b972e7567dea8e42cdf3894b7bd86420bfdff3e7afb075b7 SHA512 cf97f18c7bd726494c0091303101ab3bee99cd9243a681eab4460c4f0c9edd5b03e23be3295a828f2eaee0af35d033eb8bd468dae2d981afba5af47a7ac20020
 DIST genpatches-5.4-199.base.tar.xz 4683396 BLAKE2B e1e66ce10c436bb196a5890e08d5beb8d0a1ece7f19f8fb3b1027747509cc7b6102ace634abdbd299dd48fbc8750f3bc127abe55014410b1d558b4aec497f475 SHA512 8a16d67794e864749fdcdbf413ec0fe996d3c4fb5f04f8c8a2d3001377c8b5d4d7007a96efaa3590fd4b595cccdea36d83c6dc292629566e5398f322658d80f4
 DIST genpatches-5.4-199.extras.tar.xz 1812 BLAKE2B 03b9ebf9d306256e58c895006038f4bb3d908590ef2f603487d9b970963c24acfbe78fbe862b2b493ab477e6e901aba332dc69916eb881fc42a79a62d7f81da4 SHA512 d100e876a9b64d662331d4a78b8531a71144bb70b789e0ab0b76e6957c368ee3a88025e040cd622dd4cf6e4da358a3636571ddf55b94e42dbc250a62a629baee
 DIST genpatches-5.4-200.base.tar.xz 4700404 BLAKE2B 8420d667947cf912a8d6419581377b5d7daea5a3c03e333403a4c0d0d55200afe4bd7f379c786ff5904c8f1cd1d7735cb7df95a5a5aad93fcb8b90a8750683d3 SHA512 771883d2b15e92dd5e2ea31e9566d3e1d210389323521be5af32fbea75c168d17e947bf004eb515c54f7b0880fa12fde236045bdeb35e08aec8b54465cb253d9
 DIST genpatches-5.4-200.extras.tar.xz 1812 BLAKE2B f9d3d87c5aad19869ae7d1c82e1303ce62b5f10cd15328e4839bf7a7b39a2f571ec8b47dd65afa48f8d3ce98113a150058c59aea869f717a0f89316074af1d83 SHA512 17ce2facd53633f3059d9472a076fc57e320cbe802ea853fc91734d88e29a30b54dca75e78c7173d3333be5b96add590af89b089426059728473167408f65e5c
 DIST genpatches-5.4-201.base.tar.xz 4708884 BLAKE2B 3d6d82c90f3b8e2cffa9d9c1cd5bbe74536d44cd42c5d870272b8e87a2a99f16d338f8c28511864be87f739df53f3bd3bb2f7313b4b04f78fac2057778d5d439 SHA512 5ebe9454b61142e87e5384a5718399c4c99b059a8bfa0db638f20f2157eb2f67117d58f4d046bfed09725ba809686d93a382ce1acd63520b16ee1d8820530729
 DIST genpatches-5.4-201.extras.tar.xz 1812 BLAKE2B 4cb4f2605dcf2e374521931bbe92026246513251f53c94494d076f7da87a85dd5a2c27f4e97e72262853a90905a4a7b2d842258eeff573a8a3292fbf30c35c73 SHA512 a74d28f5014b43422cdfd8ea7a08b71faa6f0243cc1ea409e199d81e995e14cb6a849d3624bd766cf31f12a44650945aae645f37ea98079baa1d7fca6c89981e
+DIST genpatches-5.4-202.base.tar.xz 4790140 BLAKE2B 2ea183e7c63ce48f2d418ba4606782eae8aeaefac556f93a9e3358d1eb62609f431b973f0d54c006cf723e4172d73a549ed00229a82dd4f1e3717951b0cb8a3b SHA512 29f6a7c0fc679273180637cd70791b19dd1a6a87f66c46a29df2ed5fa01a5c043202853c2becf6050f4cdfed0e7ef2a7dcfbcf934623b85578a45ed3746a2fc9
+DIST genpatches-5.4-202.extras.tar.xz 1812 BLAKE2B 710012cf071fc8e65775bf36c372bf1d6743824061e8ba42cce58440dcb4e207ba5a97eac16e19c0898b991cb39e327ac0417f90e5b8affad9937c7030361e60 SHA512 75d828543b8a15e32bfde13e1fef6fbf83440344464245b77e401a69968d33de459fab3bd7668838650cca9aea3475139f3206001a119463475dd091bdca2a48
 DIST gentoo-kernel-5.10.117-1.amd64.xpak 65753983 BLAKE2B 1545c71484a187bc84f8bc14e8d572b614355d5aff1cdd8552575090deccc8e30024ab45c1a0592d34956cec402a527b41963b9bd9645b84a2ba3760b53d44c6 SHA512 536a8d9370eb97e68d1d3f0f632addfa7dcdb48dd8bc2dbd76a00d44f1456343b1a4c9646f4b5733e3583efda04b75f2b19a165c4aeff327b72201101e6ac618
 DIST gentoo-kernel-5.10.117-1.arm64.xpak 61048114 BLAKE2B 08e37c8b83d635b1ae888545a461ea594e2c3dddb41749b6c5a95712908900a09ba882ed6fd4c506cbffe144d14b8aad31f8e3875fd425cac28bc82b55548cac SHA512 a5b3f6fd37d3ae286fb352b125589c56dd2cc32eb92c8e4898189a717fad72725c625ae8eaf17c256fe1bfcce2243687c71f65eb5504853045be4486980cb00f
 DIST gentoo-kernel-5.10.117-1.ppc64le.xpak 55790781 BLAKE2B 6ca8b20f665b9d459524ac468fdde6f270d51c0148765d4adf194529323254e3813a9914bed797e6c4e33f110682f9a65bb3eb353dc391e4d8b23c49c71858a1 SHA512 db9e26a582bb14611b19aa867cfbbfe974df076107a11833e72a9c2c4ad6e3fe33c32d5b4d26c823a1ff4fe42382c5b4e0f139341b6d3fc030d048d8cdd39c8c
@@ -54,6 +64,10 @@ DIST gentoo-kernel-5.10.121-1.amd64.xpak 65730847 BLAKE2B 939734688bd5833ba7395b
 DIST gentoo-kernel-5.10.121-1.arm64.xpak 61063579 BLAKE2B c107b3e2e40588b32bbd4932b3394032de6c3bd4ba9b60fe26bf153eef721f78beb29c0388a9c5373da8a90f2d6da897f30be364e3c5eaa19494848b8c6cd9d6 SHA512 b8ce380be7e704a064303b5ee5024ae25e5e1b01327b39df9e0bb808289dea157645cd4a8b96ba4050cd34ba0521654d7a2aae86635f54539348b7b1d85face9
 DIST gentoo-kernel-5.10.121-1.ppc64le.xpak 55835020 BLAKE2B 9a3efdac85fcf1769fcab6d724113fce8861d03d7e8d10896f53965d5f4d920019b14e9e697f2e47bf3ecbf53d2646dfcc3891ffaec32eeee08df85db7039042 SHA512 20eae911890d7573209742a081c62c8e925715a3a51de93d35c1ddf1ae863970deaa658f2efa06001ea2640c580a712a2cd07d991f8e32a55dc12d71a2bb3e86
 DIST gentoo-kernel-5.10.121-1.x86.xpak 57404240 BLAKE2B a3932083414fb97fa908765ec377afddeeef4cadd392d10ff999a6d9182e449cc6875b78c7e0e0b43de3572bb422f7f0dd49e3f7688c40cd78c5776214f5b745 SHA512 8a7a46c97ccb71302a215fb724063c3217bff513f24b12916e9f6447d1b9be58c7db30c75c70664cd31a1210751396c79485b7bfd3a87f59d2798b1f54584434
+DIST gentoo-kernel-5.10.122-1.amd64.xpak 65790411 BLAKE2B 40a40ba6542621cdcf5a743af4f82a4bea0af13f0e91cfad100d5e555aa74c618451ce584a5d79e5eb1c28ac64c2e1cb0ce7267a17ab5ad4da8d825e6bf99c41 SHA512 86fac568910c740e3dc2b03586b52504a88107684f85205a7f9cab947d7b5d247f6c1d635f557dd0bae57f374871c2f7085b031f28e151f9f44ca30256d10a97
+DIST gentoo-kernel-5.10.122-1.arm64.xpak 61055506 BLAKE2B 64588bdb186c385fcbd6073fb8a41060cd4439ad844b4df5213cd032a117fe32ddce3e0209af6c944872ea4a6c8077b5538522f08842125b9b93d4f5723e9133 SHA512 9c356bc9c05fd33af9fd0136f6019027fa0f41495d9464b374a71af23a66d662a7dcade5a3c3beab185a8e0404faebe871dd98a1c4347b89834244f5595caddf
+DIST gentoo-kernel-5.10.122-1.ppc64le.xpak 55843098 BLAKE2B d1a41b6dc9c81d7c49e58405666708f5f3216899440860d32f0655acea04d23f7a9e0db5d415cf3a93e0e40ff4586af0b52eff7371c7d06ccd0605be51343788 SHA512 a99925b5e659caf6756461453b099cbea9d28b47ccd0fd2f975f97d006478dafe2522a21679839c9b075a5fa1cc5a741f7bc18dfd738c67aa0e1ee5ce92a8b5e
+DIST gentoo-kernel-5.10.122-1.x86.xpak 57455290 BLAKE2B 9db42c0ad71207471f116b9eb0555e96d456cc2a583247d20e21eef7ac49e79bbc44e05a33e0313bab225b09798034ae8355f8bc06003f2d8d6ed74947dadf79 SHA512 4e2aecdacb45cd2fa9bcdacf84b3ef9abfeae25419d8a39075a31b202cdd130600112699caeafb91d6803d1675d82be72548e000e7a4f2188adf383f7f86b15c
 DIST gentoo-kernel-5.15.41-1.amd64.xpak 69349403 BLAKE2B 37462257c705fdf3600bc45d4b6b5564346457105ae7f7ba4fb655a8a2b7ff91422063052ccf1047cf0883977d4e3407b11d0cc604b68cc9ffd500503dc1f017 SHA512 f480c67532576e5dac934aac7418e3eae3b23b9ff73645ba9243d67412897307ebbd798edc1b195112cbc5f84545915dcc8a9004754e70c4ff56b9ff94f9716c
 DIST gentoo-kernel-5.15.41-1.arm64.xpak 64219270 BLAKE2B 0daf5fb63aabd71a4e37c1c8ac0f101957366ada93143355fbc4924bd67611f6c6c02cbf37eefa4524f5957c5374ce548bf754f701bdd8543112e3ae25a58c90 SHA512 d1cd5f83f7a759dc4263f3fc524e1cb01f2ac025eaa22c18ff803491a5a599c3f67ca8e06610fe1d7dff11b48f95abd599d729f53f77107b7560b2a1b4d67221
 DIST gentoo-kernel-5.15.41-1.ppc64le.xpak 57887862 BLAKE2B 6311a4bcb222baeb0a9d0a4d52ee33c6b06098119e0b154ba2829fb88fe12a1085b753738ff0adaf7b4d4bda9aa119e3fa599eb2be85d3a8a3ae6da2bdf29b4d SHA512 fb2a8e31f39c7282b7b01161ba6823ed96a8662bd741e8960bdef2940302bd8354973185406f10d20df3f3a9dbb1b8b04e44d6d6ae3cf85351654c34fda3d273
@@ -74,6 +88,10 @@ DIST gentoo-kernel-5.15.46-1.amd64.xpak 69316089 BLAKE2B a7eb5ebd27cc829fbb8f499
 DIST gentoo-kernel-5.15.46-1.arm64.xpak 64255178 BLAKE2B 56c03ca98e72a5ba103952f9b6a6ce750d2a528c2a73329e2286c263668f5b8eb1869d0622587a2d452c00c4e2cc179b88c67a28f5d04a9ce135e06afe3cd77b SHA512 faa0e1805438bfba0dfae422d34a5553ccac1e196e57a8e4cd77936ddec33f27cc0bdb9a0e84b96fe14f149828303b80324372c0f1df82af658ee53eb5ad5c07
 DIST gentoo-kernel-5.15.46-1.ppc64le.xpak 57972210 BLAKE2B fbd46b3333f57a183c8e64e77e4c9a2ce324fb541bcefcd21b7e901173bd0a302da0ce47aacb7df5e9f5fd7c38b091dbbe8ad5d4facf64e002caaa14ae8172a3 SHA512 8d1fdf5cdbd2a6d567852d9a1bd0d68654aab671bc4a37e9c2d79f2038f604c7ec48a3026b03aefc6ccc47b0355e2a1de92bf7de377903dd7756c1ede7df7451
 DIST gentoo-kernel-5.15.46-1.x86.xpak 60054201 BLAKE2B 10f44d6127ae59eb814fa06a01c53010452b3e819b6cdf0c54bd89ec80a0165dfd7bd95d3f061ac45450c4b6011817f9da24018d8ff40c0331dbb2b2a928d146 SHA512 59d4b059eb5af43cb165251f7f82821830960421a63697bc8b5ce01a48f15e86a67103ccfdd8a1758cfe6755c73642c6f1da60454976f22e42f46e6bb35ffd27
+DIST gentoo-kernel-5.15.47-1.amd64.xpak 69328608 BLAKE2B 64f41f838d72ead30770ef921b82bd3799832316d0fe7c49db7bfddc1b3eddf41f0068e99e458060e2d19e172c6b5b098580fd482b03df3329651803f92e3345 SHA512 73f59b9c662afcfd929e9354c2bf67c4dda419606b4bac6327b49a0138904675a681ac7708d7ec70eb9d6a0224ce601a1d0925ee7ee9a0595c98d1b48c638ca4
+DIST gentoo-kernel-5.15.47-1.arm64.xpak 64275400 BLAKE2B 267fcdb7b3278f131986494a38d668d5531cab0d1c7ca9d2d8d535e1c2f189766e2308a87ae93dd0ae92356c161f8a379f44fc61710e4363a14fc582d59ba6ca SHA512 221c8059e0200fbd09f6fb54d5aaf37ead115490f4503e972a361c8fba7b16c2657d770475fd770b17cfa7f99b13b7d641c867f6340e74f4c353f291c80a98f7
+DIST gentoo-kernel-5.15.47-1.ppc64le.xpak 57938919 BLAKE2B 4b1d65e3cd147a92c2fb73681195496061634e61293ef6f7d14c22ddf01496e98074a2854c18790f0e203b29a622e878b3df341b3995765e048a6a8bbb2723a1 SHA512 7d79fd8f8f76bbfbfa27493c174f628ed97c4b1fc21430902591a796584b4bc5cf9acd0988a176b78a5d8fb6d48d89b9322460909cb0d42bb85c593a1c286db2
+DIST gentoo-kernel-5.15.47-1.x86.xpak 60121310 BLAKE2B 816e8dbcc4929fef3c579a6cb7525a27f590928d9f454cabb39f5094f898cd6e453c9d1a7d1c8ec1ce6de8b8f81dc890e931d01f8836ec34f75f2ec468ccac69 SHA512 e19cea9e28658143fbdb35f34786562bfc1e5fcfeae3fee5576001531261fc7be1fbe041c38f7e8ffc194bc8835caa6fc25f85fc0ec0cf8b78c0273a3879899b
 DIST gentoo-kernel-5.17.11-1.amd64.xpak 70396924 BLAKE2B 55c9baa3d8048dfe4ca5b384eb96820ef29ab00adea2f19ec40342af80dd1f5a87cdfff8e9f48e74c3cae72e35f810c37e7ea11d4b9e4250fc2304884f4ad7bd SHA512 7e73f9a63d4da4311a544b3f35dddbbe5b06d2483a462441b479faaa3513d02362a27266da93d577c43b972c38b9e8ff838db228802d1212e3036ef6cdd68815
 DIST gentoo-kernel-5.17.11-1.arm64.xpak 65832464 BLAKE2B d03ed7cdb970c02814f903d1ab728138bbc55d0ee39dfed1d797ef5d8cb097f2d4501aecbd582ccd6ad0fa678bb6392163205e7ec488b5899dff5159080168f1 SHA512 1de69d8db852aad7aa62f8ae9190038ed1ee0c337bcd7ee74a0882ec0abc8813eb37a8ab43d1a0379b94c1f2b60ab47740cc9a85971bb09aff20f7cb5c3f5eb5
 DIST gentoo-kernel-5.17.11-1.ppc64le.xpak 58784154 BLAKE2B 6694c16997f231c8bb236988d6476405d581a0c2401c6c8a2c5806194da679d78d3ec059b6308f32cd0da570c91acce3441ac8329c340fa2d494e6765ac9944e SHA512 aabffde89bdf2e39a45b49cfcabe47469df80ae1b2652248b89d47cf8a735f3b59f8274b494dce1fba35ae66ed45216146cbcff53fb13d99cc33323d86466a2d
@@ -90,10 +108,18 @@ DIST gentoo-kernel-5.17.14-1.amd64.xpak 70828706 BLAKE2B f53df519ffc6ec7962c36a4
 DIST gentoo-kernel-5.17.14-1.arm64.xpak 65859553 BLAKE2B c643d487b09c26ee3da7930b0c3e290e82417206eb3aea0c0ea35191cbc1582097fd2139d66746f522b69320c9ec0bb09ceb001d11e17af31aba1a69654501c1 SHA512 edb66cc71e8c2b2555024153fdc09be0de08665511f77f0f7f452b6f4fdb208b09fcf810a238a832b1c9876431a9fe4d292a4c2d5074dae65e81f83ee68aec1f
 DIST gentoo-kernel-5.17.14-1.ppc64le.xpak 58914466 BLAKE2B 70ecdf00b2efce7f555f903a17cdab45b53d6908d0841ddbf980f66281816d9d4c278ffe1c91e39cd14bcde159fed74899f9fb969f307fa6d968ea94c859440c SHA512 c631d8d0ed01f75660bbd15c0636f786deed018d4cf20921ee6a95aa0cef97e568c0490a7bc9749c864b252a458121f379f6d58bc49953d0282e60348a74dc0d
 DIST gentoo-kernel-5.17.14-1.x86.xpak 61133322 BLAKE2B 509dfbad966841b7c76a179297642580cbfb7b61b245258629d3af7f7bc6df49c86755368d024ad7207cbf3bdafcf1332081bc92011f62afd60cd62049dc6d98 SHA512 d4a060fa5f4dd257e0168aef29bd865ac544064655edb6c1254613075cb7a480297aeff4ab03d5978d5a832d1949ab7976867371fa986769ea6e1bf75cfc5392
+DIST gentoo-kernel-5.17.15-1.amd64.xpak 70817881 BLAKE2B 71015d24f6577fee0f3d6596a2fbc46b0eb79e34c2806f2a9214d58c751ccf7d9381d57377279677eb61eaf4dc7448547fc6316fcc8b25279e27e2332a671aa0 SHA512 8c01b5dd56ffe038ea2241a00ba4d826698a67ae45b9301631e6d6483cd86509be2de707aa38ea5cde7a95d33db60cb5cf9b5dbc1f124e66c1c89fe5f9ebea80
+DIST gentoo-kernel-5.17.15-1.arm64.xpak 65922409 BLAKE2B 1c31628fa3b7088f200ad162472a1941f22079b4a8ec1e635f9ccb298b2902dbc2a7036178c714b8dfc5588bc102e474c37115c98d5c9c077fb6ed94c2f1318e SHA512 1194a254f202f6417fc9d94159df0270de1d16b8a214ed2fb7383f9c288a65af5ec6e4b148f01cb5a7452eedad931507c9baedee24882500c71c89608b190b43
+DIST gentoo-kernel-5.17.15-1.ppc64le.xpak 58700395 BLAKE2B 67827ed6116cc3a5c7b5c6d1130edf764b16f22f020b4b66c90fb3494a6eb3dede8a2802b956dfd58b3429e38e17c1e79afa440c844da595ba9863abe956d69a SHA512 c3d959d626fe5f7b1c077aa9e5e5721324cd5f8044fb9bcceb6c67b4cdc98bdc98f953abff1a14ea5068a77a0390b2c92be677b28aac9d9bb11780532d633cfe
+DIST gentoo-kernel-5.17.15-1.x86.xpak 61236477 BLAKE2B f2e19e0a087f866aed20e8f56f940c1a3489cde99be1a47ebed5397fd40cc8aae186688d6be77649d62a588e489b4edce828158e0e5c326056711017e8ba71cd SHA512 4d9905d7d289d2ac47dd887c54aeb3da7c975c76cd9e0e4dcb43ae824bfafc7a36935568f706863f444077d54f03c394aa47f872a6da70dcc6a0b9435ef9f64e
 DIST gentoo-kernel-5.17.9-1.amd64.xpak 70359753 BLAKE2B 42994479de1aa72a97f73207406cd47986c7d0c545d681b00ab3edb380fda1d34fe032360868dea6099eb69507ea4ee9a4401e37139460ce4859359372627c62 SHA512 3521ee3fc95d7ce6e6cfc1f68bd46956df598b416be176d97b01f914843f9071635e21cb7e7b3d29fe29426aa5ee50ee124430830e64b6f670ecadaf8f58b957
 DIST gentoo-kernel-5.17.9-1.arm64.xpak 65823951 BLAKE2B 648ca1341d90acecc50e1d021df9665a8ade52e6f77e8480638c9b411e835f3a2c5c50089d42cb560a19e2c3f0777097330867a6f15e21aa8a282669895e8ad9 SHA512 d36d663220171939fbc6eb25b99375c2ae8bfeb06ab3dd8f61ad864591a555f287e687261e9b31c6d180399ea5fbec6ca5690f8d894bc0f8266ed7cfc9b192e2
 DIST gentoo-kernel-5.17.9-1.ppc64le.xpak 58892612 BLAKE2B 0d64511f201af38dea549e22526f9cc87069dd6e2d32be5153bb258cbc3d71bdc8b399e73367070c046c33a6ed6636ff89822b0e7ecbb2f97a7541370a7eb4c3 SHA512 4e8e1f35828d44dea9bd93b46b923137bf61049454720f8778ccb9d0d8495f14806738591b7765ff4c0b033f94e9b866ab91f845c91cfe9c414d235eae306b99
 DIST gentoo-kernel-5.17.9-1.x86.xpak 61107339 BLAKE2B c959248dff929efdc0cb4b7fa6646071c70fc24eacfb0f981eefcb3be7e4ac8aef97bdbc5a69e2d736ad0ac2a97ba9d36f2a7d7d6b0e6051a989faf27dc96158 SHA512 4340bfbacc47f52865613ea4cd787c8cabc3e3b65eb6642b03f45a1a6e14a6148c80c006519bbf6a04b7025d3655102b92398358ea57ba9c987d7872f3eeaaa6
+DIST gentoo-kernel-5.18.4-1.amd64.xpak 71621077 BLAKE2B f4b146c82019c6882279eddb5ad715928a7866cb2492a742ebef4db6105d2ef30935ac5d8378fc4cbe674ed65355abff11bebac00e72e988f743a2d4d4fe2c1f SHA512 e99b3e062253ad4e10205e07363d307a259124adb3c0656addad8cf82bbb722c63bc6ce69f39c6ebb603a756f49787e9a7f83b9a56055389a2fb3f80e83e757e
+DIST gentoo-kernel-5.18.4-1.arm64.xpak 65220466 BLAKE2B 956393b7c2cd78e2f9dd4b12295bca1025e28eb9a28cde28abf72c5af2a321d539ccf8b8d236bd812e4053973653dcb823fbb486a99802f4ece982da405cb6dc SHA512 e9ae268b88319bc1b2ba078b47568deb2cc75f151e92cbbbd718a98f02b63973718edfbe02940457bd9cd89fd0ab47e2b9e15560c10c0fb3bc4b253532684687
+DIST gentoo-kernel-5.18.4-1.ppc64le.xpak 59281512 BLAKE2B d2bdbd8c9c3ff97d4076edb50f1376813f735a477e0f97c06d7c132b447f2855b93bd4c2395d6fd8c779a611db12b2e4c6d93ceeff94cd2fd0bbeb90fbdaedde SHA512 a433d19c9baba72d2cc7046b1241058a9bf05f3939d224d849d1c480fb0572c5a4c91b9b1fc55fad6b7c4037936e01ba030f584f09fbfc0ebb0e6db3ae6bcecd
+DIST gentoo-kernel-5.18.4-1.x86.xpak 61790562 BLAKE2B 44d41a42237afa621993b81d1f137133ebbca58891b100b9a056b1e6c3f67395a286d74c0fbaf68c57c2587aeeb37395f057379486fe7c33435f65eeac750e7c SHA512 c8e985fcb1ccb1cf8e852ffb8bfe3e025ded96cd7550027c2ead81d90b26b00b1c09f33405e131e3b41fba36f1d7e76f175894f54d1b5b68fa3317b852e69263
 DIST gentoo-kernel-5.4.195-1.amd64.xpak 61565615 BLAKE2B f0cad2381c28fd37bd9be906fdf2ad8a27f509e0ee5dbdf3b4634e100060c7aed60cd51cb9358a705fc6866b26374d95b47d22390bc400993bd3c48b11953293 SHA512 714528249af3914c5cbb9d2a040743195f2b31310a961f712ee48e936f9d45038cb5f7873376b8600a68062878506adbd7cf82c3711614264bab4301a502b773
 DIST gentoo-kernel-5.4.195-1.arm64.xpak 57777950 BLAKE2B c71a60316e4ed106716b942b1e39d9d077c88b38a54c60b571cf6c6ebbac6b9e4f509f6c5372fa2cf2a464198d479642e3543672011ffe07b607ece1ccc5c554 SHA512 48a51e86c7a3927036db11da66bdf99d36c7518ccdf4566da5c145342567a1909883ed375e633510fda532ceec39b552a9bd6d15b406020d78777c686a4c41f8
 DIST gentoo-kernel-5.4.195-1.ppc64le.xpak 55046362 BLAKE2B e99110bbded6458dd3f1c28c4a7c7b3dee759a7aff41fb7f065fc5a15dcd9f6774318dfffe70ecc88bd4254bc028b1a4d8b80ba1068c3d8fb0706e4d4eadee8a SHA512 a5033eb68b7800401dcf078723607870a2d913b2ea8cee2cfccf4a4e08b67f469f8fa07c14904c2ea2d0a033c9c4d65641efe45cc647f0f656d81a74cd6fd8a1
@@ -106,26 +132,36 @@ DIST gentoo-kernel-5.4.197-1.amd64.xpak 61551217 BLAKE2B bc167c2122c7782085bfbe0
 DIST gentoo-kernel-5.4.197-1.arm64.xpak 57767449 BLAKE2B e333dfff1a79d39adb243f3c3afb08429cbc6a2244272a56a402735dcc45cf7a7d64ff42320e7f4f4a9d1f4b1ba5a9ed449cd58f3ec76cad89aa584c85e3a037 SHA512 28dccdd59ae1fbb178df849565ff941fcb7624b5b6a051787aa73120cfde694f265e33a30cb0e60016d99e6a019d3f2484da86e642dbcc150ed1c65498cac787
 DIST gentoo-kernel-5.4.197-1.ppc64le.xpak 54931909 BLAKE2B 6785786d50f751d3de0109ac8bae4f198b64d2b9c77e635d857ab722df9e82e5091e273c7d641e13a76c3bcd11083d9dac70ee8b43be0a096a7b7d2bdddaaef4 SHA512 b0cf362ebda1491b2705c3d12603616199613e83a29ccf4c692515ae0db0a5063ffc24d35af9995be3c944a36004d7af0d50ff44cd2e0d6701cc68e311d52c3c
 DIST gentoo-kernel-5.4.197-1.x86.xpak 53263398 BLAKE2B 554818067d322396837b47041a8062b2fcab81c146a982c1f448f66653c9d133f3635764ebde21e343df49c700ad86aa8d57e01308c3e7d137b8fe3e763ea393 SHA512 765fb52135bc9a71d4f3c466607f8b5f8a98618aadc1242e1d0efd7658163cb2ccb6169fee8cfdd892b74306492e12305452e65ff9107259c6ba5ef980da7290
+DIST gentoo-kernel-5.4.198-1.amd64.xpak 61601794 BLAKE2B 3e9c48be77bf4343a57b94e7a71af111a89b9bb1138deb90855c62d8b0f97bb3fcef6a56d61a257e5ee2d54b0cd694cc3c39f385bbc840d3a933059eddacff91 SHA512 ecb345471a981aa91ecdc3b5fc3e25fb01bf19bef62fb146ce7f11d960e05f80477a14d4d51f1e122934d31705231e827e462f4dc65891c49bee77370d418b03
+DIST gentoo-kernel-5.4.198-1.arm64.xpak 57712035 BLAKE2B b77edc335a015b0b681021ef6305dc4b0e16b2bceb5a5e4b3aec459d70ea91990c771e7c3ee059f112a20aaa987630ca9aa15ea1d8570dd7490738d1833af7af SHA512 74889c4f1f62b6bc0f08be5a0b985535e88f4b933bf243441232c5cee297a20174a91a2b6aeda2275de5898b86c3831c91c42ed7987ffcfb488cc4c5ec670973
+DIST gentoo-kernel-5.4.198-1.ppc64le.xpak 55020080 BLAKE2B b98e4914565db67a55bd5b1e2ebcc2b3423e10c807bb0b09c7c43daebb5b9a8a29a08a6316e50cd78197644c3f4d0110f90fe6d6500bd67404aeb1bda538fae6 SHA512 0485d8b9d5f843e2efc5f10cf7f8991245fe4f9e529fcb4039da13581bab99681388330242414c3dfb2217075f420490b80d6ba49549187c960685bd72d47f25
+DIST gentoo-kernel-5.4.198-1.x86.xpak 53310006 BLAKE2B c591705391f0b209b0ace112d0f4d42b4eee81ad59e790f9cd9ec5f54f8c396c273d4c3dae192bbd79114f1938f4bba4cbd570216891bc8aa909ddf0c3ca033a SHA512 77da9b728272f522866f34791c66ddd170d29cffd71d6276f316f6febbedbb35a4c4ffd6990b9473ebf9eab645e887a1815ab54280dd70fb1ae050b87c4dc55b
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-5.17.tar.xz 128399340 BLAKE2B 82dc4a45cc25c781ac67aa6ed1e4c369544154960f41c4634d47621f381159687a227054976d078524cda28884d395a15f7542fe44ca74ce98ca6ff54a81d6d0 SHA512 89f0a7ca69d20a539d4b612a7028a30a5e98b402e4b6b88516f14237e5da4b626d7929eab8b40fccc90766e8f3bae87e9858a19077ffad20d8204acf18794f5b
+DIST linux-5.18.tar.xz 129790264 BLAKE2B e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb SHA512 dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 EBUILD gentoo-kernel-bin-5.10.117.ebuild 3177 BLAKE2B 5e9cfaf3d6870519944876ac6339ff8feb192331a2f32518c70c78970f3ba72b653e8531c2b8eeca4cf8940d2aceee77845020aff6832fb43d3f1bd0b460a85a SHA512 afd4cb42bdec8ae814780273f84f73e3e7dbb9c4d0be890d829afbb4ec8e72a6e642f6c1b852e76c36f0c910d61a69f6b66cc7424e395efc88c7983ccea59034
 EBUILD gentoo-kernel-bin-5.10.118.ebuild 3181 BLAKE2B df517998c1165deede98f869bfd2851a1b797a6a5f8b70cb3c02401f703c77abfd379ed0f3f846ddec463eb0ca3bb21186b44cb9b722720b8f6c463bb0df0626 SHA512 7eba790dea41d43118ff3991b8fa2e65cc3f4c2b7075df992a1cfbcf312ba5cbdbc1fffd631851ca3698bbba565a211026c8c28e87e0fc5191f60e55fdc8ffc0
 EBUILD gentoo-kernel-bin-5.10.119.ebuild 3181 BLAKE2B df517998c1165deede98f869bfd2851a1b797a6a5f8b70cb3c02401f703c77abfd379ed0f3f846ddec463eb0ca3bb21186b44cb9b722720b8f6c463bb0df0626 SHA512 7eba790dea41d43118ff3991b8fa2e65cc3f4c2b7075df992a1cfbcf312ba5cbdbc1fffd631851ca3698bbba565a211026c8c28e87e0fc5191f60e55fdc8ffc0
 EBUILD gentoo-kernel-bin-5.10.120.ebuild 3181 BLAKE2B df517998c1165deede98f869bfd2851a1b797a6a5f8b70cb3c02401f703c77abfd379ed0f3f846ddec463eb0ca3bb21186b44cb9b722720b8f6c463bb0df0626 SHA512 7eba790dea41d43118ff3991b8fa2e65cc3f4c2b7075df992a1cfbcf312ba5cbdbc1fffd631851ca3698bbba565a211026c8c28e87e0fc5191f60e55fdc8ffc0
-EBUILD gentoo-kernel-bin-5.10.121.ebuild 3181 BLAKE2B df517998c1165deede98f869bfd2851a1b797a6a5f8b70cb3c02401f703c77abfd379ed0f3f846ddec463eb0ca3bb21186b44cb9b722720b8f6c463bb0df0626 SHA512 7eba790dea41d43118ff3991b8fa2e65cc3f4c2b7075df992a1cfbcf312ba5cbdbc1fffd631851ca3698bbba565a211026c8c28e87e0fc5191f60e55fdc8ffc0
+EBUILD gentoo-kernel-bin-5.10.121.ebuild 3177 BLAKE2B 5e9cfaf3d6870519944876ac6339ff8feb192331a2f32518c70c78970f3ba72b653e8531c2b8eeca4cf8940d2aceee77845020aff6832fb43d3f1bd0b460a85a SHA512 afd4cb42bdec8ae814780273f84f73e3e7dbb9c4d0be890d829afbb4ec8e72a6e642f6c1b852e76c36f0c910d61a69f6b66cc7424e395efc88c7983ccea59034
+EBUILD gentoo-kernel-bin-5.10.122.ebuild 3181 BLAKE2B df517998c1165deede98f869bfd2851a1b797a6a5f8b70cb3c02401f703c77abfd379ed0f3f846ddec463eb0ca3bb21186b44cb9b722720b8f6c463bb0df0626 SHA512 7eba790dea41d43118ff3991b8fa2e65cc3f4c2b7075df992a1cfbcf312ba5cbdbc1fffd631851ca3698bbba565a211026c8c28e87e0fc5191f60e55fdc8ffc0
 EBUILD gentoo-kernel-bin-5.15.41.ebuild 3177 BLAKE2B 201c1a0c3a7495f64a85ffe689bb561b5c1005b1b90fb3cb89081f578e669c54c89c0175f14cb8be1b079b16936c8f47a8f080d7c48f558327235d2a053b2483 SHA512 0b94554822df70fbf22eb2cd314d77d989f063ea7954f350fab0af068cbe0f1954bc254616c6be2ed8bbfc1e2bbc72a1b995871f069cd4d6e5b5fa1c4edb306a
 EBUILD gentoo-kernel-bin-5.15.43.ebuild 3181 BLAKE2B acde6c67fffa096bf28ca6fc3efb99c05ccfa657c2cb13abd96e7f9a05bfa3271d839ea791e98a2906714418fd7897ea54408bfe28edad8d64e686a3873fcd38 SHA512 9557e38f9fa538002dc4331f05e5892a05c948be73e40095bbadb8bd548aefdc0a39c0bdf179c96b0e86c6768171a3676dc763f610ed9b6b1eb8f74b0fc0b8ca
 EBUILD gentoo-kernel-bin-5.15.44.ebuild 3181 BLAKE2B acde6c67fffa096bf28ca6fc3efb99c05ccfa657c2cb13abd96e7f9a05bfa3271d839ea791e98a2906714418fd7897ea54408bfe28edad8d64e686a3873fcd38 SHA512 9557e38f9fa538002dc4331f05e5892a05c948be73e40095bbadb8bd548aefdc0a39c0bdf179c96b0e86c6768171a3676dc763f610ed9b6b1eb8f74b0fc0b8ca
 EBUILD gentoo-kernel-bin-5.15.45.ebuild 3181 BLAKE2B acde6c67fffa096bf28ca6fc3efb99c05ccfa657c2cb13abd96e7f9a05bfa3271d839ea791e98a2906714418fd7897ea54408bfe28edad8d64e686a3873fcd38 SHA512 9557e38f9fa538002dc4331f05e5892a05c948be73e40095bbadb8bd548aefdc0a39c0bdf179c96b0e86c6768171a3676dc763f610ed9b6b1eb8f74b0fc0b8ca
-EBUILD gentoo-kernel-bin-5.15.46.ebuild 3181 BLAKE2B acde6c67fffa096bf28ca6fc3efb99c05ccfa657c2cb13abd96e7f9a05bfa3271d839ea791e98a2906714418fd7897ea54408bfe28edad8d64e686a3873fcd38 SHA512 9557e38f9fa538002dc4331f05e5892a05c948be73e40095bbadb8bd548aefdc0a39c0bdf179c96b0e86c6768171a3676dc763f610ed9b6b1eb8f74b0fc0b8ca
+EBUILD gentoo-kernel-bin-5.15.46.ebuild 3177 BLAKE2B 201c1a0c3a7495f64a85ffe689bb561b5c1005b1b90fb3cb89081f578e669c54c89c0175f14cb8be1b079b16936c8f47a8f080d7c48f558327235d2a053b2483 SHA512 0b94554822df70fbf22eb2cd314d77d989f063ea7954f350fab0af068cbe0f1954bc254616c6be2ed8bbfc1e2bbc72a1b995871f069cd4d6e5b5fa1c4edb306a
+EBUILD gentoo-kernel-bin-5.15.47.ebuild 3181 BLAKE2B acde6c67fffa096bf28ca6fc3efb99c05ccfa657c2cb13abd96e7f9a05bfa3271d839ea791e98a2906714418fd7897ea54408bfe28edad8d64e686a3873fcd38 SHA512 9557e38f9fa538002dc4331f05e5892a05c948be73e40095bbadb8bd548aefdc0a39c0bdf179c96b0e86c6768171a3676dc763f610ed9b6b1eb8f74b0fc0b8ca
 EBUILD gentoo-kernel-bin-5.17.11.ebuild 3181 BLAKE2B acde6c67fffa096bf28ca6fc3efb99c05ccfa657c2cb13abd96e7f9a05bfa3271d839ea791e98a2906714418fd7897ea54408bfe28edad8d64e686a3873fcd38 SHA512 9557e38f9fa538002dc4331f05e5892a05c948be73e40095bbadb8bd548aefdc0a39c0bdf179c96b0e86c6768171a3676dc763f610ed9b6b1eb8f74b0fc0b8ca
 EBUILD gentoo-kernel-bin-5.17.12.ebuild 3181 BLAKE2B acde6c67fffa096bf28ca6fc3efb99c05ccfa657c2cb13abd96e7f9a05bfa3271d839ea791e98a2906714418fd7897ea54408bfe28edad8d64e686a3873fcd38 SHA512 9557e38f9fa538002dc4331f05e5892a05c948be73e40095bbadb8bd548aefdc0a39c0bdf179c96b0e86c6768171a3676dc763f610ed9b6b1eb8f74b0fc0b8ca
 EBUILD gentoo-kernel-bin-5.17.13.ebuild 3181 BLAKE2B acde6c67fffa096bf28ca6fc3efb99c05ccfa657c2cb13abd96e7f9a05bfa3271d839ea791e98a2906714418fd7897ea54408bfe28edad8d64e686a3873fcd38 SHA512 9557e38f9fa538002dc4331f05e5892a05c948be73e40095bbadb8bd548aefdc0a39c0bdf179c96b0e86c6768171a3676dc763f610ed9b6b1eb8f74b0fc0b8ca
 EBUILD gentoo-kernel-bin-5.17.14.ebuild 3181 BLAKE2B acde6c67fffa096bf28ca6fc3efb99c05ccfa657c2cb13abd96e7f9a05bfa3271d839ea791e98a2906714418fd7897ea54408bfe28edad8d64e686a3873fcd38 SHA512 9557e38f9fa538002dc4331f05e5892a05c948be73e40095bbadb8bd548aefdc0a39c0bdf179c96b0e86c6768171a3676dc763f610ed9b6b1eb8f74b0fc0b8ca
+EBUILD gentoo-kernel-bin-5.17.15.ebuild 3181 BLAKE2B acde6c67fffa096bf28ca6fc3efb99c05ccfa657c2cb13abd96e7f9a05bfa3271d839ea791e98a2906714418fd7897ea54408bfe28edad8d64e686a3873fcd38 SHA512 9557e38f9fa538002dc4331f05e5892a05c948be73e40095bbadb8bd548aefdc0a39c0bdf179c96b0e86c6768171a3676dc763f610ed9b6b1eb8f74b0fc0b8ca
 EBUILD gentoo-kernel-bin-5.17.9.ebuild 3181 BLAKE2B acde6c67fffa096bf28ca6fc3efb99c05ccfa657c2cb13abd96e7f9a05bfa3271d839ea791e98a2906714418fd7897ea54408bfe28edad8d64e686a3873fcd38 SHA512 9557e38f9fa538002dc4331f05e5892a05c948be73e40095bbadb8bd548aefdc0a39c0bdf179c96b0e86c6768171a3676dc763f610ed9b6b1eb8f74b0fc0b8ca
+EBUILD gentoo-kernel-bin-5.18.4.ebuild 3181 BLAKE2B 3d96b3ef0bb3f97f101823690955371ffb3f27246651b9faee643ea972b930e53706bf164d4560d3f5e485e060a40c2bdad46f59c0192076c5737f7851c93ec6 SHA512 2e245d442bb5baf2c731bb328aa1c089d4d4480066b38b198b8ac15dd11f73fc99ad85e9745f4fafcbf3d1c304e76f6209bb931c57fdb02c15a54cb7cc53624e
 EBUILD gentoo-kernel-bin-5.4.195.ebuild 3177 BLAKE2B 201c1a0c3a7495f64a85ffe689bb561b5c1005b1b90fb3cb89081f578e669c54c89c0175f14cb8be1b079b16936c8f47a8f080d7c48f558327235d2a053b2483 SHA512 0b94554822df70fbf22eb2cd314d77d989f063ea7954f350fab0af068cbe0f1954bc254616c6be2ed8bbfc1e2bbc72a1b995871f069cd4d6e5b5fa1c4edb306a
 EBUILD gentoo-kernel-bin-5.4.196.ebuild 3181 BLAKE2B acde6c67fffa096bf28ca6fc3efb99c05ccfa657c2cb13abd96e7f9a05bfa3271d839ea791e98a2906714418fd7897ea54408bfe28edad8d64e686a3873fcd38 SHA512 9557e38f9fa538002dc4331f05e5892a05c948be73e40095bbadb8bd548aefdc0a39c0bdf179c96b0e86c6768171a3676dc763f610ed9b6b1eb8f74b0fc0b8ca
-EBUILD gentoo-kernel-bin-5.4.197.ebuild 3181 BLAKE2B acde6c67fffa096bf28ca6fc3efb99c05ccfa657c2cb13abd96e7f9a05bfa3271d839ea791e98a2906714418fd7897ea54408bfe28edad8d64e686a3873fcd38 SHA512 9557e38f9fa538002dc4331f05e5892a05c948be73e40095bbadb8bd548aefdc0a39c0bdf179c96b0e86c6768171a3676dc763f610ed9b6b1eb8f74b0fc0b8ca
+EBUILD gentoo-kernel-bin-5.4.197.ebuild 3177 BLAKE2B 201c1a0c3a7495f64a85ffe689bb561b5c1005b1b90fb3cb89081f578e669c54c89c0175f14cb8be1b079b16936c8f47a8f080d7c48f558327235d2a053b2483 SHA512 0b94554822df70fbf22eb2cd314d77d989f063ea7954f350fab0af068cbe0f1954bc254616c6be2ed8bbfc1e2bbc72a1b995871f069cd4d6e5b5fa1c4edb306a
+EBUILD gentoo-kernel-bin-5.4.198.ebuild 3181 BLAKE2B acde6c67fffa096bf28ca6fc3efb99c05ccfa657c2cb13abd96e7f9a05bfa3271d839ea791e98a2906714418fd7897ea54408bfe28edad8d64e686a3873fcd38 SHA512 9557e38f9fa538002dc4331f05e5892a05c948be73e40095bbadb8bd548aefdc0a39c0bdf179c96b0e86c6768171a3676dc763f610ed9b6b1eb8f74b0fc0b8ca
 MISC metadata.xml 353 BLAKE2B cd022bd01b289ae703ae6ef6c2539fcfce833206c55e328ba02fc42b360d60f76b1920927b259dbb199724e6d3e7b0f68ba2044680d962d3cd03a973475582ff SHA512 10b10fd24801843108a71ca7d0c27514965b0a15a60da4d9b521fc41493448a1b1685ae3278dbd46cede0d069e51dede402d2c1448c8ae6a7fcfce8acf415bf3
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.121.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.121.ebuild
index da84e07f808e..b0171103c6d8 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.121.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.121.ebuild
@@ -35,7 +35,7 @@ SRC_URI+="
 S=${WORKDIR}
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 RDEPEND="
 	!sys-kernel/gentoo-kernel:${SLOT}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.122.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.122.ebuild
new file mode 100644
index 000000000000..da84e07f808e
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.122.ebuild
@@ -0,0 +1,135 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 9 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.amd64.xpak
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.arm64.xpak
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.ppc64le.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.x86.xpak
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	# ARCH=ppc64, but tarball is ppc64le. Update if we ever introduce ppc64be binpkg.
+	ebegin "Unpacking ${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d boot/dtbs ]]; then
+		mv boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.46.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.46.ebuild
index 0787e9b25ee5..9cad00c6c328 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.46.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.46.ebuild
@@ -35,7 +35,7 @@ SRC_URI+="
 S=${WORKDIR}
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 RDEPEND="
 	!sys-kernel/gentoo-kernel:${SLOT}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.47.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.47.ebuild
new file mode 100644
index 000000000000..0787e9b25ee5
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.47.ebuild
@@ -0,0 +1,135 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.amd64.xpak
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.arm64.xpak
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.ppc64le.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.x86.xpak
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	# ARCH=ppc64, but tarball is ppc64le. Update if we ever introduce ppc64be binpkg.
+	ebegin "Unpacking ${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d boot/dtbs ]]; then
+		mv boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.17.15.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.17.15.ebuild
new file mode 100644
index 000000000000..0787e9b25ee5
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.17.15.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.4.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.18.4.ebuild
new file mode 100644
index 000000000000..bec229c85248
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.18.4.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##*.} + 3 ))
+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.4.197.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.197.ebuild
index 0787e9b25ee5..9cad00c6c328 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.197.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.197.ebuild
@@ -35,7 +35,7 @@ SRC_URI+="
 S=${WORKDIR}
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 RDEPEND="
 	!sys-kernel/gentoo-kernel:${SLOT}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.198.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.198.ebuild
new file mode 100644
index 000000000000..0787e9b25ee5
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.198.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 58d68ad61a3e..fe8dedcf4004 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -8,6 +8,8 @@ DIST genpatches-5.10-129.base.tar.xz 3527080 BLAKE2B 91778a19b8905af40a0f80cc634
 DIST genpatches-5.10-129.extras.tar.xz 3868 BLAKE2B 85f4030ed0bd5aaac7c1e0d5f64412557a2684d0d53b1243357b0c5d3c521cad0cc5d72af7cdfad1fe8304454a3b1fb8adffd797aa0985353729911c48e17342 SHA512 69db79779a285aa4127339bb11bd77de8e2d9500eb85fc582473bf487a36983edff85b475bcee41b55417895503bc6799ae17f8260e056efcac43f88ff9c64a0
 DIST genpatches-5.10-130.base.tar.xz 3642656 BLAKE2B 6627de9e9ff113ed2a29e3815d0423708fe00b15f706b48e410b0770a4e78f848cbdeee48f0b5012f397f05efaf66c46fdaea888bb8b483c1c1d8c81998b0b0a SHA512 ca834e87815d241326de8c0cea3bceb31909103f86f4d569dda64784b959744200e6b10e794d8527fba2205cadb47fb31a7cafd183f298d67969b96a67146230
 DIST genpatches-5.10-130.extras.tar.xz 3868 BLAKE2B 2aac33beea74a4cec64d91e169444869d280a2b6ae3a03f18f1c9f2d7f212dbadad157f3af828edd2e2e9212d08c50fa33dc857f28d4a67464ec7256589dde77 SHA512 bd6451ee386262857c379d2e46a4e1929ea571dbf5f61b85f5c63e44684653d5dd0111e30929f73d3266ae1e7cca25e6e050935eba7d6708d261d87e6e633d6b
+DIST genpatches-5.10-131.base.tar.xz 3676828 BLAKE2B d16b120518abcd9e58861a9657189345f5fc113df3c291ba350f895092519972fca6757798e619725a5da3f833a712993a089a6c34bff53be983a6f0ea97096d SHA512 62ca509f6f43f996ab6a6d8d1effe26f999e2503fdc5ca041b6ec8229c09202e4d35b8a3e79777a717e6e2491560d578b8cf9c35fc03cac705c69e14f1d435f3
+DIST genpatches-5.10-131.extras.tar.xz 3868 BLAKE2B a873f7ad0c932107ab45a91981d89886fb65e5271bf9a9113d55404405c2a592286fb86dc1c24776601707494db6994f0aab649eb79cdc990843c3194114e8cc SHA512 e8386d12ea62a190315fd9097f148d01edcf9c6fed85a631678e1b85f64104fe580eaf1638b4ccc10cb83cd719522ca6b0fc23ebc67e72960e8f045cb8c13bcb
 DIST genpatches-5.15-45.base.tar.xz 1826632 BLAKE2B 77bb4d997b63723f677f82b91b33afd0f35367d9304051999a0daa84da26feb99fc76a61af77a5e477a5a8ded1a5c12316450563cd56b6c93a93e6df6421b107 SHA512 9435803d4dd65fa78d8e14e992681aeb016d3672b81d589b293d1cbacc024605e18429529803ba344ecae1610bb77150a7b2405cd43f00fc905e9c6babef04c1
 DIST genpatches-5.15-45.extras.tar.xz 3932 BLAKE2B e2c4132995b7b39c9d135e17cd21315013cfa8b9de9b222206d9ff9a5780c4f35be294eb6d71130a9f4b9fbd9c2f31ded41c1c6dfecb2fdc4401118411a7485a SHA512 5b1cf3281df2fe24eac3827b0753c83305dd956b23351899be1dd37a89d00917c771475e3df3f9980f6b0fd210420b479c6196c7d1ea2ea9a0d711fab50cfb64
 DIST genpatches-5.15-47.base.tar.xz 1869424 BLAKE2B 461735737047406f44d86088681cf3fbd591278c1878e7f1aebdfbdb726b5c8ccbffe43bf2c34e5baa57c04eb5fb08a723b9473b843639835383bbde464c1ade SHA512 e6ec4a4ab7abf3b91face2df9f8fa7089c054a7c5e44d8404742d05dac9bf7940e6c0f97f219519f8bce22f3cd3e40fd98c856da866b5cbd637094aee1bd884e
@@ -18,6 +20,8 @@ DIST genpatches-5.15-49.base.tar.xz 1924264 BLAKE2B 413b52e2d56b8da573f23def0f2f
 DIST genpatches-5.15-49.extras.tar.xz 3932 BLAKE2B f38c4df269bdaca692d05f2b478b3133d5c55810d2e2d8689850bfc50c9eb108943446ebaf44b87889f8619006f6f8789da09137963aef6e08a95784dae65b25 SHA512 9b00de23b1112f192a10284f5dd6f1846d42e3e0df74aa63d58d4523cfd66eea227854aa7088b0389fe70ffb4e945ee7f6e1d845fb299faf0bbd394902bd5473
 DIST genpatches-5.15-50.base.tar.xz 2105492 BLAKE2B 518b28b1244d4a84a02f0a51637989cd20e23e33eb1114da1a7102e8ff63c225e2cc8a425b0f34dea6caf1c14094427c479f5a6bca4f5c52440ee0dfe2745db8 SHA512 4fc7266870ca65f000e7a431757e78b7d2c2c4e9c1e2b39ed5492b7655190c6aba624be30dbcb88bf22c2e19b8a3f0849a4f4c388a406954241a47619c1cd0e9
 DIST genpatches-5.15-50.extras.tar.xz 3932 BLAKE2B 969f23628d80be3179e13aa7b09f19d104e13f656446e00bc4f25f3723184f104b18d835a28cfb16fed9fe1d9be68a274c14e294669beec631257f9c77d4557a SHA512 2ea8a7d58a0989198eb0df196757dfd8141cde484a6c652226fe09b030e12856793d2ec5f139096354c808840e572eaa3a236bf0952c47739ab9c13ba508286d
+DIST genpatches-5.15-51.base.tar.xz 2168832 BLAKE2B f27cc35f69f1a1d5ea36b9e21b3b935fe7c5dfeae4f925390b6df852b838e9d771261d64d252dbc0070b135afdc5713e4baec49965f426210d022ef99156a32a SHA512 30b2644ca4c40fc1c1892f022cf169dc180b996abe184d78d4831c435319c840d9f384260a29d1c38b8acaa1c2923a1c52a7f742d7a5f3c309d01dd76a485475
+DIST genpatches-5.15-51.extras.tar.xz 3932 BLAKE2B 14e232d43f8003b7dfc9f083dfa0a86ad8673d6cc0677fb5d56b0bf34dc76d05b903075e36421add28fa06cc1fe0774437e19ae0211f15dbbdba8e920218fd0c SHA512 06bc24ade088f2c7c0d74e308c90fd4689cc35152cda4019272ec78fe8da9129853f68115d7a446fbb05c8fbffec96b36f725427270b290e9a43ae6652a15e7f
 DIST genpatches-5.17-13.base.tar.xz 713196 BLAKE2B ecba47430d0aeaae2d09d586a9ea016b0b602e2005ae7bf04ffaea7967a7542660dd4bed6cbd5268f187416896c046fdcb7e1aeeccbf293012d11c7473c4d6aa SHA512 fad3e0c53a5bf450dd9dec4146233e322553e110c8b3bd93c53cdb664859aeeb3e5c861f5e04cfbd550014288b7dda9b5740e5d970c443c140c8bfe0559ab82c
 DIST genpatches-5.17-13.extras.tar.xz 3932 BLAKE2B 9aa42ee7af3c16e41f6bfffa91855a8f1949d795fd435f0334d89de5240238cdf5fd14b964236973d3178172db2aff98989bc3626f9ca6d9f9878711fc6bc581 SHA512 1cea0fe9035f02f8099768608bcc1d896234058af984db268bd03cd27e3f12c2ad108b3f6d90be11b7edd53983d19d7ae3a00de87f62c3e80f1eace1cb5660d7
 DIST genpatches-5.17-15.base.tar.xz 769140 BLAKE2B dface984138a5b7f75911c7d6a4b7fcc67349f8adfcf863aa960fdddfb0e426fb0e408cd2f725db8df17cc9d742a68f85e24c91c644b3f0c7ff142fc105fcf24 SHA512 8fed293b503b150507ecdca6d19011083cc1e3e5caa9ec4bc8527e282892c2dd35d24b746403d2b6a746586b526ee07c2fb50e97024ac409d03aefc50c372aad
@@ -28,53 +32,69 @@ DIST genpatches-5.17-17.base.tar.xz 823112 BLAKE2B de53871be24c0c7257de3b2ac384b
 DIST genpatches-5.17-17.extras.tar.xz 3932 BLAKE2B 8c858ea2d37aa0a60752e051af6a400253e79ad69eb186b5b358ef398992ee62bbd9896c68db0c5e16981ad020f24718f584e5765c6f16d4eab3dd6651940404 SHA512 1a032cbde503850d3ad3a81b8f4fe845d8cd2bb7da6979a676a4c4ed641ad9bffed6cf89aa870fd3f1e0cb9569668a431d7d30ff049ec7c669a06a11896f6c10
 DIST genpatches-5.17-18.base.tar.xz 1040972 BLAKE2B 71575497161db10073de3d7db41a8cb82a063ba8e175016e411f3f6bf822b810c1de4172a47acadced51ac750aa90f41aaee040f85e214b7f92d95b3054e660d SHA512 fe5f8ef1e5e7c662d0c7a6836a195bb07dcb616bfe6417c8226825a0db6c9727ca323840edb8c969480fe967e5f7ef9244ce14df14f369b620e4a2e60742dafd
 DIST genpatches-5.17-18.extras.tar.xz 3932 BLAKE2B 754c044fcf38d26a062d977505b3a25f663b90f1cadfa1aee524946aab3b84fc08463602bb8d5681b3303f459d6180e43bd1ac25b0c830f3163a9b8cce5029a1 SHA512 f135e3724cd1ff190d3d117c4afb5559a8908e1483e6be3cd783c42c05b8c4ae5b37c0a1537fddb88ed800d9faf4fa8996641201cf0a6891e31be2a3dda2c558
+DIST genpatches-5.17-19.base.tar.xz 1122576 BLAKE2B 62a8ef6da90d967676754daec496101b7638c1301ab5bbde5d94f8186d66f7f5672c55b8f97ca64cef9a83da00a46db7ab804cadff62d3137ecdd2bd41885be1 SHA512 b5aaa9013bf2372a658e885ce37e3171077002881e95bd81da87ff1a69645d4daed0f7717b4d35441f25ad647dcbbe92ecbd01318eb449101bdc415409c60e41
+DIST genpatches-5.17-19.extras.tar.xz 3932 BLAKE2B 87ea5b908c969c61d8da8067f13f0b674a4f72c4614b576a5b7648cf6d6880e88735931314faa43a3f4907c4d75baa3f705908bb609b95af3d9de582dfc7989a SHA512 191eed3aa27c2a2dff28b79a45db4d2c703bc45f5f63eaafbc6229541138601b6462df8262d808fcb5155eb7d632aed85e26d06e13a4095e305a493345dd02e3
+DIST genpatches-5.18-7.base.tar.xz 431972 BLAKE2B f35163850c12f2610d487c7ed42b80b1f88b982f10476124d6e19b942ef1e2a012100325ff98807fa3664adc62116e843cc584d068335767c374d29d24f33b76 SHA512 9967d15c984f731dbfe7fb7c9bdb1270678efb565bccde88dd9c4bde6b3e93720d52c96db943110e07aa257401431e9bdc9f4149f9bd1cd983605ce369277d0c
+DIST genpatches-5.18-7.extras.tar.xz 3920 BLAKE2B dac0cba1f0a14780c6b8af044fc505466671360b06bc15c3ea1dc4b69ed1ab3978030d68d8417b52b972e7567dea8e42cdf3894b7bd86420bfdff3e7afb075b7 SHA512 cf97f18c7bd726494c0091303101ab3bee99cd9243a681eab4460c4f0c9edd5b03e23be3295a828f2eaee0af35d033eb8bd468dae2d981afba5af47a7ac20020
 DIST genpatches-5.4-199.base.tar.xz 4683396 BLAKE2B e1e66ce10c436bb196a5890e08d5beb8d0a1ece7f19f8fb3b1027747509cc7b6102ace634abdbd299dd48fbc8750f3bc127abe55014410b1d558b4aec497f475 SHA512 8a16d67794e864749fdcdbf413ec0fe996d3c4fb5f04f8c8a2d3001377c8b5d4d7007a96efaa3590fd4b595cccdea36d83c6dc292629566e5398f322658d80f4
 DIST genpatches-5.4-199.extras.tar.xz 1812 BLAKE2B 03b9ebf9d306256e58c895006038f4bb3d908590ef2f603487d9b970963c24acfbe78fbe862b2b493ab477e6e901aba332dc69916eb881fc42a79a62d7f81da4 SHA512 d100e876a9b64d662331d4a78b8531a71144bb70b789e0ab0b76e6957c368ee3a88025e040cd622dd4cf6e4da358a3636571ddf55b94e42dbc250a62a629baee
 DIST genpatches-5.4-200.base.tar.xz 4700404 BLAKE2B 8420d667947cf912a8d6419581377b5d7daea5a3c03e333403a4c0d0d55200afe4bd7f379c786ff5904c8f1cd1d7735cb7df95a5a5aad93fcb8b90a8750683d3 SHA512 771883d2b15e92dd5e2ea31e9566d3e1d210389323521be5af32fbea75c168d17e947bf004eb515c54f7b0880fa12fde236045bdeb35e08aec8b54465cb253d9
 DIST genpatches-5.4-200.extras.tar.xz 1812 BLAKE2B f9d3d87c5aad19869ae7d1c82e1303ce62b5f10cd15328e4839bf7a7b39a2f571ec8b47dd65afa48f8d3ce98113a150058c59aea869f717a0f89316074af1d83 SHA512 17ce2facd53633f3059d9472a076fc57e320cbe802ea853fc91734d88e29a30b54dca75e78c7173d3333be5b96add590af89b089426059728473167408f65e5c
 DIST genpatches-5.4-201.base.tar.xz 4708884 BLAKE2B 3d6d82c90f3b8e2cffa9d9c1cd5bbe74536d44cd42c5d870272b8e87a2a99f16d338f8c28511864be87f739df53f3bd3bb2f7313b4b04f78fac2057778d5d439 SHA512 5ebe9454b61142e87e5384a5718399c4c99b059a8bfa0db638f20f2157eb2f67117d58f4d046bfed09725ba809686d93a382ce1acd63520b16ee1d8820530729
 DIST genpatches-5.4-201.extras.tar.xz 1812 BLAKE2B 4cb4f2605dcf2e374521931bbe92026246513251f53c94494d076f7da87a85dd5a2c27f4e97e72262853a90905a4a7b2d842258eeff573a8a3292fbf30c35c73 SHA512 a74d28f5014b43422cdfd8ea7a08b71faa6f0243cc1ea409e199d81e995e14cb6a849d3624bd766cf31f12a44650945aae645f37ea98079baa1d7fca6c89981e
+DIST genpatches-5.4-202.base.tar.xz 4790140 BLAKE2B 2ea183e7c63ce48f2d418ba4606782eae8aeaefac556f93a9e3358d1eb62609f431b973f0d54c006cf723e4172d73a549ed00229a82dd4f1e3717951b0cb8a3b SHA512 29f6a7c0fc679273180637cd70791b19dd1a6a87f66c46a29df2ed5fa01a5c043202853c2becf6050f4cdfed0e7ef2a7dcfbcf934623b85578a45ed3746a2fc9
+DIST genpatches-5.4-202.extras.tar.xz 1812 BLAKE2B 710012cf071fc8e65775bf36c372bf1d6743824061e8ba42cce58440dcb4e207ba5a97eac16e19c0898b991cb39e327ac0417f90e5b8affad9937c7030361e60 SHA512 75d828543b8a15e32bfde13e1fef6fbf83440344464245b77e401a69968d33de459fab3bd7668838650cca9aea3475139f3206001a119463475dd091bdca2a48
 DIST gentoo-kernel-config-g1.tar.gz 4283 BLAKE2B 44dd51ec45ebc71bffcd6d85a2fefba053f7bce8035057f0bbe928e24816ad4ba03c9bf67dcfcd6d6d1833c0a2ea93e0fd486c2093664dc41ccce316e1e60588 SHA512 3a45f28df9d457df0fe0d185da8b10f4e35f49dad75075e041e8cf3cf6972fecc8145cd557b0bf3a8dea20ddffae0194f88e61c1e5098fa0a5ca301d40aeea2e
 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
 DIST kernel-aarch64-fedora.config.5.15.19 242615 BLAKE2B 94e59440681535e38137b71814e1ae53f57a347f62cf31e0c1c8571ae43d9ae9be9957743c8cbc9ec74850c964eaabefe6799a28bc311ea7b99ee31391b47fb1 SHA512 fb77d3b73a215f97d70cd6d8c96ed20e497786b99ed7d7a7f2ed60cc1251289c1a4c7e058c41b5efac62e4a9b4b3d917dbdb11585955bba2b6584981430f4ddb
 DIST kernel-aarch64-fedora.config.5.17.11-gentoo 239036 BLAKE2B 7b4cfd0cb29d5a79f7af585ae019723da74de58eb0e756ebb783ca0e17a79b68ea751f9c7eb7f31f16adb334e2b746228b55bdebafe31195cde4a379aa865b48 SHA512 08de60599905b032d09ad263670f1501513366d89fc224e21c1689fef97f6ed28db9149becf7363f28f2983587cbefcb20ef99f6b5dab8ad24ad9320ee829790
 DIST kernel-aarch64-fedora.config.5.17.3-gentoo 238977 BLAKE2B 5f3a43fff7ddfe4dda03f00e7f4af761ff978bbc9c6d2fa73b605f60755a0d40e494428725a7728f5e2f5f58c9931d8d60b048d318e22c635588e546209dcfb2 SHA512 4c22514ec7d2d4ce87087aeae17a5f68efc3e70f48298895262d5dbc47623de6ada4254ee3a7f06a302d37af73d921470903f2f3a86fe5224e638bda882be7e5
+DIST kernel-aarch64-fedora.config.5.18.4-gentoo 242525 BLAKE2B d27e9b2f96f3d7968919eb2bd4f67b62543a9fbbeb2f1253a39046b4e3b9cfbff1266c21a98a2d86dbed1897bd41d8795726c6491d96bd1de25ad1a012fabaa5 SHA512 bf7758b7a24c4abd46e66f031e1da5081e324a383c710f60446f43296fa7543b3dad47c751ece8667ab0715e1605b104b6ceb36966a0f474ae4ec8641425914f
 DIST kernel-aarch64.config.5.4.21 199104 BLAKE2B 578ad451a76204df2a9bbbe34b5cb27051d2ac5e2c33967f562b01338c43f35da6dc33a4c2cc67ea6c3b32b155729360d3748ec28dcaa750f18449245b2e8a09 SHA512 66e9a437beb350fdc59512c17b8f72c5b5bfacf2b35070d810d77e66f49cf7929026cc28ad44b04a016d61e65d9fb4a10af6996ba09b604bf97e9c467d08f8ff
 DIST kernel-i686-fedora.config.5.10.12 205412 BLAKE2B 92c715b7e2cd7dd74da7970c05981f520597d3e403ce82c8cf4eee31c9f1f50b638792a6bdb256ef5bfdc99f1bcd594e819e8f44dc6febb2ad9a854bad817f2b SHA512 69d8db11723ae1b40fdedfaace74d15bb63198cdb0485e0a1e5eba95b31217110c93a93e39cc7370cf45f1d3a8bc7f75ec096d6db5ea9ecb28ac6b56702ebb10
 DIST kernel-i686-fedora.config.5.15.19 222233 BLAKE2B 9e0f4dd37058f59610e46a87d3165039e76299d3c186fbfc3312101bac1b8b198de404075f5bbc6f5e2ba04cfd45f9d02bdf94b01c3ed11b9275f37f11ee7617 SHA512 49ffc39de86763e707a5c0c07c1367d34e9249615f29fdf97904d7b61a375a86fc4ba37a2f02b5f61e4c76ad65d9ba12716d2523af6faa003f6336d7ae61a953
 DIST kernel-i686-fedora.config.5.17.11-gentoo 218149 BLAKE2B a1a4946185e678b9c42f8e524de25efea1a049714e07f8f64bc9482680fe4668bed2b6a91a7e63d4142cda50f3d3a05c64b62e4477d2411e0251546b6774b12c SHA512 9ad7a0a213637d9818b95ea86f5abb2c6d2fdd0929ddd15db32a0ab4c71c2ff808a066846bfd054a27dce4056942db98117414399484e1688c6dc7d7d8edd0b7
 DIST kernel-i686-fedora.config.5.17.3-gentoo 218090 BLAKE2B 1d972e6ed16c7dc1dd9959ae406af52d1cdc15f85f8ab376e4d7abb79d9e284a9a68442bde975f5f1a9bc64fffdaee96d1f41392238538b37f1b6f9652ecfcd6 SHA512 2c32cca1f20cf54f3e9b394f6e3f14f435bdd72fa22868416129bfd4253a3cc8f3164b6868e31292c2404a1c433944783279e03b45cce9bec3b2813cb4675b27
+DIST kernel-i686-fedora.config.5.18.4-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.17.11-gentoo 209309 BLAKE2B 4b94a9ebac017c2cd4240eef9bea7b65c0e0fb75e1f02d2e6585c0f352f91e1113e0fd8f527cb3d3f96e93c50eeee74186ba6c2574dd45bee515e031ed2bad9d SHA512 72c05e6e64ef8e2430ac2fe592dfcb0c5c8def60f2d53a9f2f7bc1e9f5a98faab2ace7ab73758c008bf004eb99bd91eb11be90198178b27636d7873e38ca6943
 DIST kernel-ppc64le-fedora.config.5.17.3-gentoo 209239 BLAKE2B 7c6fd8bdbd8331def5bb658359aeb3d52a9f0e72d9312699e00d852b6740250edb1c7a77ea76521b0be6a8ce41888aea4ce8734bb267cc1f3e216f2cbd6ab8d6 SHA512 f25199dd6cef4be45049fa7d6cc1dc1b8a93ddfeb3b3824e6ead76443c1ea30e31dfcd4ba66625eec74ed43ab255d1e21cb2a9011160cdc64f30c4b1fdcdb9b3
+DIST kernel-ppc64le-fedora.config.5.18.4-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.17.11-gentoo 219087 BLAKE2B cec0c1948960ec5363830ece7be7d3060c74eb689e801af229017a9d9804cf9ef546168669d65598d33fd5b2f4ac9aaceeeafd33f92ddeb8f185cb507f56b417 SHA512 c1602e8a8401311ca82972278476916f634dc8ae810a0902bfe0d415d2670b3bceba59f016ed90669eb73b1a9dfaab35cba4a1b4428e0fbaa6ccd2701871af39
 DIST kernel-x86_64-fedora.config.5.17.3-gentoo 219028 BLAKE2B a8a3e2f31315d6aaf19c6771db94a3549379fd48a33b29b00d0311a36325ba8e9f124b5962a447aa8bf63b01f714298f4fca7ff071db165f183ce9023e2b4cf2 SHA512 8c7937310b8e9cbaefe4d6910595df373edfea5a56e439671583c98a752eb5d9029bcb32178ea6b09e6847e55e71dd9ab94e0adb149626ce04c8a9e8f6d7a145
+DIST kernel-x86_64-fedora.config.5.18.4-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
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-5.17.tar.xz 128399340 BLAKE2B 82dc4a45cc25c781ac67aa6ed1e4c369544154960f41c4634d47621f381159687a227054976d078524cda28884d395a15f7542fe44ca74ce98ca6ff54a81d6d0 SHA512 89f0a7ca69d20a539d4b612a7028a30a5e98b402e4b6b88516f14237e5da4b626d7929eab8b40fccc90766e8f3bae87e9858a19077ffad20d8204acf18794f5b
+DIST linux-5.18.tar.xz 129790264 BLAKE2B e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb SHA512 dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 EBUILD gentoo-kernel-5.10.117.ebuild 3598 BLAKE2B 2d58b845b166e504cd5e4b9244920a2d5fa8210af5d1b5c698024c86c62fef955f69e8ea5d60941b1eba40bc5099bf1b4e38b886f6082ad71639452087c1fb4b SHA512 96e3cdae110a1f6aba5b85f2577f8cacdf24d2eab7d92c40700ccc0034f0ed5ce37924ee354ee99bc03288489cfaf17f7a0b38c5020a720a9330f3c60faa09b7
 EBUILD gentoo-kernel-5.10.118.ebuild 3602 BLAKE2B 96f51a1768637f8c570d4dee63cef59613d752604ad10527d45579296d639d01653228038b834dd9ff3514f01f64aebc828e978460ca4ddd1578c86412edb9c8 SHA512 9f7832e9f3ff018b75a2372e6f1e721949ac09e511c41219b230802894cb23ad0e635eb0f9bd793ede93946f11853835173f7fab9c14f07e423afc550c06835e
 EBUILD gentoo-kernel-5.10.119.ebuild 3602 BLAKE2B 96f51a1768637f8c570d4dee63cef59613d752604ad10527d45579296d639d01653228038b834dd9ff3514f01f64aebc828e978460ca4ddd1578c86412edb9c8 SHA512 9f7832e9f3ff018b75a2372e6f1e721949ac09e511c41219b230802894cb23ad0e635eb0f9bd793ede93946f11853835173f7fab9c14f07e423afc550c06835e
 EBUILD gentoo-kernel-5.10.120.ebuild 3602 BLAKE2B 96f51a1768637f8c570d4dee63cef59613d752604ad10527d45579296d639d01653228038b834dd9ff3514f01f64aebc828e978460ca4ddd1578c86412edb9c8 SHA512 9f7832e9f3ff018b75a2372e6f1e721949ac09e511c41219b230802894cb23ad0e635eb0f9bd793ede93946f11853835173f7fab9c14f07e423afc550c06835e
-EBUILD gentoo-kernel-5.10.121.ebuild 3602 BLAKE2B 96f51a1768637f8c570d4dee63cef59613d752604ad10527d45579296d639d01653228038b834dd9ff3514f01f64aebc828e978460ca4ddd1578c86412edb9c8 SHA512 9f7832e9f3ff018b75a2372e6f1e721949ac09e511c41219b230802894cb23ad0e635eb0f9bd793ede93946f11853835173f7fab9c14f07e423afc550c06835e
+EBUILD gentoo-kernel-5.10.121.ebuild 3598 BLAKE2B 2d58b845b166e504cd5e4b9244920a2d5fa8210af5d1b5c698024c86c62fef955f69e8ea5d60941b1eba40bc5099bf1b4e38b886f6082ad71639452087c1fb4b SHA512 96e3cdae110a1f6aba5b85f2577f8cacdf24d2eab7d92c40700ccc0034f0ed5ce37924ee354ee99bc03288489cfaf17f7a0b38c5020a720a9330f3c60faa09b7
+EBUILD gentoo-kernel-5.10.122.ebuild 3602 BLAKE2B 96f51a1768637f8c570d4dee63cef59613d752604ad10527d45579296d639d01653228038b834dd9ff3514f01f64aebc828e978460ca4ddd1578c86412edb9c8 SHA512 9f7832e9f3ff018b75a2372e6f1e721949ac09e511c41219b230802894cb23ad0e635eb0f9bd793ede93946f11853835173f7fab9c14f07e423afc550c06835e
 EBUILD gentoo-kernel-5.15.41.ebuild 3595 BLAKE2B a20863e70f3ad319f36acd163c232939bef6b8336174211c3268cfe86b734c096be052728dbe5760d07674e2d73521a362f7efc248b0ab988e9b663da2fa75e6 SHA512 18bf9037ac3aa860a82e18e63108109a1d80c3c71fb07e39fce8b9782255525c7449412b1c81c89aebcb56ffdb258d8bd1382ce6c80abac720c34a40b00ec861
 EBUILD gentoo-kernel-5.15.43.ebuild 3599 BLAKE2B 166a462972d13245f59f4806e490d5d753a7f92e424aaf0c749f1cfe2d5767027ed0259862cbaff715800081b7c289a49703968602e663eae7971342fd1c5a6c SHA512 37b83b8e617ee511971e2ac9e911479b6db1f089a4d99e04f5dc3eb80ca08d7557b29b8b21cc91d91613da18182ffac048691eb33b689890f45828253ecfe010
 EBUILD gentoo-kernel-5.15.44.ebuild 3599 BLAKE2B 166a462972d13245f59f4806e490d5d753a7f92e424aaf0c749f1cfe2d5767027ed0259862cbaff715800081b7c289a49703968602e663eae7971342fd1c5a6c SHA512 37b83b8e617ee511971e2ac9e911479b6db1f089a4d99e04f5dc3eb80ca08d7557b29b8b21cc91d91613da18182ffac048691eb33b689890f45828253ecfe010
 EBUILD gentoo-kernel-5.15.45.ebuild 3599 BLAKE2B 166a462972d13245f59f4806e490d5d753a7f92e424aaf0c749f1cfe2d5767027ed0259862cbaff715800081b7c289a49703968602e663eae7971342fd1c5a6c SHA512 37b83b8e617ee511971e2ac9e911479b6db1f089a4d99e04f5dc3eb80ca08d7557b29b8b21cc91d91613da18182ffac048691eb33b689890f45828253ecfe010
-EBUILD gentoo-kernel-5.15.46.ebuild 3599 BLAKE2B 166a462972d13245f59f4806e490d5d753a7f92e424aaf0c749f1cfe2d5767027ed0259862cbaff715800081b7c289a49703968602e663eae7971342fd1c5a6c SHA512 37b83b8e617ee511971e2ac9e911479b6db1f089a4d99e04f5dc3eb80ca08d7557b29b8b21cc91d91613da18182ffac048691eb33b689890f45828253ecfe010
+EBUILD gentoo-kernel-5.15.46.ebuild 3595 BLAKE2B a20863e70f3ad319f36acd163c232939bef6b8336174211c3268cfe86b734c096be052728dbe5760d07674e2d73521a362f7efc248b0ab988e9b663da2fa75e6 SHA512 18bf9037ac3aa860a82e18e63108109a1d80c3c71fb07e39fce8b9782255525c7449412b1c81c89aebcb56ffdb258d8bd1382ce6c80abac720c34a40b00ec861
+EBUILD gentoo-kernel-5.15.47.ebuild 3599 BLAKE2B 166a462972d13245f59f4806e490d5d753a7f92e424aaf0c749f1cfe2d5767027ed0259862cbaff715800081b7c289a49703968602e663eae7971342fd1c5a6c SHA512 37b83b8e617ee511971e2ac9e911479b6db1f089a4d99e04f5dc3eb80ca08d7557b29b8b21cc91d91613da18182ffac048691eb33b689890f45828253ecfe010
 EBUILD gentoo-kernel-5.17.11.ebuild 3859 BLAKE2B b32c08d83f499520e7dbdf4d3bfc3b7142beea7fe2c166ef7c39a7323a902ee17ab10ac320f1bc04dad1188d3d465be7a0cf7c3fee29bdab6b418fb2edfa59cd SHA512 f9793681a4bca6d320134edab31e2fec6ea93894bdc145f30cec87263d20f54ace39a53c0988d7e364e570bd8c82e4ed21a8636d91d57e4cd30383d3b6f73441
 EBUILD gentoo-kernel-5.17.12.ebuild 3860 BLAKE2B 6f50bafe75001be53ed0b756c7ab680a55f9172abb8d4f3cc5e0efb8c304ed65e141be4ce827ddd086f7ede81d62087e1e30c85d7ee73c2eb9f6846375528369 SHA512 557a7bc16d954a0274920f8cd062ba4ca44fc9cbaebec6474434a3ba0eb2071e85f13d5c78089200bed7b0afd93b7ee93670f39350fbaecc115c90c86c52d8fe
 EBUILD gentoo-kernel-5.17.13.ebuild 3860 BLAKE2B 6f50bafe75001be53ed0b756c7ab680a55f9172abb8d4f3cc5e0efb8c304ed65e141be4ce827ddd086f7ede81d62087e1e30c85d7ee73c2eb9f6846375528369 SHA512 557a7bc16d954a0274920f8cd062ba4ca44fc9cbaebec6474434a3ba0eb2071e85f13d5c78089200bed7b0afd93b7ee93670f39350fbaecc115c90c86c52d8fe
 EBUILD gentoo-kernel-5.17.14.ebuild 3860 BLAKE2B 6f50bafe75001be53ed0b756c7ab680a55f9172abb8d4f3cc5e0efb8c304ed65e141be4ce827ddd086f7ede81d62087e1e30c85d7ee73c2eb9f6846375528369 SHA512 557a7bc16d954a0274920f8cd062ba4ca44fc9cbaebec6474434a3ba0eb2071e85f13d5c78089200bed7b0afd93b7ee93670f39350fbaecc115c90c86c52d8fe
+EBUILD gentoo-kernel-5.17.15.ebuild 3860 BLAKE2B 6f50bafe75001be53ed0b756c7ab680a55f9172abb8d4f3cc5e0efb8c304ed65e141be4ce827ddd086f7ede81d62087e1e30c85d7ee73c2eb9f6846375528369 SHA512 557a7bc16d954a0274920f8cd062ba4ca44fc9cbaebec6474434a3ba0eb2071e85f13d5c78089200bed7b0afd93b7ee93670f39350fbaecc115c90c86c52d8fe
 EBUILD gentoo-kernel-5.17.9.ebuild 3859 BLAKE2B b32c08d83f499520e7dbdf4d3bfc3b7142beea7fe2c166ef7c39a7323a902ee17ab10ac320f1bc04dad1188d3d465be7a0cf7c3fee29bdab6b418fb2edfa59cd SHA512 f9793681a4bca6d320134edab31e2fec6ea93894bdc145f30cec87263d20f54ace39a53c0988d7e364e570bd8c82e4ed21a8636d91d57e4cd30383d3b6f73441
+EBUILD gentoo-kernel-5.18.4.ebuild 3859 BLAKE2B a86a7ba32104420cee386a861e80f4dbc1900c262bb27d9f452de0899f8c56ea0f313916d42d7212bf9112708b7e4784d302aa7c28fb44f66bcc96fda6ec394c SHA512 5929e8992d858222c4940d503bb7599e77436069eb17b0b724fa6b18fa198a34b2c26199cbf06248e20da7945ec920ec154faea1fc4e9e7f5da7c6684794ece2
 EBUILD gentoo-kernel-5.4.195.ebuild 2799 BLAKE2B 65c1618e3b44df28bd60944cdae55aa5364a2b4a51553ecb4e398513155fe5e43ab2c3fbc6479f3374c219bb5c2f1bfe53322c551aba15d22c580e0479e6d278 SHA512 74cc32e6e52e1a2fac22513b1e0bae80d72410445567f70e3d0760ad43fb4d234a961abdf59f2c0731371290233dd248ceb1827c4453486fcc16cb1bd7bf894e
 EBUILD gentoo-kernel-5.4.196.ebuild 2803 BLAKE2B c547f3ecda2b5fa1d5e44e96b2fc1321e43affc6eb21dc5b87d5d09551c4f0af3c3f7e22d040d09bfb1d3d364304ca93b3e6934c3a5e9550abb6a86626b17c0b SHA512 3b59a4b0331c00469de1bf0a519119dba1f640c9bfff7a4c42d8de2fd67575a6bb24a6eb721251b96b821d265f60aae0f2787464b2c402fa33291106a99b9b9e
-EBUILD gentoo-kernel-5.4.197.ebuild 2803 BLAKE2B c547f3ecda2b5fa1d5e44e96b2fc1321e43affc6eb21dc5b87d5d09551c4f0af3c3f7e22d040d09bfb1d3d364304ca93b3e6934c3a5e9550abb6a86626b17c0b SHA512 3b59a4b0331c00469de1bf0a519119dba1f640c9bfff7a4c42d8de2fd67575a6bb24a6eb721251b96b821d265f60aae0f2787464b2c402fa33291106a99b9b9e
+EBUILD gentoo-kernel-5.4.197.ebuild 2799 BLAKE2B 65c1618e3b44df28bd60944cdae55aa5364a2b4a51553ecb4e398513155fe5e43ab2c3fbc6479f3374c219bb5c2f1bfe53322c551aba15d22c580e0479e6d278 SHA512 74cc32e6e52e1a2fac22513b1e0bae80d72410445567f70e3d0760ad43fb4d234a961abdf59f2c0731371290233dd248ceb1827c4453486fcc16cb1bd7bf894e
+EBUILD gentoo-kernel-5.4.198.ebuild 2803 BLAKE2B c547f3ecda2b5fa1d5e44e96b2fc1321e43affc6eb21dc5b87d5d09551c4f0af3c3f7e22d040d09bfb1d3d364304ca93b3e6934c3a5e9550abb6a86626b17c0b SHA512 3b59a4b0331c00469de1bf0a519119dba1f640c9bfff7a4c42d8de2fd67575a6bb24a6eb721251b96b821d265f60aae0f2787464b2c402fa33291106a99b9b9e
 MISC metadata.xml 465 BLAKE2B ea1260a1638588a48d9dd776e9eabd9730a181af8416ba778c936fa2e80a2360be146d3cc80599e50e0a72ac709eb9538184aac87cb96528e445ed450e34f4af SHA512 c7b7b1a45fb7082b8d8d66cf5a387cc4f7207cd9488d1d5e1d6900f1e4147aa9290b5522a94d941a885f1599b5df2482b529e40912d2b2cff400ecd4b1704c41
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.121.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.121.ebuild
index 161f70398d65..d3b655df2223 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.121.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.121.ebuild
@@ -40,7 +40,7 @@ SRC_URI+="
 S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 x86"
 IUSE="debug hardened"
 REQUIRED_USE="arm? ( savedconfig )"
 
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.122.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.122.ebuild
new file mode 100644
index 000000000000..161f70398d65
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.122.ebuild
@@ -0,0 +1,131 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 9 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.46.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.46.ebuild
index 3e9875ab5936..68008deb98f3 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.46.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.46.ebuild
@@ -39,7 +39,7 @@ SRC_URI+="
 S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 x86"
 IUSE="debug hardened"
 REQUIRED_USE="arm? ( savedconfig )"
 
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.47.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.47.ebuild
new file mode 100644
index 000000000000..3e9875ab5936
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.47.ebuild
@@ -0,0 +1,131 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+CONFIG_VER=5.15.19
+CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.17.15.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.17.15.ebuild
new file mode 100644
index 000000000000..3f44c735cfff
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.17.15.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/mgorny/fedora-kernel-config-for-gentoo
+CONFIG_VER=5.17.11-gentoo
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )
+	hppa? ( savedconfig )
+	riscv? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		riscv)
+			return
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.4.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.4.ebuild
new file mode 100644
index 000000000000..bfe89d1f938d
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.18.4.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##*.} + 3 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/mgorny/fedora-kernel-config-for-gentoo
+CONFIG_VER=5.18.4-gentoo
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )
+	hppa? ( savedconfig )
+	riscv? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		riscv)
+			return
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.197.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.197.ebuild
index 4a10594a85f7..bbb1c4778144 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.197.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.197.ebuild
@@ -40,7 +40,7 @@ SRC_URI+="
 S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc ppc64 x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.198.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.198.ebuild
new file mode 100644
index 000000000000..4a10594a85f7
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.198.ebuild
@@ -0,0 +1,100 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
+			-> kernel-x86_64.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
+			-> kernel-aarch64.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
+			-> kernel-ppc64le.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+			-> kernel-i686.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
+			;;
+		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.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	[[ ${ARCH} == x86 ]] && merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index e54f16151e4b..8db565d918f1 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -7,6 +7,12 @@ DIST genpatches-4.14-292.extras.tar.xz 3656 BLAKE2B e88053843968b7170c7c3a4a6991
 DIST genpatches-4.14-293.base.tar.xz 5669948 BLAKE2B 729775d6f15d31185720debef407591cb749a94a142d44df23e7582c9815415bc9bfa633aa857d6fa377aa5e03cf8eb7f715d690391274821bbbc0a33b1cddd5 SHA512 eb238b631102f8bd13dbc0f7216601146aaf9992d871ab295866aaadcd46abca6dc23bd4f1c2e7150e0c545013ed5fe1df95a764f1da1168a3d5fa467e19f4ed
 DIST genpatches-4.14-293.experimental.tar.xz 5712 BLAKE2B 6e3e52f92499ea9d6acb87f45f3652cefa45876870116f3142412e1df685a182b196982a603b03eaffebba48ecf76917ed86e175bc279d8f72152030e7117b49 SHA512 8d354f84abc76acbf322a8b14516a282e247e026693ecc5416c6b07c535f6eb8f97a8559a42c9e8ee7467794167198cae7bc15ae027fc0746a375ad94617eecf
 DIST genpatches-4.14-293.extras.tar.xz 3656 BLAKE2B f42da17ad4afa431da5524d502740a7e998a575288b69532d45188289641fe0b0c5b2fe1b1bab2f444b09e366605c518526554f1fe671b8f1ee775d9a1bf4113 SHA512 6c41d0d6c70a761b63260a23f89cfb39e59d58e6fde515020b470da722ac274a03d6c72983095b1807df6265f972e158e040a85577595be841d3883ebcf77910
+DIST genpatches-4.14-294.base.tar.xz 5708236 BLAKE2B 033fe71c44372b1dae196502134e1213102db9a871b37cf023a4eed4ed94bbec73ba89559278f5af651971072bee8ee239c2bf99485c1d0868f1203448b9855b SHA512 3f6d7cabb502f72ac7db55700a1b4413d3aa89aefd56d872c37d6f61613eae91bb08f5763f42f0d62f87945654915d00de4c38f658e9c5fd9998a9f7fea6630f
+DIST genpatches-4.14-294.experimental.tar.xz 5712 BLAKE2B 82e42a00a97ba97ec5fd8cdf670b0ce2c6bf2317df5d19357dd128137a06389f78357ecfbb1570002f62eb7d90522955b5d50d8579024e1f204884ca531c4737 SHA512 d269b9f08a1c5d19b1039472df9ce53d37e93f21a765d9a049754510cce6afe78f4bb078fea441259765d71492c64828f1fc9b497411a7cb5d82e6e7aba509c0
+DIST genpatches-4.14-294.extras.tar.xz 3656 BLAKE2B 904852c394f3208166e557d06a79025650d127f11580684c97cd31bcaab7283305318bc93d052224049cfb226dae51563019c729c2e416d2b5c0f3518b1a0db0 SHA512 84623ddafce3b6788e8407d05d584a1b622b92fac976877a74bfa0fc17a9f359fd8923d02fcdcd2dc63cfa8f05310ea45beac75ca25fd95687126d98b9a15d5b
+DIST genpatches-4.14-295.base.tar.xz 5715844 BLAKE2B 97d40627d1e29629802e9d6c2bf0d5a2809b855cf2b21f358b1c2a71bc8263fc0dd4d2d645debbf369336eba09a8c3ef6c3d7770e1c32b159cc3e3e27a3bbde9 SHA512 90950eee1a73826145270f3816b1a1f1b66f5d9a31bd8973b8c886d0b5587872d73659482dfb832a809ec4c19708c805e2830026ecd8fa15a2ccbb60d3421c49
+DIST genpatches-4.14-295.experimental.tar.xz 5708 BLAKE2B e2ac48c2ecaf322919e513d5b83eceb0f86002d87ee9934825cf7683c2ad28b5f5226d023c62efb9f0c6c5d9a084c4aaaa43dbc55e0f2cd83d190fb31fb8ba15 SHA512 9a1ef870099c17afbf1102967f5f63c01a1bb0791141d55684a9ace5b8b15389ee048ac771c344891260af281be620b8514e2867b259e098fd916622e9a1d3c2
+DIST genpatches-4.14-295.extras.tar.xz 3656 BLAKE2B a2ea58b18ae25a3e761752377de177e1b4b33b93d9c8bb1df88e7b620058e960444163ef8745bf0911c4670ac0840f4162927707a68a1d67132cdc386f31a878 SHA512 fed2f2d256056f73162836e023e1fa6cc329425a5436a6096381c75641e2ee4c08a2897aa5b65283af727fbb530ba95f45fc3e1bef717565eab2d76022770103
 DIST genpatches-4.19-242.base.tar.xz 5448932 BLAKE2B d6c21d0052db0b05a4da6ba620041506ddcd76423ca9477edc712b4a6117214c4378937b02ac45028a6438300a2e8d0736a0ca307b0d72a7703a6cce4a284fb7 SHA512 647ca8a74f03965d1e7456bd84e9591166dabce52ea343504c0c571f661de387a4802a1e1aabae27333a81a4cdbac92657880337dbd72d2809f64985ce6a4b9c
 DIST genpatches-4.19-242.experimental.tar.xz 5460 BLAKE2B 421034c39a2aafdb7d1767e2eb1fce8d6bf8f962858b432c35289501344da3a2b3e0c8369aa2d4738b49c5569c4aae76ac31a2aa529f64267c3290948a9bbf5d SHA512 5fb5a9675d97d0341475a599eeb907a5d283ca021dc5e23fb8818a517538351123b0302026f9b7f4c49ff9569e658368b83ded22e1f55f297d2f9ae7dbe8fafe
 DIST genpatches-4.19-242.extras.tar.xz 3664 BLAKE2B 09ddac07ac5ffc8bdb644c32ddf51dae530fa4aa9bdc3dabc065f83d3416e9ee85f758bf861dfe360ce3a9b2ab5e95d8d8c27960009bd134b4ac631dc474d754 SHA512 390d2cdafd30c89480c153c247275e5e75204e9c00017669aa1179dfdd8082f8a637d7731865abf4b742704c19d3217fcba6800de7208f31aebe1e4e4f4ec639
@@ -19,6 +25,12 @@ DIST genpatches-4.19-244.extras.tar.xz 3664 BLAKE2B 995eb931851352da59db6c9a5477
 DIST genpatches-4.19-245.base.tar.xz 5473964 BLAKE2B ed43f95b9d1a135b214d0d7f0715fdb67138944212348029113f1f6d490bd70e4812bd1b12f8583a151d414f3e0410cca852dce7a101529d4b2580b24aec092b SHA512 9ecc973e185245bb0e15ca71dc4233d980e3a679aa8d1026c48de701bfddcbed3449b39d685ba7e2275d0cf8851154f665db4cd8db19bd73f52022087f8777dd
 DIST genpatches-4.19-245.experimental.tar.xz 5460 BLAKE2B bc46d4cc71a99490d21df2a6af0f994c8f318ad87af6b681408993664c77c30e515afe6f5f0eedc509596f2841f17d2a6296708df00ca856a8f8347240ea9faf SHA512 bdbcd1b5d87211c8399f5be140314168b120912504e62b4c841d102b41c5eac2eb603cac72bcf162aee83189fc93a735a481780a6507b164d0feade1375c6e78
 DIST genpatches-4.19-245.extras.tar.xz 3664 BLAKE2B 14114083d38bd91357ff120495419d81447e3f0af3c1b4d54f3fdb0c5ebf6982c3577c7b3a343a257486fa828e69ebf92cf3ab10ab8f0e2f3a228e03b2ad8b6a SHA512 a861f901e6c23cdb2b2c63c9714713af0a0d515d74e5e550936532a937334f700dcac698be690646e39a8f51483820d62e70b3ddc9526708ed78633543de4742
+DIST genpatches-4.19-246.base.tar.xz 5527752 BLAKE2B a72c9b689585e939f77ac9911a6b456fdf8a80000b0d2e44083e09fd56f9c9b2fa829a14b701f7626a599fe89442191f888b9667fa8a19487d487b4888b95a35 SHA512 6365e01147cdecf5b32f5ac8974f6794b0b1f4329acdd9a9014d86116792d8d839f6f23d0928e549473d604cf96d58f7e815b04806694c63608401c3e678aed7
+DIST genpatches-4.19-246.experimental.tar.xz 5460 BLAKE2B 257eaca1f1c834f5a05c1ceb60290b3bf42f0bb598e437e933eddaa3db5e2b8bcebb76fe1cdef4bdf4cd44f71ce9ced722c2817f5a17f5ed7062d8ff8417b70b SHA512 48ef8c131c8189a76bbe161a8028330844848517eb0e1c62fa0dec445fdfc9a903a281c233f1e68fa17bb035617401d69f881f956f6e8985386c289b383e3123
+DIST genpatches-4.19-246.extras.tar.xz 3660 BLAKE2B 6e8dd7081795129ea29ae3e2ba917feea5896c2b452a3f5cfd05e9e25d1c9a17fe1aebdc4716b29657f30c16721faf051d00b11c6973b1393e05173b6bb0a69b SHA512 3b14b9c7b4d338722b90593acf4dc7d06844835601bd89a92efd3de84b92734622153b9f1e62b00b33d3fea17af7d3ed906dc6770b1eb1ceeebd226445c870a1
+DIST genpatches-4.19-247.base.tar.xz 5536692 BLAKE2B 33b693e61a9a16ef56837dc3274ad8e4109b860dd702e2155d067896f1c2c070e80eea26cc511773bf6cbe3315abf273519833971f62b9247f03783666bbd850 SHA512 e0dada2a80af7c75a0e3462f8d7cbdecc72d69af407cba46472d12acbefffeb4ea542c60b2473dcfef51ee5bf43731a7db517f4f320886804a2d6930371f7d29
+DIST genpatches-4.19-247.experimental.tar.xz 5464 BLAKE2B 071a480a337fb254e4a5f2435ed932b2fa9adc6a8a18ac2780287228823309a5c3fd4d24ba497515e434bcd23b33fdea5b8ac68a149901b7c15f25eb15aebbb8 SHA512 11a830167dc6f4e34a81066004dc664e388c4d9a3948dc6e4f900c108404e3caa4bf7d89b92c489aa6211e3ac5024f2a181a240ef901a9a6c83ae3219eb3268b
+DIST genpatches-4.19-247.extras.tar.xz 3668 BLAKE2B 855245d7726433a2cd06e0a4e9804cbb13ee04b16bc636eaebd08cbd526fa81753ade5f5a09e2ba88ce0417f6052cac481103236ff2c2add257e5cfbc933aeb6 SHA512 8388fef8332be046d494a83e55325ca464706230b8679f8137bac44c68fd9e50d78e93026b56cdbbadf452fb1812c7a61c55d7a90547993d95f92fe3ead37fd2
 DIST genpatches-4.9-318.base.tar.xz 5151300 BLAKE2B 568a51692657549568ce2d4332f9e0035dc55b86a4aedf9ce28451cf027504359e108ce187ad9f10908126014288a46aa78016e8d52703b8e3f51b9272442c34 SHA512 32f9802e78c54360cae4349611f58c8e5f9c5e8452721802c315fe75b216e2fe2f7d5808e2ad2e915aea0f20ce65ee667fa3db366d0e9b49fa7fca54304bc6e1
 DIST genpatches-4.9-318.experimental.tar.xz 106368 BLAKE2B ee253ba8f55728c546720dbe206a3c70de95f1e15693950254505173a5721d1d682007a9988ea956533e4cef1b615b3da28b79d7c282a2099af66ee20c539296 SHA512 56453356ad599543dd9cace88ed59399556eb4f8e8d56fb150f08c2532d1a8765b4d7005d96aee4a4c9e5871869ce96f590d86d26f0792c7c8c99f0e643e2676
 DIST genpatches-4.9-318.extras.tar.xz 3676 BLAKE2B f8d266992b4fff6a3668347fccffb6573c1a0af85adda7f622d346244aaaaa8123bfa518527dbbb088f804d6f177362f5d7999cca807c5dc69e46acc7707b71a SHA512 52124e1245b3749039e7e2013ac9c30ff6b2dc6d3ffbc37c306483901f1916b0bf0ec5f5064452f7dd5729ef9da8f94ae7b5dc084ddf81b55078948988deb3b0
@@ -28,6 +40,12 @@ DIST genpatches-4.9-319.extras.tar.xz 3676 BLAKE2B 175063bce5fc92d1534fdbebe39eb
 DIST genpatches-4.9-320.base.tar.xz 5158544 BLAKE2B 176a7dab6bb21a90e5c88edad99bd695e07de67bce14822eb20745df28afc57669fe16000e84f6ea9f36b29005279f924ac390e11ab41d3f15af7690ae7b013e SHA512 e91e94cf45221a05a53610921fc0641aa0f5b8f953f8d8d91b8dad3f94573edd03d32e506ab9f2aeb1f02a744520f181028a23bb34a3bf5df8744547f73e80f4
 DIST genpatches-4.9-320.experimental.tar.xz 106400 BLAKE2B 37a9510055424561f007887d0211ca12d7bcda83dfdf99f7a7da1bb4e0092ec17f24cb0f90280c9bfad6aab83e376ea7a317f2469382632b4145eb033833ad27 SHA512 0f0c046cdb3f81a190e07a54c8ac63f03e24d4d3d19d7cfd686a93e7e6a1873838c0924894b7f99d982267d35e52b8c262d2bca5d9acfc588d2df8c6fb390d85
 DIST genpatches-4.9-320.extras.tar.xz 3676 BLAKE2B 0b9f4fbe98a376cd7a583828d4cd6793ffc1ecd699da20815995a706f772461002b5b7986c2b1c811754b543b342f8418fb1c888746cf146c2bbe6641c2e3959 SHA512 925418b7204b7c5e0fcb73f132c175a956959222819a4a1c4c8a346bf37b0b0a5dc19bab0f3c3b30587eb230d328a249ea0a0575d044109180e2d7612458f29a
+DIST genpatches-4.9-321.base.tar.xz 5188200 BLAKE2B ae2a3faf318f673b938209f734016e0bd4597f5cab2f4e67d530c324401bb76b4fd834572ea5aeb71d58b2096cf158575411b1c25d904a0fbd30ff06cf61ba6e SHA512 92b23234075d8a168eab64dcc6c5975203c9e3d6ae0d09c128671a035eba33df34bb4439231c8600124be27ecac1e20693e4261cff661fe61ed2aa96e7955569
+DIST genpatches-4.9-321.experimental.tar.xz 106388 BLAKE2B 3224b1d648e81393a76ceedf5fff17ca1c631ead77b706b2598ce54248b4ddbc4a7aa7c1cfee4a69295aa3267e7d676b65d21b91c0dba10b7736f1c0dc9f7542 SHA512 62694c8b555f14971d08e196df7b8b667ae473b238769ed36f64b26607266094d30b39b82c41f0dcc795695be8183d366d79e0af069848b8041f9ec3f6d33022
+DIST genpatches-4.9-321.extras.tar.xz 3676 BLAKE2B c88519eb65cfd9fafc826e50f9ef0a78392b7d450b67869f9364075aa7ee987af2db10c57e9391c9e0142938e809ff4e95e2702126373ef9ab97953f6197aa60 SHA512 befa275883e106fee4bbf6b61bc6ad5211d224fe0abdbc9d77af2155163b98a36e23ff21ebf6866351b2615f99a6f37f0bfaf0c4a2ca3fbfb1bdee10973eb509
+DIST genpatches-4.9-322.base.tar.xz 5195332 BLAKE2B 5a5c84f6b5d93aaf3787fb43763d48602a463b0a132a0faff2cfd3597328a184ce19e23127c462922db365c0b5a985c16f99e7d8d2fea5456811a662039da1a2 SHA512 9c6e5715d8e8c5b106f06c24077528579fd02dc5ddf6d031b598d7ae6610dafbe5938bf592b2d4994f661fbd19ce45ab08704f38c7332e010bd7d8e8419e2012
+DIST genpatches-4.9-322.experimental.tar.xz 106392 BLAKE2B cb66009c1d658a011cd7cd340b3a0145ec0f2854d23661f17bb8e3ceed7af79e8356ec292a6851fa3c7fd3a58e59c4d6fa34dcd8516b868977aaac8c18fe4355 SHA512 d67fdeffb4553872d1d9d2a1171a66e0efe84ddd46bf0e8acbd41d5b70a36772f86059147ec1bfb0c95d7bdc2d1b13577dcb9f66c6a64d6e88d69ab31d511ab6
+DIST genpatches-4.9-322.extras.tar.xz 3676 BLAKE2B fd9fb9e1d7b021a140d704ca088c7a6429b255a29d4198f27e8036e0a3921537ae4b386d2363dd6c0313f9aff9cde2ce0c37f47818fd24c71aa85b0f4e0b92b8 SHA512 ef11a6becec65725e4d571dd60ec389629b20d3c69f16ae965d5f98d44be0bc912a5ee5721e073cb72f1922e9e5600e9ec8faef162e1102650c547eb23f92d24
 DIST genpatches-5.10-126.base.tar.xz 3445148 BLAKE2B f21381f177a1c3de8e9be21c3fbf2b5ffd43dd12a7726fbcbec2e259a44e353fe63a98cc29b3e207d67cdf2642aaf142a69f438c395b0e928b13159e8fcc9fa0 SHA512 fce3451abb11c22afc8ab0ccfa6483ef2ba23916e2ebcd3191af775f1286716f90167a0bb835ecc0738d4e8a13326bd0644f46fbff19edbaa9df6c33fa5bafd0
 DIST genpatches-5.10-126.experimental.tar.xz 16872 BLAKE2B 9a963dc0eaf7170318a18fe8b6f7385e08c5e986428997d2ed6b95c027fa3bcc32b67afbf1ded290ae3f2b70fae3c9e2e902d9723707fc731e5c57f039d61668 SHA512 2be758896ac79b8a4d2bd1c8cf4c6edaa87d1e8b30938af9d26c496b26ec2180700c607dc40d72324859965b097f459be0d3037c1f25b74fddc7290b11c294ab
 DIST genpatches-5.10-126.extras.tar.xz 3868 BLAKE2B b08b05b945fef23421cf8a0f18c7b6c23e86edd4717ad80b24f4109d199373477c0bb16cb2a370a540c2d97bc99c1bb4d9feb7a9c964e9e80b9505cf51ae0ab6 SHA512 57e81535f7cbbeba031c03d0bf634035789266d1be7c7254d44a6777e554b5b6b14649c04e2a910ecc16f8e53f122b6bd0c9657cb5c9bb1fca56ab4d73f1f259
@@ -43,6 +61,12 @@ DIST genpatches-5.10-129.extras.tar.xz 3868 BLAKE2B 85f4030ed0bd5aaac7c1e0d5f644
 DIST genpatches-5.10-130.base.tar.xz 3642656 BLAKE2B 6627de9e9ff113ed2a29e3815d0423708fe00b15f706b48e410b0770a4e78f848cbdeee48f0b5012f397f05efaf66c46fdaea888bb8b483c1c1d8c81998b0b0a SHA512 ca834e87815d241326de8c0cea3bceb31909103f86f4d569dda64784b959744200e6b10e794d8527fba2205cadb47fb31a7cafd183f298d67969b96a67146230
 DIST genpatches-5.10-130.experimental.tar.xz 16876 BLAKE2B 140aef0e9b1a21214ae0379bf43bb717dfd5b59f116d0ad9e4e3263e645d2819c3c3f5d8f1c75c91142bc06caf169dc44d912e8e122f7978dadff6bc7cc92db0 SHA512 a4b20f5747f55195b4c6fe446f6a7e15860ecbd0368bbdfef3b5613faf78b7355386c2678aa15cb1c3eb9f381d84b19c967f5196ce8146cb674c003bade3233f
 DIST genpatches-5.10-130.extras.tar.xz 3868 BLAKE2B 2aac33beea74a4cec64d91e169444869d280a2b6ae3a03f18f1c9f2d7f212dbadad157f3af828edd2e2e9212d08c50fa33dc857f28d4a67464ec7256589dde77 SHA512 bd6451ee386262857c379d2e46a4e1929ea571dbf5f61b85f5c63e44684653d5dd0111e30929f73d3266ae1e7cca25e6e050935eba7d6708d261d87e6e633d6b
+DIST genpatches-5.10-131.base.tar.xz 3676828 BLAKE2B d16b120518abcd9e58861a9657189345f5fc113df3c291ba350f895092519972fca6757798e619725a5da3f833a712993a089a6c34bff53be983a6f0ea97096d SHA512 62ca509f6f43f996ab6a6d8d1effe26f999e2503fdc5ca041b6ec8229c09202e4d35b8a3e79777a717e6e2491560d578b8cf9c35fc03cac705c69e14f1d435f3
+DIST genpatches-5.10-131.experimental.tar.xz 16868 BLAKE2B 62fcc471e92f7cf9b16f6f787bdd3c1699874a0cb893ae6729522212d0198a850f2948d91e667d93eb88716789940caded2a11905f0414845d7d844e8e9d729c SHA512 b8567ffc6f980d24cb76e65ef9cb6bbb20942cb563f9f773d5af9fad67a010e0c30f0c491d4e339f11fd66181ea4bf60193940a04f99d9870897b7c81a2061b9
+DIST genpatches-5.10-131.extras.tar.xz 3868 BLAKE2B a873f7ad0c932107ab45a91981d89886fb65e5271bf9a9113d55404405c2a592286fb86dc1c24776601707494db6994f0aab649eb79cdc990843c3194114e8cc SHA512 e8386d12ea62a190315fd9097f148d01edcf9c6fed85a631678e1b85f64104fe580eaf1638b4ccc10cb83cd719522ca6b0fc23ebc67e72960e8f045cb8c13bcb
+DIST genpatches-5.10-132.base.tar.xz 3685068 BLAKE2B f46967d4a4fc013f6b7edb2e8ff427607a2521a53304bce80a371204f6a325ebb554db3a3e94178f1b6d4ee1bb71ddf254b7b991074378b080f0b2bdd01d9671 SHA512 1edf845da90e7c66d95d41d2d40141210cb7b9b786f29e5fc1c982d64d8b1a918f417364c6bc59f8b58ecfb8aa9b8e4df71e7752926ee68724a63b8c6213a14e
+DIST genpatches-5.10-132.experimental.tar.xz 16884 BLAKE2B 9c5919ab1b609650ff668f525d24eb2484bdd9ec2013dd582a4c0e67c7c64e4fca08b86f8a80f4a6ab3367d57e66a7a5ca4c837c0f7d7fa08be4c884a57b9072 SHA512 2827f282b2b39df80ac903ea28dc3e3710c97c4b45d6a3f983954bc615184c957c55c38e56e244efbe32fcbb84e6358336bac7b33e5a56f1c2eb22a81c30bb4b
+DIST genpatches-5.10-132.extras.tar.xz 3868 BLAKE2B 207e7a4bd474202ad112c450b49e8ef3ead28eadfd1e35916a7ed7d2439c9b435ca2a6ccbb56a6e761b59580751c85993d3ffb6ade8908b8f1993638ac8cfa20 SHA512 ffdf7573a027e5fae644ab22358bdcf74c7d023e28d3cbd08f01dfc02f6776956320cd1bf4e91568de64bb6eaa88682f393a257233b310133f35b2badb4bee46
 DIST genpatches-5.15-45.base.tar.xz 1826632 BLAKE2B 77bb4d997b63723f677f82b91b33afd0f35367d9304051999a0daa84da26feb99fc76a61af77a5e477a5a8ded1a5c12316450563cd56b6c93a93e6df6421b107 SHA512 9435803d4dd65fa78d8e14e992681aeb016d3672b81d589b293d1cbacc024605e18429529803ba344ecae1610bb77150a7b2405cd43f00fc905e9c6babef04c1
 DIST genpatches-5.15-45.experimental.tar.xz 5420 BLAKE2B 984a3e683708e1a1ec4e77fcacc592caca20d134a994e3922548b2cce0aea6b69e0dd3ae93899182b147e42a171b2dc5b230e601cb3b06b09ee6c8ca88bf489f SHA512 7305e4777e3001ea5526b059ed1684c16879e07f83f54536d1326c03a495915cd1f9776865d0bff024053312d9e9f4a94d27e4c047fffaff831995a5aa69561d
 DIST genpatches-5.15-45.extras.tar.xz 3932 BLAKE2B e2c4132995b7b39c9d135e17cd21315013cfa8b9de9b222206d9ff9a5780c4f35be294eb6d71130a9f4b9fbd9c2f31ded41c1c6dfecb2fdc4401118411a7485a SHA512 5b1cf3281df2fe24eac3827b0753c83305dd956b23351899be1dd37a89d00917c771475e3df3f9980f6b0fd210420b479c6196c7d1ea2ea9a0d711fab50cfb64
@@ -58,6 +82,12 @@ DIST genpatches-5.15-49.extras.tar.xz 3932 BLAKE2B f38c4df269bdaca692d05f2b478b3
 DIST genpatches-5.15-50.base.tar.xz 2105492 BLAKE2B 518b28b1244d4a84a02f0a51637989cd20e23e33eb1114da1a7102e8ff63c225e2cc8a425b0f34dea6caf1c14094427c479f5a6bca4f5c52440ee0dfe2745db8 SHA512 4fc7266870ca65f000e7a431757e78b7d2c2c4e9c1e2b39ed5492b7655190c6aba624be30dbcb88bf22c2e19b8a3f0849a4f4c388a406954241a47619c1cd0e9
 DIST genpatches-5.15-50.experimental.tar.xz 5420 BLAKE2B bd624f2f44cc489e898511545692b8a676d6eb935a48c65d2e614d216a228c955495d01ebd6781f65811ee91bde6b83d2633e23237b5b3d3a8a97ae6bc82f2c9 SHA512 348f0270ffced7ad9cebf1fd6db4671f3ff3a7161051212b9150cdce31111ff91cdecd2e150e80e490a54a1dba10b425269f7050174fd12ab7eb5d16c4388610
 DIST genpatches-5.15-50.extras.tar.xz 3932 BLAKE2B 969f23628d80be3179e13aa7b09f19d104e13f656446e00bc4f25f3723184f104b18d835a28cfb16fed9fe1d9be68a274c14e294669beec631257f9c77d4557a SHA512 2ea8a7d58a0989198eb0df196757dfd8141cde484a6c652226fe09b030e12856793d2ec5f139096354c808840e572eaa3a236bf0952c47739ab9c13ba508286d
+DIST genpatches-5.15-51.base.tar.xz 2168832 BLAKE2B f27cc35f69f1a1d5ea36b9e21b3b935fe7c5dfeae4f925390b6df852b838e9d771261d64d252dbc0070b135afdc5713e4baec49965f426210d022ef99156a32a SHA512 30b2644ca4c40fc1c1892f022cf169dc180b996abe184d78d4831c435319c840d9f384260a29d1c38b8acaa1c2923a1c52a7f742d7a5f3c309d01dd76a485475
+DIST genpatches-5.15-51.experimental.tar.xz 5424 BLAKE2B aeaaacd862904543f7ee99476566338725395507e07a55cf6ff2f12f5632297e453336a79fc47f812405717cedcd60d75855cf71c02b7a5341127f00b34208cb SHA512 3dcfa9f8e3698e419fa558a66454df4304995940028d05e3b46e523ca92e591f44f9956a09975b2d5d99c34e8b97213aae4b0e10d0460d2481430639d92f3697
+DIST genpatches-5.15-51.extras.tar.xz 3932 BLAKE2B 14e232d43f8003b7dfc9f083dfa0a86ad8673d6cc0677fb5d56b0bf34dc76d05b903075e36421add28fa06cc1fe0774437e19ae0211f15dbbdba8e920218fd0c SHA512 06bc24ade088f2c7c0d74e308c90fd4689cc35152cda4019272ec78fe8da9129853f68115d7a446fbb05c8fbffec96b36f725427270b290e9a43ae6652a15e7f
+DIST genpatches-5.15-52.base.tar.xz 2177024 BLAKE2B 2fd4767dd3ae66cce6a179105389ce6e57ef0bf46f2ed5cb9a350d300472f813d22cdabbde4201acd6c76ca0c7701d09753351c12b4eea05fd1e93142ae4d526 SHA512 cc5fd2f260366f8b2715e09c4124d269b168bbacfd40ff36d6ab113419b30331ebd000adb01e5e6df4aff27487e528dc2f3e154b7df32d37e1f30f5c13e247be
+DIST genpatches-5.15-52.experimental.tar.xz 5420 BLAKE2B f6b4d8f1efeefa4a23c8b014a7ceddc0cf7c70a193e1b4a1a7f18820ebc79709f1c5af08e31943c9944505c66339aa9f28f9d3def89829a49a86ece330257e2b SHA512 50c6e5aadf588fa5a6b25d533841397c8770e24d41259a7bba268cfa2584f9574276d6ff9f3e7a530bae146174458252d8b6d05bd5147a36cbd475aba1272707
+DIST genpatches-5.15-52.extras.tar.xz 3932 BLAKE2B 8735d0c2d8e5e3a14f01893109e8feb179d6632e0dc3254b57d7545fb6280ca09bf9c2baaef7ec02bf337cb0f1a0d42f2e44dea2168cfa2c2ad20969b64a178c SHA512 c461a48096d46bacfc4a2d89060b6e72584d74b215b3ba5c969529bfb4330672c15b7e5f015492e5b1ef081942eea60342a7d413af3fe28f2fde730b41553ac8
 DIST genpatches-5.17-12.base.tar.xz 685640 BLAKE2B 3a662f399b18c9ecf54feb6688b706e2d2529d8c6ff763767d0539475ee23d11bdd76dd236da639f70600c2669b1e6796580a5dfd3d4c5c9491d79e5fd199b48 SHA512 2f360dae9c7f5d298224364fe02dbdc99006308a476b989715111b77710c4c805c018ae95c8c699db34776f74b24e326b5dcb90f4795d0696cf1c40e8d4cbcc3
 DIST genpatches-5.17-12.experimental.tar.xz 5400 BLAKE2B 3a83fba28d1dec3fd9b59eee0255034af165bc2c4e64c1af2a963169ab77d649e2ba2249de5383d75cd87cd1bc73821c38a14941c8a6752a0b2d5d982c4bada8 SHA512 8fcb480b404a844c8fbfa3604acd5a31f4e7182e60ef54f80a444e50a9c35a0c2324c64243a31c5427d6ea02fa56416e9ffb36219b3d670b66de998099ce00a1
 DIST genpatches-5.17-12.extras.tar.xz 3932 BLAKE2B 3c0b16365f2ddce7aa5323413a19ca1b37fce7cef2d0ce15e47b54dc3450f6cd62ec64d5913ae2817c302ee4fc2556f9e6316a7272aafcd558fc309b3c00e369 SHA512 4eeb7ee2649edf630e70f82584c278b4f6758e2937c3b067575286a3353883baedbbbe578222bfa187674d953b036ee2f1c89d001030efb1db6057f6d264f9ee
@@ -76,6 +106,9 @@ DIST genpatches-5.17-17.extras.tar.xz 3932 BLAKE2B 8c858ea2d37aa0a60752e051af6a4
 DIST genpatches-5.17-18.base.tar.xz 1040972 BLAKE2B 71575497161db10073de3d7db41a8cb82a063ba8e175016e411f3f6bf822b810c1de4172a47acadced51ac750aa90f41aaee040f85e214b7f92d95b3054e660d SHA512 fe5f8ef1e5e7c662d0c7a6836a195bb07dcb616bfe6417c8226825a0db6c9727ca323840edb8c969480fe967e5f7ef9244ce14df14f369b620e4a2e60742dafd
 DIST genpatches-5.17-18.experimental.tar.xz 5404 BLAKE2B 64899f8c6c3db733071adbce5375cee41ea6c01b03624698b0a2ed0c775e6aa91614b916a11adbe7e6c9afc8bcf5800614be22442f223083bf3e93cfed814c13 SHA512 657596bb2cacba392bb4883b15fd8e05981ae799678d60ee62e5927cb403a6dcfb850d0f8f461d8a012a9359fc9f464f69672e7413b67165ec61b228354c7a2a
 DIST genpatches-5.17-18.extras.tar.xz 3932 BLAKE2B 754c044fcf38d26a062d977505b3a25f663b90f1cadfa1aee524946aab3b84fc08463602bb8d5681b3303f459d6180e43bd1ac25b0c830f3163a9b8cce5029a1 SHA512 f135e3724cd1ff190d3d117c4afb5559a8908e1483e6be3cd783c42c05b8c4ae5b37c0a1537fddb88ed800d9faf4fa8996641201cf0a6891e31be2a3dda2c558
+DIST genpatches-5.17-19.base.tar.xz 1122576 BLAKE2B 62a8ef6da90d967676754daec496101b7638c1301ab5bbde5d94f8186d66f7f5672c55b8f97ca64cef9a83da00a46db7ab804cadff62d3137ecdd2bd41885be1 SHA512 b5aaa9013bf2372a658e885ce37e3171077002881e95bd81da87ff1a69645d4daed0f7717b4d35441f25ad647dcbbe92ecbd01318eb449101bdc415409c60e41
+DIST genpatches-5.17-19.experimental.tar.xz 5404 BLAKE2B f50ae6a0b623b38aa5a29fffdd55c53fdefcd451be59c7636c861fb397324bd8eaeb18fe3c476a180767cf4ee0ce9e4a06b3e6788928ceb16d283d38942463d9 SHA512 1a9d538ba714b60ebc8a5b0b8a80a21829d395a382a2cfa838bfce58c2437137deba661ec6b1622b674cc0fa67ced444256050392d5ce1b4d6a9f5b3dd988432
+DIST genpatches-5.17-19.extras.tar.xz 3932 BLAKE2B 87ea5b908c969c61d8da8067f13f0b674a4f72c4614b576a5b7648cf6d6880e88735931314faa43a3f4907c4d75baa3f705908bb609b95af3d9de582dfc7989a SHA512 191eed3aa27c2a2dff28b79a45db4d2c703bc45f5f63eaafbc6229541138601b6462df8262d808fcb5155eb7d632aed85e26d06e13a4095e305a493345dd02e3
 DIST genpatches-5.18-1.base.tar.xz 3800 BLAKE2B 52cf33aea903e8783b554127936ebde68b1c2655567a27a6dff8b94df675cde779f940735824766d2267c7d09df970522ed3721b3fe661dc12e64c4b105b4c99 SHA512 461037cb2fc9246f1e778123a9fd58682ed2749c95acd8d30dddc1a31a66cc4961bb5b133a05fd6fb19aea1a83bf0be8a76f9e6422fb4d696010d248609534a7
 DIST genpatches-5.18-1.experimental.tar.xz 5404 BLAKE2B 5bcf5a103157f1c3573d0fa9f346331a91e4e097652a845186d13f0f461227b139e86775b27892552f342f8fbcb40d379b6b4949b37a1d62570b042c60a31eca SHA512 e19855f666a11434ff2dbcac38ed01ffbf5094d17cece8e3d78bc62f913f81395216c681dd0ca858d3efe7a186a7f1392e114fc096fc203698c5b2047daba3a9
 DIST genpatches-5.18-1.extras.tar.xz 3924 BLAKE2B b4c7e29f0237ae9e4e3300c8be75c0def63969e5c4dec52d4d5259a6b3b6d27406883e45d2ad4d0fe576a1285121037fb88fcdeab58a5fabbb58d4847cbfbbfe SHA512 0182a96feca475471d1dde2e8326067e98f8f43a6e9122e29635a52ae4ca56eaf6ac349b189a0198704c9adee62cbdbd2def7e90d2dad564c72bec2f8ff32ec9
@@ -91,6 +124,12 @@ DIST genpatches-5.18-4.extras.tar.xz 3924 BLAKE2B 9d555b98ccc35b3d42caf7fabd4675
 DIST genpatches-5.18-5.base.tar.xz 330636 BLAKE2B 6be3ebe1f59f9305fc3f153351610b30e42ff77d6c5915a31750de58b3621956c0b621179f36958625dec111a8e8affb923ab2757a7d82f512f709482de731f8 SHA512 5aca67052e1e2e386a974ef7c713fc1c69f88622105825a51202ad5d4692d712077c6528520197b38713d03f5111c5f16ac20a4be581370d832b2b20c2a33af8
 DIST genpatches-5.18-5.experimental.tar.xz 69984 BLAKE2B 45f3e324bceef184c5c914f3e0bddf0ca78866a77868bf34c069d66fd2152641b48bad7eadf0c84c564802877765847d888bf90f39d657aa946e6e678728b12c SHA512 4098203807babcf7f03345b5a6f68d6f765ca38937ec56bdac3eecf1186f65d2c5ecfb689a0bae6c9ab263e9f1fdc2d4579c0d800d38ced8b60629e6ff9c616b
 DIST genpatches-5.18-5.extras.tar.xz 3924 BLAKE2B 078d265e4097da325de808822789cca1e6f353d44fc938e6d31f28c7d0790a83ecc9a05a9ab9894d3e1b9091643a0f7a243755718120cf1c782a486c21134130 SHA512 b614382c090deb2321dba4d2914e7b0cd34bf9b135457fb13f59a80e3351437cd0d832b8f803358e5e1c06b0da3ad38e432e09b5d722afb0f8de9094197426c1
+DIST genpatches-5.18-7.base.tar.xz 431972 BLAKE2B f35163850c12f2610d487c7ed42b80b1f88b982f10476124d6e19b942ef1e2a012100325ff98807fa3664adc62116e843cc584d068335767c374d29d24f33b76 SHA512 9967d15c984f731dbfe7fb7c9bdb1270678efb565bccde88dd9c4bde6b3e93720d52c96db943110e07aa257401431e9bdc9f4149f9bd1cd983605ce369277d0c
+DIST genpatches-5.18-7.experimental.tar.xz 69968 BLAKE2B 7fb0ff78b090153a25f6f298632fa9eae623a059ba6811d67d28f269e86d60767c81d6178f3a8b4785aeac06fbe825b8cd6098dca23b34fde21d6a2f8f8ceb9f SHA512 a07e0d27db034f2d1183a34c67ff57496be1695f7eea7f5a1435bbd370f821f0ce1e1cda06846e5761eb4ccf4bf13531687c3a34ec208a684e937c51d6f81c5f
+DIST genpatches-5.18-7.extras.tar.xz 3920 BLAKE2B dac0cba1f0a14780c6b8af044fc505466671360b06bc15c3ea1dc4b69ed1ab3978030d68d8417b52b972e7567dea8e42cdf3894b7bd86420bfdff3e7afb075b7 SHA512 cf97f18c7bd726494c0091303101ab3bee99cd9243a681eab4460c4f0c9edd5b03e23be3295a828f2eaee0af35d033eb8bd468dae2d981afba5af47a7ac20020
+DIST genpatches-5.18-8.base.tar.xz 440848 BLAKE2B 8a965867409cc340b13687eec9c7391bbaf26b770ba8d4b657b923226a539b7b68eabab6f12bae4bed09a0d198917373a6ab4f707831c652e2461a49f8dd4981 SHA512 057a00d62f4d8ba7be4ea26aeaa4bfbd5581b22ded85dae71aaa693621eda17532ac00bbeaaea1689f552ce2b95a04e9aade603f6236c2a265aa8fea8231c5d0
+DIST genpatches-5.18-8.experimental.tar.xz 69972 BLAKE2B 4f834dcdc80279815e172a03066c37f930af688c61a294c588bc262269304f21ec6d4ef07ac868a610e607ef8aa0fd3c661ca1152df125532349c8c7dc6082d5 SHA512 a5d2da014d45bfe299759b4eb531a67d79a6b2dc382b5da61d09849eae9815c5992cf07a5f5c192e341a6c32056a535d04180e64a8c4aea6cd8f8194820f6ee6
+DIST genpatches-5.18-8.extras.tar.xz 3924 BLAKE2B 3f575b12166621c67c9cf6ee15a76af551a039d142a85678abc10829e9a573641be8557b9b606352d46fa4d123e95071b2946447a6f53afef5b37eec5f342cf7 SHA512 7aab8d9d18dfb6129ee0e995450c9d9d759545a9fa2cde1d26dfc03d677b9133a310f3943cd77b5981830a6a1cff59463e85759ef5cd68bcb2838dd96104f590
 DIST genpatches-5.4-199.base.tar.xz 4683396 BLAKE2B e1e66ce10c436bb196a5890e08d5beb8d0a1ece7f19f8fb3b1027747509cc7b6102ace634abdbd299dd48fbc8750f3bc127abe55014410b1d558b4aec497f475 SHA512 8a16d67794e864749fdcdbf413ec0fe996d3c4fb5f04f8c8a2d3001377c8b5d4d7007a96efaa3590fd4b595cccdea36d83c6dc292629566e5398f322658d80f4
 DIST genpatches-5.4-199.experimental.tar.xz 16904 BLAKE2B 496602e26da272a8b58a61402eba0fc9871a96e78005014bd49b4e4354336269e17eeb6828a393c74f0d0cded080247f561a1bae7f6ed22c22d575cc12659ed6 SHA512 fb23e903b297b7660df9aed9aa3a7c94e100c2aa8061e7591823b4abbca82c898f2775b42e319908e4380bec45138acb44972e1f2d09927c96c141a4ba6deff6
 DIST genpatches-5.4-199.extras.tar.xz 1812 BLAKE2B 03b9ebf9d306256e58c895006038f4bb3d908590ef2f603487d9b970963c24acfbe78fbe862b2b493ab477e6e901aba332dc69916eb881fc42a79a62d7f81da4 SHA512 d100e876a9b64d662331d4a78b8531a71144bb70b789e0ab0b76e6957c368ee3a88025e040cd622dd4cf6e4da358a3636571ddf55b94e42dbc250a62a629baee
@@ -100,6 +139,12 @@ DIST genpatches-5.4-200.extras.tar.xz 1812 BLAKE2B f9d3d87c5aad19869ae7d1c82e130
 DIST genpatches-5.4-201.base.tar.xz 4708884 BLAKE2B 3d6d82c90f3b8e2cffa9d9c1cd5bbe74536d44cd42c5d870272b8e87a2a99f16d338f8c28511864be87f739df53f3bd3bb2f7313b4b04f78fac2057778d5d439 SHA512 5ebe9454b61142e87e5384a5718399c4c99b059a8bfa0db638f20f2157eb2f67117d58f4d046bfed09725ba809686d93a382ce1acd63520b16ee1d8820530729
 DIST genpatches-5.4-201.experimental.tar.xz 16900 BLAKE2B 850768b4803c4d11e9e55925306dfaf0c9588f4f6ae7c9105c6d7f1738bf5c9edc57d083608af6659c78996e4a0bfd15520f98e322c537b98d8ea8848c833ca8 SHA512 b6f26963eb14a2b3fa0ed2bfa6e60e900e26c49cf17b039fb13b5e64e6f588c341af61ee28669ce5b9dddad270a778edd82427ce2c62c9235e7c5c9312793606
 DIST genpatches-5.4-201.extras.tar.xz 1812 BLAKE2B 4cb4f2605dcf2e374521931bbe92026246513251f53c94494d076f7da87a85dd5a2c27f4e97e72262853a90905a4a7b2d842258eeff573a8a3292fbf30c35c73 SHA512 a74d28f5014b43422cdfd8ea7a08b71faa6f0243cc1ea409e199d81e995e14cb6a849d3624bd766cf31f12a44650945aae645f37ea98079baa1d7fca6c89981e
+DIST genpatches-5.4-202.base.tar.xz 4790140 BLAKE2B 2ea183e7c63ce48f2d418ba4606782eae8aeaefac556f93a9e3358d1eb62609f431b973f0d54c006cf723e4172d73a549ed00229a82dd4f1e3717951b0cb8a3b SHA512 29f6a7c0fc679273180637cd70791b19dd1a6a87f66c46a29df2ed5fa01a5c043202853c2becf6050f4cdfed0e7ef2a7dcfbcf934623b85578a45ed3746a2fc9
+DIST genpatches-5.4-202.experimental.tar.xz 16908 BLAKE2B 5b77367d4bd1382edb054e3ded6df8ebc65df2ba59d02ac38725a9d05ff790df492f917af1a296456a6e196f5ed8385a2c4c9bc3f860060e4b43cd2381ab60a5 SHA512 a3259d5ebe27efb789882883be8ba665e9eeb1bd9102b3e47c56ec14e53ce403c93e6eabcb502f1a82104c5db34aa3644d2e307d4ee635850010fbb1757931de
+DIST genpatches-5.4-202.extras.tar.xz 1812 BLAKE2B 710012cf071fc8e65775bf36c372bf1d6743824061e8ba42cce58440dcb4e207ba5a97eac16e19c0898b991cb39e327ac0417f90e5b8affad9937c7030361e60 SHA512 75d828543b8a15e32bfde13e1fef6fbf83440344464245b77e401a69968d33de459fab3bd7668838650cca9aea3475139f3206001a119463475dd091bdca2a48
+DIST genpatches-5.4-203.base.tar.xz 4798932 BLAKE2B dc918ca3e7538b66b87a8bd8d2c673f56b71706d913007176de20014a2ebe38889541aa3441af7f4d6db69044779a1e54dadc122e59d180c15fe5131b8056aca SHA512 975dd953d5baf0e72e5718dd4979657597adc380559f41e769e94d294a08b272ba06080517d134a3b2611a6d4779cc3d8b423d869b7dec5e6c43af0634996871
+DIST genpatches-5.4-203.experimental.tar.xz 16912 BLAKE2B f126e612880a8c09920cb6640ab69e360b1382bbb28af03f4ea9dbdf57b2d673f2aa4b0da99652094ed7a935795a1fb2540981e14401dbb5344a4cdc95529957 SHA512 07c63f295ddff97a1db697191dccbcf44796b3f1b22d6f8f0075e2619d005d1da4407fe01651e37a5ee52800bc2d60b7d0d79e234f7247f8b1498213142d682b
+DIST genpatches-5.4-203.extras.tar.xz 1812 BLAKE2B c4f67f3fcd08b6d845c7fc6174a747e805ee2614ddc2733771cfeec8df5535a7e0a6b8c3528b23c7cd1127765094deb565d3e1b96bda5d1882510cdce4b050ea SHA512 029f4ba2b1fc2c581d343e9847b926ffbcbcd1c0a5cc45c28f35f2ca1572cffaf6ce75a9bfb42d2cd94f6a93ab5bdb8a3297636ddeb4be4afc66efa87a55d7cc
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4
 DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
@@ -111,27 +156,38 @@ DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6
 EBUILD gentoo-sources-4.14.280.ebuild 734 BLAKE2B 333a6cc64d73589ac11c139a7648393504d33b3bfe01efeaefaaa3af4cd595880e7666ddcd6818ba51ebe6188131bf7bc5f010190cec03995dbb823b8040db63 SHA512 146a4ab527762860fc885f00cee3f1c22f1a217bd653ac16c95b1f4924b88ba2728740734cc3cbbb31a9b2ef0e14a957d1371776801f173b4ee6c1301cd8e7c6
 EBUILD gentoo-sources-4.14.281.ebuild 742 BLAKE2B 2b5fb41c6b563e63ba6b0d0c272d3618acb08b6d3e7be9f95c510a747694da817efbd94f6c3f2e4910ea348dfbf16ac4d58b2e95ed27a6155ddc0e0af487a35c SHA512 64a2e25e00dc975969b560892cf8dd5dad093e887eb0d0fc8d593990fdccbd0669d10178077d5eaa75ebec30f7c2353f1bd1408c9c7a66ec212c2f4532c1bee2
 EBUILD gentoo-sources-4.14.282.ebuild 742 BLAKE2B acabdd0d9f6301568ffac5e12a410d4e3af9e7b9227c3a0ee7c006a309d123a876ec8583ca137db126571c190c229d982e0f1b15d7ca8122626e5ed17fa39948 SHA512 431b43cfad0ec06fc4417b8c5589fb6000ec46c608331fd37d14200c295cbfadd7dcf9ccb65d8be3d9338b938bd2058737f81a3546339aa81aec7b3015f113b9
+EBUILD gentoo-sources-4.14.283.ebuild 742 BLAKE2B 7d8d0462f487719543839d8928ca91181d31d9bf5162aa8ca6ef972b955a287cf0a8d93275203db42162a8f61b5b920c4c127315235b6e7175fe47d41cfbde76 SHA512 41b474f818a37643aa73b504dfa7a08a144d837296aab7e818c06cbc9f90829f78a24b0f23f573a5f13246001366fc0e58b6dfad2e3fe76465a8adc3ca22a40a
+EBUILD gentoo-sources-4.14.284.ebuild 742 BLAKE2B fded4aeccaca719f94802f28cf321d522d0a50068ae5115e32272a42c9efd1264717c0912b06839003cc21f50774fbe05fb3c03c2ff9e1952230ca144771664a SHA512 fb75f19d4b1b7f4307b4eea57f12ccaac398329a03cfadcd376b8b7936dccefa868783b9a3556ab80c59e4e4ad7bd741d49b57efe2a8c5f4ae986488afd70501
 EBUILD gentoo-sources-4.19.243.ebuild 742 BLAKE2B 8daf193410ffa40bbb966c15dffca709d526bd814d3207ba0f13d19180536b20549a931bd57d2f54ea6ba12f14f6b11d19a1ce164c45e677ef7a065df9c051c9 SHA512 26950d2bb98b1489688a17f8ae97661ce00e8058b7385c8fcb21aa74caf362367ab210656caa2cac65b5934537d74e2cb49c5cd164760810ea355ae8f8b076ac
 EBUILD gentoo-sources-4.19.244.ebuild 734 BLAKE2B 705c271d2f72b0ccb76a8989463685d16bfaa02c9448a41e33f34b29acb2221160a7c95ec704f19065c14f962788998b19242c9221cf573044b579e503eec9ff SHA512 f126d2b35e91c60a82696b18beb10019103e70c2e019e803a3d67ed6efaf77b3fe7815b1e06a5aec6fffe911499847aece8580e4b0d9d3a59467b93e7ed06d1e
 EBUILD gentoo-sources-4.19.245.ebuild 742 BLAKE2B a21296d5fd193ed90b032e94009d5655d0ea6551bf20d7a0a738c39a542143fadf6475cda9dccae252e00984c0518857da8b4f93965478f7692e2198a8332f38 SHA512 e3de8d1eb790f41330534ddef3e6e6b1b28043787902aa1e641800b2ddb9c9fd1df03501f44936e957b14702c8b8eb27ed21655a64469e27319d4cd1714e9055
 EBUILD gentoo-sources-4.19.246.ebuild 742 BLAKE2B 5c70dbad7a55c182e6ecdc1f51e4dbe5909a0fd5948283311c0465e76abef8baeb3954153787aab9bf0dd8f8f25ad06f8e061c86386bba21a22ee78da736cd9b SHA512 c349a0028ad7c053df41a8f9f65500f2ca7a2b2676680acc883bd94d44c67e99e035cf95377ad87d37c1aed08d0202e22a325196da1308a9b764a619b3e82d0b
+EBUILD gentoo-sources-4.19.247.ebuild 742 BLAKE2B 14cd1072c320fc48ac2f93339765632d2f6e30c4cc93ccd3101e2e34679893a07042c9e58d922d6047ce9d1815a0d883a3bf9cbd7623036e053680bea2fca1e3 SHA512 450584410edba59100581fb43e992e68d1b88f946bbd16619b65dd7f3a308004154485747028e92dbe123b958f1951e30ef3773a019e656a87ef461da8c2c580
+EBUILD gentoo-sources-4.19.248.ebuild 742 BLAKE2B 0fe228b6b10f23ae856d1bbefe722d1440ca2f094c9e257bdfd84b6488aadb40367cda3b487225d6c885774b8d2c9fab2e6a4d45bb9afbaa85eb024e1eed0f80 SHA512 8cc25c397e15fdedd1bdbaa2e65cf1019848e90022539a20275c71e047656ab8d78bba733b269f0960547ad7c0d36d7dcc15163f6545ec0538a90221127cc901
 EBUILD gentoo-sources-4.9.315.ebuild 734 BLAKE2B 5c84d1adb0c04d2269039bb84a9f8b351cfb914d70c1249d1f00c09ce430e84c7bc8a404043b0fecce8d869f1fc32d82d2a56968bef4e88ceabf28a668100adb SHA512 083e79e987016712dde1c72433fd3b3fb0ae7355eac66abce77d5b5df86f244347f587f7b860cb3aae675d8914c850b9dd22fe3a6cc614c9561b817379649b93
 EBUILD gentoo-sources-4.9.316.ebuild 742 BLAKE2B 50b39e1107cbd7810cb5458044e3920433d70e411a56dcf816cdd46df6785774382ef992a92d8afc1c3b2895e0e5ed2b64992d09a6fd880d02d920da567e527a SHA512 a8fe8a73edf09704f1abb60049bfef3ed4846eb835c21cfe3408b451362c850fe1efd6646dc39afe5d036c584060852ef8d2730f4f5ac8ef7f6cf29a571f4c9f
 EBUILD gentoo-sources-4.9.317.ebuild 742 BLAKE2B c5e7b85918e7af71f74c9480054e5dffd8828e59e2cf68cc4e93bde111b99047280311a5823361581fd3ed2b6ce906a6ace42c27d1f691829648ba854004056c SHA512 a99535afcb8e983774f7eeca56e854919cacb5ce66f2d4eec130b6d598c460eeef1757f6f955a65ef27290165229b71e235d9dc9ca72b6afd5ecd6c41342005b
+EBUILD gentoo-sources-4.9.318.ebuild 742 BLAKE2B 6bdd02c94bee05a6db0012a7218e7dadbad92934105238726963fbe58b1ebe4d99fb812f944d6121f5393274f611ff0edf5d6a9baa37cb6805144bb23fca48e9 SHA512 e2f3431092036f27d8f02e429cfb278bc793fa54e79dbf22fbc96d3a76690191ee430805213849cd97cd61d3800952c5b2dc3f247f5400e4abc6cb6702463fd2
+EBUILD gentoo-sources-4.9.319.ebuild 742 BLAKE2B 9ce62a9a4e5d55ff60572bd7e82997e4de05cb02d941799361c9e742f331ad55b4ea33c0cac5dd4ef4af34d67f474d250c4349edcb41928f9859c50454945392 SHA512 b702f4fc142dc826b357cb1c289375af60b5faf9a8f5a8a8ac9b6efe07d86046ffaad79bd8d1104f5e99cb262cd8dd51b15ccb7c59286fc4e6796efc71bc5036
 EBUILD gentoo-sources-5.10.117.ebuild 741 BLAKE2B 42c0a36c384315cbe7d2eb4971d25617486f3941bd1ffbbb4dc93733cef0b140d3396ad38b91afb84fb5ca10e1c06b90af3561e41c8ea2e1cc7c2343db5a96da SHA512 814020c6ee86fca7573a5c39d665aa251b72f4ac6c00dc30272265cc95ec444ea355c5c5908693b5976106cc77fe7092d2cedbadaeab9321bfbe660e1eeb7f71
 EBUILD gentoo-sources-5.10.118.ebuild 749 BLAKE2B 9ec82baf368d13189c7c3b7f0c49b7d285347350f6dc7d08fe9a4b44fba317b441fcf9fd3235d3820eb82909e364b040904b386d7eba515c6f99aaf87f868776 SHA512 c536e413f759a6a26ccfd50fb8a0ce85bff9eb5dfcfa00c2947ef7cbd91c48b1fdbbf69e2a0e2529a9fb833efbbaa91e8ce29817b9526a5dc9aaadcf63eb46c4
 EBUILD gentoo-sources-5.10.119.ebuild 749 BLAKE2B 1297b64e79dc516934870238a509945e5fde59ce97aaef511eda8f7bf92004b6836c374af1568ebc115b1ddc8b312c2540c61b528c189af11cdcc6bbae861c76 SHA512 90e22775b5ddfd9fa6884c94bdd7dc7c0d5fb8adf730399ad61d01f52bcff44192863f6bbf0931bba5f37e2501147414e43d8bf63d5571b22f8f303713a29bf7
 EBUILD gentoo-sources-5.10.120.ebuild 749 BLAKE2B 0e12d77b71ca273dff2d2fc2991698841eeaf912eb18517b1129d3269c3ef9a64f5ac63a1b70c3da1aeee546217b72b2631c73cc403f5a3ca48d5b4cd46f04fe SHA512 4c2c8e39ebb89a1c4df17ab87cc64deb9241b249c554f577c5f110f83b768f6598897c458e13f81694b66e75531fc25235d75fe1c10f405af18da7b44458e001
 EBUILD gentoo-sources-5.10.121.ebuild 749 BLAKE2B 3690c52bcf86721fb5a2f2d9a6040ba6ac9f40d49619a986dcb12e5afc10586f5a9993cf764a64818186857f737e7d73b0d6671132a956043022159c3612200a SHA512 d1bd1e90cbcdb46533548af91ac9ad95127bc225a665b7b7cbe3baa6fedb9101a542effb056b0ed38869a5c0e97a79a73d8269ada3996bce423b99e6a54310af
+EBUILD gentoo-sources-5.10.122.ebuild 749 BLAKE2B dffdff30d55e246a2d834a865d12a4e84644fac110041a9503e54b0cff2d98a21be9490c3bc3c3da07921afa612fb19b6610338a6ef9ba32559e6974af68385b SHA512 0d15bd174d671900c51b2bc7c53be01f7e2b9eafd080142678a40d920685595fbd1437764eddb4a1272c04e180800a9152bc9bef614a80d6850dc47646af4f95
+EBUILD gentoo-sources-5.10.123.ebuild 749 BLAKE2B 5e427ef88947b364fed2aa366bea1294b3d5dd5a32466ceb8fdbf9907ed442ef55f6dc87729eb6e8891c26d2f053dbfd654df66155c79227146c3043ea2a8fa1 SHA512 5cd6b4416f92d3f4e38568e6841595d815007504e321933142535d344d039979b5186a6209313337938142ec264335ee967c379db4c8d2aefe5aaef8b162b2df
 EBUILD gentoo-sources-5.15.41.ebuild 740 BLAKE2B e82c9b0af90aa114710aa0e1fe2a8e2a8608cd7e49c7db3180202d4932a39588be99e2545155923ce6e1f32f6fe449d6bdd96738075c4d0a1aa67e0e705b8617 SHA512 68dc21f72e24288be05f648257d89d2b66b28412085608a44d9373e6318da73c1e96cee8005af65e68033f6a1b18e59ff4456e700b17bbaa2c643226ff24e986
 EBUILD gentoo-sources-5.15.43.ebuild 748 BLAKE2B 1f73b214afba99304c363b99ff11cd577022b30398a01152eb84c34db22c2ade59331d2d44f66407f14dbef819ae85159c89576f4db2a92e126726de3bd4c5d6 SHA512 50d2ecbd58c791bdc847b58acec4eb75c828e32af5507fdd51ef58a7b71fe1f0ccdbf3312ee7a3ba4c04878a30af43fcd61a3bee01368d876868ddc4d995f60f
 EBUILD gentoo-sources-5.15.44.ebuild 748 BLAKE2B 6069f62aab539948a55c29b828cb686222e9dcd54c9f9186de2abcbd5417cdda94261b515777a00b7cf38aa7fa1eb9eed08d8c40ef0e3894868cd385687046f2 SHA512 c7056d856e448ee0f7a9a4595db34c151e8ea5f8a0ca89ccb39166de6767e7ccb7b3b3ae8b889f104724c5f75bf1a8906d8c4b3649606d98c00a92e0555e26b7
 EBUILD gentoo-sources-5.15.45.ebuild 748 BLAKE2B ade887acdfbaa78877fafed469aad26d4e1fc9d82a2559495ee30f4793817935f9cc258a6a867d0acd99b890443de3e0ea21f3c15ba1c49ab9069ac002d936db SHA512 708d283cdfd15b23d9c9c43deddb5424e946908cffb5bc403c427ea7919c327747f052c3ccdec649df4edc1ad887c55315140720b39b5d868df2b493a426848d
 EBUILD gentoo-sources-5.15.46.ebuild 748 BLAKE2B b78c6674bac1a0d9efff7bce53968e9b6b47cd41b72292d9ef63a4941a801cec67e78ad6ca60d2c4c19d3ec93bf540185d490c95ddc0fa22cb4e04e1f2ff1c66 SHA512 fe08463ef6ba1cf39cbd36cf750eda2cbdcabc24088d91f9cec7138ec86b0b7b7cc02b5a5123bad34eafb963749ca4c42a52495a1a92625d8c6e1444dac061b1
+EBUILD gentoo-sources-5.15.47.ebuild 748 BLAKE2B 115201fd478581fc48408f012c8953a735c4e487a3cfe6652f3f3a73ce2b461dddeac3658da7f0886386223e95d6156317f8f34fe1ffe8e095d726176018cce2 SHA512 b7b1bd6f8f83ccc0fa34e319f695b5a97d4592616b45c48efd31235dc794ee9b287c81a96d4124446a03adf7c8d30ba8cbb598375d4d510b2343b5cf8974442c
+EBUILD gentoo-sources-5.15.48.ebuild 748 BLAKE2B ab937be31176e89cbe2f594d3ce954fcc162489fa8a40d0667f0bc012151de0a9e1c466f170193ad1ad0e61f6ef395566c0135a92c15627a8b0882f3e53a5c0e SHA512 72851481dc1cbd9857eb737d4a49befd645a8176e17bf62812e87109d4e13be7e15c9bcac7c275a77f6a7688cd501f41ff26967dcc0d03ae5df43c31b227456e
 EBUILD gentoo-sources-5.17.11.ebuild 742 BLAKE2B 63381debe04b3b6a2550c64d745c5124c311a8f3372d32c7d1e3dde4134d1980f7b5223ccc40396ec2e93e82fb49cdee9eb72af33906e84507be8f62b0a199be SHA512 4f868b2a033fc7c1bf7f22fb03b01d6aa75c85615c4bd29c11df250d27fdfe2e9cb1ca675683e2172ab37e1b1b1fdb2ed51f0e439c58464b0c2e4380fc06c122
 EBUILD gentoo-sources-5.17.12.ebuild 742 BLAKE2B 4156dd6298aacff8389672358ef446d023a937dff53dad32cf4ddfd200f70d97b10511d073d3208ae1dd2ab8a68e84723ae4217ddbc2b5f5b8650d90d570d8b3 SHA512 d5319327891a906c2176b76cc22c55c3631a8c11786b2c35c70035c01b4f9c634f61e227c35c0632dd2da8854970ba765ea6e85ad3d684788a49662677787594
 EBUILD gentoo-sources-5.17.13.ebuild 742 BLAKE2B a1951a077001ae3f8fdba7d3adefe6cd3bcc1f38af0fce4d29f6f9ea1327dea7451fffed4e0491674da14f7c17a2edf67eaa9238196ae11163d3f66d4ed996c5 SHA512 64e6b0ea1ce3d41d7b78805db8b7c8f95d120ddf1ed0d1ccedc88faf3a5b1063b60c6c85c32b93e75166933471b2b1fafac9b6cef7bed99d597d516ab3b706cc
 EBUILD gentoo-sources-5.17.14.ebuild 742 BLAKE2B 12997100b81fee9c1bc6a048d189f68b66a312046e7d7daf590f6db6bf31edc774a5e882cab430cac09c49fac8b0b4c3396bb712d7c8b22e275528ea4f9dfee5 SHA512 3bba7236c8c24e2b135ddec3ec7e4b8098c9325332ff82930a898a4081aeb2a68f4d3f68095fde6ed9be44ae46b646845a73b3a9357caf49cfe6cc5d443ac2a6
+EBUILD gentoo-sources-5.17.15.ebuild 742 BLAKE2B 09390111bf79b7d6192bb16fc2c27afd5e3d3446d595cae4e475770f84416fc4de320acbaaffceee168bcd0564377fa3d8bb9781c10d357b04f201e6f1e9897e SHA512 63aa56ccc9ca8263e44c96fd374187894f57d8baee3e6c1a70a679f55a6b26cf489f69aae648241ab414eb901fca95ba60b708f56e704c1240dd48ded28cbc14
 EBUILD gentoo-sources-5.17.8.ebuild 742 BLAKE2B 95e0f99a778f310f85ff86fd862bb4d418aa40a0c0230800f9a417c9e89827791a8e0d87a17d3d607a777172ad00650f8dbb62de1dbd98a47b3aa0c2de21b1db SHA512 3dd8b4a3c88451fbe76b85742c870d491ebac0a1bb0e9a1b28c10254b596abc79ac201f043d4e258322257a55290096c97dce2c8c1f926b35af8b25b8f287f6a
 EBUILD gentoo-sources-5.17.9.ebuild 742 BLAKE2B a776c8acf62c71990205444dbcc91ee6497b129f0cffe91a46a656ce9d376299985831d32da405790c53f8bf332560fd10c2a5a389e8fb0bc076292d6835fa3a SHA512 7eeb9ffbb469c44d42769beda98c1afa022475b7fc55690b4d76b64acbe0ad884a288bce5b4da4e8baa9f67ccd762eb79c738218886bdf59440491995e8233be
 EBUILD gentoo-sources-5.18.0.ebuild 741 BLAKE2B 173a99711cf7e2f80832dead06826d0a5196bf35d364b5445b0da5f60901cde8c4f71757c68780a2768d344dd516fc77a6136a0f3c8ab1639fcfec24b8ef49a7 SHA512 fab36547339b5d28de0b9553b1997a4159099a9b2959539d842e3afe88ff3bde955b4babbcf566ec0baffd06fb636b553aca59cf9f7aad5d0a4d5c4a687c466d
@@ -140,7 +196,11 @@ EBUILD gentoo-sources-5.18.1-r2.ebuild 741 BLAKE2B d7cc73a7e5bd4a201e540683366f9
 EBUILD gentoo-sources-5.18.1.ebuild 741 BLAKE2B 850fb58340c7bda3854cc22131fa1c3e294255fe09dced4b9d7a177c2b451ee7a447ec397d05c15d86592a58c59ed3e83c45870b7c85391064dd03f77c11b672 SHA512 557b739782cff1984ffdac9a947f15bbfac6d5e8e455ab92635ad9d40ad8b5d2fefd6c47777e9aa93af35cdaae2a69106498776ac6c33d1de4161200560e51d5
 EBUILD gentoo-sources-5.18.2.ebuild 741 BLAKE2B 5ea1c1e649245e1c156ec44d9d454fded0e208ab1b0306f971808112994d7597760ad9bb0e5e518226098e812b9855272b2326bddedc21356d2a0e6756c16dca SHA512 b4c10e3ea61260f2df9ba92c7f6ec5a3b34ef12772fe4b3631a3c43948037f0709d6069b5bdfe7ef3855d19ca0fb1e6f491d8285769ad94a167b259e6fd00575
 EBUILD gentoo-sources-5.18.3.ebuild 741 BLAKE2B 1a7d328ea3676f0ac0a9e6bff442e83aa76725ea7898a9b4eb6d2521a2d18dee30b283791dc75c433d15fdb1685b7bb00d535e1a4926b678021699e95c8b9bf2 SHA512 d187671f1cea171181e15f8c5d80124861a780566f57ad5fd051fae05c2ef330570fd02326630995062d9c7e1a1e4395ca80c73012e9fc3b2acc362f17e94f33
+EBUILD gentoo-sources-5.18.4.ebuild 741 BLAKE2B 20b3d6f1c56fa05abbbf56211bee52f9a5feb1a13b0cb073edb1c686cb5acf41702d0ff3ce11ea921a31889cbc881d6dccaea2d0441405a644cfd4df3a83e2fb SHA512 f4786146ce24cddd01b282a247984b82b60f9276c94829df5f85b9940af792661bd869b1cf4ae61afecdb72356ea308820918e85a392daa0f401648126cad1cc
+EBUILD gentoo-sources-5.18.5.ebuild 741 BLAKE2B 9226411e47b51cd3681da2ed11df2d43afb3c0c7cd619bbe48d7c0a0f982ebdc870a2b127eebb412c33f1975ab0b478e955a6fcddae42b88bac8f3fce7487397 SHA512 447a4b1eb82e1fb20cc42a4cfd98d4431fdcd211e25bd0e67aabe83b78e7433330a82e548669c37241b0c70cbaea8eac299f995f1b27a396d89544c5450d865a
 EBUILD gentoo-sources-5.4.195.ebuild 734 BLAKE2B fc45688e7c65a8b56dc5df37c533dcb425d3608117e7a207986219eaf4059852d4e13c8b45e4de7328617ce4655a41ea5679f3efa8b3aaed91ed11417d9161bb SHA512 8c281580c84107812be562aca644e33e3febcf9a2740c07cfeec85a48c7e072e8d925f828de29bb94ca53f9402dba41d1fac8ee7c215cb62e11dcc981a0fc866
 EBUILD gentoo-sources-5.4.196.ebuild 742 BLAKE2B c1e8d47f9c7ba339701decf9502c9815931a9a4b6c7c4c609b9b597cd3e86c6a807471b2bc0e4fca842839fe69ddb42f075cadd7d7f2fd8a64f8e99c89cb944a SHA512 ad296b7fa72affcc5f424f69182bc91af92858abf737ca806da2afce92c6dd624dbe94d21dfc1c149fde4fe9b577d974a57bde52ff3650b2a23ce89f789f7183
 EBUILD gentoo-sources-5.4.197.ebuild 742 BLAKE2B a5cd58855ee2feba624798a3bbb2692ed0241c80568db5224c7c76e33aa2a7127167d2caf806888d30f2b4a66f7b905c1a54897afac52372743ba2cadba57733 SHA512 9ca866f1dd306bf40212b71a96bd56064b28486291e0f3398e8db1b9c8be8f2954b93c2f60bff4767eabf6171225053aca4450850a0cb6858419ccc30d2625c5
+EBUILD gentoo-sources-5.4.198.ebuild 742 BLAKE2B 775e9774918bc3c27d5f32be7fbb72af8066a8c5dfb515812918a3c61c871adcdbb8c4e1d9b2158e9a468107984ae8887c99f95542840296cced7d343f133a5b SHA512 eb895c6dfcb74ec15f10a7d46c45bd71a829d062a1aceea5b65bd62625aea261deb23d5a2c59ed95200dd1b71ade7e2f2d6447cc5af4ebd9414e9dc67404d124
+EBUILD gentoo-sources-5.4.199.ebuild 742 BLAKE2B a3c868ca2a7cd75161e4549765abacc28e1bfa3338ef2a921f57ea9d5046e73e0f7e6c3d72ef57ed099b6ed684580c9878d2998892665fbbd18d3694ba6845a6 SHA512 722c21a9a4cc7a94be8b74dddf77e81dd3d44f187f64feea1c689c850852cb9c93f7ad46c2630ef8a086331cd3baf2f6bc7227514f84e2ab446db5a6ace95944
 MISC metadata.xml 501 BLAKE2B f5363c8a19540d5bb924b38bdebeb8dbc60c84e58d1d87a9148a3e7abb09b0a1b733c98b130b778b8ab3a88375598444aa9d537d8c5338864a3d4497600d7836 SHA512 bc1ba0d75dbf5b95b3f93e666389c6408f20aebeec99bc8ec00653758b67588e07214285ed106fd9e5aed2c8d57c625d666c797212fda51e1ab98ce1df816467
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.283.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.283.ebuild
new file mode 100644
index 000000000000..80ad9296fec5
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.283.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="294"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.284.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.284.ebuild
new file mode 100644
index 000000000000..d2b7d1095095
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.284.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="295"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.247.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.247.ebuild
new file mode 100644
index 000000000000..ed6fcad8f95f
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.247.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="246"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.248.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.248.ebuild
new file mode 100644
index 000000000000..b71b405d7851
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.248.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="247"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.318.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.318.ebuild
new file mode 100644
index 000000000000..3b5f2e7c6372
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.318.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="321"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.319.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.319.ebuild
new file mode 100644
index 000000000000..c6406efd2f4f
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.319.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="322"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.122.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.122.ebuild
new file mode 100644
index 000000000000..c8eccff4153c
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.10.122.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="131"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.123.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.123.ebuild
new file mode 100644
index 000000000000..e4816b44f2cc
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.10.123.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="132"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.15.47.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.15.47.ebuild
new file mode 100644
index 000000000000..5253cb001e0c
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.15.47.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="51"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.15.48.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.15.48.ebuild
new file mode 100644
index 000000000000..1f31c14862e9
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.15.48.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="52"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.17.15.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.17.15.ebuild
new file mode 100644
index 000000000000..ef8c1b6ec4a6
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.17.15.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="19"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.18.4.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.18.4.ebuild
new file mode 100644
index 000000000000..2e7ef6752590
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.18.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="7"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.18.5.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.18.5.ebuild
new file mode 100644
index 000000000000..eb342e2bf5f6
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.18.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="8"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.198.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.198.ebuild
new file mode 100644
index 000000000000..52c09f6b8a22
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.198.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="202"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.199.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.199.ebuild
new file mode 100644
index 000000000000..341bedd07582
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.199.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="203"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/kpatch/Manifest b/sys-kernel/kpatch/Manifest
index 2d8536ebe68f..6f0b9a3ae254 100644
--- a/sys-kernel/kpatch/Manifest
+++ b/sys-kernel/kpatch/Manifest
@@ -1,10 +1,7 @@
-AUX kpatch-0.7.1-disable-dwarf-compression.patch 1120 BLAKE2B 443956fb6937973040efdae4a59ed925d6dad6e540bcd88146e08bfb3061b299b4f2a14226f3f52647cb27b163223d93cb729511e564dabc7814e287c8527a16 SHA512 eb51965bfe701cc0235ab442f68cb7c86cac55f6dbacac2beca39ffb94fbc767545bd598cb34c1c85b19dc2e830890eba3e28f28628f16e6a37c155e8a4324ff
 AUX kpatch-0.9.4-no-werror.patch 373 BLAKE2B b7e0d7c35fc87df6d2cb9f0a86a82f01d5a72561d62281abaf7290696d890a997ce3221be506e6213dda891a2f5100b9de83edccac8c6b6af3322353fef9f394 SHA512 3a4392ca1d56a3b2625f11b8a91c140a51d8a5ce45bec8f1a5d901d7515d07ffc85922623464576af0f89966a725faec99b9bc801610ead9102d7f69108f5cc6
-DIST kpatch-0.6.3.tar.gz 153100 BLAKE2B e95d1880ffc9ff6038bba98902d0f1e97c9f7f8d0f90eedc281c4bf0570217668cf7b701d038d6f06e9885ebdbb4407cc554d5175cf17eb8fd5051381f75deb3 SHA512 0d266dd837ad651d7f46047cf2c8de527d08274a885a154c53354f4b3c5679d91c766d7d42294ffe71cc548e5ee865c7555f24001882b806f2fb48825f9b0c06
-DIST kpatch-0.7.1.tar.gz 181732 BLAKE2B da3ff8a6bbd31c3bdc353a3d2b75c6947b915fb309a6f19c57b31a6cbad1d82b9e1611bc2c412c5d049511e217a01719eb9a017d1fbbe7c7bbf2e5b02a381f40 SHA512 c1b149e9532dc16ee4f7578aadf3eda73b53c889a055229490a7afd1fca8e6df755c98c938353f937b81679fe8d08e065c473a6c31e588b1eb67f2de56bfddea
 DIST kpatch-0.9.4.tar.gz 257885 BLAKE2B 3c84dd120b0b512e6a55d342b5950ce5d3a81c8c1e956f167bdb25c0c89dde5d4c2bd91fad687ab9eec4d6f965c21ff647f330f1fbcbfe560ca1f3cd37c6ac54 SHA512 647509fb9772b7564c0533ea043a15a66e29d413e045258036e78890c1d9cb072622bf458dda9bd4a87fe0855522c9b6ec3761f9bb4ab7e08157a179abfbaa62
-EBUILD kpatch-0.6.3-r1.ebuild 2456 BLAKE2B 7a37a9232c27d3c3914317ac434b33694f65db5b43d64b63a24ab8c8c4d22dd13c2563314daeb1e0b4578e115668d9ee749e6eedfa43a1ccdc3578ced45e6087 SHA512 eeec109841819c5411879ee0abd69286ccb645cb735169e50fb4c13cf5c7ef5fe9f529fe59ce150b5ad3cf18a539b06ef59d514e6ea840c13388c76c820e3185
-EBUILD kpatch-0.7.1-r1.ebuild 2755 BLAKE2B 02b8fd7e4650b359059c1812514f99498d1c92aef683e09d09fa63969996ef3ec71291e88f34b5f60dd17053ae41091c94b667e4e3f620cf7ddba9d7f6f38c48 SHA512 1020a0b61971baadc040b66987cb1ed48b7dff55509afd2f98e0f7c1bc3a502517faf890ccfac9b54ca54bb2fdbe7c340bea737b7593cd789d4e5b209602ba80
+DIST kpatch-0.9.6.tar.gz 260687 BLAKE2B 5c535af463f54d7be00fe987716dcb84ed17df69e4ccf5c0a6b4bde32704756c1c217ec43d9f338ce478ff6e0403e5c10f15055c56fbfa786b592b7d67427c6f SHA512 898c5704098c473187f2eab9bccd5fb3cfc31f4211492d658abcd0b7cac6d03f11a27df19a56ad17c20163803084ddf54a27defcf12b4975a8a8eb5dbad73f21
 EBUILD kpatch-0.9.4.ebuild 2747 BLAKE2B 76d7a2a7b6bfaab3e054ebfae9c3f739f63c8dd07854800403d1470022b78e43402d79b9f217c758a3ed1e9857ab2431cb60b857f93280a7a329fd893f9c76b8 SHA512 1d4e1e21131a7a1107900fef7bffc038cbb49cb27b307fd0c3ef4c04b4580d486a7e2e32e0c3f9c5e94ce86ba1d2d04d4163f94c3660e1199587330ee40594ce
+EBUILD kpatch-0.9.6.ebuild 2747 BLAKE2B 76d7a2a7b6bfaab3e054ebfae9c3f739f63c8dd07854800403d1470022b78e43402d79b9f217c758a3ed1e9857ab2431cb60b857f93280a7a329fd893f9c76b8 SHA512 1d4e1e21131a7a1107900fef7bffc038cbb49cb27b307fd0c3ef4c04b4580d486a7e2e32e0c3f9c5e94ce86ba1d2d04d4163f94c3660e1199587330ee40594ce
 EBUILD kpatch-9999.ebuild 2691 BLAKE2B d507a6b69f149e395718182c2ba3a104ea36728f58886ea99469705c6176f485f142b0d71733a4ad2d8264377009d31538f357fe2609b5bb144e1ed05246eb74 SHA512 34c3e911c2ee18ae1ac61464d666e85b363adf6c6581a419612a0d9d3e6008b4066965d64238e19096825d033de48ecbc45cba2d2466ff06d4c868939e5c7b25
 MISC metadata.xml 671 BLAKE2B 27b8de92bfdcd0343388ee8c657a3a3625a3f3879ec597b18516ff5dbe78e6ba93ffb8e0f251a0920ca11405d6c9344378865a65799009a53c71c627dd159ef3 SHA512 e960dac661381d042b3a9fcaf6e7d1e4b246970e262d972596ed3eaf5f25ee5c9a8eca0a88d416f3c360073cf5d25db481b10550db58b3f3b47ceadcf0d85668
diff --git a/sys-kernel/kpatch/files/kpatch-0.7.1-disable-dwarf-compression.patch b/sys-kernel/kpatch/files/kpatch-0.7.1-disable-dwarf-compression.patch
deleted file mode 100644
index 85f2862df54a..000000000000
--- a/sys-kernel/kpatch/files/kpatch-0.7.1-disable-dwarf-compression.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From fe6e3f51bfe17945205445904c1fc602008ac7dd Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Mon, 29 Jul 2019 13:20:20 +0300
-Subject: [PATCH] create-diff-object: disable DWARF compression explicitly
-
-On some systems the linker produces compressed debug sections by
-default. It is not supported by create-diff-object for now.
-
-Fixes: #877
-
-Upstream-Status: Submitted [https://github.com/dynup/kpatch/pull/1011]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- kpatch-build/kpatch-build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/kpatch-build/kpatch-build b/kpatch-build/kpatch-build
-index 9ef3809..365655c 100755
---- a/kpatch-build/kpatch-build
-+++ b/kpatch-build/kpatch-build
-@@ -748,7 +748,7 @@ if [[ "$ARCH" = "ppc64le" ]]; then
- 	ARCH_KCFLAGS="-mcmodel=large -fplugin=$PLUGINDIR/ppc64le-plugin.so"
- fi
- 
--export KCFLAGS="-I$DATADIR/patch -ffunction-sections -fdata-sections $ARCH_KCFLAGS"
-+export KCFLAGS="-I$DATADIR/patch -ffunction-sections -fdata-sections -gz=none $ARCH_KCFLAGS"
- 
- echo "Reading special section data"
- find_special_section_data
--- 
-2.22.0
-
diff --git a/sys-kernel/kpatch/kpatch-0.6.3-r1.ebuild b/sys-kernel/kpatch/kpatch-0.6.3-r1.ebuild
deleted file mode 100644
index 175fecf308b0..000000000000
--- a/sys-kernel/kpatch/kpatch-0.6.3-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic linux-mod
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/dynup/${PN}.git"
-else
-	SRC_URI="https://github.com/dynup/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Dynamic kernel patching for Linux"
-HOMEPAGE="https://github.com/dynup/kpatch"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+kpatch-build +kpatch kmod doc contrib test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-crypt/pesign
-	dev-libs/openssl:0=
-	sys-libs/zlib
-	sys-apps/pciutils
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-libs/elfutils
-	sys-devel/bison
-	test? ( dev-util/shellcheck-bin )
-"
-
-pkg_setup() {
-	if use kmod; then
-		if kernel_is gt 3 9 0; then
-			if ! linux_config_exists; then
-				eerror "Unable to check the currently running kernel for kpatch support"
-				eerror "Please be sure a .config file is available in the kernel src dir"
-				eerror "and ensure the kernel has been built."
-			else
-				# Fail to build if these kernel options are not enabled (see kpatch/kmod/core/Makefile)
-				CONFIG_CHECK="FUNCTION_TRACER HAVE_FENTRY MODULES SYSFS KALLSYMS_ALL"
-				ERROR_FUNCTION_TRACER="CONFIG_FUNCTION_TRACER must be enabled in the kernel's config file"
-				ERROR_HAVE_FENTRY="CONFIG_HAVE_FENTRY must be enabled in the kernel's config file"
-				ERROR_MODULES="CONFIG_MODULES must be enabled in the kernel's config file"
-				ERROR_SYSFS="CONFIG_SYSFS must be enabled in the kernel's config file"
-				ERROR_KALLSYMS_ALL="CONFIG_KALLSYMS_ALL must be enabled in the kernel's config file"
-			fi
-		else
-			eerror
-			eerror "kpatch is not available for Linux kernels below 4.0.0"
-			eerror
-			die "Upgrade the kernel sources before installing kpatch."
-		fi
-	check_extra_config
-	fi
-
-}
-
-src_prepare() {
-	replace-flags '-O?' '-O1'
-	default
-}
-
-src_compile() {
-	use kpatch-build && emake -C kpatch-build
-	use kpatch && emake -C kpatch
-	use kmod && set_arch_to_kernel && emake -C kmod
-	use doc && emake -C doc
-	use contrib && emake -C contrib
-	use test && emake check
-}
-
-src_install() {
-	use kpatch-build && emake DESTDIR="${D}" PREFIX="/usr" install -C kpatch-build
-	use kpatch && emake DESTDIR="${D}" PREFIX="/usr" install -C kpatch
-	use kmod && set_arch_to_kernel && emake DESTDIR="${D}" PREFIX="/usr" install -C kmod
-	use contrib && emake DESTDIR="${D}" PREFIX="/usr" install -C contrib
-	use doc && einstalldocs
-}
diff --git a/sys-kernel/kpatch/kpatch-0.7.1-r1.ebuild b/sys-kernel/kpatch/kpatch-0.9.6.ebuild
similarity index 96%
rename from sys-kernel/kpatch/kpatch-0.7.1-r1.ebuild
rename to sys-kernel/kpatch/kpatch-0.9.6.ebuild
index 2a2b069afca4..e30e6e2e09cf 100644
--- a/sys-kernel/kpatch/kpatch-0.7.1-r1.ebuild
+++ b/sys-kernel/kpatch/kpatch-0.9.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -34,7 +34,9 @@ DEPEND="
 	test? ( dev-util/shellcheck-bin )
 "
 
-PATCHES=( "${FILESDIR}"/${P}-disable-dwarf-compression.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.4-no-werror.patch
+)
 
 pkg_setup() {
 	if use kmod; then
diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index 6fba8d2f4326..7850333777ef 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -1,4 +1,3 @@
-DIST linux-firmware-20210518.tar.gz 328396097 BLAKE2B 7e7b2a41a8906e9bf6147a6ca4dc9cd57db66e98cf10fe4edf8ab56905bf6ad5eca88c479cad5e585b55cad765f051e6b96c0f827c2fa85ba78706b48ba9e047 SHA512 64c81d97aafa43fd438a29258ffcd812497bbd1b22c40b1e352ffea5a40c3c61b5f5a9788d76508c7010209a82ae3938ac6e28ff7f4dffc1582f6e5f8b8c00da
 DIST linux-firmware-20210629.tar.gz 333073746 BLAKE2B 89a0448dc471ff0c3edfa37b2a34bbe9f52d7c7e1fe416bea1121bd0248614e28672ef26b78dc7570cd6b949b9b8628492e9ee023eefd4fa49c7206146cc8e8a SHA512 1bc206ea691e3a17994150e3827251d539f1e77f44afc452f45129455f1c9d0c3563add95ffa5306c5c49b6dcff031c293e755e08a0329a2b094de786d8330b8
 DIST linux-firmware-20210716.tar.gz 333073746 BLAKE2B 89a0448dc471ff0c3edfa37b2a34bbe9f52d7c7e1fe416bea1121bd0248614e28672ef26b78dc7570cd6b949b9b8628492e9ee023eefd4fa49c7206146cc8e8a SHA512 1bc206ea691e3a17994150e3827251d539f1e77f44afc452f45129455f1c9d0c3563add95ffa5306c5c49b6dcff031c293e755e08a0329a2b094de786d8330b8
 DIST linux-firmware-20210818.tar.xz 172748332 BLAKE2B faf2ad6754bb72e3838aa21d5f2bc2ba49b98966a66fec04ecc5e0e2669fbbd4830820239290e12d2327f361df9084e350668befb8babfc517a5d06d2916dce9 SHA512 ce8d80794476a07740e2a0c62bf5b9a88d392e27285ba490813bf52c4b2b17cf26f24f43bc56673b8f7a11d7b204263ba9e0e8702ff8bf0a79f8478e0eb8efdc
@@ -9,7 +8,7 @@ DIST linux-firmware-20220209.tar.xz 227688608 BLAKE2B 56ff71b7184f6b2fbbac4b14be
 DIST linux-firmware-20220310.tar.xz 237571732 BLAKE2B 9246d4fcdca0a9514606eb7b4ea7e18ea072b8d4302f62fd7aea4d85014c9f7da3eadc650e7c678bfe867c6f5ae9278b68b9a27c6074472ec9574ac922df23a5 SHA512 bafd5795d27c871c199e37f1e39f316e3577186283880da3b86cbc690749313342f8297342bf3ddfc6b3da7903ab2d5d24465240dfff1b0be51aa47f90872758
 DIST linux-firmware-20220411.tar.xz 237957584 BLAKE2B 441699abac0a7554c96324e40676218401febe9ea2a11ff9ab9f9ea4945b4c590c10c9a353aa8c5c66325b408ab9ebcb57fa77b520066f1d9995cb5989bc5b75 SHA512 5470701872ed4670962d3ccb4fd046c1f00145d69e942d76b21ccce08077ca4db867bbb31b87668e6298e130f28fc522a6ff4d66927fbfcee44042e1d908f71d
 DIST linux-firmware-20220509.tar.xz 253717320 BLAKE2B 0181e209a05c3acbdcdc175868dca0ae2993effac0b265335f502a03d3a38cc4849366bb229ade87621426e99112f520f4d50444e438572c61cfc2c6d01ed6a6 SHA512 17d48222a0029d0540a7071b541653a42d66676c4dde88b7c148249450cfcb09087318cb4558ca7a0a7583f3bf0b00948d9383073e038c4f76bc4e807c757c2a
-EBUILD linux-firmware-20210518.ebuild 9828 BLAKE2B bf5be585503ac1eb052a36cec337c34d1ada0052ed1f61cd98a36030cf3a08811cebe228ad421df8553ea1cb602558c0e20c00bab20ddbaa66842fa889880718 SHA512 578d67267ad0561a20177d88e6cd2a8718bdd9c03915655e6b88216c0de0b42aacd779e0a225fa3b8ba8189bc11c160a1f303207122625b422e79db8f480e2d6
+DIST linux-firmware-20220610.tar.xz 252543088 BLAKE2B b3f627fe150f76c9a1c7b70bf691587554808275debd56e9d36fd0eff63b7ab2351ba03dd298066b03db7f2e590d7f130677e158ade587fbfb59a9efd8f83c0c SHA512 76176af2bf1e83d91c88289623364bc5d3e45d96c8586bd5c064535ee245d133283d2176d142492139cfbd41ca6ad195522c662d923b6cc76556c8509638ad0d
 EBUILD linux-firmware-20210629.ebuild 9828 BLAKE2B d812585f022d6f09455f76a07576e51137cb8d721e9cfc397447f1104fbd39bdb33a5782b7001432fdebc3149d56876943796809b8a3826d5dd6ca6fa399ff78 SHA512 4b4952579581fb52210d76b7400ff306e542df93b3cab389ef07fd1d22b51e40adf05528b93c6eeb2652f78eadde9a3dfcc7df796c43da5592a24258517fe021
 EBUILD linux-firmware-20210716.ebuild 9828 BLAKE2B d812585f022d6f09455f76a07576e51137cb8d721e9cfc397447f1104fbd39bdb33a5782b7001432fdebc3149d56876943796809b8a3826d5dd6ca6fa399ff78 SHA512 4b4952579581fb52210d76b7400ff306e542df93b3cab389ef07fd1d22b51e40adf05528b93c6eeb2652f78eadde9a3dfcc7df796c43da5592a24258517fe021
 EBUILD linux-firmware-20210818.ebuild 9787 BLAKE2B d07bd4551b5e9035357c635ff6a27b289b429dc10a152e31a1435a90cbfaeacc33f14ed69cb00f729db6ff080c0cb73698777b62a15afc0ecdc46c2a52d9c854 SHA512 5840a5f7df126d335a90f3ad4b44f92017b281e1790938f7c06008eadff64689c8e87928939f94a0bd9caf6be15b0a3b933d3dad02a4070fcffff25a3c38db02
@@ -20,5 +19,6 @@ EBUILD linux-firmware-20220209.ebuild 9793 BLAKE2B 9c5c62aed977b89e0e654228bee6a
 EBUILD linux-firmware-20220310.ebuild 9793 BLAKE2B 9c5c62aed977b89e0e654228bee6a89d99eb43b15de168be364d57c236725f3822488165bbb51405770f6f5f95122f9bd4e778328e050424d138888d12d5f50a SHA512 14bc8259f12fd506375fa5d1f2faf40be90430bcf23f30982c183535a07a899e86ff7a14381d643974babf36c7f8f224435edee9698cb31960b1af9ae2dedf51
 EBUILD linux-firmware-20220411.ebuild 9793 BLAKE2B 9c5c62aed977b89e0e654228bee6a89d99eb43b15de168be364d57c236725f3822488165bbb51405770f6f5f95122f9bd4e778328e050424d138888d12d5f50a SHA512 14bc8259f12fd506375fa5d1f2faf40be90430bcf23f30982c183535a07a899e86ff7a14381d643974babf36c7f8f224435edee9698cb31960b1af9ae2dedf51
 EBUILD linux-firmware-20220509.ebuild 9800 BLAKE2B ddd7ff41cf1e2e86da288de91078f688b57812885caa991dd595ee2d8025606e00296c54dd399f425849076dac32ad8b233e10a4628f3f82417d0474b57b4edd SHA512 9644a17ebf0052b572cc72ff0a1b2055bcc537bf97d59427be32fc9a6234a9334510dda16b811f5af7d7c51b91baaa3cd64dd7b9a0ded0323d0d96498da6ee96
+EBUILD linux-firmware-20220610.ebuild 9800 BLAKE2B ddd7ff41cf1e2e86da288de91078f688b57812885caa991dd595ee2d8025606e00296c54dd399f425849076dac32ad8b233e10a4628f3f82417d0474b57b4edd SHA512 9644a17ebf0052b572cc72ff0a1b2055bcc537bf97d59427be32fc9a6234a9334510dda16b811f5af7d7c51b91baaa3cd64dd7b9a0ded0323d0d96498da6ee96
 EBUILD linux-firmware-99999999.ebuild 9756 BLAKE2B 4f3eeea55282377e793e33f09dce13078569a535d4c9c38147d3ba36957c8b8bc1c7fdcca347dc69f732c463c6bbe43128d19193b512b557823a1f0fac7994ca SHA512 f0063290bafe61a67fbf525cf2f62b0736e193859f03bb7b388cb1637d2209837f109cec10924467c7d13a7ac60ae3929dfe9876e5d429708e6ccd7e753c7c5b
 MISC metadata.xml 970 BLAKE2B b775ae0bf7cecb73829acb649595bb15c0cf95dd696b02223023ed97d42b57fa2ecc3523d678ff1dbafd27b3d71d1f27f5661adc0dfe07a416563b523682c776 SHA512 649289c0e622b28d31598524ecb48470d274a6835f6c2de00de95b114038e2d5d0f42354aaf1948da55e51060a9b3a87c8bb30f5a7b2124e373818de4e945860
diff --git a/sys-kernel/linux-firmware/linux-firmware-20210518.ebuild b/sys-kernel/linux-firmware/linux-firmware-20220610.ebuild
similarity index 98%
rename from sys-kernel/linux-firmware/linux-firmware-20210518.ebuild
rename to sys-kernel/linux-firmware/linux-firmware-20220610.ebuild
index 57275a2aba99..59f7f02ea282 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20210518.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20220610.ebuild
@@ -6,7 +6,7 @@ inherit mount-boot savedconfig
 
 # In case this is a real snapshot, fill in commit below.
 # For normal, tagged releases, leave blank
-MY_COMMIT="f8462923ed8fc874f770b8c6dfad49d39b381f14"
+MY_COMMIT=""
 
 if [[ ${PV} == 99999999* ]]; then
 	inherit git-r3
@@ -19,7 +19,7 @@ else
 		SRC_URI="https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/${P}.tar.xz"
 	fi
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="Linux firmware files"
diff --git a/sys-kernel/rt-sources/Manifest b/sys-kernel/rt-sources/Manifest
index 2f05697705aa..6c427a8af911 100644
--- a/sys-kernel/rt-sources/Manifest
+++ b/sys-kernel/rt-sources/Manifest
@@ -1,28 +1,22 @@
 DIST deblob-5.15 170757 BLAKE2B 368539e7487c25b9808f277c36a5e30dd3a06d21dcf2aefa0066e12549c6cb2b243dfcd0a5413734607e1818d38a9ca6ef5db250517a3dbf9c5f886a8e15e9c2 SHA512 b74781bc6db536b2471149f1aef203e63b16794c3c732bb8b743a94d30fddbdcabca4113af7e364ca5ea019052aa528c398792c6faf9ad13700bba8bb61c4e3a
-DIST deblob-5.16 172217 BLAKE2B a19291cbb1cd47b8e3288e4f0057e003fb00eec92695d8f3b5557b6229aa6ccb6e00a9c44c894870d6aa54da7ce18f1ce252a1a8f8a275bc168e403a44f0f467 SHA512 354dea50e4fc69d92167519b0335463e7c07e1b801c490d0445530165715c641f38a90aab8449d88a3d4ce8e2541135266cf6be4694a4f8281a804318be209da
 DIST deblob-check-5.15 619562 BLAKE2B 6279eb78d81f42416aa24898c747eac71b3dc0a98182354a778c20f6d51f3692e64db4e37aa4489dccae70d87ce5cafbc5d4feee6d505789761dcff1b6a9dbd3 SHA512 47fe403177a93e2271b7b5244f086d2ce2d1253dddeeb6d6bf153327380d2aa7dbaa63a741da2acadf6c65d64b2578cc5c0fad08209609f36ce2f8a88dfa7b5e
-DIST deblob-check-5.16 628562 BLAKE2B e7fbdf00bec66c7950c0f801436f45bfd07b00d1922156db99d8f81c372ff51f5e8c3cef011ebe7c8c37b15eccd1a81d7c6a34aeb3981512efc0ec419e2b860a SHA512 3630fcd479ee38d29071c5061f81c09d012ffcc8a2105181425d5b62a53d083c0852925cae63c35f884d6a9bd99d82035e76ee0bcb80105f06da8887077925c7
 DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
-DIST linux-5.16.tar.xz 123114100 BLAKE2B 07a90cc640ff89e1359c06cee8c38abd33e51f9b9a89833e31a1d2750526fda4a59e8884db3c1ea63df0a37f0d3de6b5a922b014b7313d8abce20d90ac08adcb SHA512 7a257dd576bc8493595ec7d6f3c9cb6e22c772a8b2dbe735d2485c4f5c56e26a08695546e7e0f1f1cd04a533f25e829361958d4da0b98bf0ba8094dd57a85aaf
+DIST linux-5.18.tar.xz 129790264 BLAKE2B e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb SHA512 dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
-DIST patch-4.19.235-rt106.patch.xz 167380 BLAKE2B 209badf14553f3f1b465fed74779f5d6d77a8e78907c1e79aec5d7386ad7388a470de14caa051d2cfc7c3c62e6b7f3212983726e3aca27d8b100a8ee5b3b0e00 SHA512 758c8fc036002c87f7685eed39672547f34f8e0d4c3146891a1424e0fe97c5644a35f2fa4eec3cbf2bb95f1fdb0ce638663be1d2eecfa7029b799371a6bd1642
-DIST patch-4.19.235.xz 4525240 BLAKE2B 0c0409c876ec6c418f1ea60015b822007ef748fe92b15e2af3c7899f753b0a9f32cad90f678e47d5561e6b6aad3824516017479191ac84bac14557939e1fd7b9 SHA512 75a5647ef049c8dc570842e48cb563a8798c9ef5f08d596814d334e7ad2dd593d8e456c2d2551dbe608c522a3b10974113642bd836f9c30c41a4b654b7bad5bb
-DIST patch-4.19.237-rt107.patch.xz 167372 BLAKE2B e04b70af6e5c62a61ab54c10d3ba9a6896f24c1b576ab4c31f8e18a4135c17de975bc9fb0418355dbaac8b967b9aea1be2ed981f4e2d41679cdfb22e44580788 SHA512 38b12331016a43840e1014afec924df5811fcd10144b3be0f340811b19890c782cec5c6b1ca004bf8e63ae13bc3a2f7fb9c82fa9aa1539cd258b55bef3e881f4
-DIST patch-4.19.237.xz 4541096 BLAKE2B e1bfd5d4d618c3a4b8a0bbdc3a20d63658d0893abcb37d8db64dd24c8106e7581e14f3553f0b35d65369a2eb0a1ab57f6cc2febdea3f573f85c07f14ab155075 SHA512 c454ee3defbd609972b85211e93ccf032e3ccdf3e5a04f049143b8eedd310704a32b498dd79becc64e6172ba73e39c0e179fb03015595a2d3f2ddd0163da764e
-DIST patch-5.10.106-rt64.patch.xz 174684 BLAKE2B aa9cb9891ae4cfb20651063715d4fca14692d0a753bef561f5afb5f50cf5fd1f8e6dcfd57d6a9f33e66b46b7af101cbf07c891473bc4d45520e2deb2be1a7062 SHA512 2ed5b3137c0a4f572e0cb6950be75fdb71cde52a93ab4c308071d8a302dbaf1ac65346793d41a48b2d99398f235a4d846fe90d809c316642d70f98f944909fd3
-DIST patch-5.10.106.xz 2857268 BLAKE2B cf855a2f7bea26949ce870e178a99f5d0cdea99a287cae303e4e6e37944bdc05357908012f9774aee7bed3a82231a8079fb11d2f0f9b307182299e6c35fb7f57 SHA512 a41b3c1a222c82fc68ab7c1aabda98d083d57e1a706dcd40b9300462f9eeba68fa420214eb25db22773a436fdef2a27456300b8ead7b969fbdf546f7cb86e609
-DIST patch-5.15.29-rt37.patch.xz 82816 BLAKE2B c53183146ff46d476f4e91ffb772ed333383c173a559a348777dca552fb52ed309364db4dd9028b9ed896fd10a630a33cb841173434128b476cc8df07787883c SHA512 1663ddbc9e0ed085b74734071c528d20513bdcdaa33bb4ef361b7c6a7947e573641bde59904bd109d40dec09181e74cc5f7146ca1e0d1f698eaee85a31f83f0d
-DIST patch-5.15.29.xz 1225588 BLAKE2B 4d4f1971f02fb2e8efcb740e70ffb9c91c7dd61c2d681b874cd25454adcad24608d9df8817a500d3e95183b3812915166919f02ad663291673ccd7cc909b624d SHA512 12484803e62c722da469bb73510baadb344d130c38d6b9ca0d01169bc96058ff65c3b27470ef45b1a2c41a34e6452bd928d445e0c9b1799e11c18850092218de
-DIST patch-5.16.2-rt19.patch.xz 72364 BLAKE2B 6485a5f30fa871854ac63847e725f3a8ebcb2044a4b0afa34dae43896da9814f41836cb25b2a7a5c05fbd173de6f47de7e9aa6ee56327b098244c4dc8562bb9a SHA512 018da2a043be7a2d4b197fc04c2e77f894295b1bb91deda44435e27ac572275f8f7bfdade95ff40bc8cc44e24fc4c09121f0fbddfc292e03b4105050da0b4871
-DIST patch-5.16.2.xz 20432 BLAKE2B 9c9f697e4dd0a78a94ac0bd361ec69683c6904d9af02da55c3001394e6a6efcc1fccd5d44747fff6ea47271b7655bd7866d161a90196cecaddde1c630ef5c425 SHA512 50d3c386e391603fbfe86780bbfa69c3a7caa83a7eea6c239af133dde3a7aa4746f4a3f1483589018d5ac27caa7ee69d869f8f64f4b5121ddab52224f5302222
-DIST patch-5.4.182-rt72-rc1.patch.xz 184096 BLAKE2B 4922001cc619de53a01290ca9772f9411bf245ac857f5cb08a10a7e9e7c4cb71e7c323bcd763d0eb206a4a3c780b886e6ccfc34238bef876397e087cdbb38151 SHA512 1e82c6a6eb51f7fab017ea70d5fe356a7594ce6b826d85afcc5f70603125ce4fcf53eefdc91d4dedc456da269336cb0814b4c6136059354baf0314c25909a023
-DIST patch-5.4.182.xz 3742912 BLAKE2B aa85a5c0e9d0ce8328942a183f0cb97fa003e248ccd218849aa5b7805e84e1dec23b78deae761882f4a8d73330b178aa6087816ed489b3050c9a50bf46348af9 SHA512 512e412ae0ad3c1a55c95324b0a959b37dce1c5783124d728cbafdbbb2165c0def65a7a8c537640dac60717a570a420573b4319830b5b126a8e9184f98b11a75
-EBUILD rt-sources-4.19.235_p106.ebuild 1422 BLAKE2B 78b1bfe2ddf38279cb8d714b80f8123db0cd5fcb4626cc5a60550ce1a9573631bfeb71de9018c9609efa95a29971fbd73e00217ad2b56a840efc6391bf045b04 SHA512 00aa2b9086b99ff329ff856457aef5cf6d366533b72ecd85aeba4d6b29afe19c986d17c12e4d40edbdbce52a992eb619bd5fbb6019519d2a192d7c31eac1d308
-EBUILD rt-sources-4.19.237_p107.ebuild 1422 BLAKE2B 78b1bfe2ddf38279cb8d714b80f8123db0cd5fcb4626cc5a60550ce1a9573631bfeb71de9018c9609efa95a29971fbd73e00217ad2b56a840efc6391bf045b04 SHA512 00aa2b9086b99ff329ff856457aef5cf6d366533b72ecd85aeba4d6b29afe19c986d17c12e4d40edbdbce52a992eb619bd5fbb6019519d2a192d7c31eac1d308
-EBUILD rt-sources-5.10.106_p64.ebuild 1422 BLAKE2B 78b1bfe2ddf38279cb8d714b80f8123db0cd5fcb4626cc5a60550ce1a9573631bfeb71de9018c9609efa95a29971fbd73e00217ad2b56a840efc6391bf045b04 SHA512 00aa2b9086b99ff329ff856457aef5cf6d366533b72ecd85aeba4d6b29afe19c986d17c12e4d40edbdbce52a992eb619bd5fbb6019519d2a192d7c31eac1d308
-EBUILD rt-sources-5.15.29_p37.ebuild 1440 BLAKE2B 3f21c1c4a224731b17de0ce5f62e3713f90e6df36e2e243fbff8308da8316737eedc275174771a8a6666adef069a74a3a6098e34868d0a99bb5d17526f7dd44a SHA512 c34766b92f4f8a8f16d17b63103cb2cca3cfc4d73d71b5284ff715a9759689dd289145bc5ddbaa62244f5e81db9959f54dd1c68effdda8d71dacb1636dec15b2
-EBUILD rt-sources-5.16.2_p19.ebuild 1440 BLAKE2B 3f21c1c4a224731b17de0ce5f62e3713f90e6df36e2e243fbff8308da8316737eedc275174771a8a6666adef069a74a3a6098e34868d0a99bb5d17526f7dd44a SHA512 c34766b92f4f8a8f16d17b63103cb2cca3cfc4d73d71b5284ff715a9759689dd289145bc5ddbaa62244f5e81db9959f54dd1c68effdda8d71dacb1636dec15b2
-EBUILD rt-sources-5.4.182_p72-r1.ebuild 1473 BLAKE2B 4fadc974f550e7dd37e6ab56c18463131755454e880386ca94ee72c035d83620d4f1d50f54c9b138ecfa4cbd76b2a3888557a50aba5181d6a5822c5308bf773b SHA512 aa35a5beba5e2326a696faa7e5292bd0dbd4f74c931162c67ef21b51ae6d28fae5b836d79e8f2c31e9e6b4659960a6d37e5471330fd996438d346afbf298ac29
+DIST patch-4.19.246-rt110.patch.xz 167500 BLAKE2B cfcb34ee559a54c68d63a19692e7f4a760b1e5792cb7967fd7712cb5ada63caaba1787611b6aef42a9c57096e84dc300ac976923f87bcdd6825d783e1015cd3d SHA512 84f9bc2fdc0cd278c619f3735624c0e2f87a0b185334a216f212321e6202ccbef85e3096f6589c67bd50bdd47e6772c218cfaf17d8990c29abfda4f66926eb4c
+DIST patch-4.19.246.xz 4641500 BLAKE2B c399bcb74e4a9e850bc1da4ce3f34b93611a10463f9516bfd25f77647820b782166e0fff713542814e678642c122a8fc4141a0a1a95d6fbbd9f6bd8e7a20d73e SHA512 67e54d4b55cea57165f46d4b9bcdc48928f63664e0fdac4f2110a331ba16deca44b61f8f6596be6973e9e58c824cb2e042bc3cb5524a3e65b7bfd6d99b914e34
+DIST patch-5.10.120-rt70.patch.xz 172676 BLAKE2B aae688c5822b2a36d3a27ec0b454f5ec864175fd1067aba77decf045e802a7ce233a3b7f3acfea9e6f3870fb18cdebf5024c7af3ab19899494c4a83802bb7250 SHA512 640d48dd459973c98649e2d97c5da3ba386b3e2ff619900c1a43bc00341031c80d791a1f286ba5a6507874acd07576a4dd5ad17602a69985aa633e80eae4c4d0
+DIST patch-5.10.120.xz 3176856 BLAKE2B 31b88886caffce367ce02ee5d9bb3675e7261cce4d437f1cd6015344b18a2d69ee2c9af14e831629fb1d46bb0c15ad8f068f4cb9c39767d0db1b0487f38132fe SHA512 547365f492b177872d0543faf900c07879f74f89fa5ff87dca4edbf652c29780becb1a82f0406f70de5b5db4a3a7a5226d49a967c6ffa187d639858ce9593a7c
+DIST patch-5.15.44-rt46.patch.xz 81108 BLAKE2B 2a4f307fbec9c1715cb3177460998d41eee59b47d39eb5d05e00bae0fbb1dc0621aa845510eb348d46ad231080f57d3d0cbae0dc8968e0619f814cc7fba88d9e SHA512 79a6c63dea765126fd3d0563b71194e4cf128d7a0e32525bd830a628356d9fa3ab1cb8e1c93adc77a56a8d8c736e1d0980001c29df2664def37010d6b8483a60
+DIST patch-5.15.44.xz 1800820 BLAKE2B 2cf6bd8bbe0ca4052a8c0534c7b1e6cc6c0b9fe97db93495af8499badfed72492f91d48b58e4aacc0406e4612786cd34629c77b7f0fda5e87fb014c5e1ecca60 SHA512 fb8fdce86d51de27f8b3dc3f902e345bd824d21b419ec065420323cff099bb3dad0042f63ad7419f4cd0ea9a96a1654e39d92441c3162c32af0aeb134a752381
+DIST patch-5.18-rt11.patch.xz 59344 BLAKE2B 6ebe9b4b799ac20af5ebab918b34dd408140e7a67159e659d5638100bfe2fad4fe075c87becee6bf2cf19febab3f64b960e748517dfbd6961f172beb8efd6a43 SHA512 d86c9805b24f0385c0b4b0d0f66623a965d561b49d7cf01e12fd49382296b14114363d72828bbfd4b608678f17d211e72b5ac7a3bebbbc5b9ec6f6c236ebfdee
+DIST patch-5.4.193-rt74.patch.xz 184160 BLAKE2B 02988c8f7856292a6e56aca99b7721be85b4356c4a52218a4bddb9bd1790edccde31f367eb8abf6783aa30a08626fc1c7aabf65a1eb909e76a64dbe5661149ea SHA512 dddd2077b070566135e303cfff3687e9cd72ceb3479f9030d13caec9b29cb4ecfaf2691ed34973c5a14b431c7de8f952a4544c78e5119b1e366c1748eab6c95c
+DIST patch-5.4.193.xz 3907812 BLAKE2B a9d3eb2186f8f29d2164f4b3ee1ed0339969890b0ea007c8b03a5f08d2fe6aba7239112af2c661d0e147481dcddec5931f67504f752e4aba73da1c6b5a648244 SHA512 6166943e76285ae6c48fe2ebf6d057c39c18d268869c3c03620883f3e087eb3378293799e601ca3f2e948ed24e52afac0f04df808e23d7686844ec24d812b26e
+EBUILD rt-sources-4.19.246_p110.ebuild 1422 BLAKE2B 78b1bfe2ddf38279cb8d714b80f8123db0cd5fcb4626cc5a60550ce1a9573631bfeb71de9018c9609efa95a29971fbd73e00217ad2b56a840efc6391bf045b04 SHA512 00aa2b9086b99ff329ff856457aef5cf6d366533b72ecd85aeba4d6b29afe19c986d17c12e4d40edbdbce52a992eb619bd5fbb6019519d2a192d7c31eac1d308
+EBUILD rt-sources-5.10.120_p70.ebuild 1422 BLAKE2B 78b1bfe2ddf38279cb8d714b80f8123db0cd5fcb4626cc5a60550ce1a9573631bfeb71de9018c9609efa95a29971fbd73e00217ad2b56a840efc6391bf045b04 SHA512 00aa2b9086b99ff329ff856457aef5cf6d366533b72ecd85aeba4d6b29afe19c986d17c12e4d40edbdbce52a992eb619bd5fbb6019519d2a192d7c31eac1d308
+EBUILD rt-sources-5.15.44_p46.ebuild 1440 BLAKE2B 3f21c1c4a224731b17de0ce5f62e3713f90e6df36e2e243fbff8308da8316737eedc275174771a8a6666adef069a74a3a6098e34868d0a99bb5d17526f7dd44a SHA512 c34766b92f4f8a8f16d17b63103cb2cca3cfc4d73d71b5284ff715a9759689dd289145bc5ddbaa62244f5e81db9959f54dd1c68effdda8d71dacb1636dec15b2
+EBUILD rt-sources-5.18_p11.ebuild 1428 BLAKE2B 03a3e19f101a660d0e363658b65dae0ba9546ebba803298d51c79397b796f3f0fac8ac56156e00f93f22a9bb127d7d25c035288bdddd0edd1269c483abca5f0d SHA512 9db7c916171fcfc46b9ab0e2bcb7b5a269b49b6c842e2ebfdb5df0ccfd3a9cbce5ca0fce2ecd1b2a2bef684443b57c8b8b6e5c40132e5ba118c00e16887dfcc8
+EBUILD rt-sources-5.4.193_p74.ebuild 1422 BLAKE2B 78b1bfe2ddf38279cb8d714b80f8123db0cd5fcb4626cc5a60550ce1a9573631bfeb71de9018c9609efa95a29971fbd73e00217ad2b56a840efc6391bf045b04 SHA512 00aa2b9086b99ff329ff856457aef5cf6d366533b72ecd85aeba4d6b29afe19c986d17c12e4d40edbdbce52a992eb619bd5fbb6019519d2a192d7c31eac1d308
 MISC metadata.xml 426 BLAKE2B 89cc1d5f99d265e074847c32bd90c678e47e5a6a01706f3bf92211d82db4bf2d4397fb8dd62aa11bfbd25ab463633fc62a991d89e719ae0c5e608f1bafa0c3ee SHA512 bbed525e3e382d7fce0ac05a015b816b423b426fac03519d6c8f49a9dfa1b1c6035e9fc85d97198a680e4e0dc20af2f44815b3de7a0393b06d7ce0b5c0dd0145
diff --git a/sys-kernel/rt-sources/rt-sources-4.19.235_p106.ebuild b/sys-kernel/rt-sources/rt-sources-4.19.246_p110.ebuild
similarity index 100%
rename from sys-kernel/rt-sources/rt-sources-4.19.235_p106.ebuild
rename to sys-kernel/rt-sources/rt-sources-4.19.246_p110.ebuild
diff --git a/sys-kernel/rt-sources/rt-sources-4.19.237_p107.ebuild b/sys-kernel/rt-sources/rt-sources-5.10.120_p70.ebuild
similarity index 100%
rename from sys-kernel/rt-sources/rt-sources-4.19.237_p107.ebuild
rename to sys-kernel/rt-sources/rt-sources-5.10.120_p70.ebuild
diff --git a/sys-kernel/rt-sources/rt-sources-5.15.29_p37.ebuild b/sys-kernel/rt-sources/rt-sources-5.15.44_p46.ebuild
similarity index 100%
rename from sys-kernel/rt-sources/rt-sources-5.15.29_p37.ebuild
rename to sys-kernel/rt-sources/rt-sources-5.15.44_p46.ebuild
diff --git a/sys-kernel/rt-sources/rt-sources-5.16.2_p19.ebuild b/sys-kernel/rt-sources/rt-sources-5.18_p11.ebuild
similarity index 92%
rename from sys-kernel/rt-sources/rt-sources-5.16.2_p19.ebuild
rename to sys-kernel/rt-sources/rt-sources-5.18_p11.ebuild
index 8e20943244fb..1f0af5c3bd33 100644
--- a/sys-kernel/rt-sources/rt-sources-5.16.2_p19.ebuild
+++ b/sys-kernel/rt-sources/rt-sources-5.18_p11.ebuild
@@ -15,8 +15,8 @@ RT_PATCHSET="${PV/*_p}"
 inherit kernel-2
 detect_version
 
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
+K_BRANCH_ID="${KV_MAJOR}.${KV_PATCH}"
+RT_FILE="patch-${K_BRANCH_ID}-rt${RT_PATCHSET}.patch.xz"
 RT_URI="https://www.kernel.org/pub/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
 		https://www.kernel.org/pub/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
 
diff --git a/sys-kernel/rt-sources/rt-sources-5.4.182_p72-r1.ebuild b/sys-kernel/rt-sources/rt-sources-5.4.182_p72-r1.ebuild
deleted file mode 100644
index a78670212ae3..000000000000
--- a/sys-kernel/rt-sources/rt-sources-5.4.182_p72-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-KEYWORDS="~amd64 ~arm64"
-
-HOMEPAGE="https://wiki.linuxfoundation.org/realtime/start"
-
-CKV="$(ver_cut 1-3)"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-RT_PATCHSET="${PV/*_p}"
-RC_PATCHSET="1"
-
-inherit kernel-2
-detect_version
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}-rc${RC_PATCHSET}.patch.xz"
-RT_URI="https://www.kernel.org/pub/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
-		https://www.kernel.org/pub/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
-
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
-SRC_URI="${KERNEL_URI} ${RT_URI}"
-
-KV_FULL="${PVR/_p/-rt}"
-S="${WORKDIR}/linux-${KV_FULL}"
-
-UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
-UNIPATCH_STRICTORDER="yes"
-
-src_prepare() {
-	default
-
-	# 627796
-	sed \
-		"s/default PREEMPT_NONE/default PREEMPT_RT/g" \
-		-i "${S}/kernel/Kconfig.preempt" || die "sed failed"
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	ewarn
-	ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the RT project developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds."
-	ewarn
-}
-
-K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
-${HOMEPAGE}."
diff --git a/sys-kernel/rt-sources/rt-sources-5.10.106_p64.ebuild b/sys-kernel/rt-sources/rt-sources-5.4.193_p74.ebuild
similarity index 100%
rename from sys-kernel/rt-sources/rt-sources-5.10.106_p64.ebuild
rename to sys-kernel/rt-sources/rt-sources-5.4.193_p74.ebuild
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index d76b05bd314f..d641ca094987 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -3,21 +3,25 @@ DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611
 DIST kernel-aarch64-fedora.config.5.15.19 242615 BLAKE2B 94e59440681535e38137b71814e1ae53f57a347f62cf31e0c1c8571ae43d9ae9be9957743c8cbc9ec74850c964eaabefe6799a28bc311ea7b99ee31391b47fb1 SHA512 fb77d3b73a215f97d70cd6d8c96ed20e497786b99ed7d7a7f2ed60cc1251289c1a4c7e058c41b5efac62e4a9b4b3d917dbdb11585955bba2b6584981430f4ddb
 DIST kernel-aarch64-fedora.config.5.17.11-gentoo 239036 BLAKE2B 7b4cfd0cb29d5a79f7af585ae019723da74de58eb0e756ebb783ca0e17a79b68ea751f9c7eb7f31f16adb334e2b746228b55bdebafe31195cde4a379aa865b48 SHA512 08de60599905b032d09ad263670f1501513366d89fc224e21c1689fef97f6ed28db9149becf7363f28f2983587cbefcb20ef99f6b5dab8ad24ad9320ee829790
 DIST kernel-aarch64-fedora.config.5.17.3-gentoo 238977 BLAKE2B 5f3a43fff7ddfe4dda03f00e7f4af761ff978bbc9c6d2fa73b605f60755a0d40e494428725a7728f5e2f5f58c9931d8d60b048d318e22c635588e546209dcfb2 SHA512 4c22514ec7d2d4ce87087aeae17a5f68efc3e70f48298895262d5dbc47623de6ada4254ee3a7f06a302d37af73d921470903f2f3a86fe5224e638bda882be7e5
+DIST kernel-aarch64-fedora.config.5.18.4-gentoo 242525 BLAKE2B d27e9b2f96f3d7968919eb2bd4f67b62543a9fbbeb2f1253a39046b4e3b9cfbff1266c21a98a2d86dbed1897bd41d8795726c6491d96bd1de25ad1a012fabaa5 SHA512 bf7758b7a24c4abd46e66f031e1da5081e324a383c710f60446f43296fa7543b3dad47c751ece8667ab0715e1605b104b6ceb36966a0f474ae4ec8641425914f
 DIST kernel-aarch64.config.5.4.21 199104 BLAKE2B 578ad451a76204df2a9bbbe34b5cb27051d2ac5e2c33967f562b01338c43f35da6dc33a4c2cc67ea6c3b32b155729360d3748ec28dcaa750f18449245b2e8a09 SHA512 66e9a437beb350fdc59512c17b8f72c5b5bfacf2b35070d810d77e66f49cf7929026cc28ad44b04a016d61e65d9fb4a10af6996ba09b604bf97e9c467d08f8ff
 DIST kernel-i686-fedora.config.5.10.12 205412 BLAKE2B 92c715b7e2cd7dd74da7970c05981f520597d3e403ce82c8cf4eee31c9f1f50b638792a6bdb256ef5bfdc99f1bcd594e819e8f44dc6febb2ad9a854bad817f2b SHA512 69d8db11723ae1b40fdedfaace74d15bb63198cdb0485e0a1e5eba95b31217110c93a93e39cc7370cf45f1d3a8bc7f75ec096d6db5ea9ecb28ac6b56702ebb10
 DIST kernel-i686-fedora.config.5.15.19 222233 BLAKE2B 9e0f4dd37058f59610e46a87d3165039e76299d3c186fbfc3312101bac1b8b198de404075f5bbc6f5e2ba04cfd45f9d02bdf94b01c3ed11b9275f37f11ee7617 SHA512 49ffc39de86763e707a5c0c07c1367d34e9249615f29fdf97904d7b61a375a86fc4ba37a2f02b5f61e4c76ad65d9ba12716d2523af6faa003f6336d7ae61a953
 DIST kernel-i686-fedora.config.5.17.11-gentoo 218149 BLAKE2B a1a4946185e678b9c42f8e524de25efea1a049714e07f8f64bc9482680fe4668bed2b6a91a7e63d4142cda50f3d3a05c64b62e4477d2411e0251546b6774b12c SHA512 9ad7a0a213637d9818b95ea86f5abb2c6d2fdd0929ddd15db32a0ab4c71c2ff808a066846bfd054a27dce4056942db98117414399484e1688c6dc7d7d8edd0b7
 DIST kernel-i686-fedora.config.5.17.3-gentoo 218090 BLAKE2B 1d972e6ed16c7dc1dd9959ae406af52d1cdc15f85f8ab376e4d7abb79d9e284a9a68442bde975f5f1a9bc64fffdaee96d1f41392238538b37f1b6f9652ecfcd6 SHA512 2c32cca1f20cf54f3e9b394f6e3f14f435bdd72fa22868416129bfd4253a3cc8f3164b6868e31292c2404a1c433944783279e03b45cce9bec3b2813cb4675b27
+DIST kernel-i686-fedora.config.5.18.4-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.17.11-gentoo 209309 BLAKE2B 4b94a9ebac017c2cd4240eef9bea7b65c0e0fb75e1f02d2e6585c0f352f91e1113e0fd8f527cb3d3f96e93c50eeee74186ba6c2574dd45bee515e031ed2bad9d SHA512 72c05e6e64ef8e2430ac2fe592dfcb0c5c8def60f2d53a9f2f7bc1e9f5a98faab2ace7ab73758c008bf004eb99bd91eb11be90198178b27636d7873e38ca6943
 DIST kernel-ppc64le-fedora.config.5.17.3-gentoo 209239 BLAKE2B 7c6fd8bdbd8331def5bb658359aeb3d52a9f0e72d9312699e00d852b6740250edb1c7a77ea76521b0be6a8ce41888aea4ce8734bb267cc1f3e216f2cbd6ab8d6 SHA512 f25199dd6cef4be45049fa7d6cc1dc1b8a93ddfeb3b3824e6ead76443c1ea30e31dfcd4ba66625eec74ed43ab255d1e21cb2a9011160cdc64f30c4b1fdcdb9b3
+DIST kernel-ppc64le-fedora.config.5.18.4-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.17.11-gentoo 219087 BLAKE2B cec0c1948960ec5363830ece7be7d3060c74eb689e801af229017a9d9804cf9ef546168669d65598d33fd5b2f4ac9aaceeeafd33f92ddeb8f185cb507f56b417 SHA512 c1602e8a8401311ca82972278476916f634dc8ae810a0902bfe0d415d2670b3bceba59f016ed90669eb73b1a9dfaab35cba4a1b4428e0fbaa6ccd2701871af39
 DIST kernel-x86_64-fedora.config.5.17.3-gentoo 219028 BLAKE2B a8a3e2f31315d6aaf19c6771db94a3549379fd48a33b29b00d0311a36325ba8e9f124b5962a447aa8bf63b01f714298f4fca7ff071db165f183ce9023e2b4cf2 SHA512 8c7937310b8e9cbaefe4d6910595df373edfea5a56e439671583c98a752eb5d9029bcb32178ea6b09e6847e55e71dd9ab94e0adb149626ce04c8a9e8f6d7a145
+DIST kernel-x86_64-fedora.config.5.18.4-gentoo 221797 BLAKE2B 1873ffeab78c7e9a8186d255dac5b7dc5fcdadfa97d6a265aaac1583006adc1c0a150eff6892f1a82e622f77122051d0eca5e2cc0d9b95f8d0e36212d6c47ed3 SHA512 7c2325a12de85bc1aa300b5f3846711a20d43817a60a68e7cae84ac6505b3deb158c9dd0871d86e148f46435f36549231566abe276ffc2ee8bb9dd2ac5c40960
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
 DIST linux-5.10.117.tar.sign 993 BLAKE2B a4365bbb057db936510aa6f1e50b136a4e35c601d6003c3f78f0dbc2e5c18daeecba040e621c0c14ca25319da406c94b8dc469cc7c8d5003bbe94e1a90749e0a SHA512 dd63b7be79912d46945f5017bd00c45ef73ea36cd8549aa38bfdb7ac9bc71b1c9d1b3c83794c38239b2b4beb17e83ba3fc8f8fa3921721519ca0577af9d59765
 DIST linux-5.10.117.tar.xz 120409348 BLAKE2B 8258d709d637891dcbb8523c6d9c8c007a44b7f7a109ffa9cd48f9fd9b4e7dfba170f9ed97828f4beabe6c6ed34ac69b287ee489321569adb282c7d0745d3750 SHA512 3f9488c55a6e9458cf53e06992ff56054cd4c933eb0e87a5122b6b7367d6ca7aa3587572e8f5362cd3264104f839102f87f40ac98476f666c44488b9422fc39f
@@ -29,6 +33,8 @@ DIST linux-5.10.120.tar.sign 993 BLAKE2B 885d967da77de2608bbd84d8aa8adcd87eafe98
 DIST linux-5.10.120.tar.xz 120413852 BLAKE2B 791c45c935dcf77030a0f4026b795cf29197c45676cd05ce196c7cfe62f2d53e280805cdfe454698ab027e001d409595dadd7dd9c531c222b423006f976f323d SHA512 0e7aedf0dee5131779b59ade306beeb5c383fd0dde726d32878294aceefb2bf8f80672279a3db4df8efe095413f1097c9d7ac3a9ef0aafc23a005ed14928bade
 DIST linux-5.10.121.tar.sign 993 BLAKE2B 7f9d7ce16f701c1b3762e84cce4d75c46a5418d05e6ede6664852c339a20cacde1d6bfa22509a5c14326c9061e04957a5d56bd04a9dccc4859f01cfef0bdbbaf SHA512 6ee0d85ab06dec69170d055ed07f4b5ba185f9cc60aefd00160bab6c18bc8da8b5a98d51d1f12d08fb5fa560d944e5cdf60c787236751401564af87a112dd489
 DIST linux-5.10.121.tar.xz 120419880 BLAKE2B 55956466c50a788c1c9636d70af705e253a60ffc799f489b76be86d655f088b4110e241f3ba34452ec742d5af0afebd668cce1c1b8b5e41eb807887fb817fc2b SHA512 40f23767faa745a373e79a8875540dfa4fc2bd15c246334a661190d755db5cc3f8e9d110656bcead91930b5b6fac8ca786f44637998b416ac12a16b835f0fb11
+DIST linux-5.10.122.tar.sign 993 BLAKE2B 2c851bdca13aeb75a4c36dfa7d20f61a3c7f15e48cc41c482cd77ec5079f5ddad24a8b26cc5f045e1c1d0e49a2b88cebb2057c24e855c3714821a9b42e4151d3 SHA512 7b12f8c655f6396a6903ace7b9790996d336991db11d900f44a7f08cd2c5338b87228e3d7904ee7951b99730dc9e5b7c58738ad2d5851e8b747d01cf96394dc2
+DIST linux-5.10.122.tar.xz 120427020 BLAKE2B 1e3fc0340f264fff06955ca577d1c8c955ec4b571d795d6705e09c8ae586bb0c4aa5cca80a040bb2bf128a927ac90a80d28e103d2b059d35d60a53c4fff2540c SHA512 df067fbb9dc691923e9719c3bea7b7efadd0e111b8fc58924111b59688f03f4b5538191a2447507523aa50451d59944eb492e1448f1c32e8b3674e08b33d6d22
 DIST linux-5.15.41.tar.sign 991 BLAKE2B a5ffcbc8a9127288f6ec5d640178a286114343643d91d218a85e9ad9feddcb3d1febaf0d36f6ec230a732cdad0f8bc41967308049b3c7a4bece24c70ab546552 SHA512 e8420f18f3ea201669fb1ba3f6565d41ddb3c6063b81ea27de5ae51501e01a1fc73283d0fd55255f74003857ed9b07645eee7ed8a6322e986356d7b5685b10ce
 DIST linux-5.15.41.tar.xz 126321620 BLAKE2B c92592a3994c607242053cde655ebc7ba837e2a8d06594fd14c54c63e227fab42eb9ed3e1c452a76e7258c3f46cfed447306f9cbde62c5cd96f04a334edffafc SHA512 f93bddc7c7890c5014c0b506884bd5487cddac462f74e965e869538f97e22428739e5f71badfcb6ccb5b20f642dd66b53286d85036d239245cca9865d826044b
 DIST linux-5.15.43.tar.sign 991 BLAKE2B 6ee0c91a3c9fbd24dc3e00ba6ab379c4763179d66cf15609bfacac2255facc76ec5f3b1d5468706f22eedda9913d7f7e6acc65eed3bd45d45cbb51c38dac6432 SHA512 7ff83540856cd84bdc1961308f8a44efbc12b9653febf404044c42cde6e5fe0ccc3e6ef8121497a59013c48e5090cc8eea0df250934b3adf35e7e0fbf9adf974
@@ -39,6 +45,8 @@ DIST linux-5.15.45.tar.sign 991 BLAKE2B 8673e0cb946b149c701bbf2921f561f7e44414b6
 DIST linux-5.15.45.tar.xz 126301288 BLAKE2B 02b2cb0cbb76d10062775baf9642b411f88e83954b6ad781c0594eec11d6ab7bc3e33465e97c65216fdef296db2efdf96dd9fa79b936e9b20bcb0bb3bf1cec41 SHA512 0a8e95cf04af68fffa3dfa23dd53e897527c8c574c91cc0601856a5cf25aec077911405bccf85307d3da51c5152a3f7daa99b6373d8d90124224530221cfc66c
 DIST linux-5.15.46.tar.sign 991 BLAKE2B e0f482745e07787e3fd7ca26cd92f8e06370c900904f0ef4336545040611f5fc0448f685066a6124568b30af598af9c711860f849afbbe026739b24b770863d6 SHA512 742b03f68c45e82e39a249418d2fff89214897f1f41c1360065e529122f7e5d493041259e0399dd255060e9d3ceb761107ddb3026e3588a70f85d5e51ba781ef
 DIST linux-5.15.46.tar.xz 126348960 BLAKE2B 26fdc4bbed153f7a5a511b7c1a804f794dd6e4b8b44d0317a4cad304b2c824183fd6054b7ca94f22b3e49e22a13ec9dbd24373b628b01bdcdb5392eafe6b3dbe SHA512 aed8ee53e8d70f4110db49fd6ceae4b4664855a4694c9abd2064057e04efcdf22e09f6883269bf383ac700b4217333e9bbdb3f4aaf839e9e479d6360b637fc2c
+DIST linux-5.15.47.tar.sign 991 BLAKE2B 08a778da9bf02461fd2a3483283fb1651bc8afe931fa1cbf0c8d17ec9a4b9f7f9405a654d047d75a7b4411a2d17371b4fb9228f2a04efe0dfed4d1907142b632 SHA512 b9a75afdead5277ca458a26845f736834ab0b87f2b99b74c80e457261877c5f20d09e3a0588dc0c9337463ec6d8a24be313143a0fc6ee10f8a8a9d8f0f238dd9
+DIST linux-5.15.47.tar.xz 126343396 BLAKE2B e4c78c320c973ae1fff61fcf007b6c76ceafd86adb612fc59dd174eca5ad713064fb56b453448324512b642a1e4aac2e983fc266fb59e62e189347df5a2dcee5 SHA512 5a8a40f21f58eaed7ec21431a9b9401ce3a576d587e977ba87599edfd5551892469eb701adb064154b3f80e2932dde530fddf8752b13cc4de05177870e022fba
 DIST linux-5.17.11.tar.sign 991 BLAKE2B 3f734e77a1f91684b02bcf8f612ebd3feb0f21039b4df551a369f0e1f86af342ff4e287aa067f8489075e2e4eddf4598f4f3ced15cb6e73ce7530218f48fab66 SHA512 980fffb64dc560882e9e9d9e6bd09e92ec802592554df95412138c4b414915912abe6691f7979beb555e4a23a2214e0f32b409ce988b5b8d8584bb763d84c21e
 DIST linux-5.17.11.tar.xz 128457724 BLAKE2B eac40fbd6589b315983d30e3711c5a71065e8447df607f6ad02a2b430f8f47bdef6ad5cbb7e43c94b2016e9d045955593657dd7e2498f1a04c6272307a579d2f SHA512 cabe2594aa188c7dcea842e9bd31015a851d3ab3f7122b595c5c81701eca42fd223e2cc3667783a1a1f852c61b6e1045f6e361a642aaf60b545498bd1acadef2
 DIST linux-5.17.12.tar.sign 991 BLAKE2B df6f52a15ec4c2dc4bbd5e644f6a9c8d99b28eda652ceccdf7f2f6a292b7cc0b98a8e454b1fd43195e946965b9604a4c106752009b1b92693d4a269b93bff52d SHA512 d3fe3aad151850e8dcebbf4c9d8190870fe0378edbeb9a026e1c64c0793af2e5fa20865a77218a6d94b516d3f4ad6587fe7d23b7edb158cad941aafe60b3dd30
@@ -47,30 +55,41 @@ DIST linux-5.17.13.tar.sign 991 BLAKE2B 2cb8e78546563c946735b25d5a3e5b586c9fb2d1
 DIST linux-5.17.13.tar.xz 128422820 BLAKE2B 3efcb9b576a3ed7e5a8863a06f91b0436d57f0098db5aa72a2751f001f3605d8c6b1f58a92dad5394106d0b29ab5379bfb3937f3bd8ef95931e2d480846f0bc1 SHA512 ea54a3cbf874bc9fa0974327082ceb4c54f9f044d90a2c4c75f57691328815d19c082a776da4ea40f66e3f18e83c2f7f3d6e479dca1b4eb195b88f59e0426858
 DIST linux-5.17.14.tar.sign 991 BLAKE2B 519f379f4944e109412757d949edf396ffde580d41cf2b2ca77014aef2f91dd156d2cdba01d0fa9ea7311d33ff0013e32fce72c37bc5db20b1649c9a2a23c223 SHA512 a85aee30a1ee42bd8c98c71165231346123fc8e8a83e14fc33962dc234a9e3ed4a62a456c8a95307146c14b674a9cb0049aa9f2a286080441a672aaf0b073c80
 DIST linux-5.17.14.tar.xz 128463904 BLAKE2B cc605b498b6ee01f678115da2d7d0e28164c339c155f0cd9e1081306e37954ae8eba0b0c18169e2da6b1437cb74ad42afb3329da2cb45ebee7500d0510fad49f SHA512 c4108a6a14801a969e55f2ff9048d60bf804645634c7e8b3fe61017d5bdc589198e271b6bca9b894e149a3f502e6654dcdc650a04c2db17ffadfd2831d8ce4be
+DIST linux-5.17.15.tar.sign 991 BLAKE2B e7dd4791920ef75fb124f5e5860f15106bdd8ae6993337f73350f79e167b71a96af59cfb449f4c88332633384d02a92e2a562acc0de8dd70d4ca7ca02fa0cc9a SHA512 002cb1f9491ebf67db2f1284462c4eaeb3eda00542e263e8c5b07865b73789e1f0558c5ab2a9b334a312b8dc43275464f4ecf4cae80b11d55e396c12539f612e
+DIST linux-5.17.15.tar.xz 128442092 BLAKE2B 14e42132958581b1d4ec01c9095d61ca5539ed894bf6c6eccf4a984cee496affe3a0f12383abbb1df46f55c1fcb667154ebf1f4f460f96b9d5166991bcb68a63 SHA512 0239fc941bd3dee4969f87d5a3bd90b6a6b5ebaed950a17a33e64ac6a110d3b9f7e287a134098403718c764b8dc78b72ed7979f820a20eeb3136f22d743c3aa1
 DIST linux-5.17.9.tar.sign 989 BLAKE2B a078037dddf7634cf5e854b79a873cb743a3809a4be3d6fc4c8d9ea2340ed61d118dcb58edecadcdc653ded2e4c552d44b56d5d962d833b6b37234726ac35b5c SHA512 07c2d483e0b02ed17b27d774513cca9be47b7d163964e7f2b14f0be273e8d67747a164274ee1fcdf67abf39f7141297322eb5f39cf9cf4df89bd03f48fc95143
 DIST linux-5.17.9.tar.xz 128449736 BLAKE2B 83dc3cf66933f42a3cdce0015716017ed7fd7810a380a9374bac495b9f0a96b1b95b05bd012332c4156189f6a02d8a9b8b33c9391458adb9909a75bf661d8547 SHA512 8866b6f0ab8cbc122bbed0083ee9b351193780143259b818a15cdde1581222ee728a60344ea9267d7f3e6b1563b24a23100f46e6bd185fdc1e169b804e48cc2e
+DIST linux-5.18.4.tar.sign 989 BLAKE2B 2742a67e16a88e6b6c0068e35176de11caefdea09bf2ba837594cbc1eb1b52ac4000861533e301f2f4f3afad468a7157f90360e0b0a88e4dc9693bac54dcd0e4 SHA512 3dcb8b9c8075b15ebe46198ababdd9ca2e95402a41eaf3d871f06fac2c68b1f717f6e40eaa7a1b4ba1a46aa4805148b43460b6551054d5ac611e0914d4dd5baf
+DIST linux-5.18.4.tar.xz 129853184 BLAKE2B 64ac558505062485a2f9ae9d67983885707814eb93a6df2468365b1f07536e7b06bbe916078162c9a2f9754620c3efcfeec4f308ef2dc520a3f8f76d7d0b8f23 SHA512 a8067e47195ce5ae6c8818989302ba9c01768190f1908541b4fa9230e23eb33a76f99ad6dbc36484595522179b2b5116bffe9a31b8731bca5d07b02ac546ac42
 DIST linux-5.4.195.tar.sign 991 BLAKE2B c80a3a547d82b7d394155f396e3beb66df61272dd5f57be00fcf3b8b6bcc419914fde3488b950f29f6c235210e8f777e28199a4126530963749ed3107c49a249 SHA512 a770e02e59031a8bc74c832c1f9947d0f2edd397de23eef234f18b7070128c8adb1836ca4297dce1afa9f5ddbdb97fa4404e2c90faa81d5502d8856dca4112fb
 DIST linux-5.4.195.tar.xz 112920616 BLAKE2B 9c3b21e2bf18800c4b55bb04810e29fadc6414fd100d4c2bdd3df1ba7db72124a0bab389b9d5038fd04440ac69a06383df5b4c42d6e2a6382c81af8aba366bca SHA512 695e46ea1ac6c587f39f724460c480f4994267969cd620a776766ee7a5bb88b346154baa3ecc3444dfa1d0d39a5e8a0f1a5e36cdd76a2c71ea7a899b8a8a9d7b
 DIST linux-5.4.196.tar.sign 991 BLAKE2B 8da70a3f1f7a4bd7e9a312146bf891c160625126c9672a7c3a213c8dcdcad2b8ce9250b8bdfad7ab412e6913f6a1d85832818a987a3de040a38e2eba70079c3f SHA512 96f28a7a44022e9a116ce15a164039088bb64b416d89cfae52ff33e0b05cd9c9b7edde1bd66b9a3838dcf4e937a73a02cea8af1c157109fa426bc55a6b4ad1d5
 DIST linux-5.4.196.tar.xz 112910488 BLAKE2B 89262970ae146b9c8882a816c8e619072a42912f0cc51df6ad892c383672682cc852cd441e0f0ba7fb0735317aa1e4906a4337dcce4a19a5c34ffeafba139c41 SHA512 d3b5393e929c5686b394bf66b21e92baa82999185259e198c2cb8a49a257d36268468c30a513ec00b08bf1fa885772ea149dd3e67c4e6c1474097735ea074b0a
 DIST linux-5.4.197.tar.sign 991 BLAKE2B ff5725d1239341586fb62ef1d125523c3189a896b137b531b817512ce54c25ca5f96b8465720bdf04edbc9cefb814288c571be6835f4d9cbe45e79f801ae1372 SHA512 6c450ae5d4b27929599df75b44572e197141765dab6a0dab156dfe01c3c1bddb95185c601199b4e174ae050ff6ec246adb91a3e81078c62bbf887c590a1d666c
 DIST linux-5.4.197.tar.xz 112914028 BLAKE2B 88607913fb1d37720f904c8709347fcab46c34e72e38dc81ab871dba44a356747e036f522686cafc1805693b0311fc3e721b0811f2868aca7ee8b3d924f05b13 SHA512 49d046b21146372d8afd50ca127db49eaddbce1bc5733517b6237833ed0eaa9c3c4267117b4ffc71518a92fd608734ff419d4722a2b99a519f444ba213762150
+DIST linux-5.4.198.tar.sign 991 BLAKE2B 292190044b014c31d14a177d19539d675f21ffb607bbe855b53d730eed5247f098fb9117f374ff9b151bba511d9a2d33eb171f3e7f39eb7f074cecb8f4839179 SHA512 4be8ca05751231bc7efb19781c5f526dfcb36a65fe42afd2297e52576f5049837664d26f25744d07d57f78e0379e04fe52f20685902e04ecc66924abb3d3fe84
+DIST linux-5.4.198.tar.xz 112928328 BLAKE2B ac19e2d70ede623236d10b706e8d3d1aedbe8c4f3a7a5a237829eba3f491785fcbe78afbad3e57edd5f448d38756717580d12d2e8b6b7c3f391865826177e32f SHA512 33c72ff8a6b1ab6fc19c2ef58bddc28ce4664d91dd22aa1c83655bda5de7e93b92dd3acc13a136ff55210dc4dcea211056308370d29983bb401770dc701d7a4c
 EBUILD vanilla-kernel-5.10.117.ebuild 3715 BLAKE2B 95be9c325f8b9a36f89e9650e56bdea2068345a1e9ffe868f19f72499e6427d7727583558027544e83dfaa179d32976d08747d71633644424e8079ed25b9a958 SHA512 3db02eab7261107e1dc9182b6b2f7591ad203ae57a6e27ae589a7fe4b3c5e38070f21ec0ac62c0ada48aefcf61b858099837661d66149eefd87639dd8a49285d
 EBUILD vanilla-kernel-5.10.118.ebuild 3715 BLAKE2B 95be9c325f8b9a36f89e9650e56bdea2068345a1e9ffe868f19f72499e6427d7727583558027544e83dfaa179d32976d08747d71633644424e8079ed25b9a958 SHA512 3db02eab7261107e1dc9182b6b2f7591ad203ae57a6e27ae589a7fe4b3c5e38070f21ec0ac62c0ada48aefcf61b858099837661d66149eefd87639dd8a49285d
 EBUILD vanilla-kernel-5.10.119.ebuild 3715 BLAKE2B 95be9c325f8b9a36f89e9650e56bdea2068345a1e9ffe868f19f72499e6427d7727583558027544e83dfaa179d32976d08747d71633644424e8079ed25b9a958 SHA512 3db02eab7261107e1dc9182b6b2f7591ad203ae57a6e27ae589a7fe4b3c5e38070f21ec0ac62c0ada48aefcf61b858099837661d66149eefd87639dd8a49285d
 EBUILD vanilla-kernel-5.10.120.ebuild 3715 BLAKE2B 95be9c325f8b9a36f89e9650e56bdea2068345a1e9ffe868f19f72499e6427d7727583558027544e83dfaa179d32976d08747d71633644424e8079ed25b9a958 SHA512 3db02eab7261107e1dc9182b6b2f7591ad203ae57a6e27ae589a7fe4b3c5e38070f21ec0ac62c0ada48aefcf61b858099837661d66149eefd87639dd8a49285d
 EBUILD vanilla-kernel-5.10.121.ebuild 3715 BLAKE2B 95be9c325f8b9a36f89e9650e56bdea2068345a1e9ffe868f19f72499e6427d7727583558027544e83dfaa179d32976d08747d71633644424e8079ed25b9a958 SHA512 3db02eab7261107e1dc9182b6b2f7591ad203ae57a6e27ae589a7fe4b3c5e38070f21ec0ac62c0ada48aefcf61b858099837661d66149eefd87639dd8a49285d
+EBUILD vanilla-kernel-5.10.122.ebuild 3715 BLAKE2B 95be9c325f8b9a36f89e9650e56bdea2068345a1e9ffe868f19f72499e6427d7727583558027544e83dfaa179d32976d08747d71633644424e8079ed25b9a958 SHA512 3db02eab7261107e1dc9182b6b2f7591ad203ae57a6e27ae589a7fe4b3c5e38070f21ec0ac62c0ada48aefcf61b858099837661d66149eefd87639dd8a49285d
 EBUILD vanilla-kernel-5.15.41.ebuild 3715 BLAKE2B d8110213454c54cc858db8eee5b84584b4c4aa135fd514cbb8bacba1d6b7899e3c89c8e7faa08eb00fa35b19605d05fa175ae2bc405ebcc1e0fddb51ee910de2 SHA512 65b728344d395668b2662556c4949b86d1253b35ee3075e929a48b12461214bcd6c0141d0fd07ec5cba87079880092b84acbd0e2163e23bd303d3fd8d7050112
 EBUILD vanilla-kernel-5.15.43.ebuild 3715 BLAKE2B d8110213454c54cc858db8eee5b84584b4c4aa135fd514cbb8bacba1d6b7899e3c89c8e7faa08eb00fa35b19605d05fa175ae2bc405ebcc1e0fddb51ee910de2 SHA512 65b728344d395668b2662556c4949b86d1253b35ee3075e929a48b12461214bcd6c0141d0fd07ec5cba87079880092b84acbd0e2163e23bd303d3fd8d7050112
 EBUILD vanilla-kernel-5.15.44.ebuild 3715 BLAKE2B d8110213454c54cc858db8eee5b84584b4c4aa135fd514cbb8bacba1d6b7899e3c89c8e7faa08eb00fa35b19605d05fa175ae2bc405ebcc1e0fddb51ee910de2 SHA512 65b728344d395668b2662556c4949b86d1253b35ee3075e929a48b12461214bcd6c0141d0fd07ec5cba87079880092b84acbd0e2163e23bd303d3fd8d7050112
 EBUILD vanilla-kernel-5.15.45.ebuild 3715 BLAKE2B d8110213454c54cc858db8eee5b84584b4c4aa135fd514cbb8bacba1d6b7899e3c89c8e7faa08eb00fa35b19605d05fa175ae2bc405ebcc1e0fddb51ee910de2 SHA512 65b728344d395668b2662556c4949b86d1253b35ee3075e929a48b12461214bcd6c0141d0fd07ec5cba87079880092b84acbd0e2163e23bd303d3fd8d7050112
 EBUILD vanilla-kernel-5.15.46.ebuild 3715 BLAKE2B d8110213454c54cc858db8eee5b84584b4c4aa135fd514cbb8bacba1d6b7899e3c89c8e7faa08eb00fa35b19605d05fa175ae2bc405ebcc1e0fddb51ee910de2 SHA512 65b728344d395668b2662556c4949b86d1253b35ee3075e929a48b12461214bcd6c0141d0fd07ec5cba87079880092b84acbd0e2163e23bd303d3fd8d7050112
+EBUILD vanilla-kernel-5.15.47.ebuild 3715 BLAKE2B d8110213454c54cc858db8eee5b84584b4c4aa135fd514cbb8bacba1d6b7899e3c89c8e7faa08eb00fa35b19605d05fa175ae2bc405ebcc1e0fddb51ee910de2 SHA512 65b728344d395668b2662556c4949b86d1253b35ee3075e929a48b12461214bcd6c0141d0fd07ec5cba87079880092b84acbd0e2163e23bd303d3fd8d7050112
 EBUILD vanilla-kernel-5.17.11.ebuild 3834 BLAKE2B 96e35e9617f82d38106724d4cab64a3d0b87d07feb954eb2ccbe17761a35cd6ac1e7839d14296b784a63300686fefca8315c348972e54d66f28b1621cc7f5d6e SHA512 69ebcaf1d64014bd059f0b7419f0bc2bd01c6f1de7925e7f02bd54e99cb493275a2057c3eb29c3689e6f4c45dd5538dbdcc3c5dda1d94346d38d2cc48890eab3
 EBUILD vanilla-kernel-5.17.12.ebuild 3835 BLAKE2B 105facabbabfc69467f389ffbbe66cee709dc1dd28baab4d811ca343b3093abbd5ece7d01baa7dba2e5edb3070d7171af78430ce6c47d44a809e07df6252794d SHA512 fa3996d7fc56342e31f37516113334694aa7ed7d0c934c7fb4a2725e4f42e4999fc3d3b11f6b21dec768e74ba99fb1fce77676845ee93596038d6a2b65df4b0c
 EBUILD vanilla-kernel-5.17.13.ebuild 3835 BLAKE2B 105facabbabfc69467f389ffbbe66cee709dc1dd28baab4d811ca343b3093abbd5ece7d01baa7dba2e5edb3070d7171af78430ce6c47d44a809e07df6252794d SHA512 fa3996d7fc56342e31f37516113334694aa7ed7d0c934c7fb4a2725e4f42e4999fc3d3b11f6b21dec768e74ba99fb1fce77676845ee93596038d6a2b65df4b0c
 EBUILD vanilla-kernel-5.17.14.ebuild 3835 BLAKE2B 105facabbabfc69467f389ffbbe66cee709dc1dd28baab4d811ca343b3093abbd5ece7d01baa7dba2e5edb3070d7171af78430ce6c47d44a809e07df6252794d SHA512 fa3996d7fc56342e31f37516113334694aa7ed7d0c934c7fb4a2725e4f42e4999fc3d3b11f6b21dec768e74ba99fb1fce77676845ee93596038d6a2b65df4b0c
+EBUILD vanilla-kernel-5.17.15.ebuild 3835 BLAKE2B 105facabbabfc69467f389ffbbe66cee709dc1dd28baab4d811ca343b3093abbd5ece7d01baa7dba2e5edb3070d7171af78430ce6c47d44a809e07df6252794d SHA512 fa3996d7fc56342e31f37516113334694aa7ed7d0c934c7fb4a2725e4f42e4999fc3d3b11f6b21dec768e74ba99fb1fce77676845ee93596038d6a2b65df4b0c
 EBUILD vanilla-kernel-5.17.9.ebuild 3834 BLAKE2B 96e35e9617f82d38106724d4cab64a3d0b87d07feb954eb2ccbe17761a35cd6ac1e7839d14296b784a63300686fefca8315c348972e54d66f28b1621cc7f5d6e SHA512 69ebcaf1d64014bd059f0b7419f0bc2bd01c6f1de7925e7f02bd54e99cb493275a2057c3eb29c3689e6f4c45dd5538dbdcc3c5dda1d94346d38d2cc48890eab3
+EBUILD vanilla-kernel-5.18.4.ebuild 3834 BLAKE2B fc62ac945a12bf66234b68b1edc8cdbe21d96ef27afe25eced009488787bd8b3021190525228725ea6e83e3c091d5d87908da79bbb9869b94d7c2c2a7e65e734 SHA512 613f41a407732277606c315e4d8b8ce321c2ddac5b9320757e74a826184e0fa9ea33a32180575785a1ce06b687393695542eb85133b419db2d22c0216fd51fbe
 EBUILD vanilla-kernel-5.4.195.ebuild 3001 BLAKE2B 5c228a2307a9c32d2af3baecf92de59034512358a8e3f3942fc770fa80143465b145d80166c48c967439091894c3d4793c7f5a559881092b0b8b49afbbce9837 SHA512 e997a0389a227ab93c2d67723795e4250e82301c50dec1bf15b2a35fda941e9d32a21d8c277bd9f535872d4268b0ee03a1120f28899217717fd55df2d11370f2
 EBUILD vanilla-kernel-5.4.196.ebuild 3001 BLAKE2B 5c228a2307a9c32d2af3baecf92de59034512358a8e3f3942fc770fa80143465b145d80166c48c967439091894c3d4793c7f5a559881092b0b8b49afbbce9837 SHA512 e997a0389a227ab93c2d67723795e4250e82301c50dec1bf15b2a35fda941e9d32a21d8c277bd9f535872d4268b0ee03a1120f28899217717fd55df2d11370f2
 EBUILD vanilla-kernel-5.4.197.ebuild 3001 BLAKE2B 5c228a2307a9c32d2af3baecf92de59034512358a8e3f3942fc770fa80143465b145d80166c48c967439091894c3d4793c7f5a559881092b0b8b49afbbce9837 SHA512 e997a0389a227ab93c2d67723795e4250e82301c50dec1bf15b2a35fda941e9d32a21d8c277bd9f535872d4268b0ee03a1120f28899217717fd55df2d11370f2
+EBUILD vanilla-kernel-5.4.198.ebuild 3001 BLAKE2B 5c228a2307a9c32d2af3baecf92de59034512358a8e3f3942fc770fa80143465b145d80166c48c967439091894c3d4793c7f5a559881092b0b8b49afbbce9837 SHA512 e997a0389a227ab93c2d67723795e4250e82301c50dec1bf15b2a35fda941e9d32a21d8c277bd9f535872d4268b0ee03a1120f28899217717fd55df2d11370f2
 MISC metadata.xml 353 BLAKE2B cd022bd01b289ae703ae6ef6c2539fcfce833206c55e328ba02fc42b360d60f76b1920927b259dbb199724e6d3e7b0f68ba2044680d962d3cd03a973475582ff SHA512 10b10fd24801843108a71ca7d0c27514965b0a15a60da4d9b521fc41493448a1b1685ae3278dbd46cede0d069e51dede402d2c1448c8ae6a7fcfce8acf415bf3
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.122.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.122.ebuild
new file mode 100644
index 000000000000..96cb3e86fc4b
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.122.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.47.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.47.ebuild
new file mode 100644
index 000000000000..0ef902726d5d
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.47.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.15.19
+CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.17.15.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.17.15.ebuild
new file mode 100644
index 000000000000..bb3171ba9be9
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.17.15.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/mgorny/fedora-kernel-config-for-gentoo
+CONFIG_VER=5.17.11-gentoo
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.18.4.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.18.4.ebuild
new file mode 100644
index 000000000000..2bc8aa91f184
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.18.4.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/mgorny/fedora-kernel-config-for-gentoo
+CONFIG_VER=5.18.4-gentoo
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.198.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.198.ebuild
new file mode 100644
index 000000000000..4f5f7870ccb8
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.198.ebuild
@@ -0,0 +1,108 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
+			-> kernel-x86_64.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
+			-> kernel-aarch64.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
+			-> kernel-ppc64le.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+			-> kernel-i686.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+IUSE="debug"
+
+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
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
+			;;
+		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.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	[[ ${ARCH} == x86 ]] && merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 2a4134a3f031..5c9d1caa4719 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -6,20 +6,20 @@ DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7
 DIST linux-5.17.tar.xz 128399340 BLAKE2B 82dc4a45cc25c781ac67aa6ed1e4c369544154960f41c4634d47621f381159687a227054976d078524cda28884d395a15f7542fe44ca74ce98ca6ff54a81d6d0 SHA512 89f0a7ca69d20a539d4b612a7028a30a5e98b402e4b6b88516f14237e5da4b626d7929eab8b40fccc90766e8f3bae87e9858a19077ffad20d8204acf18794f5b
 DIST linux-5.18.tar.xz 129790264 BLAKE2B e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb SHA512 dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
-DIST patch-4.14.282.xz 4735904 BLAKE2B dcf9d7dba3296d364b532306c0471819b49ab1d5f7f4264d9d77d5b95f66452e8925424158341ff8ec813b008b82ac65eb31f3fb2576240a85ee270cacb0a0b8 SHA512 a6719df5395f2fbb29b179946a31a7e1d2d9fa547854db13d2f158171b2da98dad9f9f80639260a0e93b19def03cac920ae96916e41ed7311c123d69d91e01ce
-DIST patch-4.19.246.xz 4641500 BLAKE2B c399bcb74e4a9e850bc1da4ce3f34b93611a10463f9516bfd25f77647820b782166e0fff713542814e678642c122a8fc4141a0a1a95d6fbbd9f6bd8e7a20d73e SHA512 67e54d4b55cea57165f46d4b9bcdc48928f63664e0fdac4f2110a331ba16deca44b61f8f6596be6973e9e58c824cb2e042bc3cb5524a3e65b7bfd6d99b914e34
-DIST patch-4.9.317.xz 4333324 BLAKE2B 006bcd47d2e6d45ec7a20c4fcc8b6bf36145dc048b94ec6a592303e10022a10ceb005152cdf774c208284a76ed5ef5d10619ddfe590ef9af4d4a4fadc3ef5048 SHA512 2bef44936d21490bd63855696aad6f51bc712d61a0ad9900d218f788da58e86cdfa1d6f5a7717853e41d87f2769cf4b9ef0db8cf1dde3762ee90971c0ff7c33e
-DIST patch-5.10.121.xz 3276600 BLAKE2B 07cbc8953bad9ebd8a89064f882b13e2a2f762148146081ee88b2b6ef60fc6c827a54061d1f9c0b37efc8bed5edc50c573bd0e7a67712ce0079b27696819907c SHA512 945d0d048b9a67611b3c7c1129142b791ebea4ad2bf2d60b2e5428d1e85783d301236dd72d45c69c6e376c3513b5c1a209c0882337c27ad73d79c4bc38c8f73e
-DIST patch-5.15.46.xz 1979428 BLAKE2B e1dfda5d45f7a79966a20532ca6108c59c2db820d82adadb62070faa99738bec368adc5f25783ffec4f0ec824f31b9c360897cd8195bb12d67a47130c70e8439 SHA512 3da10b4e961bf40aa90c7e738f39efb12e04c9e87da08a90a5976c3fd9363bd58a75f972b8841d782adf54d950974951361d9c6353cc8f500754f68132fdf7b6
-DIST patch-5.17.14.xz 1008128 BLAKE2B 79f1c974a6128a66cbef651497aa27db31fd69e9ec3014050f16b3a4c242a657ee1ab9a3a273860f693f9872524adaffb0e117fad6885e1a47b516283630cd32 SHA512 8b998d4f9249c8fe3b6c9b7fa3e9262270c13fe628689c7cdc67c8eac8a456d667816527a6fa40bb16e215728c45f17cc29e8d8cb76badc4d20b6a16a0dbc83a
-DIST patch-5.18.3.xz 326816 BLAKE2B 6a1af08738432591f02188cbc88a4d99b22f7e704606d43357be910731df255aca0f98dd9ee69ae8ba9051970b45792fbd185d71366043a8615bd72359bb5081 SHA512 8eb6e556ed4cc92668af5de03ae9825acfbc3495583431adc80c8b35f6811d14e3a376a085692ea1ec83e1c741705511902cdaf4e85a6bebb8479d662df3b874
-DIST patch-5.4.197.xz 3941296 BLAKE2B 5c6accd691f600d83935c5aaa96f0947368b24a21198d9992612ff66af7d24074f92650d8a12e4fadde279b362342503d779be9c1c7b9e96c6aefacabf751883 SHA512 74d40207bec5273988759660cee5d5ed4fdd993ca92027a726d4d4f45a23c2c86f4a42fc060af8bcf2a367cab8c17f19eccb85c7f473e11bae6c5cac405c32dc
-EBUILD vanilla-sources-4.14.282.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
-EBUILD vanilla-sources-4.19.246.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
-EBUILD vanilla-sources-4.9.317.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
-EBUILD vanilla-sources-5.10.121.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
-EBUILD vanilla-sources-5.15.46.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
-EBUILD vanilla-sources-5.17.14.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
-EBUILD vanilla-sources-5.18.3.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
-EBUILD vanilla-sources-5.4.197.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
+DIST patch-4.14.284.xz 4769748 BLAKE2B 14758a7cab93cb9f863ff5bbc811e99517b7f00bddffa9318691e91bcc43e2b1d76713230f95ae84af888f6b6e74845433087a1b5a80917e5e9cd1b304d20db1 SHA512 552be3102fa4d12c9dd323c774d44b87b859c2f939f6fc82246a4a87c96a89658f4d0a3a21ce5d8e688e8f9eea301422bd55551c14589cfdbdb191ac8070e789
+DIST patch-4.19.248.xz 4687100 BLAKE2B 4102e49520df0fe7ec11d6bd798db875c4368631de44f19d38c8e080fc0a2d866764d1334d5e863f24aba9d5ddf9c924c1a876b03d259b814c9cd91b1f4e482d SHA512 67197f94f67304ef37a74ba88ae601c5804ae68061bc7a4fb2f1c3df41bd8dce7d88b02c084a1866fd9c2d2505f8f774ec0b5de6cd45c892caedb1df22cfdd57
+DIST patch-4.9.319.xz 4360792 BLAKE2B 60ea8047ff51cd4c9b77d6bd43727b2271ca87b22ab6db6d6b6d3376b3134cbc6d184d417032d0afdafc83a181aa9c4c1b27f1c60c25b49c5237bf1e8139f707 SHA512 320ea05d06c5aa67033f9e4192f6efcafe8b93bd5730113b2a92a0d5457473db97367fa3b4b8a24939e824716ec1fe0004dd7e2f5577c0dcf5e7df5d23bcbb99
+DIST patch-5.10.123.xz 3311684 BLAKE2B bb1065912453a525d72dd0b9c0d59563dbf8b1c341866bb13f2598c112d00bbb02853b6329f0db68e83fc6beaabab1be7280da5d0f5c8a27fc8da576d5aef88a SHA512 517007f98f15844e09cb8208598263e800885b1202dbcfe38ef87cd1340fe70631b8d85eef402003cd20050adc6639007af461d462f68e0b40494721259bb427
+DIST patch-5.15.48.xz 2043684 BLAKE2B 0cc8889dcde7096b93b3f87e1975d01ff4714e7b49bb9f88337a1455512069ec566f762711faffdf22aecbc05baccafab3650ad8509297e749bba5724ff3a7cc SHA512 b3b84cb2caebe513158832319dab583a8ad17e8023799590a7f630018c245f41e3e912fbe8de0d9bf2a88c3f39ce5d7ab73539c5b39761e924f1e08ef7b84685
+DIST patch-5.17.15.xz 1084564 BLAKE2B 72713c22da50783beac854ca3c4b48d016e4b8eb2ec641dd44f56f32be888723e8125ed3f830a114eb63086717a3a00f6188b1a58d09e0d2e4a0f0337149555b SHA512 63680c60851687980dcbbee4534ad8272efc0b0d80bdd6e1c74e61c343b16182f6636942fde3c1177c4607b176c3d342d646876ce4ed72397080f90a816678ca
+DIST patch-5.18.5.xz 433408 BLAKE2B df63025d062497dcdef2a4abca78739f1d79a5603e0eac93577912db282b8b9aebe151bb34d59c2ffa9e4fae1953ff03e323644bff4134c37422a2ed1fbe997f SHA512 7fa385c0116498406d1a9fbc6333d9891e07a74d7b70b16da9816ea0b11c78ab3273388940c3d3ff9f695cbaa72b9013de7c18a7004e501d32af859c7c93e062
+DIST patch-5.4.199.xz 4010860 BLAKE2B 26b817fe47a6a0fbe72e7cad40823bc1ea69c2ce45abec758100d81a3210e10e6a365963c6501d0975da2ffb5d79f389c8033d38e920cbc28a6f7ab25f65bb60 SHA512 f961d1c9254a98d02265d188e81dc894241e03ec33dcf5ef642e47b0a679c6fde1225252873955fda265f6b439a6fe88040be50fb6bb13cc4f38ddb1272779e3
+EBUILD vanilla-sources-4.14.284.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
+EBUILD vanilla-sources-4.19.248.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
+EBUILD vanilla-sources-4.9.319.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
+EBUILD vanilla-sources-5.10.123.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
+EBUILD vanilla-sources-5.15.48.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
+EBUILD vanilla-sources-5.17.15.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
+EBUILD vanilla-sources-5.18.5.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
+EBUILD vanilla-sources-5.4.199.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
 MISC metadata.xml 517 BLAKE2B 2871be490050fb99de129f0abf368bddb5e2604d2e1b63fed36ed19a07987f88a82c5aec08854f36755f017a4a5a961b5d247e15ded1900e40a4ad913b6233a5 SHA512 1bb6d299efadf5d251395a0c57a27e254e80ea193fe2b9bcf29c582f32e9067f9fe263c24853a0b653d0365957aa0268cc7150a6727e1e199af487d951959a1e
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.14.282.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.14.284.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.14.282.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.14.284.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.19.246.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.19.248.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.19.246.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.19.248.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.9.317.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.9.319.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.9.317.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.9.319.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.10.121.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.10.123.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.10.121.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.10.123.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.15.46.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.15.48.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.15.46.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.15.48.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.17.14.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.17.15.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.17.14.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.17.15.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.18.3.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.18.5.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.18.3.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.18.5.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.4.197.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.4.199.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.4.197.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.4.199.ebuild
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 919d1064951e..138404876ca8 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/libapparmor/Manifest b/sys-libs/libapparmor/Manifest
index f4c6dd8779e2..19b23bf736e5 100644
--- a/sys-libs/libapparmor/Manifest
+++ b/sys-libs/libapparmor/Manifest
@@ -1,6 +1,6 @@
 DIST apparmor-3.0.1.tar.gz 7785713 BLAKE2B c530d159a4139de8e59d9d975af866259b56d555e3abe2d1e2a6bfd2db57d8371d643bb93f1cd6ca96172960c09a74cc05c82d34a2e253c4c1f6ecce747f4129 SHA512 e1073e7b2cde7cc4cefcfddce8fa5069845b5873c260b9fbd4bea2ff801708101d813ff30e23a64da36f3c6394cd9339e01a170e9add69deef2d70ecd9ed9687
 DIST apparmor-3.0.3.tar.gz 7790012 BLAKE2B aada9c32c2cde4a110cbd1d626ec00b08e29e76182185752e5c23e2ec0c2668a732ffdf1eb1660bd8bc294188ccf0da42b4282939f5969a6aed39084be00769c SHA512 bbf26377e60da60dab56473ee5af15aa0f3fdf2f2a61dbfcdeba12a925afda3bc6a0f6cc31e07927400425b8c3b3649833f448d8674044c7274ef06923ab48b5
 EBUILD libapparmor-3.0.1.ebuild 2069 BLAKE2B 2298671fe021e1abee75376d0439c5a94ffef875495cf621facb87830d1fb69839f1fcd4d13810ce1ee7d6918e31765ec1399bf921529af475f5c4bbdd8f77d6 SHA512 d1d37cac0f6cd23cfe0abc8851b18e3f5b2e123e8a93a43684d6bae1999921f76fd023f4d5a026abfb3d78fcdee0186c65e897294e2095534f88b71e07f5c582
-EBUILD libapparmor-3.0.3-r1.ebuild 2130 BLAKE2B 2a6367a3b4229122c32013bbc914b3b275a7c1324f701c7852296aa653fae5b3b8be15593b545f99cf9d60b14bfb6618969edb12214ac53dc99e9b12c2daafee SHA512 1ee07b507639fb9c63d1e63e47f2beed14f06ee2cbe07969eb82a3dc8c245793ab385a2a73d24e96b8504713aa3c3bb5f59695e003557ad215cc63a443e1775e
+EBUILD libapparmor-3.0.3-r1.ebuild 2129 BLAKE2B c5541171d2afa8ab7fb5b590025ae70801b56fc4bcf77d700a00260a3413c7b06d87c37f7ee27ec8b2f1dbe264a8c4bcadf41689160417e65ff392693df6b9c2 SHA512 ee375c5c49b5fdd7fa37043a54cfbb45c25e896ed62547821b68ea2b8bfb631642e8a3f3972763b6c6b7eb5f2444932181a41eab87f6dc6c9039b9001545db9a
 EBUILD libapparmor-3.0.3.ebuild 2070 BLAKE2B 97f3707333cd6d18e797d370f13aac29618faba7697b02c7185e030447f9782176ff71e6983a5a29649990e663f7465189075cb12807e809b685ef52941a221f SHA512 9cea8403cda7dfe3564054d1bb41e4285a8eac124cc69c5714b96b1f73765afe903feb255aa95cd9f53050b1e2e5e6c3a2652806bbd24dbcfed8b41b947179f5
 MISC metadata.xml 442 BLAKE2B f38f58b9dd0a309fcdcc3777cc497167fc8c6e313e78b148673b112c9408f8842d1d63891737ec5fb8754720d03c54336733a94aa429a4238900f02144cf732d SHA512 8e3c31f63edbdda6f04ebd7358fac18ae8d1a739af83b1a6aadec7c13f1649646c273d7bbfacce6a1d8920a165797cb48431a108481750680491c24126e404ef
diff --git a/sys-libs/libapparmor/libapparmor-3.0.3-r1.ebuild b/sys-libs/libapparmor/libapparmor-3.0.3-r1.ebuild
index 9b57936f1568..2ea1ea11a7f7 100644
--- a/sys-libs/libapparmor/libapparmor-3.0.3-r1.ebuild
+++ b/sys-libs/libapparmor/libapparmor-3.0.3-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="doc +perl +python static-libs"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest
index 02cdc4984069..ac7055888e7c 100644
--- a/sys-libs/libcap/Manifest
+++ b/sys-libs/libcap/Manifest
@@ -1,7 +1,5 @@
 AUX libcap-2.62-ignore-RAISE_SETFCAP-install-failures.patch 901 BLAKE2B 8b4795bfff00f3c42d22bfb748c60109c9fb210082bd0553d5d12c098008900d478a07455251228041be3448cf547ee4ec61217b1fa302feb86175592972bb08 SHA512 c6338a21bd66a4248ea3d35c0c39f864a9cd9c0cb0dd26860739fe3828282ff7e068888b3e39b1439f75f8f57db64cfd3a88542dfbb27ed04f65677e7f8ce632
-DIST libcap-2.63.tar.xz 175104 BLAKE2B a49a628f5b9ddf5a3d077428544a53b9cdedf62053ff296a0aa7d61e12ca05f9ba7597f20ee16a3843736bee2417a3d1585ad6b336651fcb3e4ee29b108cfa0f SHA512 832842b71ca32db8f53ca5f1a3010f14e7f42693f62f29632e9948c860f990899bb094165c37307ce8b9e5bc5eb1c833e780ebca98442df3e6d900e4b238834b
 DIST libcap-2.64.tar.xz 175704 BLAKE2B 078ce2505a79c1bd4ca0a8eaf3444178bc19a566f0505d28c6959f86fbbac2fe2fc88c06fd0d988087a6e20e8ec66a2633146cea957f0f3fd92eaff4f81d7c66 SHA512 3c5cf478cef249585ee1a0dfd75c6b41b0daf4e1ecb59dce894eac5523841aa79ca499be4161f73193dd8e7363edcd51063f3e281930cee939ebd50983eecbaf
-EBUILD libcap-2.63.ebuild 2239 BLAKE2B 180d54dbec5a1835050c7774ccb9d364e1daa66a60daa32874c3d4428a7f1e0a1e29c16d235eb7c70837266066c6fbbc57d8d006bd5b08394520a66f92df4513 SHA512 04101d0259bc4316366857129cf7ce5b4997ae63f7461451471aec8c52c8590e1fe295104b99a7d59dca766d0f7aaba3ced55315380cd9330af3e9414961aa9e
 EBUILD libcap-2.64.ebuild 2246 BLAKE2B eeb0a09fd4938cada5697f5531e88178366a0f9bed2a77eb2d6571ec6478d548f47020cd61f1e780b23ddcc657673c4c38d1c24b98dbba41ecaad9b12177e98e SHA512 b958d94030b0023f655810c9db41cc05ce239d07d86da1ea1b37a5cf38ed1e48c1ba1f8ddcb59dd278db2c40d99e57a3c917fa09aa331ba944c86b08cb828fca
 EBUILD libcap-9999.ebuild 2171 BLAKE2B 8f0156d46c0da997b1204aacd200d2c7b249248af2bf96488f2fd5cb41c2bfe0a5c66fd21e6fb9a42c9a2fd3655721f782f1a944d912a74dcc1475bbfbd92df2 SHA512 163e96072426881e6db427d31e89d6c2c4d2d3b9488e4f10bae1910fd898a6c263e40c6ddca8404391ae0944508779845d06170632db9dace7b42068b9cd603c
 MISC metadata.xml 438 BLAKE2B b5260cc84a3fe6b992bb6218846c738af296522d7a467337c05a6240fd07fc9d6cece779bd9fcf24a11486a70874e17acae8182647d307a31cf43e1c19c3a2d3 SHA512 fa3713dcf6b7bb2ea6d4c2fdefc05e92ae345c76a6187ebcb40dab8c4ce0148650a8301f236efcb8cf53fff25730977a385578dbaa160b800159c6d6abbf37a9
diff --git a/sys-libs/libcap/libcap-2.63.ebuild b/sys-libs/libcap/libcap-2.63.ebuild
deleted file mode 100644
index 6b719a0438d2..000000000000
--- a/sys-libs/libcap/libcap-2.63.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal toolchain-funcs pam usr-ldscript
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/libcap/libcap.git"
-else
-	SRC_URI="https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${P}.tar.xz"
-
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="POSIX 1003.1e capabilities"
-HOMEPAGE="https://sites.google.com/site/fullycapable/"
-
-# it's available under either of the licenses
-LICENSE="|| ( GPL-2 BSD )"
-SLOT="0"
-IUSE="pam static-libs tools"
-
-# While the build system optionally uses gperf, we don't DEPEND on it because
-# the build automatically falls back when it's unavailable.  #604802
-PDEPEND="pam? ( sys-libs/pam[${MULTILIB_USEDEP}] )"
-DEPEND="${PDEPEND}
-	sys-kernel/linux-headers"
-BDEPEND="
-	sys-apps/diffutils
-	tools? ( dev-lang/go )"
-
-QA_FLAGS_IGNORED="sbin/captree" # go binaries don't use LDFLAGS
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.62-ignore-RAISE_SETFCAP-install-failures.patch
-)
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-run_emake() {
-	local args=(
-		AR="$(tc-getAR)"
-		CC="$(tc-getCC)"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		RANLIB="$(tc-getRANLIB)"
-		exec_prefix="${EPREFIX}"
-		lib_prefix="${EPREFIX}/usr"
-		lib="$(get_libdir)"
-		prefix="${EPREFIX}/usr"
-		PAM_CAP="$(usex pam yes no)"
-		DYNAMIC=yes
-		GOLANG="$(multilib_native_usex tools yes no)"
-	)
-	emake "${args[@]}" "$@"
-}
-
-src_configure() {
-	tc-export_build_env BUILD_CC
-	multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
-	run_emake
-}
-
-multilib_src_test() {
-	run_emake test
-}
-
-multilib_src_install() {
-	# no configure, needs explicit install line #444724#c3
-	run_emake DESTDIR="${D}" install
-
-	gen_usr_ldscript -a cap
-	gen_usr_ldscript -a psx
-	if ! use static-libs ; then
-		rm "${ED}"/usr/$(get_libdir)/lib{cap,psx}.a || die
-	fi
-
-	# install pam plugins ourselves
-	rm -rf "${ED}"/usr/$(get_libdir)/security || die
-
-	if use pam ; then
-		dopammod pam_cap/pam_cap.so
-		dopamsecurity '' pam_cap/capability.conf
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc CHANGELOG README doc/capability.notes
-}
diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 52b2d302a8dc..8f9d927cf1c3 100644
Binary files a/sys-power/Manifest.gz and b/sys-power/Manifest.gz differ
diff --git a/sys-power/apcupsd/Manifest b/sys-power/apcupsd/Manifest
index a8c91e497ae8..8a267f07624e 100644
--- a/sys-power/apcupsd/Manifest
+++ b/sys-power/apcupsd/Manifest
@@ -11,5 +11,5 @@ AUX apcupsd.init 804 BLAKE2B 7afd83a6be8b068133f6221cc2396a1fe4cab23f6dec68957b4
 AUX apcupsd.powerfail.init 397 BLAKE2B 472512906536753d3054d275707764a98094c14866da63fbc8d2d62e16a9099fdce0b61cf572a4ba862f0be13e1ed3407821ed07ec90f9c77fb8d95f18aafc2f SHA512 cd0ed9d24a8371de7920bf0ce2e89bb63c0bee58da1ac782ed2b929068f95b2af47458529223a33ecea4e8f73ddfe3a7b9591af6f64828de7ed1d91e2edbb6e1
 AUX apcupsd.service 111 BLAKE2B bf2ac8161af5b971642298c30b08ad78d289044bb2452bdef39b31119b60eceb0a14add7c00262132bb80dbf1964103242452cb8d9b815d6ec82c204100ea184 SHA512 011e3e52e7909f36fb73b6064277a69e5db41263cfc72bda07e326172396d5318cd2b050f1fb84c4cc6da7a247c0035c36c55322ffb234a1cfa7bf13ba492889
 DIST apcupsd-3.14.14.tar.gz 1843409 BLAKE2B 48a3b249780064d699d86b658584aa222ce9f3b46a81209110b4684bf737cca7492b87b063154864ce76478f29f73cda83ab96b47f4a7aa7aa91e29a8abbf4a8 SHA512 c953bbf3e08f809748a7978a3952604176390d1cd276f187fe096d9bc3c8993b52127e8350c0363387da41318e24b4d1e00ea58df71f3bb8f50c9a5a64cd2d7f
-EBUILD apcupsd-3.14.14-r3.ebuild 4294 BLAKE2B ff87a5d0f38873c6fb0043aeb166f69f6254a5c3b5430b18c4be2f4f618664b164877314ed888c1611172cae0010c25177896bc22a67b02e711aa79ef0230b64 SHA512 363ff52b8f8fe3e68b6857f83f3fd5b2c4b8ff705fb9a2430f9ce6610b2cb72277e6f148fc83da88c1fadad928a466bbefd2028ae4a1310862d4ff6129bb148f
+EBUILD apcupsd-3.14.14-r3.ebuild 4328 BLAKE2B 0122b01f5df11dcf196878fff89dae9d474ee1d6d217d3950c68c7838ec092daba28948abbd7ca80ab16908f2cfc212834e5e463b6a14a79d87fdb325d031dc2 SHA512 dc440aa3540d42383d34b77bce0b18df59faf2de55366aa0f0e1b82de5bb90223cbe8075aa38eb8dca784ad6168f6b894c8c2f359555accb672fe970b1fb5bbf
 MISC metadata.xml 1162 BLAKE2B ff0f026e800ae6f2985d46fdcc2f756e46706b3a1910a3032215996636de9839e0936c5ff88cc7d9e709caf2ad53c9d9b8beca73ca17b8bd4b408c039a0d5696 SHA512 aae2a1aaf01a2412d5e054f8ed93fafb912f8a4cf48d2790615746751091f412f9bf3e19c2d857506ba50ef2a312ad5eec7c2dac770eb0b1130e062af856ab36
diff --git a/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild b/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild
index d07f4d82209a..7e9251a07001 100644
--- a/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild
@@ -118,6 +118,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	use kernel_linux && udev_reload
+
 	tmpfiles_process ${PN}-tmpfiles.conf
 
 	if use cgi ; then
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index b1d9ea655e3e..8f3d1d7d99a1 100644
Binary files a/virtual/Manifest.gz and b/virtual/Manifest.gz differ
diff --git a/virtual/dist-kernel/Manifest b/virtual/dist-kernel/Manifest
index c3b087da4718..fc41941cfcaa 100644
--- a/virtual/dist-kernel/Manifest
+++ b/virtual/dist-kernel/Manifest
@@ -2,18 +2,23 @@ EBUILD dist-kernel-5.10.117.ebuild 399 BLAKE2B 69c219977a0039ac43c6d4915c2328768
 EBUILD dist-kernel-5.10.118.ebuild 403 BLAKE2B 145674cc4648e69b6cd6df4b8d32a5f0a8c69843372eca005202b632d782fc31f3c639d0d3cc2f641f09da0280d5066cca9764bf7185ff4fd1a7091a038dc53c SHA512 a0e91fc0f7433912609d5938581b06abf4b5a69292ba982b6188ba47c1514239f2074c7e3234a60e98b8652da5da2ae6626f14eb714e38489690cf4b09ac83ed
 EBUILD dist-kernel-5.10.119.ebuild 403 BLAKE2B 145674cc4648e69b6cd6df4b8d32a5f0a8c69843372eca005202b632d782fc31f3c639d0d3cc2f641f09da0280d5066cca9764bf7185ff4fd1a7091a038dc53c SHA512 a0e91fc0f7433912609d5938581b06abf4b5a69292ba982b6188ba47c1514239f2074c7e3234a60e98b8652da5da2ae6626f14eb714e38489690cf4b09ac83ed
 EBUILD dist-kernel-5.10.120.ebuild 403 BLAKE2B 145674cc4648e69b6cd6df4b8d32a5f0a8c69843372eca005202b632d782fc31f3c639d0d3cc2f641f09da0280d5066cca9764bf7185ff4fd1a7091a038dc53c SHA512 a0e91fc0f7433912609d5938581b06abf4b5a69292ba982b6188ba47c1514239f2074c7e3234a60e98b8652da5da2ae6626f14eb714e38489690cf4b09ac83ed
-EBUILD dist-kernel-5.10.121.ebuild 403 BLAKE2B 145674cc4648e69b6cd6df4b8d32a5f0a8c69843372eca005202b632d782fc31f3c639d0d3cc2f641f09da0280d5066cca9764bf7185ff4fd1a7091a038dc53c SHA512 a0e91fc0f7433912609d5938581b06abf4b5a69292ba982b6188ba47c1514239f2074c7e3234a60e98b8652da5da2ae6626f14eb714e38489690cf4b09ac83ed
+EBUILD dist-kernel-5.10.121.ebuild 399 BLAKE2B 69c219977a0039ac43c6d4915c2328768340b1aed5cf30564cc284912cf114713e2065633f0abdf195c5384b26b791f124259189a2bd691abe82847437c02ae9 SHA512 aa0ef63357b18176f14bc297ad6099177c279ba4748115ae985ae2d4ce6270d00965d5297f77b703c71acc25b2595a77740b62b9f531aeddba4b36c704e6ed24
+EBUILD dist-kernel-5.10.122.ebuild 403 BLAKE2B 145674cc4648e69b6cd6df4b8d32a5f0a8c69843372eca005202b632d782fc31f3c639d0d3cc2f641f09da0280d5066cca9764bf7185ff4fd1a7091a038dc53c SHA512 a0e91fc0f7433912609d5938581b06abf4b5a69292ba982b6188ba47c1514239f2074c7e3234a60e98b8652da5da2ae6626f14eb714e38489690cf4b09ac83ed
 EBUILD dist-kernel-5.15.41.ebuild 399 BLAKE2B 69c219977a0039ac43c6d4915c2328768340b1aed5cf30564cc284912cf114713e2065633f0abdf195c5384b26b791f124259189a2bd691abe82847437c02ae9 SHA512 aa0ef63357b18176f14bc297ad6099177c279ba4748115ae985ae2d4ce6270d00965d5297f77b703c71acc25b2595a77740b62b9f531aeddba4b36c704e6ed24
 EBUILD dist-kernel-5.15.43.ebuild 403 BLAKE2B 145674cc4648e69b6cd6df4b8d32a5f0a8c69843372eca005202b632d782fc31f3c639d0d3cc2f641f09da0280d5066cca9764bf7185ff4fd1a7091a038dc53c SHA512 a0e91fc0f7433912609d5938581b06abf4b5a69292ba982b6188ba47c1514239f2074c7e3234a60e98b8652da5da2ae6626f14eb714e38489690cf4b09ac83ed
 EBUILD dist-kernel-5.15.44.ebuild 403 BLAKE2B 145674cc4648e69b6cd6df4b8d32a5f0a8c69843372eca005202b632d782fc31f3c639d0d3cc2f641f09da0280d5066cca9764bf7185ff4fd1a7091a038dc53c SHA512 a0e91fc0f7433912609d5938581b06abf4b5a69292ba982b6188ba47c1514239f2074c7e3234a60e98b8652da5da2ae6626f14eb714e38489690cf4b09ac83ed
 EBUILD dist-kernel-5.15.45.ebuild 403 BLAKE2B 145674cc4648e69b6cd6df4b8d32a5f0a8c69843372eca005202b632d782fc31f3c639d0d3cc2f641f09da0280d5066cca9764bf7185ff4fd1a7091a038dc53c SHA512 a0e91fc0f7433912609d5938581b06abf4b5a69292ba982b6188ba47c1514239f2074c7e3234a60e98b8652da5da2ae6626f14eb714e38489690cf4b09ac83ed
-EBUILD dist-kernel-5.15.46.ebuild 403 BLAKE2B 145674cc4648e69b6cd6df4b8d32a5f0a8c69843372eca005202b632d782fc31f3c639d0d3cc2f641f09da0280d5066cca9764bf7185ff4fd1a7091a038dc53c SHA512 a0e91fc0f7433912609d5938581b06abf4b5a69292ba982b6188ba47c1514239f2074c7e3234a60e98b8652da5da2ae6626f14eb714e38489690cf4b09ac83ed
+EBUILD dist-kernel-5.15.46.ebuild 399 BLAKE2B 69c219977a0039ac43c6d4915c2328768340b1aed5cf30564cc284912cf114713e2065633f0abdf195c5384b26b791f124259189a2bd691abe82847437c02ae9 SHA512 aa0ef63357b18176f14bc297ad6099177c279ba4748115ae985ae2d4ce6270d00965d5297f77b703c71acc25b2595a77740b62b9f531aeddba4b36c704e6ed24
+EBUILD dist-kernel-5.15.47.ebuild 403 BLAKE2B 145674cc4648e69b6cd6df4b8d32a5f0a8c69843372eca005202b632d782fc31f3c639d0d3cc2f641f09da0280d5066cca9764bf7185ff4fd1a7091a038dc53c SHA512 a0e91fc0f7433912609d5938581b06abf4b5a69292ba982b6188ba47c1514239f2074c7e3234a60e98b8652da5da2ae6626f14eb714e38489690cf4b09ac83ed
 EBUILD dist-kernel-5.17.11.ebuild 410 BLAKE2B 4fb6bcce0ba2d9710cc7a84d98203b5460c25c122aa052270a1c6c08a3201df47704fb9a2421f7894150830b1433a36137e8446f5d70749bdc7ff70678903be6 SHA512 40f1d6476b3076c1f5983bc08d1d5bd236d594a749e5a9147d7201d8b146d66255156b724d80e6af6ad7615c789f82fac3a432b97890c2cac2c062a6e3e7c0fe
 EBUILD dist-kernel-5.17.12.ebuild 410 BLAKE2B 4fb6bcce0ba2d9710cc7a84d98203b5460c25c122aa052270a1c6c08a3201df47704fb9a2421f7894150830b1433a36137e8446f5d70749bdc7ff70678903be6 SHA512 40f1d6476b3076c1f5983bc08d1d5bd236d594a749e5a9147d7201d8b146d66255156b724d80e6af6ad7615c789f82fac3a432b97890c2cac2c062a6e3e7c0fe
 EBUILD dist-kernel-5.17.13.ebuild 410 BLAKE2B 4fb6bcce0ba2d9710cc7a84d98203b5460c25c122aa052270a1c6c08a3201df47704fb9a2421f7894150830b1433a36137e8446f5d70749bdc7ff70678903be6 SHA512 40f1d6476b3076c1f5983bc08d1d5bd236d594a749e5a9147d7201d8b146d66255156b724d80e6af6ad7615c789f82fac3a432b97890c2cac2c062a6e3e7c0fe
 EBUILD dist-kernel-5.17.14.ebuild 410 BLAKE2B 4fb6bcce0ba2d9710cc7a84d98203b5460c25c122aa052270a1c6c08a3201df47704fb9a2421f7894150830b1433a36137e8446f5d70749bdc7ff70678903be6 SHA512 40f1d6476b3076c1f5983bc08d1d5bd236d594a749e5a9147d7201d8b146d66255156b724d80e6af6ad7615c789f82fac3a432b97890c2cac2c062a6e3e7c0fe
+EBUILD dist-kernel-5.17.15.ebuild 410 BLAKE2B 4fb6bcce0ba2d9710cc7a84d98203b5460c25c122aa052270a1c6c08a3201df47704fb9a2421f7894150830b1433a36137e8446f5d70749bdc7ff70678903be6 SHA512 40f1d6476b3076c1f5983bc08d1d5bd236d594a749e5a9147d7201d8b146d66255156b724d80e6af6ad7615c789f82fac3a432b97890c2cac2c062a6e3e7c0fe
 EBUILD dist-kernel-5.17.9.ebuild 410 BLAKE2B 4fb6bcce0ba2d9710cc7a84d98203b5460c25c122aa052270a1c6c08a3201df47704fb9a2421f7894150830b1433a36137e8446f5d70749bdc7ff70678903be6 SHA512 40f1d6476b3076c1f5983bc08d1d5bd236d594a749e5a9147d7201d8b146d66255156b724d80e6af6ad7615c789f82fac3a432b97890c2cac2c062a6e3e7c0fe
+EBUILD dist-kernel-5.18.4.ebuild 410 BLAKE2B 4fb6bcce0ba2d9710cc7a84d98203b5460c25c122aa052270a1c6c08a3201df47704fb9a2421f7894150830b1433a36137e8446f5d70749bdc7ff70678903be6 SHA512 40f1d6476b3076c1f5983bc08d1d5bd236d594a749e5a9147d7201d8b146d66255156b724d80e6af6ad7615c789f82fac3a432b97890c2cac2c062a6e3e7c0fe
 EBUILD dist-kernel-5.4.195.ebuild 388 BLAKE2B 2cdbd973ff8c248bfe49420683c3040deb65612b315e212e61657b071338e9e54b321a9167467da27a04f185d9e8c4f38142f5195a8a9d658c2a464f76c0ee49 SHA512 164347601db14a749e61850cc9407485f8581a05efca57df2d57561ba467184728373f7ef5cf5b956bc695274814a4880ab3556b6e71187ae0050cf6bd228a11
 EBUILD dist-kernel-5.4.196.ebuild 392 BLAKE2B 0a46c1101b608049d3edf3c20d36e290ca8592cc5255a06f23c32f2635ef78d68ecbc7f9c6d640b86fc5b338de2eff99791996c22494418f923b3e67eb924eb6 SHA512 54ca8c680a499e7331c1de1e49f0b9e0ac684027362af4c7c62acae82ce82d93e656e922ddc64dbe7b989524b87dcc3aa769bfd9dec587ed1565c14ba2151462
-EBUILD dist-kernel-5.4.197.ebuild 392 BLAKE2B 0a46c1101b608049d3edf3c20d36e290ca8592cc5255a06f23c32f2635ef78d68ecbc7f9c6d640b86fc5b338de2eff99791996c22494418f923b3e67eb924eb6 SHA512 54ca8c680a499e7331c1de1e49f0b9e0ac684027362af4c7c62acae82ce82d93e656e922ddc64dbe7b989524b87dcc3aa769bfd9dec587ed1565c14ba2151462
+EBUILD dist-kernel-5.4.197.ebuild 388 BLAKE2B 2cdbd973ff8c248bfe49420683c3040deb65612b315e212e61657b071338e9e54b321a9167467da27a04f185d9e8c4f38142f5195a8a9d658c2a464f76c0ee49 SHA512 164347601db14a749e61850cc9407485f8581a05efca57df2d57561ba467184728373f7ef5cf5b956bc695274814a4880ab3556b6e71187ae0050cf6bd228a11
+EBUILD dist-kernel-5.4.198.ebuild 392 BLAKE2B 0a46c1101b608049d3edf3c20d36e290ca8592cc5255a06f23c32f2635ef78d68ecbc7f9c6d640b86fc5b338de2eff99791996c22494418f923b3e67eb924eb6 SHA512 54ca8c680a499e7331c1de1e49f0b9e0ac684027362af4c7c62acae82ce82d93e656e922ddc64dbe7b989524b87dcc3aa769bfd9dec587ed1565c14ba2151462
 MISC metadata.xml 291 BLAKE2B f8eaa7c5aaced8dad269f9939139bcdd32c64dcc4ebff2b0b41dea61de5aed39723d73721bc44c2bee64717de093b97dc326037a335616caada3ea857c98fb07 SHA512 4fb007791c48eddbb1ee30cde6c1618ef67fbe62a29f3b805a7224818c34ce986b6e3d9378ab500875e012e9ea48663809204d69a410b23d12925f11ada333ca
diff --git a/virtual/dist-kernel/dist-kernel-5.10.121.ebuild b/virtual/dist-kernel/dist-kernel-5.10.121.ebuild
index 5594b4186dc8..a8bfe038d31a 100644
--- a/virtual/dist-kernel/dist-kernel-5.10.121.ebuild
+++ b/virtual/dist-kernel/dist-kernel-5.10.121.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 x86"
 
 RDEPEND="
 	|| (
diff --git a/virtual/dist-kernel/dist-kernel-5.10.122.ebuild b/virtual/dist-kernel/dist-kernel-5.10.122.ebuild
new file mode 100644
index 000000000000..5594b4186dc8
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.10.122.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.15.46.ebuild b/virtual/dist-kernel/dist-kernel-5.15.46.ebuild
index 5594b4186dc8..a8bfe038d31a 100644
--- a/virtual/dist-kernel/dist-kernel-5.15.46.ebuild
+++ b/virtual/dist-kernel/dist-kernel-5.15.46.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 x86"
 
 RDEPEND="
 	|| (
diff --git a/virtual/dist-kernel/dist-kernel-5.15.47.ebuild b/virtual/dist-kernel/dist-kernel-5.15.47.ebuild
new file mode 100644
index 000000000000..5594b4186dc8
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.15.47.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.17.15.ebuild b/virtual/dist-kernel/dist-kernel-5.17.15.ebuild
new file mode 100644
index 000000000000..c2caefd6cfca
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.17.15.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.18.4.ebuild b/virtual/dist-kernel/dist-kernel-5.18.4.ebuild
new file mode 100644
index 000000000000..c2caefd6cfca
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.18.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.4.197.ebuild b/virtual/dist-kernel/dist-kernel-5.4.197.ebuild
index 2e0a7cc6b4b7..cbaab94293d4 100644
--- a/virtual/dist-kernel/dist-kernel-5.4.197.ebuild
+++ b/virtual/dist-kernel/dist-kernel-5.4.197.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc ppc64 x86"
 
 RDEPEND="
 	|| (
diff --git a/virtual/dist-kernel/dist-kernel-5.4.198.ebuild b/virtual/dist-kernel/dist-kernel-5.4.198.ebuild
new file mode 100644
index 000000000000..2e0a7cc6b4b7
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.4.198.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 ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 75d98abf6d87..9fed7a404d08 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index a69e589d6b78..b17d25c6d360 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,5 +1,6 @@
 AUX chromium-101-libxml-unbundle.patch 309 BLAKE2B 2d09555cab85db032c80778664efcad59f7ccba2acb7b4ed2d04a4f06167f9a14c9d0414559b71f8a58fd7421c339d3125552fd01eced7e5774a76ab4df7e7b2 SHA512 325c25e86d995deaaeb185c3b38dc21ac49eb1649b92905c2f370654249ef323421fd45591e90601fbe9ad6d18b3d1615f5b3d8c6232d0874076b3d4032ebbcd
 AUX chromium-102-i3-tab-dragging-fix.patch 2449 BLAKE2B 0af6bf02e59f975c01a2d4fae128282f3a3e23fd53ee577eeba33e1d56c520a2fee663bda734f46ff5b664878d9d38c0b061c875b2af2181835f8df97716c242 SHA512 c1d6b863238b79be31b6732a856d55d5fbdecdbd9f9961cff8f8e3b550860fe51874a9589c6c07c5b886969a731a000d1f819b00cb6edec129f8eb7f7ec5c494
+AUX chromium-104-swiftshader-no-wayland.patch 1432 BLAKE2B 298a041bd8614f8b93ec8a7aedf8e138550e6a39cacb312590ed506b4bb7bf616077ecbefdd14a1847e46193ea60e6f79563e4af044e6a9b2db59a5276ee7945 SHA512 fd12a812edd4ed20bda108999c58775f9e3421deac9f3247d97953c8d36604b26ae72028ebc7d2b9bae07f34561146ce62681a084404ae69d3147b73d45656e1
 AUX chromium-104-tflite-system-zlib.patch 3296 BLAKE2B 534ff709caccb1ecb6c635524dd897572b48bcce00cc50df01cfe73d3f197d5735cff0d4b1a7b18d5bf2b3fcfa5e3420257bd498387ae9239c44eacdd900665d SHA512 770d364bf9e4dd84ab71bd637c8c4175c26a3e8dd2e2c0ad62e29b64edda691a595449e6c6d9c28ee1e5f589e48e916d0448fe6ba65b7bc9bbc3407072df88b1
 AUX chromium-93-InkDropHost-crash.patch 1134 BLAKE2B 1593c406c48b629ea3170a518cf86e936af36c554bc97a380324ab6fc930e49a359dc3ef6787ab08314a6a8f5da85714b0fa9d8589d6a46b1d06cbbd7e401f22 SHA512 474d7f55505e1275238d71d1723d74a66fc9f27a16ed293aa80ffefbe5500cd65a0bf13ec76a9bca0334a245f22120099fb367d12b93adc14500104d11cd3bff
 AUX chromium-97-arm-tflite-cast.patch 1218 BLAKE2B a50c6a7dd3eafab72979d643b02b060482c2cd282da96504c4dac80813e631e2a368221eb7dbcc3a6ced9bb301631741ed6eb98f4ebc682b45ac35f2b7c3f1ef SHA512 afb499e4fd1d305bdc92032b8347d94e1c0771d73e9ea0cfc1717e9677a5447eab1ea41d4ddd8972192020f190c06a05ea5bf254643ae8f76ecbe548fa832a21
@@ -19,8 +20,8 @@ DIST chromium-103.0.5060.33.tar.xz 1470671736 BLAKE2B e036115ff0439e2e8ab18d97eb
 DIST chromium-104-patchset-2.tar.xz 6168 BLAKE2B 57e9f2090315d2fa9baa0d285e40fd7809b35a897fba7684672d04850c2b59ea1bc11383654a8178ece2d4baa9bb2e248898d2435618b9e8a995461d6e92ac53 SHA512 f23effc604051c18acfad3bfb974efd4aa675b84135f4eb95e0dd97261dcc9099f283a8015854c375499370f4155bb9fad51fca59555ec2f41f2d7ab90be7208
 DIST chromium-104.0.5110.0.tar.xz 1479553376 BLAKE2B 60cd553185a66693f4db789c5280f63cd2a537b5f45cf2c27462cfa85c4ccd0ef52090fdb7074ea74d8864de99f4726f9b8a1ba3c3be65d97ee40e7824718b0b SHA512 145cbf9d269f47ef7698c3c4e8d19d2f2b2cb57b78c538f63ed677fa82b00e9c0d8bdbebd2e2c1c6c7d9d36141e9e6ea661a43e592541404566dbd5d77731607
 DIST chromium-profiler-0.1.tar 269066240 BLAKE2B 6897387b63ff9a724b67f2e8799fe803dc75da376da809e752d19d6f5cf98bd84ac24161d07ac4a967577279e9ad5a8a46f0825332a7ee933a27693d6dc95611 SHA512 3fb6132599d28455d1b5c04d856ea7623e49b0b0b96f021c31d0952c4ba57d69d0a1cae6f0b91470a235221c89cc0d3bb38303ff02594ed0739712e6e2f8dbcc
-EBUILD chromium-102.0.5005.115.ebuild 32948 BLAKE2B 4538a5f74efe62b0dabfef4439b3ca8f61692e5fc1434c06100c8b60399280ad0596fcbf9612d66de692e8b7a1f8c069eb7336d99cefa4d30bb4b3c46b06ef92 SHA512 a239caf72097a78cd9765ee4ad6419ed2d1785f3e4fe03de29a5d0bf34be90728d3d038dafa8690b6c496e4d8748f902c7b2ef2aaebac974a545ae735e622951
+EBUILD chromium-102.0.5005.115.ebuild 32947 BLAKE2B 6654047c669d54c1ac716b54735a188c5a305998f24f51aefbc035ae05a44fb8d5f3a238d15591e935270284f35d1d1bde8510f8772a07bff63990532eb6adc3 SHA512 e04760b90c8fdc506cf2cddd12d7c518de43343a4924bcf4c0b17dd899ed2b16d3ea0a42d12cdd2cbac551bd36c155813bccb28451ba23dc20b7e2a903e474bb
 EBUILD chromium-102.0.5005.61.ebuild 33001 BLAKE2B eef069609ecb6f0566d209e2a79ef7bc78af654a9304c52c45cbd7ff207d72394ff43b18f8e1cec26057cf1e56c2fd046ab9cef2e4b9ca177dbb9d394a56b60d SHA512 8c4458f643188c4f2c2b45e0d0e214a7fbd6147a4015983636423c9e851c6f964cb97dc92a6ca8d8864d64b6c7b1d82c73fa1251b3611aee27f1e76bbbbbcd36
 EBUILD chromium-103.0.5060.33.ebuild 34585 BLAKE2B beaaf461feaea3e361be4f9b9dab49c7b59648de783631c46cd7fc12153470b166c7d5678991da9d38043e6bae38f4f5e520ffe98fa301aa53eeb74e2066b0ff SHA512 a299da5768896e6ee6c946f3a69ae8ee5cc8bf717ad1451539dd7ad18760d1128b8244937939723d2853287cb3a335c4990fdadaf464ba42e14d14b2766c38c0
-EBUILD chromium-104.0.5110.0.ebuild 36662 BLAKE2B 9052aa25e165abaa587f762a0a9c911912d6a0011a67ca3600c8a6125e0a4da3017794649b3176b58aa02eb5abe29f3192a9b0d2d885c5fa7b31333acc84227f SHA512 c760f4942eb10e850a243338482a64491d1333e56bce7c620b563516ea5f7b4d8312a278c8fd629687408402dd591aaa5d64b5b1cb3aa067ead3f0cf58d323ce
+EBUILD chromium-104.0.5110.0.ebuild 36720 BLAKE2B 4753c741c31a34dcce07f450ecf0d016fa2ee96876fc460c5525de745e96551b9f7aea53fbaebe8b30d9abfbd860174b70b60fab5e5287922459aff2fe7dacf4 SHA512 9d5545d3906a823e617b59cd7427dd94d9743bab16d5a4d80f18c64c1ec4f1d74fed8c66af19b7e3c4df331376b1e4f29975d4c72c5a293229b073c8a823ed4c
 MISC metadata.xml 2160 BLAKE2B 6ba2745b6d55ceda8ba586615cdf41afbfabe18ed828581332ad8f691632b8e67b364ff8edd5cc42331fcb257a4d8a370de9ad5a7f49d2f5b2f43dffceb294a0 SHA512 2858b94efa5b3b8d68deccbc9dc32e732756e4f5356297e22cb6fec16a9b7437acd3d351b5c89074b47d23b16ccc194a0a45631797a2df8a8fbed5b8051478ab
diff --git a/www-client/chromium/chromium-102.0.5005.115.ebuild b/www-client/chromium/chromium-102.0.5005.115.ebuild
index c2634b1549c9..82566d5c82b9 100644
--- a/www-client/chromium/chromium-102.0.5005.115.ebuild
+++ b/www-client/chromium/chromium-102.0.5005.115.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 
 LICENSE="BSD"
 SLOT="0/stable"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless +js-type-check kerberos libcxx +official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine"
 REQUIRED_USE="
 	component-build? ( !suid !libcxx )
diff --git a/www-client/chromium/chromium-104.0.5110.0.ebuild b/www-client/chromium/chromium-104.0.5110.0.ebuild
index 965ce6985844..64b7e13cd82b 100644
--- a/www-client/chromium/chromium-104.0.5110.0.ebuild
+++ b/www-client/chromium/chromium-104.0.5110.0.ebuild
@@ -312,6 +312,7 @@ src_prepare() {
 		"${FILESDIR}/chromium-98-EnumTable-crash.patch"
 		"${FILESDIR}/chromium-98-gtk4-build.patch"
 		"${FILESDIR}/chromium-104-tflite-system-zlib.patch"
+		"${FILESDIR}/chromium-104-swiftshader-no-wayland.patch"
 		"${FILESDIR}/chromium-use-oauth2-client-switches-as-default.patch"
 		"${FILESDIR}/chromium-shim_headers.patch"
 		"${FILESDIR}/chromium-cross-compile.patch"
diff --git a/www-client/chromium/files/chromium-104-swiftshader-no-wayland.patch b/www-client/chromium/files/chromium-104-swiftshader-no-wayland.patch
new file mode 100644
index 000000000000..75f78f36bc3d
--- /dev/null
+++ b/www-client/chromium/files/chromium-104-swiftshader-no-wayland.patch
@@ -0,0 +1,52 @@
+--- a/third_party/swiftshader/src/Vulkan/BUILD.gn
++++ b/third_party/swiftshader/src/Vulkan/BUILD.gn
+@@ -16,14 +16,22 @@ import("//build_overrides/build.gni")
+ import("../swiftshader.gni")
+ import("vulkan.gni")
+ 
++if (is_linux) {
++  import("//build/config/ozone.gni")
++}
++
+ # Need a separate config to ensure the warnings are added to the end.
+ config("swiftshader_libvulkan_private_config") {
+   if (is_linux) {
+     defines = [
+       "VK_USE_PLATFORM_XCB_KHR",
+-      "VK_USE_PLATFORM_WAYLAND_KHR",
+       "VK_EXPORT=__attribute__((visibility(\"default\")))",
+     ]
++    if (ozone_platform_wayland) {
++      defines += [
++        "VK_USE_PLATFORM_WAYLAND_KHR",
++      ]
++    }
+   } else if (is_chromeos) {
+     defines = [
+       "VK_EXPORT=__attribute__((visibility(\"default\")))",
+--- a/third_party/swiftshader/src/WSI/BUILD.gn
++++ b/third_party/swiftshader/src/WSI/BUILD.gn
+@@ -42,15 +42,19 @@ swiftshader_source_set("WSI") {
+ 
+   if (is_linux) {
+     sources += [
+-      "WaylandSurfaceKHR.cpp",
+-      "WaylandSurfaceKHR.hpp",
+       "XcbSurfaceKHR.cpp",
+       "XcbSurfaceKHR.hpp",
+-      "libWaylandClient.cpp",
+-      "libWaylandClient.hpp",
+       "libXCB.cpp",
+       "libXCB.hpp",
+     ]
++    if (ozone_platform_wayland) {
++      sources += [
++        "WaylandSurfaceKHR.cpp",
++        "WaylandSurfaceKHR.hpp",
++        "libWaylandClient.cpp",
++        "libWaylandClient.hpp",
++      ]
++    }
+   }
+ 
+   if (is_win) {
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 2f84abce1af7..cee03f4d142c 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -3,112 +3,12 @@ AUX distribution.ini 1090 BLAKE2B d1ec76caf937a8d3d0898979c236b8cc39004d2d2c467d
 AUX firefox-r1.sh 2836 BLAKE2B f2a80753f78bcae89f52ca161a0c558c3df5dd40d52f3aecdd1999dced5b025d222399d6603df17116539376f86ecf9cb615c592f7f6953876655609a69c0ac2 SHA512 8f174aa111416ebd2a092bbfd906c1b8e7fc7100da484a5d337c07cedbc761c443efa777df7340526da0f1116291550db08e150de326067b49fd4547db7f7a88
 AUX gentoo-default-prefs.js 620 BLAKE2B b78720a71b86f69a8d23b34aa47ca1c6e7c616f8ea8110d9417ea1f7efd5307568a3e099acf921ec5abad64b36075d716fa5892f4e5600f32bbad9e36a0a1c45 SHA512 5a55cd2ae13ce6ef01646c0a6188a3fd81e1eab0e547b2ba292eb42094aff0f5d5ee383686131bfed845d1e4b34bc1bd11e145e65eb151f0e342a1d49e0c688c
 AUX gentoo-hwaccel-prefs.js 162 BLAKE2B c5f2dfb727081e2d538c262f12c0cfdda31cbda58c77f4024d820e1d1915203d1fb8ad2671f88ff0eb2b019bbf44079a8b1114e240b74f815680e5c28eccc295 SHA512 f1847f11e7059a83f09c3c7494aadcb04512cdf2ccf6616ebe3ec02fc46de66fd35cf83d81e08013c0e594b73e4dffcb67a32288b6949ce137669715583fd0a4
-AUX gentoo-hwaccel-prefs.js-r1 262 BLAKE2B e5c450f8e331c8948720dbccf918f093b9d2fcdf2b173102ea36bd4e355f4cffbfaab036797672132204b51ead603c0408017c69d7c83db40981a6a9205d1d0b SHA512 d1972f4914ec2691ee5c49068fd94409a24dcf51a2b90d3029f4eaf81942a4df5e1738143481729e8a4df4d48c1378c9c865c18f968f7c4d7131ea9546655292
 AUX gentoo-hwaccel-prefs.js-r2 265 BLAKE2B ac3053eb15e2dac446337c29184b5ec54fb30b51367b91d149f50ba4d7ffaeea56197053cc0b4515a378f026a7d9a19a715240f5dbd39b193271a9f64575e7b7 SHA512 2a83aebd071e763c63777fbbada46686400aacba628d9990aa0302c3a88a4c4a21eef2bb596a8688046939698a16e443dc18ede707cfc207e60cb72c1094635d
 AUX icon/firefox-r2.desktop 8137 BLAKE2B 5d0ce737c0e0969cb1a61de7989f5ca1ca0dff413d6d98bb0c93e0fed510b4e075a88fc117d3713e5e11ee7471ceaeffa9bc9dfd4282f3ddb1ea837d823e4887 SHA512 749a50b11d89c1329a52d13745ff8d5f801e565038cb5341319b4b515f36baf1c0c740003d6d01188c27e31d7ddeff58310e7b2420681292d0f2522bc5bd34b6
 AUX icon/firefox-r3.desktop 8116 BLAKE2B 50b476a1be87bcca0bd6175b7a7f5e67ac5d3f40b0a5a99c2244036a9eea53fb518f59c1d87b18723c4ae6c261bfb692ef0b52c6714402b0a98da4b6867ab977 SHA512 07c9d89babe20fba9531396c9aa2b692aae77606be2b8a750481b6b8f9b3eab320fef313d1ed4b15d3fbc4cd94dfb56b62ce1a3e89ba7143c6aa9acc0f919bf8
 AUX icon/firefox-symbolic.svg 7432 BLAKE2B 33a552ffb9850f6b9cd3cb8d9f7f80268ac08f00a0bd5eb15d892c6fbb950f8cacf6058b9c838f5be1ae1b53541f143a1ec0c1302ae85b49100b166fcbccdce6 SHA512 ba7db9a7c95a051bcd84e4c09c802fc55ee3c0d1d06ec1b169b04e414259b75bbe92fe584aee41a1e3f71e71c160df8bedf5393449e5024110ed27dbc0579ea8
-DIST firefox-101-patches-01j.tar.xz 17516 BLAKE2B 1d222df49f8c97d71e07acbe1427351961425508af86d9df440e9a78026edacb638f1ac8e49bc93733aeffb68a270a7bf2e7f1758c285d682fbc6e8910f162cb SHA512 f7e59b67761caf60e6d37134a72d7d71bf9376a5ef9149fb83d59ddb227601a78b63685051ff634cfa17f49f5d77eba49f8ca6f9bb635fe97a4acbe8eb07177f
-DIST firefox-101-patches-03j.tar.xz 20448 BLAKE2B 4261674022814cc656a73785f75ceb489a4bf60132f027674ac841e61a43b6defcdafe14878dcb8cd01911f43952d9e2c99b23065d4e68b68d907ae176d2aaa4 SHA512 316e3474a631bfc636d2f76dc709146aec0010f44c0b1e8b40d9b603000063320257b80dc758d8e08441b67125fa2346cb468470b87efcbb3324c1be3c492f44
-DIST firefox-101-patches-04j.tar.xz 35036 BLAKE2B 6643183d0721e557497d85169546de0e9f9f4718aabd3c8b9ee50f596107a9b500212b41cfaccad8e524a882ae39a8e17bf27d2e370ad894a1e617390b428b7e SHA512 10f451d3ccbd1276a7a340146cedcf2d6bd1066f74237a27d45be63aff257e7e74e50965c8663df9d9141662d039ae7d2d112a1e05d67ff4931f3c63cc7b4620
-DIST firefox-101-patches-04jwl.tar.xz 37124 BLAKE2B f8e3dac57ee6cc1ca7dc29451d570d9ca4d1ffddfaaeca991ab0159232fdffd9d6f91c073ece33f8e00a9e6ef52c3ab73b0431d00408b11537ead382f6b52885 SHA512 9b91708845f7d4fb836ffe3050b07534c9a4ad1d4e9eadbe9eb528d787f755aa8a4ecedb454ec1ecc980b20ea2f2b9bfb33f95aecc09e95b154fc7b25897dc37
-DIST firefox-101.0-ach.xpi 443451 BLAKE2B a8da480ce7f4d677a3b432708376aa1ef3cb302b9e944605bf52708b723ff3778024683461789b83b292fe77965a5f9e45995cc354b5c3ab68f2ac1c14da11c3 SHA512 7f9778d872043a80fb357503a76b78cb9de821214bf66374f9f3cbe079dc5ada99b32c98cef76853657fd1db937ab3b1d28d499de1d304364cd7db3c8dd94863
-DIST firefox-101.0-af.xpi 413388 BLAKE2B 600f6091343ea59bc68d5c9352b75d560055530ffbb241c916d86ee3e8a9db6eabcd64743999a8de3fd3f4e0984addbfdcd341c1d97b6b0fedb8873acc1490fa SHA512 64c66a654efda3c9d9c44ba44014570285cf14aa4fa6c08c4d2f89aa27c7854fb43694445ff5f9362e2260453ca9789798af3424f56e500fc542bf514046b3df
-DIST firefox-101.0-an.xpi 487253 BLAKE2B 32938686d11e0fd7b4083b67929fa2274f8c7685871d6ad91898b6b310622c42f4e0fd732dffe50878fb874a473178826daf3e42000c916615e0159aeae4bdd4 SHA512 b32e0768865643a58e7b86fc8839e08d982463311741931b01592992cb3fb512caa28080434cf22fc8dcf2be8f8d9af76168efdda31cc002016cde46710a8102
-DIST firefox-101.0-ar.xpi 552747 BLAKE2B 1f03d743f69d1eff3e3e7f6a41401ffc3f71e28ca1e9a5bbe36ccf5186d81634853b8c94efe279c194120bdd1877f300eab88dc1017016f3087d0406147ba888 SHA512 99ca01d57559b545205f9ffa365b0c76a03f0dcd1ac0f2971d1b9d24eb11019efbae51e98718fd4bb80592d33c20181c8ac0c6531729796ab1ec08c53580974e
-DIST firefox-101.0-ast.xpi 485918 BLAKE2B b82518cc25bb583b53647b246c1ba28aed26e0231b44ff5a6d283c23004b8cf0e7ef51f557a110afe6a44ab6b98dbb42c0afb002707c9f4c4ac81285d8b02527 SHA512 30d91d61e3af8bc960d9a929c63f6dae285589114ab678044e8b04e8805bddaf0468ab4425f5349742353af6a3946c3558b4687a6cf9c7dce776d67e5335d4f3
-DIST firefox-101.0-az.xpi 477262 BLAKE2B d40546b499dd315d1a50370b09ff8ceaaefc3dcfbf43d54c69aefe0e1bcc95393bbb1fd4333c81f7f43d9f51cc5dea715f96215a8c40c4cba8d784d1064f43d4 SHA512 7e467ad180752f910899cfe8995ff8c06fa0d54ff31c11f591d3bff1e6be421ae1d9852d17e60ee5b07f83d3d9d519efdbc5d1c13b22ce4363048dd078d69c7c
-DIST firefox-101.0-be.xpi 614351 BLAKE2B b619a9b47e5bbbf1a4c5ea49043fc88fe2cf53dabf36e38d7798fa459c749a63a4d302d94ed4edbba9502442427a974f931e7462d9ad839f570d6552cbe6e9ef SHA512 0bb62a22a23e004d7443f1445071f5d979aceff9f8210154f3b1d00ea8c376b5df97c120a3d0bf1b4087674eaf504d519b260cb2c7be6e9b70d3ab150194f752
-DIST firefox-101.0-bg.xpi 558755 BLAKE2B c38a89eb63ae494b3e02e1c66810877b50fcc5fae530adfea1dbdbcc76b166872946d27b50fbc723a3e637a48f74f64f887ae19b168147515b3e4f4649c7b8b2 SHA512 cdf8c1c73981daf9e16663d216d119d8873b7b9588537b45efeb6a3d0aa4ec9f0df37d2a22f4ec3bfb6c363760b48dc8b8803e77dc9c46ad72d4e497273e4426
-DIST firefox-101.0-bn.xpi 545253 BLAKE2B d9b3b52f4f1615b99ae837d6f993231b580d5991098bd1faeef74bd0ad039cd26cee601fa283217daaa9c0c96841157036011474d605ed812fc00c6d5be39ede SHA512 42c14cd104f5d7de9434a90925f34af5fdde7ad32fadfd580d844d30b85a0e7900fdace915f9ced0b071a39da3ec02edc1b57096b1c98846df729b849ac9dc68
-DIST firefox-101.0-br.xpi 519305 BLAKE2B 72a9b820e80bc6210eea702335244141340ce8cc0dff743715ea21d3ea95e6e8438df86eac9c3be923adf6e058389ebb713f2264345b00098acb117d5ad75c0e SHA512 0b4d8b65b40481a9c6c84d64e31732da1ff415704937af4adff30e26d69a7c1f64400e77dcfc0fd0aec7f6a9198462f0c2f953dcd03e4bc08e5599e918fb798c
-DIST firefox-101.0-bs.xpi 452142 BLAKE2B 06e1c6a694a376ca9423d7eaae7fea51fafb0173579f60ffeb02cd672a22bcae8f2fc0ee0c241f2fa008f567cb41e984ee2af030ead726bf3bdd1a94943babf5 SHA512 a79b9ffda8799eb563190256f2fd2d904bb847630167884b00c3b97bfb113f62af5f7bb244b86ed3f941e16b497f33315a3014aee73d28c27ac40415d5073e1c
-DIST firefox-101.0-ca-valencia.xpi 526502 BLAKE2B 84fdac71f76b829dd7c0cb77d265908ccaec5c356e61fd7ce57d0329bdb728de5269d6eea88ed3df435311b61270aebc48e30bd65a463a69bfcffe6c55d96ae3 SHA512 98b5ca891cde876a08ac016ebfb026240a182681d94eecc6e963afb57289f0df891d76ab739cc0907bcb8b235bf6e1a0cc26fe9e415c538d3e3c1a199203a553
-DIST firefox-101.0-ca.xpi 521443 BLAKE2B 0b6c228fa208805a3bc9d35aa74f74d65789ce275045a8060406cf280d231962c63bcd6ecd2295b54ef218f16b3179de6e90c7d644f9a76eff2a10e0103504b4 SHA512 ad130d0ee829eb1f0f63afe7e8841b0bddb2524e6779abe10786c7295faeb85c43ecd408ac5b2c2b5d329678749eb02927d0f872df39fa0d27cf3a3674a9c3b5
-DIST firefox-101.0-cak.xpi 539972 BLAKE2B b2dd027a82b09c1d37ef5706af416b2833af7080d9cced92014d1d4ee7b2a273eb3188a8236002ab433ff05ab2f103c9a21f39e462f7bcd7a9cd52c8979e4113 SHA512 7b23564847f4021ce92485dc751590cbd9a0f355d3ab3e3b99e14c71c35fb30302b28aec3320f46a1abaee0ba1cd6803bcb9deec6219483b55190853c4e3d8bb
-DIST firefox-101.0-cs.xpi 557463 BLAKE2B 69fee48b4f21fc3fda8a54836f100ed612059a3aef6bc3507f11b87319fc167c9633fbbcd37c5e72bb65d83a119eb820253572179c8cdeef6b17d0fad0e63db1 SHA512 a41f7f51c08b8ea5225e984b6d5e96767bdbfab043555c9a811619467fd2873b81b0fc18533983ef2e0a5b92462f08aa66738f2f074eff91c2dc7a0a67f95b71
-DIST firefox-101.0-cy.xpi 534438 BLAKE2B b3d3fdbf17607ab250c2e0067ddf84a5a14d99e117f485ac2ac94bbe64ab5701c204eb75ff3ddb3752a4ab72255c21b9d5ad244a20926f09d1347c24f29a0d0a SHA512 204e163df222edfd79ad4f78b252c58654a27b4b6d08bbd816fb518b2b332b72d498a2f64f0f78b9d54a8d9fe295e5f027497d3963a22e4457574bf3c33a5b21
-DIST firefox-101.0-da.xpi 526067 BLAKE2B 514fabbb28a83509fb6169fc47cc650fbc917299cfaef485d2b4733d42036f01829fbfbeddad1169958b89e41b9e4993e57e1abc37fd223e4abaab03b4d3f5ea SHA512 9cd61b8806a2ddbfeb5972e9e2c1a19b14bc195226e696e3715e6231799bae656f9151b23660ebafeb87f34e544aec5dda8ec2754d13ceb05cb2627cbd7ad4ba
-DIST firefox-101.0-de.xpi 545583 BLAKE2B 11fd3c5a203a05837023d11617cb48f1c25cf820f84fd5145ab7c0999350b2e0097150eadc52f317c9b802dede774880181a470cba186f6a945625510f10b517 SHA512 c0e84843d4d2086e7d8edd1383c3a469e41a904babb483f1255b20aa1f8fa06161077556fb2a575280e3871a00721cfac2a425e0f0ebabc5c411ec36919e6cc3
-DIST firefox-101.0-dsb.xpi 558343 BLAKE2B 383dd6b6bf5640a8a0d86d33400927cb0498220a25fa030f3c036c899548e882d3168836fd80b251be30ea2c42bd4d12c36d846361ab52f4edbe4cefb2dcd392 SHA512 0dcf236bff118a68e1bfe9d4c12ee9ca435f896e0cd60004510b7f7aa4a49a782254b058d7321531e93c3817d0bbb767173264d6e7199afcb6583b7cfea01095
-DIST firefox-101.0-el.xpi 629451 BLAKE2B 47bca72136eb215119660de431f95e4337c2eb4e7fcdc7607d521052ff1ad2babb34536c4fd9b697c9e44a58f247264a2262c64a72d62c9944a85a50c79a4a9b SHA512 d129d094254bd49606db15c4becd8b054876a4fd8a0bc1fee58d78afd82b577b37a99c1a0066538c008ac8e97b2a201e5c89f3cac44e1302aa14d4cf8b9e4578
-DIST firefox-101.0-en-CA.xpi 502216 BLAKE2B e7e7e77619cd16a44df71eb4a089398f6d8c3c67c187c047539aa5565640d39706b622c29d4f060763e21b47ec60c611b06c4e26ce069109437175ad6bfae06f SHA512 93fa8322890126113a7b2e2cc2031132410c5177a88c305d22796eda0d8a6eda0d79fedd6120294d31387065a4d455e8c59d2be10b51d545889b55a02273018b
-DIST firefox-101.0-en-GB.xpi 503123 BLAKE2B ee3298df0ad894a2fa6c36e9bc523e0148b4d4d452cc110596b1bbd7514d3ca0cb1881864f9609b460a60ee245102ca57a67ca3943658cecdeb36c681f7b5afa SHA512 3f7b9fd39a3f1ebeea813ed282fc0c4706e90ae85c0151a7893a2eb252bcd87a9fa6e2323895a0ff86cfbd5c91f3b58253a3a42a5d0820cec169e4847d1cb84e
-DIST firefox-101.0-eo.xpi 529039 BLAKE2B 5dfb417114a94cec450565f07cf826f983d44d036065431f914c446be1be6f71eb03c601c7bd2911a2e2c4eeb74de2a894e9b381a093f069b6f3b2a8606863ce SHA512 4cd825b63d51276de9cbeaf8cbccc01aa77bbde51fa8bd54b22392a7e6a789dbb1e9b1c6c89ef21c53dd77946d267cbd8e54fd40e411faecc8651fd799a0d250
-DIST firefox-101.0-es-AR.xpi 539061 BLAKE2B fd90770a8c86e9e5a7f92c08be054d5c199c368f9450924d4710c941946649287dd6c6cedc7c604c6223c26bed379b01ac9437aedaae7da35490399dde3aef96 SHA512 0a734c2edefd50e7258c349dea60327a9d85a0cb7c5aca0e8540cb6c72a37d95c0df45201150c2fe98657a6640ff13befdefbf656afc12b6704a336f01c41e52
-DIST firefox-101.0-es-CL.xpi 538158 BLAKE2B 94c9907c642f1348984395918c42ae01f02ed83cdd5f3262df7fea1a8405bc552265aa6a87979e899c21b095f8225810785fbd43482799a1dadd6c3a684c516d SHA512 967df51b39613e7e1509cbcfff8e80f255f5a62fb469be5b7eb90274636394fc497ff47b365f6519c5f53d973bf6d58885434c053a800024eb0cc6f0cf0f1ce5
-DIST firefox-101.0-es-ES.xpi 529110 BLAKE2B 20d701ac74567898d1e520dd9f5fb054ec6782f33e43ce7a447bf51f31e3e38913c9aae6ae508b547f79774210111dbe82bc2cfaffe3563579cbcf620d891050 SHA512 73660d9ce54ad068fac974fbd73a9b3480b75cf4107421f8bdd243bf10604d5c99b428cda4db86657b1038e16240f07f830a62a94517465569132a8aece6d25c
-DIST firefox-101.0-es-MX.xpi 542141 BLAKE2B 9115f9712d304876482d8ad23551da7c3296e4a7ab76da2e709106f6f84c87c586db39623c872e3bdfa37058f50d3b51785eb9ae227343efbf6fa750309e5ae4 SHA512 ff66e388765532e42fb2014912562c01e936284230ae79cfe694853f11dd56cd2bba88c0bdd7fdf8535f54b485978021bfa5443c4a54192f0c9b9d776d436640
-DIST firefox-101.0-et.xpi 520744 BLAKE2B 0a1da1743b9cc13f8a6d35730db8c72c5f6b946dae1784489cba93423de89c5c5e9f0b9918775e6bca921e13f59550edfbf6027f9c404f735deb10c9cc01dad4 SHA512 1fec51670ed198f6317a9034a282fbef4b562ecd82f012094fedbd603450851e7da1aea95394ec6f829b1bf595ccc0b0acfa78615efd8c43cd491b863108b2e7
-DIST firefox-101.0-eu.xpi 527775 BLAKE2B 6c25374754515172f2bb2b9ee5a322500a77ded411fb7ba6e037424627aa88f523f21d58c58be7c452e7b94cd29b1b860d2bd07de6daf6fb4cd2c7bc265fed9e SHA512 c12e36d7c0c1b7fed5bea9c9c651fd52b215b3644327b1f20f8e2f5e2283fd2b858a0445d82848201367cda313497041707e68b587a333aa70486def289fd8d0
-DIST firefox-101.0-fa.xpi 551020 BLAKE2B ce6e197d6502e257149a6e3ded25c730121a5b53e4f2ea799a57f5525fc68bc4a5426fbd752221eeb6041e019ac7af953020d2866751d8f71ace0e0cbc10ab64 SHA512 2d075e404ebaf51c6e90e94414a3e6f8f7e597f562c9a3d35e3eba2aadabee67e8f4e470b96342c62a2ae0bcb0f717f7f52f713e508a66e96eb147ef1ec55540
-DIST firefox-101.0-ff.xpi 461238 BLAKE2B a2d914ebb3465c0cf1a4a93637b7f46ad8bd433e84d3b365899241ab3ceb798b1e610461f61255802f64ed49398e0297f6c73a3463c24e184e97a32b6f0f5c58 SHA512 d57c46117a23077c7423efceaeb2759c4e6a653763fbc093955e43e644af1c4dd5eebf81d733f8a2c766a448fd1075f9e7628c25a3aecc9704c407552319a43d
-DIST firefox-101.0-fi.xpi 523417 BLAKE2B 8b4204e8bdcf7c4a22ff3d87d2930974974441a38cd01badb8706f13a3cbdf5e829b28c0eb17452e7de2afde5a19b204fba3b90f463ddbbbd1151b2651456f43 SHA512 67fbbbedc31ffc2afeb48c11a210914eb0db04a053cd8f22c8eb0b61f95cfd64b5fa12eb01b94a3166af8e61bce3408bfeee5dfef5c8432ea2ac283fcd4a597a
-DIST firefox-101.0-fr.xpi 549196 BLAKE2B 30e31e0737177bcc5f4720fb763ddc4996613388fc45c72cae52e947c612e0d6ba8cceddd54396a1d713207b1117f0daad4b7ef53e8475831149f3c107a3a72f SHA512 b9154a7c44a36da43820f05a41daa8ca048d4f0ff33062c7786eaf9d66090860dedc6c2625ed7eb9d058101fa214ad5ece8beaa1d1e7c4c307890f6976f3044f
-DIST firefox-101.0-fy-NL.xpi 535686 BLAKE2B 5f9023c4b603f79ddc77aded999d24f4ec6288424e54e52877810c1055dc9971994c260ef6ae5a32eb91dd8a2921405e15a77ce15b29a93f9933961a3dc6e8af SHA512 9577f17b8399967b267f9258475b820c7a746a57c891ff4ce2d2158dc921db5b97a4eb2aa05ab3aaff8d744d0c8c9a7b44dcb84490a27949d40ab750317a1872
-DIST firefox-101.0-ga-IE.xpi 461042 BLAKE2B a4f5fa6679bade28a709fffa7108c0b8b92508fa2407a210987b4ac9ab3bc75578074f416d36ca5f0e3b67cdd56e65cefd8061c75dd022cdd97ae3dba8d7744f SHA512 afa9ecae197bafbbfe828799491cdb59175f4112cc95bd83bdc9861a0af6102cb5dd6fcca591da55d7ad344e1fd635b3beb2901bdab5544fe5a2318798b4097f
-DIST firefox-101.0-gd.xpi 520113 BLAKE2B 3da50c2124e1baecb5becfb61706bcaa5767b36bdd26500979733f502b8a4b42169b84a9bb728e4d669aa84b907c79437f22bebe122e8c3c0096c49241363ecc SHA512 1bed2f786499083a800f175ded6c2c79904e308831ab01d200612bee81710f3d4c3e51f8ba9690e56a1c6398d6fdfe5953deefa7a717a6412892b5c7a457c27b
-DIST firefox-101.0-gl.xpi 528662 BLAKE2B 00406056a0dc8959bee183041b011015dc26385f5765ca84207f8ace4b3c65e085582db531e5cdde0ffd4d72c30576146ae87c6c680f64b389560df86f298d13 SHA512 0d34b4c8663a183a3cf7f893916608536dfc6fbcea3760e3a39f6b1463dd8765b8825ec5bd6682d6f5bac413d15bc4154ae5e4ea17d4a829a0cecc0396ccf9c4
-DIST firefox-101.0-gn.xpi 549923 BLAKE2B da6d28840f577122dda184e9ed0e3dd8ea1ceaa9112389096f94c86bb40240c8cb1757e27e714f166c60c42bd59f49005913c7336d068d7561ed2e529f9bf2cf SHA512 2ac991baa03f72eb8bfce058bb5f0f03af020b17105477998dd347a592874e11b7bfb8e780fff01499119960b14e38bd3b7c7c4405ca83cebcede82095016e4b
-DIST firefox-101.0-gu-IN.xpi 516674 BLAKE2B 9de377953491afccb885b98d3bbfa7092cf4a35f590601235c5ecc8e54005763198ee4c8d2406ce7741591f1b28afd30bf5c472becb0ee8aa9fb72d1515ffc28 SHA512 88cefe65db467d39e212feaafaf48d85308a6550a80ca55d6241ef737a708bfa4e3482ccaf76b8703d71f6ee9e281b98d1c320b6c717df367ee7da740afede71
-DIST firefox-101.0-he.xpi 549784 BLAKE2B 9ea2aed63ea80ea67461cb4928d642b323d25df142d2fa29e2ca00c02f032d14b4383c29d023a95622bfcc776d66e800d4ab8a49f6848104f6aaccbddfd32822 SHA512 55f3c19ef737fd800cf5cd6c3f73550bf4e79fddd0ddf3c315db55f0536dc12dd5bf3145ecefa02ad406266f8634a9737fbf0fcc12d36f04c9961f169b8a5f91
-DIST firefox-101.0-hi-IN.xpi 546766 BLAKE2B 0cc503393bfa995c25c4244460579406703f8013b4cc8461ee20ad8d33cb6523c87eb51e0430686686879b664c1115511b145f714926fc8773a167fabe8b9ec3 SHA512 356ff919ec2d8b8130b6972decd6c3e6a36b7db44f3463ca52f06fe25880d604de3645d71f1cca5a9c8848f2d74fcca13c9a7e4531241b0c473314414fa3a918
-DIST firefox-101.0-hr.xpi 519206 BLAKE2B b18e0076896ff4a0e57ca1c0247deafd4cc8b343f16c23add02b7076a5ce7d4db195c5b364ca5d2360e86fffe1bbe4068e607e5920eb4023c7963af52757ef44 SHA512 82a7c87381f7059e49484538c28dd3b8495a3eb554be737ab52130a682aaa1d8be17a75aa1af9af525c0bde132eb8393d12658f4ed41ea0533e4c5795ea61991
-DIST firefox-101.0-hsb.xpi 554536 BLAKE2B 17961c62b928d980d1655978a20f7888a8416f7f254ce0c4b773e0c53dd74ccc3e76e2540e81d8220e803ae498c4757285ce2b3450c363b931baf974cd28c3ae SHA512 eb03e7417b15e6f2e277f3c1d8783cdf3c7ba2f9bb8b501f089e5e436413ab10944a6341eac0a9107e44a72aaa72744bb057300e2a6c5b8149fe889515920320
-DIST firefox-101.0-hu.xpi 557567 BLAKE2B 6c9b68790472eef8add389770c903e17f340f6bfe31bbbc4d31299e3ac6e8d0bf41f0c93415d50cd38d75f456c8a93df00d53ee176287f5dee69f7ac5e7f7373 SHA512 c72b6f0dbd3ec1bddb408760d58fa55efb0daf1a5b822faed0edd965bca3aa4ea4e35bd5c5d9615eba21866c95f80b2879a3200eb01770b5bd27f6d02dd394b4
-DIST firefox-101.0-hy-AM.xpi 568388 BLAKE2B aef23e6ef7ade48e27a6b500dafa9944de546dca378e79d781208c4b8b05d52db9597474dbab60ab045d3bd3b0247137c6d3c255f1c9bf53028cb01117cf440d SHA512 b52ceb93ecc24de924dfa4082130031a44061e01bb291a017ae0e34dc154c0bbe657f590b5f658a779119afd6832fa31e9225b0b29cce7f01a6569098b490ea8
-DIST firefox-101.0-ia.xpi 524532 BLAKE2B 4f4c98b99226f3e6679b81257f25935e6cc5d3cc9db6d36446e7efe38ad8aa427b5f9e2e1033a0a8edeb79503d0d438f5bdb830e5a06c94d9f1fe9141a617932 SHA512 f3f7ae4cd518df04f716af775c910bd83d71bf72daead8fa182436c15a80637046b7dae02632fc834c23761df1c3d3bc3b4c0e8739bacc1b95ccfd4009049591
-DIST firefox-101.0-id.xpi 521946 BLAKE2B b82d9346b19bcc37f3df04b65febe52652fc37f95db9b797054e34512fa5cbaebcba147254e157a69486594792c666ee18c40dadb9237c28bdde29baefedee60 SHA512 cf635bbd66aba2cf8ec02597fb264aa8a840e63cd4d1a94f6b32e398b4bd2fc5d8a52e6111b82ddf37148ca48384c506de2f1bffd57a295b291be45a497c2165
-DIST firefox-101.0-is.xpi 529392 BLAKE2B effe3d917eb0a236be74d5a828f658cf9b785dac99ce2a18e3cfe5d6806b607a9d4edd719fd7191704b4440075d5f7797eef5023a3ad4355d5c7a4e3982e4536 SHA512 e33f666539349207057f8903bcd658168d269845d4986eaf3138395f82a87fe18145bb6586086a5272b4ffebe2edb7fe0c20d8a820e7f28d9260d4385d59dded
-DIST firefox-101.0-it.xpi 454743 BLAKE2B 1f3e6c0c3018c1e7e968d9602b5dc4a6a33ba6e98b5bfad5f02ca432358297d24faf7a73da96569d8b0f8a87941d03644943d2fb0de70aa6e5d4f0e25ac24de3 SHA512 710d48a4ae89097fc6caa9269fd78721b2f2f1bb240a1801bd0e028e307ea8a376b41b7d83d6872cf626536f3ea40f1da98198b7b8392d7e116732da45ff5ccb
-DIST firefox-101.0-ja.xpi 579353 BLAKE2B e8f06f3330ed32c0d2f31a7f65df5502eff9f758d449807a6461ba3550895e0769ae3392631cb1f8b693b12adf4f7b83611f3d54ad4bfde78fe73c95547f6d5e SHA512 2ac284f4bd12cb01a3449819cc497b5ef03f79e7b1ad3b989594008b91876ddbb2c719a5b2bd5d693c019b6397a85d4c92dd856a879f96f1214eace77c6bd75f
-DIST firefox-101.0-ka.xpi 582461 BLAKE2B 6294fa6aa65b031b425846dc4395db0ce0200ba3669b0c4b29eae2050dcd662a0955058abf4dc093e6adaf3f199e5159196fac3c2d8ec99cc84d60806a4958d5 SHA512 938d9b056be547fb548d5b16b4664d9570bb268edd437baf82eae336fcd26b39946379b2d9d279a9bd53c1daf236f48316468748763c41b2a9b5c700df4b6e7b
-DIST firefox-101.0-kab.xpi 543572 BLAKE2B bb37e2f5babcd905fab5f93a6a2a76b729662d23e7424c2b205650ba04ab6c0915bb95c17575b7e1cecee9a2303bee4f6cec1124ae7ec3205f43178382020dc2 SHA512 c2a6178ae1545a5bf6e297dbd5f3981869d080389cad0e5c1598b1395712e294c6f05ada28a3e6db3b82e0f5f044283c35423b22a83ff68dc10ffe483f8e87fe
-DIST firefox-101.0-kk.xpi 605355 BLAKE2B fe0c9d1551a228688fbde61beca8f2da48f91704698b91da1d68483645ad7bb72da55621fd82b483650027e129509f021b63dad072b5c8353215e182ff9f866e SHA512 9840173b52afddce66710b1faf5955567eac6a379c0c400a12a98eccded9753a296efab07feb4934258a39d0b333e4e70968cbf74dbbf13d81567ca72ad1d0f6
-DIST firefox-101.0-km.xpi 520288 BLAKE2B c523bfdb6e3306333f1f016d4dcecf6b53c451dab30344f136a5514684b54b0e6e1c609f645c206c08a8ad09a32358efde73949f71b5bbb2e3de82f120989ba6 SHA512 f26c71bdbd7259a3e7ad8577f931bd9e1fb372d4d72c94e634ee904e7a7e6153d39d5be83163379968e8611f8ccff51a1a8f67f0eb1da7c11a193c365170056e
-DIST firefox-101.0-kn.xpi 486503 BLAKE2B dcbdae74e313e2eff17537a59d529fcb59dc24ad8bd82e469b13a327edd23e18f04b17b0e9bed0e914a4eb9ffc72197cb1f23eeb857456e36941892d23f54142 SHA512 16a39e41169aeddf3835613f98ace4ab9c15acff319415a72ff0cc5377c572c9e29b8d6a29834007fdd81ca57a8d2b573db4f0f2db56f391eb9da624131efc26
-DIST firefox-101.0-ko.xpi 570889 BLAKE2B 91fd0957cf8cfcf0ec8b02700aa1e0d2d9102ef40e038fb0f801272b48b8c6f8fbfbc32be3bb483c3ede2db397be05e10697bdda49f37dd956c73af53cf3c9f0 SHA512 80022dedf5e1ee42d58d3d0c98ad1b22b1e19226eeb04ec279ffbfff74c08c1585f837c9f3c9b3e12ce66350a4748f64c69c8bf942e4b83073e06d988f2dff7e
-DIST firefox-101.0-lij.xpi 459507 BLAKE2B 9d2ee16416f16a6bbf3bf899b5a5f2998ae481c21e089cd6c93a5ac66a50a28029b9385937e991d0fc09fd6d322f086322ab199397ea5d9ed82bf531e10fc99c SHA512 f4b1ddbdcdfe4c2964bbe18751c1943876e10d0e1b7ea3bea50362eb7af91658e26e5426cc70175dd11a19b04a7b8a1ab03eeff7024e69dee6dc765ef875bd0a
-DIST firefox-101.0-lt.xpi 546498 BLAKE2B 3d4fe56f7b5a10e5fa6738bb2f4dd4be8a97686a47676fc1e38012cc1f8f7986fdf1290b468c8f81f6410a820d9c25c5f09ba3db285bcbbfce9acd5d0f3d14ad SHA512 435f40dfc0ea37c036911b2606c7c0089e96e6ed400dac9da2ea50741b0cf659c8c830e4f08d5f3cd4e6bba346a20c5cf6ad00ce648f8566d84b4748f6475fdc
-DIST firefox-101.0-lv.xpi 452391 BLAKE2B f2ab43cc35d08a0b22639dbbf5badb6d8a4e321d4669d814f3890fec8a8340d96ec31ad82131d8c1229a885f5609d323fe55dc6863becb43a303b63dcb243430 SHA512 2e112898920a8532e7c5bee2e0a4f9f68ac85496d41900adf4ab297b9c727654efc0f83e1ab1eb4687137831a3bc76ecc9a2fc185de2ababe105a19691ade046
-DIST firefox-101.0-mk.xpi 463666 BLAKE2B 83d3798a84a39a4a78ff8f96136af21174bc90d4eb1b9b7bb2225d83794fa18cc01c9d7a138925b1cc971cbef1fd164f4f51fc4b39a6bf845fa38a6c1750c935 SHA512 d9066da695d464a40a2011635c8c56f514a74eee6275f11b72135e753d3ce3518172aaa07f1adaef8595c4818f7543b36af909f9f85d22c2dd074d4b7f2c980a
-DIST firefox-101.0-mr.xpi 520141 BLAKE2B 4c699dcb280ab6fee40d65f10ed5cb3783f4cc1c42f7b97235d3d27e40558ead315de6d425711f54c8555c924cdd8baa968db883cc273b990b5987a4bf313797 SHA512 b3c9183998a5019e4faef08a5b47d254540f117d6b83a8934005f2cd7791f515bc06756af1b97d360d2e88f727d14c60bebb966fae61dd6c2b4c3c50912b4d9b
-DIST firefox-101.0-ms.xpi 437570 BLAKE2B ee853b54346cf773c1e84ff71f44996bef70e243eaf3140b83376de192dcc6e08a9d62b4cd5709584758c1145948c2b528e5876b7b83a07e45cfc75192beb609 SHA512 a7d2a339e1fa8a79131e90617b09160a2102b292bae6c90dec096253e15c8673f2dc9dd3e5073072533a4ca4d4c7c376a766705552b073ece979ef9de849db59
-DIST firefox-101.0-my.xpi 503452 BLAKE2B e4aad1813f79a961ca65ea1d36cc3d651be267e47e60fff5c1839c48412c09d5d8762cf05107d5f0b9defa7ba83b7be48dea9436884c048c50738af8209d507a SHA512 be6f53378e41c6d31d45ef9d350e09dba74ee99572d49574ac93c7adf104723e9098125f9cd029e6bfe36facaccd23c67ea8a3315823187c9b3bcb8af9b29d9d
-DIST firefox-101.0-nb-NO.xpi 521734 BLAKE2B 68031e50392de258de2dcb475bb8b413ee314d70d65751f26dfc3615611d9928c143a59122536827b1837ace2d352bbb27f49a10fed30cccf6adcfc0c96d4691 SHA512 089bd0b3fd1cd8ff4a89a812f1aa8ff525545029941429aaa4c2a9b19ccf23a8bd3b4a7ed4e81ab3fafde5f86cd868574a538d5cbc5698429874a2888c0d6ce3
-DIST firefox-101.0-ne-NP.xpi 478317 BLAKE2B a1b8cf240226e82e803add6b1e38aec51633ec05497597643f89b77248a590230bbe1b9df758a80454c71727f3b2bc6022d78e9040446860977ca623c08eaeaf SHA512 15d0ef53511cc6b6ab164d2893e0925ced94ef82034bf4356d4fb58739ffbe54f885f6dcac00d6bd03e4de1eb115c19d22e48322edd2cfb06aa6ae59656dcf15
-DIST firefox-101.0-nl.xpi 529647 BLAKE2B 3ebaebbf938d143923a4cdd295dd3ec9e67ca3a394605283c194e466455d8a77a60c4badedefe27c95ccf2837297ab9308f005a05474248f755ed3422fc16e94 SHA512 aea4c9dfadb14839853c058dea437d5e1450ef535b2cd0b27b1896b6d33ecbf440b6569ad8f937129e6d6fc8a080ef06d699e8d090d7860c440a9df112d794cf
-DIST firefox-101.0-nn-NO.xpi 523770 BLAKE2B a01b26149a31957d409aee147a2ef9e8c37f0993c0647b7fb7f4040cab479811ca3f22d566c76eca0883eacc96194f47977593fc9abc41e890fc0d8dd22f75d0 SHA512 133f010b3d77bd6b41570173b8fb67b817124a17e311613a4b9c4d4a5e4ba3a6229e0a589a626cf65312255f3a49b93644484a398cc62b0fc70b935a90876c26
-DIST firefox-101.0-oc.xpi 544433 BLAKE2B 4964ad4464624d753309f167410a457db6c6c1696fd597b1f602953980e4340d662c9304cbf93487be52e89cfe58d1e0c6fd51ddef8801d58f9edad2e2c5cc22 SHA512 f7d7893511d39e3b5d694542840841b2758706eaf6c752a33759795e8abc35e3f6f6ba7834631567d0ec80f4d77955d126d128d818274e2a71bdfdbf22a8a4f0
-DIST firefox-101.0-pa-IN.xpi 592170 BLAKE2B 591cb7ffb3bf254ff1385b0e7409434797a922816c8db00bdd36e147ca857f11e3e8fd68a1cbf30f2fa2a68ef2923e916b510514d50aeb503a0ca3686bd6d77e SHA512 0b239e4bdaf749c5d5bee66f21053009ab40e2740d28bebe9f14afe934bbea69dbe8932d487da8dde1a03c62606ac73f095e629cbd9564a28f1be0db631509cc
-DIST firefox-101.0-pl.xpi 549645 BLAKE2B 40a32775fb12c07bdb6421d5fc8848c86c6ff941428237a1c3edd6f000cb1273177425c028db313b2bda437a83cbaf5bb287a7096545670251be5a6aee0cef70 SHA512 7abefd4588e656128b2dce4299506fe9696b37c460d75e83182e8cc9a72588846c45997ef429fcd14b4db508dd1d306f83d49c8ab52c18b617b89d25d3128790
-DIST firefox-101.0-pt-BR.xpi 535131 BLAKE2B 97b3de0029623dc7689f9bd4b2c6d8dd73aadc8cb94a52d48838d45bec4df8cca22154c8a6b3620d51835962d2f047bb55203a9a799a61f1738b29a54512aa45 SHA512 ebf46292bc68f9a7e674a7206ccac9a872d0b116b9a66c5cb2c9ff05136670c78c89ff2c82909805d5bbe27fc4671a831c530a468702843eeb36d123cd2accda
-DIST firefox-101.0-pt-PT.xpi 538683 BLAKE2B e2ba38821eb8f2761726428832c09706b1e73052a5bac3619ff604a2fb08049ac313d8ad578346a4e1131243fd890deb5d826f9874b6e122f87aebc146cdaf54 SHA512 57d649a6dfb7bb70556edcfed18182019e7311b91038d4a9cce1f07b7666f3dcf9c4de1728377539132a78aa493173ba8e080335f7d13823a77afee434dab059
-DIST firefox-101.0-rm.xpi 528619 BLAKE2B 149127164d57540b38a3b129812eab08d33f48cbe9d74032591a820999f8be4d78d31ca11ea72e9ebdc4852aecede621caaf559ad2180b7b6819554d4fb2f8a7 SHA512 5bf40fba66a28a6bec911b9836bc33bf0ced89016ed3feaab400238e81c63ea2ae0ce6e2fb2e16fec110cdf1c56ac0fdc0886a94a65494d1dd5b631581246448
-DIST firefox-101.0-ro.xpi 516076 BLAKE2B 5a7f4d2782301415a08c2a56b975aaf8b761ff615e73e4f66aa28fd91678c93dfa229037fcb86768486302cc3b73240df10671e7b321fc13f2478cd3141eb8d8 SHA512 785ab5e472548146a386acd27f68be24728401f63c9a2ce98c3f88b156f3e940c2888dc506e408aa760a9f1fcc846c5abb75ffe0de26c8138b268a779986bad3
-DIST firefox-101.0-ru.xpi 617781 BLAKE2B b340f626a1da5fb27ef17c336eab0a9ab9ca6f241a9d240de728549d09ba46ee18d9aecd8ee5a50b17ea3ec5d41cd67391b5110c44663ee391231723eced2823 SHA512 fa2a0f9b5442888ee7af3edca5744404e64ebca32133b2be178712465819f35885e47a22327a4edf9b7be5bb5b6cb6d5f82391368d40347ea5f5a4e714d31426
-DIST firefox-101.0-sco.xpi 490267 BLAKE2B d3eaf068abd4aafe63ced25b71f66f7bb1a9339f6566acd507b16ec5204146daa0d4075665eeb64b5927d9afc2816c15b180db3e99f3369a520b8edcd0ef41e8 SHA512 f87716df8d21310bd4a5d693390f8c12881e6fd71dc0c1028ba9fd4deb3f049f704c1b869b1fb8868f05fc407ff6b326877dd637bc3fd19a4959c7a3ade4e744
-DIST firefox-101.0-si.xpi 476127 BLAKE2B b0d6957490ddee4dd7ab1675550e8767d298feb38410c69ac5084a9e8c7741fa294a21a65628c2de629627f210e33ba6eecbae6498a5e78beb5c8276a75b0668 SHA512 086d8be2a7b79375126436ace64bb468258e504e57e0e4e19f17c5dc85acac76cdf62603d98747f24e2f2bbd7796b927e4639ffbe7b5a12afc18b00b364b939b
-DIST firefox-101.0-sk.xpi 558358 BLAKE2B 6f83449bf0cc6cf395fe4a9b2a109a8605609fd7f491efcde43011cff1e9b467da5cd01106c7f6ffcd3f72bf4ecc013a85dc95f041b9271bc96c407a00963102 SHA512 07edb792a048021c53af600a6b04ad70abec9452e1fec2112f111b20f6995c043bc2a683533f059ea9f7cc7e9bcf619d808bb59de2ae578548323f59d09c6d42
-DIST firefox-101.0-sl.xpi 531097 BLAKE2B 50fc2b60f440e26fb70a3cf8edca5a04892e3f31d57f392593ba37fc8f54cfcca9dccd238618ad27bf061e7a854a09b80384d4b40511810a1ec6591f1ab80383 SHA512 699e4ee37ed88cac8e9fc4763c81f1179fc84d9f6e1db982eb2a89621a64da78c42507f07ead7b0ad737d5419d0d2d166b26cc6b0421c2a0036d714f08caa465
-DIST firefox-101.0-son.xpi 415524 BLAKE2B 6d0db35f2fa4f0f19b3b5124239c4d1c98a3c71e6b266c015ac2e462057d0fac4d6eb044dcf7725f4f2987feecdd3d2bbe43433efd4e58619dc141af6d61c96d SHA512 f1e2dfcfb2dbe6c4c06bec890b77b982ed5bbcab43e064e82f19b600f182ba3318ebbbd8a9e792f0ca312b0ddfaedff067cb38c46afa0ccef708da7cfa9c0d69
-DIST firefox-101.0-sq.xpi 546725 BLAKE2B 5ac336c462a75b5f0a937a142dd36c740e9b9544a9632d6ecb216146645a486e0cff1fea50411ee598813a5f21053d69242674314f1d8dd0ddbb01f460f64ec8 SHA512 89a99b0b72326f50d04ad75bbf9c4156e932a44ccc0408449973afdfe9a8e810c2f9a54c8edb4997fcd3c648f935d9510762c477a98688c2d8a803bb42c98062
-DIST firefox-101.0-sr.xpi 571499 BLAKE2B 4119871309cf09b1b6b94567fb0a862bab2c6e7ac7f716b75f3c0c12d5c362b2dc852a9c2d37c3d532b8c383f74675ce7ae76dd166de1b89b3dfefe9be1715f9 SHA512 59d6a7fe568cc704ac58acbd41de55793d3c9864b1a3010a6d7a65ed0046fab8fc7e92f65ee9ed7d75425dbcffd211b744ada68cdb9985f8a8a92a306f31a6cb
-DIST firefox-101.0-sv-SE.xpi 532145 BLAKE2B 86a75e4680fc9c6410b8c962c21960d45f1b906967431522445b25a0a4dd6042e02b86f959ca8972b57193781f333c830b3b663553bec051f51fbb7f3bf1d533 SHA512 eea4ee8a7a3969b3304a73bcd9832caa84722c4241894deaa83711164b565afcff3b9ecd18867e6e0bc5c89aab2f1d1db50141b36602938b5fc344cf54a409f3
-DIST firefox-101.0-szl.xpi 502506 BLAKE2B 03fdfe9bf053508f0b5ef4cfbaebeb19065c1ca4f55a4e79566c2e64e31fbe0551a6d707a16fe3298160289665b315969bece8c6fc26dabe9bd036bfc92fbbb4 SHA512 39e646563bb8ca5f1564b94044743c6edc124d072f3ac726661f6676b5ed1b37c97d5acfa16617a47713390cb9b01e6765cd5971bddcbcd54cd5709a2f8b6cde
-DIST firefox-101.0-ta.xpi 500997 BLAKE2B c0af351654be4f327846f9c986b87c99074dc53f478549e555f6a7d13bc857338dc19d750a87a9a7356db9299bebc1d1296aab83a5d5099b0621b6822301aaac SHA512 f209f73f57cd7cf13d67011f518be989fc468a5e0ad35a31ffc3ae60555517f4994e830643dee39c56eec0bebc0f475007ce2506162ae7b66a5653c569177200
-DIST firefox-101.0-te.xpi 541004 BLAKE2B a971a8008e0d7d75054bd502bee5e006cd32ba222fce0168198eb2af12a721ee89f09b24ad48da5a656182f8bf7d07f6240dcd2c8b0dff93ff33df096120582f SHA512 842916e41371e260f659932dfc935781667ef48b79bf78dfcf7db0d93328464bc86c8bc440277e3a0181eacabe1eb9f47aa54e6a1eae17646ff01884684ace50
-DIST firefox-101.0-th.xpi 598582 BLAKE2B 0891cea480799f18e7d9fd955940c9ce6e67786255fa96138e1a57c9474de3934c479167c16c002523a4cde19efb2aac3506cc6005de577d3bacd256b3aca317 SHA512 9f135435b12a773ac41a5344f612193e8e8e0cd8a47972208829cfcf6788c2ab8af1b6d6024646f2b93473a0ba2cf5a6bee112ef9b1a492868fe4ce0a99ca1c0
-DIST firefox-101.0-tl.xpi 505942 BLAKE2B 0ceec5ae7a66b576ed9f2c7c0dcdb57bea78f0eb708c60cd744fbe0f95c7cb1d5848c6387b733c7c06a3ea1169d8fb3e7a6a86416f3bda43375f1b0eb364af98 SHA512 06591c770820c790279a43ce1f3e6707933f6d4a96be9c528210b3563dfeb7cfdb6c77ef8cf07cc2d06cace4fbf0f010db2fbbcdd957fd9068e720f6de08d0e4
-DIST firefox-101.0-tr.xpi 545467 BLAKE2B defd18d757683aa8276930718acf4daa572131ce051fa89317120d2182c89193b3931bc838a34abc9b2248375d6da73df090e5893ba18ac02bfdc10a27301010 SHA512 65057bb62b9181e6415419d9136dd4e6d8abbc4735b01486730f5c51084f4fe5295b096dacea3c06d75cb18740b93afd2b7b287ab4ae5f10e5120decc88a4fdd
-DIST firefox-101.0-trs.xpi 480504 BLAKE2B 002b98f42dd12497b373b878b848da35e1ee8aa3891ed5b8d69b5d0338e0db80534d7c4fc07657784b151129ba063fec6e21cd99dac63465eef7ebd2c6deb0b9 SHA512 ea07ecc3c520af78eb343eacbb4035788871275cd199f01c9e378a5824f009533bfe5855294d9465fed4eb260f9571192711f87ee9814b47b6919ad696be7294
-DIST firefox-101.0-uk.xpi 611842 BLAKE2B b08e041195924ed61ccfc9512310758b7dc0ca0bea724dc87ae02ef98a6d191127d109d44090b6a3a9769ae3a2c43245462078f7154cd91a6b731611344da670 SHA512 6c5aff629856ae3a7c3e71726a51f5985be6b3b720b4e2106019ec4f225128db5b6c96b7cfb6605208894c9055d8ded182bc1a52e8f7c1d1009a4ff6ebb8e02e
-DIST firefox-101.0-ur.xpi 548437 BLAKE2B f4837d3440c6b3744cc8cb259683dc54dab7bc8108d84587ba64f8cee2956257b58b6136c4e35e621b7dfb84a012e46bcc7c6cc3bbce8b1ecb6c8412459d6e8c SHA512 c04aa823829093c88fed63ae1bba07a0c1b03f38e676a45009bf4212f286994c470e809b042dbc700d4c196dbb51a6bbc951149cf078466cb2c3cd39c00ee448
-DIST firefox-101.0-uz.xpi 468689 BLAKE2B 05f3d5fdc7376b94fdd0c7bcad6e7b2256dcc627e570b0ec51048b8d8ed44671bcde728fc3c4cbe5e86546db3abb1bafcbb0438dcc964f2f2ab5c924a7f9282b SHA512 e413b3e596f9de8e340c8334650c58fe1998a8d0187a8c0ea9ef1d13a29f6bc71ec9d55a05c0c11482f0c1bf3fb0a09061f69e0f87e315999e12c00cf1e4a8e9
-DIST firefox-101.0-vi.xpi 564700 BLAKE2B c7680c2beca53d285ca6bd412ac0dd18fdf589e39e14373fb0e4d284f70b55da278871080aabc6f16828068927a0b156d93e959a92f48f647d1d8e9689dae530 SHA512 3aed361bf35dbd8d215afd8037ed3fe06d756bd395dceefa06c999cf26ec6209b5aa1228b38bc4b6b042bb6c8438588264846d6346477088a96d55e0255a5c5d
-DIST firefox-101.0-xh.xpi 418658 BLAKE2B 68a9f90c2b92d8ed36e47d73077720b86e91abe379c4032041e244083fb70eee27a06a64b69417eed58849394e563a9641ed27247c23af1e82639ca776f1d0bf SHA512 1a0fe5caa261b66470b5033283e1699cd55f4c5a7a9b3e9614af19d6d11523de922e9540e0f9a914281920402c2a97654e2ddba04d8f08acb4e317cc7181c5a2
-DIST firefox-101.0-zh-CN.xpi 567077 BLAKE2B 051b082f6f6eab983b3eb6ac94fd673b80e4db1aebc533240d6b029905d7ae8de39cbf15d7eac67f5cfc9f8370951591f9a6e2153b806e174222447195f3dc4a SHA512 37c646b5c1c2ba49b20dcbb197f8856c2198de66705c11279ac790ef2be25dde843fab1a96f767129b15080445a961079edf4e9d58064f7d521357c596fa9fff
-DIST firefox-101.0-zh-TW.xpi 567648 BLAKE2B 1b9cdf34a9553c665b38b8b02814fdca8536ffd30da6d92c1ded2d3b0706d933809193705e05578f362f5a2653c88aab5a6c92290f88a55f1e31104d8be18ea9 SHA512 0a0680d6fd6d158a7bc0b5f19e24028647b3eb63b571bc4dc4741a2e647fa4d8de4120bf2fdba6481890cf75bf293e7c7779050f219738bbe23cfcf334516e5d
+DIST firefox-101-patches-05j.tar.xz 37268 BLAKE2B 714eb1ea764f24c21b1610363abb5af7eff2047ed0a2248796ac65fa0e4274d905944de343c6ccb64a7cc25379a4676138e22b500d3c0da2cfdae6b7fbffb784 SHA512 a019fb9f1bf2b8550cdb904fb9fccf73c82718284b53d88fdad2a87e4fea303f78bbf25b85d57427164625030e28e94fe731a8b0a6ee4252e13bcc781a398412
+DIST firefox-101-patches-05jwl.tar.xz 39392 BLAKE2B 4c47e6c024d19cb904918489fd145ff14d89bd855d573b50af6ee03700677373f237a83ad31d2a5b4abbd85fb8aba2e5be0be743a2cbd10229d31af6c3c3eb4b SHA512 db8d6d302d89bdc9b6f7ea433ecc02d95e8767dc3e13e301539f4d35586c1473c17c48424a4fad70954e21063d93c10e91effc29d17d1c1595de079dcb47fc46
 DIST firefox-101.0.1-ach.xpi 443457 BLAKE2B 68a1ebdccbce17eeac8824e63e034f0db706a091b4dea9ce1c14d0b769ad404e36004e89a838ef68bfbc44336125bb3494ade8b076ce38e70ea15b78f394f8e5 SHA512 9ee130d4e96bb73ec2ec01bd75faa2687bcb620727f44e199ee17db3e523254e0a0e8bd8d1813f4eebeb80e575ba20b312677d23a4994aadc6a4d4fb9bbfa5b8
 DIST firefox-101.0.1-af.xpi 413389 BLAKE2B d531c87e3df019cd5ff8e497cb3e74f000d238b65329d4eff72fbe80c2e3052abbaa19bac17d9383df1a2d88e60fa20c9511b1c12ca3fc06fb986db4902da772 SHA512 c9ddeb4ddd6dd8704c17f5dd8bf8ebdb881d88ad1bb1e01737b70ba0efd3374fda0829123afcbfbf98b770be4c281a714fbab2ee30d6fceff3eacbfa398df9db
 DIST firefox-101.0.1-an.xpi 487249 BLAKE2B 7d7d6b1b0590940df28b4a432d3909200496e500cce58cefb71393e6778723e71a251fede6470c97bb63b7e66b2c807bd9cf23fe4f790a9ea86c1f4856a48206 SHA512 fa7d675d52d547c7168e402e6a9c4f4687a1b1dd251e8e75ed8d0b7e171960e2762ae42d94d950d1925467b6195141101dd0b662c39919822ff2fdd2a248613f
@@ -207,7 +107,6 @@ DIST firefox-101.0.1-xh.xpi 418659 BLAKE2B 520914da5263161b9f9480e455b584cc48f42
 DIST firefox-101.0.1-zh-CN.xpi 567077 BLAKE2B d15b9f6881ac0198c90024fb8dbc3b1370b0e3858857732e49d72991aea2ff7b943c5c40fd2488230e857d0b9d41d25746691ce5ac86b90127a543e3a697b1c7 SHA512 848462ae18da62d79aa6163dcb0e53adb4ac0fe031a80dd1f3a0b943102060548682f8921b02431df552fd817bbd246bac5663e091762eb1ec040308f34fe639
 DIST firefox-101.0.1-zh-TW.xpi 567655 BLAKE2B f6a05838f02d95ad9ce8d2bde6b3f1b0c106fc11dbbd17000dcd4bf4c799a1f822f538bdc5667ac1bc87de34ce576dbd2e462d7dc6170a04f19f6fa3ee214116 SHA512 22fa87260421895813f5b3269e8a320d24b4477bad5c6108d0b68f80afeaaea2d90d367c436a49d643523a00bffbdf4c570c7d5544d3e6f1977a1c5b0473b3b5
 DIST firefox-101.0.1.source.tar.xz 486021240 BLAKE2B 8dce0083dc1fa7d9f04b1a87a02e6e171e19b18ddeab210a12940a4e582e8420aebaafb2fbbfcbfcadc36c2004a61b4a3a24b630838b3a7f146945ea735ec045 SHA512 435a7f6013582933e75c41e554a45beda30b5affd7d3ed7d2876026609ba7f17b2c20b507d9d0c9ce2379e335ec09b021257ba30ac55fabf02dca54b03ea70b4
-DIST firefox-101.0.source.tar.xz 490975228 BLAKE2B 7d819a8d66df38a80929d83ed42bcaf0c3fab431c8593a98c8381a4757776540475ca77fdcbcc144e1ba7c27b851d51da653d375a34a9dbe9785a09d319554c4 SHA512 fffe7e0940c1443fcdc5b205677764cb4e04b29f33fcfafb2857d383700584f309806b81fc4989efb56cc12a3cca1ff7d451b647050c43e98777b5c952ed5d56
 DIST firefox-91.10.0esr-ach.xpi 453209 BLAKE2B 14b4549f563075b1b91e626993d0bd9ded4798ed61a747e2bb11d0f1325fe3d506773b675148f3d4b292fd3799d92e3d9968679000879d7e4ae9dd75bec37815 SHA512 eab581d3b6e87f88b5ddeadcf805fc456ba5abdf8bcd571d961609aefefc35aefad841c078485a8509ff679baca516d2425f472a49bbe19fa782d8c8f52bc726
 DIST firefox-91.10.0esr-af.xpi 426923 BLAKE2B bfebf65937d882cce010f41ac4e3bf0a91659b03d103a2bcd6975ceb1dfe8e4c6f93d18c9f9ee80b65d29f602b0894006c820d1fced79c38099b100696cde9c8 SHA512 b88dc4bb84e80752c1d3dfaee88f829312b063be11abaeb5d3b0a95e4441be7f89ce2fd090d50786bbc01839a08b9ff85c98a4d54c9304259078242187056426
 DIST firefox-91.10.0esr-an.xpi 499888 BLAKE2B 67b8233f0cd6f3e1a0d7b9a3f98c1f98af4239e11e3b768d7825f11fb4c998bed424e605500ff9d470c1fe525b20a7d6cb28ebc1cf3b7edf104712d71a6a8f43 SHA512 ac68029cef8e543dfc7f954baa518cdd25180e5f9ddfee9114fcbff2cd9cc9784f7486c10c38e5c4980cbda5fc63b26d393ec1ef4457731378e48c762d16ca68
@@ -307,9 +206,7 @@ DIST firefox-91.10.0esr-zh-CN.xpi 575371 BLAKE2B ab139a8305601c53895eab447643461
 DIST firefox-91.10.0esr-zh-TW.xpi 576233 BLAKE2B 1afbb5ad4fb00bd4acbe0b71eb53e08a61b4ec38e22706efe2052454bc53b98bd87e5083e6f9b47574b4793a25551ca3f2e44b587586c7fe2c5de5f277de7ade SHA512 5422dddbc5d7ad54088a9258d5fd0a3a15d7b15dbac5080d7a897539d9dfb6fab258a0d76abceda87c123f66211649fd384bb249405af9e8099a3b7c12cf20c5
 DIST firefox-91.10.0esr.source.tar.xz 380454768 BLAKE2B a28103041af99732545dcf5ff0c6ea999252f7006602b9f74c388afadb32f98927ec10fb1f5ff30029c18a0f7d26dd27584f4d129de6671d6728a49ade07b451 SHA512 8344b829d7bd86250afdd4cb582e27ed5705b3ef48aec50b9a39abc17deba86c9fd721f4667f5c2155e3d7cd1d6e1f82ff8e218ced3a16a4e06bb414ee0690f8
 DIST firefox-91esr-patches-08j.tar.xz 19280 BLAKE2B 017c2b31f7b5b2b8fb1f23ee165b20b4c7490ec86f7385c203a316b8184586fd5b6594bbbd98375725c7f5b0623af026eeabf587b847d4d0ce5d35b005735af3 SHA512 e3e9c869a41eee1082b3822f7de37c7ff984bf90f4cda216c01aeed4ebe682112eb21a3acec83bc31d4f667437e52e06488128be041eb9d32d64dffb007f4b0b
-EBUILD firefox-101.0-r10.ebuild 36783 BLAKE2B f1252ec8d7d3686069815f7e227f2ff5205995f299016e70d490b378df8f25ed2960ba8a82383293b70243789514812a7f8a17e5bffa3b6f4be0e1f86e5048b7 SHA512 c863d08694b83e97c0eb70cf422cf2dd89a5362b6c5ed5aca1fbe735342d1d6c7cdccd50d015fecacd636b36a41ab45f3cd799f474b67553cd8dec3db05cc49f
-EBUILD firefox-101.0.1-r10.ebuild 37107 BLAKE2B a49f6d2eac83cd0d7c3e46a9f993d18afd204e5d2d1a9c07587528151f518fae9854dbebe6b7917b852eb03f9b2ab74dcfc0cc879027036910285ce8acc1b7bd SHA512 8819b11245fb4365e5d729bbf32ac623376d75a926d2a7dcbf2cbc99961a53850b1d6d242fe1605440e0b1dec69cc8542e1d8f93be9c411c29be2dde607ddd1e
-EBUILD firefox-101.0.1.ebuild 36761 BLAKE2B 92f1778172394c29f7e7a2edba831ad8d10b83222ed5f5166b33afba37e4e169c1ae076f9fa75770df7ad54b17f089e7ce20979367290c9c42cf7038e027c0b4 SHA512 aecba4b51d67b4edccc0858e5dab9a0d81b9a9a8501e651bab1ed23c11ae96d90aae9e1a9948016f4e5c0e31561ac3eb23220a42afc7e674550ac65fc2a86e55
-EBUILD firefox-101.0.ebuild 36439 BLAKE2B 57e62d3c0ed34bec0fca934ce421d6dfb02d58a02ee45c99d914d7a40b932de4cff1a42507ac50e1169a87514b06fd6b074e646f3dfb9a4edf5564e2a30a07cc SHA512 164caf0c18885ae5b7b9aaf28c1d069e80e61b5dc917f7352099ac00d44a5b0dffffe5a8c307d584ca89be81884b8d8864870e282ee88757e28f77d1668a58ca
+EBUILD firefox-101.0.1-r10.ebuild 37107 BLAKE2B dcc7861b0404352e99331420caeed24a2cf9ece74d9a6239f017f51950e1f41fd49d845b70f142dbf494377a723ce86145ffad52aeff626436aace08fb4b1787 SHA512 ce0a3bdeccea740b52c90d51ab36c88412725235f441092a0bd944c8a9fdeb993525449c2b5ed971ed96d7e35e7daa646541546561c50b026fe72d77b36ee25a
+EBUILD firefox-101.0.1.ebuild 36761 BLAKE2B c1897652216a930d05e2842a2d59364be96c8fe228fa20e6dfb8796ab4671031028d54376008eeb8340558594d1447a5d79b873e58b307e8908f20f7ac326226 SHA512 66a030921fec178bb467aadcfe547cddda648074cab896149ca64ae37b6c7c89d99473707a36e3bdf7945453958433a1f19d04ef09abf7d28ce87f7bf6b51b6c
 EBUILD firefox-91.10.0.ebuild 35732 BLAKE2B 9ccb5bd3145d3d47a74a9e6501f81aa1f83ed102ef715a4e3e7041b4a74db1f070ee46910a1c08793e65f5d788450ecbba7d3c24ef3740ef4bf0f4aa28694c1a SHA512 49359cc54e2bd677bb566062b15b76cd9d95718be739dc8dd1828a97f4972614eb63c1a1bf09f6f0d79ee83ff76e0fa813c3156cf44551833342b9864da88d16
 MISC metadata.xml 2395 BLAKE2B ee257e2fbeed0224f696b3cef50af4387e8abed54a840131ff3e07892c0571d5a97221848eeeb20639d2f15be600e9b592dc0f9180f9561356b0fad2c2fcf148 SHA512 3d3f5dee740a64c6dc7a29bae5a9c2b205eeb59cb698f0a5a85b1a4bc7c0aa93724c7196008bd0439c12455ea3c29d4187088b6dda39d797b2f2595c1054337c
diff --git a/www-client/firefox/files/gentoo-hwaccel-prefs.js-r1 b/www-client/firefox/files/gentoo-hwaccel-prefs.js-r1
deleted file mode 100644
index ae0eb5c67e80..000000000000
--- a/www-client/firefox/files/gentoo-hwaccel-prefs.js-r1
+++ /dev/null
@@ -1,5 +0,0 @@
-/* Force hardware accelerated rendering due to USE=hwaccel */
-pref("layers.acceleration.force-enabled",  true);
-pref("webgl.force-enabled",                true);
-pref("gfx.webrender.all",                  true);
-pref("gfx.x11-egl.force-enabled",          true);
diff --git a/www-client/firefox/firefox-101.0-r10.ebuild b/www-client/firefox/firefox-101.0-r10.ebuild
deleted file mode 100644
index e409fa7f0871..000000000000
--- a/www-client/firefox/firefox-101.0-r10.ebuild
+++ /dev/null
@@ -1,1282 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-FIREFOX_PATCHSET="firefox-101-patches-03j.tar.xz"
-
-LLVM_MAX_SLOT=14
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="ncurses,sqlite,ssl"
-
-WANT_AUTOCONF="2.1"
-
-VIRTUALX_REQUIRED="pgo"
-
-MOZ_ESR=
-
-MOZ_PV=${PV}
-MOZ_PV_SUFFIX=
-if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
-	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
-
-	# Convert the ebuild version to the upstream Mozilla version
-	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
-	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
-	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
-fi
-
-if [[ -n ${MOZ_ESR} ]] ; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_PN="${PN%-bin}"
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
-MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
-
-inherit autotools check-reqs desktop flag-o-matic gnome2-utils linux-info \
-	llvm multiprocessing pax-utils python-any-r1 toolchain-funcs \
-	virtualx xdg
-
-MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
-
-if [[ ${PV} == *_rc* ]] ; then
-	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
-fi
-
-PATCH_URIS=(
-	https://dev.gentoo.org/~{juippis,polynomial-c,whissi,slashbeast}/mozilla/patchsets/${FIREFOX_PATCHSET}
-)
-
-SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
-	${PATCH_URIS[@]}"
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="https://www.mozilla.com/firefox"
-
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-SLOT="rapid"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-
-IUSE="+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel"
-IUSE+=" jack libproxy lto +openh264 pgo pulseaudio sndio selinux"
-IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp"
-IUSE+=" wayland wifi"
-
-# Firefox-only IUSE
-IUSE+=" geckodriver +gmp-autoupdate screencast +X"
-
-REQUIRED_USE="debug? ( !system-av1 )
-	pgo? ( lto )
-	wayland? ( dbus )
-	wifi? ( dbus )"
-
-# Firefox-only REQUIRED_USE flags
-REQUIRED_USE+=" || ( X wayland )"
-REQUIRED_USE+=" pgo? ( X )"
-REQUIRED_USE+=" screencast? ( wayland )"
-
-BDEPEND="${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	>=dev-util/cbindgen-0.23.0
-	>=net-libs/nodejs-10.23.1
-	virtual/pkgconfig
-	>=virtual/rust-1.59.0
-	|| (
-		(
-			sys-devel/clang:14
-			sys-devel/llvm:14
-			clang? (
-				=sys-devel/lld-14*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-14*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:13
-			sys-devel/llvm:13
-			clang? (
-				=sys-devel/lld-13*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:12
-			sys-devel/llvm:12
-			clang? (
-				=sys-devel/lld-12*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] )
-			)
-		)
-	)
-	amd64? ( >=dev-lang/nasm-2.14 )
-	x86? ( >=dev-lang/nasm-2.14 )"
-
-COMMON_DEPEND="
-	dev-libs/glib:2
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/libffi:=
-	>=dev-libs/nss-3.78
-	>=dev-libs/nspr-4.32
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/mesa
-	media-video/ffmpeg
-	sys-libs/zlib
-	virtual/freedesktop-icon-theme
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/pango
-	x11-libs/pixman
-	dbus? (
-		dev-libs/dbus-glib
-		sys-apps/dbus
-	)
-	jack? ( virtual/jack )
-	libproxy? ( net-libs/libproxy )
-	selinux? ( sec-policy/selinux-mozilla )
-	sndio? ( media-sound/sndio )
-	screencast? ( media-video/pipewire:= )
-	system-av1? (
-		>=media-libs/dav1d-0.9.3:=
-		>=media-libs/libaom-1.0.0:=
-	)
-	system-harfbuzz? (
-		>=media-gfx/graphite2-1.3.13
-		>=media-libs/harfbuzz-2.8.1:0=
-	)
-	system-icu? ( >=dev-libs/icu-71.1:= )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
-	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
-	system-png? ( >=media-libs/libpng-1.6.35:0=[apng] )
-	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
-	wayland? (
-		x11-libs/gtk+:3[wayland]
-		x11-libs/libdrm
-		x11-libs/libxkbcommon[wayland]
-	)
-	wifi? (
-		kernel_linux? (
-			dev-libs/dbus-glib
-			net-misc/networkmanager
-			sys-apps/dbus
-		)
-	)
-	X? (
-		virtual/opengl
-		x11-libs/cairo[X]
-		x11-libs/gtk+:3[X]
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libxkbcommon[X]
-		x11-libs/libXrandr
-		x11-libs/libXtst
-		x11-libs/libxcb:=
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	!www-client/firefox:0
-	!www-client/firefox:esr
-	jack? ( virtual/jack )
-	openh264? ( media-libs/openh264:*[plugin] )
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4
-		)
-	)
-	selinux? ( sec-policy/selinux-mozilla )"
-
-DEPEND="${COMMON_DEPEND}
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4[sdk]
-		)
-	)
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-	)"
-
-S="${WORKDIR}/${PN}-${PV%_*}"
-
-# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
-# overridden in the enviromnent (advanced hackers only)
-if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
-	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
-fi
-
-llvm_check_deps() {
-	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
-		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	if use clang ; then
-		if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
-		if use pgo ; then
-			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
-				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-				return 1
-			fi
-		fi
-	fi
-
-	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
-}
-
-MOZ_LANGS=(
-	af ar ast be bg br ca cak cs cy da de dsb
-	el en-CA en-GB en-US es-AR es-ES et eu
-	fi fr fy-NL ga-IE gd gl he hr hsb hu
-	id is it ja ka kab kk ko lt lv ms nb-NO nl nn-NO
-	pa-IN pl pt-BR pt-PT rm ro ru
-	sk sl sq sr sv-SE th tr uk uz vi zh-CN zh-TW
-)
-
-# Firefox-only LANGS
-MOZ_LANGS+=( ach )
-MOZ_LANGS+=( an )
-MOZ_LANGS+=( az )
-MOZ_LANGS+=( bn )
-MOZ_LANGS+=( bs )
-MOZ_LANGS+=( ca-valencia )
-MOZ_LANGS+=( eo )
-MOZ_LANGS+=( es-CL )
-MOZ_LANGS+=( es-MX )
-MOZ_LANGS+=( fa )
-MOZ_LANGS+=( ff )
-MOZ_LANGS+=( gn )
-MOZ_LANGS+=( gu-IN )
-MOZ_LANGS+=( hi-IN )
-MOZ_LANGS+=( hy-AM )
-MOZ_LANGS+=( ia )
-MOZ_LANGS+=( km )
-MOZ_LANGS+=( kn )
-MOZ_LANGS+=( lij )
-MOZ_LANGS+=( mk )
-MOZ_LANGS+=( mr )
-MOZ_LANGS+=( my )
-MOZ_LANGS+=( ne-NP )
-MOZ_LANGS+=( oc )
-MOZ_LANGS+=( sco )
-MOZ_LANGS+=( si )
-MOZ_LANGS+=( son )
-MOZ_LANGS+=( szl )
-MOZ_LANGS+=( ta )
-MOZ_LANGS+=( te )
-MOZ_LANGS+=( tl )
-MOZ_LANGS+=( trs )
-MOZ_LANGS+=( ur )
-MOZ_LANGS+=( xh )
-
-mozilla_set_globals() {
-	# https://bugs.gentoo.org/587334
-	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
-		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
-	)
-
-	local lang xflag
-	for lang in "${MOZ_LANGS[@]}" ; do
-		# en and en_US are handled internally
-		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
-			continue
-		fi
-
-		# strip region subtag if $lang is in the list
-		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
-			xflag=${lang%%-*}
-		else
-			xflag=${lang}
-		fi
-
-		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
-		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
-		SRC_URI+=" )"
-		IUSE+=" l10n_${xflag/[_@]/-}"
-	done
-}
-mozilla_set_globals
-
-moz_clear_vendor_checksums() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -ne 1 ]] ; then
-		die "${FUNCNAME} requires exact one argument"
-	fi
-
-	einfo "Clearing cargo checksums for ${1} ..."
-
-	sed -i \
-		-e 's/\("files":{\)[^}]*/\1/' \
-		"${S}"/third_party/rust/${1}/.cargo-checksum.json \
-		|| die
-}
-
-moz_install_xpi() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local DESTDIR=${1}
-	shift
-
-	insinto "${DESTDIR}"
-
-	local emid xpi_file xpi_tmp_dir
-	for xpi_file in "${@}" ; do
-		emid=
-		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
-
-		# Unpack XPI
-		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
-
-		# Determine extension ID
-		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
-			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
-		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
-			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
-		else
-			die "failed to determine extension id"
-		fi
-
-		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
-		newins "${xpi_file}" "${emid}.xpi"
-	done
-}
-
-mozconfig_add_options_ac() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_add_options_mk() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_use_enable() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_enable "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-mozconfig_use_with() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_with "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has usersandbox $FEATURES ; then
-				die "You must enable usersandbox as X server can not run as root!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6600M"
-		fi
-
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has userpriv ${FEATURES} ; then
-				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6400M"
-		fi
-
-		check-reqs_pkg_setup
-
-		llvm_pkg_setup
-
-		if use clang && use lto ; then
-			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
-			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
-			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
-
-			local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
-			[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
-			[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
-
-			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
-				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
-				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
-				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
-				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
-				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
-				eerror "  - Rebuild lld with llvm that was used to build rust (may need to rebuild the whole "
-				eerror "    llvm/clang/lld/rust chain depending on your @world updates)"
-				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
-			fi
-		fi
-
-		if ! use clang && [[ $(gcc-major-version) -eq 11 ]] \
-			&& ! has_version -b ">sys-devel/gcc-11.1.0:11" ; then
-			# bug 792705
-			eerror "Using GCC 11 to compile firefox is currently known to be broken (see bug #792705)."
-			die "Set USE=clang or select <gcc-11 to build ${CATEGORY}/${P}."
-		fi
-
-		python-any-r1_pkg_setup
-
-		# Avoid PGO profiling problems due to enviroment leakage
-		# These should *always* be cleaned up anyway
-		unset \
-			DBUS_SESSION_BUS_ADDRESS \
-			DISPLAY \
-			ORBIT_SOCKETDIR \
-			SESSION_MANAGER \
-			XAUTHORITY \
-			XDG_CACHE_HOME \
-			XDG_SESSION_COOKIE
-
-		# Build system is using /proc/self/oom_score_adj, bug #604394
-		addpredict /proc/self/oom_score_adj
-
-		if use pgo ; then
-			# Allow access to GPU during PGO run
-			local ati_cards mesa_cards nvidia_cards render_cards
-			shopt -s nullglob
-
-			ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-			if [[ -n "${ati_cards}" ]] ; then
-				addpredict "${ati_cards}"
-			fi
-
-			mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-			if [[ -n "${mesa_cards}" ]] ; then
-				addpredict "${mesa_cards}"
-			fi
-
-			nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-			if [[ -n "${nvidia_cards}" ]] ; then
-				addpredict "${nvidia_cards}"
-			fi
-
-			render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-			if [[ -n "${render_cards}" ]] ; then
-				addpredict "${render_cards}"
-			fi
-
-			shopt -u nullglob
-		fi
-
-		if ! mountpoint -q /dev/shm ; then
-			# If /dev/shm is not available, configure is known to fail with
-			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
-			ewarn "/dev/shm is not mounted -- expect build failures!"
-		fi
-
-		# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
-			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
-		fi
-
-		if [[ -z "${MOZ_API_KEY_LOCATION+set}" ]] ; then
-			MOZ_API_KEY_LOCATION="AIzaSyB2h2OuRgGaPicUgy5N-5hsZqiPW6sH3n_rptiQ"
-		fi
-
-		# Mozilla API keys (see https://location.services.mozilla.com/api)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_MOZILLA+set}" ]] ; then
-			MOZ_API_KEY_MOZILLA="edb3d487-3a84-46m0ap1e3-9dfd-92b5efaaa005"
-		fi
-
-		# Ensure we use C locale when building, bug #746215
-		export LC_ALL=C
-	fi
-
-	CONFIG_CHECK="~SECCOMP"
-	WARNING_SECCOMP="CONFIG_SECCOMP not set! This system will be unable to play DRM-protected content."
-	linux-info_pkg_setup
-}
-
-src_unpack() {
-	local _lp_dir="${WORKDIR}/language_packs"
-	local _src_file
-
-	if [[ ! -d "${_lp_dir}" ]] ; then
-		mkdir "${_lp_dir}" || die
-	fi
-
-	for _src_file in ${A} ; do
-		if [[ ${_src_file} == *.xpi ]]; then
-			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
-		else
-			unpack ${_src_file}
-		fi
-	done
-}
-
-src_prepare() {
-	use lto && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
-	eapply "${WORKDIR}/firefox-patches"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	# Make cargo respect MAKEOPTS
-	export CARGO_BUILD_JOBS="$(makeopts_jobs)"
-
-	# Make LTO respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/build/moz.configure/lto-pgo.configure \
-		|| die "sed failed to set num_cores"
-
-	# Make ICU respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/intl/icu_sources_data.py \
-		|| die "sed failed to set num_cores"
-
-	# sed-in toolchain prefix
-	sed -i \
-		-e "s/objdump/${CHOST}-objdump/" \
-		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py \
-		|| die "sed failed to set toolchain prefix"
-
-	sed -i \
-		-e 's/ccache_stats = None/return None/' \
-		"${S}"/python/mozbuild/mozbuild/controller/building.py \
-		|| die "sed failed to disable ccache stats call"
-
-	einfo "Removing pre-built binaries ..."
-	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
-
-	# Clearing checksums where we have applied patches
-	moz_clear_vendor_checksums target-lexicon-0.9.0
-
-	# Create build dir
-	BUILD_DIR="${WORKDIR}/${PN}_build"
-	mkdir -p "${BUILD_DIR}" || die
-
-	# Write API keys to disk
-	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
-	echo -n "${MOZ_API_KEY_LOCATION//gGaPi/}" > "${S}"/api-location.key || die
-	echo -n "${MOZ_API_KEY_MOZILLA//m0ap1/}" > "${S}"/api-mozilla.key || die
-
-	xdg_environment_reset
-}
-
-src_configure() {
-	# Show flags set at the beginning
-	einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Current CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	local have_switched_compiler=
-	if use clang && ! tc-is-clang ; then
-		# Force clang
-		einfo "Enforcing the use of clang due to USE=clang ..."
-		have_switched_compiler=yes
-		AR=llvm-ar
-		AS=llvm-as
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		NM=llvm-nm
-		RANLIB=llvm-ranlib
-	elif ! use clang && ! tc-is-gcc ; then
-		# Force gcc
-		have_switched_compiler=yes
-		einfo "Enforcing the use of gcc due to USE=-clang ..."
-		AR=gcc-ar
-		CC=${CHOST}-gcc
-		CXX=${CHOST}-g++
-		NM=gcc-nm
-		RANLIB=gcc-ranlib
-	fi
-
-	if [[ -n "${have_switched_compiler}" ]] ; then
-		# Because we switched active compiler we have to ensure
-		# that no unsupported flags are set
-		strip-unsupported-flags
-	fi
-
-	# Ensure we use correct toolchain
-	export HOST_CC="$(tc-getBUILD_CC)"
-	export HOST_CXX="$(tc-getBUILD_CXX)"
-	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
-	# Pass the correct toolchain paths through cbindgen
-	if tc-is-cross-compiler ; then
-		export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
-	fi
-
-	# Set MOZILLA_FIVE_HOME
-	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-	# python/mach/mach/mixin/process.py fails to detect SHELL
-	export SHELL="${EPREFIX}/bin/bash"
-
-	# Set state path
-	export MOZBUILD_STATE_PATH="${BUILD_DIR}"
-
-	# Set MOZCONFIG
-	export MOZCONFIG="${S}/.mozconfig"
-
-	# Initialize MOZCONFIG
-	mozconfig_add_options_ac '' --enable-application=browser
-
-	# Set Gentoo defaults
-	export MOZILLA_OFFICIAL=1
-
-	mozconfig_add_options_ac 'Gentoo default' \
-		--allow-addon-sideload \
-		--disable-cargo-incremental \
-		--disable-crashreporter \
-		--disable-gpsd \
-		--disable-install-strip \
-		--disable-parental-controls \
-		--disable-strip \
-		--disable-updater \
-		--enable-negotiateauth \
-		--enable-new-pass-manager \
-		--enable-official-branding \
-		--enable-release \
-		--enable-system-ffi \
-		--enable-system-pixman \
-		--host="${CBUILD:-${CHOST}}" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--prefix="${EPREFIX}/usr" \
-		--target="${CHOST}" \
-		--without-ccache \
-		--without-wasm-sandboxed-libraries \
-		--with-intl-api \
-		--with-libclang-path="$(llvm-config --libdir)" \
-		--with-system-nspr \
-		--with-system-nss \
-		--with-system-zlib \
-		--with-toolchain-prefix="${CHOST}-" \
-		--with-unsigned-addon-scopes=app,system \
-		--x-includes="${ESYSROOT}/usr/include" \
-		--x-libraries="${ESYSROOT}/usr/$(get_libdir)"
-
-	# Set update channel
-	local update_channel=release
-	[[ -n ${MOZ_ESR} ]] && update_channel=esr
-	mozconfig_add_options_ac '' --update-channel=${update_channel}
-
-	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
-		mozconfig_add_options_ac '' --enable-rust-simd
-	fi
-
-	# For future keywording: This is currently (97.0) only supported on:
-	# amd64, arm, arm64 & x86.
-	# Might want to flip the logic around if Firefox is to support more arches.
-	if use ppc64; then
-		mozconfig_add_options_ac '' --disable-sandbox
-	else
-		mozconfig_add_options_ac '' --enable-sandbox
-	fi
-
-	if [[ -s "${S}/api-google.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
-	else
-		einfo "Building without Google API key ..."
-	fi
-
-	if [[ -s "${S}/api-location.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-location-service-api-keyfile="${S}/api-location.key"
-	else
-		einfo "Building without Location API key ..."
-	fi
-
-	if [[ -s "${S}/api-mozilla.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-mozilla-api-keyfile="${S}/api-mozilla.key"
-	else
-		einfo "Building without Mozilla API key ..."
-	fi
-
-	mozconfig_use_with system-av1
-	mozconfig_use_with system-harfbuzz
-	mozconfig_use_with system-harfbuzz system-graphite2
-	mozconfig_use_with system-icu
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-libevent
-	mozconfig_use_with system-libvpx
-	mozconfig_use_with system-png
-	mozconfig_use_with system-webp
-
-	mozconfig_use_enable dbus
-	mozconfig_use_enable libproxy
-
-	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
-
-	mozconfig_use_enable geckodriver
-
-	if use hardened ; then
-		mozconfig_add_options_ac "+hardened" --enable-hardening
-		append-ldflags "-Wl,-z,relro -Wl,-z,now"
-	fi
-
-	local myaudiobackends=""
-	use jack && myaudiobackends+="jack,"
-	use sndio && myaudiobackends+="sndio,"
-	use pulseaudio && myaudiobackends+="pulseaudio,"
-	! use pulseaudio && myaudiobackends+="alsa,"
-
-	mozconfig_add_options_ac '--enable-audio-backends' --enable-audio-backends="${myaudiobackends::-1}"
-
-	mozconfig_use_enable wifi necko-wifi
-
-	if use X && use wayland ; then
-		mozconfig_add_options_ac '+x11+wayland' --enable-default-toolkit=cairo-gtk3-x11-wayland
-	elif ! use X && use wayland ; then
-		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland-only
-	else
-		mozconfig_add_options_ac '+x11' --enable-default-toolkit=cairo-gtk3
-	fi
-
-	if use lto ; then
-		if use clang ; then
-			# Upstream only supports lld when using clang
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
-
-			mozconfig_add_options_ac '+lto' --enable-lto=cross
-
-		else
-			# ThinLTO is currently broken, see bmo#1644409
-			mozconfig_add_options_ac '+lto' --enable-lto=full
-			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
-		fi
-
-		if use pgo ; then
-			mozconfig_add_options_ac '+pgo' MOZ_PGO=1
-
-			if use clang ; then
-				# Used in build/pgo/profileserver.py
-				export LLVM_PROFDATA="llvm-profdata"
-			fi
-		fi
-	else
-		# Avoid auto-magic on linker
-		if use clang ; then
-			# This is upstream's default
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
-		else
-			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
-		fi
-	fi
-
-	# LTO flag was handled via configure
-	filter-flags '-flto*'
-
-	mozconfig_use_enable debug
-	if use debug ; then
-		mozconfig_add_options_ac '+debug' --disable-optimize
-	else
-		if is-flag '-g*' ; then
-			if use clang ; then
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
-			else
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
-			fi
-		else
-			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
-		fi
-
-		if is-flag '-O0' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
-		elif is-flag '-O4' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
-		elif is-flag '-O3' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
-		elif is-flag '-O1' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
-		elif is-flag '-Os' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
-		else
-			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
-		fi
-	fi
-
-	# Debug flag was handled via configure
-	filter-flags '-g*'
-
-	# Optimization flag was handled via configure
-	filter-flags '-O*'
-
-	# Modifications to better support ARM, bug #553364
-	if use cpu_flags_arm_neon ; then
-		mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
-
-		if ! tc-is-clang ; then
-			# thumb options aren't supported when using clang, bug 666966
-			mozconfig_add_options_ac '+cpu_flags_arm_neon' \
-				--with-thumb=yes \
-				--with-thumb-interwork=no
-		fi
-	fi
-
-	if [[ ${CHOST} == armv*h* ]] ; then
-		mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
-
-		if ! use system-libvpx ; then
-			sed -i \
-				-e "s|softfp|hard|" \
-				"${S}"/media/libvpx/moz.build \
-				|| die
-		fi
-	fi
-
-	if use clang ; then
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
-		# toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
-		local disable_elf_hack=
-		if use amd64 ; then
-			disable_elf_hack=yes
-		elif use x86 ; then
-			disable_elf_hack=yes
-		elif use arm ; then
-			disable_elf_hack=yes
-		fi
-
-		if [[ -n ${disable_elf_hack} ]] ; then
-			mozconfig_add_options_ac 'elf-hack is broken when using Clang' --disable-elf-hack
-		fi
-	elif tc-is-gcc ; then
-		if ver_test $(gcc-fullversion) -ge 10 ; then
-			einfo "Forcing -fno-tree-loop-vectorize to workaround GCC bug, see bug 758446 ..."
-			append-cxxflags -fno-tree-loop-vectorize
-		fi
-	fi
-
-	# Additional ARCH support
-	case "${ARCH}" in
-		arm)
-			# Reduce the memory requirements for linking
-			if use clang ; then
-				# Nothing to do
-				:;
-			elif use lto ; then
-				append-ldflags -Wl,--no-keep-memory
-			else
-				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
-			fi
-			;;
-	esac
-
-	if ! use elibc_glibc ; then
-		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
-	fi
-
-	# Allow elfhack to work in combination with unstripped binaries
-	# when they would normally be larger than 2GiB.
-	append-ldflags "-Wl,--compress-debug-sections=zlib"
-
-	# Make revdep-rebuild.sh happy; Also required for musl
-	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
-
-	# Pass $MAKEOPTS to build system
-	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
-
-	# Use system's Python environment
-	PIP_NETWORK_INSTALL_RESTRICTED_VIRTUALENVS=mach
-
-	if use system-python-libs; then
-		export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="system"
-	else
-		export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="none"
-	fi
-
-	# Disable notification when build system has finished
-	export MOZ_NOSPAM=1
-
-	# Portage sets XARGS environment variable to "xargs -r" by default which
-	# breaks build system's check_prog() function which doesn't support arguments
-	mozconfig_add_options_ac 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
-
-	# Set build dir
-	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
-
-	# Show flags we will use
-	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	# Handle EXTRA_CONF and show summary
-	local ac opt hash reason
-
-	# Apply EXTRA_ECONF entries to $MOZCONFIG
-	if [[ -n ${EXTRA_ECONF} ]] ; then
-		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
-		for opt in "${ac[@]}"; do
-			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
-		done
-	fi
-
-	echo
-	echo "=========================================================="
-	echo "Building ${PF} with the following configuration"
-	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
-		[[ -z ${hash} || ${hash} == \# ]] \
-			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
-		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
-	done
-	echo "=========================================================="
-	echo
-
-	./mach configure || die
-}
-
-src_compile() {
-	local virtx_cmd=
-
-	if use pgo ; then
-		virtx_cmd=virtx
-
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		addpredict /root
-	fi
-
-	if ! use X && use wayland; then
-		local -x GDK_BACKEND=wayland
-	else
-		local -x GDK_BACKEND=x11
-	fi
-
-	${virtx_cmd} ./mach build --verbose \
-		|| die
-}
-
-src_install() {
-	# xpcshell is getting called during install
-	pax-mark m \
-		"${BUILD_DIR}"/dist/bin/xpcshell \
-		"${BUILD_DIR}"/dist/bin/${PN} \
-		"${BUILD_DIR}"/dist/bin/plugin-container
-
-	DESTDIR="${D}" ./mach install || die
-
-	# Upstream cannot ship symlink but we can (bmo#658850)
-	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
-	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
-
-	# Don't install llvm-symbolizer from sys-devel/llvm package
-	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
-		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
-	fi
-
-	# Install policy (currently only used to disable application updates)
-	insinto "${MOZILLA_FIVE_HOME}/distribution"
-	newins "${FILESDIR}"/distribution.ini distribution.ini
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Install system-wide preferences
-	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
-	insinto "${PREFS_DIR}"
-	newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js
-
-	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"
-
-	# Set dictionary path to use system hunspell
-	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
-	pref("spellchecker.dictionary_path",       "${EPREFIX}/usr/share/myspell");
-	EOF
-
-	# Force hwaccel prefs if USE=hwaccel is enabled
-	if use hwaccel ; then
-		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-r1 \
-		>>"${GENTOO_PREFS}" \
-		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
-	fi
-
-	if ! use gmp-autoupdate ; then
-		local plugin
-		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
-			einfo "Disabling auto-update for ${plugin} plugin ..."
-			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
-			pref("media.${plugin}.autoupdate",   false);
-			EOF
-		done
-	fi
-
-	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
-	if use system-harfbuzz ; then
-		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
-		sticky_pref("gfx.font_rendering.graphite.enabled", true);
-		EOF
-	fi
-
-	# Install language packs
-	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
-	if [[ -n "${langpacks}" ]] ; then
-		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
-	fi
-
-	# Install geckodriver
-	if use geckodriver ; then
-		einfo "Installing geckodriver into ${ED}${MOZILLA_FIVE_HOME} ..."
-		pax-mark m "${BUILD_DIR}"/dist/bin/geckodriver
-		exeinto "${MOZILLA_FIVE_HOME}"
-		doexe "${BUILD_DIR}"/dist/bin/geckodriver
-
-		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
-	fi
-
-	# Install icons
-	local icon_srcdir="${S}/browser/branding/official"
-	local icon_symbolic_file="${FILESDIR}/icon/firefox-symbolic.svg"
-
-	insinto /usr/share/icons/hicolor/symbolic/apps
-	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
-
-	local icon size
-	for icon in "${icon_srcdir}"/default*.png ; do
-		size=${icon%.png}
-		size=${size##*/default}
-
-		if [[ ${size} -eq 48 ]] ; then
-			newicon "${icon}" ${PN}.png
-		fi
-
-		newicon -s ${size} "${icon}" ${PN}.png
-	done
-
-	# Install menu
-	local app_name="Mozilla ${MOZ_PN^}"
-	local desktop_file="${FILESDIR}/icon/${PN}-r3.desktop"
-	local desktop_filename="${PN}.desktop"
-	local exec_command="${PN}"
-	local icon="${PN}"
-	local use_wayland="false"
-
-	if use wayland ; then
-		use_wayland="true"
-	fi
-
-	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
-
-	sed -i \
-		-e "s:@NAME@:${app_name}:" \
-		-e "s:@EXEC@:${exec_command}:" \
-		-e "s:@ICON@:${icon}:" \
-		"${WORKDIR}/${PN}.desktop-template" \
-		|| die
-
-	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
-
-	rm "${WORKDIR}/${PN}.desktop-template" || die
-
-	# Install wrapper script
-	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
-	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
-
-	# Update wrapper
-	sed -i \
-		-e "s:@PREFIX@:${EPREFIX}/usr:" \
-		-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
-		-e "s:@APULSELIB_DIR@:${apulselib}:" \
-		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
-		"${ED}/usr/bin/${PN}" \
-		|| die
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
-	# does not need to be forced into the LD_LIBRARY_PATH
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		einfo "APULSE found; Generating library symlinks for sound support ..."
-		local lib
-		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
-		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
-			# A quickpkg rolled by hand will grab symlinks as part of the package,
-			# so we need to avoid creating them if they already exist.
-			if [[ ! -L ${lib##*/} ]] ; then
-				ln -s "${lib}" ${lib##*/} || die
-			fi
-		done
-		popd &>/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! use gmp-autoupdate ; then
-		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
-		elog "installing into new profiles:"
-		local plugin
-		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
-			elog "\t ${plugin}"
-		done
-		elog
-	fi
-
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		elog "Apulse was detected at merge time on this system and so it will always be"
-		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
-		elog "media-sound/apulse."
-		elog
-	fi
-
-	local show_doh_information
-	local show_normandy_information
-	local show_shortcut_information
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		# New install; Tell user that DoH is disabled by default
-		show_doh_information=yes
-		show_normandy_information=yes
-		show_shortcut_information=no
-	else
-		local replacing_version
-		for replacing_version in ${REPLACING_VERSIONS} ; do
-			if ver_test "${replacing_version}" -lt 91.0 ; then
-				# Tell user that we no longer install a shortcut
-				# per supported display protocol
-				show_shortcut_information=yes
-			fi
-		done
-	fi
-
-	if [[ -n "${show_doh_information}" ]] ; then
-		elog
-		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
-		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
-		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
-		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
-		elog "(\"Off by choice\") by default."
-		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
-	fi
-
-	# bug 713782
-	if [[ -n "${show_normandy_information}" ]] ; then
-		elog
-		elog "Upstream operates a service named Normandy which allows Mozilla to"
-		elog "push changes for default settings or even install new add-ons remotely."
-		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
-		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
-		elog "concerns prevail, which is why we have switched off the use of this"
-		elog "service by default."
-		elog
-		elog "To re-enable this service set"
-		elog
-		elog "    app.normandy.enabled=true"
-		elog
-		elog "in about:config."
-	fi
-
-	if [[ -n "${show_shortcut_information}" ]] ; then
-		elog
-		elog "Since ${PN}-91.0 we no longer install multiple shortcuts for"
-		elog "each supported display protocol.  Instead we will only install"
-		elog "one generic Mozilla ${PN^} shortcut."
-		elog "If you still want to be able to select between running Mozilla ${PN^}"
-		elog "on X11 or Wayland, you have to re-create these shortcuts on your own."
-	fi
-
-	# bug 835078
-	if use hwaccel && has_version "x11-drivers/xf86-video-nouveau"; then
-		ewarn "You have nouveau drivers installed in your system and 'hwaccel' "
-		ewarn "enabled for Firefox. Nouveau / your GPU might not supported the "
-		ewarn "required EGL, so either disable 'hwaccel' or try the workaround "
-		ewarn "explained in https://bugs.gentoo.org/835078#c5 if Firefox crashes."
-	fi
-
-	elog
-	elog "Unfortunately Firefox-100.0 breaks compatibility with some sites using "
-	elog "useragent checks. To temporarily fix this, enter about:config and modify "
-	elog "network.http.useragent.forceVersion preference to \"99\"."
-	elog "Or install an addon to change your useragent."
-	elog "See: https://support.mozilla.org/en-US/kb/difficulties-opening-or-using-website-firefox-100"
-	elog
-}
diff --git a/www-client/firefox/firefox-101.0.1-r10.ebuild b/www-client/firefox/firefox-101.0.1-r10.ebuild
index dbeac617ed9b..0dee9d411efe 100644
--- a/www-client/firefox/firefox-101.0.1-r10.ebuild
+++ b/www-client/firefox/firefox-101.0.1-r10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="8"
 
-FIREFOX_PATCHSET="firefox-101-patches-04jwl.tar.xz"
+FIREFOX_PATCHSET="firefox-101-patches-05jwl.tar.xz"
 
 LLVM_MAX_SLOT=14
 
diff --git a/www-client/firefox/firefox-101.0.1.ebuild b/www-client/firefox/firefox-101.0.1.ebuild
index 86413b7f9f78..e4e4ad10cb39 100644
--- a/www-client/firefox/firefox-101.0.1.ebuild
+++ b/www-client/firefox/firefox-101.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="8"
 
-FIREFOX_PATCHSET="firefox-101-patches-04j.tar.xz"
+FIREFOX_PATCHSET="firefox-101-patches-05j.tar.xz"
 
 LLVM_MAX_SLOT=14
 
diff --git a/www-client/firefox/firefox-101.0.ebuild b/www-client/firefox/firefox-101.0.ebuild
deleted file mode 100644
index 7a8a1e28e9be..000000000000
--- a/www-client/firefox/firefox-101.0.ebuild
+++ /dev/null
@@ -1,1266 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-FIREFOX_PATCHSET="firefox-101-patches-01j.tar.xz"
-
-LLVM_MAX_SLOT=14
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="ncurses,sqlite,ssl"
-
-WANT_AUTOCONF="2.1"
-
-VIRTUALX_REQUIRED="pgo"
-
-MOZ_ESR=
-
-MOZ_PV=${PV}
-MOZ_PV_SUFFIX=
-if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
-	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
-
-	# Convert the ebuild version to the upstream Mozilla version
-	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
-	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
-	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
-fi
-
-if [[ -n ${MOZ_ESR} ]] ; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_PN="${PN%-bin}"
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
-MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
-
-inherit autotools check-reqs desktop flag-o-matic gnome2-utils linux-info \
-	llvm multiprocessing pax-utils python-any-r1 toolchain-funcs \
-	virtualx xdg
-
-MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
-
-if [[ ${PV} == *_rc* ]] ; then
-	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
-fi
-
-PATCH_URIS=(
-	https://dev.gentoo.org/~{juippis,polynomial-c,whissi,slashbeast}/mozilla/patchsets/${FIREFOX_PATCHSET}
-)
-
-SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
-	${PATCH_URIS[@]}"
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="https://www.mozilla.com/firefox"
-
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-SLOT="rapid"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-
-IUSE="+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel"
-IUSE+=" jack libproxy lto +openh264 pgo pulseaudio sndio selinux"
-IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp"
-IUSE+=" wayland wifi"
-
-# Firefox-only IUSE
-IUSE+=" geckodriver +gmp-autoupdate screencast"
-
-REQUIRED_USE="debug? ( !system-av1 )
-	pgo? ( lto )
-	wayland? ( dbus )
-	wifi? ( dbus )"
-
-# Firefox-only REQUIRED_USE flags
-REQUIRED_USE+=" screencast? ( wayland )"
-
-BDEPEND="${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	>=dev-util/cbindgen-0.23.0
-	>=net-libs/nodejs-10.23.1
-	virtual/pkgconfig
-	>=virtual/rust-1.59.0
-	|| (
-		(
-			sys-devel/clang:14
-			sys-devel/llvm:14
-			clang? (
-				=sys-devel/lld-14*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-14*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:13
-			sys-devel/llvm:13
-			clang? (
-				=sys-devel/lld-13*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:12
-			sys-devel/llvm:12
-			clang? (
-				=sys-devel/lld-12*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] )
-			)
-		)
-	)
-	amd64? ( >=dev-lang/nasm-2.14 )
-	x86? ( >=dev-lang/nasm-2.14 )"
-
-COMMON_DEPEND="
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/libffi:=
-	>=dev-libs/nss-3.78
-	>=dev-libs/nspr-4.32
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/mesa
-	media-video/ffmpeg
-	sys-libs/zlib
-	virtual/freedesktop-icon-theme
-	x11-libs/cairo[X]
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3[X]
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libxcb:=
-	x11-libs/pango
-	x11-libs/pixman
-	dbus? (
-		sys-apps/dbus
-		dev-libs/dbus-glib
-	)
-	jack? ( virtual/jack )
-	libproxy? ( net-libs/libproxy )
-	screencast? ( media-video/pipewire:= )
-	selinux? ( sec-policy/selinux-mozilla )
-	sndio? ( media-sound/sndio )
-	system-av1? (
-		>=media-libs/dav1d-0.9.3:=
-		>=media-libs/libaom-1.0.0:=
-	)
-	system-harfbuzz? (
-		>=media-gfx/graphite2-1.3.13
-		>=media-libs/harfbuzz-2.8.1:0=
-	)
-	system-icu? ( >=dev-libs/icu-71.1:= )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
-	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
-	system-png? ( >=media-libs/libpng-1.6.35:0=[apng] )
-	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
-	wifi? (
-		kernel_linux? (
-			dev-libs/dbus-glib
-			net-misc/networkmanager
-			sys-apps/dbus
-		)
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	!www-client/firefox:0
-	!www-client/firefox:esr
-	jack? ( virtual/jack )
-	openh264? ( media-libs/openh264:*[plugin] )
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4
-		)
-	)
-	selinux? ( sec-policy/selinux-mozilla )"
-
-DEPEND="${COMMON_DEPEND}
-	x11-libs/libICE
-	x11-libs/libSM
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4[sdk]
-		)
-	)
-	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
-	amd64? ( virtual/opengl )
-	x86? ( virtual/opengl )"
-
-S="${WORKDIR}/${PN}-${PV%_*}"
-
-# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
-# overridden in the enviromnent (advanced hackers only)
-if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
-	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
-fi
-
-llvm_check_deps() {
-	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
-		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	if use clang ; then
-		if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
-		if use pgo ; then
-			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
-				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-				return 1
-			fi
-		fi
-	fi
-
-	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
-}
-
-MOZ_LANGS=(
-	af ar ast be bg br ca cak cs cy da de dsb
-	el en-CA en-GB en-US es-AR es-ES et eu
-	fi fr fy-NL ga-IE gd gl he hr hsb hu
-	id is it ja ka kab kk ko lt lv ms nb-NO nl nn-NO
-	pa-IN pl pt-BR pt-PT rm ro ru
-	sk sl sq sr sv-SE th tr uk uz vi zh-CN zh-TW
-)
-
-# Firefox-only LANGS
-MOZ_LANGS+=( ach )
-MOZ_LANGS+=( an )
-MOZ_LANGS+=( az )
-MOZ_LANGS+=( bn )
-MOZ_LANGS+=( bs )
-MOZ_LANGS+=( ca-valencia )
-MOZ_LANGS+=( eo )
-MOZ_LANGS+=( es-CL )
-MOZ_LANGS+=( es-MX )
-MOZ_LANGS+=( fa )
-MOZ_LANGS+=( ff )
-MOZ_LANGS+=( gn )
-MOZ_LANGS+=( gu-IN )
-MOZ_LANGS+=( hi-IN )
-MOZ_LANGS+=( hy-AM )
-MOZ_LANGS+=( ia )
-MOZ_LANGS+=( km )
-MOZ_LANGS+=( kn )
-MOZ_LANGS+=( lij )
-MOZ_LANGS+=( mk )
-MOZ_LANGS+=( mr )
-MOZ_LANGS+=( my )
-MOZ_LANGS+=( ne-NP )
-MOZ_LANGS+=( oc )
-MOZ_LANGS+=( sco )
-MOZ_LANGS+=( si )
-MOZ_LANGS+=( son )
-MOZ_LANGS+=( szl )
-MOZ_LANGS+=( ta )
-MOZ_LANGS+=( te )
-MOZ_LANGS+=( tl )
-MOZ_LANGS+=( trs )
-MOZ_LANGS+=( ur )
-MOZ_LANGS+=( xh )
-
-mozilla_set_globals() {
-	# https://bugs.gentoo.org/587334
-	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
-		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
-	)
-
-	local lang xflag
-	for lang in "${MOZ_LANGS[@]}" ; do
-		# en and en_US are handled internally
-		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
-			continue
-		fi
-
-		# strip region subtag if $lang is in the list
-		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
-			xflag=${lang%%-*}
-		else
-			xflag=${lang}
-		fi
-
-		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
-		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
-		SRC_URI+=" )"
-		IUSE+=" l10n_${xflag/[_@]/-}"
-	done
-}
-mozilla_set_globals
-
-moz_clear_vendor_checksums() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -ne 1 ]] ; then
-		die "${FUNCNAME} requires exact one argument"
-	fi
-
-	einfo "Clearing cargo checksums for ${1} ..."
-
-	sed -i \
-		-e 's/\("files":{\)[^}]*/\1/' \
-		"${S}"/third_party/rust/${1}/.cargo-checksum.json \
-		|| die
-}
-
-moz_install_xpi() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local DESTDIR=${1}
-	shift
-
-	insinto "${DESTDIR}"
-
-	local emid xpi_file xpi_tmp_dir
-	for xpi_file in "${@}" ; do
-		emid=
-		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
-
-		# Unpack XPI
-		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
-
-		# Determine extension ID
-		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
-			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
-		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
-			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
-		else
-			die "failed to determine extension id"
-		fi
-
-		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
-		newins "${xpi_file}" "${emid}.xpi"
-	done
-}
-
-mozconfig_add_options_ac() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_add_options_mk() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_use_enable() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_enable "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-mozconfig_use_with() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_with "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has usersandbox $FEATURES ; then
-				die "You must enable usersandbox as X server can not run as root!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6600M"
-		fi
-
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has userpriv ${FEATURES} ; then
-				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6400M"
-		fi
-
-		check-reqs_pkg_setup
-
-		llvm_pkg_setup
-
-		if use clang && use lto ; then
-			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
-			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
-			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
-
-			local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
-			[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
-			[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
-
-			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
-				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
-				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
-				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
-				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
-				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
-				eerror "  - Rebuild lld with llvm that was used to build rust (may need to rebuild the whole "
-				eerror "    llvm/clang/lld/rust chain depending on your @world updates)"
-				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
-			fi
-		fi
-
-		if ! use clang && [[ $(gcc-major-version) -eq 11 ]] \
-			&& ! has_version -b ">sys-devel/gcc-11.1.0:11" ; then
-			# bug 792705
-			eerror "Using GCC 11 to compile firefox is currently known to be broken (see bug #792705)."
-			die "Set USE=clang or select <gcc-11 to build ${CATEGORY}/${P}."
-		fi
-
-		python-any-r1_pkg_setup
-
-		# Avoid PGO profiling problems due to enviroment leakage
-		# These should *always* be cleaned up anyway
-		unset \
-			DBUS_SESSION_BUS_ADDRESS \
-			DISPLAY \
-			ORBIT_SOCKETDIR \
-			SESSION_MANAGER \
-			XAUTHORITY \
-			XDG_CACHE_HOME \
-			XDG_SESSION_COOKIE
-
-		# Build system is using /proc/self/oom_score_adj, bug #604394
-		addpredict /proc/self/oom_score_adj
-
-		if use pgo ; then
-			# Allow access to GPU during PGO run
-			local ati_cards mesa_cards nvidia_cards render_cards
-			shopt -s nullglob
-
-			ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-			if [[ -n "${ati_cards}" ]] ; then
-				addpredict "${ati_cards}"
-			fi
-
-			mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-			if [[ -n "${mesa_cards}" ]] ; then
-				addpredict "${mesa_cards}"
-			fi
-
-			nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-			if [[ -n "${nvidia_cards}" ]] ; then
-				addpredict "${nvidia_cards}"
-			fi
-
-			render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-			if [[ -n "${render_cards}" ]] ; then
-				addpredict "${render_cards}"
-			fi
-
-			shopt -u nullglob
-		fi
-
-		if ! mountpoint -q /dev/shm ; then
-			# If /dev/shm is not available, configure is known to fail with
-			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
-			ewarn "/dev/shm is not mounted -- expect build failures!"
-		fi
-
-		# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
-			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
-		fi
-
-		if [[ -z "${MOZ_API_KEY_LOCATION+set}" ]] ; then
-			MOZ_API_KEY_LOCATION="AIzaSyB2h2OuRgGaPicUgy5N-5hsZqiPW6sH3n_rptiQ"
-		fi
-
-		# Mozilla API keys (see https://location.services.mozilla.com/api)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_MOZILLA+set}" ]] ; then
-			MOZ_API_KEY_MOZILLA="edb3d487-3a84-46m0ap1e3-9dfd-92b5efaaa005"
-		fi
-
-		# Ensure we use C locale when building, bug #746215
-		export LC_ALL=C
-	fi
-
-	CONFIG_CHECK="~SECCOMP"
-	WARNING_SECCOMP="CONFIG_SECCOMP not set! This system will be unable to play DRM-protected content."
-	linux-info_pkg_setup
-}
-
-src_unpack() {
-	local _lp_dir="${WORKDIR}/language_packs"
-	local _src_file
-
-	if [[ ! -d "${_lp_dir}" ]] ; then
-		mkdir "${_lp_dir}" || die
-	fi
-
-	for _src_file in ${A} ; do
-		if [[ ${_src_file} == *.xpi ]]; then
-			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
-		else
-			unpack ${_src_file}
-		fi
-	done
-}
-
-src_prepare() {
-	use lto && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
-	eapply "${WORKDIR}/firefox-patches"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	# Make cargo respect MAKEOPTS
-	export CARGO_BUILD_JOBS="$(makeopts_jobs)"
-
-	# Make LTO respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/build/moz.configure/lto-pgo.configure \
-		|| die "sed failed to set num_cores"
-
-	# Make ICU respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/intl/icu_sources_data.py \
-		|| die "sed failed to set num_cores"
-
-	# sed-in toolchain prefix
-	sed -i \
-		-e "s/objdump/${CHOST}-objdump/" \
-		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py \
-		|| die "sed failed to set toolchain prefix"
-
-	sed -i \
-		-e 's/ccache_stats = None/return None/' \
-		"${S}"/python/mozbuild/mozbuild/controller/building.py \
-		|| die "sed failed to disable ccache stats call"
-
-	einfo "Removing pre-built binaries ..."
-	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
-
-	# Clearing checksums where we have applied patches
-	moz_clear_vendor_checksums target-lexicon-0.9.0
-
-	# Create build dir
-	BUILD_DIR="${WORKDIR}/${PN}_build"
-	mkdir -p "${BUILD_DIR}" || die
-
-	# Write API keys to disk
-	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
-	echo -n "${MOZ_API_KEY_LOCATION//gGaPi/}" > "${S}"/api-location.key || die
-	echo -n "${MOZ_API_KEY_MOZILLA//m0ap1/}" > "${S}"/api-mozilla.key || die
-
-	xdg_environment_reset
-}
-
-src_configure() {
-	# Show flags set at the beginning
-	einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Current CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	local have_switched_compiler=
-	if use clang && ! tc-is-clang ; then
-		# Force clang
-		einfo "Enforcing the use of clang due to USE=clang ..."
-		have_switched_compiler=yes
-		AR=llvm-ar
-		AS=llvm-as
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		NM=llvm-nm
-		RANLIB=llvm-ranlib
-	elif ! use clang && ! tc-is-gcc ; then
-		# Force gcc
-		have_switched_compiler=yes
-		einfo "Enforcing the use of gcc due to USE=-clang ..."
-		AR=gcc-ar
-		CC=${CHOST}-gcc
-		CXX=${CHOST}-g++
-		NM=gcc-nm
-		RANLIB=gcc-ranlib
-	fi
-
-	if [[ -n "${have_switched_compiler}" ]] ; then
-		# Because we switched active compiler we have to ensure
-		# that no unsupported flags are set
-		strip-unsupported-flags
-	fi
-
-	# Ensure we use correct toolchain
-	export HOST_CC="$(tc-getBUILD_CC)"
-	export HOST_CXX="$(tc-getBUILD_CXX)"
-	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
-	# Pass the correct toolchain paths through cbindgen
-	if tc-is-cross-compiler ; then
-		export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
-	fi
-
-	# Set MOZILLA_FIVE_HOME
-	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-	# python/mach/mach/mixin/process.py fails to detect SHELL
-	export SHELL="${EPREFIX}/bin/bash"
-
-	# Set state path
-	export MOZBUILD_STATE_PATH="${BUILD_DIR}"
-
-	# Set MOZCONFIG
-	export MOZCONFIG="${S}/.mozconfig"
-
-	# Initialize MOZCONFIG
-	mozconfig_add_options_ac '' --enable-application=browser
-
-	# Set Gentoo defaults
-	export MOZILLA_OFFICIAL=1
-
-	mozconfig_add_options_ac 'Gentoo default' \
-		--allow-addon-sideload \
-		--disable-cargo-incremental \
-		--disable-crashreporter \
-		--disable-gpsd \
-		--disable-install-strip \
-		--disable-parental-controls \
-		--disable-strip \
-		--disable-updater \
-		--enable-negotiateauth \
-		--enable-new-pass-manager \
-		--enable-official-branding \
-		--enable-release \
-		--enable-system-ffi \
-		--enable-system-pixman \
-		--host="${CBUILD:-${CHOST}}" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--prefix="${EPREFIX}/usr" \
-		--target="${CHOST}" \
-		--without-ccache \
-		--without-wasm-sandboxed-libraries \
-		--with-intl-api \
-		--with-libclang-path="$(llvm-config --libdir)" \
-		--with-system-nspr \
-		--with-system-nss \
-		--with-system-zlib \
-		--with-toolchain-prefix="${CHOST}-" \
-		--with-unsigned-addon-scopes=app,system \
-		--x-includes="${ESYSROOT}/usr/include" \
-		--x-libraries="${ESYSROOT}/usr/$(get_libdir)"
-
-	# Set update channel
-	local update_channel=release
-	[[ -n ${MOZ_ESR} ]] && update_channel=esr
-	mozconfig_add_options_ac '' --update-channel=${update_channel}
-
-	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
-		mozconfig_add_options_ac '' --enable-rust-simd
-	fi
-
-	# For future keywording: This is currently (97.0) only supported on:
-	# amd64, arm, arm64 & x86.
-	# Might want to flip the logic around if Firefox is to support more arches.
-	if use ppc64; then
-		mozconfig_add_options_ac '' --disable-sandbox
-	else
-		mozconfig_add_options_ac '' --enable-sandbox
-	fi
-
-	if [[ -s "${S}/api-google.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
-	else
-		einfo "Building without Google API key ..."
-	fi
-
-	if [[ -s "${S}/api-location.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-location-service-api-keyfile="${S}/api-location.key"
-	else
-		einfo "Building without Location API key ..."
-	fi
-
-	if [[ -s "${S}/api-mozilla.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-mozilla-api-keyfile="${S}/api-mozilla.key"
-	else
-		einfo "Building without Mozilla API key ..."
-	fi
-
-	mozconfig_use_with system-av1
-	mozconfig_use_with system-harfbuzz
-	mozconfig_use_with system-harfbuzz system-graphite2
-	mozconfig_use_with system-icu
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-libevent
-	mozconfig_use_with system-libvpx
-	mozconfig_use_with system-png
-	mozconfig_use_with system-webp
-
-	mozconfig_use_enable dbus
-	mozconfig_use_enable libproxy
-
-	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
-
-	mozconfig_use_enable geckodriver
-
-	if use hardened ; then
-		mozconfig_add_options_ac "+hardened" --enable-hardening
-		append-ldflags "-Wl,-z,relro -Wl,-z,now"
-	fi
-
-	local myaudiobackends=""
-	use jack && myaudiobackends+="jack,"
-	use sndio && myaudiobackends+="sndio,"
-	use pulseaudio && myaudiobackends+="pulseaudio,"
-	! use pulseaudio && myaudiobackends+="alsa,"
-
-	mozconfig_add_options_ac '--enable-audio-backends' --enable-audio-backends="${myaudiobackends::-1}"
-
-	mozconfig_use_enable wifi necko-wifi
-
-	if use wayland ; then
-		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-x11-wayland
-	else
-		mozconfig_add_options_ac '' --enable-default-toolkit=cairo-gtk3
-	fi
-
-	if use lto ; then
-		if use clang ; then
-			# Upstream only supports lld when using clang
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
-
-			mozconfig_add_options_ac '+lto' --enable-lto=cross
-
-		else
-			# ThinLTO is currently broken, see bmo#1644409
-			mozconfig_add_options_ac '+lto' --enable-lto=full
-			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
-		fi
-
-		if use pgo ; then
-			mozconfig_add_options_ac '+pgo' MOZ_PGO=1
-
-			if use clang ; then
-				# Used in build/pgo/profileserver.py
-				export LLVM_PROFDATA="llvm-profdata"
-			fi
-		fi
-	else
-		# Avoid auto-magic on linker
-		if use clang ; then
-			# This is upstream's default
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
-		else
-			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
-		fi
-	fi
-
-	# LTO flag was handled via configure
-	filter-flags '-flto*'
-
-	mozconfig_use_enable debug
-	if use debug ; then
-		mozconfig_add_options_ac '+debug' --disable-optimize
-	else
-		if is-flag '-g*' ; then
-			if use clang ; then
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
-			else
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
-			fi
-		else
-			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
-		fi
-
-		if is-flag '-O0' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
-		elif is-flag '-O4' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
-		elif is-flag '-O3' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
-		elif is-flag '-O1' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
-		elif is-flag '-Os' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
-		else
-			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
-		fi
-	fi
-
-	# Debug flag was handled via configure
-	filter-flags '-g*'
-
-	# Optimization flag was handled via configure
-	filter-flags '-O*'
-
-	# Modifications to better support ARM, bug #553364
-	if use cpu_flags_arm_neon ; then
-		mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
-
-		if ! tc-is-clang ; then
-			# thumb options aren't supported when using clang, bug 666966
-			mozconfig_add_options_ac '+cpu_flags_arm_neon' \
-				--with-thumb=yes \
-				--with-thumb-interwork=no
-		fi
-	fi
-
-	if [[ ${CHOST} == armv*h* ]] ; then
-		mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
-
-		if ! use system-libvpx ; then
-			sed -i \
-				-e "s|softfp|hard|" \
-				"${S}"/media/libvpx/moz.build \
-				|| die
-		fi
-	fi
-
-	if use clang ; then
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
-		# toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
-		local disable_elf_hack=
-		if use amd64 ; then
-			disable_elf_hack=yes
-		elif use x86 ; then
-			disable_elf_hack=yes
-		elif use arm ; then
-			disable_elf_hack=yes
-		fi
-
-		if [[ -n ${disable_elf_hack} ]] ; then
-			mozconfig_add_options_ac 'elf-hack is broken when using Clang' --disable-elf-hack
-		fi
-	elif tc-is-gcc ; then
-		if ver_test $(gcc-fullversion) -ge 10 ; then
-			einfo "Forcing -fno-tree-loop-vectorize to workaround GCC bug, see bug 758446 ..."
-			append-cxxflags -fno-tree-loop-vectorize
-		fi
-	fi
-
-	# Additional ARCH support
-	case "${ARCH}" in
-		arm)
-			# Reduce the memory requirements for linking
-			if use clang ; then
-				# Nothing to do
-				:;
-			elif use lto ; then
-				append-ldflags -Wl,--no-keep-memory
-			else
-				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
-			fi
-			;;
-	esac
-
-	if ! use elibc_glibc ; then
-		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
-	fi
-
-	# Allow elfhack to work in combination with unstripped binaries
-	# when they would normally be larger than 2GiB.
-	append-ldflags "-Wl,--compress-debug-sections=zlib"
-
-	# Make revdep-rebuild.sh happy; Also required for musl
-	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
-
-	# Pass $MAKEOPTS to build system
-	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
-
-	# Use system's Python environment
-	PIP_NETWORK_INSTALL_RESTRICTED_VIRTUALENVS=mach
-
-	if use system-python-libs; then
-		export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="system"
-	else
-		export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="none"
-	fi
-
-	# Disable notification when build system has finished
-	export MOZ_NOSPAM=1
-
-	# Portage sets XARGS environment variable to "xargs -r" by default which
-	# breaks build system's check_prog() function which doesn't support arguments
-	mozconfig_add_options_ac 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
-
-	# Set build dir
-	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
-
-	# Show flags we will use
-	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	# Handle EXTRA_CONF and show summary
-	local ac opt hash reason
-
-	# Apply EXTRA_ECONF entries to $MOZCONFIG
-	if [[ -n ${EXTRA_ECONF} ]] ; then
-		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
-		for opt in "${ac[@]}"; do
-			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
-		done
-	fi
-
-	echo
-	echo "=========================================================="
-	echo "Building ${PF} with the following configuration"
-	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
-		[[ -z ${hash} || ${hash} == \# ]] \
-			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
-		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
-	done
-	echo "=========================================================="
-	echo
-
-	./mach configure || die
-}
-
-src_compile() {
-	local virtx_cmd=
-
-	if use pgo ; then
-		virtx_cmd=virtx
-
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		addpredict /root
-	fi
-
-	local -x GDK_BACKEND=x11
-
-	${virtx_cmd} ./mach build --verbose \
-		|| die
-}
-
-src_install() {
-	# xpcshell is getting called during install
-	pax-mark m \
-		"${BUILD_DIR}"/dist/bin/xpcshell \
-		"${BUILD_DIR}"/dist/bin/${PN} \
-		"${BUILD_DIR}"/dist/bin/plugin-container
-
-	DESTDIR="${D}" ./mach install || die
-
-	# Upstream cannot ship symlink but we can (bmo#658850)
-	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
-	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
-
-	# Don't install llvm-symbolizer from sys-devel/llvm package
-	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
-		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
-	fi
-
-	# Install policy (currently only used to disable application updates)
-	insinto "${MOZILLA_FIVE_HOME}/distribution"
-	newins "${FILESDIR}"/distribution.ini distribution.ini
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Install system-wide preferences
-	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
-	insinto "${PREFS_DIR}"
-	newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js
-
-	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"
-
-	# Set dictionary path to use system hunspell
-	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
-	pref("spellchecker.dictionary_path",       "${EPREFIX}/usr/share/myspell");
-	EOF
-
-	# Force hwaccel prefs if USE=hwaccel is enabled
-	if use hwaccel ; then
-		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-r1 \
-		>>"${GENTOO_PREFS}" \
-		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
-	fi
-
-	if ! use gmp-autoupdate ; then
-		local plugin
-		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
-			einfo "Disabling auto-update for ${plugin} plugin ..."
-			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
-			pref("media.${plugin}.autoupdate",   false);
-			EOF
-		done
-	fi
-
-	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
-	if use system-harfbuzz ; then
-		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
-		sticky_pref("gfx.font_rendering.graphite.enabled", true);
-		EOF
-	fi
-
-	# Install language packs
-	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
-	if [[ -n "${langpacks}" ]] ; then
-		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
-	fi
-
-	# Install geckodriver
-	if use geckodriver ; then
-		einfo "Installing geckodriver into ${ED}${MOZILLA_FIVE_HOME} ..."
-		pax-mark m "${BUILD_DIR}"/dist/bin/geckodriver
-		exeinto "${MOZILLA_FIVE_HOME}"
-		doexe "${BUILD_DIR}"/dist/bin/geckodriver
-
-		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
-	fi
-
-	# Install icons
-	local icon_srcdir="${S}/browser/branding/official"
-	local icon_symbolic_file="${FILESDIR}/icon/firefox-symbolic.svg"
-
-	insinto /usr/share/icons/hicolor/symbolic/apps
-	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
-
-	local icon size
-	for icon in "${icon_srcdir}"/default*.png ; do
-		size=${icon%.png}
-		size=${size##*/default}
-
-		if [[ ${size} -eq 48 ]] ; then
-			newicon "${icon}" ${PN}.png
-		fi
-
-		newicon -s ${size} "${icon}" ${PN}.png
-	done
-
-	# Install menu
-	local app_name="Mozilla ${MOZ_PN^}"
-	local desktop_file="${FILESDIR}/icon/${PN}-r3.desktop"
-	local desktop_filename="${PN}.desktop"
-	local exec_command="${PN}"
-	local icon="${PN}"
-	local use_wayland="false"
-
-	if use wayland ; then
-		use_wayland="true"
-	fi
-
-	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
-
-	sed -i \
-		-e "s:@NAME@:${app_name}:" \
-		-e "s:@EXEC@:${exec_command}:" \
-		-e "s:@ICON@:${icon}:" \
-		"${WORKDIR}/${PN}.desktop-template" \
-		|| die
-
-	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
-
-	rm "${WORKDIR}/${PN}.desktop-template" || die
-
-	# Install wrapper script
-	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
-	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
-
-	# Update wrapper
-	sed -i \
-		-e "s:@PREFIX@:${EPREFIX}/usr:" \
-		-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
-		-e "s:@APULSELIB_DIR@:${apulselib}:" \
-		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
-		"${ED}/usr/bin/${PN}" \
-		|| die
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
-	# does not need to be forced into the LD_LIBRARY_PATH
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		einfo "APULSE found; Generating library symlinks for sound support ..."
-		local lib
-		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
-		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
-			# A quickpkg rolled by hand will grab symlinks as part of the package,
-			# so we need to avoid creating them if they already exist.
-			if [[ ! -L ${lib##*/} ]] ; then
-				ln -s "${lib}" ${lib##*/} || die
-			fi
-		done
-		popd &>/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! use gmp-autoupdate ; then
-		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
-		elog "installing into new profiles:"
-		local plugin
-		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
-			elog "\t ${plugin}"
-		done
-		elog
-	fi
-
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		elog "Apulse was detected at merge time on this system and so it will always be"
-		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
-		elog "media-sound/apulse."
-		elog
-	fi
-
-	local show_doh_information
-	local show_normandy_information
-	local show_shortcut_information
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		# New install; Tell user that DoH is disabled by default
-		show_doh_information=yes
-		show_normandy_information=yes
-		show_shortcut_information=no
-	else
-		local replacing_version
-		for replacing_version in ${REPLACING_VERSIONS} ; do
-			if ver_test "${replacing_version}" -lt 91.0 ; then
-				# Tell user that we no longer install a shortcut
-				# per supported display protocol
-				show_shortcut_information=yes
-			fi
-		done
-	fi
-
-	if [[ -n "${show_doh_information}" ]] ; then
-		elog
-		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
-		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
-		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
-		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
-		elog "(\"Off by choice\") by default."
-		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
-	fi
-
-	# bug 713782
-	if [[ -n "${show_normandy_information}" ]] ; then
-		elog
-		elog "Upstream operates a service named Normandy which allows Mozilla to"
-		elog "push changes for default settings or even install new add-ons remotely."
-		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
-		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
-		elog "concerns prevail, which is why we have switched off the use of this"
-		elog "service by default."
-		elog
-		elog "To re-enable this service set"
-		elog
-		elog "    app.normandy.enabled=true"
-		elog
-		elog "in about:config."
-	fi
-
-	if [[ -n "${show_shortcut_information}" ]] ; then
-		elog
-		elog "Since ${PN}-91.0 we no longer install multiple shortcuts for"
-		elog "each supported display protocol.  Instead we will only install"
-		elog "one generic Mozilla ${PN^} shortcut."
-		elog "If you still want to be able to select between running Mozilla ${PN^}"
-		elog "on X11 or Wayland, you have to re-create these shortcuts on your own."
-	fi
-
-	# bug 835078
-	if use hwaccel && has_version "x11-drivers/xf86-video-nouveau"; then
-		ewarn "You have nouveau drivers installed in your system and 'hwaccel' "
-		ewarn "enabled for Firefox. Nouveau / your GPU might not supported the "
-		ewarn "required EGL, so either disable 'hwaccel' or try the workaround "
-		ewarn "explained in https://bugs.gentoo.org/835078#c5 if Firefox crashes."
-	fi
-
-	elog
-	elog "Unfortunately Firefox-100.0 breaks compatibility with some sites using "
-	elog "useragent checks. To temporarily fix this, enter about:config and modify "
-	elog "network.http.useragent.forceVersion preference to \"99\"."
-	elog "Or install an addon to change your useragent."
-	elog "See: https://support.mozilla.org/en-US/kb/difficulties-opening-or-using-website-firefox-100"
-	elog
-}
diff --git a/www-client/microsoft-edge/Manifest b/www-client/microsoft-edge/Manifest
index b0598656b168..d94c5bda5c99 100644
--- a/www-client/microsoft-edge/Manifest
+++ b/www-client/microsoft-edge/Manifest
@@ -1,3 +1,3 @@
-DIST microsoft-edge-stable_102.0.1245.39-1_amd64.deb 119527670 BLAKE2B 768b0a5f1ccde5333fddac3d0ffba3095490e23eb933235bb6108cf5ca8767d419e7804d218227fe01139defb3a673c18f0bd80da868c48a093fbef18dacf9bd SHA512 01d8f893757585378e8870b4fa6c0d7548e217760418b334e3ad7f84480ed8b4eb7394c8b7f21eb847a8147d9dabf8fac97702e1e7cf37143694cd3a1116d962
-EBUILD microsoft-edge-102.0.1245.39.ebuild 2503 BLAKE2B 6e9465b67cd5fc35097dd61a95c915a4f3b58ac44e82efc9bfa351baf6f1581f4e68c02287881d7aafa8ce7a5d1643f6d209cc38bd64f94957f60cccde175fa5 SHA512 1f95dbc80e9b207396d6a73a7ffe21d9d44af40c15aa4b7a795c893df0720bef079dc2956ad6d34718e58100e6806a1ccaebdd5f9c71f6363ee05ec69c1893f6
+DIST microsoft-edge-stable_102.0.1245.41-1_amd64.deb 119503196 BLAKE2B 397526545cfe15c0e8e3cd21b49be4f2f26da7e0791fa1ceccc52a89f000c5b3f6e925d5f0aae1435cb4f137b158761c3f85e682bb5297f2536ba2b7e72ab908 SHA512 385bc11d4449835737f3d1c24d7a71300a60d089c9f2a3836d7f95c25add383a2ab277836134e8a7782b1f8db16cf133331c3edb805e3b0395c91116c2327084
+EBUILD microsoft-edge-102.0.1245.41.ebuild 2503 BLAKE2B 6e9465b67cd5fc35097dd61a95c915a4f3b58ac44e82efc9bfa351baf6f1581f4e68c02287881d7aafa8ce7a5d1643f6d209cc38bd64f94957f60cccde175fa5 SHA512 1f95dbc80e9b207396d6a73a7ffe21d9d44af40c15aa4b7a795c893df0720bef079dc2956ad6d34718e58100e6806a1ccaebdd5f9c71f6363ee05ec69c1893f6
 MISC metadata.xml 528 BLAKE2B ef09f12e6f9b503cd78a39ece67ab0b21c4760114b052bf105b7c5e426a1df43a5b37ff547338fc7122ac8a029b2ebb85a8793dbd4d192ae990ae71829dcdec6 SHA512 b6ab632cfce365f249a178a261eba3d469cd645cdcb99dd1bc4f1e865fbd6668cfd0f7171843e2b234ff852f8191a8b08b48cf89991cdfc7ca36337a71e5a38d
diff --git a/www-client/microsoft-edge/microsoft-edge-102.0.1245.39.ebuild b/www-client/microsoft-edge/microsoft-edge-102.0.1245.41.ebuild
similarity index 100%
rename from www-client/microsoft-edge/microsoft-edge-102.0.1245.39.ebuild
rename to www-client/microsoft-edge/microsoft-edge-102.0.1245.41.ebuild
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index 508faf989ae4..39fabebf4898 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,8 +1,8 @@
-DIST opera-beta_88.0.4412.13_amd64.deb 84766736 BLAKE2B 4bc08f2d049b4f9ac06996458d512a85b4be643eae235fbcaec3028f90a962f53485a14ef087f0f5eadb3be1a8e620e6b00af8bc72ce8049108aacb17d4af815 SHA512 0691106a24f361eba8e38f170a4e903595b360315f16a84ecbd3518d8ae23cf821a2fa48497f3b105802b7418d69df350c2655d84e8d5ccc70fcc48eedb65203
 DIST opera-beta_88.0.4412.18_amd64.deb 84660352 BLAKE2B 00bca30e13c5d1a058afc27ba72e31b47a9afab0cecf13e375ec12f334467872cb5d6f44d6a2fe9eb3dc56c0a59f2d590be6cdc88adeba840dc83381baeb76ae SHA512 843e299dd65ce4cc80130968121b87d099a020856a3329b81e2eabf795ce8b2402147d138df76dd9577ec83fbb5f2b0d9de778f38993339497fec83a81cf3ba1
 DIST opera-beta_88.0.4412.20_amd64.deb 84683044 BLAKE2B 79f5961a441008ba0e28164c7f5673565cf2ca78e96a4c0e6674414ab92c743c4178dba770dfc681dc7675028730adf5eb517a2958316a422725754dd9a5dfdd SHA512 84ec4bd4ccfcb80644b80e1722153283eccf7e67f42666021f66ad72fcb52ce53ee2805fd754b936660402fd0f9d1c0b9c4920182399eab83b46fc350cf0920c
-DIST opera-ffmpeg-codecs-100.0.4896.20.tar.xz 1393360 BLAKE2B be608a42042b2713fff66716c171959609e06d94b6c56cd8081e05313915378eff25c7098228ff6727a430c9f02bd4e9c9dcce4e715f09e10ac62d89ccd6ae1c SHA512 7dab4a091ac3562cd9c09cf37bc70edf9000ad1b3d31f27278e2edc68b9f55fd4f821ebc90a761ae5803542195718015c859e107344b31a5f7f9ad6cf028df42
-EBUILD opera-beta-88.0.4412.13.ebuild 3593 BLAKE2B da8be56b4172f761c079f04351208b3c2099c4c6ddf6dcbfb43ba4eeebad092cd15f810d6349fa239e0dd9f5d417438a7ac64c5d4b52b3c49ee05a6b3aa32d87 SHA512 4db5b67971d618764db4913c48d92be6efbd858fb07127fd54f12f28e9973ae7b0cf1a0f03002f2b50dc7b15509d081e5c9115cf2c88a9765f825c6f25ce4f84
-EBUILD opera-beta-88.0.4412.18.ebuild 3593 BLAKE2B da8be56b4172f761c079f04351208b3c2099c4c6ddf6dcbfb43ba4eeebad092cd15f810d6349fa239e0dd9f5d417438a7ac64c5d4b52b3c49ee05a6b3aa32d87 SHA512 4db5b67971d618764db4913c48d92be6efbd858fb07127fd54f12f28e9973ae7b0cf1a0f03002f2b50dc7b15509d081e5c9115cf2c88a9765f825c6f25ce4f84
-EBUILD opera-beta-88.0.4412.20.ebuild 3593 BLAKE2B da8be56b4172f761c079f04351208b3c2099c4c6ddf6dcbfb43ba4eeebad092cd15f810d6349fa239e0dd9f5d417438a7ac64c5d4b52b3c49ee05a6b3aa32d87 SHA512 4db5b67971d618764db4913c48d92be6efbd858fb07127fd54f12f28e9973ae7b0cf1a0f03002f2b50dc7b15509d081e5c9115cf2c88a9765f825c6f25ce4f84
+DIST opera-beta_89.0.4447.12_amd64.deb 86320096 BLAKE2B 993f12fc5cb5b26ea3f2351435735114fa6c28a7ec0c15c19abfe74aadf9e81df00b868bcc42a3adebe9125e98b3441d48a1428062c00f740cc7c2eec4a9ae9d SHA512 a8818f6de4397675b6995c771b3160c910e4a947f3b928d49349fc64d12d1f9a8dfb4b6f4798616d76f133e12fe0425821631a91382cadab91ef9e30a2e76f34
+DIST opera-ffmpeg-codecs-102.0.5005.61.tar.xz 1429920 BLAKE2B a4cb07805650c3cd7f7e1127e475775c95d74b8cd17af5ad736a6d4f256176586b1608c2a617961cf2f3f7980879bc8f1a84cd9faa4838eafbc7b1b4e2edfe1a SHA512 af20383a0b77da89bf2ef52b412d9cce0a1f12bcfe2612ebd5110f1e8008cfff874da36e00b980609ac29346c545f2326bbe5f1b42473530f2886d67a00f52ca
+EBUILD opera-beta-88.0.4412.18-r1.ebuild 3584 BLAKE2B a747320ddd65e8eae0103d0f06308e66898d32f147106143b2e2269ec41f91fddb1fde363e41efbb103442ecac05a6b1611fcd59a95d3280d696ef25d68b0c2e SHA512 c72d3e2de99617299bac78478b89ce23b8f368dd3fecbc57dc0555220030b6573090659069b48021db8856cb14e2884d1f0b9380864f47fd00227abe0e274d20
+EBUILD opera-beta-88.0.4412.20-r1.ebuild 3584 BLAKE2B a747320ddd65e8eae0103d0f06308e66898d32f147106143b2e2269ec41f91fddb1fde363e41efbb103442ecac05a6b1611fcd59a95d3280d696ef25d68b0c2e SHA512 c72d3e2de99617299bac78478b89ce23b8f368dd3fecbc57dc0555220030b6573090659069b48021db8856cb14e2884d1f0b9380864f47fd00227abe0e274d20
+EBUILD opera-beta-89.0.4447.12.ebuild 3584 BLAKE2B a747320ddd65e8eae0103d0f06308e66898d32f147106143b2e2269ec41f91fddb1fde363e41efbb103442ecac05a6b1611fcd59a95d3280d696ef25d68b0c2e SHA512 c72d3e2de99617299bac78478b89ce23b8f368dd3fecbc57dc0555220030b6573090659069b48021db8856cb14e2884d1f0b9380864f47fd00227abe0e274d20
 MISC metadata.xml 380 BLAKE2B 6126e5c5d5f67d1bd7d4b6659fbc9f8f62ef105e737d2cc4e6c652f4c899df1b55ef2abe077e41aa2e4eb3d553a2652e38a583b3c7baac7a20318b69f766997f SHA512 cbe76a1630f13557a0aae1703436b19b0f9f7842c5604695d49255937c8304fff07ec20f26d408527ee672e2e9625ebc748bb7d3879d5fc77c06655c4b9b1816
diff --git a/www-client/opera-beta/opera-beta-88.0.4412.13.ebuild b/www-client/opera-beta/opera-beta-88.0.4412.18-r1.ebuild
similarity index 97%
rename from www-client/opera-beta/opera-beta-88.0.4412.13.ebuild
rename to www-client/opera-beta/opera-beta-88.0.4412.18-r1.ebuild
index d1fbcd0074a1..d9356701daff 100644
--- a/www-client/opera-beta/opera-beta-88.0.4412.13.ebuild
+++ b/www-client/opera-beta/opera-beta-88.0.4412.18-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 CHROMIUM_LANGS="
-	be bg bn ca cs da de el en-GB en-US es-419 es fil fi fr-CA fr hi hr hu id
+	bg bn ca cs da de el en-GB en-US es-419 es fil fi fr hi hr hu id
 	it ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
 	zh-CN zh-TW
 "
@@ -42,7 +42,7 @@ fi
 
 KEYWORDS="-* ~amd64"
 
-FFMPEG_VERSION="100.0.4896.20"
+FFMPEG_VERSION="102.0.5005.61"
 
 SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}
 	proprietary-codecs? (
diff --git a/www-client/opera-beta/opera-beta-88.0.4412.18.ebuild b/www-client/opera-beta/opera-beta-88.0.4412.20-r1.ebuild
similarity index 97%
rename from www-client/opera-beta/opera-beta-88.0.4412.18.ebuild
rename to www-client/opera-beta/opera-beta-88.0.4412.20-r1.ebuild
index d1fbcd0074a1..d9356701daff 100644
--- a/www-client/opera-beta/opera-beta-88.0.4412.18.ebuild
+++ b/www-client/opera-beta/opera-beta-88.0.4412.20-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 CHROMIUM_LANGS="
-	be bg bn ca cs da de el en-GB en-US es-419 es fil fi fr-CA fr hi hr hu id
+	bg bn ca cs da de el en-GB en-US es-419 es fil fi fr hi hr hu id
 	it ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
 	zh-CN zh-TW
 "
@@ -42,7 +42,7 @@ fi
 
 KEYWORDS="-* ~amd64"
 
-FFMPEG_VERSION="100.0.4896.20"
+FFMPEG_VERSION="102.0.5005.61"
 
 SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}
 	proprietary-codecs? (
diff --git a/www-client/opera-beta/opera-beta-88.0.4412.20.ebuild b/www-client/opera-beta/opera-beta-89.0.4447.12.ebuild
similarity index 97%
rename from www-client/opera-beta/opera-beta-88.0.4412.20.ebuild
rename to www-client/opera-beta/opera-beta-89.0.4447.12.ebuild
index d1fbcd0074a1..d9356701daff 100644
--- a/www-client/opera-beta/opera-beta-88.0.4412.20.ebuild
+++ b/www-client/opera-beta/opera-beta-89.0.4447.12.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 CHROMIUM_LANGS="
-	be bg bn ca cs da de el en-GB en-US es-419 es fil fi fr-CA fr hi hr hu id
+	bg bn ca cs da de el en-GB en-US es-419 es fil fi fr hi hr hu id
 	it ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
 	zh-CN zh-TW
 "
@@ -42,7 +42,7 @@ fi
 
 KEYWORDS="-* ~amd64"
 
-FFMPEG_VERSION="100.0.4896.20"
+FFMPEG_VERSION="102.0.5005.61"
 
 SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}
 	proprietary-codecs? (
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index a8b817725877..1522b684a7c8 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,8 +1,9 @@
-DIST opera-developer_89.0.4428.0_amd64.deb 85354036 BLAKE2B 345733351e89915d2d4c84b709e6d6c5e8401fb4d271ca6499bcc137c336a4abce8f3aced96f58070e824a9cbd192de147c3cfd4206a5bff625f39203d6c6fdb SHA512 e3dce3522272249e6cb4dc444bd0ad69b3daff7fc0b8ca0f05e10ef85051cc9d6c907aea0db12e2967d84a99a70bfbdfc8d6f2d7d8dda8df50bd88d6a85035aa
 DIST opera-developer_89.0.4436.0_amd64.deb 85378600 BLAKE2B 7299ebcdbb48ecb0d783cece6af0ac477e9209872af9bd0275f0051be10a4f112759889ae940e8cde3db1e430d010369295b3cceef05610bfb24547f195f86c6 SHA512 60efd929bae1ff94566a8f5be36c9c00262246a9a09cf785cea4d1ae0175990cc2cede660a12225d005f5fbf9232d37f1ef1c81bb8d789d6070e0a070bc159b1
 DIST opera-developer_89.0.4443.0_amd64.deb 86069040 BLAKE2B 5f21e4cf6ba78ab0f0068f3fc638a2c8cd462ad71c5ee028b3c132d7e2481018a8f7869c8748cc8eb3be5ae3cda758b999dae840094dddc8e456412c35de8f73 SHA512 442c73a732f54349f5ea30850a5e03f6d26aa56d9efb15bfbd9d2bc72874a2d2e40e6d48bb535da5975eba9b5342da71cfdf6855b6fbacc9d44d155bb465596a
+DIST opera-developer_90.0.4450.0_amd64.deb 86183352 BLAKE2B d2265610809a4f8c3b25df73bc889edf2148d9196d755cd608953f821599858c9baac8b72a8bb58a97cd04a48c49d2a8d769601321fa3ff5f95d049d39d8bc0b SHA512 238a2e0c125dd68c3c2f1f85bc39943d5b1209f8b738dd9ce07c43c4e4519edb7de3e04b8babae372de774ced1990a0d2c45c9484baaa9fa777452ab44069971
 DIST opera-ffmpeg-codecs-100.0.4896.20.tar.xz 1393360 BLAKE2B be608a42042b2713fff66716c171959609e06d94b6c56cd8081e05313915378eff25c7098228ff6727a430c9f02bd4e9c9dcce4e715f09e10ac62d89ccd6ae1c SHA512 7dab4a091ac3562cd9c09cf37bc70edf9000ad1b3d31f27278e2edc68b9f55fd4f821ebc90a761ae5803542195718015c859e107344b31a5f7f9ad6cf028df42
-EBUILD opera-developer-89.0.4428.0.ebuild 3593 BLAKE2B da8be56b4172f761c079f04351208b3c2099c4c6ddf6dcbfb43ba4eeebad092cd15f810d6349fa239e0dd9f5d417438a7ac64c5d4b52b3c49ee05a6b3aa32d87 SHA512 4db5b67971d618764db4913c48d92be6efbd858fb07127fd54f12f28e9973ae7b0cf1a0f03002f2b50dc7b15509d081e5c9115cf2c88a9765f825c6f25ce4f84
+DIST opera-ffmpeg-codecs-102.0.5005.61.tar.xz 1429920 BLAKE2B a4cb07805650c3cd7f7e1127e475775c95d74b8cd17af5ad736a6d4f256176586b1608c2a617961cf2f3f7980879bc8f1a84cd9faa4838eafbc7b1b4e2edfe1a SHA512 af20383a0b77da89bf2ef52b412d9cce0a1f12bcfe2612ebd5110f1e8008cfff874da36e00b980609ac29346c545f2326bbe5f1b42473530f2886d67a00f52ca
 EBUILD opera-developer-89.0.4436.0.ebuild 3593 BLAKE2B da8be56b4172f761c079f04351208b3c2099c4c6ddf6dcbfb43ba4eeebad092cd15f810d6349fa239e0dd9f5d417438a7ac64c5d4b52b3c49ee05a6b3aa32d87 SHA512 4db5b67971d618764db4913c48d92be6efbd858fb07127fd54f12f28e9973ae7b0cf1a0f03002f2b50dc7b15509d081e5c9115cf2c88a9765f825c6f25ce4f84
 EBUILD opera-developer-89.0.4443.0.ebuild 3593 BLAKE2B da8be56b4172f761c079f04351208b3c2099c4c6ddf6dcbfb43ba4eeebad092cd15f810d6349fa239e0dd9f5d417438a7ac64c5d4b52b3c49ee05a6b3aa32d87 SHA512 4db5b67971d618764db4913c48d92be6efbd858fb07127fd54f12f28e9973ae7b0cf1a0f03002f2b50dc7b15509d081e5c9115cf2c88a9765f825c6f25ce4f84
+EBUILD opera-developer-90.0.4450.0.ebuild 3584 BLAKE2B a747320ddd65e8eae0103d0f06308e66898d32f147106143b2e2269ec41f91fddb1fde363e41efbb103442ecac05a6b1611fcd59a95d3280d696ef25d68b0c2e SHA512 c72d3e2de99617299bac78478b89ce23b8f368dd3fecbc57dc0555220030b6573090659069b48021db8856cb14e2884d1f0b9380864f47fd00227abe0e274d20
 MISC metadata.xml 380 BLAKE2B 6126e5c5d5f67d1bd7d4b6659fbc9f8f62ef105e737d2cc4e6c652f4c899df1b55ef2abe077e41aa2e4eb3d553a2652e38a583b3c7baac7a20318b69f766997f SHA512 cbe76a1630f13557a0aae1703436b19b0f9f7842c5604695d49255937c8304fff07ec20f26d408527ee672e2e9625ebc748bb7d3879d5fc77c06655c4b9b1816
diff --git a/www-client/opera-developer/opera-developer-89.0.4428.0.ebuild b/www-client/opera-developer/opera-developer-90.0.4450.0.ebuild
similarity index 97%
rename from www-client/opera-developer/opera-developer-89.0.4428.0.ebuild
rename to www-client/opera-developer/opera-developer-90.0.4450.0.ebuild
index d1fbcd0074a1..d9356701daff 100644
--- a/www-client/opera-developer/opera-developer-89.0.4428.0.ebuild
+++ b/www-client/opera-developer/opera-developer-90.0.4450.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 CHROMIUM_LANGS="
-	be bg bn ca cs da de el en-GB en-US es-419 es fil fi fr-CA fr hi hr hu id
+	bg bn ca cs da de el en-GB en-US es-419 es fil fi fr hi hr hu id
 	it ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
 	zh-CN zh-TW
 "
@@ -42,7 +42,7 @@ fi
 
 KEYWORDS="-* ~amd64"
 
-FFMPEG_VERSION="100.0.4896.20"
+FFMPEG_VERSION="102.0.5005.61"
 
 SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}
 	proprietary-codecs? (
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 6ac52faa19e3..53ba38236eb0 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -1,4 +1,4 @@
-DIST opera-ffmpeg-codecs-100.0.4896.20.tar.xz 1393360 BLAKE2B be608a42042b2713fff66716c171959609e06d94b6c56cd8081e05313915378eff25c7098228ff6727a430c9f02bd4e9c9dcce4e715f09e10ac62d89ccd6ae1c SHA512 7dab4a091ac3562cd9c09cf37bc70edf9000ad1b3d31f27278e2edc68b9f55fd4f821ebc90a761ae5803542195718015c859e107344b31a5f7f9ad6cf028df42
-DIST opera-stable_88.0.4412.27_amd64.deb 84457296 BLAKE2B d7efa481b44061e24993e80ec76567c721fb1e4e1a33141fee96eb08edafffb76df43e38b88ddaf7eb7b183a84030b768857c91d05049f97f37fecb9323feaf5 SHA512 b815d5cb2f180eab223d59c382efd247d0f806842e09410aa5e0590b06e88b494677be4a53cf4203b167a0e11cd1e0720a140e113531b4276b713cb546c74e1c
-EBUILD opera-88.0.4412.27.ebuild 3592 BLAKE2B 125c70df7b038b356bed9f7e194a703c319f45103a9962e49ac8cfcc79bd7a4f9a31fe3705bc5fbb35e5db47b2339f882c979a64cd2bb00a3582ca7aaae3ad46 SHA512 6a4b10ef0e16fa07e20b359123b5a1e3ed61244cbdb1b0c6ed3b1fc6eed4a6536ed05cbcb7263eda601c48b6f5e62a0d7ecdffa1a22d800e89089b02deb45a9a
+DIST opera-ffmpeg-codecs-102.0.5005.61.tar.xz 1429920 BLAKE2B a4cb07805650c3cd7f7e1127e475775c95d74b8cd17af5ad736a6d4f256176586b1608c2a617961cf2f3f7980879bc8f1a84cd9faa4838eafbc7b1b4e2edfe1a SHA512 af20383a0b77da89bf2ef52b412d9cce0a1f12bcfe2612ebd5110f1e8008cfff874da36e00b980609ac29346c545f2326bbe5f1b42473530f2886d67a00f52ca
+DIST opera-stable_88.0.4412.40_amd64.deb 84459728 BLAKE2B 0bd9c7ccc894f605c4129f20ddf94a4bc63375df23e6e2e33850ffb6a3c049869b9832685bfdf0a50cf155aeade5275f010859d4c3b4edd8f834b5c77f85690d SHA512 1a83973413a0b6ea5003ab501d76a47fafac38fca3ce7052eac99d4cf5aa5f0ff19dfb085f7caf4abf89a647958ba3d73a1fad92e12d847fd15e64685e780b37
+EBUILD opera-88.0.4412.40.ebuild 3583 BLAKE2B 13854d02b15144eb83990b5e7b32de07f5c3ad7e791b7e1d44a8066402de2abae0fbb5556de088ad09f641187038c17a8c00d2050774d890d2e26c29d69a4c78 SHA512 c7089c91e81623b69d121e5badfdb5676d223b37a88c103db31faf25821e957228e2e58f66cdffb1eb85e83e85de59e3aac399723ee53ce9a689972046813d96
 MISC metadata.xml 380 BLAKE2B 6126e5c5d5f67d1bd7d4b6659fbc9f8f62ef105e737d2cc4e6c652f4c899df1b55ef2abe077e41aa2e4eb3d553a2652e38a583b3c7baac7a20318b69f766997f SHA512 cbe76a1630f13557a0aae1703436b19b0f9f7842c5604695d49255937c8304fff07ec20f26d408527ee672e2e9625ebc748bb7d3879d5fc77c06655c4b9b1816
diff --git a/www-client/opera/opera-88.0.4412.27.ebuild b/www-client/opera/opera-88.0.4412.40.ebuild
similarity index 97%
rename from www-client/opera/opera-88.0.4412.27.ebuild
rename to www-client/opera/opera-88.0.4412.40.ebuild
index 5a702a579bd7..fdfecdad5600 100644
--- a/www-client/opera/opera-88.0.4412.27.ebuild
+++ b/www-client/opera/opera-88.0.4412.40.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 CHROMIUM_LANGS="
-	be bg bn ca cs da de el en-GB en-US es-419 es fil fi fr-CA fr hi hr hu id
+	bg bn ca cs da de el en-GB en-US es-419 es fil fi fr hi hr hu id
 	it ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
 	zh-CN zh-TW
 "
@@ -42,7 +42,7 @@ fi
 
 KEYWORDS="-* amd64"
 
-FFMPEG_VERSION="100.0.4896.20"
+FFMPEG_VERSION="102.0.5005.61"
 
 SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}
 	proprietary-codecs? (
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index afd404a44279..0be5af0bfe98 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,6 +1,6 @@
 DIST qutebrowser-2.5.0.tar.gz 6086105 BLAKE2B c95afbbdfeebe4352e461cef78d499e9efa9de2e4acc2cedf350904bd617a4f238c34042369655030e53433f941288ff676f8ffd873683939ddd38ff01604aa1 SHA512 41ab6f6d2b72c94e0f66ba0a80999d820748d0f86dbec92583a2be88725f1ebd7517dd75edbaa0ce60bc029ed4dc0dd3e30a1cb25ab4ef940b968c87b4df2472
 DIST qutebrowser-2.5.1.tar.gz 6089389 BLAKE2B e26be42742795b22c34d131a5c9046e0223cef2fd461d8aa3c656a8182bf0127e17e55a7e0a79e1ade76c883094d841a822864e995365b0217ef1b422272e6e0 SHA512 27eca3e987e4c2a662fc863840d3ea697da65f55c7b9180e892466aeb5a2753f1eca424bbf8705670fe8cd9363e3297e03f9f9cc0d4f85f0198a4e3312d32f3c
 EBUILD qutebrowser-2.5.0.ebuild 4291 BLAKE2B 77eb11d168f99a99d2de509f49a16580bfa4a85f48ccb98818dccda17a599357aec68f084da14104442971f18dbcb248dd6401e2c0f9c3ceb8a8bfb0e090cc90 SHA512 becebc7833fdf20439ad705bb9ec528021f6a93e3a51133a0e243148174ef921e8ae30934b5e5e9a907b5dea616e79741e2ee6306e3d780b8321ef0127bde074
-EBUILD qutebrowser-2.5.1.ebuild 4338 BLAKE2B abe2479e0c2391d96225272cc31a3f8773ab2cac4ed2cbb545f14f3d25384b7fa56c8a8376a3fd747e351477cdc8dac83bcefb2fdea14b0558e92d85d7b13177 SHA512 dc65f804d93d23a740db11aff91532293b5176a30e0b0ebc109bcbaf78e2609d03d67672f64eabe445697372789656c6ab86a651f07478a207b80a90d45043f0
+EBUILD qutebrowser-2.5.1.ebuild 4337 BLAKE2B 556ef9db9fe8f4345c21ab5ad8a3e140a07ffd1285171c79896bf20e375b2f3cac60ef917094881b06efa75b88d2da7fce4944b2744c9f2200561831d916f636 SHA512 96bc71761297c407eab8c1376be115ad71032285f7ea46a6265cf737db12043c6d0279ce20946cadbde06c9f5bca5c96d94b5d6dc02e431263a6641c6495df8b
 EBUILD qutebrowser-9999.ebuild 4338 BLAKE2B abe2479e0c2391d96225272cc31a3f8773ab2cac4ed2cbb545f14f3d25384b7fa56c8a8376a3fd747e351477cdc8dac83bcefb2fdea14b0558e92d85d7b13177 SHA512 dc65f804d93d23a740db11aff91532293b5176a30e0b0ebc109bcbaf78e2609d03d67672f64eabe445697372789656c6ab86a651f07478a207b80a90d45043f0
 MISC metadata.xml 945 BLAKE2B e796d777d56a5452b6652d77e011dfb160684f6e7498d0c4fad583bb828ecd111c25be5d80ed906b9b579e6ccd33315fc20a727342df0fb1b66b1a71effcea25 SHA512 80a65a391a84208042d9e7a6e0b5e8644ed07d5e389cd6a7b314b961dca5cff6406c5556693b34dcd275acfb27d05d9e40f77e9d503f9e3e8054ab6b6763932d
diff --git a/www-client/qutebrowser/qutebrowser-2.5.1.ebuild b/www-client/qutebrowser/qutebrowser-2.5.1.ebuild
index 09bc4c14cb21..9287f76d1bec 100644
--- a/www-client/qutebrowser/qutebrowser-2.5.1.ebuild
+++ b/www-client/qutebrowser/qutebrowser-2.5.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/qutebrowser/qutebrowser.git"
 else
 	SRC_URI="https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~x86"
 fi
 
 DESCRIPTION="Keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 130ae3a5bd59..7ed9e081a80c 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -19,5 +19,5 @@ EBUILD seamonkey-2.53.10.2.ebuild 16641 BLAKE2B 915e872ebd5871fbf0da8591d4e37e50
 EBUILD seamonkey-2.53.11-r1.ebuild 16718 BLAKE2B d0feca842452f60e2b6cb1529b199e8f291d479cf705469f1873074273b77e32d330fe45407b955c2933b0e81de10a0675b5238e240e9e4951ccb09241e0af7b SHA512 bf542f7e05ce374cfbf580a531b108bc0b9351ca9683ea1152e6d27b99de01d2e3f2ea89017562d32f8ce4b6b87cb5e89299b1e118680a42edf371c07766c480
 EBUILD seamonkey-2.53.11.1.ebuild 16398 BLAKE2B 234837da0a57f82612d73d88a13afd9067cb86f213bd629925b0a4ba6a5801812fd6d53d9f3dc31fb2b4f304329a8885c3617a28a16a98a1614f78c8b9f22ed0 SHA512 3cc00da4b210d1048d5451f89ecc9c59394ec35080f3325bacd61acc62124ac550ac5b8677ae7c591b8272f0c9191a50dfd16c15edf7e97a1fa04bff6bd5d237
 EBUILD seamonkey-2.53.11.ebuild 16718 BLAKE2B f54e4a021d74b690b7158281b1f3f79cccd5288978da1fdc16f241c91ef6042e09a48b1110eed991e17c7d90eb37710e644c8eedcc20e6c4fe900b673505f30d SHA512 2c253792ec4d84c28374492193a9b915da7d98d2c2c1061ef514079cc41631520a4a2a5144de5106a9b22a77b869f404b2e04c162ede40487a9d51d619176dc0
-EBUILD seamonkey-2.53.12.ebuild 17650 BLAKE2B 0e67aa3816bf03bbcba308c7e3d5ac4ca0f136e8d2ed426b24d334ee1ca455d0e799c7e7d630fa43ae94a7973adb1db3b41c1ed6c2948990e677970010657f0a SHA512 4aea3b2f72d5895ae211d954b7497edbb853122e24c3df8975566e4d9329e7dbe55c73439905f5416dfe6df98492885145f062f2c611959e80fffcaaef0ce60d
+EBUILD seamonkey-2.53.12.ebuild 17826 BLAKE2B a45f836e4e1aacb9790cc0a6039f339ba365b918d520bf3388d6cf836e48c88f292139231d6e4c1af32f3de808f1e8abd3aa3a193450acdec5d54ff3e910648c SHA512 f913288ad8753bc2605cf54a6c0274b2be7acb03bb910bb89815f237617bbd5e0801bbc596c6deb26d10317db3e754d6fa1b149c9be7aedd9a9fc4329912af5c
 MISC metadata.xml 2160 BLAKE2B d6a44fccac758a624499d000b95e9809d90e484c2cc42e8d4713ad89779e0aa7e4ab0aa59f0fd639bde2a571a11b29b93310e5aff4ec95c6db6894afa47aa25c SHA512 29374ed27142c3e9ab95eea7c25b76f8c939158a324e58c46400f2ac096ea79e75732ed7ba248202e01e0becbdb0ae38197523e5c888f13c23764de720f5e553
diff --git a/www-client/seamonkey/seamonkey-2.53.12.ebuild b/www-client/seamonkey/seamonkey-2.53.12.ebuild
index e5f780401623..59e56fa078df 100644
--- a/www-client/seamonkey/seamonkey-2.53.12.ebuild
+++ b/www-client/seamonkey/seamonkey-2.53.12.ebuild
@@ -48,7 +48,7 @@ SYSTEM_IUSE=( +system-{av1,harfbuzz,icu,jpeg,libevent,libvpx,png,sqlite} )
 IUSE="+chatzilla cpu_flags_arm_neon +crypt dbus debug +gmp-autoupdate +ipc jack
 lto pulseaudio selinux startup-notification test webrtc wifi"
 IUSE+=" ${SYSTEM_IUSE[@]}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 
 RESTRICT="!test? ( test )"
 
@@ -393,6 +393,13 @@ src_configure() {
 	# use startup-cache for faster startup time
 	mozconfig_annotate '' --enable-startupcache
 
+	# Elfhack is known to be broken on x86.
+	# https://bugs.gentoo.org/851933
+	# https://bugzilla.mozilla.org/show_bug.cgi?id=1706264
+	if use x86 ; then
+		mozconfig_annotate 'elf-hack is broken on x86' --disable-elf-hack
+	fi
+
 	# Elf hack should be enabled by default on architectures that support it.
 	# On archs that don't support it, it should not be enabled by default.
 	# www-client/firefox says building with clang breaks elf hack on archs that
@@ -405,8 +412,6 @@ src_configure() {
 		local disable_elf_hack=
 		if use amd64 ; then
 			disable_elf_hack=yes
-		elif use x86 ; then
-			disable_elf_hack=yes
 		elif use arm ; then
 			disable_elf_hack=yes
 		fi
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index ac8803a34a9e..3f9d55b6a71e 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,9 +1,9 @@
-DIST vivaldi-snapshot_5.3.2679.46-1_amd64.deb 89889532 BLAKE2B 23b32123f9dee0fbdf10b7d036d5ed48a18a86dc60060b09d8599e46a50a8fa32bed9f71e9f7a0fa84262868324c6c57a2331f44152045ca0f7cfa60dd44ff53 SHA512 0c71edfaf6cd4503e008fb93cc8321abcf6a7c88b2cc53f9ded747121d3ce8dba539704414762a3241dd424b73d29ff54e56520936ae4abdfde843ece29298fb
-DIST vivaldi-snapshot_5.3.2679.46-1_arm64.deb 81639900 BLAKE2B 98421bad31b4e1e8f89b4a5b4da4e97248eaab318457122b0e68dc190d94e6ff2dfc23e0266c18c1cddd0753bc731e3a5bc9712ad6234b3eb80b343863dd073e SHA512 93f5072edb46f417b08ec4558c46232706a10656600f5777e977bf82c06276faf6369d879195da4265c11041ef12d53d3eca43dd946350a2dee5242b7afcc284
-DIST vivaldi-snapshot_5.3.2679.46-1_armhf.deb 81289752 BLAKE2B 682c0d5c77c868629b073c071d13d856f7c7bf153f8b4b7124451f4a886efc687caa35af3170e1c37f8715eaca68a2cf36f7786b36d297a868a40e94f6f9aff2 SHA512 b2ae390467d2d5da85af56805adebda5e6bd18e952f9bae36793a1cc40f4cd5901452f51a2e976ecedb29f8dd3c333043ce3b78ae9debe8ee4e658ff20c5a124
 DIST vivaldi-snapshot_5.3.2679.50-1_amd64.deb 89860344 BLAKE2B 717361941272e173cca0052fe61070723d7959bf54e6a32800f604a0ee6f2e7e0aecb7599cf917d45107a54e7243873e61017b05fc7c3f822ff9ae2b0d57fd56 SHA512 8dedecb29f38134aa73483274c6108ab6598fea78a4a6589d8f48c89f0e81a727d03535b1f4e98d8939f6be9078385eb141865d533ae76ef839c7f8ee304e326
 DIST vivaldi-snapshot_5.3.2679.50-1_arm64.deb 81621900 BLAKE2B efaf8bf691106b2f061a373bc346db9022c33b763b992ecf2232843a9b2c6f614bd8b929d9f28f1b359df4cf98e30c2e66626f6ebc8326fe3d0f1f544ae32661 SHA512 89123c9899065c3f6bc305cd1ad8e3f215b5b31b3625272d7089d3fb60cf804be81d419b4c1b3cab20a8d4fb174be5176bbf44fda8524cf7fe882f3b4a41e71b
 DIST vivaldi-snapshot_5.3.2679.50-1_armhf.deb 81289972 BLAKE2B cc841f04163bd44c16b3751bf37ccbf5e756bc563056bd411213e2a735f9c6e01705ef5b3ae14f1e69531b617b4482ef3a6463476477509504e600256da78f22 SHA512 f2a8c886b1d0dfb61091ade1612285c62de0b88fb14c42e55945d47bb601af4f69b6f5b68fda45b83a5bd35579e57ba89010fa981f61c7139e224949b082652b
-EBUILD vivaldi-snapshot-5.3.2679.46.ebuild 3611 BLAKE2B d036836843f8e53d8f578756df54d36777f8fd5dbdd8b2ba0e9377e386f84a426c8384a600cd505a77529400b9b74ad2ceb5ec3bfd3095da84c0fbfe772287d2 SHA512 6130b8b6b50db57b32ffe169d0bc9b152343e6bd74ee2b26ff91c4419cc1d5fed07386cd2afedcd16833f4768c69d7d3a7d9fea9bcb6e048d3ce7a8eca4729dc
+DIST vivaldi-snapshot_5.4.2704.3-1_amd64.deb 89878764 BLAKE2B 2b9cfe2471529f56c18e73f6334acaa802f5b8ee64c7dde531269f773dc437732d0a4be4bd44b5683b9e499b80f0bcf9e339b2ffbda68e15fbc45b7f930d6093 SHA512 a0075be7fb9d72d8b2ba5ad368667725f9e4921ea1de8a0f40b3ac25afd38289aa1f2d65ff5d5b376d3db3d2db0ad4ecd308014b2c23105298cd414691836ae0
+DIST vivaldi-snapshot_5.4.2704.3-1_arm64.deb 81633128 BLAKE2B 458d8a8cf3cc3765d45fa852f93fd61de75c0ac860f2ab8649c7ca10615e25c6dc0c5d28ac0a2800a582d29e17b62f08128d9e980618e3b13a7ae26e9a9f1260 SHA512 3c3d841ff8d00c63af674b6857e765acb4bced1fc0857b09008a701215e9d43a827faccb7e79de141990494ddfdb707958d4dcad13634c133f430eb8c555054d
+DIST vivaldi-snapshot_5.4.2704.3-1_armhf.deb 81291512 BLAKE2B 5a8546636b059db93fbfc3781304d1e935978b02b621f2e65a31d5bae0e457543173f318a58070652f1b037de7082e9f46794bd1f995c9eae5ffd8697115f4f1 SHA512 63fa6f435eef51c3b28a1596277e0601d9cc6ab6a1f75e282ce6aa7b4a1ebfc7ed2528e9014d51672913edd9f85933006ae9ae330f815389921ff2a92e7eb39a
 EBUILD vivaldi-snapshot-5.3.2679.50.ebuild 3660 BLAKE2B b1ad18fea4f5e8121caa04d2a31d519d1a3f517d11940ba040926eaa69113b89b686c38d2bdac91f423ee857e4586cc816a1ca728db2471f16178ea11a81d978 SHA512 5af4f410d790a00bb58a1fed497fed2eb273d30a3121a7eff08f68de15eafb8fe4548fb22db718bd6b05523acae808b55fa0e4ef3fd1fdc1272e58e824b2867b
+EBUILD vivaldi-snapshot-5.4.2704.3.ebuild 3660 BLAKE2B b1ad18fea4f5e8121caa04d2a31d519d1a3f517d11940ba040926eaa69113b89b686c38d2bdac91f423ee857e4586cc816a1ca728db2471f16178ea11a81d978 SHA512 5af4f410d790a00bb58a1fed497fed2eb273d30a3121a7eff08f68de15eafb8fe4548fb22db718bd6b05523acae808b55fa0e4ef3fd1fdc1272e58e824b2867b
 MISC metadata.xml 485 BLAKE2B 2be960ebfbbc2eefeb14ad0e387c02d90fd29adf4dcc77db0413f3c89087cbffac1ce538279d33c9b901cb67ad437c981d230b8f0bed1e98ad60ad049865e716 SHA512 62feb46aa9afe538c9ccaf687ba199779a5ce9231530296db7dcf38149ad2097d0418a7a43dfc9fb4fcdf679cb1a9b66ac550bea2b8927bafaec8fefa9b0d8c8
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-5.3.2679.46.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-5.4.2704.3.ebuild
similarity index 98%
rename from www-client/vivaldi-snapshot/vivaldi-snapshot-5.3.2679.46.ebuild
rename to www-client/vivaldi-snapshot/vivaldi-snapshot-5.4.2704.3.ebuild
index 63af99839e3a..cc815568ad94 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-5.3.2679.46.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-5.4.2704.3.ebuild
@@ -8,6 +8,8 @@ CHROMIUM_LANGS="
 	af
 	am
 	ar
+	az
+	be
 	bg
 	bn
 	ca
@@ -23,34 +25,41 @@ CHROMIUM_LANGS="
 	es-419
 	es-PE
 	et
+	eu
 	fa
 	fi
 	fil
 	fr
 	fy
 	gd
+	gl
 	gu
 	he
 	hi
 	hr
 	hu
+	hy
 	id
 	io
+	is
 	it
 	ja
 	jbo
+	ka
 	kab
 	kn
 	ko
 	ku
 	lt
 	lv
+	mk
 	ml
 	mr
 	ms
 	nb
 	nl
 	nn
+	pa
 	pl
 	pt-BR
 	pt-PT
@@ -59,7 +68,9 @@ CHROMIUM_LANGS="
 	sc
 	sk
 	sl
+	sq
 	sr
+	sr-Latn
 	sv
 	sw
 	ta
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 7903ef38081e..621d20495b4e 100644
Binary files a/www-servers/Manifest.gz and b/www-servers/Manifest.gz differ
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 054b2d4890ac..8df418ef18ea 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -15,18 +15,20 @@ DIST apache-tomcat-10.0.22-src.tar.gz 6115322 BLAKE2B 6a9d2e6896fa266b4d75627f85
 DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce
 DIST apache-tomcat-8.5.78-src.tar.gz 5972826 BLAKE2B 93acb2e997a877a2195642da7d896ec4f08bebd83aa12d868607056c23722bdb90147814173dde17fc142a9e4e434e4570a15ebfa1f8b1c7911a16408728b4bb SHA512 b58fdaa57420fcf7759420fba26bfd6edaa5174f5d3a81fdf8783f19d5385e2502d2ad4bfa0e4a77c6a084bf6d97a6d3cd274ab0ab3f2311d23079e273c41b32
 DIST apache-tomcat-8.5.79-src.tar.gz 5983349 BLAKE2B 8be7a268462c7edfd31636f2790ae83b8dbc16b8c0193f6a02f9f8591ffa9c91683b2042038661a0254fdab66f740b7ab99c1e6f11f0bd1245a836def9011533 SHA512 198f3eefe8445c050a98cf6d69597c17eee76158534c18a636f2285143c0cd248b939b8233618438330aedcd936d76505a064842619b077d8c2fa43244c7a8ff
+DIST apache-tomcat-8.5.81-src.tar.gz 5988747 BLAKE2B 569e1564cf6f5419aaa0d66a2497852021a244af1a858ad943b45e1c36939011a78edd83c717f346e4327278b95b95535e5c57bdd71af5662e052abc02528f49 SHA512 a9261e2a92e122f0f7f547d0b4e083d6c15cdb4d1ad750bdb3c9e3a597a1c4c1bb0f5dd7ad92f41ce18d15ac7fee47acc2cdd59e588b872f173467864120e581
 DIST apache-tomcat-9.0.62-src.tar.gz 6156545 BLAKE2B 414f4f7193a8db2bb3d0abcbd2d8c30ede5783e83ba01229ffb322e9bf6b08d2fb10d83ce4742d9e6a4ebc50c9b047679ae798fbd3db8ae165f76d2782034d71 SHA512 7e9cad2703473d9f096009c464b28d54d3765259fab1923ef8c9b1cbfa231fa51cedadfe771a3a95abffd258759a71023e036bda78b949440a5e826fbd4e9e09
 DIST apache-tomcat-9.0.63-src.tar.gz 6167222 BLAKE2B b608c61fa0584927f4a0ba1d945a41aa626f9441305855bcd2f613fa339fee8be5fbf1b85d96efe94ea5da7dbde2721761ea91d66a66ca11dc8195e33dd572e8 SHA512 9be4b85e2c39702fc4c80b285d7df1d192ab5024452c75d77e1072438a3051dd3056d080cab4834cc9682fd641a8c9ee0484a16b8d21008b944a870016fb04f3
 DIST apache-tomcat-9.0.64-src.tar.gz 6174208 BLAKE2B 3ec55872dc73279202faae10b4825ca8cd4f5d2763c43778445b2f1aee27ed1cd765e7345276735359e3a40779eaf2ef8f9120eaca8d38af07cbbcd0584078b4 SHA512 7e01a979d41f7d73204b7a7ae5a85b0094626bf64bcfa3a52f1fc46989369d504b6dd49718084ee0a10af775cab488aae1e18ce05eb2b527800e2a693c7b6386
 DIST biz.aQute.bnd-6.2.0.jar 16669843 BLAKE2B 290aec26cb4e2248488038e6cb0919728ca0cc802b16de3f390d549d135bc1177053b75e500b9f74e47c996d20b231404d57965a3f412662730cc4c938d90a4f SHA512 ad51dc9a04fc117cd01b604559989dd7c7db776761ef6000eccdcfdab825dedc615297af60c778044e46867972a74840d90eebea9b0ff826bdbd10f4d2ec5d6f
 DIST biz.aQute.bndlib-6.2.0.jar 3156015 BLAKE2B 922b9bc78e47968bad73a26f4df475d84d8a2bca3773473b1f8c147737e652728df4e90a49d09a20943f418a91fd5acfe18e51137e85850796d95b7415bcf684 SHA512 7b7b366467b71c6dd67b3d7a7bc63d476c4aca479153bbc1506435168b0b4c792152fb5b44e2b1f916cd67f482d15956d2c38182fdfaf9679dff65b1b109a16a
 EBUILD tomcat-10.0.20.ebuild 6258 BLAKE2B 438a3004bf5f4206f8aee6b0267f9597e56981ad4a698f181e135df2cc3576f7e695be10815fce7a15207646e991ecfcfc69de13ce8325cb285e0eb75cce38d8 SHA512 d5c7815169e200036d326f8b2901342a00fe88992409eb53c956393640f791bf4e5f8030bf0389d36be9fc04ae5c2a9a3c6a22e7bca4cad2a6b080d127f0f3a7
-EBUILD tomcat-10.0.21.ebuild 6259 BLAKE2B 98aafd111b5567ed267889bef4752a77837046621215aac65425868370d22198502c2398b8633d056345529d9a488bfcb1ffd8cb02667ae9c411f1b4b888a58b SHA512 b6202ca76aea59086cc906ca4af6df31dc907e6239f9684d737b979f7e158deec7e9e24c4d33dd2c145bc6b2c60b5ec01e9288aa4c71db95c64e768f7814fa6b
+EBUILD tomcat-10.0.21.ebuild 6258 BLAKE2B 438a3004bf5f4206f8aee6b0267f9597e56981ad4a698f181e135df2cc3576f7e695be10815fce7a15207646e991ecfcfc69de13ce8325cb285e0eb75cce38d8 SHA512 d5c7815169e200036d326f8b2901342a00fe88992409eb53c956393640f791bf4e5f8030bf0389d36be9fc04ae5c2a9a3c6a22e7bca4cad2a6b080d127f0f3a7
 EBUILD tomcat-10.0.22.ebuild 6259 BLAKE2B 98aafd111b5567ed267889bef4752a77837046621215aac65425868370d22198502c2398b8633d056345529d9a488bfcb1ffd8cb02667ae9c411f1b4b888a58b SHA512 b6202ca76aea59086cc906ca4af6df31dc907e6239f9684d737b979f7e158deec7e9e24c4d33dd2c145bc6b2c60b5ec01e9288aa4c71db95c64e768f7814fa6b
 EBUILD tomcat-7.0.109-r1.ebuild 4151 BLAKE2B 2dd58aae5be3d975b4cee4852a61e97d670f7b312d0e8f6dad1f6faaaab617c1d1270f7d574b2c740432fd34818aa618c04fb488b38b29493e9ae7336a6c7fba SHA512 8f92e1f5f08be910962366c1b812b5f0386c983137fc41e20d812232ca156a2daa9062c89ad00ce093f583c67953efa3d70d24b002d814db8298e8d03827fbf3
 EBUILD tomcat-8.5.78-r1.ebuild 4749 BLAKE2B 07355b40016620c842b4b582ea11ca987bc04b4b89c65ed6228d0d94a37518d5cfe0da98589cec5985aa6d62fa701f9932c1bde8683734c1985bea6f7f181656 SHA512 2c5edb87d504df16582030f7340df7a27f845b12c95f0b342aaf5a2c88fae025ec1c8582d18312d9cf1d15cb8a0973e7f2763986690a3c3b59223832ea368cfe
-EBUILD tomcat-8.5.79.ebuild 4750 BLAKE2B a35a7ab335879705ba77fc18d1d90d07d2438073a3efa75dbccd7a5a54cb93aa53d6618b63d99f3c1c959ed0ceddc738257034aa1ccb002e686a836f65e87aac SHA512 b78bd351be7d5f111827f46e23447372eac320b3af8891106658002f44cded4c7ad404a8ff221120e5b777d29beb02d292d71503af7f1e7dfd6c0684d49f9226
+EBUILD tomcat-8.5.79.ebuild 4749 BLAKE2B 07355b40016620c842b4b582ea11ca987bc04b4b89c65ed6228d0d94a37518d5cfe0da98589cec5985aa6d62fa701f9932c1bde8683734c1985bea6f7f181656 SHA512 2c5edb87d504df16582030f7340df7a27f845b12c95f0b342aaf5a2c88fae025ec1c8582d18312d9cf1d15cb8a0973e7f2763986690a3c3b59223832ea368cfe
+EBUILD tomcat-8.5.81.ebuild 4750 BLAKE2B a35a7ab335879705ba77fc18d1d90d07d2438073a3efa75dbccd7a5a54cb93aa53d6618b63d99f3c1c959ed0ceddc738257034aa1ccb002e686a836f65e87aac SHA512 b78bd351be7d5f111827f46e23447372eac320b3af8891106658002f44cded4c7ad404a8ff221120e5b777d29beb02d292d71503af7f1e7dfd6c0684d49f9226
 EBUILD tomcat-9.0.62.ebuild 5822 BLAKE2B 9ec1e8f21e7a6b07adf51e10dec445291e86260d33b2c014848c301e1593becc7a32a73c25c60ee19570c2ec8b6ead7005f9052b3b2e503b80d38e88e03baa73 SHA512 f5de64b7838ebeff771bb1c8f6aa3ddc0ad1a929faee65aa483ef79ae8aaecf6056b633f1ae0e4f169f09422b55b9053aefaa2caab94ab2d359a932e3d49dd16
-EBUILD tomcat-9.0.63.ebuild 5823 BLAKE2B 4cb40dde75f3a89d20cd2fbf069862a0cb733499e871d4d72808424d041cfdf6e03e2226f713af663f9a56069c66874079781d72619c92fd53fe367b6b07e644 SHA512 882546993468a1743de5c3cc289fdd9da57d3b95fb8bbb5184215cd7b53f8454e3a2c49a8f765514da1545d80ee14709eead03cd919fa0b056212e80de3c0901
+EBUILD tomcat-9.0.63.ebuild 5822 BLAKE2B 9ec1e8f21e7a6b07adf51e10dec445291e86260d33b2c014848c301e1593becc7a32a73c25c60ee19570c2ec8b6ead7005f9052b3b2e503b80d38e88e03baa73 SHA512 f5de64b7838ebeff771bb1c8f6aa3ddc0ad1a929faee65aa483ef79ae8aaecf6056b633f1ae0e4f169f09422b55b9053aefaa2caab94ab2d359a932e3d49dd16
 EBUILD tomcat-9.0.64.ebuild 5823 BLAKE2B 4cb40dde75f3a89d20cd2fbf069862a0cb733499e871d4d72808424d041cfdf6e03e2226f713af663f9a56069c66874079781d72619c92fd53fe367b6b07e644 SHA512 882546993468a1743de5c3cc289fdd9da57d3b95fb8bbb5184215cd7b53f8454e3a2c49a8f765514da1545d80ee14709eead03cd919fa0b056212e80de3c0901
 MISC metadata.xml 713 BLAKE2B 8a4ecfb2190e156b77598a825550953f936ddc1a1303a95bcae173592ac4f482e81af1d7b62bc62248c20ac92cdd1dd3a9c351c74f684193085c0b242043fee7 SHA512 946fed270cb43e9c239f6f831ac2e8021526a9c3b1b8fea91d00d1b48f979273de3f7c227bce03009de04bcc8386803606864ffdb85666005d6b0ef5c49f01c5
diff --git a/www-servers/tomcat/tomcat-10.0.21.ebuild b/www-servers/tomcat/tomcat-10.0.21.ebuild
index 17405e3e5eda..eedd06361adf 100644
--- a/www-servers/tomcat/tomcat-10.0.21.ebuild
+++ b/www-servers/tomcat/tomcat-10.0.21.ebuild
@@ -23,7 +23,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-10/v${PV}/src/${MY_P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="10"
-KEYWORDS="~amd64 ~amd64-linux"
+KEYWORDS="amd64 ~amd64-linux"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tomcat/tomcat-8.5.79.ebuild b/www-servers/tomcat/tomcat-8.5.79.ebuild
index d0fb542639ea..4c41325ba986 100644
--- a/www-servers/tomcat/tomcat-8.5.79.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.79.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="8.5"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tomcat/tomcat-8.5.81.ebuild b/www-servers/tomcat/tomcat-8.5.81.ebuild
new file mode 100644
index 000000000000..d0fb542639ea
--- /dev/null
+++ b/www-servers/tomcat/tomcat-8.5.81.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 prefix
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="8.5"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.15"
+SAPI_SLOT="3.1"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+	~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+	acct-group/tomcat
+	acct-user/tomcat
+	>=virtual/jre-1.8:*"
+DEPEND="${COMMON_DEP}
+	app-admin/pwgen
+	dev-java/ant-core
+	>=virtual/jdk-1.8:*
+	doc? (
+		dev-java/glassfish-xmlrpc-api:0
+		dev-java/wsdl4j:0
+	)
+	test? (
+		>=dev-java/ant-junit-1.9:0
+		dev-java/easymock:3.2
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	find -name '*.jar' -type f -delete -print || die
+
+	# Remove bundled servlet-api
+	rm -rv java/javax/{el,servlet} || die
+
+	eapply "${FILESDIR}/${PN}-8.5.66-build.xml.patch"
+
+	# For use of catalina.sh in netbeans
+	sed -i -e "/^# ----- Execute The Requested Command/ a\
+		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
+		bin/catalina.sh || die
+
+	java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dexecute.validate=false"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_compile() {
+	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+	use doc && EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only glassfish-xmlrpc-api glassfish-xmlrpc-api.jar):$(java-pkg_getjar --build-only wsdl4j wsdl4j.jar)"
+	LC_ALL=C java-pkg-2_src_compile
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	local dest="/usr/share/${PN}-${SLOT}"
+
+	java-pkg_jarinto "${dest}"/bin
+	java-pkg_dojar output/build/bin/*.jar
+	exeinto "${dest}"/bin
+	doexe output/build/bin/*.sh
+
+	java-pkg_jarinto "${dest}"/lib
+	java-pkg_dojar output/build/lib/*.jar
+
+	dodoc RELEASE-NOTES RUNNING.txt
+	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+	use source && java-pkg_dosrc java/*
+
+	### Webapps ###
+
+	# add missing docBase
+	local apps="host-manager manager"
+	for app in ${apps}; do
+		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+			output/build/webapps/${app}/META-INF/context.xml || die
+	done
+
+	insinto "${dest}"/webapps
+	doins -r output/build/webapps/{host-manager,manager,ROOT}
+	use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+	### Config ###
+
+	# create "logs" directory in $CATALINA_BASE
+	# and set correct perms, see #458890
+	dodir "${dest}"/logs
+	fperms 0750 "${dest}"/logs
+
+	# replace the default pw with a random one, see #92281
+	local randpw="$(pwgen -s -B 15 1)"
+	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+	# prepend gentoo.classpath to common.loader, see #453212
+	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+	insinto "${dest}"
+	doins -r output/build/conf
+
+	### rc ###
+
+	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+	insinto "${dest}"/gentoo
+	doins "${T}"/tomcat.conf
+	exeinto "${dest}"/gentoo
+	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+	elog "To manage Tomcat instances, run:"
+	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
+	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
+}
diff --git a/www-servers/tomcat/tomcat-9.0.63.ebuild b/www-servers/tomcat/tomcat-9.0.63.ebuild
index e151500fc704..816509c99633 100644
--- a/www-servers/tomcat/tomcat-9.0.63.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.63.ebuild
@@ -23,7 +23,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="9"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index 13aae805e33d..0fd7af947210 100644
Binary files a/x11-base/Manifest.gz and b/x11-base/Manifest.gz differ
diff --git a/x11-base/xcb-proto/Manifest b/x11-base/xcb-proto/Manifest
index 165cd679c9ca..2172b50b72ee 100644
--- a/x11-base/xcb-proto/Manifest
+++ b/x11-base/xcb-proto/Manifest
@@ -1,5 +1,7 @@
 DIST xcb-proto-1.14.1.tar.xz 143588 BLAKE2B 24983ec26632e93ef2d0c854cd41272925b6f3aab2642701232b73bc37d200d794c46f438e4a4102484e6ac9723e78c923b99cc78ada3541f43eaf0ad7ebc863 SHA512 140fbf48483bacc7f6b70fdcf76f9e4ff0e87df9cb3a071cea47d8fe4574407cdefcfbd674099014d297e5fc010748e71d8609fca4cc32e8b25c634f928b727d
+DIST xcb-proto-1.15.1.tar.xz 147908 BLAKE2B a85a40f725b4704f23a407862626b34cdaeaecb66877126dbbeadc6993da12a0687d9965d1e72144683e15be53b7fda151480cbe7e2caa572f3b029d9c45a416 SHA512 56fd505e567e1d39b4d46d0e5f79aeb90144c9b1a4429b2f51cd326ec0dea2a5fda5e2ebfe48af0da2781a4b1e29d9a91a4e0da662db5e35a701eac2e5ec1684
 DIST xcb-proto-1.15.tar.xz 146628 BLAKE2B d7f38f1a415a7c70af372c64726e089ee454ffb981c031e4b8e93f345a1ada9dc40fb4e8b59adf553af8b4d9b7ef52730c9df56a0c24e53f98b3403346c7e810 SHA512 a333ac7c39f17ff2567419d09a9a77210c943a4e88d79eb152d416ae26bf6fb14e2446f9817abc806edd7aa3733bd4de5852b5ae90a25cbcc9d40e59c211aa36
 EBUILD xcb-proto-1.14.1.ebuild 1267 BLAKE2B d1c880832af5a8c6a774829d97fbd1b28c5cae334bc7a07ec3758f0624b20cc05cda6adb28decf3f8115e59410e49a263516d3a56fb1c244846f2a6fbf113079 SHA512 d1af50d1aacddb902f7bec51a765bdf569c3331ffccaaf2dc080af54bc01c31d2780aaf293364050d18814d8b620bbb9faabc9b89a142463655954fae53a277c
-EBUILD xcb-proto-1.15.ebuild 1282 BLAKE2B 3d45f1d315bbd6719e4d849f83b240cf666107b2c95fcf1baafbf55467696659070da4a8220e1c65d0dac6dc5d240e59c1f398bd70b7e17da5ab5ee16bb1a6d3 SHA512 4c5e2233d557410bb7d31de42faf896449ce387e118941e84b1917743b60e8e606d8c29593b9b2aa8028a9795235a8b7a848d96b5e909286233d75ffd2fae341
+EBUILD xcb-proto-1.15.1.ebuild 1282 BLAKE2B 62495920c2b8fb09286c5098173b6f7fdc9c3b2e6283fc3b0fad7a26548e1a20417de92a8e5ce100ea7e41e3a6948ad5e2f0ba1c826ec80a9befd0a10900f666 SHA512 bd9db1a66811883bb0c7ebb1e89ac58ef85bf8d8151e47600239d44c209b753d285dca3a96de3812a40bf17adb695e88b9933f4d36f026ae1e541c5bec3378c6
+EBUILD xcb-proto-1.15.ebuild 1276 BLAKE2B ff76b5820a6ecbe2c7f637a3f89560a5f779610a1735eee2b1041997972c8fd4a1f7bec1e7b3cde44c7de61d73aa1bfb2a99af4c01ed21a176a5657732923de4 SHA512 863878e4163be654cab77c5ee266051ffc458ce0b5bfa18ec2b63ae24d0f0637894dc5cb66be60c60f0242ec2948cbf1a771052bfae85e7476f61d6ee78d9a78
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-base/xcb-proto/xcb-proto-1.15.1.ebuild b/x11-base/xcb-proto/xcb-proto-1.15.1.ebuild
new file mode 100644
index 000000000000..6340da91f79c
--- /dev/null
+++ b/x11-base/xcb-proto/xcb-proto-1.15.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..11} )
+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-base/xcb-proto/xcb-proto-1.15.ebuild b/x11-base/xcb-proto/xcb-proto-1.15.ebuild
index 4c7003b79e92..f97e10505b65 100644
--- a/x11-base/xcb-proto/xcb-proto-1.15.ebuild
+++ b/x11-base/xcb-proto/xcb-proto-1.15.ebuild
@@ -14,7 +14,7 @@ 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"
+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}"
 
diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
index c191051eaba9..3919245995f3 100644
--- a/x11-base/xwayland/Manifest
+++ b/x11-base/xwayland/Manifest
@@ -3,6 +3,6 @@ AUX xwayland-drop-redundantly-installed-files_v2.patch 745 BLAKE2B eb9a61b2746c7
 DIST xwayland-22.1.1.tar.xz 1272176 BLAKE2B 5dabf9d6cf6ed217cdf5694dba9c63059bcc43e2bb413c1edcd5d8775a906270b28e9dddb90bedacdefe27bd792339c346782511102b42250e2a940aa664e9cb SHA512 435cdf59f2be1ff7cb3dbb04e7a8920d9c48471fbeffca96c9dab2be400b168bfdb73b9e818829c555ab5d6fd83345eb693b3ba785d4ef701bdb27c8344077b5
 DIST xwayland-22.1.2.tar.xz 1271848 BLAKE2B 2efb3111396e1ed6ae6a4489c6d8612d511daea95edf456e60136185db9a69f937f0ab838e3c3095b76f9221d3b84ec0a1a7424f849e69d26eada0b988ebb675 SHA512 c8620169f16c2bbd592dbe77bc1f7a2c27a78f49a89bf966d8a449b7faacd69f5ea4aac7adb5b75e06dcc5efca26a2141c9b5d4cf6a592ec7882bad5e235bce4
 EBUILD xwayland-22.1.1.ebuild 2024 BLAKE2B 303818387b24dcda4732e955da2198a1644d58bf8db85663d81644a0fd2bb1bbab88f4880f6dd6f1e169f88fec87d1161144829c01b54bc34e9c25a28c5be291 SHA512 9adb330f7818976f4bded0141ac3c4c3f1aa22668effaeebc29e781162574ff6dbf925b1cd82cab8cedc6bbf7b69b86c377d9525428b921bc3be8ab49835d529
-EBUILD xwayland-22.1.2.ebuild 2030 BLAKE2B 4ada48a4e50637f5cb12787d34aa29069d534c4fcbb672a57b8e99889927d963543eb3e70e69506f9ce121670db3d293529d0caee6a392a100763e924d6d7d49 SHA512 833f3dce21485744fe04ff6f6a27c5baf8997744e590e5b0d7a831e975f4f2a4902f56779d44df935f73551252a2da79c582072e85c8f3016ef9a7a94f661927
+EBUILD xwayland-22.1.2.ebuild 2025 BLAKE2B 4d152697cb01711c1349f6bbb0c8a7a70377bf14fa580c09a1cbc610245abcd66b9ffed89fb50dc3b5a2d2ea767d34f4f2946e5e2d9a18a423f8cc56b09e5713 SHA512 81318e471dec813d599e78882597d6ab74e85c3062f2df502d9eb6e9ef1ed1685727028af90ce7e9401f8115771b2c16537ae5c691b5d231d30c360b4824e0cf
 EBUILD xwayland-9999.ebuild 2221 BLAKE2B 7e7383bfa79c1aa60274d44068f63cd06f59c5e4f1c93b78660989068fbea140e2e9ed294a78466bcaa22fd43bae7c7d085f82d498180e7b8f1a08b905c204c7 SHA512 b3cfdae1ada3028a22afc4ffaf1165a8cfbaba345055afea7a4a35649c1900f9f12def59956309eb1c0f80304ce1f00b21566096743d41abd5f2032f367e070f
 MISC metadata.xml 450 BLAKE2B 9bddecffad64304a7d32a52c921ca817db03bb90315ebdb64710def6dfd5a17362e319de94fe26ccb5def82996917005bc3a77b4f673cf19a4f4be19d6d2ffe8 SHA512 13fef8a30ada7880d900603b361337757f93eaeb1d61d97d1119ab11633c1128926ca61c8249d00fa4fe2756191f5f01c974036c9d7ecee0457c0629d8f0da11
diff --git a/x11-base/xwayland/xwayland-22.1.2.ebuild b/x11-base/xwayland/xwayland-22.1.2.ebuild
index 9d1c7632d0f4..71630bf0a575 100644
--- a/x11-base/xwayland/xwayland-22.1.2.ebuild
+++ b/x11-base/xwayland/xwayland-22.1.2.ebuild
@@ -13,7 +13,7 @@ IUSE="selinux video_cards_nvidia unwind xcsecurity"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="
 	dev-libs/libbsd
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index f0b7fb17cfec..67e657dc818a 100644
Binary files a/x11-drivers/Manifest.gz and b/x11-drivers/Manifest.gz differ
diff --git a/x11-drivers/xf86-input-libinput/Manifest b/x11-drivers/xf86-input-libinput/Manifest
index 466db60879a0..1dc3955bbafa 100644
--- a/x11-drivers/xf86-input-libinput/Manifest
+++ b/x11-drivers/xf86-input-libinput/Manifest
@@ -1,5 +1,5 @@
 DIST xf86-input-libinput-1.2.0.tar.bz2 358985 BLAKE2B f6fc97c4cb81ae61604d2a56063127a5a9a548c529eda9c506a77d8591b9a439cd0fac9c471e7429fddac6e8c4c043087e53d5113ac62c8bdb5b11381f3d5dce SHA512 ebff9490d33fd7495df2e03203060a76b3274f0e638bc92f3d95257fac57cdb9dac308e90e54006fe9522b6de3b1f1c38fd5f0b0b75b7051e5422290f43de52d
 DIST xf86-input-libinput-1.2.1.tar.xz 312324 BLAKE2B 2ce0419b19306f38cd8adb4159270b3943893032480325243066800cb1256dc1e497756da004f42510a6f6c78b1a3b73a41feccc66d5ce9c7cf40595008abebc SHA512 3decf694861d1aa3c02d090e66c5ed5513818cb18e9863f1790e0c8122a972230fb903705062b8291e1709db9098623f1205c63ccfb68e552e104813414589c7
 EBUILD xf86-input-libinput-1.2.0.ebuild 460 BLAKE2B c010f570daf37a294af0959dca737969b0991f1abd4ab80729129baf3f217f821b5d19b9dd433bc82dd61c651d871d685a16327d3b177c317eaa0438b60741f8 SHA512 d49995162bc85da6d24f1a4de4ba6fc14d286c2d806f1df68e9fbe6aeb27de0d7dafdaca24053e318e9053769ae5069df7d19d44a365de8e9de42fc7f7fe7f85
-EBUILD xf86-input-libinput-1.2.1.ebuild 499 BLAKE2B 8463d9860ae80672f31b2323e29251c501676d777d76051973a9ec0cd2c8e96fa04b795fb63beda08e0e091a5b4fb9192928e4a9b98900ef99a01a3a46a74fb0 SHA512 e43062f5a77d152fa80f163cd4223abc5b23a7ecbdfee0e87270a31aa8d1a845a103542fe937789d7e3813c4573c625c73804c00b9f455aedefb77c8fdf7531e
+EBUILD xf86-input-libinput-1.2.1.ebuild 493 BLAKE2B 2619e3ded80ad41494ae7991c1eac03d3a3ad9ed16d83b40f5cb147d5c07a3c22e51a834a5043e44f5c64735809e426277190c918335184e2a1c9f596c5b17c8 SHA512 77d855488709b393c224c42289df3f90e435b30584fe6c33a429d7d86802f42c689a5d052fd993ec016c658b8256bc65349392f697eb7865a94f75b4147a5e31
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-drivers/xf86-input-libinput/xf86-input-libinput-1.2.1.ebuild b/x11-drivers/xf86-input-libinput/xf86-input-libinput-1.2.1.ebuild
index 7c2dc62a9259..0bea7a2a5ac8 100644
--- a/x11-drivers/xf86-input-libinput/xf86-input-libinput-1.2.1.ebuild
+++ b/x11-drivers/xf86-input-libinput/xf86-input-libinput-1.2.1.ebuild
@@ -8,7 +8,7 @@ inherit linux-info xorg-3
 
 DESCRIPTION="X.org input driver based on libinput"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND=">=dev-libs/libinput-1.11.0:0="
 DEPEND="${RDEPEND}
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index a838c430a268..b378b9053122 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index a8685e76f8c2..5b38f5011b4e 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,6 +1,6 @@
 DIST libdrm-2.4.110.tar.xz 436372 BLAKE2B 0d5f8bfe47bdcc96ef7dbe3ecf2da0b21262bae4396fa1e73c0f728d970d041a9925082c4526bc71e00f110c2eb0ba94313d9a7c27a2d4676073fdbc3708c628 SHA512 52f92ef1fe4c218a1d7dba53ef43334dbfca80e3209afe59f3a32c4bf67473126534e990df07a931a12d46a3b997c21ef17c1c4d8a0c88d44d5c6c040e3b6be3
 DIST libdrm-2.4.111.tar.xz 447388 BLAKE2B bd1fe6a1af3dbdd542ea9d3b887121d917c11ef9c3c0074bbe5d18ffd15050e2df63c744aa5e559e7f8a1f1e9561d3b2ba8b9a45ad72d7c1e6393b7eae99cf54 SHA512 17e92e9e4ded8031ac222764bed7e9ff430a1a377f5e435f6b62b4a7f45cb4c4b769b3b79fbcba11512c1ac973abf8cdcca8e0b9659ae095e915d3d5efcf5516
 EBUILD libdrm-2.4.110.ebuild 1971 BLAKE2B 0493208ad962927697e870e8dcdbc7800d184472c7ef121c192a6ea84e0aa1594b9ce72edbb8eec7a2467e6fff756e3bb682178c6f72286e74ac1e0e6fb6beb2 SHA512 944f92796f65158e3974f3b57eaf76237e2ecbbe144dbbb9fb345fa68b8caa83a4fe11f1da74d277d1b860aea66e4c3d351579d134bd3d5635eedb17e37be142
-EBUILD libdrm-2.4.111.ebuild 1950 BLAKE2B d892aa28a9055968915a2eb329ca9ac49bbcaec0ae4f417f46d7fcf0641c2ee95086d8b09d3b433b0d07e452db95951f8c80e0ec8466fbdbbe03a60459a0652d SHA512 a2f387299e8d2446a63efb5f7c80061414143dfe8dde9216c7d6f3d9a6f50e1820f97f27fa7d5977d84b0f83e5119e06c0eddd2e290b773f730744160538fa2b
+EBUILD libdrm-2.4.111.ebuild 1944 BLAKE2B 256813710721b83bf46d5896bcd1659b69c57a287cccfc09329a824d58aa326abf7c8d460ea05fe441db5d9d3f5e6b8b58420eaddcec9e0b2e8f8f0f68dc92c2 SHA512 0182fb9782d2c2f00f01bb90ae4dbb048ba40515027558517fbb95b433a886cb18cee65726bf2effdf1799cd5db44af8a48aca70a994c7b5c63d2b702c007900
 EBUILD libdrm-9999.ebuild 1950 BLAKE2B d892aa28a9055968915a2eb329ca9ac49bbcaec0ae4f417f46d7fcf0641c2ee95086d8b09d3b433b0d07e452db95951f8c80e0ec8466fbdbbe03a60459a0652d SHA512 a2f387299e8d2446a63efb5f7c80061414143dfe8dde9216c7d6f3d9a6f50e1820f97f27fa7d5977d84b0f83e5119e06c0eddd2e290b773f730744160538fa2b
 MISC metadata.xml 407 BLAKE2B 1ec724640ea057ea29a6c84f3dcd34cb6a3f4bd7731c00d486688c9ec1dce393133e58b86ade00e51f91c80fe521e8829cfb796bd7cdc2e3d8c7be450d4c4188 SHA512 b54da0a8739fda9bb388e9893d992323247df89d9e97d20f29c62e64b189bf38092615cf113ae5048ce223270ebfaa128bb6b5fa119e5e8c8cdf2bda76a64769
diff --git a/x11-libs/libdrm/libdrm-2.4.111.ebuild b/x11-libs/libdrm/libdrm-2.4.111.ebuild
index a8ccddd22d1b..0b295ed43844 100644
--- a/x11-libs/libdrm/libdrm-2.4.111.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.111.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
diff --git a/x11-libs/libva-intel-media-driver/Manifest b/x11-libs/libva-intel-media-driver/Manifest
index f81294102eab..db855752cde5 100644
--- a/x11-libs/libva-intel-media-driver/Manifest
+++ b/x11-libs/libva-intel-media-driver/Manifest
@@ -5,9 +5,11 @@ DIST intel-media-22.1.0.tar.gz 26188730 BLAKE2B 7ade4b25d2fe50ed6c3498c37f0fb39e
 DIST intel-media-22.3.1.tar.gz 27302226 BLAKE2B 24ac80adcd9a72f9e9b7db4b878715233835f2b69a25d1029538fb87da1fa49ed3c0606478a8b24e198f0c366003ff315e31972c7576e9ff2ecd8419e12ab150 SHA512 286f974a11546f8541429230330c5bd514c5eb372d3278461a132fb236f19908aa544a44010e52981bb942573ab6c2047c8c03471517182e2daf2da87b0eb74f
 DIST intel-media-22.4.1.tar.gz 27407593 BLAKE2B eed738064b6febc17e93f195f81f71be55cb539f0bac1a90b0a60695b89ed2eb8deac5da3a646bd178396ace8e68c35a8e58fbebd74e6298aea6c1bd505fd482 SHA512 7615c76d501f9fa127da8465c4f5ecf8067b0374e14ee699b874ec7b4dfc131630901e2ec4d85e420b13c33bb1431938adefb60add7e1abe7e7351bec5e6322c
 DIST intel-media-22.4.2.tar.gz 27408373 BLAKE2B dfc72e1188eddc47207f7def060efb4852aaa57971d26690657117facfab8dbfc7f3a249bb1defbf52ed2e3db218f5f4eedcd397e25d8f790bf472c92d058bf5 SHA512 1f32709b80cd25006e2156e4487d75d07ff5eb337164c6aaacb92385dc31c1ce0c80a3c7062c830f89674d70bfedd7f81e4f34ea4d1dd8adb4da0d2212e744ea
+DIST intel-media-22.4.3.tar.gz 27415572 BLAKE2B d4298d6195cfd160c3bbc0789e2bbdbfe4ffac2fe592b697d52320e60c62a542902d8610c1a1a41ce7f79bf80bce7ee386cfe8b8e4b10509066dff8e6b52deee SHA512 9acf38fc0ffc65a7ef39570a31e9403600b1c6fe532a741ccdb26588e056a4bb0e5a53290942a026f4813b86db95d7d1eb3166682a889e482ac1645c6ce8aba4
 EBUILD libva-intel-media-driver-22.1.0-r1.ebuild 1368 BLAKE2B 5f58f95f23416c6dfa77cd61e311c59448a5b1dadd3280115d17176bb392607320d3b4b00324cf80c7bfd953cf8365edeaed562edc7117ecf3a3f94c7577a00b SHA512 b24aa898bb3c48126c0e85f886cc564eee38f611d8ffb21ecc163b070814e526262892b7dc6d99fbec302345d2788b98c335734f82258d68a0357c0de9c8ca38
 EBUILD libva-intel-media-driver-22.3.1.ebuild 1368 BLAKE2B 6867cae8428766be791e91ecfd074062ff94a26a36cbbfcbe1d18136edd32b9a2245a1abd3799f18985a3099165098812ae400e3ef36cd063de6343815fdbc16 SHA512 9546f6afff8f11566e0f4b2f6b1862d31b766b383f42ffc91edb4282711e72bb1260972d8a049f777526e6cfccc970780dad9b48a2372cb0cec1faea8c43999d
 EBUILD libva-intel-media-driver-22.4.1.ebuild 1369 BLAKE2B 93487cf7effcc1749b455c7459195f0e4ea9a802e3f12b22bef4d29d928227c293e0d18ce713f1f2abbe5784fde6171f33447c8eff9d176d62fb69a9133ab4c8 SHA512 7635e220c3ec9c69c6351fa87867570971a07a65054b911e982b05c191d45c53c10799d37932482f4500481baced5801d1859d805735b9f584b1a54f4cc32d32
 EBUILD libva-intel-media-driver-22.4.2.ebuild 1369 BLAKE2B 93487cf7effcc1749b455c7459195f0e4ea9a802e3f12b22bef4d29d928227c293e0d18ce713f1f2abbe5784fde6171f33447c8eff9d176d62fb69a9133ab4c8 SHA512 7635e220c3ec9c69c6351fa87867570971a07a65054b911e982b05c191d45c53c10799d37932482f4500481baced5801d1859d805735b9f584b1a54f4cc32d32
+EBUILD libva-intel-media-driver-22.4.3.ebuild 1369 BLAKE2B 93487cf7effcc1749b455c7459195f0e4ea9a802e3f12b22bef4d29d928227c293e0d18ce713f1f2abbe5784fde6171f33447c8eff9d176d62fb69a9133ab4c8 SHA512 7635e220c3ec9c69c6351fa87867570971a07a65054b911e982b05c191d45c53c10799d37932482f4500481baced5801d1859d805735b9f584b1a54f4cc32d32
 EBUILD libva-intel-media-driver-9999.ebuild 1369 BLAKE2B e7a9336e295f00875c9eaef26a47113e5e94fd804459b3c17ec7ada98ae2ab70760d13ed9eff17295465e79c54a26ace0f5ba5d2bb3fca7a431bef7aa7b503dc SHA512 171e12e7d4613336a534bfcbac98aa53e68ad64a00edd21840c10f4db848803ed3d254c82a32c54fe99a02b401b7afb0782c2e35b7a453068208cbfe91ffc717
 MISC metadata.xml 506 BLAKE2B 22e3db4e87af8f032b2f02d18937c894524ede02e6a408cee8f8fddf492cfd2ebc8de6ebe8e2e1786ec81f119a09d3abb50dd2617c7651ff2082986d66421760 SHA512 5f7ebdec168766dc148294d92b1a6f6a355293a78ff8c879d1de94dca283ecfb9136bb0f124f41af15256f31832c2b034452a2b4d0ea0616a36b2576b7d8da58
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-22.4.3.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-22.4.3.ebuild
new file mode 100644
index 000000000000..9a49528f5647
--- /dev/null
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-22.4.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	: ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
+	if [[ ${PV%9999} != "" ]] ; then
+		: ${EGIT_BRANCH:="release/${PV%.9999}"}
+	fi
+	inherit git-r3
+else
+	MY_PV="${PV%_pre}"
+	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
+	S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
+	if [[ ${PV} != *_pre* ]] ; then
+		KEYWORDS="~amd64"
+	fi
+fi
+
+DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
+HOMEPAGE="https://github.com/intel/media-driver"
+
+LICENSE="MIT BSD redistributable? ( no-source-code )"
+SLOT="0"
+IUSE="+redistributable test X"
+
+RESTRICT="!test? ( test )"
+
+DEPEND=">=media-libs/gmmlib-22.0.0:=
+	>=x11-libs/libva-2.14.0[X?]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
+	"${FILESDIR}"/${PN}-21.4.2-Remove-unwanted-CFLAGS.patch
+	"${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DMEDIA_BUILD_FATAL_WARNINGS=OFF
+		-DMEDIA_RUN_TEST_SUITE=$(usex test)
+		-DBUILD_TYPE=Release
+		-DPLATFORM=linux
+		-DUSE_X11=$(usex X)
+		-DENABLE_NONFREE_KERNELS=$(usex redistributable)
+		-DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
+	)
+	local CMAKE_BUILD_TYPE="Release"
+	cmake_src_configure
+}
diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest
index cbb428bd159c..3991f526acd0 100644
--- a/x11-libs/libxcb/Manifest
+++ b/x11-libs/libxcb/Manifest
@@ -2,5 +2,5 @@ AUX libxcb-1.14-tests-don-t-use-deprecated-fail_unless-check-API.patch 5795 BLAK
 DIST libxcb-1.14.tar.xz 439404 BLAKE2B 63605e02dd32b4d26b3ac6d3b93b7383dbc30701b9a063e8efa5b387215c9325196451f80c7b0b357df1773c6fd1224eea8eeca2a456055a2cdc61082c726111 SHA512 b90a23204b0d2c29d8b115577edb01df0465e02d6a8876550fecd62375d24a5d5f872ddd5946772ddba077cadce75b12c7a6d218469dc30b5b92bc82188e8bc6
 DIST libxcb-1.15.tar.xz 446492 BLAKE2B d50146ee9b822dfd0c24513110e1706cda05ce588f276005167a911d3097275f36be1ce755c42c2b2970e750f10b2b943f3e373b6e55865fba986e29811a3545 SHA512 f6c7d766b7cf9cab6abe948ee424cbae6951dbfe2f76fa58a109cdc05b0f0919dcc4e38176a22ff4b95fc1e38596115317e32ba33b24cae0035a4e30dbcbdad9
 EBUILD libxcb-1.14.ebuild 1500 BLAKE2B 31d68d2b246e4da3906e3a1507fa83a151a9ee3b66427192dc1917d95fe3e48c43765b8284d8f074d2f8a19c82e2f1055f36aac4c515f0096339547ce753e57c SHA512 6e86fde7e6b6c011b81b946a6a1f22070285d75e8001dd9a31e059e9579287b2c863425c505dac0de14ccf613541b660d06e771313d4b639ba2d2db8b91e1ed1
-EBUILD libxcb-1.15.ebuild 1427 BLAKE2B 2f951f68b04f71599829c502b240cb6a028f9ee62d521b7254ffe203a91ab39918783f8b335b2a829813bb92e7ee009b414d0387d480c1d2fe312e7d328508ea SHA512 8723fe98d3a9ca995e587deeb1c49c44b78febfddb1ee81cd543ece1786dcd3e6f18f9a00118d5b6c38317d5ae95f69e460f1333da9f9121b71510b551b0aee1
+EBUILD libxcb-1.15.ebuild 1421 BLAKE2B ea764fad22c6d88b74cbb57cafaa5bb9446d5c439c2a75705097171427b68225993cc8c8ee099222636e6b3ae9313d75cac4e48c296d66a95e4fbc2495083520 SHA512 fd2f74bf142e2f7bbdbcb8ba9b6ee79d8c6c246f9c809cb23a3d963218fae6f3cf6b8c6d1fcc0a72c52c5f57194e756d6ae59832861cfd7babc508cca78a73ed
 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
index 38cd08cb34f8..bd387bfcdd07 100644
--- a/x11-libs/libxcb/libxcb-1.15.ebuild
+++ b/x11-libs/libxcb/libxcb-1.15.ebuild
@@ -15,7 +15,7 @@ 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"
+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"
diff --git a/x11-libs/libxkbcommon/Manifest b/x11-libs/libxkbcommon/Manifest
index c02987415bff..0e6a777dec54 100644
--- a/x11-libs/libxkbcommon/Manifest
+++ b/x11-libs/libxkbcommon/Manifest
@@ -1,5 +1,5 @@
 DIST libxkbcommon-1.4.0.tar.xz 471948 BLAKE2B 5b0a155a3a47adb7302db01f3daa0ef81993a9754b032b01f1cdbd53af74d15df95dc6c9334860211a28272b246f66978ad6e409db74a242afb13c17dc25b76e SHA512 7dd86952c036a6a78455b1ba05b53fcff9d6f133bb01c83fa860b4eaec3fc26bb0b5535948bcc2dafbd27204c3c91d01404ca9fc52896cc36af509384797d4f1
 DIST libxkbcommon-1.4.1.tar.xz 471824 BLAKE2B a784f3612bb52abb79bf1a2ddd3e7709fa52eddce5cabcf8520ed7df8ec8ea557e51205e1e9d116a0b31eb27b1f3bca33144318c5f01be7312cbb3e48f687fbe SHA512 757b340aeab6d187917807a88015b5113475ab2172aaaa8e530b40ea60619b3fbdfa668fd62707d66ed8fb763e68fee19394fcbd519af7c01d8975c59fdf0d89
 EBUILD libxkbcommon-1.4.0.ebuild 1545 BLAKE2B 298465c21b402115970f4e407832afaae66e78da6b55d3def4e07b8974e431a9131e103ca49db3377d88b72d178d53a0c02c0674a51570358a1b059e77de1ea4 SHA512 a26476ddf446e7e27a5e544ac0fa59c665b1dbc28fa2d09a3547c44f1d83983096e15533b867309188546675bc9c664a30bef12373213c40b67ca9e2b66beb72
-EBUILD libxkbcommon-1.4.1.ebuild 1552 BLAKE2B 71bfc2747bfb9726fdec31ee0ec0386427da53c5c8bcf986550af64d692c1cf1ca851042221befdc21836b159710bb2008b6874944a982f26c19513ffc58b7da SHA512 845e8f2d068fc455dec422b80b29cd2b613b4c7780e2ff5b5cb85ca6ffc697b75beed54da3add2021746800812ea74eb2c1f4c719506efab4de35954a178dbe8
+EBUILD libxkbcommon-1.4.1.ebuild 1546 BLAKE2B 46130805ce7f44b3e8c65cd9b01ed4a8ed803c888ba88d9a4109b920a73461e3ef76916c1028eec153c704a5728c2a0d46022b6f33b69734f71dc28a62ea9a73 SHA512 baf464731b445e85309edd2e111ad6807ab1ecfabdc3176184a9328bc679a3c5a72c7a3e540ae8f5338c639b75a40e737cbfa4699b0d1424189efeceff96919e
 MISC metadata.xml 392 BLAKE2B 387cc216299e7c312552b0fa7abdd744203daff7bc5a51ef5b7d2bcfd39b83904308c8bb2b66f2459f77f593e18fc8ade017491fa45e698e8e6bfce03a819df8 SHA512 0ab9850b467605c1050d70ca526d2a4c2957e3ec9f56113fcabeb9d4a79cb8636ab077f66e17c7e05b79aad6948a7e89a83e5d8c48197ab016a7f5b2f2886f42
diff --git a/x11-libs/libxkbcommon/libxkbcommon-1.4.1.ebuild b/x11-libs/libxkbcommon/libxkbcommon-1.4.1.ebuild
index 23a22a86c0b6..42877660736d 100644
--- a/x11-libs/libxkbcommon/libxkbcommon-1.4.1.ebuild
+++ b/x11-libs/libxkbcommon/libxkbcommon-1.4.1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/xkbcommon/${PN}"
 else
 	SRC_URI="https://xkbcommon.org/download/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 PYTHON_COMPAT=( python3_{8..11} )
diff --git a/x11-libs/motif/Manifest b/x11-libs/motif/Manifest
index bcd46bdf884c..1dbdc897b6c1 100644
--- a/x11-libs/motif/Manifest
+++ b/x11-libs/motif/Manifest
@@ -3,5 +3,5 @@ DIST motif-2.3.8-patches-1.tar.xz 1896 BLAKE2B 7234860dadac55362c7f1804133a660da
 DIST motif-2.3.8-patches-2.tar.xz 4068 BLAKE2B 5466f824d71edd1d787eebe5b1fa09de5b52ffa20cdf733301722c4f1d7509af8084f226d68dcba14c2e8d15d5b1ea7d49e408eea8f710af3c0b27c86aba444c SHA512 27e10c2a5b3dec8597acb04940bb8e000fc43c325e5b6f578246ab4187ef34264940369bff1e9c999ba967e85e093434e16a447f1d4da805d0a5ab1576e5ef80
 DIST motif-2.3.8.tar.gz 5704328 BLAKE2B 3755b7f46e50240e1e9e7046aa439fa89872e54ae5d03860383f509b6d0f09edf85bd7d92ea4d37925efd2e44401028aa2752d940c42d9cccb652b2bd1d85459 SHA512 1ab8e8eece25ef97e948592b5fa3e19d98e932695290a18b7a8e90f1aa2766bc4f082bdbc3999dff5660e684821178a149040f76bb477163e53ca06474d02b55
 EBUILD motif-2.3.8-r2.ebuild 3055 BLAKE2B 9e910be57aa656ff5234012c677c669814505537e78e6a56cecd0b97f14c94eb081332d8012972581d12fe8c4a0927276457f3a5e81d9429b2644973ea6df540 SHA512 465c166e1c5a6dd46faf07a915b6abb505ba04355e537cb43bca0447af5939c3a6ebf6a13d0f88adbb811c82a44febae2797e75cb8103c0464fd25caa4abe97c
-EBUILD motif-2.3.8-r3.ebuild 3053 BLAKE2B 5532b2a0fa173069c2198b7de210ed3ccec59b96b3e10f199cf464a6a093ede066929f8e43be773a4ad22a02b0fd09cf38846d87f22358728014e29f4583b2b4 SHA512 bc550f0d4d8204875a58b2921ba166ef018e4dd51fb005d532159bf37cb65b3e8b452e05f0ebb5efd133a5b39827f341f4ba0b641a6cdb0312e7b4a3666f11d7
+EBUILD motif-2.3.8-r3.ebuild 3063 BLAKE2B 742b397c44535b94fc12a2ef76570ab5ad460364759da4db01a292fc03ab36ad1609c59b4e0956c30a6b5c3091eee7502d8d64c458e633702f1f672df9ac745e SHA512 96da47b671b947d2a105e134708c27a874c02eb470bff197667e3650f07e55c3723aed72af11508e31880035c90037d367256879814159fdfbcbacbf5fcfe695
 MISC metadata.xml 445 BLAKE2B 4cfd68cffe9f6c0fdccff74526669d1585ce47949682b911becb4508f40a13493be2a55b5cff6a90c0c9556b330a96bb478dbef2e1b16e4f4baf7a323d88ada3 SHA512 d8ada4a3a14db837ab11752d55bfec960de6a631fd4bbfa569dc4a09d8b3ff3f6908339888e83ad56c716ae9d940111c36030db870f2765b86db2303ed2fbaba
diff --git a/x11-libs/motif/motif-2.3.8-r3.ebuild b/x11-libs/motif/motif-2.3.8-r3.ebuild
index 59092ddaa9c3..61eca89704b2 100644
--- a/x11-libs/motif/motif-2.3.8-r3.ebuild
+++ b/x11-libs/motif/motif-2.3.8-r3.ebuild
@@ -13,14 +13,14 @@ SRC_URI="mirror://sourceforge/project/motif/Motif%20${PV}%20Source%20Code/${P}.t
 
 LICENSE="LGPL-2.1+ MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples jpeg +motif22-compatibility png static-libs unicode xft"
 
 RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
 	>=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
 	>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
-	jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	jpeg? ( >=media-libs/libjpeg-turbo-1.5.3-r2:0=[${MULTILIB_USEDEP}] )
 	png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
 	unicode? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
 	xft? (
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 9202031fe6c4..dc54fee8106d 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -4,5 +4,5 @@ DIST pango-1.42.4-patchset.tar.xz 6040 BLAKE2B ec3f1a6a4de30e0864e7f0bf0950cb7a7
 DIST pango-1.42.4.tar.xz 833876 BLAKE2B 7de1094a29750b9e59ea1e5c92644fa5d6b835828d027963a53cce3f204ee1ea0042ec492e209de9136f05ca131ccda959bc477d4f6e9c72e5f620ddf4235f26 SHA512 993e97f647eba0c5ed90bcfcb8228bf67fa3f20b1f4331e4e40a30788d7c3ac55eee1209471bf21df125cb8fc6121acc8062a9da2f8a7d6cbe8e9ad13a9320dc
 DIST pango-1.50.7.tar.xz 4294752 BLAKE2B 049b7c09f2ec35ca229eadcd146513d2b292fac8c2296a1635f32c1e21a2ff14979c4ce4a88f966d2d85dad55e356f089c09e00062d06373f7d0760871333046 SHA512 4d754ed753fc34074c2a8751459406af7eb1eccb227c6158287f7e2921614d918cae47d078d4a2b4c098b641e40274e81bf1ec6b6a1b147efd550626665767d3
 EBUILD pango-1.42.4-r2.ebuild 2317 BLAKE2B 7bbc0227f8b846c1e51cc142e7a3088ec88c2fdc35fff8970daf3699e94e369de66380fc140aca039accd546270be27c809e13c0a71d42ae8df19f64198d22c8 SHA512 8c1c0f11ad9ecbe7f464e7b839de614e4f266d2674b843d133489b882270f02754c61b05f2624a2b4c9d571b7824d2a142ccc2105e2c7e968fc26e97e2936c1d
-EBUILD pango-1.50.7.ebuild 2277 BLAKE2B 84f35ec9d7ea21745d890a988449b268dde8fb8db94c987d956058281a1606a204afab19bdb72f38e1844ca8be59188abdc76ce8ee00b2117376dd3fbe757a09 SHA512 53866f9fe136db9ef07cb6e89936fe3e2218bac3840d0e189a81a4b3924a772e71be84577433b284bb79c40edc8135ff131b777b3c2d909c030fe0734b747a3d
+EBUILD pango-1.50.7.ebuild 2342 BLAKE2B 875607c2d0be3fea17df3e74b6153bef9ec154e6f08fb36b0a4bd2b2a40263bdf0d546850d9515b4ddf14584ac48bba3e0d2178173ef5967fd5a821529156e93 SHA512 6085bf6b8cc8f4bb2e7d4aaefb6125bb352217b818b4fddc08e9b0f2c130cf38e1372198bc48d777113156f66520c4fc98a264fe71830e7307dee8fd3d776888
 MISC metadata.xml 523 BLAKE2B 623788e7504fe89c7d8604eaa2a6b1ab5fb022965eaa3044dd2a94b6f68638453011257659c0f17b7ced9b6945acb3eb4767f9fd3ce9686b69b3b60b867dcdfb SHA512 a60feab6e4e50cb9b477f388d4534eed4616fac6aca4f6eae450fac42bfa9ca0d7382e36b98a159732f9c6926162cb2ea55d72a644bc77629ff09fd0097226eb
diff --git a/x11-libs/pango/pango-1.50.7.ebuild b/x11-libs/pango/pango-1.50.7.ebuild
index 0e00b0941644..01f3c6c62e73 100644
--- a/x11-libs/pango/pango-1.50.7.ebuild
+++ b/x11-libs/pango/pango-1.50.7.ebuild
@@ -13,7 +13,8 @@ LICENSE="LGPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
-IUSE="debug +introspection sysprof X"
+IUSE="debug +introspection sysprof test X"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/glib-2.62.2:2[${MULTILIB_USEDEP}]
@@ -37,6 +38,7 @@ BDEPEND="
 	dev-util/glib-utils
 	sys-apps/help2man
 	virtual/pkgconfig
+	test? ( media-fonts/cantarell )
 "
 
 src_prepare() {
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index b6f54036048c..bfc4c5fb4494 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/py3status/Manifest b/x11-misc/py3status/Manifest
index 1082a171f6cf..1a63eddccc93 100644
--- a/x11-misc/py3status/Manifest
+++ b/x11-misc/py3status/Manifest
@@ -1,3 +1,3 @@
-DIST py3status-3.44.tar.gz 413211 BLAKE2B 0287f84de34e6674987d898a3ba288e348c897b5489f9fad74d092a70963e31403f0237a2547750c97a915e4f3703c5bf327babcdb3aafc3a03bfb0280b90e5c SHA512 f135c5793759350ec4c58af8b80e56e3c25359675da7ccd8e6c1da994f67df13259a3d4f2b9d9047b9fcb0bf14f08526630a60f0f148bf364ce874fc13fb162a
-EBUILD py3status-3.44.ebuild 886 BLAKE2B 06c4c89fde351654e7c7bf9b50662356e226a67933e302d9a2013216ee6717e923c134d7cc7a618bf96b21d4ee7200f4ad156fdb78286088017e8c316ff1ae3d SHA512 9d4d945ca504187f5634b5cfd76d3348fd758eef6b5436acb5b161797df21a99eb9e9d250445fbf15dfc735bcf17072ec1bf4dcf5cad5e69644087dc78d21e4c
+DIST py3status-3.45.tar.gz 415867 BLAKE2B 4484f8b9e4a8dbe19427d4083679bf23a961908fe63c4c58f3bba14b77d3584cd0e8e237290907f2679573713a5964818e98ee4addfa59157989624d9411f310 SHA512 e121a60cd2c57e1e3525e15fc165d44cd18ea6e2bd3aa704ea826ea0297ee66385b8ca3b88aadff89b7dd77771dca895fc51efce241880e99b8510a162a7334e
+EBUILD py3status-3.45.ebuild 886 BLAKE2B 06c4c89fde351654e7c7bf9b50662356e226a67933e302d9a2013216ee6717e923c134d7cc7a618bf96b21d4ee7200f4ad156fdb78286088017e8c316ff1ae3d SHA512 9d4d945ca504187f5634b5cfd76d3348fd758eef6b5436acb5b161797df21a99eb9e9d250445fbf15dfc735bcf17072ec1bf4dcf5cad5e69644087dc78d21e4c
 MISC metadata.xml 758 BLAKE2B 640668524d2db72abf19e3acddfb502b8adbf71e397a1b37f6179ecce65abd361ee81a3821448561ed350d5f62c711c726dd8ff8e03d8980215934de2ce73b9c SHA512 cb0875ce9a6477d4c1a1b67ea25e67d0cc397d81c4021301e5f52e9a50b782cc44958060aebfe1bd03ca087d4e5d29a0b7dcc826eedf2694c238a2f211912460
diff --git a/x11-misc/py3status/py3status-3.44.ebuild b/x11-misc/py3status/py3status-3.45.ebuild
similarity index 100%
rename from x11-misc/py3status/py3status-3.44.ebuild
rename to x11-misc/py3status/py3status-3.45.ebuild
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 613beb8c3e8b..0343e01a87b0 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,6 +1,6 @@
 DIST xkeyboard-config-2.35.1.tar.xz 873196 BLAKE2B 22a57cf8858f85dedb78c6fb8d29914e3ba07fc1bafacce40ea1aca485d5db510140af3a5df286ccf3247e8e2715820ea6b6ef412d808b448236f04325eefb8f SHA512 0c62246aa45c9cb883979cc32ba01a6ebf1c3e40673603ddd304a46f1583b997b17ade708849102285f01fe0caafb35abf9c7686ef8be49f4f2b521e03418f94
 DIST xkeyboard-config-2.36.tar.xz 880776 BLAKE2B 3ce6d9e5a1e763beb15614cd1b559ff6d56c2f6438b1c0680755a029ac90e48de4a939b1bcc0054a510cc0e08f6ffa6db98fecd4bf11e01510b151aa664425c3 SHA512 a81054ff6b7928a445a913b80fad995056559feff7bc1f4926657f171a102108b6e22958dc6c814ae2a25445f65c94485f13399628016f1358cf3840e235e3de
 EBUILD xkeyboard-config-2.35.1.ebuild 1030 BLAKE2B 164b75403f67163fd688e5b494574436d85634b2123f6eb73d860d228618ba9d905c9cc8b486f022fa4beaee478b638cddeea4f460d7efe4508f4fc3540e4de0 SHA512 ab9c02ef0ce4fec301ee4667cdc4f57a97e9694f488f13ec25c37300dc75640e73086bd813c5b90d7076be508a21234411d49f640403bfdddb75367e0fcb0a51
-EBUILD xkeyboard-config-2.36.ebuild 1038 BLAKE2B 8ddae88b4c7009cb60dec8707cbe239054a49bd713079aaf28b1c10b31f8458b9dea63415dcf197008f3827a203ca9489117d474c9dc7e48061584ae0f2415b7 SHA512 38ff78bfc51cd3f8bfe2a0cfb6262f2f46a12f17868ac5b3cb6fb0cabe44e6b0ac562ea7cb39a208f743f24f5a7da67f43b98fb822020eb6371c0682e2373eaa
+EBUILD xkeyboard-config-2.36.ebuild 1032 BLAKE2B 063989bcb0b1e71433acb37060fe999efa3f9cee42f6ccb8e52519d0b70652677d30368500f3f336e722b5af36d1fa95b35e7baf7a83a8a2d919d864be8c0cc0 SHA512 e5d920ca0954637f6368586167f38489aedc5d451273144acffe9c6ea415089886917b1e1bea35f00df5698eee90b7917716cca978b74c2cc0db033b6679d56b
 EBUILD xkeyboard-config-9999.ebuild 1038 BLAKE2B 8ddae88b4c7009cb60dec8707cbe239054a49bd713079aaf28b1c10b31f8458b9dea63415dcf197008f3827a203ca9489117d474c9dc7e48061584ae0f2415b7 SHA512 38ff78bfc51cd3f8bfe2a0cfb6262f2f46a12f17868ac5b3cb6fb0cabe44e6b0ac562ea7cb39a208f743f24f5a7da67f43b98fb822020eb6371c0682e2373eaa
 MISC metadata.xml 338 BLAKE2B 0abfc9e29fc629961ecbcc525a18185afd4b08cee4b68d35d1e2f863b898b1881b68e53f26079d1dfacbcd1f6961433dddf316435f421ec9f8b7a2e669c89eab SHA512 d1df4e20e9260892555393fddfeac0c9190c13cbf2a654ece211faab0c180ecdf592939992d5abf20a432a68a1ac0400e9e65241a9d3c7a04093c11b13123d75
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.36.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.36.ebuild
index 007071e3699d..840fc0b20d32 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.36.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.36.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index b02917a6816b..de3e3b1ff50d 100644
Binary files a/x11-plugins/Manifest.gz and b/x11-plugins/Manifest.gz differ
diff --git a/x11-plugins/asclock/Manifest b/x11-plugins/asclock/Manifest
index 59b16ce08503..5d45c4cf8e44 100644
--- a/x11-plugins/asclock/Manifest
+++ b/x11-plugins/asclock/Manifest
@@ -1,5 +1,7 @@
+AUX asclock-2.0.12-fix-implicit-func-decl.patch 286 BLAKE2B 8e3b43e435182ad92547591336b1866f150fa53918f5c65b1f22d40ca6291d11ab530c19ed56af27e32ec269975dae6c738760db658ea31826e1686cd4604eb2 SHA512 069278ba350eda39b5d633462a9d7536c716331501b8e992295c9233559d101788b30da1d956d78cd90bb663485717d6691a20df45442b68c79e742f3cc8b8b5
 AUX asclock-2.0.12-fno-common.patch 421 BLAKE2B 65befa6f59c55e7fcc4bef4f7370d48bee7d3ba1c219396eb9b767302f7b69284d5e64e0bf392cc981de06fb8b2fe629b346699fbe3081b777582538314fb2c2 SHA512 1244ed512b76c55ad9c37cd9a50321878e2d7ebe02f8958dc6548b2aaece8bf2b4abf93783bb2e6dc9947fea81b0a792fd8e2f9763eeffe85474b49b0dc6c50e
 AUX asclock-gcc41.patch 1528 BLAKE2B ec7f3e2361f06bd995128234fc60ceb9e3998054912f78a954eb05a04f376d231a59eb6e9d583940694f01388f81b0f0c2e33a098a2032d5e3917e629421ab57 SHA512 73d5edb1c3b1a287c9f00ad35491994f5d51bf0d5df2d81c3d428da0ed53eb4a73c0da1fe979d7479df103164e440b8a3472e18306c9fc5f85fd313d29f34b0d
 DIST asclock-2.0.12.tar.gz 111858 BLAKE2B acc5e25c268f013c30e7c35e5f162246839b6ffdd049e041e47bd9eee5a9fd6f62b27bb5f8eec157a2b19f6a930f9084531d3c1a7e9cd19cdfdd4ba33005f952 SHA512 408c0cbd7d8c19e8cda450ed1e3e0857dd908768557221b5707bda4eaa56170899bb3ecbe1d9f487ad7cbe7ebe36019cfe7a19f58dae2b918fb1179d67a8bb0e
 EBUILD asclock-2.0.12-r3.ebuild 1515 BLAKE2B f232f19e4b2cabc6766bf6e531fb97066a539f63f9c1f548933cdf940f14e607dc9c6a11de52a0f9566c4b1e1564a67c4a207f12109e10190b6d5f0c88fa82db SHA512 b8d55247c2f51b2c4608fa3fff8cd00f2e0826b3d879921bab640d3899c94ded609642d97e5c1da54c343f0624cea49b6d1d25ee2e59cbcc18d9c27e263c5b25
+EBUILD asclock-2.0.12-r4.ebuild 1540 BLAKE2B f2159e088bf6c6e2616ad84498dfad4e0cdcfeb23fd30acb329a7a3195d9aee3eaaeb83d8c276fd56d7d56c1e2e1aa01004a5836604b6b32bcf1228de1ffebcb SHA512 873038b6ff08184b5a5f4a8021a0ab201e958bbd0d373eafdbccbdd40f2737d722104ca23ec07129ee9f6b9d7017c2472d04eb0cbea1108c93c2909bdeca06e5
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/x11-plugins/asclock/asclock-2.0.12-r4.ebuild b/x11-plugins/asclock/asclock-2.0.12-r4.ebuild
new file mode 100644
index 000000000000..4d5b8555b83d
--- /dev/null
+++ b/x11-plugins/asclock/asclock-2.0.12-r4.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo toolchain-funcs
+
+DESCRIPTION="Clock applet for AfterStep"
+HOMEPAGE="http://tigr.net/afterstep/applets/"
+SRC_URI="http://www.tigr.net/afterstep/download/asclock/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+
+DEPEND="x11-libs/libXpm"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-gcc41.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+	"${FILESDIR}"/${P}-fix-implicit-func-decl.patch
+)
+
+src_prepare() {
+	default
+
+	ln -s themes/classic default_theme || die
+}
+
+src_configure() {
+	:;
+}
+
+src_compile() {
+	local x
+
+	# Will break Solaris
+	[[ ${CHOST} == *-linux-gnu ]] && CFLAGS="${CFLAGS} \
+		-Dlinux \
+		-D_POSIX_C_SOURCE=199309L \
+		-D_POSIX_SOURCE \
+		-D_XOPEN_SOURCE"
+
+	for x in asclock parser symbols config; do
+		edo $(tc-getCC) \
+			${CPPFLAGS} ${CFLAGS} ${ASFLAGS} \
+			-I"${EPREFIX}"/usr/include \
+			-D_BSD_SOURCE \
+			-D_SVID_SOURCE \
+			-DFUNCPROTO=15 \
+			-DNARROWPROTO \
+			-c -o ${x}.o ${x}.c
+	done
+
+	edo $(tc-getCC) \
+		${LDFLAGS} \
+		-o asclock \
+		asclock.o parser.o symbols.o config.o \
+		-L"${ESYSROOT}/usr/$(get_libdir)" \
+		-L"${ESYSROOT}"/usr/lib/X11 \
+		-lXpm -lXext -lX11
+}
+
+src_install() {
+	dobin asclock
+	local themesdir="/usr/share/${PN}/themes"
+	insinto ${themesdir}
+	doins -r themes/*
+	dodoc README README.THEMES TODO
+	cd "${ED}"/${themesdir} || die
+	rm Freeamp/Makefile{,.*} || die
+	ln -s classic default_theme || die
+}
diff --git a/x11-plugins/asclock/files/asclock-2.0.12-fix-implicit-func-decl.patch b/x11-plugins/asclock/files/asclock-2.0.12-fix-implicit-func-decl.patch
new file mode 100644
index 000000000000..b0379a396129
--- /dev/null
+++ b/x11-plugins/asclock/files/asclock-2.0.12-fix-implicit-func-decl.patch
@@ -0,0 +1,13 @@
+diff --git a/asclock.h b/asclock.h
+index 7580df8..ec6883b 100644
+--- a/asclock.h
++++ b/asclock.h
+@@ -137,6 +137,8 @@ extern char *hour_map;
+ extern char *min_map;
+ extern char *sec_map;
+ 
++int mytime();
++
+ /********* symbols.c ***************/
+ void init_symbols();
+ void postconfig();
diff --git a/x11-plugins/cputnik/Manifest b/x11-plugins/cputnik/Manifest
index 1b40f63ae7ed..116f3f7b6b5e 100644
--- a/x11-plugins/cputnik/Manifest
+++ b/x11-plugins/cputnik/Manifest
@@ -1,5 +1,6 @@
 AUX cputnik-0.2.0-fno-common.patch 1429 BLAKE2B 564cd629a6782aa9747be1460185cd612758b701db6700f21800ce9c9425e9e1cac883f7beb540ce525e9b601f451457c6dab6188a2bf9cee4002c59e3d98202 SHA512 bfc90e8e43b4be13d36e546b4d03bb1a1456c03d9602d7802dbfc6a3f0fa0b68b8deb82f9f5e7f0d7d8224667c2caf9f70c82cae29a662ee748fc6678ca62976
+AUX cputnik-0.2.0-libdir.patch 223 BLAKE2B 6e69d17c34571f8bf1b5492788a04f76ab3542c5379f03828c0576f3350886d419165b61951c40324ba006a8c69f9433c4066683e41890ea55960a6cc5c19ab6 SHA512 4806159dcdd10d52fbe2a48a62c21247d36f69b41c9680f8394336aef1865aff06058ec393b7d2e47653d42be211dd97ee3bdff01f17247d0669e02c413f2cfd
 AUX cputnik-0.2.0-makefile.patch 709 BLAKE2B d40b5743f8bedf589d18e020374a38daf10563542c5e9f93514013880dceb16629c7ee83737ecdb6ff7dbde189697bebe6679b931e4cf5996245f2049a811f31 SHA512 4aff01e83540a7c08e777be8726b07fdb9d34798da957c85b9c27c87760854db335ed9f45b1dd250f63ae16c1e96c59615db79ca818f7233822103695458744d
 DIST cputnik-0.2.0.tar.gz 17850 BLAKE2B 90824218a349d9b6cdf592cafe8dd29674f975a190a19a3dd6b941383d47f4fc492af339cbbb88240499363a1048b2564855d5a17caeaf53437fe34bf0d55ee1 SHA512 829d9d63f82a2d41c0160be575b3fb7840a5c295c6dd16702240a6aa104e557bff83936c46243e850edf918b41ddc22fd123dab7f5ffd6492302d60c374df55f
-EBUILD cputnik-0.2.0-r1.ebuild 673 BLAKE2B 8a4cd4828e036461ee72518e8a712cd2e22a5bc362958cbd1f9267708b7ff11c4759536d78611f935d75e15b774721757f432a8744c58113487f9ec016d43097 SHA512 ac27e947b81f04db7d2d32101aa8a79ec2f03dd060bb15ad5f372bc74006ac1e7b3771c39aaf2405505926297f70c60f981a411221de789827693a0d35b880d4
+EBUILD cputnik-0.2.0-r1.ebuild 706 BLAKE2B 3b03340ad743b37fa88958590b920d75a2c7013f589e89070e5a645cee55ed007333c8fb433f3f6b8dc26f595999de661a1f59709684e0b57fac5fd1cdeeb341 SHA512 783deaf3cc35c82d767edfdfdfd381ad4e78e3fd22f852d8c50008eecf1d47af886dfca1937c1e6b44b35a48a76123628503f86035b5d0dd25dcc6cbc56337b3
 MISC metadata.xml 250 BLAKE2B 3d69a837b82fe334630573d6bf123718a3eac254377bc2ca86a2268f210cbcef9922db631e91954bceacc28828b54ad567d0568a4df655545ac56a4a54151d76 SHA512 ee587c14474743ca118c5468d1cd04ce5e3533ea29550ae74a7d517f092c895fa18c7edc7e9ffe7757b62c214dda7abf5352ee838a6dbd7d1079d60d2762732f
diff --git a/x11-plugins/cputnik/cputnik-0.2.0-r1.ebuild b/x11-plugins/cputnik/cputnik-0.2.0-r1.ebuild
index eb195d5a676b..031cf79deae7 100644
--- a/x11-plugins/cputnik/cputnik-0.2.0-r1.ebuild
+++ b/x11-plugins/cputnik/cputnik-0.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,9 +22,11 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${P}/src
 
-PATCHES=( "${FILESDIR}"/${P}-makefile.patch
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
 	"${FILESDIR}"/${P}-fno-common.patch
-	)
+	"${FILESDIR}"/${P}-libdir.patch
+)
 
 src_compile() {
 	emake CC="$(tc-getCC)"
diff --git a/x11-plugins/cputnik/files/cputnik-0.2.0-libdir.patch b/x11-plugins/cputnik/files/cputnik-0.2.0-libdir.patch
new file mode 100644
index 000000000000..4c613d739f08
--- /dev/null
+++ b/x11-plugins/cputnik/files/cputnik-0.2.0-libdir.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/732444
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ 
+ CFLAGS			+= -Wall
+ INCS			= -I/usr/include/X11
+-LIBS			= -L/usr/lib -lXpm -lXext -lX11
++LIBS			= -lXpm -lXext -lX11
+ INSTALL_PREFIX	= /usr
+ 
+ 
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 4b431c3602a9..74a712bcc93e 100644
Binary files a/x11-terms/Manifest.gz and b/x11-terms/Manifest.gz differ
diff --git a/x11-terms/kitty-shell-integration/Manifest b/x11-terms/kitty-shell-integration/Manifest
index 47d31b9b30ef..24313fea2671 100644
--- a/x11-terms/kitty-shell-integration/Manifest
+++ b/x11-terms/kitty-shell-integration/Manifest
@@ -1,6 +1,6 @@
 DIST kitty-0.25.1.tar.xz 4671008 BLAKE2B f5110c64e3659499351875dfb4ad9dba85724184cbb742d4b2fe63dcb604b5c8e8736c51ae126345736cbb90238ba3c9e3de099cd6ebfdd0e50b5dfb36c2d2b6 SHA512 6d9862f8411372e0cf692114d6e29eb92db3a2e324282a21ca35b2ca5229c9d87ab988e802e44d47e98b6e64ae7abc5ff0cc677c082eb287e14ee68cd1a4c31e
 DIST kitty-0.25.2.tar.xz 4681940 BLAKE2B 9aa43711c833541f364100465dfd1c13251ed59d5777634a5f193cc0544743295a772de85c64b4657e2cbca3d88f77019b0fe26b25c8b0908c1cc108b480ecf6 SHA512 ac858b525abbdeb137989a7971c51651d46bffedde048ed572bbb4c31119a4e0f9f424edbdbfd14fe2e043b4a7c8a1a1f8ee6591906e40a655d9f783b21f31a6
 EBUILD kitty-shell-integration-0.25.1.ebuild 1476 BLAKE2B d07578dfe48ab8aa3ff01b4ed91e0e9e1d357f00d0931d2a4beaa8659c843b130108ce925bb37fdb4679048e1d9bd90a64aaa95150eabb3e6c9b195e504a1bc3 SHA512 0f74797060755fdf9430efbbe5e7d56182b38dafd1d9c8bbf25d01e932e1bc95fb5e774064667b66f8beb8ab1e0772174746506bb9b156b88131dd23a14d82c4
-EBUILD kitty-shell-integration-0.25.2.ebuild 1478 BLAKE2B c9751a6a82bf10a629f06b6099dec2b6d08c0e4d961e6c8105ce7e975e849161bb09a8990a0ed971f96e4ea0787b87e64074d705e807fba6dbef3c3494ea495b SHA512 7f5f6d48619adeb300727cc9b30ef97403a2f6da00a45661cb8cec489ea9ccab02a48ba502d8099175342d832ec9ad98f82aff87bf5ef5d1df50ab7971d8fcea
+EBUILD kitty-shell-integration-0.25.2.ebuild 1476 BLAKE2B d07578dfe48ab8aa3ff01b4ed91e0e9e1d357f00d0931d2a4beaa8659c843b130108ce925bb37fdb4679048e1d9bd90a64aaa95150eabb3e6c9b195e504a1bc3 SHA512 0f74797060755fdf9430efbbe5e7d56182b38dafd1d9c8bbf25d01e932e1bc95fb5e774064667b66f8beb8ab1e0772174746506bb9b156b88131dd23a14d82c4
 EBUILD kitty-shell-integration-9999.ebuild 1403 BLAKE2B 9f1e4aebc1103678d42ba5809c41848b2ace36e2ed0137bdb0f30048cb4372c61f80e509a8087a52b149fe25115ca8aaa511d4697459e1087bee65788055dd85 SHA512 d7674435c3d3d9cfd04d47889f9e0f1cb4e60a6dc3506529829b3782e958fc3cb18fe8b0a25463725128106d6ca8308a17ae961b184e13682a1b05852e22ce4e
 MISC metadata.xml 610 BLAKE2B 29a121e206c4a21965f03cac1b01314dc32384eb617e9c188814f2c9a8896d10cb299aa4ef7fec74c5a74c966069355d291fe23d9f37b2cbb3d34ebb24850f81 SHA512 867c3bfc752f53287bea2f027a949bb433cd069f5480a5197986371db6dac4524577bf1503259a4fb4f6832ec7c860a5f2b4ac495a17c6a19fee5c62a70e6892
diff --git a/x11-terms/kitty-shell-integration/kitty-shell-integration-0.25.2.ebuild b/x11-terms/kitty-shell-integration/kitty-shell-integration-0.25.2.ebuild
index 4c3e987c411b..e4411a8cbd8d 100644
--- a/x11-terms/kitty-shell-integration/kitty-shell-integration-0.25.2.ebuild
+++ b/x11-terms/kitty-shell-integration/kitty-shell-integration-0.25.2.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/kitty-${PV}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 RESTRICT="test" # intended to be ran on the full kitty package
 
 src_compile() { :; }
diff --git a/x11-terms/kitty-terminfo/Manifest b/x11-terms/kitty-terminfo/Manifest
index aef5091fbc3a..a3a31aef3db3 100644
--- a/x11-terms/kitty-terminfo/Manifest
+++ b/x11-terms/kitty-terminfo/Manifest
@@ -1,6 +1,6 @@
 DIST kitty-0.25.1.tar.xz 4671008 BLAKE2B f5110c64e3659499351875dfb4ad9dba85724184cbb742d4b2fe63dcb604b5c8e8736c51ae126345736cbb90238ba3c9e3de099cd6ebfdd0e50b5dfb36c2d2b6 SHA512 6d9862f8411372e0cf692114d6e29eb92db3a2e324282a21ca35b2ca5229c9d87ab988e802e44d47e98b6e64ae7abc5ff0cc677c082eb287e14ee68cd1a4c31e
 DIST kitty-0.25.2.tar.xz 4681940 BLAKE2B 9aa43711c833541f364100465dfd1c13251ed59d5777634a5f193cc0544743295a772de85c64b4657e2cbca3d88f77019b0fe26b25c8b0908c1cc108b480ecf6 SHA512 ac858b525abbdeb137989a7971c51651d46bffedde048ed572bbb4c31119a4e0f9f424edbdbfd14fe2e043b4a7c8a1a1f8ee6591906e40a655d9f783b21f31a6
 EBUILD kitty-terminfo-0.25.1.ebuild 618 BLAKE2B f28c7bc4aff671b8f2df8094f8abd881b9bfe0580fd84e302fea050235f5932c34636e407d87afb34ee1fe2e7006e1dc1a1902d9a914cfe4aa7372fb7d18d368 SHA512 971734b7d326df234fff57c14a17ce6da9e9f97dc86ea412b9521c76e0c06fceadffcb708db781d85d5529a6ec9c829dcd5f8210c36c06b73f6ce05b9be729b3
-EBUILD kitty-terminfo-0.25.2.ebuild 620 BLAKE2B 84d17d934610d200dd4d556462255c9f6ee5fa90553b81db4dc764a9bb4026d74b874f19ef92e3aeaaaf2856021870199518b66e633212896aa5b9d4f5255b8a SHA512 a9dca5ba4c276df302fb5df4507294bdac4609398ed441b242dba8459d2d58306c29a49373278f428c1d86a3e9e426f3605153252aebe9bfac5af00e088fac18
+EBUILD kitty-terminfo-0.25.2.ebuild 618 BLAKE2B f28c7bc4aff671b8f2df8094f8abd881b9bfe0580fd84e302fea050235f5932c34636e407d87afb34ee1fe2e7006e1dc1a1902d9a914cfe4aa7372fb7d18d368 SHA512 971734b7d326df234fff57c14a17ce6da9e9f97dc86ea412b9521c76e0c06fceadffcb708db781d85d5529a6ec9c829dcd5f8210c36c06b73f6ce05b9be729b3
 EBUILD kitty-terminfo-9999.ebuild 545 BLAKE2B 50bf783694580b016f3291640d6c4ab3e8ee335f78d13b75cb7ebe6628ddd2f244fab2e7c465a3964ed6b5e0ebbdb144c739a01ffa7239c8518503ea107a52f2 SHA512 267b8b4a526ee22159f7c1c0d9a089e183308e1e7f61d775834e4ed5d4f25be7aac8cc3db4afa3c3f1e933159f27abff25c31989dd6478c1727eec590bf0a3c8
 MISC metadata.xml 610 BLAKE2B 29a121e206c4a21965f03cac1b01314dc32384eb617e9c188814f2c9a8896d10cb299aa4ef7fec74c5a74c966069355d291fe23d9f37b2cbb3d34ebb24850f81 SHA512 867c3bfc752f53287bea2f027a949bb433cd069f5480a5197986371db6dac4524577bf1503259a4fb4f6832ec7c860a5f2b4ac495a17c6a19fee5c62a70e6892
diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-0.25.2.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.25.2.ebuild
index 35ff98034a87..dc5bddaad255 100644
--- a/x11-terms/kitty-terminfo/kitty-terminfo-0.25.2.ebuild
+++ b/x11-terms/kitty-terminfo/kitty-terminfo-0.25.2.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/kitty-${PV}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 RESTRICT="test" # intended to be ran on the full kitty package
 
 BDEPEND="sys-libs/ncurses"
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index dbd259e5fb5d..8ecadd471937 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -4,6 +4,6 @@ DIST kitty-0.25.1.tar.xz.sig 566 BLAKE2B 7fba36cd7c5d06274e21106e2f31ecb0c22362a
 DIST kitty-0.25.2.tar.xz 4681940 BLAKE2B 9aa43711c833541f364100465dfd1c13251ed59d5777634a5f193cc0544743295a772de85c64b4657e2cbca3d88f77019b0fe26b25c8b0908c1cc108b480ecf6 SHA512 ac858b525abbdeb137989a7971c51651d46bffedde048ed572bbb4c31119a4e0f9f424edbdbfd14fe2e043b4a7c8a1a1f8ee6591906e40a655d9f783b21f31a6
 DIST kitty-0.25.2.tar.xz.sig 566 BLAKE2B 38435c7c418b421321ad29e1935f2280b1df215cb95b1025b3c85a0cc7e3279f1a0f79b05af9c698d4121a4f2e23a81774406a3ba77d0b5e669a36e1e58621b6 SHA512 cc16d4d22c043a30d9712cee211b4560873aa3e6ddc799881c791c72c6a4bfb7822a01683c62afcf67814889dfbc312d9f8b1f2200ab7f89a937addbf76c99b9
 EBUILD kitty-0.25.1.ebuild 3519 BLAKE2B a2e4526d6449e83e68dd31370fc1b8df7037c7439dd9881f7214addfe7d5ea6e6ebedebded50fcb3b74176c6a469ee2c2be0bec6876e4c14e13fe7e50e48085c SHA512 aea90a245183698729866da0c687e943f636cee01cfc609bd6694e88cc912834e34a69cdca2305146774805bb0fd08307dc0807649bda7c544b85ef9d8475e6c
-EBUILD kitty-0.25.2.ebuild 3521 BLAKE2B 46b78faae65e9a50fd9bcf5747922418da5c605e62e8c90cdac9b333b951314b79e68ea5817b4867e3ffb171061692afffb8fc680149066f4f2c801d0c6341f1 SHA512 7f6f3de88a3d5a87a07946c78bc0318a80c847fc8e3e28dffdff7d4d972662c0d8cd3d0eaedcd4714f1e2b121dd1ce7432250d16bc78b51d96eb19f76c02f5c5
+EBUILD kitty-0.25.2.ebuild 3519 BLAKE2B a2e4526d6449e83e68dd31370fc1b8df7037c7439dd9881f7214addfe7d5ea6e6ebedebded50fcb3b74176c6a469ee2c2be0bec6876e4c14e13fe7e50e48085c SHA512 aea90a245183698729866da0c687e943f636cee01cfc609bd6694e88cc912834e34a69cdca2305146774805bb0fd08307dc0807649bda7c544b85ef9d8475e6c
 EBUILD kitty-9999.ebuild 3521 BLAKE2B 46b78faae65e9a50fd9bcf5747922418da5c605e62e8c90cdac9b333b951314b79e68ea5817b4867e3ffb171061692afffb8fc680149066f4f2c801d0c6341f1 SHA512 7f6f3de88a3d5a87a07946c78bc0318a80c847fc8e3e28dffdff7d4d972662c0d8cd3d0eaedcd4714f1e2b121dd1ce7432250d16bc78b51d96eb19f76c02f5c5
 MISC metadata.xml 757 BLAKE2B 5b7786583ac3a7742c1345fb86287e3309eedf7e7110025730c9153dd893bdbd8e340b3a70f99a650d60f3a405c73346fbb2f0465ba2dad820e9fe2506f9963f SHA512 96c3583ce9713803d9892270f9e41cce2cdb75931065637196c002f66e9638f87db52f32a69d37cc6bef5302cb0cd5212178659b217b1df63e253f4bdf759c77
diff --git a/x11-terms/kitty/kitty-0.25.2.ebuild b/x11-terms/kitty/kitty-0.25.2.ebuild
index 531d4fb7df94..b8455230a169 100644
--- a/x11-terms/kitty/kitty-0.25.2.ebuild
+++ b/x11-terms/kitty/kitty-0.25.2.ebuild
@@ -15,7 +15,7 @@ else
 		https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz
 		verify-sig? ( https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz.sig )"
 	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/kovidgoyal.gpg"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~ppc64 x86"
 fi
 
 DESCRIPTION="Fast, feature-rich, GPU-based terminal"
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index cfe74b7104a4..29621203f03a 100644
Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ
diff --git a/x11-wm/notion/Manifest b/x11-wm/notion/Manifest
index 538f28990ee9..83fb5837655c 100644
--- a/x11-wm/notion/Manifest
+++ b/x11-wm/notion/Manifest
@@ -2,6 +2,8 @@ AUX notion 26 BLAKE2B b39f9f65f79f85b8af02c52334f71f0eb171abf2e48af8698b4eb51929
 AUX notion-3_p2015061300-pkg-config.patch 2533 BLAKE2B 98b1c54fc92067702b77a6f4d51b87d829e124135e4004bec32ab71eaefc39c69c944810730bba8defb7e082138f12e2169cd48879177671c149a86407eef49c SHA512 7fb084b35dc274e8d943a4801f2a38d43bead5eb94d33282903416120e5116d37811b6388b61f4f402d1efeed01cf36606537cb7c0aaf8a3362e99d05c9c3fda
 AUX notion.desktop 208 BLAKE2B 7d138a583a49325901e3c1682c22dbdc1da02b4dcaa2ae6581c66e2676277de1a7b5a87e1c25465cb4ae6beebd7e93ab473e92b3ad6949ad97c833f2293e40da SHA512 3c0a0c5787d77afc94b0f0f9187be5c32374c2dbc51d2d9de3729b2c4e18572d6d8d79a554b017ba33c7276bc2aca8182f93b2d7268f92101385ab6a06f8191f
 DIST notion-3_p2015061300.tar.gz 797057 BLAKE2B 55258bb1d47a1c2506e9cb6654e5d68d69494a749174eaace2a53416ae40cac908b0398400a5a377dbb07618aa800529cbdfc0c7ef946d285681e1dfccfd9c48 SHA512 254be12a8ece555d9f6253d99891bb51214379d0c04b6bf9595b7e5bf9493cb5d2fada37438f89621e7157f9e3647e446b5e173847498ee3608081f006b86679
+DIST notion-4.0.2_p20220613.tar.gz 791823 BLAKE2B 2aa50eb4f710bf289dd6edb6f4696662e8d2588b337f038845efdf79aa2e2b28a725734c829de5184def6fd5d32c51f511025dadf4ad6a689c0dc4e0b0d8e3eb SHA512 7c187571a00bdf5736032c0ff0b57a0afdb20a7b4f6e66877c84bf112922ec8f5b853165d419ecc7c18fc84a873b278c3cbdad5e7399e0312066141de1dc6673
 EBUILD notion-3_p2015061300-r100.ebuild 2362 BLAKE2B cde9df6b82ad429e29de3c65417615d44f1237f34fb9fde8f1eb83f644f25e455bd57d17bbeb895c9cf069d6705d4051e00c1fc77f90c1eb4236e814ae53219d SHA512 93ffd486ab64078d7010b949af167b93d16ae97eea741e2ad08627a559f787d72811f1379a68689efe6f9db85578239dc0e5da23d7c949c7edf59be8dc89b9a9
-EBUILD notion-9999.ebuild 2226 BLAKE2B 37f5b955dd35f1e94d00865223e0c5beb538e5e92e7dee608d5fc20b84967bdbb9f774572933be989471ebed5a801345bff1ede813a829b906bd87d2d1d8e6a8 SHA512 b63a100f090dd2a95b754a255657aceae5fd5b8dc0d2e141fd30e9640d2ff4fea2b04860d648eb00cf893255d0bca1e1a34ed5ee10bf7661e173cebc62025979
+EBUILD notion-4.0.2_p20220613.ebuild 2123 BLAKE2B 8aca9e78756246c79bc2388bc8de7d1518a4e541eb98e9f6ffe4c2d1d7ba583af364ba97c042eb7e86c73ed9729a83a200c4531b24b055d8261ee67ec04ab2e4 SHA512 6ae643d2c54358402565a52437e1fc466f35282223058c11f3c8e3141d3e78ea876c6ed1a2dd0201d9bc6ace109cac4a0e2180af1ea3b2442a1455a900f8d960
+EBUILD notion-9999.ebuild 2046 BLAKE2B 69701c3d87c27b2b41670fbf9e1d9533db62bde2882216a5d7ddf3b13cebbbd311bb272c8a665731add1075c68fff0355dfb546c93d16b4d72ef15c496b1cfb8 SHA512 7833f2282368da0b75e2f971e5929cc0d404c239ae3cefd49738b766cab04e3046a18c4a7f0f50a3d394f33ab224dadfc386d6f83230a7a1acbc92570e3ac2d8
 MISC metadata.xml 441 BLAKE2B f1adc7889242f95216b90541c0b15e459738b2a375e1f74e19c52d9e5d2c5c7241c8eee77a89290d88619e5981adac8518477e6af2d2416c4596594d5a2bd671 SHA512 ebe72f7eeab009519f2d127028b210d9cc621ae6fcb60e09f8f07a35ff13eb6a66a514a2083490079749045332c4a9a35cef64d852c942761c065dd6547eb52e
diff --git a/x11-wm/notion/notion-4.0.2_p20220613.ebuild b/x11-wm/notion/notion-4.0.2_p20220613.ebuild
new file mode 100644
index 000000000000..6ba63e41d144
--- /dev/null
+++ b/x11-wm/notion/notion-4.0.2_p20220613.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-4 )
+
+inherit lua-single toolchain-funcs readme.gentoo-r1
+
+DESCRIPTION="Notion is a tiling, tabbed window manager for the X window system"
+HOMEPAGE="https://notionwm.net/"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/raboof/${PN}.git"
+else
+	inherit vcs-snapshot
+	COMMIT="f161c1b4dbba1ac81d8e9c3d7e5e353058a4d7d1"
+	SRC_URI="https://github.com/raboof/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="nls xinerama +xrandr"
+# needs slingshot,... not in tree
+RESTRICT="test"
+# mod_xrandr references mod_xinerama
+REQUIRED_USE="
+	${LUA_REQUIRED_USE}
+	xrandr? ( xinerama )"
+
+RDEPEND="
+	${LUA_DEPS}
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	nls? ( sys-devel/gettext )
+	xinerama? ( x11-libs/libXinerama )
+	xrandr? ( x11-libs/libXrandr )"
+DEPEND="${RDEPEND}"
+# luac is called at build time
+BDEPEND="
+	${LUA_DEPS}
+	virtual/pkgconfig"
+
+src_configure() {
+	tc-export AR CC PKG_CONFIG
+	export INSTALL_STRIP=""
+
+	cat > system-local.mk <<- _EOF_ || die
+		PREFIX=${EPREFIX}/usr
+		DOCDIR=\$(PREFIX)/share/doc/${PF}
+		ETCDIR=${EPREFIX}/etc/${PN}
+		LIBDIR=\$(PREFIX)/$(get_libdir)
+		VARDIR=${EPREFIX}/var/cache/${PN}
+		LUA_MANUAL=1
+		LUA=${LUA}
+		LUAC=${BROOT}/usr/bin/${ELUA/lua/luac}
+		LUA_LIBS=$(lua_get_LIBS)
+		LUA_INCLUDES=$(lua_get_CFLAGS)
+		$(usev !nls "DEFINES+=-DCF_NO_LOCALE -DCF_NO_GETTEXT")
+	_EOF_
+
+	if ! use xinerama ; then
+		sed -e 's/mod_xinerama//g' -i modulelist.mk || die
+	fi
+
+	if ! use xrandr ; then
+		sed -e 's/mod_xrandr//g' -i modulelist.mk || die
+		sed -e '/mod_xrandr/d' -i etc/cfg_defaults.lua || die
+	fi
+}
+
+src_install() {
+	default
+
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}"/notion
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/notion.desktop
+
+	local DOC_CONTENTS="
+		If you want notion to have an ability to view a file based on its
+		guessed MIME type you should emerge app-misc/run-mailcap."
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/x11-wm/notion/notion-9999.ebuild b/x11-wm/notion/notion-9999.ebuild
index 56c03dbb134d..3bc5247a3ad3 100644
--- a/x11-wm/notion/notion-9999.ebuild
+++ b/x11-wm/notion/notion-9999.ebuild
@@ -1,22 +1,36 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-LUA_COMPAT=( lua5-{1..2} )
+LUA_COMPAT=( lua5-4 )
 
-inherit git-r3 lua-single toolchain-funcs readme.gentoo-r1
+inherit lua-single toolchain-funcs readme.gentoo-r1
 
 DESCRIPTION="Notion is a tiling, tabbed window manager for the X window system"
 HOMEPAGE="https://notionwm.net/"
-EGIT_REPO_URI="https://github.com/raboof/${PN}.git"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/raboof/${PN}.git"
+else
+	SRC_URI="https://github.com/raboof/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS=""
 IUSE="nls xinerama +xrandr"
+# needs slingshot,... not in tree
+RESTRICT="test"
+# mod_xrandr references mod_xinerama
+REQUIRED_USE="
+	${LUA_REQUIRED_USE}
+	xrandr? ( xinerama )"
 
-RDEPEND="${LUA_DEPS}
+RDEPEND="
+	${LUA_DEPS}
 	x11-libs/libSM
 	x11-libs/libX11
 	x11-libs/libXext
@@ -25,44 +39,27 @@ RDEPEND="${LUA_DEPS}
 	xrandr? ( x11-libs/libXrandr )"
 DEPEND="${RDEPEND}"
 # luac is called at build time
-BDEPEND="${LUA_DEPS}
+BDEPEND="
+	${LUA_DEPS}
 	virtual/pkgconfig"
 
-# mod_xrandr references mod_xinerama
-REQUIRED_USE="${LUA_REQUIRED_USE}
-	xrandr? ( xinerama )"
-
-# needs slingshot,... not in tree
-RESTRICT=test
-
-src_prepare() {
-	default
-
-	sed -e "/^CFLAGS/{s: =: +=: ; s:-Os:: ; s:-g::}" \
-		-e "/^LDFLAGS/{s: =: +=: ; s:-Wl,--as-needed::}" \
-		-i system-autodetect.mk || die
-	echo > build/lua-detect.mk
-}
-
 src_configure() {
-	{	echo "CFLAGS += -D_DEFAULT_SOURCE"
-		echo "PREFIX=${EROOT}/usr"
-		echo "DOCDIR=\$(PREFIX)/share/doc/${PF}"
-		echo "ETCDIR=${EROOT}/etc/${PN}"
-		echo "LIBDIR=\$(PREFIX)/$(get_libdir)"
-		echo "VARDIR=${EROOT}/var/cache/${PN}"
-		echo "X11_PREFIX=${EROOT}/usr"
-		echo "STRIPPROG=true"
-		echo "CC=$(tc-getCC)"
-		echo "AR=$(tc-getAR)"
-		echo "RANLIB=$(tc-getRANLIB)"
-		echo "LUA_MANUAL=1"
-		echo "LUA=${LUA}"
-		echo "LUAC=luac"
-		echo "LUA_LIBS=$(lua_get_LIBS)"
-		echo "LUA_INCLUDES=$(lua_get_CFLAGS)"
-		use nls || echo "DEFINES+=-DCF_NO_LOCALE -DCF_NO_GETTEXT"
-	} > system-local.mk
+	tc-export AR CC PKG_CONFIG
+	export INSTALL_STRIP=""
+
+	cat > system-local.mk <<- _EOF_ || die
+		PREFIX=${EPREFIX}/usr
+		DOCDIR=\$(PREFIX)/share/doc/${PF}
+		ETCDIR=${EPREFIX}/etc/${PN}
+		LIBDIR=\$(PREFIX)/$(get_libdir)
+		VARDIR=${EPREFIX}/var/cache/${PN}
+		LUA_MANUAL=1
+		LUA=${LUA}
+		LUAC=${BROOT}/usr/bin/${ELUA/lua/luac}
+		LUA_LIBS=$(lua_get_LIBS)
+		LUA_INCLUDES=$(lua_get_CFLAGS)
+		$(usev !nls "DEFINES+=-DCF_NO_LOCALE -DCF_NO_GETTEXT")
+	_EOF_
 
 	if ! use xinerama ; then
 		sed -e 's/mod_xinerama//g' -i modulelist.mk || die
@@ -70,8 +67,7 @@ src_configure() {
 
 	if ! use xrandr ; then
 		sed -e 's/mod_xrandr//g' -i modulelist.mk || die
-		sed -e '/mod_xrandr/d' \
-			-i etc/cfg_defaults.lua || die
+		sed -e '/mod_xrandr/d' -i etc/cfg_defaults.lua || die
 	fi
 }
 
@@ -84,12 +80,12 @@ src_install() {
 	insinto /usr/share/xsessions
 	doins "${FILESDIR}"/notion.desktop
 
+	local DOC_CONTENTS="
+		If you want notion to have an ability to view a file based on its
+		guessed MIME type you should emerge app-misc/run-mailcap."
 	readme.gentoo_create_doc
 }
 
 pkg_postinst() {
 	readme.gentoo_print_elog
 }
-
-DOC_CONTENTS="If you want notion to have an ability to view a file based on its
-guessed MIME type you should emerge app-misc/run-mailcap."
diff --git a/x11-wm/windowlab/Manifest b/x11-wm/windowlab/Manifest
index 7a1ce908f021..84e265a8083e 100644
--- a/x11-wm/windowlab/Manifest
+++ b/x11-wm/windowlab/Manifest
@@ -1,5 +1,7 @@
 AUX windowlab-1.34-fixed-font.patch 385 BLAKE2B e137d399ed40bda9776316f0b2fd5be9dd8520f0b0f88e754ea3c559975a3f42763b802f78a835230fc7fc27c7b544c9838a672f98fb1b008bdecdfddefef408 SHA512 c0e860c92dce68a921880fbe042163a50ad2f1e31572acb2a93bc557405ba7323a8a5e0e5608365be0585dac1bf648958c74aa9e017b9da6c0a15ac4caaae6e4
 AUX windowlab-1.40-gentoo.diff 1621 BLAKE2B eee189cfc54178f850225c4226a1cb70d131ad9417e9f8e000a1a56aaa3ddcf35dc65f4958937a0f40e020be966776a2f61f4797fc4217e128189b3bda4eb771 SHA512 d0d06e2396f1a2f26d7c76b5ed513df2fa4d7496a898664b1fec51b33d6e3f63dd131207cd68243f9c8895d7bfa00e399b3a38ac81101e8321532f454f193ccd
+AUX windowlab-1.40-libdir.patch 579 BLAKE2B 2dfdb96da3e156df9865afff8ccdcbe3c0bb677c4c28a47579868aa787e140cb15aacff38b87a92d3f03748a7a754dc1cfe2c8bc1f57236490b244002aaf873f SHA512 3c7784bb0d75cb9e491f918fceae4123f7c5f669e78e3a626a1784b9083f542f6dacbf94908539e3da647511bf658240796794dc4df092300e1898f79fe0a8c1
 DIST windowlab-1.40.tar 174080 BLAKE2B 9091565b40e886f921f33251c293b39ad4ec544a98d91046e52fa4e1aae66141934645e724ee224750dd7c50fba5a45fe2b4482c46e860c752a10c2b00dd05a5 SHA512 abea16f4f85f846d426fecce548cef2bf867fc6545a720ec2d3a8d93eb5a4abd6942e44534bb7faef6cffe0551181764effa99d835b8f067a1510f7d50af6d3d
 EBUILD windowlab-1.40-r1.ebuild 1056 BLAKE2B cf7eca457b2b92aa2c98e75b58ef968776a04d0a20d2bf35831d34afa6957ae0b158009c6d4dff7366338e10287eacb1153e8a284485ca9e5e1cbd36026af451 SHA512 94fb9dfcb2b13c3c591036d05b6fdac34b0972cbd06fc779b8aad08e8ee2c5bd0e0e51c63e86b9f2e30337f383a379711ca8f7b3054abfae20e7adc2783d17f4
+EBUILD windowlab-1.40-r2.ebuild 1127 BLAKE2B f6227751587578f01b5f6d9dbf0532492af1afbb9913d0caee26eeb84f9ee477b6cf0407d39b958d4c3f63d15d04ac0addb4af2a6afbb1ea01ad1566df583508 SHA512 794d7dd96389921c721c969e29c3dcedef5b122ebc2c16bb787324f9ed6b0bb255ec7dc652f0280fa0556e33d77d7903b71c040800eecf94bb750683eeedb77d
 MISC metadata.xml 746 BLAKE2B 0ea6f7861ef16880dc5e900f1a5164b42c70e9d4808e5a19fecf6cf6ed45cb4a6aee10ac1e94e9a0458e46aa14705c01c505e61afb1bc1b8412d46efe11ced1b SHA512 417ec354ef36d2cf99373fb8b88ea5aecf75158c4e5135467828fe56e5763d19d37af6b9728c74a089230eb66036bcd0b8c89508ae7cbc49bc1b503f890e32c1
diff --git a/x11-wm/windowlab/files/windowlab-1.40-libdir.patch b/x11-wm/windowlab/files/windowlab-1.40-libdir.patch
new file mode 100644
index 000000000000..65c2b662dc62
--- /dev/null
+++ b/x11-wm/windowlab/files/windowlab-1.40-libdir.patch
@@ -0,0 +1,20 @@
+https://bugs.gentoo.org/732470
+--- a/Makefile
++++ b/Makefile
+@@ -51,7 +51,6 @@ BINDIR = $(DESTDIR)$(PREFIX)/bin
+ MANDIR = $(DESTDIR)$(PREFIX)$(MANBASE)/man1
+ CFGDIR = $(DESTDIR)$(SYSCONFDIR)
+ INCLUDES = -I$(XROOT)/include $(EXTRA_INC)
+-LDPATH = -L$(XROOT)/lib
+ LIBS = -lX11 $(EXTRA_LIBS)
+ 
+ PROG = windowlab
+@@ -62,7 +61,7 @@ HEADERS = windowlab.h
+ all: $(PROG)
+ 
+ $(PROG): $(OBJS)
+-	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LDPATH) $(LIBS) -o $@
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $@
+ 
+ $(OBJS): %.o: %.c $(HEADERS)
+ 	$(CC) $(CFLAGS) $(DEFINES) $(INCLUDES) -c $< -o $@
diff --git a/x11-wm/windowlab/windowlab-1.40-r2.ebuild b/x11-wm/windowlab/windowlab-1.40-r2.ebuild
new file mode 100644
index 000000000000..521a807b40c7
--- /dev/null
+++ b/x11-wm/windowlab/windowlab-1.40-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="small and simple window manager of novel design"
+HOMEPAGE="http://www.nickgravgaard.com/windowlab/"
+SRC_URI="http://www.nickgravgaard.com/${PN}/${P}.tar"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~x86"
+IUSE="truetype"
+
+RDEPEND="truetype? ( x11-libs/libXft )
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.34-fixed-font.patch"
+	"${FILESDIR}/${P}-gentoo.diff"
+	"${FILESDIR}/${PN}-1.40-libdir.patch"
+)
+
+src_configure() {
+	if use truetype ; then
+		export DEFINES=-DXFT
+		export EXTRA_INC=$($(tc-getPKG_CONFIG) --cflags xft)
+		export EXTRA_LIBS=$($(tc-getPKG_CONFIG) --libs xft)
+	fi
+
+	tc-export CC
+}
+
+src_install() {
+	default
+
+	exeinto /etc/X11/Sessions
+	cat <<- EOF > "${T}"/${PN}
+		#!/bin/sh
+		exec /usr/bin/${PN}
+	EOF
+	doexe "${T}"/${PN}
+}
+
+pkg_postinst() {
+	elog "${PN}'s menu config file has been changed from"
+	elog "${EROOT}/etc/X11/${PN}/menurc to ${EROOT}/etc/X11/${PN}/${PN}.menurc"
+}
diff --git a/x11-wm/wmii/Manifest b/x11-wm/wmii/Manifest
index a2c48872c2e2..72d07373902e 100644
--- a/x11-wm/wmii/Manifest
+++ b/x11-wm/wmii/Manifest
@@ -1,4 +1,6 @@
+AUX wmii-3.9.2-libdir.patch 261 BLAKE2B b131312959eb8883ea60a64cad8f37c60b8bc5f4097ed00e74754a3443d040f2ec425a53952ad1990ed32c8b7b139e51a499244558c31e0de7fc2c7458366b7d SHA512 075f08ceb1e339c65af423b043560d84ba856133c3f750145acff6cf8d42e647a952f86826d4dbdb934c7f04e7cba9c9d767dc25768211cea5e5dc98819829a0
 AUX wmii.desktop 106 BLAKE2B b92235ce6a4f21648baf326952bf7dd0cc9f76670b97a41316d9763889c91b64defa067c0b07a93c2547e477fdac29b4f4050cc9954210b98788ea34ad3eac54 SHA512 4c2ce08f692996c20f3f8d3d7884ac82644e8d1782b3895a0e75ecfe6c8ee9faf68a7621226d3cd9fb75cee0942d46cc55373dd74832508368a7c9760a18b143
 DIST wmii+ixp-3.9.2.tbz 432032 BLAKE2B 176b0cee20de3bac6eb23584650fc9beed793cfce1b2af9d47fc7be675da094d90670e8566b1dce264a8715711aa0d3cd207d9b8ef243bd48343fd5fe3c645f7 SHA512 c75d6d3f80e2b263c8d7b9eb6d0e700a1ad642209fc0984908e9399d22372c6c0572f47ab61881d5d56c4cc4eeb2914a545f6af1bbb936b65848764577d75761
 EBUILD wmii-3.9.2-r6.ebuild 1644 BLAKE2B 8d1aadc39751bc8e85d6745e57dc8c2342d7dea5b897357ef62fbd86c3669b5c0e1cac912f90865e0339cbc2b882828a6ce83ddc2478318496788ad4fcc722e4 SHA512 ad857a5e68236dc3d8669b21d9aac5d03ca52a442044a2a1a40c16fcb4f0d03d80a15cb1e3d9596c339990e4e28190da35f3c65d1320838194f87ba0c78ee00d
+EBUILD wmii-3.9.2-r7.ebuild 1702 BLAKE2B 38225c543b840fc99c41254f279cb75710e7242e4189efe169b29d17cfb93897045ac74d4fea00f59e89cec245986afa1ac98278a86f2e8d2681f1b2b0553ac2 SHA512 72b6264ddc4257e5e188c0b4409f2589325d69a8b0d528aae016370496cc65d369264c597279814a045bb3a2309feac60ffc7a2d46664ebaa2ad037298cea9e4
 MISC metadata.xml 595 BLAKE2B 9bb2ba3899843174bf9b9d27cef59718a10e12ba096c29295473d09d564ce6f7346c62214111e9f5f50cac7da6630caf7f63d7d34305a529c8a4ece2b9c7c441 SHA512 c3c5b5e5797dfd1ddbb947f51a1b4ff5d35889fb74ea8c8532ccbfe3458a1beb5a7468701152a3c98ad2cdfb1e233a1abf5e04869becd409d660a255be790884
diff --git a/x11-wm/wmii/files/wmii-3.9.2-libdir.patch b/x11-wm/wmii/files/wmii-3.9.2-libdir.patch
new file mode 100644
index 000000000000..a1d68fac1afa
--- /dev/null
+++ b/x11-wm/wmii/files/wmii-3.9.2-libdir.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/832476
+--- a/config.mk
++++ b/config.mk
+@@ -11,7 +11,7 @@ PREFIX = /usr/local
+ 
+ # Includes and libs
+ INCLUDES = -I. -I$(ROOT)/include -I$(INCLUDE) -I/usr/include
+-LIBS = -L$(ROOT)/lib -L/usr/lib
++LIBS = -L$(LIBDIR)
+ 
+ TERMINAL = xterm
+ 
diff --git a/x11-wm/wmii/wmii-3.9.2-r7.ebuild b/x11-wm/wmii/wmii-3.9.2-r7.ebuild
new file mode 100644
index 000000000000..b4c0c4b776be
--- /dev/null
+++ b/x11-wm/wmii/wmii-3.9.2-r7.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+MY_P="wmii+ixp-${PV}"
+
+DESCRIPTION="A dynamic window manager for X11"
+HOMEPAGE="https://github.com/0intro/wmii"
+SRC_URI="https://dl.suckless.org/wmii/${MY_P}.tbz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+DEPEND="
+	media-libs/freetype
+	>=sys-libs/libixp-0.5_p20110208-r3
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libX11"
+RDEPEND="${DEPEND}
+	media-fonts/font-misc-misc
+	x11-apps/xmessage
+	x11-apps/xsetroot"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( NEWS NOTES README TODO )
+
+# Force dynamic linking, bug #273332
+MAKEOPTS="${MAKEOPTS} STATIC= -j1"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.9.2-libdir.patch
+)
+
+src_prepare() {
+	default
+
+	mywmiiconf=(
+		PREFIX=/usr
+		DOC=/usr/share/doc/${PF}
+		ETC=/etc
+		LIBDIR=/usr/$(get_libdir)
+		CC="$(tc-getCC) -c"
+		LD="$(tc-getCC)"
+		AR="$(tc-getAR) crs"
+		LIBIXP="${ESYSROOT}/usr/$(get_libdir)/libixp.so"
+	)
+
+	# Punt internal copy of sys-libs/libixp, bug #323037
+	rm include/ixp{,_srvutil}.h || die
+	sed -i -e '/libixp/d' Makefile || die
+
+	# bug #335083
+	sed -i -e "/BINSH \!=/d" mk/hdr.mk || die
+	# bug #369115
+	sed -i -e 's/-lXext/& -lXrender -lX11/' cmd/Makefile || die
+}
+
+src_compile() {
+	append-flags -I"${ESYSROOT}"/usr/include/freetype2
+	append-flags -fcommon
+
+	emake "${mywmiiconf[@]}"
+}
+
+src_install() {
+	emake "${mywmiiconf[@]}" DESTDIR="${D}" install
+
+	echo ${PN} > "${T}"/${PN} || die
+	exeinto /etc/X11/Sessions
+	doexe "${T}"/${PN}
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/${PN}.desktop
+}
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index 14ccc89f85dc..c8a2620fe9a7 100644
Binary files a/xfce-base/Manifest.gz and b/xfce-base/Manifest.gz differ
diff --git a/xfce-base/exo/Manifest b/xfce-base/exo/Manifest
index 2629b8ec9e8a..fa97c04ec0bb 100644
--- a/xfce-base/exo/Manifest
+++ b/xfce-base/exo/Manifest
@@ -6,7 +6,7 @@ DIST exo-4.17.1.tar.bz2 877757 BLAKE2B 152e168568f4ad12e1eb03f7b1971b3369647da0a
 DIST exo-4.17.2.tar.bz2 878021 BLAKE2B 2756a032be106f371de17cf2c862acecb1a1a264f7f91b4c452d6a0cc8addc93ebf918b5e2e17baa1a78e8dc3bca6fde505d994fb3258a2bcceeb49899cd3b6c SHA512 99d688f9dc2f1a66f546943780521572d3df689e616b75a2a1e26a1d8c95b534175f6bc9a1a1782a7ffb8c09fa40e649ee6d688105344c748775ee3fdd10d1d0
 EBUILD exo-4.16.2.ebuild 1037 BLAKE2B fc845e4cba69c4bfde2512f34e6c8674b9dc0614617d76f6ef050b8f6ba25dc8616622eaa9b6abd18aa52f5e2515a0a68a9230f07168fa70c798308f17ff3331 SHA512 0962ad579e7bdbb0f2e0127c9bd90972d4a6dddd57ca7b383084b5852743f7308731ec4a9b393fb76db710b13f4971f5d2390f94e0298aa021a89612e9b3788a
 EBUILD exo-4.16.3.ebuild 1162 BLAKE2B 15951f356c35d0268c1724efc3bd1f9859ad7fc11677350b59b1f6ca4016b1dda6e55d70bdfc0b12158ad10cafa36d4684d5202ea63f5a7fa0006eb47feeb567 SHA512 d8154db5c11d65addbcca1844d9463e213699a8fd342d87161ef2f217ffe08bc34e8b6b85e41d0180773e5858ac8ee7d6181ea45625ca9a5c07c3b9136f07ee9
-EBUILD exo-4.16.4.ebuild 1174 BLAKE2B 6792a8c06c3a83231447ea19b3e9c08d14a2d6459b01badcdaf38ab754fed28b49348eb6f6151a3b8720dded19625e6e968a7728bff2076785952b4b80c32d5b SHA512 3fc5d74c6c7ed836f11abc18cb5fbbf4067fb92234d7d019d6205491ba4ac31c6fb1766c52e88471db21246d3098e84e0b7b4b80159f5068a1e458ddebe0f473
+EBUILD exo-4.16.4.ebuild 1172 BLAKE2B 65ff724d9fc726f88e0385f2a2e2791390f8bd3cccbbd79d144c8235793d56f9b51924d0b89b3f34f010876471e8864f509804fc95d3a8cdeeddb590e242ac28 SHA512 bcf5d7b292cbad5a67c0535408be21d45d1f45b65eee760c72b00007be5ed403a47efae4ff625711b9456c0c412121d83379f260995d5a80f567c3c2a88c9063
 EBUILD exo-4.17.1.ebuild 935 BLAKE2B 22e3173c32dc14eb338e159298070d55815c11b7e75a34935a14d125077f8b5822d234305fcbd8dd550667fe151abd99847c54d884342bccbdbefc334a515ab1 SHA512 37d72958a4967cdce59632e24ca231a3bc582182634aac2fc8a798d571b4b742845ab6a571db3847f0702ff5d9d670cc712cb1970b46ff3c37b862bcd62fa957
 EBUILD exo-4.17.2.ebuild 942 BLAKE2B 221b81d4e6131ae084178b5d45b71c9dbc1cfd2896fac6bcb41110d5043d6aa6a757e9dcb9ec965ec156775d02318eb4891a661abc2008465039e9888ac4fbf4 SHA512 2ede1b9df14198493a0634786ce6506170ac94febb372d2f626f981010671d129ef806132db240fdc291629803bbfce8967bc09c0eff636646e081042561755d
 MISC metadata.xml 242 BLAKE2B e489d8bd8fc709502185e0439171cde4402146bc1ec7340bbe41550c06410a49faec8777cb7e79c3ba482feee774350beec5741ed8fe93a85ebed7b746f9200e SHA512 1bcfaf0482a1e7b5a7182d853dafaa2d47687bbc1c9d38b69ba35ce97cdeeff9bd2137a086c5af2a27b730a295e7cbd73d0b43fbe5af331bb7a3113d2117dff3
diff --git a/xfce-base/exo/exo-4.16.4.ebuild b/xfce-base/exo/exo-4.16.4.ebuild
index 98cd2ece22bc..a873af84c6f1 100644
--- a/xfce-base/exo/exo-4.16.4.ebuild
+++ b/xfce-base/exo/exo-4.16.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.50
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index 0bd3b7d820ef..875bc48878ca 100644
Binary files a/xfce-extra/Manifest.gz and b/xfce-extra/Manifest.gz differ
diff --git a/xfce-extra/xfce4-wavelan-plugin/Manifest b/xfce-extra/xfce4-wavelan-plugin/Manifest
index 286467fc2721..09c0c6d04abb 100644
--- a/xfce-extra/xfce4-wavelan-plugin/Manifest
+++ b/xfce-extra/xfce4-wavelan-plugin/Manifest
@@ -1,4 +1,6 @@
 AUX xfce4-wavelan-plugin-0.6.2-close-definition.patch 1551 BLAKE2B d4d13dc82bcc990562b2fd40207e0ecf39b51fbc157eff92ce726e34708691531da3fa35d9c3245f00a1ae5b738ee35d12019c9adb24b455c15b256bbceacf5d SHA512 ad15a7fcae2a3254d59c5a856d6e3e4a523748ad58edae3aeec1bb7044dd025c0d7dab83f756715813a64f32ddd94ba73deddef5f846198fd8c35c36ca3a01f9
 DIST xfce4-wavelan-plugin-0.6.2.tar.bz2 356954 BLAKE2B 982ffbc5f72d5771650b4e8d6c64f468bf927febca8c65d8a20258043e1c9433ee9c4631eb501e620f6a1037852494e3f66fe2700e08063ee770cedcad857475 SHA512 90e0d5f2e9add1f177f0f69e537ccdeeaf518a122feb776cb8bce139b9af6ea7d248e758ae381b69041bbdefe2d38f2162d08b25fd246d98c3a028d743892123
+DIST xfce4-wavelan-plugin-0.6.3.tar.bz2 364789 BLAKE2B 3d39eb0716efaccd8effd6f6a89da9e0f749cbffdf2bdebeb021ebd8ed9c8f3f5eb728db8ebacf52cc977db827d9b0536c9c42a94caa40469172fce800fc71ef SHA512 a49af2c59f59890790081525a793638c673446b4a3f77584013cf87201fc0cf3218622834c32918daeb3fd2d87511db19512b903c60f8ccd58ae5c4f78507b7a
 EBUILD xfce4-wavelan-plugin-0.6.2-r1.ebuild 748 BLAKE2B 55cb47e9da5c82e93b459b9e7915cd8742a04f94899b9ad61a1b5719ebe9fefb9aeda73a337fbe47d18b1700fd7f3d77ef8b74b8e25741c6c511fafcc0adc9ce SHA512 1a341359446550c473d55b7f883b4b31251c9311ea0265f19a2a7c5e2bae2d4f9f6a276493ad78829311a4797aa657cf8fd9de2422162fbf0728f15aedb7cd0a
+EBUILD xfce4-wavelan-plugin-0.6.3.ebuild 701 BLAKE2B 5c1c07b02a87c3bf6885272fc0f77fb6d0efdc90ed03a1382558845ba89203fbf01d4b5af88eefa87353292e370200d2e7e092446f529f955a8d44ccc8c18937 SHA512 4a7be3f926f4ad5677368c9978e5fa8d2ae6cc49df2e33efbb27f4977c4afc881c22788cb682aeb56e51526946933dc74f7aec3731a88b12c01d18d97e047207
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.6.3.ebuild b/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.6.3.ebuild
new file mode 100644
index 000000000000..5f5f9ee13b9a
--- /dev/null
+++ b/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.6.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A panel plug-in to display wireless interface statistics"
+HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-wavelan-plugin"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+
+DEPEND="
+	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
+	>=xfce-base/xfce4-panel-4.12:=
+"
+RDEPEND="
+	${DEPEND}
+	kernel_linux? ( sys-apps/net-tools )
+"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}